Merge branch 'linus' into irq/numa
Ingo Molnar [Mon, 1 Jun 2009 19:06:21 +0000 (21:06 +0200)]
Conflicts:
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c

Merge reason: we gathered a few conflicts plus update to latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
Documentation/kernel-parameters.txt
arch/arm/common/gic.c
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c
arch/powerpc/sysdev/mpic.c
arch/x86/Kconfig
arch/x86/kernel/Makefile
arch/x86/kernel/apic/es7000_32.c
arch/x86/kernel/cpu/common.c
drivers/pci/intel-iommu.c

Simple merge
Simple merge
@@@ -153,10 -151,7 +151,9 @@@ static int bcm1480_set_affinity(unsigne
                        ____raw_writeq(cur_ints, IOADDR(A_BCM1480_IMR_MAPPER(cpu) + R_BCM1480_IMR_INTERRUPT_MASK_H + (k*BCM1480_IMR_HL_SPACING)));
                }
        }
-       spin_unlock(&bcm1480_imr_lock);
-       spin_unlock_irqrestore(&desc->lock, flags);
+       spin_unlock_irqrestore(&bcm1480_imr_lock, flags);
 +
 +      return 0;
  }
  #endif
  
@@@ -144,10 -142,7 +142,9 @@@ static int sb1250_set_affinity(unsigne
                ____raw_writeq(cur_ints, IOADDR(A_IMR_MAPPER(cpu) +
                                        R_IMR_INTERRUPT_MASK));
        }
-       spin_unlock(&sb1250_imr_lock);
-       spin_unlock_irqrestore(&desc->lock, flags);
+       spin_unlock_irqrestore(&sb1250_imr_lock, flags);
 +
 +      return 0;
  }
  #endif
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge