powerpc: Fix bug arising from having multiple memory_limit variables

We had a static memory_limit in prom.c, and then another one defined
in setup_64.c and used in numa.c, which resulted in the kernel crashing
when mem=xxx was given on the command line.  This puts the declaration
in system.h and the definition in mem.c.  This also moves the
definition of tce_alloc_start/end out of setup_64.c.

Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 2 insertions, 0 deletions

diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h
index e926e43c4ae6..5b2ecbc47907 100644
--- a/include/asm-powerpc/system.h
+++ b/include/asm-powerpc/system.h
@@ -179,6 +179,7 @@ extern struct task_struct *_switch(struct thread_struct *prev,
 
 extern unsigned int rtas_data;
 extern int mem_init_done;       /* set on boot once kmalloc can be called */
+extern unsigned long memory_limit;
 
 extern int powersave_nap;       /* set if nap mode can be used in idle loop */
 
diff --git a/include/asm-ppc64/system.h b/include/asm-ppc64/system.h
index fd7c1f890c45..99b8ca52f101 100644
--- a/include/asm-ppc64/system.h
+++ b/include/asm-ppc64/system.h
@@ -136,6 +136,7 @@ static inline void flush_spe_to_thread(struct task_struct *t)
 }
 
 extern int mem_init_done;       /* set on boot once kmalloc can be called */
+extern unsigned long memory_limit;
 
 /* EBCDIC -> ASCII conversion for [0-9A-Z] on iSeries */
 extern unsigned char e2a(unsigned char);