[PATCH] i386/smpboot: use msleep() instead of schedule_timeout()

Nishanth Aravamudan · Linus Torvalds · commit aeb8397b6a28 · 2005-09-10T10:06:29.000-07:00
Replace schedule_timeout() with msleep() to guarantee the task delays as
expected.

Signed-off-by: Nishanth Aravamudan &lt;nacc@us.ibm.com&gt;
Signed-off-by: Domen Puncer &lt;domen@coderock.org&gt;
Signed-off-by: Andrew Morton &lt;akpm@osdl.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
@@ -1330,8 +1330,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);
 }

Original file line number	Diff line number	Diff line change
`@@ -1330,8 +1330,7 @@ void __cpu_die(unsigned int cpu)`
`1330`	`1330`	`printk ("CPU %d is now offline\n", cpu);`
`1331`	`1331`	`return;`
`1332`	`1332`	`}`
`1333`		`- current->state = TASK_UNINTERRUPTIBLE;`
`1334`		`- schedule_timeout(HZ/10);`
	`1333`	`+ msleep(100);`
`1335`	`1334`	`}`
`1336`	`1335`	`printk(KERN_ERR "CPU %u didn't die...\n", cpu);`
`1337`	`1336`	`}`