diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-06 10:15:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-06 10:15:28 -0700 |
| commit | 2044513ffe4a9c18e6e2a64f048e05d8b62fa927 (patch) | |
| tree | 011f45466c3fd87a9efa4f4b57188297e7c24d93 /arch/csky/abiv2/inc/abi/entry.h | |
| parent | bbcf9cd1576752ebe8d618ad8c6500b7e262ffac (diff) | |
| parent | bdcd93ef9afb42a6051e472fa62c693b1f9edbd8 (diff) | |
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/abiv2/inc/abi/entry.h')
| -rw-r--r-- | arch/csky/abiv2/inc/abi/entry.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/csky/abiv2/inc/abi/entry.h b/arch/csky/abiv2/inc/abi/entry.h index 4fdd6c12e7ff..bedcc6f06bba 100644 --- a/arch/csky/abiv2/inc/abi/entry.h +++ b/arch/csky/abiv2/inc/abi/entry.h @@ -136,8 +136,6 @@ .macro RESTORE_REGS_FTRACE ldw tls, (sp, 0) - ldw a0, (sp, 16) - mtcr a0, ss0 #ifdef CONFIG_CPU_HAS_HILO ldw a0, (sp, 140) @@ -158,7 +156,6 @@ addi sp, 40 ldm r16-r30, (sp) addi sp, 72 - mfcr sp, ss0 .endm .macro SAVE_SWITCH_STACK |