summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/entry_64.S
diff options
context:
space:
mode:
authorIngo Molnar2008-07-08 12:24:13 +0200
committerIngo Molnar2008-07-08 12:24:13 +0200
commite3ae0acf59244ecf5b023ec99cef4b6b29d649bc (patch)
tree02a8bfdcab61677430ecfe04e9e44e1007c35f0e /arch/x86/kernel/entry_64.S
parentMerge branch 'x86/nmi' into x86/devel (diff)
parentx86, SGI UV: uv_ptc_proc_write fix (diff)
downloadkernel-qcow2-linux-e3ae0acf59244ecf5b023ec99cef4b6b29d649bc.tar.gz
kernel-qcow2-linux-e3ae0acf59244ecf5b023ec99cef4b6b29d649bc.tar.xz
kernel-qcow2-linux-e3ae0acf59244ecf5b023ec99cef4b6b29d649bc.zip
Merge branch 'x86/uv' into x86/devel
Diffstat (limited to 'arch/x86/kernel/entry_64.S')
-rw-r--r--arch/x86/kernel/entry_64.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index e4c5f951e68d..ff15ab552280 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -719,6 +719,10 @@ ENTRY(apic_timer_interrupt)
apicinterrupt LOCAL_TIMER_VECTOR,smp_apic_timer_interrupt
END(apic_timer_interrupt)
+ENTRY(uv_bau_message_intr1)
+ apicinterrupt 220,uv_bau_message_interrupt
+END(uv_bau_message_intr1)
+
ENTRY(error_interrupt)
apicinterrupt ERROR_APIC_VECTOR,smp_error_interrupt
END(error_interrupt)