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=-14.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham 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 E19C9C433E7 for ; Fri, 9 Oct 2020 17:01:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AE49022251 for ; Fri, 9 Oct 2020 17:01:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="l2DhmzVV"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="mrXrBLdg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390048AbgJIRB6 (ORCPT ); Fri, 9 Oct 2020 13:01:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389960AbgJIRBa (ORCPT ); Fri, 9 Oct 2020 13:01:30 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2BA2C0613D5; Fri, 9 Oct 2020 10:01:29 -0700 (PDT) Date: Fri, 09 Oct 2020 17:01:27 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1602262888; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ufYBVR9+tvOGV9InmkinKMjA91EJlwAInVNaD8Xo/24=; b=l2DhmzVVQw+x70nwqFthIKda/v2WK9HThAzLoJbIoqn5iyq3UcjXcPqT25upEBpSs+1GhT 8f8UJquMqj11pnrbWgbuG9+xAI8jjE2A/Y5I25RmMq1TGq397kUivLNDMz1wdPGE4mr+OA V1+fIVwha3cvu2Hc0DLPFl5KK4yrG0TNqghKBG7g0fuyn7k6mk+/Uvm8T4iBdqkltOQSv0 RvUwO2XoUVHbay+ckj3MSVpVhJ8frj4NjfETPfqAQh4YxjAFrqBJGNrV2OJ1Pp+x+yd+P9 B2PXjeE9kQxLTeqnEe+XIdUmAXmqBh3zj9zdOnjb4cUGog6sThO5s0nyF62R4g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1602262888; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ufYBVR9+tvOGV9InmkinKMjA91EJlwAInVNaD8Xo/24=; b=mrXrBLdg6j3ozKkKMxg2k/821p3rsrLREzTmW+36a0al5lrOz+yOE96AxnSK5q92wzcCZK xo9njbZ/fBseySDg== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: core/rcu] lockdep: Cleanup PREEMPT_COUNT leftovers Cc: Thomas Gleixner , Peter Zijlstra , Ingo Molnar , Will Deacon , "Paul E. McKenney" , x86 , LKML MIME-Version: 1.0 Message-ID: <160226288765.7002.17366343920565407938.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the core/rcu branch of tip: Commit-ID: 0eb8743dc57063598478c2549669fda36c25b917 Gitweb: https://git.kernel.org/tip/0eb8743dc57063598478c2549669fda36c25b917 Author: Thomas Gleixner AuthorDate: Mon, 14 Sep 2020 19:23:55 +02:00 Committer: Paul E. McKenney CommitterDate: Mon, 28 Sep 2020 16:03:19 -07:00 lockdep: Cleanup PREEMPT_COUNT leftovers 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