Skip to contentSkip to conversation

m68k: convert to asm-generic/hardirq.h

PATCH Geert Uytterhoeven 1 participant 1 message Sep 23, 2009 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 5 lines · On Tue, Sep 22, 2009 at 02:04, <[email protected]> wrote:

From: Christoph Hellwig <[email protected]>

This one broke the m68k build, cfr.
http://kisskb.ellerman.id.au/kisskb/buildresult/1295096/.
I guess including <asm-generic/hardirq.h> here exposes us to Include Hell...

git revert 45d80eea87c9f8292d2d33173d6866c0ec57238a fixes it.

Quoted 17 lines

---

 arch/m68k/include/asm/hardirq_mm.h |   12 ++----------

 1 file changed, 2 insertions(+), 10 deletions(-)

diff -puN arch/m68k/include/asm/hardirq_mm.h~m68k-convert-to-asm-generic-hardirqh arch/m68k/include/asm/hardirq_mm.h

arch/m68k/include/asm/hardirq_mm.h renamed from arch/m68k/include/asm/hardirq_mm.h~m68k-convert-to-asm-generic-hardirqh +0 -5
@@ -1,16 +1,8 @@
  #ifndef __M68K_HARDIRQ_H
  #define __M68K_HARDIRQ_H
 
-#include <linux/threads.h>
-#include <linux/cache.h>
-
-/* entry.S is sensitive to the offsets of these fields */
-typedef struct {

arch/m68k/include/asm/hardirq_mm.h line 8

Quoted 10 lines
arch/m68k/include/asm/hardirq_mm.h renamed from arch/m68k/include/asm/hardirq_mm.h~m68k-convert-to-asm-generic-hardirqh +2 -5
-       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

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds