Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'acpi-5.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki:
"These fix two regressions, one related to ACPI power resources
management and one that broke ACPI tools compilation.
Specifics:
- Stop turning off unused ACPI power resources in an unknown state to
address a regression introduced during the 5.14 cycle (Rafael
Wysocki).
- Fix an ACPI tools build issue introduced recently when the minimal
stdarg.h was added (Miguel Bernal Marin)"
* tag 'acpi-5.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: PM: Do not turn off power resources in unknown state
ACPI: tools: fix compilation error
+8
-8
+1
-6
drivers/acpi/power.c
+1
-6
drivers/acpi/power.c
···
1035
1035
list_for_each_entry_reverse(resource, &acpi_power_resource_list, list_node) {
1036
1036
mutex_lock(&resource->resource_lock);
1037
1037
1038
-
/*
1039
-
* Turn off power resources in an unknown state too, because the
1040
-
* platform firmware on some system expects the OS to turn off
1041
-
* power resources without any users unconditionally.
1042
-
*/
1043
1038
if (!resource->ref_count &&
1044
-
resource->state != ACPI_POWER_RESOURCE_STATE_OFF) {
1039
+
resource->state == ACPI_POWER_RESOURCE_STATE_ON) {
1045
1040
acpi_handle_debug(resource->device.handle, "Turning OFF\n");
1046
1041
__acpi_power_off(resource);
1047
1042
}
+7
-2
include/acpi/platform/acgcc.h
+7
-2
include/acpi/platform/acgcc.h
···
22
22
#define va_arg(v, l) __builtin_va_arg(v, l)
23
23
#define va_copy(d, s) __builtin_va_copy(d, s)
24
24
#else
25
+
#ifdef __KERNEL__
25
26
#include <linux/stdarg.h>
26
-
#endif
27
-
#endif
27
+
#else
28
+
/* Used to build acpi tools */
29
+
#include <stdarg.h>
30
+
#endif /* __KERNEL__ */
31
+
#endif /* ACPI_USE_BUILTIN_STDARG */
32
+
#endif /* ! va_arg */
28
33
29
34
#define ACPI_INLINE __inline__
30
35