GitLab will be down for maintenance this Sunday 13th June, from approx 7-11am UTC. This is for a PostgreSQL migration. See the tracker issue for more informations.

Commit f1bdb523 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86, irq: don't call mp_config_acpi_gsi() if update_mptable is not enabled

Len expressed concern that the update_mptable feature has
side-effects on the ACPI code.

Make it sure explicitly that the code only ever gets called if
the (default disabled) update_mptable boot quirk option is

[ Impact: isolate the update_mptable feature from ACPI code more ]
Signed-off-by: default avatarYinghai Lu <>
Cc: Len Brown <>
LKML-Reference: <>
Signed-off-by: default avatarIngo Molnar <>
parent 629e15d2
...@@ -87,6 +87,15 @@ static inline int acpi_probe_gsi(void) ...@@ -87,6 +87,15 @@ static inline int acpi_probe_gsi(void)
} }
#endif /* CONFIG_ACPI */ #endif /* CONFIG_ACPI */
extern int enable_update_mptable;
static inline int enable_update_mptable(void)
return 0;
struct physid_mask { struct physid_mask {
...@@ -1226,6 +1226,8 @@ int mp_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) ...@@ -1226,6 +1226,8 @@ int mp_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity)
ioapic_pin); ioapic_pin);
return gsi; return gsi;
} }
if (enable_update_mptable)
mp_config_acpi_gsi(dev, gsi, trigger, polarity); mp_config_acpi_gsi(dev, gsi, trigger, polarity);
set_io_apic_irq_attr(&irq_attr, ioapic, ioapic_pin, set_io_apic_irq_attr(&irq_attr, ioapic, ioapic_pin,
...@@ -957,7 +957,7 @@ static int __init replace_intsrc_all(struct mpc_table *mpc, ...@@ -957,7 +957,7 @@ static int __init replace_intsrc_all(struct mpc_table *mpc,
return 0; return 0;
} }
static int __initdata enable_update_mptable; int enable_update_mptable;
static int __init update_mptable_setup(char *str) static int __init update_mptable_setup(char *str)
{ {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment