Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp6614593ybp; Tue, 15 Oct 2019 18:36:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqxsfXlw3WwIfa6j88FJEcSg31jUJgjYGXn/l5jRQ7l8maqPigDMPVNIwjcoSkC5f3Douzr8 X-Received: by 2002:aa7:c556:: with SMTP id s22mr36664976edr.105.1571189769255; Tue, 15 Oct 2019 18:36:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571189769; cv=none; d=google.com; s=arc-20160816; b=yS/cdui3a8mAgyavIWAyxojNHiu3XsxYqTyU/Ok77oeNyZL0GKo1KCfKkuOGVcPaoK rjf3I0hj6euxqwOXeI6cVEO2JASFbRlJTX19bzJZyT18v2vNTdMPyoJYVp830Hy0U2qO ZGGED6Qnb6Q5DNBJUxoyCmA9mZDdHVAli3xgRuIQlL9chSrODG6ajxTO7+1GHbAMlVzB Y5b65mM9SUlAq8hwARBDyHcq4MX9hUBYmWTp28i5aTHSms7/Z/pqUIvK2ZBvQ9wXJPlJ O49DW9tskJEXnk7VYROPCGZlOnZE4bTQigFd7DaY1OPvJpWZKm2VVJwkIZNbkOKylZl4 ofDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=tuj3lliyGCwXk84eOXKbnq8wmhGqbyUP46UktjfL4jk=; b=JQKXhgDgQGSI/tgw5LhVSBMHJ8elYLwaLCBC6AY34YAVKpfqWtUHn/5sWt2y49w3Iq x3k81naHifqugYguL6ezsMViyPDxdIl9Ra4NDaAOwbSidMh8iCjI/8wlOBEwuoZPt91n gp7CZXuLcyGGT6YE5PCqF4aUy2jqPRg0CxfEk2n2uZcghkL7i8vk39YTntFR3X1/AkwK WCCuLobyh1BTJg0CIlJdpXvloZPxezl52gS+pNlL7dxx8/id4K1+tjtiM+PBCUnzJOiZ mqVK43PzcbgjrlldGlOQjU+G5xpRp5Mk3d9KOWMIsBEvm9hV762qbhRrpuEweyL6BDkW YVxQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nl6si14080433ejb.207.2019.10.15.18.35.45; Tue, 15 Oct 2019 18:36:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389433AbfJOTSr (ORCPT + 99 others); Tue, 15 Oct 2019 15:18:47 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:45662 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389397AbfJOTSn (ORCPT ); Tue, 15 Oct 2019 15:18:43 -0400 Received: from localhost ([127.0.0.1] helo=localhost.localdomain) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1iKSL7-00067i-2B; Tue, 15 Oct 2019 21:18:37 +0200 From: Sebastian Andrzej Siewior To: linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, Ley Foon Tan , nios2-dev@lists.rocketboards.org, Sebastian Andrzej Siewior Subject: [PATCH 14/34] nios2: Use CONFIG_PREEMPTION Date: Tue, 15 Oct 2019 21:18:01 +0200 Message-Id: <20191015191821.11479-15-bigeasy@linutronix.de> In-Reply-To: <20191015191821.11479-1-bigeasy@linutronix.de> References: <20191015191821.11479-1-bigeasy@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Gleixner CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT. Switch the entry code over to use CONFIG_PREEMPTION. Cc: Ley Foon Tan Cc: nios2-dev@lists.rocketboards.org Signed-off-by: Thomas Gleixner Signed-off-by: Sebastian Andrzej Siewior --- arch/nios2/kernel/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/nios2/kernel/entry.S b/arch/nios2/kernel/entry.S index 1e515ccd698e3..3d8d1d0bcb64b 100644 --- a/arch/nios2/kernel/entry.S +++ b/arch/nios2/kernel/entry.S @@ -365,7 +365,7 @@ ENTRY(ret_from_interrupt) ldw r1, PT_ESTATUS(sp) /* check if returning to kernel */ TSTBNZ r1, r1, ESTATUS_EU, Luser_return =20 -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION GET_THREAD_INFO r1 ldw r4, TI_PREEMPT_COUNT(r1) bne r4, r0, restore_all --=20 2.23.0