x86: reduce memory and intra-node effects

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2 files changed, 7 insertions, 3 deletions

diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index 382377d6421d..dca58fb39b08 100644
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -562,7 +562,7 @@ __cpuinit void numa_add_cpu(int cpu)
 
 void __cpuinit numa_set_node(int cpu, int node)
 {
-        u16 *cpu_to_node_map = (u16 *)x86_cpu_to_node_map_early_ptr;
+        u16 *cpu_to_node_map = x86_cpu_to_node_map_early_ptr;
 
         cpu_pda(cpu)->nodenumber = node;
 
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
index bccbdc7be434..e5a1ec8342dc 100644
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
@@ -346,8 +346,12 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end)
         /* First clean up the node list */
         for (i = 0; i < MAX_NUMNODES; i++) {
                 cutoff_node(i, start, end);
-                /* ZZZ why was this needed. At least add a comment */
-                if (nodes[i].end && (nodes[i].end - nodes[i].start) < NODE_MIN_SIZE) {
+                /*
+                 * don't confuse VM with a node that doesn't have the
+                 * minimum memory.
+                 */
+                if (nodes[i].end &&
+                        (nodes[i].end - nodes[i].start) < NODE_MIN_SIZE) {
                         unparse_node(i);
                         node_set_offline(i);
                 }