diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-03 20:29:19 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-03 20:29:19 -0500 |
| commit | 91d75e209bd59695f0708d66964d928d45b3b2f3 (patch) | |
| tree | 32cab1359d951e4193bebb181a0f0319824a2b95 /arch/x86/xen | |
| parent | 9976b39b5031bbf76f715893cf080b6a17683881 (diff) | |
| parent | 8b0e5860cb099d7958d13b00ffbc35ad02735700 (diff) | |
Merge branch 'x86/core' into core/percpu
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 352ea6830659..82cd39a6cbd3 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
| @@ -942,6 +942,9 @@ asmlinkage void __init xen_start_kernel(void) | |||
| 942 | possible map and a non-dummy shared_info. */ | 942 | possible map and a non-dummy shared_info. */ |
| 943 | per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; | 943 | per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; |
| 944 | 944 | ||
| 945 | local_irq_disable(); | ||
| 946 | early_boot_irqs_off(); | ||
| 947 | |||
| 945 | xen_raw_console_write("mapping kernel into physical memory\n"); | 948 | xen_raw_console_write("mapping kernel into physical memory\n"); |
| 946 | pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages); | 949 | pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages); |
| 947 | 950 | ||