Merge branch 'linus' into x86/apic

Conflicts:
	arch/x86/kernel/acpi/boot.c
	arch/x86/mm/fault.c

diff --cc arch/arm/kernel/irq.c
index 4bb723eadad13c73dc5da7ba61ef2e2367fbc9ba,363db186cb93334791588db5b2158e6f295c5c54..45eacb5a2ecd80fb7a30dc56d6f3386f1c842f19
--- 1/arch/arm/kernel/irq.c
--- 2/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@@ -101,14 -101,9 +101,14 @@@ unlock
  /* Handle bad interrupts */
  static struct irq_desc bad_irq_desc = {
        .handle_irq = handle_bad_irq,
-       .lock = SPIN_LOCK_UNLOCKED
+       .lock = __SPIN_LOCK_UNLOCKED(bad_irq_desc.lock),
  };
  
 +#ifdef CONFIG_CPUMASK_OFFSTACK
 +/* We are not allocating bad_irq_desc.affinity or .pending_mask */
 +#error "ARM architecture does not support CONFIG_CPUMASK_OFFSTACK."
 +#endif
 +
  /*
   * do_IRQ handles all hardware IRQ's.  Decoded IRQs should not
   * come via this function.  Instead, they should provide their

diff --cc arch/blackfin/kernel/irqchip.c
Simple merge

diff --cc arch/sparc/kernel/irq_64.c
Simple merge

diff --cc arch/x86/ia32/ia32entry.S
Simple merge

diff --cc arch/x86/include/asm/paravirt.h
Simple merge

diff --cc arch/x86/include/asm/processor.h
Simple merge

diff --cc arch/x86/include/asm/spinlock.h
Simple merge

diff --cc arch/x86/kernel/acpi/sleep.c
Simple merge

diff --cc arch/x86/kernel/cpu/intel.c
Simple merge

diff --cc arch/x86/kernel/process.c
Simple merge

diff --cc arch/x86/kernel/traps.c
Simple merge

diff --cc arch/x86/kernel/vmi_32.c
Simple merge

diff --cc arch/x86/mm/fault.c
index d3eee74f830ad71bbc2fdad868e9f3549a581d96,c76ef1d701c9f48625aed06d4e7b4ec3d98e8862..2a9ea3aee4935b801f1405550592988eefc59236
--- 1/arch/x86/mm/fault.c
--- 2/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@@ -806,8 -601,8 +806,6 @@@ void __kprobes do_page_fault(struct pt_
        /* get the address */
        address = read_cr2();
  
-       if (unlikely(notify_page_fault(regs)))
-               return;
 -      si_code = SEGV_MAPERR;
 -
        if (unlikely(kmmio_fault(regs, address)))
                return;
  
@@@ -834,17 -629,23 +832,22 @@@
                        return;
  
                /* Can handle a stale RO->RW TLB */
 -              if (spurious_fault(address, error_code))
 +              if (spurious_fault(error_code, address))
                        return;
  
+               /* kprobes don't want to hook the spurious faults. */
+               if (notify_page_fault(regs))
+                       return;
                /*
                 * Don't take the mm semaphore here. If we fixup a prefetch
                 * fault we could otherwise deadlock.
                 */
 -              goto bad_area_nosemaphore;
 +              bad_area_nosemaphore(regs, error_code, address);
 +              return;
        }
  
 -      /* kprobes don't want to hook the spurious faults. */
 -      if (notify_page_fault(regs))
++      if (unlikely(notify_page_fault(regs)))
+               return;
 -
        /*
         * It's safe to allow irq's after cr2 has been saved and the
         * vmalloc fault has been handled.

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/sched.c
Simple merge