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 64A87C433E7 for ; Fri, 9 Oct 2020 17:02:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2D31722251 for ; Fri, 9 Oct 2020 17:02:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="y6fVjPPU"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="20+dVflX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390081AbgJIRCL (ORCPT ); Fri, 9 Oct 2020 13:02:11 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:59214 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389936AbgJIRB3 (ORCPT ); Fri, 9 Oct 2020 13:01:29 -0400 Date: Fri, 09 Oct 2020 17:01:25 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1602262886; 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=SE7Czp+opUNx4ncsSvp0lItuPv8IWzF11iong+Ft6LY=; b=y6fVjPPUBagujRcAmhIwv5Inp3Sf5edELAhK1A6oy1ftqN9X+IH4F60+FuVYDXIyG2uBcv 6qzITS5hoTYlmL7ScxUpcX1gzGfwSQQpZJYQItHOU//HgXoBWrYbzutkps2cTL9CiRXj6s uy8/eZR9Zm+4ETHwZGNIvW4s7kDE4t48GBIPawyhTrG8g1nwof0ecMdsFM+NkHqbtXacH4 0BIO19wD2FwS9lnTkzCF6eR7sYbze8iigb9qM92WEyYWL2tFm4Np5PsbfplFAPXcfjRjcf mFNhmF2H+uV5DnRW+KNizBQEjQp/dVoHrfCvmuaTmoa9E8hbzreoTVEhzbWdjw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1602262886; 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=SE7Czp+opUNx4ncsSvp0lItuPv8IWzF11iong+Ft6LY=; b=20+dVflXkAjCJ5MDWEzGiaJQuByQTGupuFOln6VsgXR45l3GfWHg4qQeSqqwMoLXbBt4Tc pBoh1x3okDTL2xAg== 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] sched: Cleanup PREEMPT_COUNT leftovers Cc: Thomas Gleixner , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , "Paul E. McKenney" , x86 , LKML MIME-Version: 1.0 Message-ID: <160226288549.7002.94618164546835622.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: 4a291f57d97ce1c14d286b2451573ccbb3b43022 Gitweb: https://git.kernel.org/tip/4a291f57d97ce1c14d286b2451573ccbb3b43022 Author: Thomas Gleixner AuthorDate: Mon, 14 Sep 2020 19:30:49 +02:00 Committer: Paul E. McKenney CommitterDate: Mon, 28 Sep 2020 16:03:21 -07:00 sched: 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: Ingo Molnar Cc: Peter Zijlstra Cc: Juri Lelli Cc: Vincent Guittot Cc: Dietmar Eggemann Cc: Steven Rostedt Cc: Ben Segall Cc: Mel Gorman Cc: Daniel Bristot de Oliveira Signed-off-by: Paul E. McKenney --- kernel/sched/core.c | 6 +----- lib/Kconfig.debug | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 2d95dc3..1c304a1 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3706,8 +3706,7 @@ asmlinkage __visible void schedule_tail(struct task_struct *prev) * finish_task_switch() for details. * * finish_task_switch() will drop rq->lock() and lower preempt_count - * and the preempt_enable() will end up enabling preemption (on - * PREEMPT_COUNT kernels). + * and the preempt_enable() will end up enabling preemption. */ rq = finish_task_switch(prev); @@ -7308,9 +7307,6 @@ void __cant_sleep(const char *file, int line, int preempt_offset) if (irqs_disabled()) return; - if (!IS_ENABLED(CONFIG_PREEMPT_COUNT)) - return; - if (preempt_count() > preempt_offset) return; diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index d4d0574..52af6ad 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -1320,7 +1320,6 @@ config DEBUG_LOCKDEP config DEBUG_ATOMIC_SLEEP bool "Sleep inside atomic section checking" - select PREEMPT_COUNT depends on DEBUG_KERNEL help If you say Y here, various routines which may sleep will become very