SRAT memory hotplug 1/2: Revert 20053:ebb07c5934c8.
authorKeir Fraser <keir.fraser@citrix.com>
Wed, 9 Dec 2009 10:41:37 +0000 (10:41 +0000)
committerKeir Fraser <keir.fraser@citrix.com>
Wed, 9 Dec 2009 10:41:37 +0000 (10:41 +0000)
Signed-off-by: Jiang, Yunhong <yunhong.jiang@intel.com>
xen/arch/x86/srat.c

index 13a035ce45193b1a0b657e85fe85a2d265ecb7cd..f6c5ada414e3cdc9ae0de3487c2f94261f8b3e98 100644 (file)
@@ -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