summaryrefslogtreecommitdiffstats
path: root/arch/sparc/include/asm/hardirq_32.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-11-14 14:38:28 +0100
committerTakashi Iwai <tiwai@suse.de>2009-11-14 14:38:28 +0100
commit0c3c35e148dbc03106038dd25816fb9f3a084d86 (patch)
tree8b8cc6a027353a0f242f61362b35b0942da61b83 /arch/sparc/include/asm/hardirq_32.h
parent50d40f187f9182ee8caa1b83f80a0e11e2226baa (diff)
parent5e08fe570c2dbabb5015c37049eb9a451e55c890 (diff)
downloadblackbird-op-linux-0c3c35e148dbc03106038dd25816fb9f3a084d86.tar.gz
blackbird-op-linux-0c3c35e148dbc03106038dd25816fb9f3a084d86.zip
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/sparc/include/asm/hardirq_32.h')
-rw-r--r--arch/sparc/include/asm/hardirq_32.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/sparc/include/asm/hardirq_32.h b/arch/sparc/include/asm/hardirq_32.h
index 4f63ed8df551..162007643cdc 100644
--- a/arch/sparc/include/asm/hardirq_32.h
+++ b/arch/sparc/include/asm/hardirq_32.h
@@ -7,17 +7,7 @@
#ifndef __SPARC_HARDIRQ_H
#define __SPARC_HARDIRQ_H
-#include <linux/threads.h>
-#include <linux/spinlock.h>
-#include <linux/cache.h>
-
-/* entry.S is sensitive to the offsets of these fields */ /* XXX P3 Is it? */
-typedef struct {
- unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
-
#define HARDIRQ_BITS 8
+#include <asm-generic/hardirq.h>
#endif /* __SPARC_HARDIRQ_H */
OpenPOWER on IntegriCloud