1 files changed, 2 insertions, 6 deletions

diff --git a/kernel/kmod.c b/kernel/kmod.c
index 4f895556d7b..8a65e7886f4 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -255,12 +255,9 @@ static void __call_usermodehelper(struct work_struct *work)
 {
         struct subprocess_info *sub_info =
                 container_of(work, struct subprocess_info, work);
-        enum umh_wait wait = sub_info->wait;
+        int wait = sub_info->wait & ~UMH_KILLABLE;
         pid_t pid;
 
-        if (wait != UMH_NO_WAIT)
-                wait &= ~UMH_KILLABLE;
-
         /* CLONE_VFORK: wait until the usermode helper has execve'd
          * successfully We need the data structures to stay around
          * until that is done.  */
@@ -430,8 +427,7 @@ EXPORT_SYMBOL(call_usermodehelper_setfns);
  * asynchronously if wait is not set, and runs as a child of keventd.
  * (ie. it runs with full root capabilities).
  */
-int call_usermodehelper_exec(struct subprocess_info *sub_info,
-                             enum umh_wait wait)
+int call_usermodehelper_exec(struct subprocess_info *sub_info, int wait)
 {
         DECLARE_COMPLETION_ONSTACK(done);
         int retval = 0;