From fc795a341c7777f3ea9f96c9f0b563415b2db797 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 3 Aug 2011 13:59:04 -0400
Subject: [PATCH] --- yaml --- r: 268997 b: refs/heads/master c:
 18e5a45db30e0e338cdd663eda05a8288cc14fa5 h: refs/heads/master i:   268995:
 601ade148179bc16bd34a6c44e8edd697684fca7 v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/watchdog.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 002a3b9c0094..0379e61fe9f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e5b2a01d2ca2eae4ef913b59f84341f9a70e206
+refs/heads/master: 18e5a45db30e0e338cdd663eda05a8288cc14fa5
diff --git a/trunk/kernel/watchdog.c b/trunk/kernel/watchdog.c
index 36491cd5b7d4..e952a1394d26 100644
--- a/trunk/kernel/watchdog.c
+++ b/trunk/kernel/watchdog.c
@@ -438,7 +438,7 @@ static int watchdog_enable(int cpu)
 
 	/* create the watchdog thread */
 	if (!p) {
-		p = kthread_create(watchdog, (void *)(unsigned long)cpu, "watchdog/%d", cpu);
+		p = kthread_create_on_node(watchdog, NULL, cpu_to_node(cpu), "watchdog/%d", cpu);
 		if (IS_ERR(p)) {
 			printk(KERN_ERR "softlockup watchdog for %i failed\n", cpu);
 			if (!err) {