diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 16:38:21 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 16:38:21 -0500 |
| commit | 4646575daf21f544fc2f7e8d90d8c488948fcc7c (patch) | |
| tree | fa0208fa11662c2d36e74cf6152288f8fbf7ddc9 /arch/x86/kernel/entry_64.S | |
| parent | 86ed4aa457f9c832856156a2ee6477d108825855 (diff) | |
| parent | 581f202bcd60acbc3af1f5faa429e570c512f8a3 (diff) | |
Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: UV RTC: Always enable RTC clocksource
x86: UV RTC: Rename generic_interrupt to x86_platform_ipi
x86: UV RTC: Clean up error handling
x86: UV RTC: Add clocksource only boot option
x86: UV RTC: Fix early expiry handling
Diffstat (limited to 'arch/x86/kernel/entry_64.S')
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 4deb8fc849dd..63bca794c8f9 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
| @@ -977,8 +977,8 @@ apicinterrupt UV_BAU_MESSAGE \ | |||
| 977 | #endif | 977 | #endif |
| 978 | apicinterrupt LOCAL_TIMER_VECTOR \ | 978 | apicinterrupt LOCAL_TIMER_VECTOR \ |
| 979 | apic_timer_interrupt smp_apic_timer_interrupt | 979 | apic_timer_interrupt smp_apic_timer_interrupt |
| 980 | apicinterrupt GENERIC_INTERRUPT_VECTOR \ | 980 | apicinterrupt X86_PLATFORM_IPI_VECTOR \ |
| 981 | generic_interrupt smp_generic_interrupt | 981 | x86_platform_ipi smp_x86_platform_ipi |
| 982 | 982 | ||
| 983 | #ifdef CONFIG_SMP | 983 | #ifdef CONFIG_SMP |
| 984 | apicinterrupt INVALIDATE_TLB_VECTOR_START+0 \ | 984 | apicinterrupt INVALIDATE_TLB_VECTOR_START+0 \ |