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
|
@ -343,6 +343,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
|
|||
no: ACPI OperationRegions are not marked as reserved,
|
||||
no further checks are performed.
|
||||
|
||||
acpi_no_memhotplug [ACPI] Disable memory hotplug. Useful for kdump
|
||||
kernels.
|
||||
|
||||
add_efi_memmap [EFI; X86] Include EFI memory map in
|
||||
kernel's map of available physical RAM.
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -565,6 +565,7 @@ asmlinkage void __init start_kernel(void)
|
|||
init_timers();
|
||||
hrtimers_init();
|
||||
softirq_init();
|
||||
acpi_early_init();
|
||||
timekeeping_init();
|
||||
time_init();
|
||||
sched_clock_postinit();
|
||||
|
@ -641,7 +642,6 @@ asmlinkage void __init start_kernel(void)
|
|||
|
||||
check_bugs();
|
||||
|
||||
acpi_early_init(); /* before LAPIC and SMP init */
|
||||
sfi_init_late();
|
||||
|
||||
if (efi_enabled(EFI_RUNTIME_SERVICES)) {
|
||||
|
|
Loading…
Reference in a new issue