Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / include / asm-i386 / mach-xen / asm / hw_irq.h

diff --git a/include/asm-i386/mach-xen/asm/hw_irq.h b/include/asm-i386/mach-xen/asm/hw_irq.h
index eecc6b6..87e5a35 100644 (file)
--- a/include/asm-i386/mach-xen/asm/hw_irq.h
+++ b/include/asm-i386/mach-xen/asm/hw_irq.h
@@ -12,7 +12,6 @@
  *     <tomsoft@informatik.tu-chemnitz.de>
  */
 
-#include <linux/config.h>
 #include <linux/profile.h>
 #include <asm/atomic.h>
 #include <asm/irq.h>
@@ -20,6 +19,8 @@
 
 struct hw_interrupt_type;
 
+#define NMI_VECTOR             0x02
+
 /*
  * Various low-level irq details needed by irq.c, process.c,
  * time.c, io_apic.c and smp.c
@@ -68,10 +69,4 @@ extern atomic_t irq_mis_count;
 
 #define IO_APIC_IRQ(x) (((x) >= 16) || ((1<<(x)) & io_apic_irqs))
 
-extern void resend_irq_on_evtchn(struct hw_interrupt_type *h, unsigned int i);
-static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i)
-{
-       resend_irq_on_evtchn(h, i);
-}
-
 #endif /* _ASM_HW_IRQ_H */