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 | a852cbfaaf8122827602027b1614971cfd832304 (diff) | |
| parent | 55d8085671863fe4ee6a17b7814bd38180a44e1d (diff) | |
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 86497d5f44c..c52f4034c7f 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); |