diff --git a/[refs] b/[refs] index 7a4bcb29388f..030a3f6797ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af48931c4863ced64cc52c58757be6e254437f9a +refs/heads/master: b1d248d96c71665c79befb81207f38f894c7c082 diff --git a/trunk/drivers/acpi/bus.c b/trunk/drivers/acpi/bus.c index 310e3b9749cb..d68bd61072bb 100644 --- a/trunk/drivers/acpi/bus.c +++ b/trunk/drivers/acpi/bus.c @@ -935,6 +935,12 @@ static int __init acpi_bus_init(void) goto error1; } + /* + * _PDC control method may load dynamic SSDT tables, + * and we need to install the table handler before that. + */ + acpi_sysfs_init(); + acpi_early_processor_set_pdc(); /* @@ -1026,7 +1032,6 @@ static int __init acpi_init(void) acpi_scan_init(); acpi_ec_init(); acpi_power_init(); - acpi_sysfs_init(); acpi_debugfs_init(); acpi_sleep_proc_init(); acpi_wakeup_device_init();