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-um / hardirq.h

diff --git a/include/asm-um/hardirq.h b/include/asm-um/hardirq.h
index da49d29..313ebb8 100644 (file)
--- a/include/asm-um/hardirq.h
+++ b/include/asm-um/hardirq.h
@@ -1,6 +1,25 @@
-#ifndef __UM_HARDIRQ_H
-#define __UM_HARDIRQ_H
+/* (c) 2004 cw@f00f.org, GPLv2 blah blah */
 
-#include "asm/arch/hardirq.h"
+#ifndef __ASM_UM_HARDIRQ_H
+#define __ASM_UM_HARDIRQ_H
 
-#endif
+#include <linux/threads.h>
+#include <linux/irq.h>
+
+/* NOTE: When SMP works again we might want to make this
+ * ____cacheline_aligned or maybe use per_cpu state? --cw */
+typedef struct {
+       unsigned int __softirq_pending;
+} irq_cpustat_t;
+
+#include <linux/irq_cpustat.h>
+
+/* As this would be very strange for UML to get we BUG() after the
+ * printk. */
+static inline void ack_bad_irq(unsigned int irq)
+{
+       printk(KERN_ERR "unexpected IRQ %02x\n", irq);
+       BUG();
+}
+
+#endif /* __ASM_UM_HARDIRQ_H */