diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 06:30:42 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 06:30:42 +0100 |
commit | 13b2eda64d14d0a0c15c092664c7351ea58ea851 (patch) | |
tree | e0c82eb79a20f515f37ab3ffb9e5039b531eaa8c /arch/x86/xen | |
parent | Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', 'x86/signal' and 'x86/urgent'; commit 'v2.6.29-rc6' into x86/core (diff) | |
parent | xen: disable interrupts early, as start_kernel expects (diff) | |
download | linux-dev-13b2eda64d14d0a0c15c092664c7351ea58ea851.tar.xz linux-dev-13b2eda64d14d0a0c15c092664c7351ea58ea851.zip |
Merge branch 'x86/urgent' into x86/core
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
Diffstat (limited to 'arch/x86/xen')
-rw-r--r-- | arch/x86/xen/enlighten.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 86497d5f44cd..c52f4034c7fd 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -940,6 +940,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); |