From: "Andi Kleen" <ak@suse.de>

Remove unneeded ifdef in hardirq.h

I can't see any reason for the #ifdef CONFIG_X86 introduced to the x86_64
hardirq.h as part of the generic irq subsystem changes.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 /dev/null                            |    0 
 25-akpm/include/asm-x86_64/hardirq.h |    2 --
 2 files changed, 2 deletions(-)

diff -puN include/asm-x86_64/hardirq.h~x86_64-remove-unneeded-ifdef-in-hardirqh include/asm-x86_64/hardirq.h
--- 25/include/asm-x86_64/hardirq.h~x86_64-remove-unneeded-ifdef-in-hardirqh	2004-11-28 01:54:50.115978320 -0800
+++ 25-akpm/include/asm-x86_64/hardirq.h	2004-11-28 01:54:50.118977864 -0800
@@ -21,7 +21,6 @@
  */
 static inline void ack_bad_irq(unsigned int irq)
 {
-#ifdef CONFIG_X86
 	printk("unexpected IRQ trap at vector %02x\n", irq);
 #ifdef CONFIG_X86_LOCAL_APIC
 	/*
@@ -34,6 +33,5 @@ static inline void ack_bad_irq(unsigned 
 	 */
 	ack_APIC_irq();
 #endif
-#endif
 }
 #endif /* __ASM_HARDIRQ_H */
diff -L include/asm-x86_64/hardirq.h.old -puN /dev/null /dev/null
_