aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2005-09-12 12:49:24 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-12 13:49:57 -0400
commit413588c7cb8113c03d0044f1d41b832ad7201c29 (patch)
tree5a16d8926c30c7b982a7f309aa948097e6369aae
parentb9aac10dddd927f0b9cfcca19a272ded87015574 (diff)
[PATCH] x86-64: Remove code to resume machine check state of other CPUs.
The resume code uses CPU hotplug now so at resume time we only ever see one CPU. Pointed out by Yu Luming. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/x86_64/kernel/mce.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/mce.c b/arch/x86_64/kernel/mce.c
index a39a3edf9ed4..969365c0771b 100644
--- a/arch/x86_64/kernel/mce.c
+++ b/arch/x86_64/kernel/mce.c
@@ -515,10 +515,12 @@ __setup("mce", mcheck_enable);
515 * Sysfs support 515 * Sysfs support
516 */ 516 */
517 517
518/* On resume clear all MCE state. Don't want to see leftovers from the BIOS. */ 518/* On resume clear all MCE state. Don't want to see leftovers from the BIOS.
519 Only one CPU is active at this time, the others get readded later using
520 CPU hotplug. */
519static int mce_resume(struct sys_device *dev) 521static int mce_resume(struct sys_device *dev)
520{ 522{
521 on_each_cpu(mce_init, NULL, 1, 1); 523 mce_init(NULL);
522 return 0; 524 return 0;
523} 525}
524 526