Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 307b1cd7 authored Mar 23, 2012 by Akinobu Mita Committed by Linus Torvalds Mar 23, 2012

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@gmail.com>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 2df5e129

arch/x86/kernel/cpu/perf_event.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -643,14 +643,14 @@ static bool __perf_sched_find_counter(struct perf_sched *sched)
		/* 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;
		}

include/linux/bitops.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -27,11 +27,14 @@ extern unsigned long __sw_hweight64(__u64 w);
		(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;

tools/perf/util/include/linux/bitops.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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))