rx wire up v5.16

Signed-off-by: Yoshinori Sato <yo-satoh@sios.com>

diff --git a/arch/rx/include/asm/processor.h b/arch/rx/include/asm/processor.h
index 133d75e..17497d3 100644 (file)
--- a/arch/rx/include/asm/processor.h
+++ b/arch/rx/include/asm/processor.h
@@ -81,7 +81,7 @@ static inline void prepare_to_copy(struct task_struct *tsk)
  */
 #define thread_saved_pc(tsk)   (tsk->thread.pc)
 
-unsigned long get_wchan(struct task_struct *p);
+unsigned long __get_wchan(struct task_struct *p);
 void show_trace(struct task_struct *tsk, unsigned long *sp,
                struct pt_regs *regs);
 #define        KSTK_EIP(tsk) (task_pt_regs(tsk)->pc)

diff --git a/arch/rx/kernel/process.c b/arch/rx/kernel/process.c
index 9e52401..ee8c5ed 100644 (file)
--- a/arch/rx/kernel/process.c
+++ b/arch/rx/kernel/process.c
@@ -114,7 +114,7 @@ int copy_thread(unsigned long clone_flags,
        return 0;
 }
 
-unsigned long get_wchan(struct task_struct *p)
+unsigned long __get_wchan(struct task_struct *p)
 {
        int count = 0;
        unsigned long pc;