From 005a46a234dea8da9de94aaf081c400c87e0037f Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Sun, 22 Jul 2007 11:12:34 +0200
Subject: [PATCH] --- yaml --- r: 62478 b: refs/heads/master c:
 0bd8acd1a7fbb5492c1de8af271b6964a7fd5274 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2e74a5a66b32..79417fb7b9d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbab6e7a5cdcc53c2f56404ae0f7f5a3fd48f609
+refs/heads/master: 0bd8acd1a7fbb5492c1de8af271b6964a7fd5274
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index 6fa0a302e2aa..af838f6b0b7f 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/arch/x86_64/kernel/setup.c
@@ -608,6 +608,9 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 	else
 		num_cache_leaves = 3;
 
+	if (c->x86 == 0xf || c->x86 == 0x10 || c->x86 == 0x11)
+		set_bit(X86_FEATURE_K8, &c->x86_capability);
+
 	/* RDTSC can be speculated around */
 	clear_bit(X86_FEATURE_SYNC_RDTSC, &c->x86_capability);