Skip to content

Commit 4cd083d

Browse files
committed
Merge tag 'modules-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux
Pull module updates from Luis Chamberlain: "Just one cleanup and one documentation improvement change. No functional changes" * tag 'modules-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux: kernel/module: improve documentation for try_module_get() module: Remove redundant TASK_UNINTERRUPTIBLE
2 parents a05aea9 + 4515d08 commit 4cd083d

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

include/linux/module.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ extern void __module_get(struct module *module);
670670
* @module: the module we should check for
671671
*
672672
* Only try to get a module reference count if the module is not being removed.
673-
* This call will fail if the module is already being removed.
673+
* This call will fail if the module is in the process of being removed.
674674
*
675675
* Care must also be taken to ensure the module exists and is alive prior to
676676
* usage of this call. This can be gauranteed through two means:

kernel/module/dups.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ bool kmod_dup_request_exists_wait(char *module_name, bool wait, int *dup_ret)
207207
* optimization enabled ...
208208
*/
209209
ret = wait_for_completion_state(&kmod_req->first_req_done,
210-
TASK_UNINTERRUPTIBLE | TASK_KILLABLE);
210+
TASK_KILLABLE);
211211
if (ret) {
212212
*dup_ret = ret;
213213
return true;

0 commit comments

Comments
 (0)