Merge branch 'x86/amd-nb' into x86/apic-cleanups
authorThomas Gleixner <tglx@linutronix.de>
Thu, 9 Dec 2010 17:17:25 +0000 (18:17 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 9 Dec 2010 17:17:25 +0000 (18:17 +0100)
Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform

Conflicts:
arch/x86/include/asm/io_apic.h

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
1  2 
arch/x86/include/asm/apic.h
arch/x86/include/asm/io_apic.h
arch/x86/kernel/apic/apic.c
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/setup.c

Simple merge
@@@ -168,8 -168,10 +168,10 @@@ extern int save_IO_APIC_setup(struct IO
  extern void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
  extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
  
 -extern void probe_nr_irqs_gsi(void);
+ extern int get_nr_irqs_gsi(void);
  extern void setup_ioapic_ids_from_mpc(void);
 +extern void setup_ioapic_ids_from_mpc_nocheck(void);
  
  struct mp_ioapic_gsi{
        u32 gsi_base;
Simple merge
Simple merge
Simple merge