Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp3594457yba; Mon, 29 Apr 2019 05:23:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqwzju0Wc/PbEJ5x0Bnzv1+7S6F+014Rshktph2dAo3rMCA2UkXs1Pi8Tr6LKGFkL6dVMSPq X-Received: by 2002:a17:902:9b83:: with SMTP id y3mr61614264plp.165.1556540621628; Mon, 29 Apr 2019 05:23:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556540621; cv=none; d=google.com; s=arc-20160816; b=PMOnS39GnZ+IgCCK4ZS8DCMLYHKyZHyOHdT+MdkEqDBT1BQOSACN66iFJuvXmb4A6x k+MMuH13zDFgWzBG2OTOZEpdfnXHZGORKk0ABQ1kW91OQc/NlBMyeyc94c76qjPaecR/ abHpJ4jciR13NjhINNy3evWAA6aZWnp1QmbD4zPZkHu3DsmHZjqmRHMn95yhDYOtJsvL ZICgEca/hFHCe1D1orAoPgeitdkzgpJ1b5NvL0tnpY5jOzhPKG/oLZQFV97IADzjdO9x qq4n3tIsv4UYOJlo1Bv2JnenJZu671+KwLYgozBycV0ffkKTGRrEYC0L8Ak7vYDkrlVd kQBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from; bh=qs9V1sxPQf2HNSmKgnf6FkIrgIaul3OpJlthijqdGbw=; b=n9REdSkS9e38O0Htfyqs4skpGJNdGXlDD5SKP/+0WqUiR7PNbUD7A5k8mxg4vwFPgK OvAXlvu2xWsYByVHVPUV/+fKPDw5PJG19BC2BWctJfiXa6+N+d2UcAuvXNSYeQrZ4776 QkmBmHMOzu2wYZBxRpBhxKR+4FKKnOpGT6caYOWFKYqbD9eZqT+a5ZTHL8aDYlBcM9Xi aKvkwK25zpQqXGkE4z1OD1LjK/cqGn8qrpDor5fPaC3TamsiCT0VI2S1PZ3B3AAGUqTV iUcGYqU8R3CrkOrwN6N3YopRcUZuQxAnstwcTH/W3EnyFrdu+KVf4JNrEH8t2QL4c6e+ uzqw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r5si32106076pls.46.2019.04.29.05.23.25; Mon, 29 Apr 2019 05:23:41 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728157AbfD2MWS (ORCPT + 99 others); Mon, 29 Apr 2019 08:22:18 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:7141 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727710AbfD2MWQ (ORCPT ); Mon, 29 Apr 2019 08:22:16 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 9D18AF454F8671C87392; Mon, 29 Apr 2019 20:22:12 +0800 (CST) Received: from huawei.com (10.90.53.225) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.439.0; Mon, 29 Apr 2019 20:22:02 +0800 From: zhengbin To: , , , CC: Subject: [PATCH] lockdep: remove unnecessary unlikely() Date: Mon, 29 Apr 2019 20:26:31 +0800 Message-ID: <1556540791-23110-1-git-send-email-zhengbin13@huawei.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.90.53.225] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org DEBUG_LOCKS_WARN_ON() already contains an unlikely(), there is no need for another one. Signed-off-by: zhengbin --- 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 e221be7..1522034 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -3157,7 +3157,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; /* -- 2.7.4