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/ppc64 | |
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/ppc64')
-rw-r--r-- | arch/ppc64/kernel/prom.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/prom.c b/arch/ppc64/kernel/prom.c index cd41a47dd43f..97bfceb5353b 100644 --- a/arch/ppc64/kernel/prom.c +++ b/arch/ppc64/kernel/prom.c | |||
@@ -83,6 +83,8 @@ static int __initdata dt_root_addr_cells; | |||
83 | static int __initdata dt_root_size_cells; | 83 | static int __initdata dt_root_size_cells; |
84 | static int __initdata iommu_is_off; | 84 | static int __initdata iommu_is_off; |
85 | int __initdata iommu_force_on; | 85 | int __initdata iommu_force_on; |
86 | unsigned long tce_alloc_start, tce_alloc_end; | ||
87 | |||
86 | typedef u32 cell_t; | 88 | typedef u32 cell_t; |
87 | 89 | ||
88 | #if 0 | 90 | #if 0 |
@@ -1063,7 +1065,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node, | |||
1063 | { | 1065 | { |
1064 | u32 *prop; | 1066 | u32 *prop; |
1065 | u64 *prop64; | 1067 | u64 *prop64; |
1066 | extern unsigned long tce_alloc_start, tce_alloc_end; | ||
1067 | 1068 | ||
1068 | DBG("search \"chosen\", depth: %d, uname: %s\n", depth, uname); | 1069 | DBG("search \"chosen\", depth: %d, uname: %s\n", depth, uname); |
1069 | 1070 | ||