* [PATCH V2] sched/rt, powerpc: Prepare for PREEMPT_RT
@ 2020-11-10 8:02 Wang Qing
2020-11-10 8:06 ` Christophe Leroy
2020-11-10 8:10 ` Greg Kroah-Hartman
0 siblings, 2 replies; 3+ messages in thread
From: Wang Qing @ 2020-11-10 8:02 UTC (permalink / raw)
To: Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras,
Nicholas Piggin, Christophe Leroy, Jordan Niethe,
Alistair Popple, Michael Neuling, Aneesh Kumar K.V,
Peter Zijlstra, Greg Kroah-Hartman, linuxppc-dev, linux-kernel
Cc: tglx, Wang Qing
PREEMPT_RT is a separate preemption model, CONFIG_PRTTMPT will
be disabled when CONFIG_PREEMPT_RT is enabled, so you need
to add CONFIG_PREEMPT_RT judgments to __die().
Signed-off-by: Wang Qing <wangqing@vivo.com>
Changes in v2:
- Modify as Christophe suggested.
---
arch/powerpc/kernel/traps.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 5006dcb..dec7b81
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -262,10 +262,11 @@ static int __die(const char *str, struct pt_regs *regs, long err)
{
printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter);
- printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s %s\n",
+ printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s%s %s\n",
IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN) ? "LE" : "BE",
PAGE_SIZE / 1024, get_mmu_str(),
IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "",
+ IS_ENABLED(CONFIG_PREEMPT_RT) ? " PREEMPT_RT" : "",
IS_ENABLED(CONFIG_SMP) ? " SMP" : "",
IS_ENABLED(CONFIG_SMP) ? (" NR_CPUS=" __stringify(NR_CPUS)) : "",
debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "",
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH V2] sched/rt, powerpc: Prepare for PREEMPT_RT
2020-11-10 8:02 [PATCH V2] sched/rt, powerpc: Prepare for PREEMPT_RT Wang Qing
@ 2020-11-10 8:06 ` Christophe Leroy
2020-11-10 8:10 ` Greg Kroah-Hartman
1 sibling, 0 replies; 3+ messages in thread
From: Christophe Leroy @ 2020-11-10 8:06 UTC (permalink / raw)
To: Wang Qing, Michael Ellerman, Benjamin Herrenschmidt,
Paul Mackerras, Nicholas Piggin, Jordan Niethe, Alistair Popple,
Michael Neuling, Aneesh Kumar K.V, Peter Zijlstra,
Greg Kroah-Hartman, linuxppc-dev, linux-kernel
Cc: tglx
Le 10/11/2020 à 09:02, Wang Qing a écrit :
> PREEMPT_RT is a separate preemption model, CONFIG_PRTTMPT will
s/CONFIG_PRTTMPT/CONFIG_PREEMPT
> be disabled when CONFIG_PREEMPT_RT is enabled, so you need
> to add CONFIG_PREEMPT_RT judgments to __die().
>
> Signed-off-by: Wang Qing <wangqing@vivo.com>
Otherwise
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
>
> Changes in v2:
> - Modify as Christophe suggested.
> ---
> arch/powerpc/kernel/traps.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
> index 5006dcb..dec7b81
> --- a/arch/powerpc/kernel/traps.c
> +++ b/arch/powerpc/kernel/traps.c
> @@ -262,10 +262,11 @@ static int __die(const char *str, struct pt_regs *regs, long err)
> {
> printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter);
>
> - printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s %s\n",
> + printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s%s %s\n",
> IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN) ? "LE" : "BE",
> PAGE_SIZE / 1024, get_mmu_str(),
> IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "",
> + IS_ENABLED(CONFIG_PREEMPT_RT) ? " PREEMPT_RT" : "",
> IS_ENABLED(CONFIG_SMP) ? " SMP" : "",
> IS_ENABLED(CONFIG_SMP) ? (" NR_CPUS=" __stringify(NR_CPUS)) : "",
> debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "",
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH V2] sched/rt, powerpc: Prepare for PREEMPT_RT
2020-11-10 8:02 [PATCH V2] sched/rt, powerpc: Prepare for PREEMPT_RT Wang Qing
2020-11-10 8:06 ` Christophe Leroy
@ 2020-11-10 8:10 ` Greg Kroah-Hartman
1 sibling, 0 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2020-11-10 8:10 UTC (permalink / raw)
To: Wang Qing
Cc: Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras,
Nicholas Piggin, Christophe Leroy, Jordan Niethe,
Alistair Popple, Michael Neuling, Aneesh Kumar K.V,
Peter Zijlstra, linuxppc-dev, linux-kernel, tglx
On Tue, Nov 10, 2020 at 04:02:47PM +0800, Wang Qing wrote:
> PREEMPT_RT is a separate preemption model, CONFIG_PRTTMPT will
Minor typo on this line with your config option :(
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-10 8:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-10 8:02 [PATCH V2] sched/rt, powerpc: Prepare for PREEMPT_RT Wang Qing
2020-11-10 8:06 ` Christophe Leroy
2020-11-10 8:10 ` Greg Kroah-Hartman
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).