Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[linux-beck.git] / kernel / kmod.c

diff --git a/kernel/kmod.c b/kernel/kmod.c
index 6b375af4958d1290c5c7a066903203802ee41d77..8637e041a24722b7245f5a5cf24fa7dd71dce001 100644 (file)
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -285,10 +285,7 @@ static int wait_for_helper(void *data)
        pid_t pid;
 
        /* If SIGCLD is ignored sys_wait4 won't populate the status. */
-       spin_lock_irq(&current->sighand->siglock);
-       current->sighand->action[SIGCHLD-1].sa.sa_handler = SIG_DFL;
-       spin_unlock_irq(&current->sighand->siglock);
-
+       kernel_sigaction(SIGCHLD, SIG_DFL);
        pid = kernel_thread(____call_usermodehelper, sub_info, SIGCHLD);
        if (pid < 0) {
                sub_info->retval = pid;
@@ -498,7 +495,7 @@ int __usermodehelper_disable(enum umh_disable_depth depth)
 static void helper_lock(void)
 {
        atomic_inc(&running_helpers);
-       smp_mb__after_atomic_inc();
+       smp_mb__after_atomic();
 }
 
 static void helper_unlock(void)