Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 2 insertions, 1 deletions

diff --git a/fs/binfmt_som.c b/fs/binfmt_som.c
index eff74b9c9e77..cc8560f6c9b0 100644
--- a/fs/binfmt_som.c
+++ b/fs/binfmt_som.c
@@ -43,7 +43,7 @@ static int load_som_library(struct file *);
  * don't even try.
  */
 #if 0
-static int som_core_dump(long signr, struct pt_regs *regs, unsigned long limit);
+static int som_core_dump(struct coredump_params *cprm);
 #else
 #define som_core_dump   NULL
 #endif
@@ -227,6 +227,7 @@ load_som_binary(struct linux_binprm * bprm, struct pt_regs * regs)
         /* OK, This is the point of no return */
         current->flags &= ~PF_FORKNOEXEC;
         current->personality = PER_HPUX;
+        setup_new_exec(bprm);
 
         /* Set the task size for HP-UX processes such that
          * the gateway page is outside the address space.