From 9506e95a5c8e9fc2cdd24cd3017895657fddb288 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Sat, 5 Aug 2006 12:15:02 -0700
Subject: [PATCH] --- yaml --- r: 33251 b: refs/heads/master c:
 fa25d8d6d3fa0fecd00cd4b909011291eae9257d h: refs/heads/master i:   33249:
 8fa4f7c165a65dce0c8d630a6f4319aaf718ea9f   33247:
 ab5ba3cda2cebfe86047d8c3ee45a0a8a54efa79 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/acpi/acpi_memhotplug.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index bcd8800f103e..28f7df8ebb05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58c1b5b079071d82b2f924000b7e8fb5585ce7d8
+refs/heads/master: fa25d8d6d3fa0fecd00cd4b909011291eae9257d
diff --git a/trunk/drivers/acpi/acpi_memhotplug.c b/trunk/drivers/acpi/acpi_memhotplug.c
index 81e970adeab3..e9175eaeb1df 100644
--- a/trunk/drivers/acpi/acpi_memhotplug.c
+++ b/trunk/drivers/acpi/acpi_memhotplug.c
@@ -230,17 +230,10 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
 	 * (i.e. memory-hot-remove function)
 	 */
 	list_for_each_entry(info, &mem_device->res_list, list) {
-		u64 start_pfn, end_pfn;
-
-		start_pfn = info->start_addr >> PAGE_SHIFT;
-		end_pfn = (info->start_addr + info->length - 1) >> PAGE_SHIFT;
-
-		if (pfn_valid(start_pfn) || pfn_valid(end_pfn)) {
-			/* already enabled. try next area */
+		if (info->enabled) { /* just sanity check...*/
 			num_enabled++;
 			continue;
 		}
-
 		result = add_memory(node, info->start_addr, info->length);
 		if (result)
 			continue;