drm/i915/region: fix order when adding blocks

[linux-2.6-microblaze.git] / kernel / umh.c

diff --git a/kernel/umh.c b/kernel/umh.c
index a25433f..fcf3ee8 100644 (file)
--- a/kernel/umh.c
+++ b/kernel/umh.c
@@ -119,37 +119,16 @@ static void call_usermodehelper_exec_sync(struct subprocess_info *sub_info)
 {
        pid_t pid;
 
-       /* If SIGCLD is ignored kernel_wait4 won't populate the status. */
+       /* If SIGCLD is ignored do_wait won't populate the status. */
        kernel_sigaction(SIGCHLD, SIG_DFL);
        pid = kernel_thread(call_usermodehelper_exec_async, sub_info, SIGCHLD);
-       if (pid < 0) {
+       if (pid < 0)
                sub_info->retval = pid;
-       } else {
-               int ret = -ECHILD;
-               /*
-                * Normally it is bogus to call wait4() from in-kernel because
-                * wait4() wants to write the exit code to a userspace address.
-                * But call_usermodehelper_exec_sync() always runs as kernel
-                * thread (workqueue) and put_user() to a kernel address works
-                * OK for kernel threads, due to their having an mm_segment_t
-                * which spans the entire address space.
-                *
-                * Thus the __user pointer cast is valid here.
-                */
-               kernel_wait4(pid, (int __user *)&ret, 0, NULL);
-
-               /*
-                * If ret is 0, either call_usermodehelper_exec_async failed and
-                * the real error code is already in sub_info->retval or
-                * sub_info->retval is 0 anyway, so don't mess with it then.
-                */
-               if (ret)
-                       sub_info->retval = ret;
-       }
+       else
+               kernel_wait(pid, &sub_info->retval);
 
        /* Restore default kernel sig handler */
        kernel_sigaction(SIGCHLD, SIG_IGN);
-
        umh_complete(sub_info);
 }