Merge remote-tracking branch 'linus/master' into testing

1 files changed, 2 insertions, 5 deletions

diff --git a/lib/idr.c b/lib/idr.c
index cca4b9302a71..bfe4db4e165f 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -524,9 +524,7 @@ EXPORT_SYMBOL(idr_alloc_cyclic);
 
 static void idr_remove_warning(int id)
 {
-        printk(KERN_WARNING
-                "idr_remove called for id=%d which is not allocated.\n", id);
-        dump_stack();
+        WARN(1, "idr_remove called for id=%d which is not allocated.\n", id);
 }
 
 static void sub_remove(struct idr *idp, int shift, int id)
@@ -1064,8 +1062,7 @@ void ida_remove(struct ida *ida, int id)
         return;
 
  err:
-        printk(KERN_WARNING
-               "ida_remove called for id=%d which is not allocated.\n", id);
+        WARN(1, "ida_remove called for id=%d which is not allocated.\n", id);
 }
 EXPORT_SYMBOL(ida_remove);