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 930D3C2D0A8 for ; Mon, 28 Sep 2020 23:31:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 543CF2076A for ; Mon, 28 Sep 2020 23:31:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601335897; bh=PMgsGG5FAWr0wRIFGcOtMZzn3uNlhC8t4NOrl9ZokMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bXY+3Ix9tHFf5DhYf2O7nfaFAHm6sYr7va3WuOi3l0YQ0shP4LbBRD/JgAwBnlvxi +iQWdXvhcgPyb3Yln4w2ZBC+faoUGmVgkjP5wLqX8PoSGrrUCWHhKltArs2Qo6C8Jk azQiWFSC9pO28x/RYD+e5Ka64Uxmky8+Wl8sL77g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727338AbgI1Xbf (ORCPT ); Mon, 28 Sep 2020 19:31:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:54292 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727229AbgI1XbH (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 78AD623A5D; 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=PMgsGG5FAWr0wRIFGcOtMZzn3uNlhC8t4NOrl9ZokMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MAk55kfbeWDSX5XuL4VkAPUC/KHOU+3WpG1eD9VfjSFZ4h9kK5aUbx5/LpwWl8eEP 8YUUgbdYvOEvEW3MC8xNExtZ9wSH0baxVoTBngm9Why3R47jbdkJpFi9X36EErqO3n zx4yPiAFi2EUwU8fYKwJR/GYHCm5QZzds2DErgTA= 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, Chris Zankel , Max Filippov , linux-xtensa@linux-xtensa.org, "Paul E . McKenney" Subject: [PATCH tip/core/rcu 10/15] xtensa: Cleanup PREEMPT_COUNT leftovers Date: Mon, 28 Sep 2020 16:30:57 -0700 Message-Id: <20200928233102.24265-10-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: Chris Zankel Cc: Max Filippov Cc: linux-xtensa@linux-xtensa.org Signed-off-by: Paul E. McKenney --- arch/xtensa/kernel/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S index 703cf62..5a27dd3 100644 --- a/arch/xtensa/kernel/entry.S +++ b/arch/xtensa/kernel/entry.S @@ -819,7 +819,7 @@ ENTRY(debug_exception) * preemption if we have HW breakpoints to preserve DEBUGCAUSE.DBNUM * meaning. */ -#if defined(CONFIG_PREEMPT_COUNT) && defined(CONFIG_HAVE_HW_BREAKPOINT) +#ifdef CONFIG_HAVE_HW_BREAKPOINT GET_THREAD_INFO(a2, a1) l32i a3, a2, TI_PRE_COUNT addi a3, a3, 1 -- 2.9.5