Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 29 Apr 2019 07:16:02 -0700
From:   tip-bot for zhengbin <tipbot@zytor.com>
Message-ID: <tip-d671002be6bdd7f77a771e23bf3e95d1f16775e6@git.kernel.org>
Cc:     peterz@infradead.org, torvalds@linux-foundation.org,
        tglx@linutronix.de, linux-kernel@vger.kernel.org,
        paulmck@linux.vnet.ibm.com, akpm@linux-foundation.org,
        mingo@kernel.org, will.deacon@arm.com, hpa@zytor.com,
        zhengbin13@huawei.com
Reply-To: akpm@linux-foundation.org, paulmck@linux.vnet.ibm.com,
          linux-kernel@vger.kernel.org, tglx@linutronix.de,
          peterz@infradead.org, torvalds@linux-foundation.org,
          zhengbin13@huawei.com, hpa@zytor.com, will.deacon@arm.com,
          mingo@kernel.org
In-Reply-To: <1556540791-23110-1-git-send-email-zhengbin13@huawei.com>
References: <1556540791-23110-1-git-send-email-zhengbin13@huawei.com>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:locking/core] locking/lockdep: Remove unnecessary unlikely()
Git-Commit-ID: d671002be6bdd7f77a771e23bf3e95d1f16775e6
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  d671002be6bdd7f77a771e23bf3e95d1f16775e6
Gitweb:     https://git.kernel.org/tip/d671002be6bdd7f77a771e23bf3e95d1f16775e6
Author:     zhengbin <zhengbin13@huawei.com>
AuthorDate: Mon, 29 Apr 2019 20:26:31 +0800
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 29 Apr 2019 16:11:01 +0200

locking/lockdep: Remove unnecessary unlikely()

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 25ecc6d3058b..6426d071a324 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -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;
 
 	/*