diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-27 17:18:29 -0500 |
| commit | 292dd876ee765c478b27c93cc51e93a558ed58bf (patch) | |
| tree | 5b740e93253295baee2a9c414a6c66d03d44a9ef /include/asm-i386/apic.h | |
| parent | d4ec6c7cc9a15a7a529719bc3b84f46812f9842e (diff) | |
| parent | 9fdb62af92c741addbea15545f214a6e89460865 (diff) | |
Pull release into acpica branch
Diffstat (limited to 'include/asm-i386/apic.h')
| -rw-r--r-- | include/asm-i386/apic.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-i386/apic.h b/include/asm-i386/apic.h index 8c454aa58ac6..d30b8571573f 100644 --- a/include/asm-i386/apic.h +++ b/include/asm-i386/apic.h | |||
| @@ -132,6 +132,11 @@ extern unsigned int nmi_watchdog; | |||
| 132 | 132 | ||
| 133 | extern int disable_timer_pin_1; | 133 | extern int disable_timer_pin_1; |
| 134 | 134 | ||
| 135 | void smp_send_timer_broadcast_ipi(struct pt_regs *regs); | ||
| 136 | void switch_APIC_timer_to_ipi(void *cpumask); | ||
| 137 | void switch_ipi_to_APIC_timer(void *cpumask); | ||
| 138 | #define ARCH_APICTIMER_STOPS_ON_C3 1 | ||
| 139 | |||
| 135 | #else /* !CONFIG_X86_LOCAL_APIC */ | 140 | #else /* !CONFIG_X86_LOCAL_APIC */ |
| 136 | static inline void lapic_shutdown(void) { } | 141 | static inline void lapic_shutdown(void) { } |
| 137 | 142 | ||