[Xen-changelog] [xen-unstable] SRAT memory hotplug 1/2: Revert 20053:ebb07c5934c8.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1260355297 0
# Node ID 1f5f1674e53f478b1ca57ab629d96f18d0bf4711
# Parent  7f611de6b93cc4cbec0530548a85953afa845315
SRAT memory hotplug 1/2: Revert 20053:ebb07c5934c8.

Signed-off-by: Jiang, Yunhong <yunhong.jiang@xxxxxxxxx>
---
 xen/arch/x86/srat.c |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

diff -r 7f611de6b93c -r 1f5f1674e53f xen/arch/x86/srat.c
--- a/xen/arch/x86/srat.c       Tue Dec 08 14:14:27 2009 +0000
+++ b/xen/arch/x86/srat.c       Wed Dec 09 10:41:37 2009 +0000
@@ -185,21 +185,10 @@ acpi_numa_memory_affinity_init(struct ac
                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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog