diff --git a/[refs] b/[refs] index 326647a914c9..adbd4cb5b72d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70834d3070c3f3015ab5c05176d54bd4a0100546 +refs/heads/master: b3449922502f5a161ee2b5022a33aec8472fbf18 diff --git a/trunk/kernel/kmod.c b/trunk/kernel/kmod.c index a0a88543934e..8ea25944ce33 100644 --- a/trunk/kernel/kmod.c +++ b/trunk/kernel/kmod.c @@ -199,6 +199,11 @@ void call_usermodehelper_freeinfo(struct subprocess_info *info) } EXPORT_SYMBOL(call_usermodehelper_freeinfo); +static void umh_complete(struct subprocess_info *sub_info) +{ + complete(sub_info->complete); +} + /* Keventd can't block, but this (a child) can. */ static int wait_for_helper(void *data) { @@ -235,7 +240,7 @@ static int wait_for_helper(void *data) sub_info->retval = ret; } - complete(sub_info->complete); + umh_complete(sub_info); return 0; } @@ -269,7 +274,7 @@ static void __call_usermodehelper(struct work_struct *work) case UMH_WAIT_EXEC: if (pid < 0) sub_info->retval = pid; - complete(sub_info->complete); + umh_complete(sub_info); } }