diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 00:37:42 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 00:37:42 -0500 |
| commit | 83eb95b852902f952ba594447a796ad8146b9462 (patch) | |
| tree | 33c199aeeae58b69ad8d6d2a33c2d96ba2b98ddf /arch/x86/kernel/tsc.c | |
| parent | efb3e34b6176d30c4fe8635fa8e1beb6280cc2cd (diff) | |
| parent | 9bbe7b984096ac45586da2adf26c14069ecb79b2 (diff) | |
Merge branch 'sh/sdio' into sh-latest
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 03d2ea82f35a..823f79a17ad1 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
| @@ -965,7 +965,7 @@ out: | |||
| 965 | 965 | ||
| 966 | static int __init init_tsc_clocksource(void) | 966 | static int __init init_tsc_clocksource(void) |
| 967 | { | 967 | { |
| 968 | if (!cpu_has_tsc || tsc_disabled > 0) | 968 | if (!cpu_has_tsc || tsc_disabled > 0 || !tsc_khz) |
| 969 | return 0; | 969 | return 0; |
| 970 | 970 | ||
| 971 | if (tsc_clocksource_reliable) | 971 | if (tsc_clocksource_reliable) |