diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 17:47:20 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 17:47:20 -0500 |
| commit | d7fc3ca1cd0ecce82263299c6b1631fc83b0ec79 (patch) | |
| tree | a6471779a25cf2794542f9441213f5aa5f337f2f /include/asm-i386/apic.h | |
| parent | fbfda6e71bbdd3b4d41a56c3f20f31762c455a5e (diff) | |
| parent | ed62178589929d248a0aaf4018ca3867e2f96d9d (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-i386/apic.h')
| -rw-r--r-- | include/asm-i386/apic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-i386/apic.h b/include/asm-i386/apic.h index d30b8571573f..ff9ac8d19eb2 100644 --- a/include/asm-i386/apic.h +++ b/include/asm-i386/apic.h | |||
| @@ -137,6 +137,8 @@ void switch_APIC_timer_to_ipi(void *cpumask); | |||
| 137 | void switch_ipi_to_APIC_timer(void *cpumask); | 137 | void switch_ipi_to_APIC_timer(void *cpumask); |
| 138 | #define ARCH_APICTIMER_STOPS_ON_C3 1 | 138 | #define ARCH_APICTIMER_STOPS_ON_C3 1 |
| 139 | 139 | ||
| 140 | extern int timer_over_8254; | ||
| 141 | |||
| 140 | #else /* !CONFIG_X86_LOCAL_APIC */ | 142 | #else /* !CONFIG_X86_LOCAL_APIC */ |
| 141 | static inline void lapic_shutdown(void) { } | 143 | static inline void lapic_shutdown(void) { } |
| 142 | 144 | ||