aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/setup_64.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-10-31 19:45:19 -0500
committerStephen Rothwell <sfr@canb.auug.org.au>2005-10-31 22:34:30 -0500
commitbec7c458b372251617e0fdc6bf8ce4df06bab430 (patch)
treebdffb7e8a092655f535fe4401ad8e81ae639221b /arch/powerpc/kernel/setup_64.c
parent5015b49448cbe5352b9cc232333ab26f3e608a07 (diff)
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.c17
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,
631 return NOTIFY_DONE; 631 return NOTIFY_DONE;
632} 632}
633 633
634#ifdef CONFIG_PPC_ISERIES
635/*
636 * On iSeries we just parse the mem=X option from the command line.
637 * On pSeries it's a bit more complicated, see prom_init_mem()
638 */
639static int __init early_parsemem(char *p)
640{
641 if (!p)
642 return 0;
643
644 memory_limit = ALIGN(memparse(p, &p), PAGE_SIZE);
645
646 return 0;
647}
648early_param("mem", early_parsemem);
649#endif /* CONFIG_PPC_ISERIES */
650
651#ifdef CONFIG_IRQSTACKS 634#ifdef CONFIG_IRQSTACKS
652static void __init irqstack_early_init(void) 635static void __init irqstack_early_init(void)
653{ 636{