From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de, "David S. Miller" <davem@davemloft.net>,
sparclinux@vger.kernel.org,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Subject: [PATCH 19/34] sparc: Use CONFIG_PREEMPTION
Date: Tue, 15 Oct 2019 21:18:06 +0200 [thread overview]
Message-ID: <20191015191821.11479-20-bigeasy@linutronix.de> (raw)
In-Reply-To: <20191015191821.11479-1-bigeasy@linutronix.de>
From: Thomas Gleixner <tglx@linutronix.de>
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 trap code over to use CONFIG_PREEMPTION.
Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
[bigeasy: +Kconfig]
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
arch/sparc/Kconfig | 2 +-
arch/sparc/kernel/rtrap_64.S | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index fbc1aecf0f94c..9798d2074a265 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -278,7 +278,7 @@ config US3_MC
config GENERIC_LOCKBREAK
bool
default y
- depends on SPARC64 && SMP && PREEMPT
+ depends on SPARC64 && SMP && PREEMPTION
config NUMA
bool "NUMA support"
diff --git a/arch/sparc/kernel/rtrap_64.S b/arch/sparc/kernel/rtrap_64.S
index 29aa34f11720c..c5fd4b450d9b6 100644
--- a/arch/sparc/kernel/rtrap_64.S
+++ b/arch/sparc/kernel/rtrap_64.S
@@ -310,7 +310,7 @@ kern_rtt: rdpr %canrestore, %g1
retry
to_kernel:
-#ifdef CONFIG_PREEMPT
+#ifdef CONFIG_PREEMPTION
ldsw [%g6 + TI_PRE_COUNT], %l5
brnz %l5, kern_fpucheck
ldx [%g6 + TI_FLAGS], %l5
--
2.23.0
WARNING: multiple messages have this Message-ID (diff)
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: linux-kernel@vger.kernel.org
Cc: tglx@linutronix.de, "David S. Miller" <davem@davemloft.net>,
sparclinux@vger.kernel.org,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Subject: [PATCH 19/34] sparc: Use CONFIG_PREEMPTION
Date: Tue, 15 Oct 2019 19:18:06 +0000 [thread overview]
Message-ID: <20191015191821.11479-20-bigeasy@linutronix.de> (raw)
In-Reply-To: <20191015191821.11479-1-bigeasy@linutronix.de>
From: Thomas Gleixner <tglx@linutronix.de>
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 trap code over to use CONFIG_PREEMPTION.
Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
[bigeasy: +Kconfig]
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
arch/sparc/Kconfig | 2 +-
arch/sparc/kernel/rtrap_64.S | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index fbc1aecf0f94c..9798d2074a265 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -278,7 +278,7 @@ config US3_MC
config GENERIC_LOCKBREAK
bool
default y
- depends on SPARC64 && SMP && PREEMPT
+ depends on SPARC64 && SMP && PREEMPTION
config NUMA
bool "NUMA support"
diff --git a/arch/sparc/kernel/rtrap_64.S b/arch/sparc/kernel/rtrap_64.S
index 29aa34f11720c..c5fd4b450d9b6 100644
--- a/arch/sparc/kernel/rtrap_64.S
+++ b/arch/sparc/kernel/rtrap_64.S
@@ -310,7 +310,7 @@ kern_rtt: rdpr %canrestore, %g1
retry
to_kernel:
-#ifdef CONFIG_PREEMPT
+#ifdef CONFIG_PREEMPTION
ldsw [%g6 + TI_PRE_COUNT], %l5
brnz %l5, kern_fpucheck
ldx [%g6 + TI_FLAGS], %l5
--
2.23.0
next prev parent reply other threads:[~2019-10-15 19:19 UTC|newest]
Thread overview: 131+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-15 19:17 [PATCH 00/34] Treewide: Use CONFIG_PREEMPTION Sebastian Andrzej Siewior
2019-10-15 19:17 ` [PATCH 01/34] ARM: " Sebastian Andrzej Siewior
2019-10-15 19:17 ` Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:17 ` [PATCH 02/34] arm64: " Sebastian Andrzej Siewior
2019-10-15 19:17 ` Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:17 ` [PATCH 03/34] powerpc: " Sebastian Andrzej Siewior
2019-10-15 19:17 ` Sebastian Andrzej Siewior
2019-10-16 4:57 ` Christophe Leroy
2019-10-16 4:57 ` Christophe Leroy
2019-10-16 7:48 ` Sebastian Andrzej Siewior
2019-10-16 7:48 ` Sebastian Andrzej Siewior
2019-10-16 9:33 ` Michael Ellerman
2019-10-16 9:33 ` Michael Ellerman
2019-10-16 9:35 ` Sebastian Andrzej Siewior
2019-10-16 9:35 ` Sebastian Andrzej Siewior
2019-10-24 13:59 ` [PATCH 03/34 v2] " Sebastian Andrzej Siewior
2019-10-24 13:59 ` Sebastian Andrzej Siewior
2019-10-24 16:04 ` [PATCH 03/34 v3] " Sebastian Andrzej Siewior
2019-10-24 16:04 ` Sebastian Andrzej Siewior
2019-11-12 12:38 ` Michael Ellerman
2019-11-12 12:38 ` Michael Ellerman
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-12-08 14:58 ` tip-bot2 for Thomas Gleixner
2019-10-15 19:17 ` [PATCH 04/34] ARC: " Sebastian Andrzej Siewior
2019-10-15 19:17 ` Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:17 ` [PATCH 05/34] c6x: " Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:17 ` [PATCH 06/34] csky: " Sebastian Andrzej Siewior
2019-10-15 23:29 ` Guo Ren
2019-10-16 7:39 ` Sebastian Andrzej Siewior
2019-10-16 23:31 ` Guo Ren
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:17 ` [PATCH 07/34] h8300: " Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:17 ` [PATCH 08/34] hexagon: " Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:17 ` [PATCH 09/34] ia64: " Sebastian Andrzej Siewior
2019-10-15 19:17 ` Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-12-08 14:58 ` tip-bot2 for Thomas Gleixner
2019-10-15 19:17 ` [PATCH 10/34] m68k/coldfire: " Sebastian Andrzej Siewior
2019-10-16 0:50 ` Greg Ungerer
2019-10-16 7:55 ` Sebastian Andrzej Siewior
2019-10-16 12:14 ` Greg Ungerer
2019-10-15 19:17 ` [PATCH 11/34] microblaze: " Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:17 ` [PATCH 12/34] MIPS: " Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:18 ` [PATCH 13/34] nds32: " Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:18 ` [PATCH 14/34] nios2: " Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:18 ` [PATCH 15/34] parisc: " Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:18 ` [PATCH 16/34] riscv: " Sebastian Andrzej Siewior
2019-10-15 19:18 ` Sebastian Andrzej Siewior
2019-10-15 20:26 ` Paul Walmsley
2019-10-15 20:26 ` Paul Walmsley
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:18 ` [PATCH 17/34] s390: " Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:18 ` [PATCH 18/34] sh: " Sebastian Andrzej Siewior
2019-10-15 19:18 ` Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-12-08 14:58 ` tip-bot2 for Thomas Gleixner
2019-10-15 19:18 ` Sebastian Andrzej Siewior [this message]
2019-10-15 19:18 ` [PATCH 19/34] sparc: " Sebastian Andrzej Siewior
2019-10-15 20:34 ` David Miller
2019-10-15 20:34 ` David Miller
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-12-08 14:58 ` tip-bot2 for Thomas Gleixner
2019-10-15 19:18 ` [PATCH 20/34] xtensa: " Sebastian Andrzej Siewior
2019-10-15 19:43 ` Max Filippov
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:18 ` [PATCH 21/34] net: " Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, net: Use CONFIG_PREEMPTION.patch tip-bot2 for Thomas Gleixner
2019-10-15 19:18 ` [PATCH 22/34] xen: Use CONFIG_PREEMPTION Sebastian Andrzej Siewior
2019-10-15 19:18 ` [Xen-devel] " Sebastian Andrzej Siewior
2019-10-16 5:10 ` Jürgen Groß
2019-10-16 5:10 ` [Xen-devel] " Jürgen Groß
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-12-08 14:58 ` [Xen-devel] " tip-bot2 for Thomas Gleixner
2019-10-15 19:18 ` [PATCH 23/34] fs: " Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:18 ` [PATCH 24/34] btrfs: " Sebastian Andrzej Siewior
2019-10-15 20:16 ` David Sterba
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:18 ` [PATCH 25/34] mm: " Sebastian Andrzej Siewior
2019-10-16 14:38 ` Christopher Lameter
2019-10-16 14:38 ` Christopher Lameter
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Thomas Gleixner
2019-10-15 19:18 ` [PATCH 26/34] Documentation/RCU: Use CONFIG_PREEMPTION where appropriate Sebastian Andrzej Siewior
2019-10-16 4:13 ` Paul E. McKenney
2019-10-16 7:31 ` Sebastian Andrzej Siewior
2019-10-17 3:06 ` Paul E. McKenney
2019-10-15 19:18 ` [PATCH 27/34] rcu: " Sebastian Andrzej Siewior
2019-10-16 4:14 ` Paul E. McKenney
2019-10-15 19:18 ` [PATCH 28/34] drm/i810: Refer to `PREEMPTION' in comment Sebastian Andrzej Siewior
2019-10-16 19:58 ` Daniel Vetter
2019-10-15 19:18 ` [PATCH 29/34] backlight/jornada720: Use CONFIG_PREEMPTION Sebastian Andrzej Siewior
2019-10-15 19:18 ` Sebastian Andrzej Siewior
2019-10-17 11:37 ` Daniel Thompson
2019-10-17 11:37 ` Daniel Thompson
2019-10-17 13:23 ` Lee Jones
2019-10-17 13:23 ` Lee Jones
2019-10-17 13:23 ` Lee Jones
2019-10-17 13:28 ` Sebastian Andrzej Siewior
2019-10-17 13:28 ` Sebastian Andrzej Siewior
2019-10-18 7:38 ` Lee Jones
2019-10-18 7:38 ` Lee Jones
2019-10-18 7:38 ` Lee Jones
2019-10-18 7:40 ` Lee Jones
2019-10-18 7:40 ` Lee Jones
2019-10-18 7:40 ` Lee Jones
2019-10-15 19:18 ` [PATCH 30/34] media: cec-gpio: " Sebastian Andrzej Siewior
2019-10-15 19:53 ` Hans Verkuil
2019-10-16 11:51 ` Hans Verkuil
2019-10-16 12:02 ` Sebastian Andrzej Siewior
2019-10-16 12:24 ` Hans Verkuil
2019-10-15 19:18 ` [PATCH 31/34] locking: " Sebastian Andrzej Siewior
2019-10-16 8:18 ` Peter Zijlstra
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Sebastian Andrzej Siewior
2019-10-15 19:18 ` [PATCH 32/34] lib: " Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/core: " tip-bot2 for Sebastian Andrzej Siewior
2019-10-15 19:18 ` [PATCH 33/34] tracing: " Sebastian Andrzej Siewior
2019-10-15 19:24 ` Steven Rostedt
2019-10-15 19:18 ` [PATCH 34/34] workqueue: Use PREEMPTION Sebastian Andrzej Siewior
2019-12-08 14:58 ` [tip: sched/urgent] sched/rt, " tip-bot2 for Sebastian Andrzej Siewior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191015191821.11479-20-bigeasy@linutronix.de \
--to=bigeasy@linutronix.de \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=sparclinux@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.