summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-28 23:52:14 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-28 23:52:14 -0800
commit7f357f99380cf5927ddd66e49d2ebc23f19814eb (patch)
tree83a6fe1cb66f901581d336f5fe041f1f11cc7edb /include
parent1cdfa0d9da1fa7df23ba6dee3267420845d192b2 (diff)
parentcaf393738350f8165b1510aefc0b61e03fa96ab7 (diff)
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86_64/hw_irq.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/hw_irq.h b/include/asm-x86_64/hw_irq.h
index 4a42816524a8..767e11abd5c5 100644
--- a/include/asm-x86_64/hw_irq.h
+++ b/include/asm-x86_64/hw_irq.h
@@ -130,7 +130,7 @@ __asm__( \
"push $" #nr "-256 ; " \
"jmp common_interrupt");
-#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP)
+#if defined(CONFIG_X86_IO_APIC)
static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {
if (IO_APIC_IRQ(i))
send_IPI_self(IO_APIC_VECTOR(i));