2 files changed, 0 insertions, 41 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 3bc48b0bd3a..e4cbca58536 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -200,10 +200,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         acpi_display_output=video
                         See above.
 
-        acpi_early_pdc_eval     [HW,ACPI] Evaluate processor _PDC methods
-                                early. Needed on some platforms to properly
-                                initialize the EC.
-
         acpi_irq_balance [HW,ACPI]
                         ACPI will balance active IRQs
                         default in APIC mode
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index f0c68c1b86d..ef34faad600 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -341,36 +341,6 @@ void acpi_processor_set_pdc(acpi_handle handle)
 }
 EXPORT_SYMBOL_GPL(acpi_processor_set_pdc);
 
-static int early_pdc_optin;
-static int set_early_pdc_optin(const struct dmi_system_id *id)
-{
-        early_pdc_optin = 1;
-        return 0;
-}
-
-static int param_early_pdc_optin(char *s)
-{
-        early_pdc_optin = 1;
-        return 1;
-}
-__setup("acpi_early_pdc_eval", param_early_pdc_optin);
-
-static struct dmi_system_id __cpuinitdata early_pdc_optin_table[] = {
-        {
-        set_early_pdc_optin, "HP Envy", {
-        DMI_MATCH(DMI_BIOS_VENDOR, "Hewlett-Packard"),
-        DMI_MATCH(DMI_PRODUCT_NAME, "HP Envy") }, NULL},
-        {
-        set_early_pdc_optin, "HP Pavilion dv6", {
-        DMI_MATCH(DMI_BIOS_VENDOR, "Hewlett-Packard"),
-        DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv6") }, NULL},
-        {
-        set_early_pdc_optin, "HP Pavilion dv7", {
-        DMI_MATCH(DMI_BIOS_VENDOR, "Hewlett-Packard"),
-        DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv7") }, NULL},
-        {},
-};
-
 static acpi_status
 early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
@@ -396,13 +366,6 @@ void __init acpi_early_processor_set_pdc(void)
          */
         dmi_check_system(processor_idle_dmi_table);
 
-        /*
-         * Allow systems to opt-in to early _PDC evaluation.
-         */
-        dmi_check_system(early_pdc_optin_table);
-        if (!early_pdc_optin)
-                return;
-
         acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT,
                             ACPI_UINT32_MAX,
                             early_init_pdc, NULL, NULL, NULL);