4 files changed, 2 insertions, 14 deletions

diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan
index 3d35d062970d..c253c1b46c6b 100644
--- a/lib/Kconfig.kasan
+++ b/lib/Kconfig.kasan
@@ -6,6 +6,7 @@ if HAVE_ARCH_KASAN
 config KASAN
         bool "KASan: runtime memory debugger"
         depends on SLUB || (SLAB && !DEBUG_SLAB)
+        select SLUB_DEBUG if SLUB
         select CONSTRUCTORS
         select STACKDEPOT
         help
diff --git a/lib/percpu_ida.c b/lib/percpu_ida.c
index 9bbd9c5d375a..beb14839b41a 100644
--- a/lib/percpu_ida.c
+++ b/lib/percpu_ida.c
@@ -141,7 +141,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
         spin_lock_irqsave(&tags->lock, flags);
 
         /* Fastpath */
-        if (likely(tags->nr_free >= 0)) {
+        if (likely(tags->nr_free)) {
                 tag = tags->freelist[--tags->nr_free];
                 spin_unlock_irqrestore(&tags->lock, flags);
                 return tag;
diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index 1642fd507a96..7c6096a71704 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -24,9 +24,6 @@
  **/
 struct scatterlist *sg_next(struct scatterlist *sg)
 {
-#ifdef CONFIG_DEBUG_SG
-        BUG_ON(sg->sg_magic != SG_MAGIC);
-#endif
         if (sg_is_last(sg))
                 return NULL;
 
@@ -111,10 +108,7 @@ struct scatterlist *sg_last(struct scatterlist *sgl, unsigned int nents)
         for_each_sg(sgl, sg, nents, i)
                 ret = sg;
 
-#ifdef CONFIG_DEBUG_SG
-        BUG_ON(sgl[0].sg_magic != SG_MAGIC);
         BUG_ON(!sg_is_last(ret));
-#endif
         return ret;
 }
 EXPORT_SYMBOL(sg_last);
diff --git a/lib/test_printf.c b/lib/test_printf.c
index b2aa8f514844..cea592f402ed 100644
--- a/lib/test_printf.c
+++ b/lib/test_printf.c
@@ -260,13 +260,6 @@ plain(void)
 {
         int err;
 
-        /*
-         * Make sure crng is ready. Otherwise we get "(ptrval)" instead
-         * of a hashed address when printing '%p' in plain_hash() and
-         * plain_format().
-         */
-        wait_for_random_bytes();
-
         err = plain_hash();
         if (err) {
                 pr_warn("plain 'p' does not appear to be hashed\n");