* [PATCH v3 3/9] arm: Rely on generic printing of preemption model. [not found] <20250212134115.2583667-1-bigeasy@linutronix.de> @ 2025-02-12 13:41 ` Sebastian Andrzej Siewior 2025-02-12 15:58 ` Russell King (Oracle) 2025-02-12 13:41 ` [PATCH v3 4/9] arm64: " Sebastian Andrzej Siewior 1 sibling, 1 reply; 4+ messages in thread From: Sebastian Andrzej Siewior @ 2025-02-12 13:41 UTC (permalink / raw) To: linux-kernel, linux-rt-devel Cc: Ben Segall, Catalin Marinas, Dietmar Eggemann, Ingo Molnar, Juri Lelli, Mel Gorman, Peter Zijlstra, Shrikanth Hegde, Steven Rostedt, Thomas Gleixner, Valentin Schneider, Vincent Guittot, Will Deacon, Sebastian Andrzej Siewior, Russell King, linux-arm-kernel, Russell King (Oracle) __die() invokes later __show_regs() -> show_regs_print_info() which prints the current preemption model. Remove it from the initial line. Cc: Russell King <linux@armlinux.org.uk> Cc: linux-arm-kernel@lists.infradead.org Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- arch/arm/kernel/traps.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 6ea645939573f..afbd2ebe5c39d 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -258,13 +258,6 @@ void show_stack(struct task_struct *tsk, unsigned long *sp, const char *loglvl) barrier(); } -#ifdef CONFIG_PREEMPT -#define S_PREEMPT " PREEMPT" -#elif defined(CONFIG_PREEMPT_RT) -#define S_PREEMPT " PREEMPT_RT" -#else -#define S_PREEMPT "" -#endif #ifdef CONFIG_SMP #define S_SMP " SMP" #else @@ -282,8 +275,8 @@ static int __die(const char *str, int err, struct pt_regs *regs) static int die_counter; int ret; - pr_emerg("Internal error: %s: %x [#%d]" S_PREEMPT S_SMP S_ISA "\n", - str, err, ++die_counter); + pr_emerg("Internal error: %s: %x [#%d]" S_SMP S_ISA "\n", + str, err, ++die_counter); /* trap and error numbers are mostly meaningless on ARM */ ret = notify_die(DIE_OOPS, str, regs, err, tsk->thread.trap_no, SIGSEGV); -- 2.47.2 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3 3/9] arm: Rely on generic printing of preemption model. 2025-02-12 13:41 ` [PATCH v3 3/9] arm: Rely on generic printing of preemption model Sebastian Andrzej Siewior @ 2025-02-12 15:58 ` Russell King (Oracle) 0 siblings, 0 replies; 4+ messages in thread From: Russell King (Oracle) @ 2025-02-12 15:58 UTC (permalink / raw) To: Sebastian Andrzej Siewior Cc: linux-kernel, linux-rt-devel, Ben Segall, Catalin Marinas, Dietmar Eggemann, Ingo Molnar, Juri Lelli, Mel Gorman, Peter Zijlstra, Shrikanth Hegde, Steven Rostedt, Thomas Gleixner, Valentin Schneider, Vincent Guittot, Will Deacon, linux-arm-kernel On Wed, Feb 12, 2025 at 02:41:09PM +0100, Sebastian Andrzej Siewior wrote: > __die() invokes later __show_regs() -> show_regs_print_info() which > prints the current preemption model. > Remove it from the initial line. > > Cc: Russell King <linux@armlinux.org.uk> Please either drop this - or correct it as per my r-b below. Thanks. > Cc: linux-arm-kernel@lists.infradead.org > Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> > Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> > --- > arch/arm/kernel/traps.c | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c > index 6ea645939573f..afbd2ebe5c39d 100644 > --- a/arch/arm/kernel/traps.c > +++ b/arch/arm/kernel/traps.c > @@ -258,13 +258,6 @@ void show_stack(struct task_struct *tsk, unsigned long *sp, const char *loglvl) > barrier(); > } > > -#ifdef CONFIG_PREEMPT > -#define S_PREEMPT " PREEMPT" > -#elif defined(CONFIG_PREEMPT_RT) > -#define S_PREEMPT " PREEMPT_RT" > -#else > -#define S_PREEMPT "" > -#endif > #ifdef CONFIG_SMP > #define S_SMP " SMP" > #else > @@ -282,8 +275,8 @@ static int __die(const char *str, int err, struct pt_regs *regs) > static int die_counter; > int ret; > > - pr_emerg("Internal error: %s: %x [#%d]" S_PREEMPT S_SMP S_ISA "\n", > - str, err, ++die_counter); > + pr_emerg("Internal error: %s: %x [#%d]" S_SMP S_ISA "\n", > + str, err, ++die_counter); > > /* trap and error numbers are mostly meaningless on ARM */ > ret = notify_die(DIE_OOPS, str, regs, err, tsk->thread.trap_no, SIGSEGV); > -- > 2.47.2 > > -- RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last! ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v3 4/9] arm64: Rely on generic printing of preemption model. [not found] <20250212134115.2583667-1-bigeasy@linutronix.de> 2025-02-12 13:41 ` [PATCH v3 3/9] arm: Rely on generic printing of preemption model Sebastian Andrzej Siewior @ 2025-02-12 13:41 ` Sebastian Andrzej Siewior 2025-02-12 18:41 ` Catalin Marinas 1 sibling, 1 reply; 4+ messages in thread From: Sebastian Andrzej Siewior @ 2025-02-12 13:41 UTC (permalink / raw) To: linux-kernel, linux-rt-devel Cc: Ben Segall, Catalin Marinas, Dietmar Eggemann, Ingo Molnar, Juri Lelli, Mel Gorman, Peter Zijlstra, Shrikanth Hegde, Steven Rostedt, Thomas Gleixner, Valentin Schneider, Vincent Guittot, Will Deacon, Sebastian Andrzej Siewior, linux-arm-kernel __die() invokes later show_regs() -> show_regs_print_info() which prints the current preemption model. Remove it from the initial line. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Acked-by: Will Deacon <will@kernel.org> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- arch/arm64/kernel/traps.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 4e26bd356a482..529cff825531c 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -172,14 +172,6 @@ static void dump_kernel_instr(const char *lvl, struct pt_regs *regs) printk("%sCode: %s\n", lvl, str); } -#ifdef CONFIG_PREEMPT -#define S_PREEMPT " PREEMPT" -#elif defined(CONFIG_PREEMPT_RT) -#define S_PREEMPT " PREEMPT_RT" -#else -#define S_PREEMPT "" -#endif - #define S_SMP " SMP" static int __die(const char *str, long err, struct pt_regs *regs) @@ -187,7 +179,7 @@ static int __die(const char *str, long err, struct pt_regs *regs) static int die_counter; int ret; - pr_emerg("Internal error: %s: %016lx [#%d]" S_PREEMPT S_SMP "\n", + pr_emerg("Internal error: %s: %016lx [#%d] " S_SMP "\n", str, err, ++die_counter); /* trap and error numbers are mostly meaningless on ARM */ -- 2.47.2 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3 4/9] arm64: Rely on generic printing of preemption model. 2025-02-12 13:41 ` [PATCH v3 4/9] arm64: " Sebastian Andrzej Siewior @ 2025-02-12 18:41 ` Catalin Marinas 0 siblings, 0 replies; 4+ messages in thread From: Catalin Marinas @ 2025-02-12 18:41 UTC (permalink / raw) To: Sebastian Andrzej Siewior Cc: linux-kernel, linux-rt-devel, Ben Segall, Dietmar Eggemann, Ingo Molnar, Juri Lelli, Mel Gorman, Peter Zijlstra, Shrikanth Hegde, Steven Rostedt, Thomas Gleixner, Valentin Schneider, Vincent Guittot, Will Deacon, linux-arm-kernel On Wed, Feb 12, 2025 at 02:41:10PM +0100, Sebastian Andrzej Siewior wrote: > __die() invokes later show_regs() -> show_regs_print_info() which prints > the current preemption model. > Remove it from the initial line. > > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will@kernel.org> > Cc: linux-arm-kernel@lists.infradead.org > Acked-by: Will Deacon <will@kernel.org> > Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Acked-by: Catalin Marinas <catalin.marinas@arm.com> ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-02-12 18:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20250212134115.2583667-1-bigeasy@linutronix.de>
2025-02-12 13:41 ` [PATCH v3 3/9] arm: Rely on generic printing of preemption model Sebastian Andrzej Siewior
2025-02-12 15:58 ` Russell King (Oracle)
2025-02-12 13:41 ` [PATCH v3 4/9] arm64: " Sebastian Andrzej Siewior
2025-02-12 18:41 ` Catalin Marinas
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).