diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-20 15:54:21 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-31 09:35:46 +0200 |
| commit | 64fcbac1f38882d8ae82c44a1c2a676cfa5e79e1 (patch) | |
| tree | ec1206322a8ca2a775db5ca552d5666b968be77c /arch/x86/include | |
| parent | dd3e6e8c6e7a2294f137c4dbccb3e73e7fa8ba15 (diff) | |
| download | linux-64fcbac1f38882d8ae82c44a1c2a676cfa5e79e1.tar.gz linux-64fcbac1f38882d8ae82c44a1c2a676cfa5e79e1.tar.bz2 linux-64fcbac1f38882d8ae82c44a1c2a676cfa5e79e1.zip | |
x86: Simplify timer_ack magic in time_32.c
Let the compiler optimize the timer_ack magic away in the 32bit timer
interrupt and put the same code into time_64.c. It's optimized out for
CONFIG_X86_IO_APIC on 32bit and for 64bit because timer_ack is const 0
in both cases.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/timer.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h index e854c7ab4169..65228ccc5f0d 100644 --- a/arch/x86/include/asm/timer.h +++ b/arch/x86/include/asm/timer.h @@ -9,11 +9,13 @@ unsigned long long native_sched_clock(void); unsigned long native_calibrate_tsc(void); +extern int recalibrate_cpu_khz(void); -#ifdef CONFIG_X86_32 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_IO_APIC) extern int timer_ack; +#else +# define timer_ack (0) #endif -extern int recalibrate_cpu_khz(void); extern int no_timer_check; |