diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-28 20:28:14 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-28 20:28:14 +1000 |
| commit | 20c8c2106305729e7d5e06f6c3d390e965a3dd34 (patch) | |
| tree | 23ae68e9ed3c7bdb1fccb19a761904a67c671f57 /arch/powerpc/mm | |
| parent | a3a9e99e36b2897b3e038869e61f363d62434086 (diff) | |
powerpc: Fixes to get the merged kernel to boot on powermac.
This merges ppc_ksyms.c, puts back the actual do_execve call in
sys_execve, makes init_MMU call find_end_of_memory rather than
ppc_md.find_end_of_memory (every platform has a device tree
with a /memory node now, right?) and fixes some problems with the
mpic initialization on newworld powermacs.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/init.c b/arch/powerpc/mm/init.c index f4d983a6e52..3a81ef15c67 100644 --- a/arch/powerpc/mm/init.c +++ b/arch/powerpc/mm/init.c @@ -239,7 +239,7 @@ void __init MMU_init(void) if (boot_mem_size) total_memory = boot_mem_size; else - total_memory = ppc_md.find_end_of_memory(); + total_memory = find_end_of_memory(); if (__max_memory && total_memory > __max_memory) total_memory = __max_memory; |