aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/memblock.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/mm/memblock.c b/mm/memblock.c
index 770c5bfac2cd..73d903ebf3d4 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -49,7 +49,6 @@ void memblock_dump_all(void)
49 return; 49 return;
50 50
51 pr_info("MEMBLOCK configuration:\n"); 51 pr_info("MEMBLOCK configuration:\n");
52 pr_info(" rmo_size = 0x%llx\n", (unsigned long long)memblock.rmo_size);
53 pr_info(" memory.size = 0x%llx\n", (unsigned long long)memblock.memory.size); 52 pr_info(" memory.size = 0x%llx\n", (unsigned long long)memblock.memory.size);
54 53
55 memblock_dump(&memblock.memory, "memory"); 54 memblock_dump(&memblock.memory, "memory");
@@ -195,10 +194,6 @@ static long memblock_add_region(struct memblock_type *type, u64 base, u64 size)
195 194
196long memblock_add(u64 base, u64 size) 195long memblock_add(u64 base, u64 size)
197{ 196{
198 /* On pSeries LPAR systems, the first MEMBLOCK is our RMO region. */
199 if (base == 0)
200 memblock.rmo_size = size;
201
202 return memblock_add_region(&memblock.memory, base, size); 197 return memblock_add_region(&memblock.memory, base, size);
203 198
204} 199}
@@ -459,9 +454,6 @@ void __init memblock_enforce_memory_limit(u64 memory_limit)
459 break; 454 break;
460 } 455 }
461 456
462 if (memblock.memory.regions[0].size < memblock.rmo_size)
463 memblock.rmo_size = memblock.memory.regions[0].size;
464
465 memory_limit = memblock_end_of_DRAM(); 457 memory_limit = memblock_end_of_DRAM();
466 458
467 /* And truncate any reserves above the limit also. */ 459 /* And truncate any reserves above the limit also. */