From 75e8ca1c5d5316a0863a96672c14ecfbc0182bed Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Wed, 11 Jan 2006 22:42:02 +0100
Subject: [PATCH] --- yaml --- r: 17919 b: refs/heads/master c:
 130951ccb14167c20b87e8bed52b60864ed53c2b h: refs/heads/master i:   17917:
 95d11f91bb0c02e5a1aa4fa10482d0942d3539be   17915:
 3356f45f4ec75249a98d8a4f139fe205e9c20e28   17911:
 3d974df3a486ef7be3dea741dd8730a5a23354e6   17903:
 fe1b517231715a499151cde364661dc85d94d0ba   17887:
 805bfd611d6b9616a530830272ac64c7ca8c4b72   17855:
 ac0799b1fead2984e823b66766fc67a68961f8d0   17791:
 5f7bd125d8db075d945bc4e4dfd6b133344c35b9   17663:
 5ac8c4bbdbc0f3df03a5ca909dd83dfe84301b45   17407:
 bd354ad2ecf8084b02b062002373b13966f0d560 v: v3

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

diff --git a/[refs] b/[refs]
index 263d65014921..3b5f71658fb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2765130b020c22f803afba74772f33f2ad13bf28
+refs/heads/master: 130951ccb14167c20b87e8bed52b60864ed53c2b
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index a0e0c9ca8f10..754a05f9b4db 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/arch/x86_64/kernel/setup.c
@@ -910,6 +910,10 @@ static int __init init_amd(struct cpuinfo_x86 *c)
 	} 
 	display_cacheinfo(c);
 
+	/* c->x86_power is 8000_0007 edx. Bit 8 is constant TSC */
+	if (c->x86_power & (1<<8))
+		set_bit(X86_FEATURE_CONSTANT_TSC, &c->x86_capability);
+
 	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))
@@ -1268,6 +1272,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 		"ttp",  /* thermal trip */
 		"tm",
 		"stc"
+		"?",
+		"constant_tsc",
 	};