Merge with mainline to remove plat-omap/Kconfig conflict

[mirror_ubuntu-zesty-kernel.git] / kernel / sched_cpupri.c

diff --git a/kernel/sched_cpupri.c b/kernel/sched_cpupri.c
index 597b33099dfa690617a812b3899e731bf7d5c792..eeb3506c4834e167d531c5bf62409ae9322c450f 100644 (file)
--- a/kernel/sched_cpupri.c
+++ b/kernel/sched_cpupri.c
@@ -47,9 +47,7 @@ static int convert_prio(int prio)
 }
 
 #define for_each_cpupri_active(array, idx)                    \
-  for (idx = find_first_bit(array, CPUPRI_NR_PRIORITIES);     \
-       idx < CPUPRI_NR_PRIORITIES;                            \
-       idx = find_next_bit(array, CPUPRI_NR_PRIORITIES, idx+1))
+       for_each_bit(idx, array, CPUPRI_NR_PRIORITIES)
 
 /**
  * cpupri_find - find the best (lowest-pri) CPU in the system