[PATCH] m68k: merge the non-mmu and mmu versions of hardirq.h

[PATCH] m68k: merge the non-mmu and mmu versions of hardirq.h

[Greg Ungerer]

[PATCH] m68k: merge the non-mmu and mmu versions of hardirq.h

There is nothing different required between the non-mmu and mmu
versions of hardirq.h, so merge them back into a single file.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
 arch/m68k/include/asm/{hardirq_mm.h => hardirq.h} |    2 +
 arch/m68k/include/asm/hardirq_no.h                |   27 ---------------------
 2 files changed, 2 insertions(+), 27 deletions(-)
 rename arch/m68k/include/asm/{hardirq_mm.h => hardirq.h} (90%)
 delete mode 100644 arch/m68k/include/asm/hardirq_no.h

diff --git a/arch/m68k/include/asm/hardirq_mm.h b/arch/m68k/include/asm/hardirq.h
similarity index 90%
rename from arch/m68k/include/asm/hardirq_mm.h
rename to arch/m68k/include/asm/hardirq.h
index 394ee94..7167ed2 100644
--- a/arch/m68k/include/asm/hardirq_mm.h
+++ b/arch/m68k/include/asm/hardirq.h
@@ -13,4 +13,6 @@ typedef struct {
 
 #define HARDIRQ_BITS	8
 
+void ack_bad_irq(unsigned int irq);
+
 #endif
diff --git a/arch/m68k/include/asm/hardirq_no.h b/arch/m68k/include/asm/hardirq_no.h
deleted file mode 100644
index bfad281..0000000
--- a/arch/m68k/include/asm/hardirq_no.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __M68K_HARDIRQ_H
-#define __M68K_HARDIRQ_H
-
-#include <linux/cache.h>
-#include <linux/threads.h>
-#include <asm/irq.h>
-
-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
-
-/*
- * 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
-
-void ack_bad_irq(unsigned int irq);
-
-#endif /* __M68K_HARDIRQ_H */

Re: [PATCH] m68k: merge the non-mmu and mmu versions of hardirq.h

[Arnd Bergmann]

On Wednesday 17 June 2009, Greg Ungerer wrote:
> [PATCH] m68k: merge the non-mmu and mmu versions of hardirq.h
> 
> There is nothing different required between the non-mmu and mmu
> versions of hardirq.h, so merge them back into a single file.
> 
> Signed-off-by: Greg Ungerer <gerg@uclinux.org>

AFAICT this file is also the same in the new asm-generic version, so you
could fall back to that directly.

	Arnd <><

Re: [PATCH] m68k: merge the non-mmu and mmu versions of hardirq.h

[Greg Ungerer]

Hi Arnd,

Arnd Bergmann wrote:
> On Wednesday 17 June 2009, Greg Ungerer wrote:
>> [PATCH] m68k: merge the non-mmu and mmu versions of hardirq.h
>>
>> There is nothing different required between the non-mmu and mmu
>> versions of hardirq.h, so merge them back into a single file.
>>
>> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
> 
> AFAICT this file is also the same in the new asm-generic version, so you
> could fall back to that directly.

Indeed it could. It will need a clean out of ack_bad_irq() in
arch/m68knommu/kernel.irq.c, but otherwise looks good.

I'll prepare a new patch that uses that.

Regards
Greg



------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com

Re: [PATCH] m68k: merge the non-mmu and mmu versions of hardirq.h

[Greg Ungerer]

Hi Arnd,

Greg Ungerer wrote:
> Arnd Bergmann wrote:
>> On Wednesday 17 June 2009, Greg Ungerer wrote:
>>> [PATCH] m68k: merge the non-mmu and mmu versions of hardirq.h
>>>
>>> There is nothing different required between the non-mmu and mmu
>>> versions of hardirq.h, so merge them back into a single file.
>>>
>>> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
>>
>> AFAICT this file is also the same in the new asm-generic version, so you
>> could fall back to that directly.
> 
> Indeed it could. It will need a clean out of ack_bad_irq() in
> arch/m68knommu/kernel.irq.c, but otherwise looks good.
> 
> I'll prepare a new patch that uses that.

This turns out not to be as trivial as I first thought.

The include of linux/irq.h in the asm-generic/hardirq.h
causes all sorts of include ordering problems for the m68k
hardirq.h. The m68k hardirq.h includes asm/irq.h instead.

Regards
Greg


------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com