Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (22 commits)
  [S390] Update default configuration.
  [S390] hibernate: Do real CPU swap at resume time
  [S390] dasd: tolerate devices that have no feature codes
  [S390] zcrypt: Do not add/remove devices in s/r callbacks
  [S390] hibernate: make sure pfn_is_nosave handles lowcore pages
  [S390] smp: introduce LC_ORDER and simplify lowcore handling
  [S390] ptrace: use common code for simple peek/poke operations
  [S390] fix disabled_wait inline assembly clobber list
  [S390] Change kernel_page_present coding style.
  [S390] hibernation: reset system after resume
  [S390] hibernation: fix guest page hinting related crash
  [S390] Get rid of init_module/delete_module compat functions.
  [S390] Convert sys_execve to function with parameters.
  [S390] Convert sys_clone to function with parameters.
  [S390] qdio: change state of all primed input buffers
  [S390] qdio: reduce per device debug messages
  [S390] cio: introduce consistent subchannel scanning
  [S390] cio: idset use actual number of ssids
  [S390] cio: dont kfree vmalloced memory
  [S390] cio: introduce css_settle
  ...

1 files changed, 15 insertions, 25 deletions

diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index 5a43f27eec13..59fe6ecc6ed3 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -32,6 +32,7 @@
 #include <linux/elfcore.h>
 #include <linux/kernel_stat.h>
 #include <linux/syscalls.h>
+#include <linux/compat.h>
 #include <asm/compat.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
@@ -230,17 +231,11 @@ SYSCALL_DEFINE0(fork)
         return do_fork(SIGCHLD, regs->gprs[15], regs, 0, NULL, NULL);
 }
 
-SYSCALL_DEFINE0(clone)
+SYSCALL_DEFINE4(clone, unsigned long, newsp, unsigned long, clone_flags,
+                int __user *, parent_tidptr, int __user *, child_tidptr)
 {
         struct pt_regs *regs = task_pt_regs(current);
-        unsigned long clone_flags;
-        unsigned long newsp;
-        int __user *parent_tidptr, *child_tidptr;
 
-        clone_flags = regs->gprs[3];
-        newsp = regs->orig_gpr2;
-        parent_tidptr = (int __user *) regs->gprs[4];
-        child_tidptr = (int __user *) regs->gprs[5];
         if (!newsp)
                 newsp = regs->gprs[15];
         return do_fork(clone_flags, newsp, regs, 0,
@@ -274,30 +269,25 @@ asmlinkage void execve_tail(void)
 /*
  * sys_execve() executes a new program.
  */
-SYSCALL_DEFINE0(execve)
+SYSCALL_DEFINE3(execve, char __user *, name, char __user * __user *, argv,
+                char __user * __user *, envp)
 {
         struct pt_regs *regs = task_pt_regs(current);
         char *filename;
-        unsigned long result;
-        int rc;
+        long rc;
 
-        filename = getname((char __user *) regs->orig_gpr2);
-        if (IS_ERR(filename)) {
-                result = PTR_ERR(filename);
+        filename = getname(name);
+        rc = PTR_ERR(filename);
+        if (IS_ERR(filename))
+                return rc;
+        rc = do_execve(filename, argv, envp, regs);
+        if (rc)
                 goto out;
-        }
-        rc = do_execve(filename, (char __user * __user *) regs->gprs[3],
-                       (char __user * __user *) regs->gprs[4], regs);
-        if (rc) {
-                result = rc;
-                goto out_putname;
-        }
         execve_tail();
-        result = regs->gprs[2];
-out_putname:
-        putname(filename);
+        rc = regs->gprs[2];
 out:
-        return result;
+        putname(filename);
+        return rc;
 }
 
 /*