diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 18:42:29 -0500 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 18:42:29 -0500 |
commit | 5db0e1e9e0f30f160b832a0b5cd1131954bf4f6e (patch) | |
tree | c49877290fcbebb6245429bc5d554bea438c4fe8 | |
parent | 174596a0b9f21e8844d70566a6bb29bf48a87750 (diff) |
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.c | 3 | ||||
-rw-r--r-- | kernel/time/tick-broadcast.c | 2 |
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) | |||
145 | * Cycle through CPUs to check if the CPUs stay | 145 | * Cycle through CPUs to check if the CPUs stay |
146 | * synchronized to each other. | 146 | * synchronized to each other. |
147 | */ | 147 | */ |
148 | int next_cpu = next_cpu_nr(raw_smp_processor_id(), cpu_online_map); | 148 | int next_cpu = cpumask_next(raw_smp_processor_id(), |
149 | cpu_online_mask); | ||
149 | 150 | ||
150 | if (next_cpu >= nr_cpu_ids) | 151 | if (next_cpu >= nr_cpu_ids) |
151 | next_cpu = cpumask_first(cpu_online_mask); | 152 | 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, | |||
512 | struct tick_device *td; | 512 | struct tick_device *td; |
513 | int cpu; | 513 | int cpu; |
514 | 514 | ||
515 | for_each_cpu_mask_nr(cpu, *mask) { | 515 | for_each_cpu(cpu, mask) { |
516 | td = &per_cpu(tick_cpu_device, cpu); | 516 | td = &per_cpu(tick_cpu_device, cpu); |
517 | if (td->evtdev) | 517 | if (td->evtdev) |
518 | td->evtdev->next_event = expires; | 518 | td->evtdev->next_event = expires; |