Skip to contentSkip to conversation

x86_64 breakage on UP_IOAPIC

PATCH In review Mikael Pettersson 3 participants 3 messages Apr 26, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86_64 breakage on UP_IOAPIC

The

o x86_64: Resend lost APIC IRQs on Uniprocessor too

change in 2.4.31-pre1 causes linkage errors: on UP_IOAPIC systems it creates references to send_IPI_self() which is only defined on SMP.

The patch below reverts this change.

Alternatively, x86_64 could implement a send_IPI_self() fallback for !SMP, just like i386 does.

/Mikael

include/asm-x86_64/hw_irq.h renamed from include/asm-x86_64/hw_irq.h.~1~ +1 -1
@@ -156,7 +156,7 @@ static inline void x86_do_profile (unsig
 	atomic_inc((atomic_t *)&prof_buffer[eip]);
 }
 
-#ifdef CONFIG_X86_IO_APIC
+#ifdef CONFIG_SMP /*more of this file should probably be ifdefed SMP */
 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));
#1 lore raw

Tiny, trivial, pedantic whitespace nit :

Quoted 17 lines · Mikael Pettersson

The

o x86_64: Resend lost APIC IRQs on Uniprocessor too

change in 2.4.31-pre1 causes linkage errors: on UP_IOAPIC systems it creates references to send_IPI_self() which is only defined on SMP.

The patch below reverts this change.

Alternatively, x86_64 could implement a send_IPI_self() fallback for !SMP, just like i386 does.

/Mikael

include/asm-x86_64/hw_irq.h static inline void x86_do_profile (unsig · line 159

Quoted 5 lines
include/asm-x86_64/hw_irq.h renamed from include/asm-x86_64/hw_irq.h.~1~ +1 -1
@@ -156,7 +156,7 @@ static inline void x86_do_profile (unsig
 	atomic_inc((atomic_t *)&prof_buffer[eip]);
 }
 
-#ifdef CONFIG_X86_IO_APIC
+#ifdef CONFIG_SMP /*more of this file should probably be ifdefed SMP */
                     ^^^
                      Space here?
Signature · 1 line
Jesper
#2 lore raw
Quoted 24 lines · Jesper Juhl

Tiny, trivial, pedantic whitespace nit :

Quoted 20 lines · Mikael Pettersson

The

o x86_64: Resend lost APIC IRQs on Uniprocessor too

change in 2.4.31-pre1 causes linkage errors: on UP_IOAPIC systems it creates references to send_IPI_self() which is only defined on SMP.

The patch below reverts this change.

Alternatively, x86_64 could implement a send_IPI_self() fallback for !SMP, just like i386 does.

/Mikael

include/asm-x86_64/hw_irq.h renamed from include/asm-x86_64/hw_irq.h.~1~ +0 -0
@@ -156,7 +156,7 @@ static inline void x86_do_profile (unsig
 	atomic_inc((atomic_t *)&prof_buffer[eip]);
 }
 
Quoted 4 lines

include/asm-x86_64/hw_irq.h static inline void x86_do_profile (unsig · line 159

Quoted 2 lines
include/asm-x86_64/hw_irq.h renamed from include/asm-x86_64/hw_irq.h.~1~ +1 -1
-#ifdef CONFIG_X86_IO_APIC
+#ifdef CONFIG_SMP /*more of this file should probably be ifdefed SMP */
                     ^^^
                      Space here?

I did a cut-n-paste from the 2.4.30 original.

/Mikael