From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B203C2D0A8 for ; Mon, 28 Sep 2020 23:31:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DC31B21775 for ; Mon, 28 Sep 2020 23:31:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601335875; bh=SAdqNDMYiPXJzGpnDHbWkZPrsqj76BVlOKwIxsw8+d4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=emjkVefzGbHuQiaJrJIuepb1Kyy2X8EDkH4JGxJNudvqOdMkoU3hkPAwyIFAh467E RzSVJSf03FL4/fuOVbpqJAssRC9AWy+roMpf88vVtHLmWuiC6EuvcVCSIWJZ83AEBc fYvup3BheGUFKXV1n5N4wVwZiNaVWF7Gg5kRG6FE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727279AbgI1XbO (ORCPT ); Mon, 28 Sep 2020 19:31:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:54330 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726891AbgI1XbF (ORCPT ); Mon, 28 Sep 2020 19:31:05 -0400 Received: from paulmck-ThinkPad-P72.home (unknown [50.45.173.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 164B52100A; Mon, 28 Sep 2020 23:31:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601335865; bh=SAdqNDMYiPXJzGpnDHbWkZPrsqj76BVlOKwIxsw8+d4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n2dWiDctDrVfJ2h6lUK1zGYT+5uA/152BHNj8OdIPtCur9wnBZY4cIrELAPON+wfU 7pw46knccQWcITiREAlWKJ4TvNHZXfufoqBrNzCBqGgOyBFdx3ZUFRbSW1W/0lV+Hv g89LUHUTpaByxEbYvsJr3c2ubyYr6DBs8FZNmO7Q= From: paulmck@kernel.org To: rcu@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com, mingo@kernel.org, jiangshanlai@gmail.com, akpm@linux-foundation.org, mathieu.desnoyers@efficios.com, josh@joshtriplett.org, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, dhowells@redhat.com, edumazet@google.com, fweisbec@gmail.com, oleg@redhat.com, joel@joelfernandes.org, mhocko@kernel.org, mgorman@techsingularity.net, torvalds@linux-foundation.org, Will Deacon , "Paul E . McKenney" Subject: [PATCH tip/core/rcu 04/15] lockdep: Cleanup PREEMPT_COUNT leftovers Date: Mon, 28 Sep 2020 16:30:51 -0700 Message-Id: <20200928233102.24265-4-paulmck@kernel.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200928233041.GA23230@paulmck-ThinkPad-P72> References: <20200928233041.GA23230@paulmck-ThinkPad-P72> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Gleixner CONFIG_PREEMPT_COUNT is now unconditionally enabled and will be removed. Cleanup the leftovers before doing so. Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Will Deacon Acked-by: Will Deacon Signed-off-by: Paul E. McKenney --- include/linux/lockdep.h | 6 ++---- lib/Kconfig.debug | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index 6a584b3..879de69 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -560,16 +560,14 @@ do { \ #define lockdep_assert_preemption_enabled() \ do { \ - WARN_ON_ONCE(IS_ENABLED(CONFIG_PREEMPT_COUNT) && \ - debug_locks && \ + WARN_ON_ONCE(debug_locks && \ (preempt_count() != 0 || \ !raw_cpu_read(hardirqs_enabled))); \ } while (0) #define lockdep_assert_preemption_disabled() \ do { \ - WARN_ON_ONCE(IS_ENABLED(CONFIG_PREEMPT_COUNT) && \ - debug_locks && \ + WARN_ON_ONCE(debug_locks && \ (preempt_count() == 0 && \ raw_cpu_read(hardirqs_enabled))); \ } while (0) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index f50fbcf..d4d0574 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1161,7 +1161,6 @@ config PROVE_LOCKING select DEBUG_RWSEMS select DEBUG_WW_MUTEX_SLOWPATH select DEBUG_LOCK_ALLOC - select PREEMPT_COUNT select TRACE_IRQFLAGS default n help -- 2.9.5