Merge branch 'bugzilla-14954' into release

Len Brown 418521de be6066f3

+30
+30
drivers/acpi/processor_pdc.c
··· 144 144 } 145 145 EXPORT_SYMBOL_GPL(acpi_processor_set_pdc); 146 146 147 + static int early_pdc_optin; 148 + static int set_early_pdc_optin(const struct dmi_system_id *id) 149 + { 150 + early_pdc_optin = 1; 151 + return 0; 152 + } 153 + 154 + static struct dmi_system_id __cpuinitdata early_pdc_optin_table[] = { 155 + { 156 + set_early_pdc_optin, "HP Envy", { 157 + DMI_MATCH(DMI_BIOS_VENDOR, "Hewlett-Packard"), 158 + DMI_MATCH(DMI_PRODUCT_NAME, "HP Envy") }, NULL}, 159 + { 160 + set_early_pdc_optin, "HP Pavilion dv6", { 161 + DMI_MATCH(DMI_BIOS_VENDOR, "Hewlett-Packard"), 162 + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv6") }, NULL}, 163 + { 164 + set_early_pdc_optin, "HP Pavilion dv7", { 165 + DMI_MATCH(DMI_BIOS_VENDOR, "Hewlett-Packard"), 166 + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv7") }, NULL}, 167 + {}, 168 + }; 169 + 147 170 static acpi_status 148 171 early_init_pdc(acpi_handle handle, u32 lvl, void *context, void **rv) 149 172 { ··· 181 158 * should not use mwait for CPU-states. 182 159 */ 183 160 dmi_check_system(processor_idle_dmi_table); 161 + 162 + /* 163 + * Allow systems to opt-in to early _PDC evaluation. 164 + */ 165 + dmi_check_system(early_pdc_optin_table); 166 + if (!early_pdc_optin) 167 + return; 184 168 185 169 acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT, 186 170 ACPI_UINT32_MAX,