The patch titled
Subject: bitops: rename for_each_set_bit_cont() in favor of analogous list.h function
has been removed from the -mm tree. Its filename was
bitops-rename-for_each_set_bit_cont-in-favor-of-analogous-listh-function.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Subject: bitops: rename for_each_set_bit_cont() in favor of analogous list.h function
This renames for_each_set_bit_cont() to for_each_set_bit_from() because it
is analogous to list_for_each_entry_from() in list.h rather than
list_for_each_entry_continue().
This doesn't remove for_each_set_bit_cont() for now.
Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Cc: Robert Richter <robert.richter@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/cpu/perf_event.c | 4 ++--
include/linux/bitops.h | 5 ++++-
tools/perf/util/include/linux/bitops.h | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff -puN arch/x86/kernel/cpu/perf_event.c~bitops-rename-for_each_set_bit_cont-in-favor-of-analogous-listh-function arch/x86/kernel/cpu/perf_event.c
--- a/arch/x86/kernel/cpu/perf_event.c~bitops-rename-for_each_set_bit_cont-in-favor-of-analogous-listh-function
+++ a/arch/x86/kernel/cpu/perf_event.c
@@ -643,14 +643,14 @@ static bool __perf_sched_find_counter(st
/* Prefer fixed purpose counters */
if (x86_pmu.num_counters_fixed) {
idx = X86_PMC_IDX_FIXED;
- for_each_set_bit_cont(idx, c->idxmsk, X86_PMC_IDX_MAX) {
+ for_each_set_bit_from(idx, c->idxmsk, X86_PMC_IDX_MAX) {
if (!__test_and_set_bit(idx, sched->state.used))
goto done;
}
}
/* Grab the first unused counter starting with idx */
idx = sched->state.counter;
- for_each_set_bit_cont(idx, c->idxmsk, X86_PMC_IDX_FIXED) {
+ for_each_set_bit_from(idx, c->idxmsk, X86_PMC_IDX_FIXED) {
if (!__test_and_set_bit(idx, sched->state.used))
goto done;
}
diff -puN include/linux/bitops.h~bitops-rename-for_each_set_bit_cont-in-favor-of-analogous-listh-function include/linux/bitops.h
--- a/include/linux/bitops.h~bitops-rename-for_each_set_bit_cont-in-favor-of-analogous-listh-function
+++ a/include/linux/bitops.h
@@ -27,11 +27,14 @@ extern unsigned long __sw_hweight64(__u6
(bit) = find_next_bit((addr), (size), (bit) + 1))
/* same as for_each_set_bit() but use bit as value to start with */
-#define for_each_set_bit_cont(bit, addr, size) \
+#define for_each_set_bit_from(bit, addr, size) \
for ((bit) = find_next_bit((addr), (size), (bit)); \
(bit) < (size); \
(bit) = find_next_bit((addr), (size), (bit) + 1))
+#define for_each_set_bit_cont(bit, addr, size) \
+ for_each_set_bit_from(bit, addr, size)
+
static __inline__ int get_bitmask_order(unsigned int count)
{
int order;
diff -puN tools/perf/util/include/linux/bitops.h~bitops-rename-for_each_set_bit_cont-in-favor-of-analogous-listh-function tools/perf/util/include/linux/bitops.h
--- a/tools/perf/util/include/linux/bitops.h~bitops-rename-for_each_set_bit_cont-in-favor-of-analogous-listh-function
+++ a/tools/perf/util/include/linux/bitops.h
@@ -15,7 +15,7 @@
(bit) = find_next_bit((addr), (size), (bit) + 1))
/* same as for_each_set_bit() but use bit as value to start with */
-#define for_each_set_bit_cont(bit, addr, size) \
+#define for_each_set_bit_from(bit, addr, size) \
for ((bit) = find_next_bit((addr), (size), (bit)); \
(bit) < (size); \
(bit) = find_next_bit((addr), (size), (bit) + 1))
_
Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are
origin.patch
linux-next.patch
ocfs2-use-find_last_bit.patch
ocfs2-use-bitmap_weight.patch
sysctl-use-bitmap-library-functions.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
