mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branches 'acpi-init' and 'acpi-hotplug'
* acpi-init: ACPI / init: Run acpi_early_init() before timekeeping_init() * acpi-hotplug: ACPI / memhotplug: add parameter to disable memory hotplug
This commit is contained in:
commit
8341ecc9f4
3 changed files with 16 additions and 1 deletions
|
|
@ -360,7 +360,19 @@ static void acpi_memory_device_remove(struct acpi_device *device)
|
|||
acpi_memory_device_free(mem_device);
|
||||
}
|
||||
|
||||
static bool __initdata acpi_no_memhotplug;
|
||||
|
||||
void __init acpi_memory_hotplug_init(void)
|
||||
{
|
||||
if (acpi_no_memhotplug)
|
||||
return;
|
||||
|
||||
acpi_scan_add_handler_with_hotplug(&memory_device_handler, "memory");
|
||||
}
|
||||
|
||||
static int __init disable_acpi_memory_hotplug(char *str)
|
||||
{
|
||||
acpi_no_memhotplug = true;
|
||||
return 1;
|
||||
}
|
||||
__setup("acpi_no_memhotplug", disable_acpi_memory_hotplug);
|
||||
|
|
|
|||
Loading…
Reference in a new issue