[PATCH 1/4] ARM: sa1100: fix sa1100 after sparse irq conversion

[Russell King - ARM Linux]

On Tue, Feb 21, 2012 at 11:02:39AM -0600, Rob Herring wrote:
> Russell,
> 
> On 02/21/2012 07:25 AM, Russell King - ARM Linux wrote:
> > On Sun, Feb 19, 2012 at 09:21:19AM -0600, Rob Herring wrote:
> >> On 02/18/2012 05:18 PM, Russell King - ARM Linux wrote:
> >>> On Thu, Feb 16, 2012 at 09:32:11PM -0600, Rob Herring wrote:
> >>>> From: Rob Herring <rob.herring at calxeda.com>
> >>>>
> >>>> SA1100 was converted to sparse irq in parallel with include of mach/irqs.h
> >>>> being removed from asm/irq.h when sparse irq is enabled, resulting in lots
> >>>> of compile errors.
> >>>
> >>> Can this be applied before the change to enable sparse IRQ for sa11x0
> >>> platforms without breaking them?
> >>
> >> All but the rename of NR_IRQS to SA1100_NR_IRQS should be fine, but I
> >> can change it to leave NR_IRQS.
> > 
> > This isn't going to work.
> > 
> > If we update stuff to include mach/irqs.h, then we end up with mach/irqs.h
> > trying to override NR_IRQS in asm/irq.h:
> > 
> > #ifndef CONFIG_SPARSE_IRQ
> > #include <mach/irqs.h>
> > #else
> > #define NR_IRQS NR_IRQS_LEGACY
> > #endif
> > 
> > which spits out a lovely warning:
> > 
> > In file included from arch/arm/mach-sa1100/irq.c:20:
> > arch/arm/mach-sa1100/include/mach/irqs.h:86:1: warning: "NR_IRQS" redefined
> > In file included from arch/arm/include/asm/hardirq.h:6,
> >                  from include/linux/hardirq.h:7,
> >                  from include/linux/interrupt.h:12,
> >                  from arch/arm/mach-sa1100/irq.c:14:
> > arch/arm/include/asm/irq.h:9:1: warning: this is the location of the previous definition
> > 
> 
> But this only occurs after you converted to SPARSE_IRQ, right? If you
> add an "#ifndef NR_IRQS" to mach/irqs.h in your conversion, then
> everything should be okay. Then after everything is merged, NR_IRQS can
> be removed.

Right, I was thinking about the effects of changing this stuff after the
sparse IRQ commit.  But you're right, it can be done before that.

What does need to happen is the fixing of NR_IRQS etc needs to be part
of the very same commit which enables sparse IRQ.

> Can you take a look at my branch sa11x0-sparse-irq I just pushed out.
> It's based on your sa11x0 branch with just your sparse irq conversion
> commit rebased. I've built it with and without the sparse irq conversion
> and also merged my sparse_irq branch in without conflict and built that.

I'll take your word for it, and if you want to throw the relevant commits
at the patch system, I'll merge them into the enormous sa11x0 branch. I
need to drop the asoc branch out of it before the next merge window though
as I'm not planning to push that just yet.