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 /arch/powerpc/kernel/prom.c | |
| parent | 5f6b5b973a125de0dbe236ce659a495787c81ff0 (diff) | |
| download | blackbird-obmc-linux-cf00a8d18b9a1c2d55b2728e89125c234e821db5.tar.gz blackbird-obmc-linux-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 'arch/powerpc/kernel/prom.c')
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 6309a1a17c4a..2eccd0e159e3 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -78,15 +78,13 @@ extern struct rtas_t rtas; extern struct lmb lmb; extern unsigned long klimit; -static unsigned long memory_limit; - static int __initdata dt_root_addr_cells; static int __initdata dt_root_size_cells; #ifdef CONFIG_PPC64 static int __initdata iommu_is_off; int __initdata iommu_force_on; -extern unsigned long tce_alloc_start, tce_alloc_end; +unsigned long tce_alloc_start, tce_alloc_end; #endif typedef u32 cell_t; |
