---

yaml --- r: 166639 b: refs/heads/master c: a28b3dc h: refs/heads/master i: 166637: ca48557 166635: fb89de6 166631: dfd5fd6 166623: 99ac42f v: v3
git-mirror · Oct 1, 2009 · b9bcf48 · b9bcf48
1 parent 4cbaeae
commit b9bcf48
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3db4a8ad19173a8fd0ced13d47c97910f1ab14b
+refs/heads/master: a28b3dc90964ed961b6ed2c320885ab8b3a0a8ff
diff --git a/trunk/arch/m68k/include/asm/hardirq_mm.h b/trunk/arch/m68k/include/asm/hardirq_mm.h
@@ -1,8 +1,16 @@
 #ifndef __M68K_HARDIRQ_H
 #define __M68K_HARDIRQ_H
 
-#define HARDIRQ_BITS	8
+#include <linux/threads.h>
+#include <linux/cache.h>
+
+/* entry.S is sensitive to the offsets of these fields */
+typedef struct {
+	unsigned int __softirq_pending;
+} ____cacheline_aligned irq_cpustat_t;
 
-#include <asm-generic/hardirq.h>
+#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
+
+#define HARDIRQ_BITS	8
 
 #endif