*** linux/arch/i386/kernel/io_apic.c.df	Mon May 20 22:07:36 2002
--- linux/arch/i386/kernel/io_apic.c	Tue May 21 18:41:54 2002
***************
*** 203,213 ****
  	unsigned int cpu;
  	unsigned long timestamp;
  } ____cacheline_aligned irq_balance_t;
  
  static irq_balance_t irq_balance[NR_IRQS] __cacheline_aligned
! 			= { [ 0 ... NR_IRQS-1 ] = { 1, 0 } };
  
  extern unsigned long irq_affinity [NR_IRQS];
  
  #endif
  
--- 203,213 ----
  	unsigned int cpu;
  	unsigned long timestamp;
  } ____cacheline_aligned irq_balance_t;
  
  static irq_balance_t irq_balance[NR_IRQS] __cacheline_aligned
! 			= { [ 0 ... NR_IRQS-1 ] = { 0, 0 } };
  
  extern unsigned long irq_affinity [NR_IRQS];
  
  #endif
  
***************
*** 220,248 ****
  static unsigned long move(int curr_cpu, unsigned long allowed_mask, unsigned long now, int direction)
  {
  	int search_idle = 1;
  	int cpu = curr_cpu;
  
! 	goto inside;
! 
! 	do {
! 		if (unlikely(cpu == curr_cpu))
! 			search_idle = 0;
! inside:
! 		if (direction == 1) {
! 			cpu++;
! 			if (cpu >= smp_num_cpus)
  				cpu = 0;
  		} else {
! 			cpu--;
! 			if (cpu == -1)
! 				cpu = smp_num_cpus-1;
  		}
! 	} while (!IRQ_ALLOWED(cpu,allowed_mask) ||
! 			(search_idle && !IDLE_ENOUGH(cpu,now)));
! 
! 	return cpu;
  }
  
  static inline void balance_irq(int irq)
  {
  #if CONFIG_SMP
--- 220,242 ----
  static unsigned long move(int curr_cpu, unsigned long allowed_mask, unsigned long now, int direction)
  {
  	int search_idle = 1;
  	int cpu = curr_cpu;
  
! 	for (;;) {
! 		if (direction) {
! 			if (++cpu >= smp_num_cpus)
  				cpu = 0;
  		} else {
! 			if (--cpu < 0)
! 				cpu = smp_num_cpus - 1;
  		}
! 		if (IRQ_ALLOWED(cpu, allowed_mask) && (!search_idle || IDLE_ENOUGH(cpu, now)))
! 			return cpu;
! 		if (unlikely(cpu == curr_cpu))
! 			search_idle = 0;
! 	}
  }
  
  static inline void balance_irq(int irq)
  {
  #if CONFIG_SMP