+++ /dev/null
-From: Myron Stowe <myron.stowe@hp.com>
-Subject: ACPI: Disambiguate processor declaration type
-References: bnc#440062
-Patch-Mainline: yes
-Commit-ID: ad93a765c1834db031b5bf1c2baf2a50d0462ca4
-
-Signed-off-by: Thomas Renninger <trenn@suse.de>
-
-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 | 1 +
- drivers/acpi/scan.c | 2 +-
- include/acpi/acpi_drivers.h | 1 +
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/acpi/processor_core.c
-+++ b/drivers/acpi/processor_core.c
-@@ -89,6 +89,7 @@ static int acpi_processor_handle_eject(s
-
-
- static const struct acpi_device_id processor_device_ids[] = {
-+ {ACPI_PROCESSOR_OBJECT_HID, 0},
- {ACPI_PROCESSOR_HID, 0},
- {"", 0},
- };
---- a/drivers/acpi/scan.c
-+++ b/drivers/acpi/scan.c
-@@ -1002,7 +1002,7 @@ static void acpi_device_set_id(struct ac
- 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;
---- a/include/acpi/acpi_drivers.h
-+++ b/include/acpi/acpi_drivers.h
-@@ -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"