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/kernel/setup_64.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/kernel/setup_64.c')
-rw-r--r-- | arch/powerpc/kernel/setup_64.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 681537f8ea10..40c48100bf1b 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
@@ -631,15 +631,6 @@ static int ppc64_panic_event(struct notifier_block *this, | |||
631 | return NOTIFY_DONE; | 631 | return NOTIFY_DONE; |
632 | } | 632 | } |
633 | 633 | ||
634 | /* | ||
635 | * These three variables are used to save values passed to us by prom_init() | ||
636 | * via the device tree. The TCE variables are needed because with a memory_limit | ||
637 | * in force we may need to explicitly map the TCE are at the top of RAM. | ||
638 | */ | ||
639 | unsigned long memory_limit; | ||
640 | unsigned long tce_alloc_start; | ||
641 | unsigned long tce_alloc_end; | ||
642 | |||
643 | #ifdef CONFIG_PPC_ISERIES | 634 | #ifdef CONFIG_PPC_ISERIES |
644 | /* | 635 | /* |
645 | * On iSeries we just parse the mem=X option from the command line. | 636 | * On iSeries we just parse the mem=X option from the command line. |