From 66381b6b47588931d24caa9be4d080c10f9143c1 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 1 Jan 2009 10:12:23 +1030
Subject: [PATCH] --- yaml --- r: 125695 b: refs/heads/master c:
 f1fc057c79cb2d27602fb3ad08a031f13459ef27 h: refs/heads/master i:   125693:
 fad934c1efb9dace599e4a84d8b7682f1a454684   125691:
 585b8ba9d5786d9a18eb9421703381621f07f269   125687:
 45be76babc35fb6c34a5e83e15d6e018fb9e0683   125679:
 a35050c6ea75704a494758784b219e419f9fe86e   125663:
 04237c005b89bc5fc7cfb038fe6c2db0923950c2   125631:
 90871cd73a3e7175c589a2e685b1382e0ae91974   125567:
 01a407c11eefd5f691d84cdce6780a96a959736e   125439:
 5d201d71fb74fe17616613cfd2f0afff96af63fb v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/softirq.c    | 2 +-
 trunk/kernel/softlockup.c | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a48b97bc1336..40a2c633c6f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4462344ee9ea9224d026801b877887f2f39774a3
+refs/heads/master: f1fc057c79cb2d27602fb3ad08a031f13459ef27
diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
index 466e75ce271a..b7568d7def23 100644
--- a/trunk/kernel/softirq.c
+++ b/trunk/kernel/softirq.c
@@ -733,7 +733,7 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb,
 			break;
 		/* Unbind so it can run.  Fall thru. */
 		kthread_bind(per_cpu(ksoftirqd, hotcpu),
-			     any_online_cpu(cpu_online_map));
+			     cpumask_any(cpu_online_mask));
 	case CPU_DEAD:
 	case CPU_DEAD_FROZEN: {
 		struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
diff --git a/trunk/kernel/softlockup.c b/trunk/kernel/softlockup.c
index 1ab790c67b17..492f0c72fec5 100644
--- a/trunk/kernel/softlockup.c
+++ b/trunk/kernel/softlockup.c
@@ -303,7 +303,7 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
 		break;
 	case CPU_ONLINE:
 	case CPU_ONLINE_FROZEN:
-		check_cpu = any_online_cpu(cpu_online_map);
+		check_cpu = cpumask_any(cpu_online_mask);
 		wake_up_process(per_cpu(watchdog_task, hotcpu));
 		break;
 #ifdef CONFIG_HOTPLUG_CPU
@@ -313,7 +313,7 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
 			cpumask_t temp_cpu_online_map = cpu_online_map;
 
 			cpu_clear(hotcpu, temp_cpu_online_map);
-			check_cpu = any_online_cpu(temp_cpu_online_map);
+			check_cpu = cpumask_any(&temp_cpu_online_map);
 		}
 		break;
 
@@ -323,7 +323,7 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
 			break;
 		/* Unbind so it can run.  Fall thru. */
 		kthread_bind(per_cpu(watchdog_task, hotcpu),
-			     any_online_cpu(cpu_online_map));
+			     cpumask_any(cpu_online_mask));
 	case CPU_DEAD:
 	case CPU_DEAD_FROZEN:
 		p = per_cpu(watchdog_task, hotcpu);