From 751cce03834b71dfcd0b3c53be706eb7580ea825 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed, 25 Feb 2009 09:42:25 -0800
Subject: [PATCH] --- yaml --- r: 131866 b: refs/heads/master c:
 55d8085671863fe4ee6a17b7814bd38180a44e1d h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/xen/enlighten.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e76ac6dbaf70..9c4fdd107ec9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ab0d47d0ab311eb181532c1ecb6d02905685071
+refs/heads/master: 55d8085671863fe4ee6a17b7814bd38180a44e1d
diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c
index bea215230b20..b58e96338149 100644
--- a/trunk/arch/x86/xen/enlighten.c
+++ b/trunk/arch/x86/xen/enlighten.c
@@ -1672,6 +1672,9 @@ asmlinkage void __init xen_start_kernel(void)
 	   possible map and a non-dummy shared_info. */
 	per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];
 
+	local_irq_disable();
+	early_boot_irqs_off();
+
 	xen_raw_console_write("mapping kernel into physical memory\n");
 	pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages);