From 21726498441e59fc1769d37ab03c44a1e88984fa Mon Sep 17 00:00:00 2001 From: Boaz Harrosh Date: Thu, 31 May 2012 16:26:14 -0700 Subject: [PATCH] --- yaml --- r: 309729 b: refs/heads/master c: ae3cef7300e9fddc35ad251dd5f27c5b88c8594a h: refs/heads/master i: 309727: e4f18fb21ad1aa2adc9c960aa72bb3a1b57fa022 v: v3 --- [refs] | 2 +- trunk/include/linux/kmod.h | 4 ---- trunk/kernel/kmod.c | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 181961fc2817..b23777c7e65f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0aac6162e945590057dcfb841bdce8fd18ed4f6 +refs/heads/master: ae3cef7300e9fddc35ad251dd5f27c5b88c8594a diff --git a/trunk/include/linux/kmod.h b/trunk/include/linux/kmod.h index dd99c329e161..f07f9a4e10ff 100644 --- a/trunk/include/linux/kmod.h +++ b/trunk/include/linux/kmod.h @@ -79,10 +79,6 @@ void call_usermodehelper_setfns(struct subprocess_info *info, /* Actually execute the sub-process */ int call_usermodehelper_exec(struct subprocess_info *info, int wait); -/* Free the subprocess_info. This is only needed if you're not going - to call call_usermodehelper_exec */ -void call_usermodehelper_freeinfo(struct subprocess_info *info); - static inline int call_usermodehelper_fns(char *path, char **argv, char **envp, int wait, int (*init)(struct subprocess_info *info, struct cred *new), diff --git a/trunk/kernel/kmod.c b/trunk/kernel/kmod.c index 05698a7415fe..21a0f8e99102 100644 --- a/trunk/kernel/kmod.c +++ b/trunk/kernel/kmod.c @@ -221,13 +221,12 @@ static int ____call_usermodehelper(void *data) return 0; } -void call_usermodehelper_freeinfo(struct subprocess_info *info) +static void call_usermodehelper_freeinfo(struct subprocess_info *info) { if (info->cleanup) (*info->cleanup)(info); kfree(info); } -EXPORT_SYMBOL(call_usermodehelper_freeinfo); static void umh_complete(struct subprocess_info *sub_info) {