From: "tip-bot2 for Sebastian Andrzej Siewior" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Heiko Carstens <hca@linux.ibm.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: sched/core] s390: Rely on generic printing of preemption model
Date: Mon, 17 Mar 2025 10:34:47 -0000 [thread overview]
Message-ID: <174220768744.14745.11827032035008557038.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250314160810.2373416-7-bigeasy@linutronix.de>
The following commit has been merged into the sched/core branch of tip:
Commit-ID: b70f50be0c74bd9498fba9d33cc548722a2ec879
Gitweb: https://git.kernel.org/tip/b70f50be0c74bd9498fba9d33cc548722a2ec879
Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
AuthorDate: Fri, 14 Mar 2025 17:08:07 +01:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Mon, 17 Mar 2025 11:23:40 +01:00
s390: Rely on generic printing of preemption model
die() invokes later show_regs() -> show_regs_print_info() which prints
the current preemption model.
Remove it from the initial line.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Link: https://lore.kernel.org/r/20250314160810.2373416-7-bigeasy@linutronix.de
---
arch/s390/kernel/dumpstack.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/arch/s390/kernel/dumpstack.c b/arch/s390/kernel/dumpstack.c
index 1ecd058..911b95c 100644
--- a/arch/s390/kernel/dumpstack.c
+++ b/arch/s390/kernel/dumpstack.c
@@ -198,13 +198,8 @@ void __noreturn die(struct pt_regs *regs, const char *str)
console_verbose();
spin_lock_irq(&die_lock);
bust_spinlocks(1);
- printk("%s: %04x ilc:%d [#%d] ", str, regs->int_code & 0xffff,
+ printk("%s: %04x ilc:%d [#%d]", str, regs->int_code & 0xffff,
regs->int_code >> 17, ++die_counter);
-#ifdef CONFIG_PREEMPT
- pr_cont("PREEMPT ");
-#elif defined(CONFIG_PREEMPT_RT)
- pr_cont("PREEMPT_RT ");
-#endif
pr_cont("SMP ");
if (debug_pagealloc_enabled())
pr_cont("DEBUG_PAGEALLOC");
next prev parent reply other threads:[~2025-03-17 10:34 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-14 16:08 [PATCH v4 0/9] preempt: Add a generic function to return the preemption string Sebastian Andrzej Siewior
2025-03-14 16:08 ` [PATCH v4 1/9] sched: " Sebastian Andrzej Siewior
2025-03-16 11:15 ` Ingo Molnar
2025-03-17 8:31 ` Sebastian Andrzej Siewior
2025-03-17 9:12 ` Ingo Molnar
2025-03-17 9:25 ` Sebastian Andrzej Siewior
2025-03-17 10:18 ` Ingo Molnar
2025-03-17 10:33 ` Sebastian Andrzej Siewior
2025-03-17 11:25 ` Ingo Molnar
2025-03-17 10:46 ` Ingo Molnar
2025-03-17 10:34 ` [tip: sched/core] " tip-bot2 for Sebastian Andrzej Siewior
2025-03-14 16:08 ` [PATCH v4 2/9] lib/dump_stack: Use preempt_model_str() Sebastian Andrzej Siewior
2025-03-17 10:34 ` [tip: sched/core] " tip-bot2 for Sebastian Andrzej Siewior
2025-03-14 16:08 ` [PATCH v4 3/9] arm: Rely on generic printing of preemption model Sebastian Andrzej Siewior
2025-03-17 10:34 ` [tip: sched/core] " tip-bot2 for Sebastian Andrzej Siewior
2025-03-14 16:08 ` [PATCH v4 4/9] arm64: " Sebastian Andrzej Siewior
2025-03-17 10:34 ` [tip: sched/core] " tip-bot2 for Sebastian Andrzej Siewior
2025-03-14 16:08 ` [PATCH v4 5/9] powerpc: " Sebastian Andrzej Siewior
2025-03-17 10:34 ` [tip: sched/core] " tip-bot2 for Sebastian Andrzej Siewior
2025-03-14 16:08 ` [PATCH v4 6/9] s390: " Sebastian Andrzej Siewior
2025-03-17 10:34 ` tip-bot2 for Sebastian Andrzej Siewior [this message]
2025-03-14 16:08 ` [PATCH v4 7/9] x86: " Sebastian Andrzej Siewior
2025-03-17 10:34 ` [tip: sched/core] " tip-bot2 for Sebastian Andrzej Siewior
2025-03-14 16:08 ` [PATCH v4 8/9] xtensa: " Sebastian Andrzej Siewior
2025-03-17 10:34 ` [tip: sched/core] " tip-bot2 for Sebastian Andrzej Siewior
2025-03-14 16:08 ` [PATCH v4 9/9] tracing: Use preempt_model_str() Sebastian Andrzej Siewior
2025-03-17 10:34 ` [tip: sched/core] " tip-bot2 for Sebastian Andrzej Siewior
2025-03-17 9:14 ` [PATCH v4 0/9] preempt: Add a generic function to return the preemption string Ingo Molnar
2025-03-17 9:28 ` 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=174220768744.14745.11827032035008557038.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bigeasy@linutronix.de \
--cc=hca@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=x86@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®