Merge branch 'x86/amd-nb' into x86/apic-cleanups

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>

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

diff --cc arch/x86/include/asm/io_apic.h
index d7d46cb53e5288940a9e6c26feed06cc1ca21a5d,a6b28d017c2fb9aae9e5f5d2bae03db4dcadbd43..107f2d8c65707fc50f61a1b3838898058c987365
--- 1/arch/x86/include/asm/io_apic.h
--- 2/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@@ -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;

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

diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge

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