diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 13:36:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 13:36:48 -0500 |
| commit | 43a834d86c136b31ef6ad796725eb474a55a908d (patch) | |
| tree | 973db568aa41089f8d160982a850bec32c801c72 /arch/x86/kernel/tsc.c | |
| parent | a7f16d10b510f9ee3500af7831f2e3094fab3dca (diff) | |
| parent | 3235dc3f22378f35ce77eba0d0f62db2d9c4844e (diff) | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Remove trailing spaces in messages
x86, mtrr: Remove unused mtrr/state.c
x86, trivial: Fix grammo in tsc comment about Geode TSC reliability
Diffstat (limited to 'arch/x86/kernel/tsc.c')
| -rw-r--r-- | arch/x86/kernel/tsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 597683aa5ba0..23066ecf12fa 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
| @@ -806,7 +806,7 @@ static void __init check_system_tsc_reliable(void) | |||
| 806 | unsigned long res_low, res_high; | 806 | unsigned long res_low, res_high; |
| 807 | 807 | ||
| 808 | rdmsr_safe(MSR_GEODE_BUSCONT_CONF0, &res_low, &res_high); | 808 | rdmsr_safe(MSR_GEODE_BUSCONT_CONF0, &res_low, &res_high); |
| 809 | /* Geode_LX - the OLPC CPU has a possibly a very reliable TSC */ | 809 | /* Geode_LX - the OLPC CPU has a very reliable TSC */ |
| 810 | if (res_low & RTSC_SUSP) | 810 | if (res_low & RTSC_SUSP) |
| 811 | tsc_clocksource_reliable = 1; | 811 | tsc_clocksource_reliable = 1; |
| 812 | #endif | 812 | #endif |