Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[pandora-kernel.git] / mm / memblock.c

diff --git a/mm/memblock.c b/mm/memblock.c
index 6259055..88adc8a 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -314,7 +314,8 @@ static void __init_memblock memblock_merge_regions(struct memblock_type *type)
                }
 
                this->size += next->size;
-               memmove(next, next + 1, (type->cnt - (i + 1)) * sizeof(*next));
+               /* move forward from next + 1, index of which is i + 2 */
+               memmove(next, next + 1, (type->cnt - (i + 2)) * sizeof(*next));
                type->cnt--;
        }
 }