summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-05-01 10:35:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-01 10:35:01 -0700
commit60b88f3941e1baa200d01481b40e963c44243672 (patch)
treebdd76cef7f2094f3bd3495ca45775c75a84db53b /kernel
parentb7e1bd964812808710b48a5f9a58f7ddfb1d4e59 (diff)
parent79465d2fd48e68940c2bdecddbdecd45bbba06fe (diff)
downloadlinux-60b88f3941e1baa200d01481b40e963c44243672.tar.gz
linux-60b88f3941e1baa200d01481b40e963c44243672.tar.xz
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
Diffstat (limited to 'kernel')
-rw-r--r--kernel/module.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/module.c b/kernel/module.c
index 5f14fec..079c461 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -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;