From 1e457a89e86eb2a6bb5da4a72a5646500fbfe91b Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Tue, 26 Sep 2006 10:52:34 +0200
Subject: [PATCH] --- yaml --- r: 35878 b: refs/heads/master c:
 3ca113ea74836a80645c79adba24caaa7a74120c h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/i386/kernel/smpboot.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2cac57b3c55b..22016536126a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5758d5dfef1c514200bda3f29ba700f1c3e3bc99
+refs/heads/master: 3ca113ea74836a80645c79adba24caaa7a74120c
diff --git a/trunk/arch/i386/kernel/smpboot.c b/trunk/arch/i386/kernel/smpboot.c
index 517eb3874550..020d873b7d21 100644
--- a/trunk/arch/i386/kernel/smpboot.c
+++ b/trunk/arch/i386/kernel/smpboot.c
@@ -177,6 +177,9 @@ static void __devinit smp_store_cpu_info(int id)
 	 */
 	if ((c->x86_vendor == X86_VENDOR_AMD) && (c->x86 == 6)) {
 
+		if (num_possible_cpus() == 1)
+			goto valid_k7;
+
 		/* Athlon 660/661 is valid. */	
 		if ((c->x86_model==6) && ((c->x86_mask==0) || (c->x86_mask==1)))
 			goto valid_k7;