ACPI: Disambiguate processor declaration type
authorMyron Stowe <myron.stowe@hp.com>
Tue, 4 Nov 2008 21:52:55 +0000 (14:52 -0700)
committerLen Brown <len.brown@intel.com>
Fri, 7 Nov 2008 01:11:15 +0000 (20:11 -0500)
Declaring processors in ACPI namespace can be done using either a
"Processor" definition or a "Device" definition (see section 8.4 -
Declaring Processors; "Advanced Configuration and Power Interface
Specification", Revision 3.0b).  Currently the two processor
declaration types are conflated.

This patch disambiguates the processor declaration's definition type
enabling subsequent code to behave uniquely based explicitly on the
declaration's type.

Signed-off-by: Myron Stowe <myron.stowe@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/processor_core.c
drivers/acpi/scan.c
include/acpi/acpi_drivers.h

index 24a362f8034c49a722005efec417714560b5b9cf..0c670dd297d7c39f11d35f112a6f14884f9ddfc9 100644 (file)
@@ -89,6 +89,7 @@ static int acpi_processor_handle_eject(struct acpi_processor *pr);
 
 
 static const struct acpi_device_id processor_device_ids[] = {
+       {ACPI_PROCESSOR_OBJECT_HID, 0},
        {ACPI_PROCESSOR_HID, 0},
        {"", 0},
 };
index a9dda8e0f9f9c2c14859b027fcd80b1b88abdeda..3fb6e2db585aef9aa70ef410542e4b8e7321046e 100644 (file)
@@ -1043,7 +1043,7 @@ static void acpi_device_set_id(struct acpi_device *device,
                hid = ACPI_POWER_HID;
                break;
        case ACPI_BUS_TYPE_PROCESSOR:
-               hid = ACPI_PROCESSOR_HID;
+               hid = ACPI_PROCESSOR_OBJECT_HID;
                break;
        case ACPI_BUS_TYPE_SYSTEM:
                hid = ACPI_SYSTEM_HID;
index cf04c6011c2acadf4624a7a39f06fd66668383f4..7469ff39763303ecf62ba67677e0a324547367fe 100644 (file)
@@ -41,6 +41,7 @@
  */
 
 #define ACPI_POWER_HID                 "LNXPOWER"
+#define ACPI_PROCESSOR_OBJECT_HID      "ACPI_CPU"
 #define ACPI_PROCESSOR_HID             "ACPI0007"
 #define ACPI_SYSTEM_HID                        "LNXSYSTM"
 #define ACPI_THERMAL_HID               "LNXTHERM"