1 files changed, 15 insertions, 7 deletions

diff --git a/arch/x86_64/mm/srat.c b/arch/x86_64/mm/srat.c
index 5d01b31472e1..8e3d097a9ddd 100644
--- a/arch/x86_64/mm/srat.c
+++ b/arch/x86_64/mm/srat.c
@@ -20,6 +20,9 @@
 
 static struct acpi_table_slit *acpi_slit;
 
+/* Internal processor count */
+static unsigned int __initdata num_processors = 0;
+
 static nodemask_t nodes_parsed __initdata;
 static nodemask_t nodes_found __initdata;
 static struct node nodes[MAX_NUMNODES] __initdata;
@@ -101,16 +104,18 @@ acpi_numa_processor_affinity_init(struct acpi_table_processor_affinity *pa)
                 bad_srat();
                 return;
         }
-        if (pa->apic_id >= NR_CPUS) {
-                printk(KERN_ERR "SRAT: lapic %u too large.\n",
-                       pa->apic_id);
+        if (num_processors >= NR_CPUS) {
+                printk(KERN_ERR "SRAT: Processor #%d (lapic %u) INVALID. (Max ID: %d).\n",
+                        num_processors, pa->apic_id, NR_CPUS);
                 bad_srat();
                 return;
         }
-        cpu_to_node[pa->apic_id] = node;
+        cpu_to_node[num_processors] = node;
         acpi_numa = 1;
-        printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n",
-               pxm, pa->apic_id, node);
+        printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> CPU %u -> Node %u\n",
+               pxm, pa->apic_id, num_processors, node);
+
+        num_processors++;
 }
 
 /* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
@@ -124,7 +129,6 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
 
         if (srat_disabled() || ma->flags.enabled == 0)
                 return;
-        /* hotplug bit is ignored for now */
         pxm = ma->proximity_domain;
         node = setup_node(pxm);
         if (node < 0) {
@@ -134,6 +138,10 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
         }
         start = ma->base_addr_lo | ((u64)ma->base_addr_hi << 32);
         end = start + (ma->length_lo | ((u64)ma->length_hi << 32));
+        /* It is fine to add this area to the nodes data it will be used later*/
+        if (ma->flags.hot_pluggable == 1)
+                printk(KERN_INFO "SRAT: hot plug zone found %lx - %lx \n",
+                                start, end);
         i = conflicting_nodes(start, end);
         if (i >= 0) {
                 printk(KERN_ERR