aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memblock.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-07-06 18:39:02 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-08-04 22:56:08 -0400
commitcd3db0c4ca3d237e7ad20f7107216e575705d2b0 (patch)
tree03be7c14bd68a568a6e2f6df2db9fbbdf11c1483 /mm/memblock.c
parente63075a3c9377536d085bc013cd3fe6323162449 (diff)
memblock: Remove rmo_size, burry it in arch/powerpc where it belongs
The RMA (RMO is a misnomer) is a concept specific to ppc64 (in fact server ppc64 though I hijack it on embedded ppc64 for similar purposes) and represents the area of memory that can be accessed in real mode (aka with MMU off), or on embedded, from the exception vectors (which is bolted in the TLB) which pretty much boils down to the same thing. We take that out of the generic MEMBLOCK data structure and move it into arch/powerpc where it belongs, renaming it to "RMA" while at it. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'mm/memblock.c')
-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. */