aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorToshi Kani <toshi.kani@hp.com>2013-11-20 14:25:34 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-04 10:57:04 -0800
commit1ba9563629aced9bd4471cd088fbffe11910e6f2 (patch)
treeba1a7a19b8b4ef705922e1b617468fb6af8b9e47 /include
parentcad6526a7a12079819b73c63cefdff076858830e (diff)
ACPI / hotplug: Fix conflicted PCI bridge notify handlers
commit ca499fc87ed945094d952da0eb7eea7dbeb1feec upstream. The PCI host bridge scan handler installs its own notify handler, handle_hotplug_event_root(), by itself. Nevertheless, the ACPI hotplug framework also installs the common notify handler, acpi_hotplug_notify_cb(), for PCI root bridges. This causes acpi_hotplug_notify_cb() to call _OST method with unsupported error as hotplug.enabled is not set. To address this issue, introduce hotplug.ignore flag, which indicates that the scan handler installs its own notify handler by itself. The ACPI hotplug framework does not install the common notify handler when this flag is set. Signed-off-by: Toshi Kani <toshi.kani@hp.com> [rjw: Changed the name of the new flag] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/acpi/acpi_bus.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index f45b2a7800c..6b66efdcd19 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -97,6 +97,7 @@ enum acpi_hotplug_mode {
struct acpi_hotplug_profile {
struct kobject kobj;
bool enabled:1;
+ bool ignore:1;
enum acpi_hotplug_mode mode;
};