summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2009-02-25 09:42:25 -0800
committerIngo Molnar <mingo@elte.hu>2009-02-25 18:51:57 +0100
commit55d8085671863fe4ee6a17b7814bd38180a44e1d (patch)
tree8fd456bb73651277c38b0de54f32a6f43ef2cebb
parent4ab0d47d0ab311eb181532c1ecb6d02905685071 (diff)
downloadlinux-3.10-55d8085671863fe4ee6a17b7814bd38180a44e1d.tar.gz
linux-3.10-55d8085671863fe4ee6a17b7814bd38180a44e1d.tar.bz2
linux-3.10-55d8085671863fe4ee6a17b7814bd38180a44e1d.zip
xen: disable interrupts early, as start_kernel expects
This avoids a lockdep warning from: if (DEBUG_LOCKS_WARN_ON(unlikely(!early_boot_irqs_enabled))) return; in trace_hardirqs_on_caller(); Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Cc: Mark McLoughlin <markmc@redhat.com> Cc: Xen-devel <xen-devel@lists.xensource.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/xen/enlighten.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index bea215230b2..b58e9633814 100644
--- a/arch/x86/xen/enlighten.c
+++ b/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);