summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2014-04-28 11:05:43 +0930
committerRusty Russell <rusty@rustcorp.com.au>2014-04-28 11:06:59 +0930
commit79465d2fd48e68940c2bdecddbdecd45bbba06fe (patch)
treedda5d44feb8ef0845c8c367c2e3a223b46f6a8e7 /kernel
parent132e9a68a5794ad2e4a3d0c07dfb7133a70b1651 (diff)
downloadlinux-79465d2fd48e68940c2bdecddbdecd45bbba06fe.tar.gz
linux-79465d2fd48e68940c2bdecddbdecd45bbba06fe.tar.xz
module: remove warning about waiting module removal.
We remove the waiting module removal in commit 3f2b9c9cdf38 (September 2013), but it turns out that modprobe in kmod (< version 16) was asking for waiting module removal. No one noticed since modprobe would check for 0 usage immediately before trying to remove the module, and the race is unlikely. However, it means that anyone running old (but not ancient) kmod versions is hitting the printk designed to see if anyone was running "rmmod -w". All reports so far have been false positives, so remove the warning. Fixes: 3f2b9c9cdf389e303b2273679af08aab5f153517 Reported-by: Valerio Vanni <valerio.vanni@inwind.it> Cc: Elliott, Robert (Server Storage) <Elliott@hp.com> Cc: stable@kernel.org Acked-by: Lucas De Marchi <lucas.de.marchi@gmail.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
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 1186940..ae78218 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;