diff options
author | Toshi Kani <toshi.kani@hp.com> | 2013-11-20 14:25:34 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-20 14:25:34 +0100 |
commit | ca499fc87ed945094d952da0eb7eea7dbeb1feec (patch) | |
tree | 2bc0d81c4c782077abeef722a82ff081484c2f90 /include/acpi | |
parent | 296e5809ee567e41d55da41a882abef9d8071e5e (diff) | |
download | linux-stable-ca499fc87ed945094d952da0eb7eea7dbeb1feec.tar.gz linux-stable-ca499fc87ed945094d952da0eb7eea7dbeb1feec.tar.bz2 linux-stable-ca499fc87ed945094d952da0eb7eea7dbeb1feec.zip |
ACPI / hotplug: Fix conflicted PCI bridge notify handlers
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]
Cc: 3.9+ <stable@vger.kernel.org> # 3.9+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acpi_bus.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index d64a3010332f..5f4bb4501305 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -100,6 +100,7 @@ enum acpi_hotplug_mode { struct acpi_hotplug_profile { struct kobject kobj; bool enabled:1; + bool ignore:1; enum acpi_hotplug_mode mode; }; |