From 139b4a2c6b3af6858d25d7d2c18a6f87499324a9 Mon Sep 17 00:00:00 2001 From: Bob Moore Date: Mon, 18 Oct 2010 08:44:34 +0800 Subject: [PATCH] --- yaml --- r: 217649 b: refs/heads/master c: 81256669aaaa8b06a617f8d0613cb7fb24f8b910 h: refs/heads/master i: 217647: 277805c971d0ace6883a9024c040f0b754710570 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpica/utglobal.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d38f4137f124..6f1a650d2160 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3989170f8e3c1bd71d8f7ec6e3d52e46815ee096 +refs/heads/master: 81256669aaaa8b06a617f8d0613cb7fb24f8b910 diff --git a/trunk/drivers/acpi/acpica/utglobal.c b/trunk/drivers/acpi/acpica/utglobal.c index 45f63340ca5f..4a5dcaa268de 100644 --- a/trunk/drivers/acpi/acpica/utglobal.c +++ b/trunk/drivers/acpi/acpica/utglobal.c @@ -154,14 +154,16 @@ ACPI_EXPORT_SYMBOL(acpi_format_exception) * 1) _SB_ is defined to be a device to allow \_SB_._INI to be run * during the initialization sequence. * 2) _TZ_ is defined to be a thermal zone in order to allow ASL code to - * perform a Notify() operation on it. + * perform a Notify() operation on it. 09/2010: Changed to type Device. + * This still allows notifies, but does not confuse host code that + * searches for valid thermal_zone objects. */ const struct acpi_predefined_names acpi_gbl_pre_defined_names[] = { {"_GPE", ACPI_TYPE_LOCAL_SCOPE, NULL}, {"_PR_", ACPI_TYPE_LOCAL_SCOPE, NULL}, {"_SB_", ACPI_TYPE_DEVICE, NULL}, {"_SI_", ACPI_TYPE_LOCAL_SCOPE, NULL}, - {"_TZ_", ACPI_TYPE_THERMAL, NULL}, + {"_TZ_", ACPI_TYPE_DEVICE, NULL}, {"_REV", ACPI_TYPE_INTEGER, (char *)ACPI_CA_SUPPORT_LEVEL}, {"_OS_", ACPI_TYPE_STRING, ACPI_OS_NAME}, {"_GL_", ACPI_TYPE_MUTEX, (char *)1},