diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-31 13:07:02 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-31 13:07:02 +1100 |
| commit | cf00a8d18b9a1c2d55b2728e89125c234e821db5 (patch) | |
| tree | 99425b8acd08aae1e07a7ae31ff47fa18e4e8c91 /include | |
| parent | 5f6b5b973a125de0dbe236ce659a495787c81ff0 (diff) | |
| download | linux-3.10-cf00a8d18b9a1c2d55b2728e89125c234e821db5.tar.gz linux-3.10-cf00a8d18b9a1c2d55b2728e89125c234e821db5.tar.bz2 linux-3.10-cf00a8d18b9a1c2d55b2728e89125c234e821db5.zip | |
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')
| -rw-r--r-- | include/asm-powerpc/system.h | 1 | ||||
| -rw-r--r-- | include/asm-ppc64/system.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h index e926e43c4ae..5b2ecbc4790 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 fd7c1f890c4..99b8ca52f10 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); |