From b8a20740f6deeb1d541f796caf46c3a81abb20fb Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 1 Jan 2009 10:12:29 +1030
Subject: [PATCH] --- yaml --- r: 125706 b: refs/heads/master c:
 5db0e1e9e0f30f160b832a0b5cd1131954bf4f6e h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/kernel/time/clocksource.c    | 3 ++-
 trunk/kernel/time/tick-broadcast.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4d7f375123a5..f766d8e99dad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 174596a0b9f21e8844d70566a6bb29bf48a87750
+refs/heads/master: 5db0e1e9e0f30f160b832a0b5cd1131954bf4f6e
diff --git a/trunk/kernel/time/clocksource.c b/trunk/kernel/time/clocksource.c
index 32141b15d63e..ca89e1593f08 100644
--- a/trunk/kernel/time/clocksource.c
+++ b/trunk/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/trunk/kernel/time/tick-broadcast.c b/trunk/kernel/time/tick-broadcast.c
index 356fac57a182..118a3b3b3f9a 100644
--- a/trunk/kernel/time/tick-broadcast.c
+++ b/trunk/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;