diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-24 16:14:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-24 16:14:34 -0700 |
| commit | 0c59f236139877f08b0c7a6e1411584f4ba07160 (patch) | |
| tree | 3f065901387692a6b3212b66c30757ab381e7d3d /arch/x86 | |
| parent | bee2d97b2c4583c2471aa65ab9c189a0011f62b3 (diff) | |
| parent | 8d54db795dfb1049d45dc34f0dddbc5347ec5642 (diff) | |
| download | op-kernel-dev-0c59f236139877f08b0c7a6e1411584f4ba07160.zip op-kernel-dev-0c59f236139877f08b0c7a6e1411584f4ba07160.tar.gz | |
Merge tag 'stable/for-linus-3.6-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Pull a Xen fix from Konrad Rzeszutek Wilk:
"It is a bug-fix when we run the initial PV guest on a AMD K8 machine
and have CONFIG_AMD_NUMA enabled and detect the NUMA topology from the
Northbridge.
We end up in the situation where the initial domain gets too much
information and gets confused and crashes - the fix is to restrict the
domain to get the information - and we do it by just disabling NUMA on
the PV guest (the hypervisor is still able to do its proper NUMA
allocations of guests).
It is OK to disable the PV guest from accessing NUMA data as right now
we do not inject any NUMA node information to the PV guests. When we
do get to that point, then this patch will have to be reverted."
* Disable PV NUMA support as we do not do anything with it (yet) and it
can cause bootup crashes on certain AMD machines.
* tag 'stable/for-linus-3.6-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/boot: Disable NUMA for PV guests.
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/xen/setup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index d11ca11..e2d62d6 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -17,6 +17,7 @@ #include <asm/e820.h> #include <asm/setup.h> #include <asm/acpi.h> +#include <asm/numa.h> #include <asm/xen/hypervisor.h> #include <asm/xen/hypercall.h> @@ -544,4 +545,7 @@ void __init xen_arch_setup(void) disable_cpufreq(); WARN_ON(set_pm_idle_to_default()); fiddle_vdso(); +#ifdef CONFIG_NUMA + numa_off = 1; +#endif } |
