Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[~andy/linux] / kernel / module.c

diff --git a/kernel/module.c b/kernel/module.c
index f5a3b1e8ec5137395fba2b42165aeb972f0530d0..d24fcf29cb64c16029857a89dbcdeaa1ef9d724a 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -815,10 +815,8 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
                return -EFAULT;
        name[MODULE_NAME_LEN-1] = '\0';
 
-       if (!(flags & O_NONBLOCK)) {
-               printk(KERN_WARNING
-                      "waiting module removal not supported: please upgrade");
-       }
+       if (!(flags & O_NONBLOCK))
+               pr_warn("waiting module removal not supported: please upgrade\n");
 
        if (mutex_lock_interruptible(&module_mutex) != 0)
                return -EINTR;