tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 60b88f39 b7e1bd96

+1 -4
+1 -1
include/trace/events/module.h
··· 25 25 { (1UL << TAINT_OOT_MODULE), "O" }, \ 26 26 { (1UL << TAINT_FORCED_MODULE), "F" }, \ 27 27 { (1UL << TAINT_CRAP), "C" }, \ 28 - { (1UL << TAINT_UNSIGNED_MODULE), "X" }) 28 + { (1UL << TAINT_UNSIGNED_MODULE), "E" }) 29 29 30 30 TRACE_EVENT(module_load, 31 31
-3
kernel/module.c
··· 815 815 return -EFAULT; 816 816 name[MODULE_NAME_LEN-1] = '\0'; 817 817 818 - if (!(flags & O_NONBLOCK)) 819 - pr_warn("waiting module removal not supported: please upgrade\n"); 820 - 821 818 if (mutex_lock_interruptible(&module_mutex) != 0) 822 819 return -EINTR; 823 820