From b9bcf4882c2d54ccef5809aade7600bf8bdbb9a1 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 1 Oct 2009 15:43:57 -0700
Subject: [PATCH] --- yaml --- r: 166639 b: refs/heads/master c:
 a28b3dc90964ed961b6ed2c320885ab8b3a0a8ff h: refs/heads/master i:   166637:
 ca485571a83adc9f2b398af5f5540497ba0a8211   166635:
 fb89de66f61e34246e6e0f842c825ab8f123be11   166631:
 dfd5fd656fcfe1f35a92c45b1a9db25cd65a8b95   166623:
 99ac42f4555aefd74c856d2315620a956f4fb0cc v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/m68k/include/asm/hardirq_mm.h | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ae6d8b4779f9..d3ca2d1cfd9f 100644
--- 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
index 554f65b6cd3b..394ee946015c 100644
--- 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