revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / mm / memblock.c

diff --git a/mm/memblock.c b/mm/memblock.c
index aa6919112842ecf36c52653f9321b9752b8bc61d..43840b305ecb2c01ac478d1c3c67aff7993016a7 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -196,10 +196,6 @@ static long memblock_add_region(struct memblock_region *rgn, u64 base, u64 size)
 long memblock_add(u64 base, u64 size)
 {
        struct memblock_region *_rgn = &memblock.memory;
-       u64 end = base + size;
-
-       base = PAGE_ALIGN(base);
-       size = (end & PAGE_MASK) - base;
 
        /* On pSeries LPAR systems, the first MEMBLOCK is our RMO region. */
        if (base == 0)