summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/mpspec.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-11 10:49:40 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-11 10:49:40 +0100
commitd5b5a232b2f2b6e64762308e90d47248dddfd72f (patch)
tree968c0568b62d6eeeec22a2ca07f1be6de07c437d /arch/x86/include/asm/mpspec.h
parent0e81cb59c7120191c0243c686b591797bc79e5c6 (diff)
parentbf56957d176c279175464f385f3eb03d65819328 (diff)
downloadtalos-op-linux-d5b5a232b2f2b6e64762308e90d47248dddfd72f.tar.gz
talos-op-linux-d5b5a232b2f2b6e64762308e90d47248dddfd72f.zip
Merge branch 'x86/apic' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/apic
Diffstat (limited to 'arch/x86/include/asm/mpspec.h')
-rw-r--r--arch/x86/include/asm/mpspec.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index 8c5620147c40..5916c8df09d9 100644
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -77,6 +77,8 @@ extern int acpi_probe_gsi(void);
#ifdef CONFIG_X86_IO_APIC
extern int mp_config_acpi_gsi(unsigned char number, unsigned int devfn, u8 pin,
u32 gsi, int triggering, int polarity);
+extern int mp_find_ioapic(int gsi);
+extern int mp_find_ioapic_pin(int ioapic, int gsi);
#else
static inline int
mp_config_acpi_gsi(unsigned char number, unsigned int devfn, u8 pin,
OpenPOWER on IntegriCloud