diff options
author | Paul Mackerras <paulus@samba.org> | 2005-09-28 06:28:14 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-09-28 06:28:14 -0400 |
commit | 20c8c2106305729e7d5e06f6c3d390e965a3dd34 (patch) | |
tree | 23ae68e9ed3c7bdb1fccb19a761904a67c671f57 /arch/powerpc/kernel/process.c | |
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/kernel/process.c')
-rw-r--r-- | arch/powerpc/kernel/process.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index f5a9d2a84fa1..e3946769dd8e 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c | |||
@@ -601,6 +601,8 @@ int sys_execve(unsigned long a0, unsigned long a1, unsigned long a2, | |||
601 | flush_fp_to_thread(current); | 601 | flush_fp_to_thread(current); |
602 | flush_altivec_to_thread(current); | 602 | flush_altivec_to_thread(current); |
603 | flush_spe_to_thread(current); | 603 | flush_spe_to_thread(current); |
604 | error = do_execve(filename, (char __user * __user *) a1, | ||
605 | (char __user * __user *) a2, regs); | ||
604 | if (error == 0) { | 606 | if (error == 0) { |
605 | task_lock(current); | 607 | task_lock(current); |
606 | current->ptrace &= ~PT_DTRACE; | 608 | current->ptrace &= ~PT_DTRACE; |