x86/numa_emulation: Fix uniform-split numa emulation

[sfrench/cifs-2.6.git] / arch / x86 / mm / numa_emulation.c

diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c
index b54d52a2d00a83a9fa4be8647fe3acf92b81c4c7..d71d72cf6c66685eb9f8eee9f7bb29c4a277baa2 100644 (file)
--- a/arch/x86/mm/numa_emulation.c
+++ b/arch/x86/mm/numa_emulation.c
@@ -400,9 +400,17 @@ void __init numa_emulation(struct numa_meminfo *numa_meminfo, int numa_dist_cnt)
                n = simple_strtoul(emu_cmdline, &emu_cmdline, 0);
                ret = -1;
                for_each_node_mask(i, physnode_mask) {
+                       /*
+                        * The reason we pass in blk[0] is due to
+                        * numa_remove_memblk_from() called by
+                        * emu_setup_memblk() will delete entry 0
+                        * and then move everything else up in the pi.blk
+                        * array. Therefore we should always be looking
+                        * at blk[0].
+                        */
                        ret = split_nodes_size_interleave_uniform(&ei, &pi,
-                                       pi.blk[i].start, pi.blk[i].end, 0,
-                                       n, &pi.blk[i], nid);
+                                       pi.blk[0].start, pi.blk[0].end, 0,
+                                       n, &pi.blk[0], nid);
                        if (ret < 0)
                                break;
                        if (ret < n) {