From 515484ddb7bcf414c8060bd6153de0382690a781 Mon Sep 17 00:00:00 2001
From: Wen Congyang <wency@cn.fujitsu.com>
Date: Fri, 16 Nov 2012 02:12:38 +0100
Subject: [PATCH] --- yaml --- r: 336687 b: refs/heads/master c:
 61d8eff14417fb6d6c5d57e4f0f7925e9e99fce3 h: refs/heads/master i:   336685:
 c7870aa27004a643265b02d2caa2c2f634c63050   336683:
 159c0636f297be7b22d3d1c627afa256da610367   336679:
 3321aa952e0a334cddd2a7050c1a19cc5e7034c9   336671:
 68dc67e4d50983bb9b345d93f7c0ec525c7b7c3a v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/acpi/acpi_memhotplug.c | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 67a6409a5674..28a08a0b9f8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65479472571fbf91502b7854be45ec0026b5229e
+refs/heads/master: 61d8eff14417fb6d6c5d57e4f0f7925e9e99fce3
diff --git a/trunk/drivers/acpi/acpi_memhotplug.c b/trunk/drivers/acpi/acpi_memhotplug.c
index f7e300769966..e0f7425c8854 100644
--- a/trunk/drivers/acpi/acpi_memhotplug.c
+++ b/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;
 }