---

yaml --- r: 259068 b: refs/heads/master c: 10f939f h: refs/heads/master v: v3
git-mirror · Jul 25, 2011 · d1fa7e6 · d1fa7e6
1 parent 59ede73
commit d1fa7e6
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 48 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a66af29876b086d8279b48515b83ced66803fb15
+refs/heads/master: 10f939ff3ab80514da3bd96357bb54a8a59b9225
diff --git a/trunk/arch/m68k/include/asm/hardirq.h b/trunk/arch/m68k/include/asm/hardirq.h
@@ -1,5 +1,34 @@
-#ifdef __uClinux__
-#include "hardirq_no.h"
+#ifndef __M68K_HARDIRQ_H
+#define __M68K_HARDIRQ_H
+
+#include <linux/threads.h>
+#include <linux/cache.h>
+#include <asm/irq.h>
+
+#define HARDIRQ_BITS	8
+
+/*
+ * The hardirq mask has to be large enough to have
+ * space for potentially all IRQ sources in the system
+ * nesting on a single CPU:
+ */
+#if (1 << HARDIRQ_BITS) < NR_IRQS
+# error HARDIRQ_BITS is too low!
+#endif
+
+#ifdef CONFIG_MMU
+
+/* entry.S is sensitive to the offsets of these fields */
+typedef struct {
+	unsigned int __softirq_pending;
+} ____cacheline_aligned irq_cpustat_t;
+
+#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
+
 #else
-#include "hardirq_mm.h"
+
+#include <asm-generic/hardirq.h>
+
+#endif /* !CONFIG_MMU */
+
 #endif
diff --git a/trunk/arch/m68k/include/asm/hardirq_mm.h b/trunk/arch/m68k/include/asm/hardirq_mm.h
diff --git a/trunk/arch/m68k/include/asm/hardirq_no.h b/trunk/arch/m68k/include/asm/hardirq_no.h
diff --git a/trunk/arch/m68k/include/asm/irq.h b/trunk/arch/m68k/include/asm/irq.h
@@ -32,15 +32,6 @@
 #include <linux/irqreturn.h>
 #include <linux/spinlock_types.h>
 
-/*
- * The hardirq mask has to be large enough to have
- * space for potentially all IRQ sources in the system
- * nesting on a single CPU:
- */
-#if (1 << HARDIRQ_BITS) < NR_IRQS
-# error HARDIRQ_BITS is too low!
-#endif
-
 /*
  * Interrupt source definitions
  * General interrupt sources are the level 1-7.