summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc64
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-31 13:07:02 +1100
committerPaul Mackerras <paulus@samba.org>2005-10-31 13:07:02 +1100
commitcf00a8d18b9a1c2d55b2728e89125c234e821db5 (patch)
tree99425b8acd08aae1e07a7ae31ff47fa18e4e8c91 /include/asm-ppc64
parent5f6b5b973a125de0dbe236ce659a495787c81ff0 (diff)
downloadop-kernel-dev-cf00a8d18b9a1c2d55b2728e89125c234e821db5.zip
op-kernel-dev-cf00a8d18b9a1c2d55b2728e89125c234e821db5.tar.gz
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>
Diffstat (limited to 'include/asm-ppc64')
-rw-r--r--include/asm-ppc64/system.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ppc64/system.h b/include/asm-ppc64/system.h
index fd7c1f8..99b8ca5 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);
OpenPOWER on IntegriCloud