locking/lockdep: Remove unnecessary unlikely()
authorzhengbin <zhengbin13@huawei.com>
Mon, 29 Apr 2019 12:26:31 +0000 (20:26 +0800)
committerIngo Molnar <mingo@kernel.org>
Mon, 29 Apr 2019 14:11:01 +0000 (16:11 +0200)
DEBUG_LOCKS_WARN_ON() already contains an unlikely(), there is no need
for another one.

Signed-off-by: zhengbin <zhengbin13@huawei.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Cc: houtao1@huawei.com
Link: http://lkml.kernel.org/r/1556540791-23110-1-git-send-email-zhengbin13@huawei.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/locking/lockdep.c

index 25ecc6d..6426d07 100644 (file)
@@ -3256,7 +3256,7 @@ void lockdep_hardirqs_on(unsigned long ip)
        /*
         * See the fine text that goes along with this variable definition.
         */
-       if (DEBUG_LOCKS_WARN_ON(unlikely(early_boot_irqs_disabled)))
+       if (DEBUG_LOCKS_WARN_ON(early_boot_irqs_disabled))
                return;
 
        /*