summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2009-09-22 04:04:10 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-22 18:17:45 +0400
commitdb4e5cbe2f201c6abd51f7dfe41dbd2589affeba (patch)
treee1db462b358d7242faae23e46bd74fd3f246d7bb /arch/um
parent672917dcc781ead7652a8b11b1fba14e38ac15b8 (diff)
downloadlinux-db4e5cbe2f201c6abd51f7dfe41dbd2589affeba.tar.xz
um: convert to asm-generic/hardirq.h
Signed-off-by: Christoph Hellwig <hch@lst.de> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/include/asm/hardirq.h26
1 files changed, 1 insertions, 25 deletions
diff --git a/arch/um/include/asm/hardirq.h b/arch/um/include/asm/hardirq.h
index 313ebb8a2566..fb3c05a0cbbf 100644
--- a/arch/um/include/asm/hardirq.h
+++ b/arch/um/include/asm/hardirq.h
@@ -1,25 +1 @@
-/* (c) 2004 cw@f00f.org, GPLv2 blah blah */
-
-#ifndef __ASM_UM_HARDIRQ_H
-#define __ASM_UM_HARDIRQ_H
-
-#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 */
+#include <asm-generic/hardirq.h>