X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fturbostat.c;h=ca8551a999e8a1a5c335e2d0fec8e33127a8ab34;hb=abbfb4e3663055cd15457a654b54b4a5738f1412;hp=46f74a74dd91fe27396fca548362ae97d0e5d1e6;hpb=64d6b501e5411a93751ffb9be6154a90389dd9e0;p=collectd.git

diff --git a/src/turbostat.c b/src/turbostat.c
index 46f74a74..ca8551a9 100644
--- a/src/turbostat.c
+++ b/src/turbostat.c
@@ -70,7 +70,6 @@ static unsigned int do_slm_cstates;
 static unsigned int has_aperf;
 static unsigned int has_epb;
 static unsigned int genuine_intel;
-static unsigned int has_invariant_tsc;
 static unsigned int do_nehalem_platform_info;
 static int do_smi;
 static unsigned int do_rapl;
@@ -1206,9 +1205,7 @@ check_cpuid()
 	 * this check is valid for both Intel and AMD
 	 */
 	__get_cpuid(0x80000007, &eax, &ebx, &ecx, &edx);
-	has_invariant_tsc = edx & (1 << 8);
-
-	if (!has_invariant_tsc) {
+	if (!(edx & (1 << 8))) {
 		ERROR("No invariant TSC");
 		return -ERR_NO_INVARIANT_TSC;
 	}
@@ -1229,7 +1226,7 @@ check_cpuid()
 		return -ERR_NO_APERF;
 	}
 
-	do_nehalem_platform_info = genuine_intel && has_invariant_tsc;
+   do_nehalem_platform_info = genuine_intel;
 	do_nhm_cstates = genuine_intel;	/* all Intel w/ non-stop TSC have NHM counters */
 	do_smi = do_nhm_cstates;
 	do_snb_cstates = is_snb(family, model);