diff options
| author | Ingo Molnar | 2008-10-06 16:18:26 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-10-06 18:06:53 +0200 |
| commit | 0962f402af1bb0b53ccee626785d202a10c12fff (patch) | |
| tree | 26fa57193f16e45c6e0557049d02164f129077ed /include/asm-x86/timer.h | |
| parent | Merge branch 'x86/pebs' into x86-v28-for-linus-phase1 (diff) | |
| parent | Merge commit 'v2.6.27-rc3' into x86/prototypes (diff) | |
| download | kernel-qcow2-linux-0962f402af1bb0b53ccee626785d202a10c12fff.tar.gz kernel-qcow2-linux-0962f402af1bb0b53ccee626785d202a10c12fff.tar.xz kernel-qcow2-linux-0962f402af1bb0b53ccee626785d202a10c12fff.zip | |
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
Conflicts:
arch/x86/kernel/process_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/timer.h')
| -rw-r--r-- | include/asm-x86/timer.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-x86/timer.h b/include/asm-x86/timer.h index b87123dec3d9..d0babce4b47a 100644 --- a/include/asm-x86/timer.h +++ b/include/asm-x86/timer.h @@ -9,9 +9,12 @@ unsigned long long native_sched_clock(void); unsigned long native_calibrate_tsc(void); +#ifdef CONFIG_X86_32 extern int timer_ack; -extern int no_timer_check; extern int recalibrate_cpu_khz(void); +#endif /* CONFIG_X86_32 */ + +extern int no_timer_check; #ifndef CONFIG_PARAVIRT #define calibrate_tsc() native_calibrate_tsc() |