Fix SRAT for non dual core AMD systems, from Andi.

diff --git a/queue/series b/queue/series
index 39e2b8aff7cc639b6a8cafba8761d9fa2c38a032..ae6fa976170ee3343f5d0a9516004cafb9642a4e 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -1 +1,2 @@
 sys_set_mempolicy-mode-check.patch
+x86_64-srat-dual-core-amd.patch

diff --git a/queue/x86_64-srat-dual-core-amd.patch b/queue/x86_64-srat-dual-core-amd.patch
new file mode 100644 (file)
index 0000000..56401d8
--- /dev/null
+++ b/queue/x86_64-srat-dual-core-amd.patch
@@ -0,0 +1,29 @@
+From stable-bounces@linux.kernel.org  Mon Aug  8 09:47:43 2005
+Date: Mon, 8 Aug 2005 18:47:19 +0200
+From: Andi Kleen <ak@suse.de>
+To: stable@kernel.org, discuss@x86-64.org
+Subject: [PATCH] Fix SRAT for non dual core AMD systems
+
+Patch for 2.6.12-STABLE
+
+This fixes a bug in SRAT handling on AMD systems that was introduced
+with the dual core support. It would be disabled on CPUs without dual core.
+Just drop the bogus check.
+
+Signed-off-by: Andi Kleen <ak@suse.de>
+Signed-off-by: Chris Wright <chrisw@osdl.org>
+
+Index: linux-2.6.12/arch/x86_64/kernel/setup.c
+===================================================================
+--- linux-2.6.12.orig/arch/x86_64/kernel/setup.c
++++ linux-2.6.12/arch/x86_64/kernel/setup.c
+@@ -729,8 +729,6 @@ static void __init amd_detect_cmp(struct
+       int cpu = smp_processor_id();
+       int node = 0;
+       unsigned bits;
+-      if (c->x86_num_cores == 1)
+-              return;
+ 
+       bits = 0;
+       while ((1 << bits) < c->x86_num_cores)
+