[kernel] r14423 - in dists/trunk/linux-2.6/debian: . config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Fri Oct 23 01:31:06 2009
New Revision: 14423

Log:
[x86_64] Enable NUMA_EMU (Closes: #541389)

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Oct 23 01:13:40 2009	(r14422)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Oct 23 01:31:06 2009	(r14423)
@@ -4,6 +4,7 @@
   * Include aufs2, marked as staging (Closes: #541828)
   * Include speakup modules under staging
   * Add stable release 2.6.31.5
+  * [x86_64] Enable NUMA_EMU (Closes: #541389)
 
   [ Martin Michlmayr ]
   * CPUidle: always return with interrupts enabled.

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Fri Oct 23 01:13:40 2009	(r14422)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Fri Oct 23 01:31:06 2009	(r14423)
@@ -15,7 +15,7 @@
 CONFIG_NUMA=y
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
-# CONFIG_NUMA_EMU is not set
+CONFIG_NUMA_EMU=y
 CONFIG_PCI_MMCONFIG=y
 
 ##