2 files changed, 15 insertions, 5 deletions

diff --git a/fs/coredump.c b/fs/coredump.c
index 7dfb3b062e24..d52f6bd5ad8e 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -525,6 +525,7 @@ void do_coredump(siginfo_t *siginfo)
         if (ispipe) {
                 int dump_count;
                 char **helper_argv;
+                struct subprocess_info *sub_info;
 
                 if (ispipe < 0) {
                         printk(KERN_WARNING "format_corename failed\n");
@@ -571,9 +572,14 @@ void do_coredump(siginfo_t *siginfo)
                         goto fail_dropcount;
                 }
 
-                retval = call_usermodehelper_fns(helper_argv[0], helper_argv,
-                                        NULL, UMH_WAIT_EXEC, umh_pipe_setup,
-                                        NULL, &cprm);
+                retval = -ENOMEM;
+                sub_info = call_usermodehelper_setup(helper_argv[0],
+                                                helper_argv, NULL, GFP_KERNEL,
+                                                umh_pipe_setup, NULL, &cprm);
+                if (sub_info)
+                        retval = call_usermodehelper_exec(sub_info,
+                                                          UMH_WAIT_EXEC);
+
                 argv_free(helper_argv);
                 if (retval) {
                         printk(KERN_INFO "Core dump to %s pipe failed\n",
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index a32ec1ce882b..3e0878e8a80d 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -50,6 +50,7 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
 
 static void __init handle_initrd(void)
 {
+        struct subprocess_info *info;
         static char *argv[] = { "linuxrc", NULL, };
         extern char *envp_init[];
         int error;
@@ -70,8 +71,11 @@ static void __init handle_initrd(void)
          */
         current->flags |= PF_FREEZER_SKIP;
 
-        call_usermodehelper_fns("/linuxrc", argv, envp_init, UMH_WAIT_PROC,
-                        init_linuxrc, NULL, NULL);
+        info = call_usermodehelper_setup("/linuxrc", argv, envp_init,
+                                         GFP_KERNEL, init_linuxrc, NULL, NULL);
+        if (!info)
+                return;
+        call_usermodehelper_exec(info, UMH_WAIT_PROC);
 
         current->flags &= ~PF_FREEZER_SKIP;