diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2010-12-03 09:54:03 +0000 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-01-10 10:46:30 -0500 |
| commit | c1f5db1a53a7286f6c818f71016ae6aced814d27 (patch) | |
| tree | bbf924688a63b8b6a67e067a45274331643a1bfb /arch/x86/xen/enlighten.c | |
| parent | d1b758ebc2a82d738092cb42e742470f9d0ea53e (diff) | |
| download | op-kernel-dev-c1f5db1a53a7286f6c818f71016ae6aced814d27.zip op-kernel-dev-c1f5db1a53a7286f6c818f71016ae6aced814d27.tar.gz | |
xen: disable ACPI NUMA for PV guests
Xen does not currently expose PV-NUMA information to PV
guests. Therefore disable NUMA for the time being to prevent the
kernel picking up on an host-level NUMA information which it might
come across in the firmware.
[ Added comment - Jeremy ]
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/xen/enlighten.c')
| -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 44dcad4..ed47d12 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()) |
