diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 15:45:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 15:45:35 -0500 |
commit | bad73c5aa069f1f14cc07ce7bbae8d463635560c (patch) | |
tree | db905bb3400e6fe70be95cd20158bed79b2b2c6c /drivers/acpi/acpica/exresnte.c | |
parent | b58ed041a360ed051fab17e4d9b0f451c6fedba7 (diff) | |
parent | f316fc56555a5c3bcf6350f3d5ac26dd2c55f4cb (diff) |
Merge tag 'pm+acpi-for-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI and power management updates from Rafael Wysocki:
- Introduction of device PM QoS flags.
- ACPI device power management update allowing subsystems other than
PCI to use it more easily.
- ACPI device enumeration rework allowing additional kinds of devices
to be enumerated via ACPI. From Mika Westerberg, Adrian Hunter,
Mathias Nyman, Andy Shevchenko, and Rafael J. Wysocki.
- ACPICA update to version 20121018 from Bob Moore and Lv Zheng.
- ACPI memory hotplug update from Wen Congyang and Yasuaki Ishimatsu.
- Introduction of acpi_handle_<level>() messaging macros and ACPI-based
CPU hot-remove support from Toshi Kani.
- ACPI EC updates from Feng Tang.
- cpufreq updates from Viresh Kumar, Fabio Baltieri and others.
- cpuidle changes to quickly notice governor prediction failure from
Youquan Song.
- Support for using multiple cpuidle drivers at the same time and
cpuidle cleanups from Daniel Lezcano.
- devfreq updates from Nishanth Menon and others.
- cpupower update from Thomas Renninger.
- Fixes and small cleanups all over the place.
* tag 'pm+acpi-for-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (196 commits)
mmc: sdhci-acpi: enable runtime-pm for device HID INT33C6
ACPI: add Haswell LPSS devices to acpi_platform_device_ids list
ACPI: add documentation about ACPI 5 enumeration
pnpacpi: fix incorrect TEST_ALPHA() test
ACPI / PM: Fix header of acpi_dev_pm_detach() in acpi.h
ACPI / video: ignore BIOS initial backlight value for HP Folio 13-2000
ACPI : do not use Lid and Sleep button for S5 wakeup
ACPI / PNP: Do not crash due to stale pointer use during system resume
ACPI / video: Add "Asus UL30VT" to ACPI video detect blacklist
ACPI: do acpisleep dmi check when CONFIG_ACPI_SLEEP is set
spi / ACPI: add ACPI enumeration support
gpio / ACPI: add ACPI support
PM / devfreq: remove compiler error with module governors (2)
cpupower: IvyBridge (0x3a and 0x3e models) support
cpupower: Provide -c param for cpupower monitor to schedule process on all cores
cpupower tools: Fix warning and a bug with the cpu package count
cpupower tools: Fix malloc of cpu_info structure
cpupower tools: Fix issues with sysfs_topology_read_file
cpupower tools: Fix minor warnings
cpupower tools: Update .gitignore for files created in the debug directories
...
Diffstat (limited to 'drivers/acpi/acpica/exresnte.c')
-rw-r--r-- | drivers/acpi/acpica/exresnte.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/exresnte.c b/drivers/acpi/acpica/exresnte.c index fa50e77e64a8..6239956786eb 100644 --- a/drivers/acpi/acpica/exresnte.c +++ b/drivers/acpi/acpica/exresnte.c | |||
@@ -1,4 +1,3 @@ | |||
1 | |||
2 | /****************************************************************************** | 1 | /****************************************************************************** |
3 | * | 2 | * |
4 | * Module Name: exresnte - AML Interpreter object resolution | 3 | * Module Name: exresnte - AML Interpreter object resolution |
@@ -58,8 +57,8 @@ ACPI_MODULE_NAME("exresnte") | |||
58 | * PARAMETERS: object_ptr - Pointer to a location that contains | 57 | * PARAMETERS: object_ptr - Pointer to a location that contains |
59 | * a pointer to a NS node, and will receive a | 58 | * a pointer to a NS node, and will receive a |
60 | * pointer to the resolved object. | 59 | * pointer to the resolved object. |
61 | * walk_state - Current state. Valid only if executing AML | 60 | * walk_state - Current state. Valid only if executing AML |
62 | * code. NULL if simply resolving an object | 61 | * code. NULL if simply resolving an object |
63 | * | 62 | * |
64 | * RETURN: Status | 63 | * RETURN: Status |
65 | * | 64 | * |
@@ -67,7 +66,7 @@ ACPI_MODULE_NAME("exresnte") | |||
67 | * | 66 | * |
68 | * Note: for some of the data types, the pointer attached to the Node | 67 | * Note: for some of the data types, the pointer attached to the Node |
69 | * can be either a pointer to an actual internal object or a pointer into the | 68 | * can be either a pointer to an actual internal object or a pointer into the |
70 | * AML stream itself. These types are currently: | 69 | * AML stream itself. These types are currently: |
71 | * | 70 | * |
72 | * ACPI_TYPE_INTEGER | 71 | * ACPI_TYPE_INTEGER |
73 | * ACPI_TYPE_STRING | 72 | * ACPI_TYPE_STRING |
@@ -89,7 +88,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr, | |||
89 | ACPI_FUNCTION_TRACE(ex_resolve_node_to_value); | 88 | ACPI_FUNCTION_TRACE(ex_resolve_node_to_value); |
90 | 89 | ||
91 | /* | 90 | /* |
92 | * The stack pointer points to a struct acpi_namespace_node (Node). Get the | 91 | * The stack pointer points to a struct acpi_namespace_node (Node). Get the |
93 | * object that is attached to the Node. | 92 | * object that is attached to the Node. |
94 | */ | 93 | */ |
95 | node = *object_ptr; | 94 | node = *object_ptr; |