Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3385771pxk; Mon, 28 Sep 2020 16:37:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8OEo1l4z7wy1dfDTAUag5t6j9u/9kYARxAsTvA8ZVFlzV7lnUETqrQLGKazthrfaVYj34 X-Received: by 2002:a05:6402:17b5:: with SMTP id j21mr405280edy.276.1601336235112; Mon, 28 Sep 2020 16:37:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601336235; cv=none; d=google.com; s=arc-20160816; b=s2lTp2zcgEN5m2bf0n9iLQeDiljPt+OJzCAeogNmU+dJaxc+6UQrJ0Twmg0Xe0GNuS s+d4WPnk4+FrJzAUNzjSuKpkHmJ/n46RqBSmaR08hvfa2rrQ1Rf1lp/rdTeAUIneLCqi IUTldi1x8Y431WiHN8P2kRTjMPch7f+73qZFzjBRLy7XFwklqKd778LhU1De6HOvEmSJ +DowNz2s3N5WRIDkroo8bZNI2kvBaRYnU59O3kw4vNAeu7NcDLCcdPf/4SAqx/RIKh+9 prczyj5njgcUi9//QCgCxfUp90R3epSg00bgZacFlFBYnGZHqhLxaBJGppNFny7oZj1C Q9oQ== 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=rXii62048CTEAER0ZQJa5E8yby6nE7er/s+E+aNLVco=; b=BSCNSRxe8Y3gP7KSonJzDnq4M9C5u6mEBXVRic+IpE9klryVHdeFUPeUlr3dpogWAO P41QiZFiZ9ntmMCBjVGVRBDyZC/Nl8piZdHaGCpg/peILXDvpBIO7mwjbAPmS18bM74g r8AtItFoCYeWopH50P4PnkI0p3E/q5VJ7SSMIkC6ztzwtiOCy1bZYdGRAjfKOi3jbbzw pTMGA7Dk2O3+rrzO/HTH0UABxXvywKMwVjH92uOeMc8xiLHSeD+M1y37BfTW1nTu6VOy 0J+iGOMw7U0m8Quu5+Dt14KLbDmuAz72NhJY6O3+9b3HZXJ9sG5dvFagwwucJQIMX+9C rLKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=H4+BYV92; 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 du1si1314049ejc.562.2020.09.28.16.36.40; Mon, 28 Sep 2020 16:37:15 -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=H4+BYV92; 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 S1727348AbgI1Xbj (ORCPT + 99 others); Mon, 28 Sep 2020 19:31:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:54528 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727230AbgI1XbH (ORCPT ); Mon, 28 Sep 2020 19:31:07 -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 AB36020774; Mon, 28 Sep 2020 23:31:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601335866; bh=Sp+zAn1zjwwev3l5w3lCSxo4W4MlUTJTdRaZ0QZC+n4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H4+BYV920oJWpV8cxT3QkUForkAcb5Zd2wa7mYxP/IOWWboQRWIbis27EZRxTBW9m PVTV4AOLLz+V55txe53ntc9jyDf1SjGrZLWqYH0cINACtFTwgb64cKKZH6WkptmA6n 4M4bams1uUsWazbpOY4ztBBjDttTrjLbchd9w6Ng= 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, Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , David Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, "Paul E . McKenney" Subject: [PATCH tip/core/rcu 11/15] drm/i915: Cleanup PREEMPT_COUNT leftovers Date: Mon, 28 Sep 2020 16:30:58 -0700 Message-Id: <20200928233102.24265-11-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: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: David Airlie Cc: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Paul E. McKenney --- drivers/gpu/drm/i915/Kconfig.debug | 1 - drivers/gpu/drm/i915/i915_utils.h | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/Kconfig.debug b/drivers/gpu/drm/i915/Kconfig.debug index 1cb28c2..17d9b00 100644 --- a/drivers/gpu/drm/i915/Kconfig.debug +++ b/drivers/gpu/drm/i915/Kconfig.debug @@ -20,7 +20,6 @@ config DRM_I915_DEBUG bool "Enable additional driver debugging" depends on DRM_I915 select DEBUG_FS - select PREEMPT_COUNT select I2C_CHARDEV select STACKDEPOT select DRM_DP_AUX_CHARDEV diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h index 5477337..ecfed86 100644 --- a/drivers/gpu/drm/i915/i915_utils.h +++ b/drivers/gpu/drm/i915/i915_utils.h @@ -337,8 +337,7 @@ wait_remaining_ms_from_jiffies(unsigned long timestamp_jiffies, int to_wait_ms) (Wmax)) #define wait_for(COND, MS) _wait_for((COND), (MS) * 1000, 10, 1000) -/* If CONFIG_PREEMPT_COUNT is disabled, in_atomic() always reports false. */ -#if defined(CONFIG_DRM_I915_DEBUG) && defined(CONFIG_PREEMPT_COUNT) +#ifdef CONFIG_DRM_I915_DEBUG # define _WAIT_FOR_ATOMIC_CHECK(ATOMIC) WARN_ON_ONCE((ATOMIC) && !in_atomic()) #else # define _WAIT_FOR_ATOMIC_CHECK(ATOMIC) do { } while (0) -- 2.9.5