diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-06 15:39:02 -0700 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-05 12:56:08 +1000 |
| commit | cd3db0c4ca3d237e7ad20f7107216e575705d2b0 (patch) | |
| tree | 03be7c14bd68a568a6e2f6df2db9fbbdf11c1483 /mm/memblock.c | |
| parent | e63075a3c9377536d085bc013cd3fe6323162449 (diff) | |
| download | kernel_samsung_aries-cd3db0c4ca3d237e7ad20f7107216e575705d2b0.zip kernel_samsung_aries-cd3db0c4ca3d237e7ad20f7107216e575705d2b0.tar.gz kernel_samsung_aries-cd3db0c4ca3d237e7ad20f7107216e575705d2b0.tar.bz2 | |
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.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index 770c5bf..73d903e 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -49,7 +49,6 @@ void memblock_dump_all(void) return; pr_info("MEMBLOCK configuration:\n"); - pr_info(" rmo_size = 0x%llx\n", (unsigned long long)memblock.rmo_size); pr_info(" memory.size = 0x%llx\n", (unsigned long long)memblock.memory.size); memblock_dump(&memblock.memory, "memory"); @@ -195,10 +194,6 @@ static long memblock_add_region(struct memblock_type *type, u64 base, u64 size) long memblock_add(u64 base, u64 size) { - /* On pSeries LPAR systems, the first MEMBLOCK is our RMO region. */ - if (base == 0) - memblock.rmo_size = size; - return memblock_add_region(&memblock.memory, base, size); } @@ -459,9 +454,6 @@ void __init memblock_enforce_memory_limit(u64 memory_limit) break; } - if (memblock.memory.regions[0].size < memblock.rmo_size) - memblock.rmo_size = memblock.memory.regions[0].size; - memory_limit = memblock_end_of_DRAM(); /* And truncate any reserves above the limit also. */ |