From: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Fri, 29 Jul 2005 04:15:53 +0000 (-0700)
Subject: [PATCH] x86_64: Use msleep in smpboot.c
X-Git-Tag: v2.6.13-rc5~128
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ef6e525393dbbab7e1dc42594d35a1dfd688d1d7;p=linux-2.6-omap-h63xx.git

[PATCH] x86_64: Use msleep in smpboot.c

Replace schedule_timeout() with msleep() to guarantee the task delays as
expected.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c
index 001c2d57248..6d23354443c 100644
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
@@ -1183,8 +1183,7 @@ void __cpu_die(unsigned int cpu)
 			printk ("CPU %d is now offline\n", cpu);
 			return;
 		}
-		current->state = TASK_UNINTERRUPTIBLE;
-		schedule_timeout(HZ/10);
+		msleep(100);
 	}
  	printk(KERN_ERR "CPU %u didn't die...\n", cpu);
 }