diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2006-05-17 10:00:46 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-05-19 07:02:15 +0200 |
| commit | 2babf5c2ec2f2d5de3e38d20f7df7fd815fd10c9 (patch) | |
| tree | 9ecda21067fe36f36fbefae87141150b62c39acd /arch/powerpc/kernel/setup_64.c | |
| parent | [PATCH] powerpc: Parse early parameters earlier (diff) | |
| download | linux-2babf5c2ec2f2d5de3e38d20f7df7fd815fd10c9.tar.xz linux-2babf5c2ec2f2d5de3e38d20f7df7fd815fd10c9.zip | |
[PATCH] powerpc: Unify mem= handling
We currently do mem= handling in three seperate places. And as benh pointed out
I wrote two of them. Now that we parse command line parameters earlier we can
clean this mess up.
Moving the parsing out of prom_init means the device tree might be allocated
above the memory limit. If that happens we'd have to move it. As it happens
we already have logic to do that for kdump, so just genericise it.
This also means we might have reserved regions above the memory limit, if we
do the bootmem allocator will blow up, so we have to modify
lmb_enforce_memory_limit() to truncate the reserves as well.
Tested on P5 LPAR, iSeries, F50, 44p. Tested moving device tree on P5 and
44p and F50.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
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 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 6224624c3d38..59773d9044ba 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -347,9 +347,6 @@ void __init setup_system(void) { DBG(" -> setup_system()\n"); -#ifdef CONFIG_KEXEC - kdump_move_device_tree(); -#endif /* * Unflatten the device-tree passed by prom_init or kexec */ |