Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 309729
b: refs/heads/master
c: ae3cef7
h: refs/heads/master
i:
  309727: e4f18fb
v: v3
  • Loading branch information
Boaz Harrosh authored and Linus Torvalds committed Jun 1, 2012
1 parent c5550ec commit 2172649
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f0aac6162e945590057dcfb841bdce8fd18ed4f6
refs/heads/master: ae3cef7300e9fddc35ad251dd5f27c5b88c8594a
4 changes: 0 additions & 4 deletions trunk/include/linux/kmod.h
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
3 changes: 1 addition & 2 deletions trunk/kernel/kmod.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit 2172649

Please sign in to comment.