Merge branch 'linus' into x86/core

Conflicts:
	arch/x86/kernel/genapic_64.c
	include/asm-x86/kvm_host.h

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

diff --cc arch/x86/Kconfig
Simple merge

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

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

diff --cc arch/x86/kernel/io_apic_64.c
index b9950dae59b7f7ddc961c3d36669ae50af33eaf2,61a83b70c18fcc65ce60b965ee3a6e0456622dc4..e63282e788640402828dc17cf641a9a8c71c003a
--- 1/arch/x86/kernel/io_apic_64.c
--- 2/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@@ -898,18 -838,7 +911,10 @@@ void __setup_vector_irq(int cpu
        }
  }
  
- void setup_vector_irq(int cpu)
- {
-       spin_lock(&vector_lock);
-       __setup_vector_irq(smp_processor_id());
-       spin_unlock(&vector_lock);
- }
- 
- 
  static struct irq_chip ioapic_chip;
 +#ifdef CONFIG_INTR_REMAP
 +static struct irq_chip ir_ioapic_chip;
 +#endif
  
  static void ioapic_register_intr(int irq, unsigned long trigger)
  {

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

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

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

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

diff --cc include/asm-x86/efi.h
Simple merge

diff --cc include/asm-x86/hw_irq.h
Simple merge

diff --cc include/asm-x86/i387.h
Simple merge

diff --cc include/asm-x86/iommu.h
Simple merge

diff --cc include/asm-x86/irq_vectors.h
Simple merge

diff --cc include/asm-x86/kvm_host.h
index 95eb742765b3890c82a5aca369773523c9749815,0f3c531146142df89075e4623c36377510c7489e..72e9a525f91a64ca5318df5e794c082135a27201
--- 1/include/asm-x86/kvm_host.h
--- 2/include/asm-x86/kvm_host.h
+++ b/include/asm-x86/kvm_host.h
@@@ -729,4 -731,8 +731,8 @@@ asmlinkage void kvm_handle_fault_on_reb
        KVM_EX_ENTRY " 666b, 667b \n\t" \
        ".popsection"
  
 -#endif
+ #define KVM_ARCH_WANT_MMU_NOTIFIER
+ int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);
+ int kvm_age_hva(struct kvm *kvm, unsigned long hva);
+ 
 +#endif /* ASM_X86__KVM_HOST_H */

diff --cc kernel/irq/manage.c
Simple merge