From c80314b0c1a7d709f8fb807fbf1306ce3b6a1f2a Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 17 Oct 2007 18:04:34 +0200 Subject: [PATCH] --- yaml --- r: 70957 b: refs/heads/master c: f97586b610dc87a6494236118321e56ffc13319c h: refs/heads/master i: 70955: 74ac3d6549e7a7b986ebfb6d6a30537966894edd v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/tsc_32.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 097cb99c4088..af1cd3be6c79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fb450a327fc098efe6c9f000d470abac354cfcc +refs/heads/master: f97586b610dc87a6494236118321e56ffc13319c diff --git a/trunk/arch/x86/kernel/tsc_32.c b/trunk/arch/x86/kernel/tsc_32.c index b85ad754f70e..e87a3939ed40 100644 --- a/trunk/arch/x86/kernel/tsc_32.c +++ b/trunk/arch/x86/kernel/tsc_32.c @@ -349,10 +349,10 @@ __cpuinit int unsynchronized_tsc(void) static void __init check_geode_tsc_reliable(void) { - unsigned long val; + unsigned long res_low, res_high; - rdmsrl(MSR_GEODE_BUSCONT_CONF0, val); - if ((val & RTSC_SUSP)) + rdmsr_safe(MSR_GEODE_BUSCONT_CONF0, &res_low, &res_high); + if (res_low & RTSC_SUSP) clocksource_tsc.flags &= ~CLOCK_SOURCE_MUST_VERIFY; } #else