git.codelabs.ch
/
muen
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[muen/linux.git]
/
arch
/
x86
/
kernel
/
idt.c
diff --git
a/arch/x86/kernel/idt.c
b/arch/x86/kernel/idt.c
index 50bee5fe114013622ee858e4a3b7b16d1ffa8a05..2c3a1b4294eb40d202b4e14435cf3682b9f34d5e 100644
(file)
--- a/
arch/x86/kernel/idt.c
+++ b/
arch/x86/kernel/idt.c
@@
-140,6
+140,9
@@
static const __initconst struct idt_data apic_idts[] = {
# ifdef CONFIG_IRQ_WORK
INTG(IRQ_WORK_VECTOR, irq_work_interrupt),
# endif
+#ifdef CONFIG_X86_UV
+ INTG(UV_BAU_MESSAGE, uv_bau_message_intr1),
+#endif
INTG(SPURIOUS_APIC_VECTOR, spurious_interrupt),
INTG(ERROR_APIC_VECTOR, error_interrupt),
#endif