From 126e8aa2137edd37ef8507827e3a97427de9396e Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 10 Nov 2010 12:29:49 +0000 Subject: [PATCH] --- yaml --- r: 222191 b: refs/heads/master c: 4a89261b02d421cc1bcadaaebb90bb7919db0854 h: refs/heads/master i: 222189: 80e7d5a7d2220643646b179aa6ff75536cabb550 222187: e615ad3dfd6746dce26601652986ecc6a8e3b11b 222183: 20a5230e7c2aa16589c8a74283f559176a7d3990 222175: 0cf310e4440dbe9a6bc19262f1fa9cb56a0a5179 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/tlb_nohash.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index de7e08adfc12..28e8a56903c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01cf6fe8553b0ac649f3323d8da69b51cad8c468 +refs/heads/master: 4a89261b02d421cc1bcadaaebb90bb7919db0854 diff --git a/trunk/arch/powerpc/mm/tlb_nohash.c b/trunk/arch/powerpc/mm/tlb_nohash.c index 36c0c449a899..2a030d89bbc6 100644 --- a/trunk/arch/powerpc/mm/tlb_nohash.c +++ b/trunk/arch/powerpc/mm/tlb_nohash.c @@ -585,6 +585,6 @@ void setup_initial_memory_limit(phys_addr_t first_memblock_base, ppc64_rma_size = min_t(u64, first_memblock_size, 0x40000000); /* Finally limit subsequent allocations */ - memblock_set_current_limit(ppc64_memblock_base + ppc64_rma_size); + memblock_set_current_limit(first_memblock_base + ppc64_rma_size); } #endif /* CONFIG_PPC64 */