diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-01 19:52:10 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-01 19:52:10 -0500 |
| commit | 1826907c1f591f820748d33ac77736fe42d18a08 (patch) | |
| tree | e053d95435f665cd9373f6aa08c345427521eda3 /drivers/acpi/bus.c | |
| parent | 4e19fd9395f92e0fa250595d2da06d2c427c15f5 (diff) | |
| parent | 8fbd4ade93dc67f035914cd4030f1c58797d9e59 (diff) | |
| download | op-kernel-dev-1826907c1f591f820748d33ac77736fe42d18a08.zip op-kernel-dev-1826907c1f591f820748d33ac77736fe42d18a08.tar.gz | |
Merge tag 'pm+acpi-4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management and ACPI fix from Rafael J. Wysocki:
"Just one fix for a nasty boot failure on some systems based on Intel
Skylake that shipped with broken firmware where enabling
hardware-coordinated P-states management (HWP) causes a faulty
interrupt handler in SMM to be invoked and crash the system (Srinivas
Pandruvada)"
* tag 'pm+acpi-4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / processor: Request native thermal interrupt handling via _OSC
Diffstat (limited to 'drivers/acpi/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 0e85678..c068c82 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -1019,6 +1019,9 @@ static int __init acpi_bus_init(void) goto error1; } + /* Set capability bits for _OSC under processor scope */ + acpi_early_processor_osc(); + /* * _OSC method may exist in module level code, * so it must be run after ACPI_FULL_INITIALIZATION |
