Commit 0c59f236 authored Sep 24, 2012 by Linus Torvalds

Merge tag 'stable/for-linus-3.6-rc7-tag' of...

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.

parents bee2d97b 8d54db79

arch/x86/xen/setup.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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
		}

Admin message