Commit 4cd083d5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a05aea98 4515d08a

include/linux/module.h

+1 −1
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ extern void __module_get(struct module *module); 
 * @module: the module we should check for

 *

 * Only try to get a module reference count if the module is not being removed.

 * This call will fail if the module is already being removed.

 * This call will fail if the module is in the process of being removed.

 *

 * Care must also be taken to ensure the module exists and is alive prior to

 * usage of this call. This can be gauranteed through two means:

kernel/module/dups.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ bool kmod_dup_request_exists_wait(char *module_name, bool wait, int *dup_ret) 
	 * optimization enabled ...

	 */

	ret = wait_for_completion_state(&kmod_req->first_req_done,

					TASK_UNINTERRUPTIBLE | TASK_KILLABLE);

					TASK_KILLABLE);

	if (ret) {

		*dup_ret = ret;

		return true;