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.

Akinobu Mita committed 14 years ago

Commit 307b1cd1 parent 2df5e123 files · +7 −4Browse files

Unified · Split

3 files

arch/x86/kernel/cpu/perf_event.c +2 −2
include/linux/bitops.h +4 −1
tools/perf/util/include/linux/bitops.h +1 −1

arch/x86/kernel/cpu/perf_event.c+2−2

@@ -643,14 +643,14 @@ static bool __perf_sched_find_counter(struct perf_sched *sched) · 642 unmodified lines
643	643	/* Prefer fixed purpose counters */
644	644	if (x86_pmu.num_counters_fixed) {
645	645	idx = X86_PMC_IDX_FIXED;
646		− for_each_set_bit_cont(idx, c->idxmsk, X86_PMC_IDX_MAX) {
	646	+ for_each_set_bit_from(idx, c->idxmsk, X86_PMC_IDX_MAX) {
647	647	if (!__test_and_set_bit(idx, sched->state.used))
648	648	goto done;
649	649	}
650	650	}
651	651	/* Grab the first unused counter starting with idx */
652	652	idx = sched->state.counter;
653		− for_each_set_bit_cont(idx, c->idxmsk, X86_PMC_IDX_FIXED) {
	653	+ for_each_set_bit_from(idx, c->idxmsk, X86_PMC_IDX_FIXED) {
654	654	if (!__test_and_set_bit(idx, sched->state.used))
655	655	goto done;
656	656	}

include/linux/bitops.h+4−1

@@ -27,11 +27,14 @@ extern unsigned long __sw_hweight64(__u64 w); · 26 unmodified lines
27	27	(bit) = find_next_bit((addr), (size), (bit) + 1))
28	28
29	29	/* same as for_each_set_bit() but use bit as value to start with */
30		−#define for_each_set_bit_cont(bit, addr, size) \
	30	+#define for_each_set_bit_from(bit, addr, size) \
31	31	for ((bit) = find_next_bit((addr), (size), (bit)); \
32	32	(bit) < (size); \
33	33	(bit) = find_next_bit((addr), (size), (bit) + 1))
34	34
	35	+#define for_each_set_bit_cont(bit, addr, size) \
	36	+ for_each_set_bit_from(bit, addr, size)
	37	+
35	38	static __inline__ int get_bitmask_order(unsigned int count)
36	39	{
37	40	int order;

tools/perf/util/include/linux/bitops.h+1−1

@@ -15,7 +15,7 @@ · 14 unmodified lines
15	15	(bit) = find_next_bit((addr), (size), (bit) + 1))
16	16
17	17	/* same as for_each_set_bit() but use bit as value to start with */
18		−#define for_each_set_bit_cont(bit, addr, size) \
	18	+#define for_each_set_bit_from(bit, addr, size) \
19	19	for ((bit) = find_next_bit((addr), (size), (bit)); \
20	20	(bit) < (size); \
21	21	(bit) = find_next_bit((addr), (size), (bit) + 1))