aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/mm/srat.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86_64/mm/srat.c b/arch/x86_64/mm/srat.c
index 5d01b31472e1..ec1c4aca4513 100644
--- a/arch/x86_64/mm/srat.c
+++ b/arch/x86_64/mm/srat.c
@@ -124,7 +124,6 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
124 124
125 if (srat_disabled() || ma->flags.enabled == 0) 125 if (srat_disabled() || ma->flags.enabled == 0)
126 return; 126 return;
127 /* hotplug bit is ignored for now */
128 pxm = ma->proximity_domain; 127 pxm = ma->proximity_domain;
129 node = setup_node(pxm); 128 node = setup_node(pxm);
130 if (node < 0) { 129 if (node < 0) {
@@ -134,6 +133,10 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
134 } 133 }
135 start = ma->base_addr_lo | ((u64)ma->base_addr_hi << 32); 134 start = ma->base_addr_lo | ((u64)ma->base_addr_hi << 32);
136 end = start + (ma->length_lo | ((u64)ma->length_hi << 32)); 135 end = start + (ma->length_lo | ((u64)ma->length_hi << 32));
136 /* It is fine to add this area to the nodes data it will be used later*/
137 if (ma->flags.hot_pluggable == 1)
138 printk(KERN_INFO "SRAT: hot plug zone found %lx - %lx \n",
139 start, end);
137 i = conflicting_nodes(start, end); 140 i = conflicting_nodes(start, end);
138 if (i >= 0) { 141 if (i >= 0) {
139 printk(KERN_ERR 142 printk(KERN_ERR