Merge branch 'upstream' into for-linus

[karo-tx-linux.git] / include / linux / kmod.h

diff --git a/include/linux/kmod.h b/include/linux/kmod.h
index 5c058778ad35dfaa59f7c9144a1a11843e4c0a0e..6efd7a78de6aaaa6d74c526ba44f5fafa81e1fad 100644 (file)
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -56,7 +56,6 @@ enum umh_wait {
 struct subprocess_info {
        struct work_struct work;
        struct completion *complete;
-       struct cred *cred;
        char *path;
        char **argv;
        char **envp;
@@ -72,8 +71,6 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
                                                  char **envp, gfp_t gfp_mask);
 
 /* Set various pieces of state into the subprocess_info structure */
-void call_usermodehelper_setkeys(struct subprocess_info *info,
-                                struct key *session_keyring);
 void call_usermodehelper_setfns(struct subprocess_info *info,
                    int (*init)(struct subprocess_info *info),
                    void (*cleanup)(struct subprocess_info *info),
@@ -112,21 +109,6 @@ call_usermodehelper(char *path, char **argv, char **envp, enum umh_wait wait)
                                       NULL, NULL, NULL);
 }
 
-static inline int
-call_usermodehelper_keys(char *path, char **argv, char **envp,
-                        struct key *session_keyring, enum umh_wait wait)
-{
-       struct subprocess_info *info;
-       gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL;
-
-       info = call_usermodehelper_setup(path, argv, envp, gfp_mask);
-       if (info == NULL)
-               return -ENOMEM;
-
-       call_usermodehelper_setkeys(info, session_keyring);
-       return call_usermodehelper_exec(info, wait);
-}
-
 extern void usermodehelper_init(void);
 
 extern int usermodehelper_disable(void);