---

yaml
---
r: 39969
b: refs/heads/master
c: 887b959
h: refs/heads/master
i:
  39967: 8107d0e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cbe44cd8d48a92856295f445183f52bf42a544d
+refs/heads/master: 887b95931b4072e60e3bf4253ff7bffe372bca46

trunk/drivers/acpi/acpi_memhotplug.c

@@ -85,6 +85,8 @@ struct acpi_memory_device {
 	struct list_head res_list;
 };
 
+static int acpi_hotmem_initialized;
+
 static acpi_status
 acpi_memory_get_resource(struct acpi_resource *resource, void *context)
 {
@@ -438,6 +440,15 @@ static int acpi_memory_device_start (struct acpi_device *device)
 	struct acpi_memory_device *mem_device;
 	int result = 0;
 
+	/*
+	 * Early boot code has recognized memory area by EFI/E820.
+	 * If DSDT shows these memory devices on boot, hotplug is not necessary
+	 * for them. So, it just returns until completion of this driver's
+	 * start up.
+	 */
+	if (!acpi_hotmem_initialized)
+		return 0;
+
 	mem_device = acpi_driver_data(device);
 
 	if (!acpi_memory_check_device(mem_device)) {
@@ -537,6 +548,7 @@ static int __init acpi_memory_device_init(void)
 		return -ENODEV;
 	}
 
+	acpi_hotmem_initialized = 1;
 	return 0;
 }