diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:07:02 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:07:02 -0500 |
commit | cf00a8d18b9a1c2d55b2728e89125c234e821db5 (patch) | |
tree | 99425b8acd08aae1e07a7ae31ff47fa18e4e8c91 /arch/powerpc/mm/mem.c | |
parent | 5f6b5b973a125de0dbe236ce659a495787c81ff0 (diff) |
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 'arch/powerpc/mm/mem.c')
-rw-r--r-- | arch/powerpc/mm/mem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 3ca331728d21..e43e8ef70088 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
@@ -59,6 +59,7 @@ | |||
59 | 59 | ||
60 | int init_bootmem_done; | 60 | int init_bootmem_done; |
61 | int mem_init_done; | 61 | int mem_init_done; |
62 | unsigned long memory_limit; | ||
62 | 63 | ||
63 | /* | 64 | /* |
64 | * This is called by /dev/mem to know if a given address has to | 65 | * This is called by /dev/mem to know if a given address has to |