Merge branch 'x86/cpu' into x86/x2apic

diff --cc arch/x86/Kconfig
Simple merge

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

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

diff --cc arch/x86/kernel/cpu/feature_names.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/cpufeature.h
Simple merge

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