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

[Greg Ungerer <gerg@snapgear.com>]

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