---

yaml
---
r: 336687
b: refs/heads/master
c: 61d8eff
h: refs/heads/master
i:
  336685: c7870aa
  336683: 159c063
  336679: 3321aa9
  336671: 68dc67e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65479472571fbf91502b7854be45ec0026b5229e
+refs/heads/master: 61d8eff14417fb6d6c5d57e4f0f7925e9e99fce3

trunk/drivers/acpi/acpi_memhotplug.c

@@ -87,8 +87,6 @@ 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)
 {
@@ -433,15 +431,6 @@ static int acpi_memory_device_add(struct acpi_device *device)
 
 	printk(KERN_DEBUG "%s \n", acpi_device_name(device));
 
-	/*
-	 * 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;
-
 	if (!acpi_memory_check_device(mem_device)) {
 		/* call add_memory func */
 		result = acpi_memory_enable_device(mem_device);
@@ -557,7 +546,6 @@ static int __init acpi_memory_device_init(void)
 		return -ENODEV;
 	}
 
-	acpi_hotmem_initialized = 1;
 	return 0;
 }