aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2010-10-17 20:44:34 -0400
committerLen Brown <len.brown@intel.com>2010-10-17 22:55:38 -0400
commit81256669aaaa8b06a617f8d0613cb7fb24f8b910 (patch)
tree09d43991e5db00d7f3d47f56715971b0438261e7 /drivers/acpi
parent3989170f8e3c1bd71d8f7ec6e3d52e46815ee096 (diff)
ACPICA: Change type of _TZ from ThermalZone to Device
The type of ThermalZone was confusing hosts as they process the various ThermalZone objects. ACPICA BZ 876. http://www.acpica.org/bugzilla/show_bug.cgi?id=876 Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpica/utglobal.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index 45f63340ca5f..4a5dcaa268de 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -154,14 +154,16 @@ ACPI_EXPORT_SYMBOL(acpi_format_exception)
154 * 1) _SB_ is defined to be a device to allow \_SB_._INI to be run 154 * 1) _SB_ is defined to be a device to allow \_SB_._INI to be run
155 * during the initialization sequence. 155 * during the initialization sequence.
156 * 2) _TZ_ is defined to be a thermal zone in order to allow ASL code to 156 * 2) _TZ_ is defined to be a thermal zone in order to allow ASL code to
157 * perform a Notify() operation on it. 157 * perform a Notify() operation on it. 09/2010: Changed to type Device.
158 * This still allows notifies, but does not confuse host code that
159 * searches for valid thermal_zone objects.
158 */ 160 */
159const struct acpi_predefined_names acpi_gbl_pre_defined_names[] = { 161const struct acpi_predefined_names acpi_gbl_pre_defined_names[] = {
160 {"_GPE", ACPI_TYPE_LOCAL_SCOPE, NULL}, 162 {"_GPE", ACPI_TYPE_LOCAL_SCOPE, NULL},
161 {"_PR_", ACPI_TYPE_LOCAL_SCOPE, NULL}, 163 {"_PR_", ACPI_TYPE_LOCAL_SCOPE, NULL},
162 {"_SB_", ACPI_TYPE_DEVICE, NULL}, 164 {"_SB_", ACPI_TYPE_DEVICE, NULL},
163 {"_SI_", ACPI_TYPE_LOCAL_SCOPE, NULL}, 165 {"_SI_", ACPI_TYPE_LOCAL_SCOPE, NULL},
164 {"_TZ_", ACPI_TYPE_THERMAL, NULL}, 166 {"_TZ_", ACPI_TYPE_DEVICE, NULL},
165 {"_REV", ACPI_TYPE_INTEGER, (char *)ACPI_CA_SUPPORT_LEVEL}, 167 {"_REV", ACPI_TYPE_INTEGER, (char *)ACPI_CA_SUPPORT_LEVEL},
166 {"_OS_", ACPI_TYPE_STRING, ACPI_OS_NAME}, 168 {"_OS_", ACPI_TYPE_STRING, ACPI_OS_NAME},
167 {"_GL_", ACPI_TYPE_MUTEX, (char *)1}, 169 {"_GL_", ACPI_TYPE_MUTEX, (char *)1},