diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-31 05:07:02 +0300 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-31 05:07:02 +0300 |
| commit | cf00a8d18b9a1c2d55b2728e89125c234e821db5 (patch) | |
| tree | 99425b8acd08aae1e07a7ae31ff47fa18e4e8c91 /arch/powerpc/mm/numa.c | |
| parent | 5f6b5b973a125de0dbe236ce659a495787c81ff0 (diff) | |
| download | linux-cf00a8d18b9a1c2d55b2728e89125c234e821db5.tar.xz | |
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/numa.c')
| -rw-r--r-- | arch/powerpc/mm/numa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index cb864b8f2750..4035cad8d7f1 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -20,6 +20,7 @@ #include <asm/lmb.h> #include <asm/machdep.h> #include <asm/abs_addr.h> +#include <asm/system.h> static int numa_enabled = 1; @@ -300,7 +301,6 @@ static unsigned long __init numa_enforce_memory_limit(unsigned long start, unsig * we've already adjusted it for the limit and it takes care of * having memory holes below the limit. */ - extern unsigned long memory_limit; if (! memory_limit) return size; |