diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2020-04-01 12:26:12 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-04-01 12:26:12 +0200 |
| commit | c9f289701540baeef9ac7c9977d67a7259f404db (patch) | |
| tree | ac3c29d41da02ac735c9a12da78905842fbccd2f /arch/s390/kernel/dumpstack.c | |
| parent | Merge branch 'for-5.6/upstream-fixes' into for-linus (diff) | |
| parent | HID: appleir: Use devm_kzalloc() instead of kzalloc() (diff) | |
| download | wireguard-linux-c9f289701540baeef9ac7c9977d67a7259f404db.tar.xz wireguard-linux-c9f289701540baeef9ac7c9977d67a7259f404db.zip | |
Merge branch 'for-5.7/appleir' into for-linus
- small code cleanups in hid-appleir from Lucas Tanure
Diffstat (limited to 'arch/s390/kernel/dumpstack.c')
| -rw-r--r-- | arch/s390/kernel/dumpstack.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/kernel/dumpstack.c b/arch/s390/kernel/dumpstack.c index d306fe04489a..2c122d8bab93 100644 --- a/arch/s390/kernel/dumpstack.c +++ b/arch/s390/kernel/dumpstack.c @@ -195,6 +195,8 @@ void die(struct pt_regs *regs, const char *str) 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()) |