summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2009-01-01 10:12:29 +1030
committerRusty Russell <rusty@rustcorp.com.au>2009-01-01 10:12:29 +1030
commit5db0e1e9e0f30f160b832a0b5cd1131954bf4f6e (patch)
treec49877290fcbebb6245429bc5d554bea438c4fe8
parent174596a0b9f21e8844d70566a6bb29bf48a87750 (diff)
downloadlinux-5db0e1e9e0f30f160b832a0b5cd1131954bf4f6e.tar.gz
linux-5db0e1e9e0f30f160b832a0b5cd1131954bf4f6e.tar.bz2
linux-5db0e1e9e0f30f160b832a0b5cd1131954bf4f6e.zip
cpumask: replace for_each_cpu_mask_nr with for_each_cpu in kernel/time/
Impact: cleanup Simple replacement, now the _nr is redundant. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Mike Travis <travis@sgi.com> Cc: Ingo Molnar <mingo@redhat.com>
-rw-r--r--kernel/time/clocksource.c3
-rw-r--r--kernel/time/tick-broadcast.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 32141b15d63e..ca89e1593f08 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -145,7 +145,8 @@ static void clocksource_watchdog(unsigned long data)
* Cycle through CPUs to check if the CPUs stay
* synchronized to each other.
*/
- int next_cpu = next_cpu_nr(raw_smp_processor_id(), cpu_online_map);
+ int next_cpu = cpumask_next(raw_smp_processor_id(),
+ cpu_online_mask);
if (next_cpu >= nr_cpu_ids)
next_cpu = cpumask_first(cpu_online_mask);
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index 356fac57a182..118a3b3b3f9a 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -512,7 +512,7 @@ static void tick_broadcast_init_next_event(struct cpumask *mask,
struct tick_device *td;
int cpu;
- for_each_cpu_mask_nr(cpu, *mask) {
+ for_each_cpu(cpu, mask) {
td = &per_cpu(tick_cpu_device, cpu);
if (td->evtdev)
td->evtdev->next_event = expires;