From: Andrew Morton - Move a bunch of not-needed-if-not-balancing things inside CONFIG_IRQBALANCE. - inlines are nicer. Cc: Zhang Yanmin Signed-off-by: Andrew Morton --- arch/i386/kernel/io_apic.c | 20 +++++++++----------- include/linux/irq.h | 4 +++- 2 files changed, 12 insertions(+), 12 deletions(-) diff -puN arch/i386/kernel/io_apic.c~x86-kernel-irq-balancer-fix-tidy arch/i386/kernel/io_apic.c --- devel/arch/i386/kernel/io_apic.c~x86-kernel-irq-balancer-fix-tidy 2006-05-19 16:06:30.000000000 -0700 +++ devel-akpm/arch/i386/kernel/io_apic.c 2006-05-19 16:07:45.000000000 -0700 @@ -270,7 +270,7 @@ static void set_ioapic_affinity_irq(unsi # include /* kmalloc() */ # include /* time_after() */ -# ifdef CONFIG_BALANCED_IRQ_DEBUG +#ifdef CONFIG_BALANCED_IRQ_DEBUG # define TDprintk(x...) do { printk("<%ld:%s:%d>: ", jiffies, __FILE__, __LINE__); printk(x); } while (0) # define Dprintk(x...) do { TDprintk(x); } while (0) # else @@ -278,10 +278,15 @@ static void set_ioapic_affinity_irq(unsi # define Dprintk(x...) # endif - #define IRQBALANCE_CHECK_ARCH -999 -static int irqbalance_disabled = IRQBALANCE_CHECK_ARCH; -static int physical_balance = 0; +#define MAX_BALANCED_IRQ_INTERVAL (5*HZ) +#define MIN_BALANCED_IRQ_INTERVAL (HZ/2) +#define BALANCED_IRQ_MORE_DELTA (HZ/10) +#define BALANCED_IRQ_LESS_DELTA (HZ) + +static int irqbalance_disabled __read_mostly = IRQBALANCE_CHECK_ARCH; +static int physical_balance __read_mostly; +static long balanced_irq_interval __read_mostly = MAX_BALANCED_IRQ_INTERVAL; static struct irq_cpu_info { unsigned long * last_irq; @@ -300,13 +305,6 @@ static struct irq_cpu_info { #define CPU_TO_PACKAGEINDEX(i) (first_cpu(cpu_sibling_map[i])) -#define MAX_BALANCED_IRQ_INTERVAL (5*HZ) -#define MIN_BALANCED_IRQ_INTERVAL (HZ/2) -#define BALANCED_IRQ_MORE_DELTA (HZ/10) -#define BALANCED_IRQ_LESS_DELTA (HZ) - -static long balanced_irq_interval = MAX_BALANCED_IRQ_INTERVAL; - static cpumask_t balance_irq_affinity[NR_IRQS] = { [0 ... NR_IRQS-1] = CPU_MASK_ALL }; diff -puN include/linux/irq.h~x86-kernel-irq-balancer-fix-tidy include/linux/irq.h --- devel/include/linux/irq.h~x86-kernel-irq-balancer-fix-tidy 2006-05-19 16:06:30.000000000 -0700 +++ devel-akpm/include/linux/irq.h 2006-05-19 16:06:30.000000000 -0700 @@ -167,7 +167,9 @@ static inline void set_irq_info(int irq, #ifdef CONFIG_IRQBALANCE extern void set_balance_irq_affinity(unsigned int irq, cpumask_t mask); #else -#define set_balance_irq_affinity(irq, mask) +static inline void set_balance_irq_affinity(unsigned int irq, cpumask_t mask) +{ +} #endif extern int no_irq_affinity; _