Patchwork powerpc/mm: Fix build error in setup_initial_memory_limit

login
register
mail settings
Submitter Kumar Gala
Date Nov. 10, 2010, 10:29 p.m.
Message ID <1289428189-27258-1-git-send-email-galak@kernel.crashing.org>
Download mbox | patch
Permalink /patch/70698/
State Accepted, archived
Commit 4a89261b02d421cc1bcadaaebb90bb7919db0854
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Kumar Gala - Nov. 10, 2010, 10:29 p.m.
arch/powerpc/mm/tlb_nohash.c: In function 'setup_initial_memory_limit':
arch/powerpc/mm/tlb_nohash.c:588:29: error: 'ppc64_memblock_base' undeclared (first use in this function)
arch/powerpc/mm/tlb_nohash.c:588:29: note: each undeclared identifier is reported only once for each function it appears in

Due to a copy/paste typo with the following commit:

	commit cd3db0c4ca3d237e7ad20f7107216e575705d2b0
	Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
	Date:   Tue Jul 6 15:39:02 2010 -0700

	    memblock: Remove rmo_size, burry it in arch/powerpc where it belongs

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---

Ben,

I think this is correct, but haven't really looked at all the code.

- k

 arch/powerpc/mm/tlb_nohash.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c
index 36c0c44..2a030d8 100644
--- a/arch/powerpc/mm/tlb_nohash.c
+++ b/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 */