Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3384479pxk; Mon, 28 Sep 2020 16:34:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4uBKSkKJaaac2KPDWxiTMPwjii/EhAz2504u2nVcJCyjB7+F572TEEwhAL97Y9BKTv5+Q X-Received: by 2002:a17:906:bc52:: with SMTP id s18mr1090317ejv.398.1601336077402; Mon, 28 Sep 2020 16:34:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601336077; cv=none; d=google.com; s=arc-20160816; b=he7T+jBJFswI5GXKQUQi6XOXwI3GJKsttfosRsvsQnDYOwnlp+tO0c7sRhEKk8+Vvi MvPbUl/bTSBCbr9rVXCHeiXU/6ak0sd0ygwwIyQDxpxYdDyqYxKZuUki5ehGdX1yOq/t 60KA2oYiqPu61oHumhaCITSmqw9an3VubTy9XZwC6H6Oy5qG0O3xXeH3RvZ5dho2oOhp /FZZazT2Y7f9jhib32husTqtd7dxOMdqh1FYS/6iWc7jU569WYlLrHVA7TN8Sfc34Dvz KkjmtndoN6+S6EPjTP4wBQBqOOLDyR6C/lzFNpt0b5EIkzwPK0b35jbBkFamNv4+01jb JZVA== 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=ueHVlfFpwbT+MiGEVDl2BxSaCSnVR6NikwpEk+dHijs=; b=RwdeUeEmU4WrEK2c/E4MjmZ5BoLsoAnqNru+wfDuXQ+Bw3dkrEIw8CTfVoP8aQvOzu 7VVNAewt4exw2jkddgDZGii8/A+M0mwKXvnLdXS2OiwGtiQwy1Y9QtW1Nblw8QV9ZNH1 UWwoTo5VkoiH/oTmMMOzD7Iqey2SeL7gM23uCCIkF5kURdxc43lOWgXfupRG7d39Wyvh Mtfo8MiOSGIUwKorR8g6jXc1+ZoEoubIpUwHjw4+oiCqpXTGQXyXrxux7Psbv7SZb5ZO CCPLZvS2i1KSghKbR2Fk8koDdJNCNuf9uubXbt/g5odbBXX50iftwAx/oBQSNovuKkF9 3L+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MAk55kfb; 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 d25si1519393edy.405.2020.09.28.16.34.06; Mon, 28 Sep 2020 16:34:37 -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=MAk55kfb; 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 S1727333AbgI1Xbe (ORCPT + 99 others); Mon, 28 Sep 2020 19:31:34 -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