aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/acpi
diff options
context:
space:
mode:
authorJiang Liu <jiang.liu@linux.intel.com>2014-06-09 04:19:32 -0400
committerThomas Gleixner <tglx@linutronix.de>2014-06-21 17:05:40 -0400
commita491cc902ca495365e9cd45154b60d8c702d86da (patch)
tree44d11422fd50ba2fea564c0e53e3b3ec781055d7 /arch/x86/kernel/acpi
parentb1bfd5ea451b60a4725907c282dec232c63f68bb (diff)
x86, mpparse: Simplify arch/x86/include/asm/mpspec.h
Simplify arch/x86/include/asm/mpspec.h by 1) Change max_physical_apicid to static as it's only used in apic.c. 2) Kill declaration of mpc_default_type, it's never defined. 3) Delete default_acpi_madt_oem_check(), it has already been declared in apic.h. 4) Make default_acpi_madt_oem_check() depends on CONFIG_X86_LOCAL_APIC instead of CONFIG_X86_64 to support i386. 5) Change mp_override_legacy_irq(), mp_config_acpi_legacy_irqs() and mp_register_gsi() as static because they are only used in acpi/boot.c. Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> Acked-by: David Rientjes <rientjes@google.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Joerg Roedel <joro@8bytes.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: H. Peter Anvin <hpa@linux.intel.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Grant Likely <grant.likely@linaro.org> Cc: Rafael J. Wysocki <rjw@rjwysocki.net> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Len Brown <len.brown@intel.com> Cc: Pavel Machek <pavel@ucw.cz> Cc: Seiji Aguchi <seiji.aguchi@hds.com> Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Richard Weinberger <richard@nod.at> Cc: Andi Kleen <ak@linux.intel.com> Link: http://lkml.kernel.org/r/1402302011-23642-4-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/acpi')
-rw-r--r--arch/x86/kernel/acpi/boot.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 86281ffb96d6..b41b47021f53 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -345,6 +345,10 @@ acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long e
345#endif /*CONFIG_X86_LOCAL_APIC */ 345#endif /*CONFIG_X86_LOCAL_APIC */
346 346
347#ifdef CONFIG_X86_IO_APIC 347#ifdef CONFIG_X86_IO_APIC
348static void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,
349 u32 gsi);
350static int mp_register_gsi(struct device *dev, u32 gsi, int trigger,
351 int polarity);
348 352
349static int __init 353static int __init
350acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end) 354acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end)
@@ -903,7 +907,8 @@ static int __init acpi_parse_madt_lapic_entries(void)
903#ifdef CONFIG_X86_IO_APIC 907#ifdef CONFIG_X86_IO_APIC
904#define MP_ISA_BUS 0 908#define MP_ISA_BUS 0
905 909
906void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi) 910static void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,
911 u32 gsi)
907{ 912{
908 int ioapic; 913 int ioapic;
909 int pin; 914 int pin;
@@ -938,7 +943,7 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi)
938 isa_irq_to_gsi[bus_irq] = gsi; 943 isa_irq_to_gsi[bus_irq] = gsi;
939} 944}
940 945
941void __init mp_config_acpi_legacy_irqs(void) 946static void __init mp_config_acpi_legacy_irqs(void)
942{ 947{
943 int i; 948 int i;
944 struct mpc_intsrc mp_irq; 949 struct mpc_intsrc mp_irq;
@@ -1040,7 +1045,8 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger,
1040 return 0; 1045 return 0;
1041} 1046}
1042 1047
1043int mp_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) 1048static int mp_register_gsi(struct device *dev, u32 gsi, int trigger,
1049 int polarity)
1044{ 1050{
1045 int ioapic; 1051 int ioapic;
1046 int ioapic_pin; 1052 int ioapic_pin;