X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=arch%2Fx86_64%2Fkernel%2Fsetup.c;h=a570c81c83163fc2856997bb173b11748b228b06;hb=ee58fad51a2a767cb2567706ace967705233d881;hp=619af2e2fa267ba18eab8086a5b50d36ec8cc56c;hpb=7e95b593a1aeb6fe1d3904e799d23a45261f2c19;p=linux-2.6-omap-h63xx.git

diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 619af2e2fa2..a570c81c831 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -838,6 +838,8 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
 	if (cpu_has_ds) {
 		unsigned int l1, l2;
 		rdmsr(MSR_IA32_MISC_ENABLE, l1, l2);
+		if (!(l1 & (1<<11)))
+			set_bit(X86_FEATURE_BTS, c->x86_capability);
 		if (!(l1 & (1<<12)))
 			set_bit(X86_FEATURE_PEBS, c->x86_capability);
 	}