Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3385187pxk; Mon, 28 Sep 2020 16:35:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzz8JzXhAR9iDETm0ve0ahm+y+ZuPICKILePElptIlQkKJIJnzRbfJpGeZ9J0Atta6Aaxyz X-Received: by 2002:a17:906:4cd6:: with SMTP id q22mr1095644ejt.139.1601336158150; Mon, 28 Sep 2020 16:35:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601336158; cv=none; d=google.com; s=arc-20160816; b=SjA8hnfIGeWgiUrg9j2nP/AixH1MaiDLrS6nsU0ybYILhMDhdxn2k3TUmac2AA/Ry+ mzhkJBJRAYe20m2niCfm+aRiiEwxb6eJTKwxQxuHB4Le4XOGldJbBIO9DI97AEdqqm+H Fx2CbKGTEj0MNaeOZa3pMqIB0+mMrPE9MiN/zLo4eR4IhhrntGpnBCXg1rzdnd0owxAh L1WJ8o3jXLDTfOt2CML9g7mLEt4yseMyUZZ7SpMrnnREMsHzkZH1RasTLiZF3rkPsqSe GBVmMGWD6D5+/NXjgkivHd9SY41HbBeWrlCdKPtDgDtzaR7FDLB31c5TiqxwOi8IbezH A1pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=HaUBIgNbeHY0nfrqVV2PMuc1yeSbaTlxKde6vlGfSpk=; b=sZ1w1ZFuKaGSwSvx1br/UrY3lxb0XgRpkj5TGo5v6VsTnCuwuxAkb7yYPIgJ7H1od+ rvRPogohWP7edGKbeqN0KSeFARST6iXMBRzkd+GSMHjAtlUQxFK+rKvv9kd7ZW6guhf5 cGhWwBAoapbxliWuOeWiNJ9rJtAtKa/HoVG3Clvhh2DlNRQJF7glMkdAjf9jGIxvSlZT cj421K/A32N6IfXHduIp6To9o+aLHwWyUtgCF4iPxIvA4BwfJCr6+c00N+I+dOo8IKd8 un2NnQjynbyB7c22wklwlk43A7/a2HcrxF8I1dOFCasRFh6LK99cVlK3Y0WbHmmUod28 qS5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=n2dWiDct; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ce11si28953ejb.481.2020.09.28.16.35.27; Mon, 28 Sep 2020 16:35:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=n2dWiDct; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727271AbgI1XbO (ORCPT + 99 others); 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