Re: Fix x86 subarch breakage by the patch to allow more APIC irq sources

[James Cleverdon <jamesclv@us.ibm.com>]

Oops!  You're right.  Sorry, for some reason I thought all the sub-arches 
would inherit the default definition.  Obviously that wasn't the case.

And, I like Linus' solution to it.


On Wednesday 22 October 2003 8:56 am, James Bottomley wrote:
> The problem with this patch was that it defined a new quantity
> NR_IRQ_VECTORS.  However, the definition of NR_IRQ_VECTORS is only in
> mach-default/irq_vectors.h.  Every subarch which defines it's own
> irq_vectors.h (that's voyager, visws and pc9800) now won't compile.
>
> I think the best fix is the attached (although you could clean up
> mach-default/irq_vectors.h with this too).
>
> James
>
> ===== include/asm-i386/irq.h 1.9 vs edited =====
> --- 1.9/include/asm-i386/irq.h	Wed Apr 23 02:49:34 2003
> +++ edited/include/asm-i386/irq.h	Wed Oct 22 10:49:21 2003
> @@ -15,6 +15,10 @@
>  /* include comes from machine specific directory */
>  #include "irq_vectors.h"
>
> +#ifndef NR_IRQ_VECTORS
> +#define NR_IRQ_VECTORS NR_IRQS
> +#endif
> +
>  static __inline__ int irq_canonicalize(int irq)
>  {
>  	return ((irq == 2) ? 9 : irq);

-- 
James Cleverdon
IBM xSeries Linux Solutions
{jamesclv(Unix, preferred), cleverdj(Notes)} at us dot ibm dot comm