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

diff --cc arch/csky/Kconfig
index 902f1142d55073a628b51282f5187912afb30cec,af238739811e1e84c09e8a4d022ca7e09cfdc470..3d5afb5f568543d20fe0d714615c407508cd8e1b
--- 1/arch/csky/Kconfig
--- 2/arch/csky/Kconfig
+++ b/arch/csky/Kconfig
@@@ -38,6 -39,11 +39,10 @@@ config CSK
        select GX6605S_TIMER if CPU_CK610
        select HAVE_ARCH_TRACEHOOK
        select HAVE_ARCH_AUDITSYSCALL
 -      select HAVE_COPY_THREAD_TLS
+       select HAVE_ARCH_MMAP_RND_BITS
+       select HAVE_ARCH_SECCOMP_FILTER
+       select HAVE_CONTEXT_TRACKING
+       select HAVE_VIRT_CPU_ACCOUNTING_GEN
        select HAVE_DEBUG_BUGVERBOSE
        select HAVE_DYNAMIC_FTRACE
        select HAVE_DYNAMIC_FTRACE_WITH_REGS

diff --cc arch/csky/kernel/process.c
index 28cfeaaf902a3ee7c3a468933fa38821aa4d8870,3da63cf0bfde4a77bcb04980eae7c896b74271f7..f730869e21eed4829e5f5e90c96f64f1bbc95b68
--- 1/arch/csky/kernel/process.c
--- 2/arch/csky/kernel/process.c
+++ b/arch/csky/kernel/process.c
@@@ -30,17 -30,7 +30,7 @@@ asmlinkage void ret_from_kernel_thread(
   */
  void flush_thread(void){}
  
- /*
-  * Return saved PC from a blocked thread
-  */
- unsigned long thread_saved_pc(struct task_struct *tsk)
- {
-       struct switch_stack *sw = (struct switch_stack *)tsk->thread.sp;
- 
-       return sw->r15;
- }
- 
 -int copy_thread_tls(unsigned long clone_flags,
 +int copy_thread(unsigned long clone_flags,
                unsigned long usp,
                unsigned long kthread_arg,
                struct task_struct *p,

diff --cc tools/testing/selftests/seccomp/seccomp_bpf.c
index 06bd5901be7458971bd6db636aa4e6e795670262,8d18a0ddafdd84e4fcde80e4a28a3525f4373a6a..535720b2592ae60520bd1c1424ed078dbfca7da3
--- 1/tools/testing/selftests/seccomp/seccomp_bpf.c
--- 2/tools/testing/selftests/seccomp/seccomp_bpf.c
+++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
@@@ -1781,7 -1704,7 +1791,7 @@@ void change_syscall(struct __test_metad
  
  #if defined(__x86_64__) || defined(__i386__) || defined(__powerpc__) || \
        defined(__s390__) || defined(__hppa__) || defined(__riscv) || \
-       defined(__xtensa__)
 -      defined(__csky__)
++      defined(__xtensa__) || defined(__csky__)
        {
                regs.SYSCALL_NUM = syscall;
        }