Merge tag 'sound-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-block.git] / kernel / module.c

diff --git a/kernel/module.c b/kernel/module.c
index 5f14fec9f825f907d5e6939fe9d1a9a469ab4654..079c4615607d6ed266330a5416529bfcc37e4db0 100644 (file)
--- 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;