diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-06 19:15:28 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-06 19:15:28 +0200 |
| commit | 2044513ffe4a9c18e6e2a64f048e05d8b62fa927 (patch) | |
| tree | 011f45466c3fd87a9efa4f4b57188297e7c24d93 /arch/csky/include/asm/bug.h | |
| parent | Merge tag 'xtensa-20200805' of git://github.com/jcmvbkbc/linux-xtensa (diff) | |
| parent | csky: Add context tracking support (diff) | |
| download | linux-2044513ffe4a9c18e6e2a64f048e05d8b62fa927.tar.xz linux-2044513ffe4a9c18e6e2a64f048e05d8b62fa927.zip | |
Merge tag 'csky-for-linus-5.9-rc1' of https://github.com/c-sky/csky-linux
Pull arch/csky updates from Guo Ren:
"New features:
- seccomp-filter
- err-injection
- top-down&random mmap-layout
- irq_work
- show_ipi
- context-tracking
Fixes & Optimizations:
- kprobe_on_ftrace
- optimize panic print"
* tag 'csky-for-linus-5.9-rc1' of https://github.com/c-sky/csky-linux:
csky: Add context tracking support
csky: Add arch_show_interrupts for IPI interrupts
csky: Add irq_work support
csky: Fixup warning by EXPORT_SYMBOL(kmap)
csky: Set CONFIG_NR_CPU 4 as default
csky: Use top-down mmap layout
csky: Optimize the trap processing flow
csky: Add support for function error injection
csky: Fixup kprobes handler couldn't change pc
csky: Fixup duplicated restore sp in RESTORE_REGS_FTRACE
csky: Add cpu feature register hint for smp
csky: Add SECCOMP_FILTER supported
csky: remove unusued thread_saved_pc and *_segments functions/macros
Diffstat (limited to 'arch/csky/include/asm/bug.h')
| -rw-r--r-- | arch/csky/include/asm/bug.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/csky/include/asm/bug.h b/arch/csky/include/asm/bug.h index bd7b3235bb84..33ebd16b9c78 100644 --- a/arch/csky/include/asm/bug.h +++ b/arch/csky/include/asm/bug.h @@ -20,7 +20,8 @@ do { \ struct pt_regs; -void die_if_kernel(char *str, struct pt_regs *regs, int nr); +void die(struct pt_regs *regs, const char *str); void show_regs(struct pt_regs *regs); +void show_code(struct pt_regs *regs); #endif /* __ASM_CSKY_BUG_H */ |