From e5eee3b7b75dccff75f48513a6d1bc6fe850248c Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Sat, 25 Mar 2006 16:31:49 +0100
Subject: [PATCH] --- yaml --- r: 23844 b: refs/heads/master c:
 0085979006fd55ec7c2f721bdaa9af130a08d62a h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86_64/kernel/setup.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 145cdf6196c2..53dfff0ef189 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcf36bfa5de6d4e37878d4c98b6986fee4eb8b4c
+refs/heads/master: 0085979006fd55ec7c2f721bdaa9af130a08d62a
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index db70090a08f7..a57eec8311a7 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/arch/x86_64/kernel/setup.c
@@ -946,8 +946,6 @@ static int __init init_amd(struct cpuinfo_x86 *c)
 
 	if (c->extended_cpuid_level >= 0x80000008) {
 		c->x86_max_cores = (cpuid_ecx(0x80000008) & 0xff) + 1;
-		if (c->x86_max_cores & (c->x86_max_cores - 1))
-			c->x86_max_cores = 1;
 
 		amd_detect_cmp(c);
 	}