2 files changed, 15 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 50680a59a2ff..f87856eafea8 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -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.
 
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 9aeacdfca410..b67be85ff0fc 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -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);