From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 9 Dec 2010 17:17:25 +0000 (+0100)
Subject: Merge branch 'x86/amd-nb' into x86/apic-cleanups
X-Git-Tag: v2.6.38-rc1~458^2~11
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=d834a9dcecae834cd6b2bc5e50e1907738d9cf6a

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>
---

d834a9dcecae834cd6b2bc5e50e1907738d9cf6a
diff --cc arch/x86/include/asm/io_apic.h
index d7d46cb53e52,a6b28d017c2f..107f2d8c6570
--- a/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;