diff -purN -X /home/mbligh/.diff.exclude 698-aiofix2/arch/i386/Kconfig 700-config_irqbal/arch/i386/Kconfig --- 698-aiofix2/arch/i386/Kconfig 2003-07-28 19:03:37.000000000 -0700 +++ 700-config_irqbal/arch/i386/Kconfig 2003-07-28 19:03:53.000000000 -0700 @@ -844,6 +844,14 @@ config 1000HZ bool "1000 Hz" endchoice +config IRQBALANCE + bool "Enable kernel irq balancing" + depends on SMP + default y + help + The defalut yes will allow the kernel to do irq load balancing. + Saying no will keep the kernel from doing irq load balancing. + config HAVE_DEC_LOCK bool depends on (SMP || PREEMPT) && X86_CMPXCHG diff -purN -X /home/mbligh/.diff.exclude 698-aiofix2/arch/i386/kernel/io_apic.c 700-config_irqbal/arch/i386/kernel/io_apic.c --- 698-aiofix2/arch/i386/kernel/io_apic.c 2003-07-28 19:03:18.000000000 -0700 +++ 700-config_irqbal/arch/i386/kernel/io_apic.c 2003-07-29 14:32:27.000000000 -0700 @@ -272,7 +272,7 @@ static void set_ioapic_affinity (unsigne spin_unlock_irqrestore(&ioapic_lock, flags); } -#if defined(CONFIG_SMP) +#if defined(CONFIG_IRQBALANCE) # include /* kernel_thread() */ # include /* kstat */ # include /* kmalloc() */ @@ -667,8 +667,6 @@ static int __init irqbalance_disable(cha __setup("noirqbalance", irqbalance_disable); -static void set_ioapic_affinity (unsigned int irq, unsigned long mask); - static inline void move_irq(int irq) { /* note - we hold the desc->lock */ @@ -680,9 +678,11 @@ static inline void move_irq(int irq) __initcall(balanced_irq_init); -#else /* !SMP */ +#else /* !CONFIG_IRQBALANCE */ static inline void move_irq(int irq) { } +#endif /* CONFIG_IRQBALANCE */ +#ifndef CONFIG_SMP void send_IPI_self(int vector) { unsigned int cfg; @@ -697,7 +697,7 @@ void send_IPI_self(int vector) */ apic_write_around(APIC_ICR, cfg); } -#endif /* defined(CONFIG_SMP) */ +#endif /* !CONFIG_SMP */ /*