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/exoparg1.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/exoparg1.c')
-rw-r--r-- | drivers/acpi/acpica/exoparg1.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c index 9ba8c73cea16..bbf01e9bf057 100644 --- a/drivers/acpi/acpica/exoparg1.c +++ b/drivers/acpi/acpica/exoparg1.c | |||
@@ -1,4 +1,3 @@ | |||
1 | |||
2 | /****************************************************************************** | 1 | /****************************************************************************** |
3 | * | 2 | * |
4 | * Module Name: exoparg1 - AML execution - opcodes with 1 argument | 3 | * Module Name: exoparg1 - AML execution - opcodes with 1 argument |
@@ -606,7 +605,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) | |||
606 | } | 605 | } |
607 | 606 | ||
608 | /* | 607 | /* |
609 | * Set result to ONES (TRUE) if Value == 0. Note: | 608 | * Set result to ONES (TRUE) if Value == 0. Note: |
610 | * return_desc->Integer.Value is initially == 0 (FALSE) from above. | 609 | * return_desc->Integer.Value is initially == 0 (FALSE) from above. |
611 | */ | 610 | */ |
612 | if (!operand[0]->integer.value) { | 611 | if (!operand[0]->integer.value) { |
@@ -618,7 +617,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) | |||
618 | case AML_INCREMENT_OP: /* Increment (Operand) */ | 617 | case AML_INCREMENT_OP: /* Increment (Operand) */ |
619 | 618 | ||
620 | /* | 619 | /* |
621 | * Create a new integer. Can't just get the base integer and | 620 | * Create a new integer. Can't just get the base integer and |
622 | * increment it because it may be an Arg or Field. | 621 | * increment it because it may be an Arg or Field. |
623 | */ | 622 | */ |
624 | return_desc = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER); | 623 | return_desc = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER); |
@@ -686,7 +685,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) | |||
686 | 685 | ||
687 | /* | 686 | /* |
688 | * Note: The operand is not resolved at this point because we want to | 687 | * Note: The operand is not resolved at this point because we want to |
689 | * get the associated object, not its value. For example, we don't | 688 | * get the associated object, not its value. For example, we don't |
690 | * want to resolve a field_unit to its value, we want the actual | 689 | * want to resolve a field_unit to its value, we want the actual |
691 | * field_unit object. | 690 | * field_unit object. |
692 | */ | 691 | */ |
@@ -727,7 +726,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) | |||
727 | 726 | ||
728 | /* | 727 | /* |
729 | * The type of the base object must be integer, buffer, string, or | 728 | * The type of the base object must be integer, buffer, string, or |
730 | * package. All others are not supported. | 729 | * package. All others are not supported. |
731 | * | 730 | * |
732 | * NOTE: Integer is not specifically supported by the ACPI spec, | 731 | * NOTE: Integer is not specifically supported by the ACPI spec, |
733 | * but is supported implicitly via implicit operand conversion. | 732 | * but is supported implicitly via implicit operand conversion. |
@@ -965,7 +964,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) | |||
965 | case ACPI_TYPE_PACKAGE: | 964 | case ACPI_TYPE_PACKAGE: |
966 | 965 | ||
967 | /* | 966 | /* |
968 | * Return the referenced element of the package. We must | 967 | * Return the referenced element of the package. We must |
969 | * add another reference to the referenced object, however. | 968 | * add another reference to the referenced object, however. |
970 | */ | 969 | */ |
971 | return_desc = | 970 | return_desc = |