Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp3083202ybl; Sun, 8 Dec 2019 07:01:24 -0800 (PST) X-Google-Smtp-Source: APXvYqyPookQ8vzm4TtGVC+hMPp/QkAQFnKc9ki/m2EZSgpXugpDQVMLadE0oAxgwNXRX5rHkPMs X-Received: by 2002:aca:d4c1:: with SMTP id l184mr20939308oig.172.1575817284749; Sun, 08 Dec 2019 07:01:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575817284; cv=none; d=google.com; s=arc-20160816; b=NZMdykUCjP1Eq9V5OQMjGOMQEhI7tbM17UCsZT9F+MTtZjhr6yAnZdgb+vnx7K4BxI spRvgEcHGwpkIBb/tdkuvdttvhFhkq1fh8wUfUdYsojcY9Xtxmr3Jwy2BvZoicklmfBz rpVB8bSus5iSAGpOFJ82tJ6B3YXNh5yJWxkH4Hpv903o76nHYC5WUD2hMch1+oS738ys IWKhXO7lfqYSGXPbjH2jYGd+dbHSYqbbz5Xs4CslgwbTxXUJWq7VI8RAkYISqIlD82mN 4qmMsKBmHQ80MgGrA3++hhdWlfV67tEWnT31ej4wzRf70k8VZkBryFPeduTQAV9uNY2r c5IQ== 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 :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:date; bh=kFNNHBW6b1x8T0ZyC3tKOEKzf5XD3zJ25TmV9+pi/28=; b=bJBaYnx0DrbtidnnWJw5tPFSL7yzFoYlyxXpnuouYiSut55r9NsFIgQZyTA2uWcOD3 nc2PnYn9jYrPgc2zJGNhfRfjsxBUgkUaGQUSbAK5DSL64XLyxeM1pqhLhUH7yH0xpgOc XQwTIa5cwkFX76tfLCqdPZZdA5DqpvejEu6Jxj3bgiYeyPFQbyhR8/dKkjJ6l5ihHwK0 r+tMIV0SXutq1U+YKIIqWDcijbXile93d1JMl/FM4W+Y+PcLxG74pgLCvbJZgoKqgOru htWshb2Esx9b81MbNMsee6Gu6FdZXGqkVmxO85Z71bv2oXmCQLqIgdqqltQNx5/2XM8n LPog== 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 v3si10485927oif.122.2019.12.08.07.01.13; Sun, 08 Dec 2019 07:01:24 -0800 (PST) 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 S1727026AbfLHO7b (ORCPT + 99 others); Sun, 8 Dec 2019 09:59:31 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:36869 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726708AbfLHO6w (ORCPT ); Sun, 8 Dec 2019 09:58:52 -0500 Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1idy1F-0000ah-3h; Sun, 08 Dec 2019 15:58:45 +0100 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id BBFA21C2890; Sun, 8 Dec 2019 15:58:34 +0100 (CET) Date: Sun, 08 Dec 2019 14:58:34 -0000 From: "tip-bot2 for Thomas Gleixner" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/urgent] sched/rt, csky: Use CONFIG_PREEMPTION Cc: Thomas Gleixner , Sebastian Andrzej Siewior , Guo Ren , Linus Torvalds , Peter Zijlstra , Ingo Molnar , x86 , LKML In-Reply-To: <20191015191821.11479-7-bigeasy@linutronix.de> References: <20191015191821.11479-7-bigeasy@linutronix.de> MIME-Version: 1.0 Message-ID: <157581711461.21853.16937521050987954666.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the sched/urgent branch of tip: Commit-ID: 365a795a13326df11a5114d2b6067ca2a6d53364 Gitweb: https://git.kernel.org/tip/365a795a13326df11a5114d2b6067ca2a6d53364 Author: Thomas Gleixner AuthorDate: Tue, 15 Oct 2019 21:17:53 +02:00 Committer: Ingo Molnar CommitterDate: Sun, 08 Dec 2019 14:37:33 +01:00 sched/rt, csky: Use CONFIG_PREEMPTION 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. Signed-off-by: Thomas Gleixner Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner Acked-by: Guo Ren Cc: Linus Torvalds Cc: Peter Zijlstra Link: https://lore.kernel.org/r/20191015191821.11479-7-bigeasy@linutronix.de Signed-off-by: Ingo Molnar --- arch/csky/kernel/entry.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/csky/kernel/entry.S b/arch/csky/kernel/entry.S index a7a5b67..0077063 100644 --- a/arch/csky/kernel/entry.S +++ b/arch/csky/kernel/entry.S @@ -277,7 +277,7 @@ ENTRY(csky_irq) zero_fp psrset ee -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION mov r9, sp /* Get current stack pointer */ bmaski r10, THREAD_SHIFT andn r9, r10 /* Get thread_info */ @@ -294,7 +294,7 @@ ENTRY(csky_irq) mov a0, sp jbsr csky_do_IRQ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION subi r12, 1 stw r12, (r9, TINFO_PREEMPT) cmpnei r12, 0