mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev
Cc: Ben Segall <bsegall@google.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Dietmar Eggemann <dietmar.eggemann@arm.com>,
	Ingo Molnar <mingo@redhat.com>,
	Juri Lelli <juri.lelli@redhat.com>, Mel Gorman <mgorman@suse.de>,
	Peter Zijlstra <peterz@infradead.org>,
	Shrikanth Hegde <sshegde@linux.ibm.com>,
	Steven Rostedt <rostedt@goodmis.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Valentin Schneider <vschneid@redhat.com>,
	Vincent Guittot <vincent.guittot@linaro.org>,
	Will Deacon <will@kernel.org>,
	Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
	Chris Zankel <chris@zankel.net>,
	Max Filippov <jcmvbkbc@gmail.com>
Subject: [PATCH v2 8/9] xtensa: Use preempt_model_str().
Date: Mon,  3 Feb 2025 15:16:31 +0100	[thread overview]
Message-ID: <20250203141632.440554-9-bigeasy@linutronix.de> (raw)
In-Reply-To: <20250203141632.440554-1-bigeasy@linutronix.de>

Use preempt_model_str() instead of manually conducting the preemption
model.

Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
 arch/xtensa/kernel/traps.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index 38092d21acf8e..a7b1e4ad112e8 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -629,15 +629,11 @@ DEFINE_SPINLOCK(die_lock);
 void __noreturn die(const char * str, struct pt_regs * regs, long err)
 {
 	static int die_counter;
-	const char *pr = "";
-
-	if (IS_ENABLED(CONFIG_PREEMPTION))
-		pr = IS_ENABLED(CONFIG_PREEMPT_RT) ? " PREEMPT_RT" : " PREEMPT";
 
 	console_verbose();
 	spin_lock_irq(&die_lock);
 
-	pr_info("%s: sig: %ld [#%d]%s\n", str, err, ++die_counter, pr);
+	pr_info("%s: sig: %ld [#%d] %s\n", str, err, ++die_counter, preempt_model_str());
 	show_regs(regs);
 	if (!user_mode(regs))
 		show_stack(NULL, (unsigned long *)regs->areg[1], KERN_INFO);
-- 
2.47.2


  parent reply	other threads:[~2025-02-03 14:16 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-03 14:16 [PATCH v2 0/9] preempt: Add a generic function to return the preemption string Sebastian Andrzej Siewior
2025-02-03 14:16 ` [PATCH v2 1/9] sched: " Sebastian Andrzej Siewior
2025-02-08  8:01   ` Shrikanth Hegde
2025-02-10 10:52     ` Sebastian Andrzej Siewior
2025-02-10 14:21       ` Shrikanth Hegde
2025-02-10 14:25         ` Sebastian Andrzej Siewior
2025-02-03 14:16 ` [PATCH v2 2/9] lib/dump_stack: Use preempt_model_str() Sebastian Andrzej Siewior
2025-02-03 14:16 ` [PATCH v2 3/9] arm: Rely on generic printing of preemption model Sebastian Andrzej Siewior
2025-02-10 12:04   ` Sebastian Andrzej Siewior
2025-02-10 15:16     ` Russell King (Oracle)
2025-02-10 15:39       ` Sebastian Andrzej Siewior
2025-02-10 16:26         ` Russell King (Oracle)
2025-02-11 14:52           ` Sebastian Andrzej Siewior
2025-02-11 15:05             ` Russell King (Oracle)
2025-02-11 15:21               ` Sebastian Andrzej Siewior
2025-02-03 14:16 ` [PATCH v2 4/9] arm64: " Sebastian Andrzej Siewior
2025-02-10 12:05   ` Sebastian Andrzej Siewior
2025-02-10 15:03     ` Will Deacon
2025-02-03 14:16 ` [PATCH v2 5/9] powerpc: Use preempt_model_str() Sebastian Andrzej Siewior
2025-02-03 15:19   ` Christophe Leroy
2025-02-03 16:01     ` Sebastian Andrzej Siewior
2025-02-03 16:37       ` Christophe Leroy
2025-02-04  8:22         ` [PATCH v3 " Sebastian Andrzej Siewior
2025-02-05  6:48           ` Christophe Leroy
2025-02-08  7:35           ` Shrikanth Hegde
2025-02-08 12:55             ` Christophe Leroy
2025-02-08 13:42               ` Shrikanth Hegde
2025-02-08 17:55                 ` Christophe Leroy
2025-02-09 14:38                   ` Shrikanth Hegde
2025-02-09 18:42                     ` Christophe Leroy
2025-02-10 10:59             ` Sebastian Andrzej Siewior
2025-02-10 14:23               ` Sebastian Andrzej Siewior
2025-02-10 17:32                 ` Shrikanth Hegde
2025-02-03 14:16 ` [PATCH v2 6/9] s390: Rely on generic printing of preemption model Sebastian Andrzej Siewior
2025-02-03 14:28   ` Heiko Carstens
2025-02-03 14:16 ` [PATCH v2 7/9] x86: " Sebastian Andrzej Siewior
2025-02-10 12:06   ` Sebastian Andrzej Siewior
2025-02-03 14:16 ` Sebastian Andrzej Siewior [this message]
2025-02-03 17:55   ` [PATCH v2 8/9] xtensa: Use preempt_model_str() Max Filippov
2025-02-03 14:16 ` [PATCH v2 9/9] tracing: " Sebastian Andrzej Siewior
2025-02-03 17:20   ` Steven Rostedt
2025-02-03 14:25 ` [PATCH v2 0/9] preempt: Add a generic function to return the preemption string Peter Zijlstra
2025-02-03 14:39   ` 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=20250203141632.440554-9-bigeasy@linutronix.de \
    --to=bigeasy@linutronix.de \
    --cc=bsegall@google.com \
    --cc=catalin.marinas@arm.com \
    --cc=chris@zankel.net \
    --cc=dietmar.eggemann@arm.com \
    --cc=jcmvbkbc@gmail.com \
    --cc=juri.lelli@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rt-devel@lists.linux.dev \
    --cc=mgorman@suse.de \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=rostedt@goodmis.org \
    --cc=sshegde@linux.ibm.com \
    --cc=tglx@linutronix.de \
    --cc=vincent.guittot@linaro.org \
    --cc=vschneid@redhat.com \
    --cc=will@kernel.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®