Merge branch 'x86/cpu' into x86/x2apic
Ingo Molnar [Sat, 23 Aug 2008 15:46:59 +0000 (17:46 +0200)]
12 files changed:
1  2 
arch/x86/Kconfig
arch/x86/kernel/apic_32.c
arch/x86/kernel/cpu/common_64.c
arch/x86/kernel/cpu/feature_names.c
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/io_apic_64.c
arch/x86/kernel/mpparse.c
arch/x86/kernel/setup.c
arch/x86/kernel/smpboot.c
arch/x86/kernel/vmi_32.c
include/asm-x86/cpufeature.h
include/asm-x86/hw_irq.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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)
  {
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge