diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 08:48:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 08:48:46 -0800 |
| commit | 9f99a2f0e44663517b99b69a3e4a499d0ba877df (patch) | |
| tree | 92bbe9f9c9c6687a49e13e4e1bfe2a29bc736476 /arch | |
| parent | Merge branch 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen (diff) | |
| parent | xen/event: validate irq before get evtchn by irq (diff) | |
| download | linux-dev-9f99a2f0e44663517b99b69a3e4a499d0ba877df.tar.xz linux-dev-9f99a2f0e44663517b99b69a3e4a499d0ba877df.zip | |
Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/event: validate irq before get evtchn by irq
xen/fb: fix potential memory leak
xen/fb: fix xenfb suspend/resume race.
xen: disable ACPI NUMA for PV guests
xen/irq: Cleanup the find_unbound_irq
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 6aba2a23e2c3..7e8d3bc80af6 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1174,6 +1174,15 @@ asmlinkage void __init xen_start_kernel(void) xen_smp_init(); +#ifdef CONFIG_ACPI_NUMA + /* + * The pages we from Xen are not related to machine pages, so + * any NUMA information the kernel tries to get from ACPI will + * be meaningless. Prevent it from trying. + */ + acpi_numa = -1; +#endif + pgd = (pgd_t *)xen_start_info->pt_base; if (!xen_initial_domain()) |