Merge branch 'bugzilla-14954' into release

diff --combined drivers/acpi/processor_pdc.c
index 7d4ee394d0b34373b957c1051cad6086d66e5156,f3364371207eb205a526570333d6184112a9b5b0..7247819dbd80b0679af19bb17b152b4ba1f7dee9
--- 1/drivers/acpi/processor_pdc.c
--- 2/drivers/acpi/processor_pdc.c
+++ b/drivers/acpi/processor_pdc.c
@@@ -144,6 -144,29 +144,29 @@@ void acpi_processor_set_pdc(acpi_handl
  }
  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 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)
  {
@@@ -151,7 -174,7 +174,7 @@@
        return AE_OK;
  }
  
 -void acpi_early_processor_set_pdc(void)
 +void __init acpi_early_processor_set_pdc(void)
  {
        /*
         * Check whether the system is DMI table. If yes, OSPM
@@@ -159,6 -182,13 +182,13 @@@
         */
        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);