From 235b6c1be9777585a62070da1bf8eff709c1c14e Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Tue, 26 Sep 2006 10:52:41 +0200
Subject: [PATCH] --- yaml --- r: 35967 b: refs/heads/master c:
 27fbe5b28a2ffef171c6005f304ea4f80fcdcc01 h: refs/heads/master i:   35965:
 565a25a5639b6637a8ff24e67e303449c7679a2e   35963:
 f964af722bc111ed0a5d091dbf74b7144f645863   35959:
 1338206cb214833f8df8158e144f905f1c6d4520   35951:
 a613fc7b918ef37b3872a7e8fd49ad6ed093c1dd   35935:
 40fe9b7d3a251c928598afc4f9d1eaf8f7577c3a   35903:
 15f78d3612810c9694eebab15bbbecfe013bafa9   35839:
 cc4705e82321182264dfd8639d14018807456dff v: v3

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

diff --git a/[refs] b/[refs]
index cb75fa2a1ee3..c56e4b58fd90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35d534a3ff4905c0a7bddbad0fc9df55967742c7
+refs/heads/master: 27fbe5b28a2ffef171c6005f304ea4f80fcdcc01
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index e328e3eb8cbe..085f2e09b9dc 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/arch/x86_64/kernel/setup.c
@@ -843,6 +843,8 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
 	if ((c->x86 == 0xf && c->x86_model >= 0x03) ||
 	    (c->x86 == 0x6 && c->x86_model >= 0x0e))
 		set_bit(X86_FEATURE_CONSTANT_TSC, &c->x86_capability);
+	if (c->x86 == 6)
+		set_bit(X86_FEATURE_REP_GOOD, &c->x86_capability);
 	set_bit(X86_FEATURE_SYNC_RDTSC, &c->x86_capability);
  	c->x86_max_cores = intel_num_cpu_cores(c);