diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 06:24:13 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 06:24:13 -0400 |
commit | e3ae0acf59244ecf5b023ec99cef4b6b29d649bc (patch) | |
tree | 02a8bfdcab61677430ecfe04e9e44e1007c35f0e /arch/x86/kernel/entry_64.S | |
parent | 4b62ac9a2b859f932afd5625362c927111b7dd9b (diff) | |
parent | e7eb8726d0e144f0925972c4ecee945e91a42753 (diff) |
Merge branch 'x86/uv' into x86/devel
Diffstat (limited to 'arch/x86/kernel/entry_64.S')
-rw-r--r-- | arch/x86/kernel/entry_64.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index e4c5f951e68..ff15ab55228 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
@@ -719,6 +719,10 @@ ENTRY(apic_timer_interrupt) | |||
719 | apicinterrupt LOCAL_TIMER_VECTOR,smp_apic_timer_interrupt | 719 | apicinterrupt LOCAL_TIMER_VECTOR,smp_apic_timer_interrupt |
720 | END(apic_timer_interrupt) | 720 | END(apic_timer_interrupt) |
721 | 721 | ||
722 | ENTRY(uv_bau_message_intr1) | ||
723 | apicinterrupt 220,uv_bau_message_interrupt | ||
724 | END(uv_bau_message_intr1) | ||
725 | |||
722 | ENTRY(error_interrupt) | 726 | ENTRY(error_interrupt) |
723 | apicinterrupt ERROR_APIC_VECTOR,smp_error_interrupt | 727 | apicinterrupt ERROR_APIC_VECTOR,smp_error_interrupt |
724 | END(error_interrupt) | 728 | END(error_interrupt) |