From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 20 Jul 2009 09:11:23 +0000 (+0100)
Subject: linux/x86-64: MCE: truely do Dom0 stuff only on Dom0
X-Git-Tag: xen-3.4.2~22
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=89978038215e3874a993f36c6d5406d90dbe606b;p=legacy%2Flinux-2.6.18-xen.git

linux/x86-64: MCE: truely do Dom0 stuff only on Dom0

Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/arch/x86_64/kernel/mce.c b/arch/x86_64/kernel/mce.c
index 0e318084..1519041d 100644
--- a/arch/x86_64/kernel/mce.c
+++ b/arch/x86_64/kernel/mce.c
@@ -657,7 +657,6 @@ static struct notifier_block mce_cpu_notifier = {
 };
 #endif
 
-extern void bind_virq_for_mce(void);
 static __init int mce_init_device(void)
 {
 	int err;
@@ -674,10 +673,14 @@ static __init int mce_init_device(void)
 	register_hotcpu_notifier(&mce_cpu_notifier);
 	misc_register(&mce_log_device);
 
-    /*Register vIRQ handler for MCE LOG processing*/
-#if defined(CONFIG_X86_XEN_MCE)
-    printk(KERN_DEBUG "MCE: bind virq for DOM0 Logging\n");
-    bind_virq_for_mce();
+#ifdef CONFIG_X86_XEN_MCE
+	if (is_initial_xendomain()) {
+		/* Register vIRQ handler for MCE LOG processing */
+		extern void bind_virq_for_mce(void);
+
+		printk(KERN_DEBUG "MCE: bind virq for DOM0 logging\n");
+		bind_virq_for_mce();
+	}
 #endif
 
 	return err;