diff -purN -X /home/mbligh/.diff.exclude 780-hugetlb_dyn_as/include/asm-i386/mach-default/irq_vectors.h 790-irq_vector/include/asm-i386/mach-default/irq_vectors.h --- 780-hugetlb_dyn_as/include/asm-i386/mach-default/irq_vectors.h 2004-01-15 10:41:17.000000000 -0800 +++ 790-irq_vector/include/asm-i386/mach-default/irq_vectors.h 2004-02-28 11:42:19.000000000 -0800 @@ -84,22 +84,7 @@ */ #define NR_VECTORS 256 -#ifdef CONFIG_PCI_USE_VECTOR -#define NR_IRQS FIRST_SYSTEM_VECTOR -#define NR_IRQ_VECTORS NR_IRQS -#else -#ifdef CONFIG_X86_IO_APIC -#define NR_IRQS 224 -# if (224 >= 32 * NR_CPUS) -# define NR_IRQ_VECTORS NR_IRQS -# else -# define NR_IRQ_VECTORS (32 * NR_CPUS) -# endif -#else -#define NR_IRQS 16 -#define NR_IRQ_VECTORS NR_IRQS -#endif -#endif +#include "irq_vectors_limits.h" #define FPU_IRQ 13 diff -purN -X /home/mbligh/.diff.exclude 780-hugetlb_dyn_as/include/asm-i386/mach-default/irq_vectors_limits.h 790-irq_vector/include/asm-i386/mach-default/irq_vectors_limits.h --- 780-hugetlb_dyn_as/include/asm-i386/mach-default/irq_vectors_limits.h 1969-12-31 16:00:00.000000000 -0800 +++ 790-irq_vector/include/asm-i386/mach-default/irq_vectors_limits.h 2004-02-28 11:42:19.000000000 -0800 @@ -0,0 +1,21 @@ +#ifndef _ASM_IRQ_VECTORS_LIMITS_H +#define _ASM_IRQ_VECTORS_LIMITS_H + +#ifdef CONFIG_PCI_USE_VECTOR +#define NR_IRQS FIRST_SYSTEM_VECTOR +#define NR_IRQ_VECTORS NR_IRQS +#else +#ifdef CONFIG_X86_IO_APIC +#define NR_IRQS 224 +# if (224 >= 32 * NR_CPUS) +# define NR_IRQ_VECTORS NR_IRQS +# else +# define NR_IRQ_VECTORS (32 * NR_CPUS) +# endif +#else +#define NR_IRQS 16 +#define NR_IRQ_VECTORS NR_IRQS +#endif +#endif + +#endif /* _ASM_IRQ_VECTORS_LIMITS_H */ diff -purN -X /home/mbligh/.diff.exclude 780-hugetlb_dyn_as/include/asm-i386/mach-generic/irq_vectors_limits.h 790-irq_vector/include/asm-i386/mach-generic/irq_vectors_limits.h --- 780-hugetlb_dyn_as/include/asm-i386/mach-generic/irq_vectors_limits.h 1969-12-31 16:00:00.000000000 -0800 +++ 790-irq_vector/include/asm-i386/mach-generic/irq_vectors_limits.h 2004-02-28 11:42:19.000000000 -0800 @@ -0,0 +1,14 @@ +#ifndef _ASM_IRQ_VECTORS_LIMITS_H +#define _ASM_IRQ_VECTORS_LIMITS_H + +/* + * For Summit or generic (i.e. installer) kernels, we have lots of I/O APICs, + * even with uni-proc kernels, so use a big array. + * + * This value should be the same in both the generic and summit subarches. + * Change one, change 'em both. + */ +#define NR_IRQS 224 +#define NR_IRQ_VECTORS 1024 + +#endif /* _ASM_IRQ_VECTORS_LIMITS_H */ diff -purN -X /home/mbligh/.diff.exclude 780-hugetlb_dyn_as/include/asm-i386/mach-summit/irq_vectors_limits.h 790-irq_vector/include/asm-i386/mach-summit/irq_vectors_limits.h --- 780-hugetlb_dyn_as/include/asm-i386/mach-summit/irq_vectors_limits.h 1969-12-31 16:00:00.000000000 -0800 +++ 790-irq_vector/include/asm-i386/mach-summit/irq_vectors_limits.h 2004-02-28 11:42:19.000000000 -0800 @@ -0,0 +1,14 @@ +#ifndef _ASM_IRQ_VECTORS_LIMITS_H +#define _ASM_IRQ_VECTORS_LIMITS_H + +/* + * For Summit or generic (i.e. installer) kernels, we have lots of I/O APICs, + * even with uni-proc kernels, so use a big array. + * + * This value should be the same in both the generic and summit subarches. + * Change one, change 'em both. + */ +#define NR_IRQS 224 +#define NR_IRQ_VECTORS 1024 + +#endif /* _ASM_IRQ_VECTORS_LIMITS_H */