diff options
| author |   Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-01 11:45:19 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-01 14:34:30 +1100 |
| commit | bec7c458b372251617e0fdc6bf8ce4df06bab430 (patch) | |
| tree | bdffb7e8a092655f535fe4401ad8e81ae639221b /arch/powerpc/kernel/setup_64.c | |
| parent | powerpc: fix __strnlen_user in merge tree (diff) | |
| download | linux-dev-bec7c458b372251617e0fdc6bf8ce4df06bab430.tar.xz linux-dev-bec7c458b372251617e0fdc6bf8ce4df06bab430.zip | |
powerpc: make mem= work on iSeries again
By parsing the command line earlier, we can add the mem= value to the
flattened device tree and let the generic code sort out the memory limit
for us.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 40c48100bf1b..19530ce9cd27 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -631,23 +631,6 @@ static int ppc64_panic_event(struct notifier_block *this, return NOTIFY_DONE; } -#ifdef CONFIG_PPC_ISERIES -/* - * On iSeries we just parse the mem=X option from the command line. - * On pSeries it's a bit more complicated, see prom_init_mem() - */ -static int __init early_parsemem(char *p) -{ - if (!p) - return 0; - - memory_limit = ALIGN(memparse(p, &p), PAGE_SIZE); - - return 0; -} -early_param("mem", early_parsemem); -#endif /* CONFIG_PPC_ISERIES */ - #ifdef CONFIG_IRQSTACKS static void __init irqstack_early_init(void) { |