From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 9 Dec 2009 10:41:37 +0000 (+0000)
Subject: SRAT memory hotplug 1/2: Revert 20053:ebb07c5934c8.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12944
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4d817e3923416c21a61c0df32f244893974eb2e8;p=xen.git

SRAT memory hotplug 1/2: Revert 20053:ebb07c5934c8.

Signed-off-by: Jiang, Yunhong <yunhong.jiang@intel.com>
---

diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c
index 13a035ce45..f6c5ada414 100644
--- a/xen/arch/x86/srat.c
+++ b/xen/arch/x86/srat.c
@@ -185,21 +185,10 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
 		bad_srat();
 		return;
 	}
-	if (ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) {
-		if (page_is_ram_type(paddr_to_pfn(start), RAM_TYPE_CONVENTIONAL))
-			printk(KERN_INFO "SRAT: hot-pluggable zone found %"PRIx64" - %"PRIx64" \n",
+	/* It is fine to add this area to the nodes data it will be used later*/
+	if (ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE)
+		printk(KERN_INFO "SRAT: hot plug zone found %"PRIx64" - %"PRIx64" \n",
 				start, end);
-		else {
-			/* TODO: This range contains no existing memory yet,
-			 * and shouldn't be included in nodes' [start, end]. It
-			 * will be covered with physical memory hotplug support
-			 * in future.
-			 */
-			printk(KERN_INFO "SRAT: future hotplug zone found %"PRIx64" - %"PRIx64" \n",
-				start, end);
-			return;
-		}
-	}
 	i = conflicting_nodes(start, end);
 	if (i == node) {
 		printk(KERN_WARNING