diff options
| author | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
| commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
| tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /arch/x86/kernel/tsc.c | |
| parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'arch/x86/kernel/tsc.c')
| -rw-r--r-- | arch/x86/kernel/tsc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index d5cebb52d45b..b8e7aaf7ef75 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
| @@ -543,8 +543,6 @@ unsigned long native_calibrate_tsc(void) | |||
| 543 | return tsc_pit_min; | 543 | return tsc_pit_min; |
| 544 | } | 544 | } |
| 545 | 545 | ||
| 546 | #ifdef CONFIG_X86_32 | ||
| 547 | /* Only called from the Powernow K7 cpu freq driver */ | ||
| 548 | int recalibrate_cpu_khz(void) | 546 | int recalibrate_cpu_khz(void) |
| 549 | { | 547 | { |
| 550 | #ifndef CONFIG_SMP | 548 | #ifndef CONFIG_SMP |
| @@ -566,7 +564,6 @@ int recalibrate_cpu_khz(void) | |||
| 566 | 564 | ||
| 567 | EXPORT_SYMBOL(recalibrate_cpu_khz); | 565 | EXPORT_SYMBOL(recalibrate_cpu_khz); |
| 568 | 566 | ||
| 569 | #endif /* CONFIG_X86_32 */ | ||
| 570 | 567 | ||
| 571 | /* Accelerators for sched_clock() | 568 | /* Accelerators for sched_clock() |
| 572 | * convert from cycles(64bits) => nanoseconds (64bits) | 569 | * convert from cycles(64bits) => nanoseconds (64bits) |