tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'acpi-4.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fixes from Rafael Wysocki:
"Two ACPI fixes for 4.9-rc7.

One of them reverts a recent ACPI commit that attempted to improve
reboot/power-off on some systems, but introduced problems elsewhere,
and the other one fixes kernel builds with the new WDAT watchdog
driver enabled in some configurations.

Specifics:

- Revert the recent commit that caused the ACPI _PTS method to be
executed in the power-off/reboot code path (as per the
specification) in an attempt to improve things on some systems
(apparently expecting _PTS to be executed in that code path), but
broke power-off/reboot on at least one other machine (Rafael
Wysocki).

- Fix kernel builds with the new WDAT watchdog driver enabled in some
configurations by explicitly selecting WATCHDOG_CORE when enabling
the WDAT watchdog driver (Mika Westerberg)"

* tag 'acpi-4.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
watchdog: wdat_wdt: Select WATCHDOG_CORE
Revert "ACPI: Execute _PTS before system reboot"

Linus Torvalds beb53e4b 68656443

+7 -23
+6 -23
drivers/acpi/sleep.c
··· 47 47 } 48 48 } 49 49 50 - static void acpi_sleep_pts_switch(u32 acpi_state) 51 - { 52 - acpi_status status; 53 - 54 - status = acpi_execute_simple_method(NULL, "\\_PTS", acpi_state); 55 - if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) { 56 - /* 57 - * OS can't evaluate the _PTS object correctly. Some warning 58 - * message will be printed. But it won't break anything. 59 - */ 60 - printk(KERN_NOTICE "Failure in evaluating _PTS object\n"); 61 - } 62 - } 63 - 64 - static int sleep_notify_reboot(struct notifier_block *this, 50 + static int tts_notify_reboot(struct notifier_block *this, 65 51 unsigned long code, void *x) 66 52 { 67 53 acpi_sleep_tts_switch(ACPI_STATE_S5); 68 - 69 - acpi_sleep_pts_switch(ACPI_STATE_S5); 70 - 71 54 return NOTIFY_DONE; 72 55 } 73 56 74 - static struct notifier_block sleep_notifier = { 75 - .notifier_call = sleep_notify_reboot, 57 + static struct notifier_block tts_notifier = { 58 + .notifier_call = tts_notify_reboot, 76 59 .next = NULL, 77 60 .priority = 0, 78 61 }; ··· 899 916 pr_info(PREFIX "(supports%s)\n", supported); 900 917 901 918 /* 902 - * Register the sleep_notifier to reboot notifier list so that the _TTS 903 - * and _PTS object can also be evaluated when the system enters S5. 919 + * Register the tts_notifier to reboot notifier list so that the _TTS 920 + * object can also be evaluated when the system enters S5. 904 921 */ 905 - register_reboot_notifier(&sleep_notifier); 922 + register_reboot_notifier(&tts_notifier); 906 923 return 0; 907 924 }
+1
drivers/watchdog/Kconfig
··· 155 155 config WDAT_WDT 156 156 tristate "ACPI Watchdog Action Table (WDAT)" 157 157 depends on ACPI 158 + select WATCHDOG_CORE 158 159 select ACPI_WATCHDOG 159 160 help 160 161 This driver adds support for systems with ACPI Watchdog Action