Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60b88f39 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux 

Pull module fixes from Rusty Russell:
 "Fixed one missing place for the new taint flag, and remove a warning
  giving only false positives (now we finally figured out why)"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  module: remove warning about waiting module removal.
  Fix: tracing: use 'E' instead of 'X' for unsigned module taint flag
parents b7e1bd96 79465d2f

include/trace/events/module.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct module; 
	{ (1UL << TAINT_OOT_MODULE),		"O" },		\

	{ (1UL << TAINT_FORCED_MODULE),		"F" },		\

	{ (1UL << TAINT_CRAP),			"C" },		\

	{ (1UL << TAINT_UNSIGNED_MODULE),	"X" })

	{ (1UL << TAINT_UNSIGNED_MODULE),	"E" })



TRACE_EVENT(module_load,

kernel/module.c

+0 −3
Original line number Diff line number Diff line
@@ -815,9 +815,6 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user, 
		return -EFAULT;

	name[MODULE_NAME_LEN-1] = '\0';



	if (!(flags & O_NONBLOCK))

		pr_warn("waiting module removal not supported: please upgrade\n");



	if (mutex_lock_interruptible(&module_mutex) != 0)

		return -EINTR;