Merge tag 'pci-v6.6-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci

[platform/kernel/linux-rpi.git] / arch / arc / kernel / ptrace.c

diff --git a/arch/arc/kernel/ptrace.c b/arch/arc/kernel/ptrace.c
index 2abdcd9..e0c233c 100644 (file)
--- a/arch/arc/kernel/ptrace.c
+++ b/arch/arc/kernel/ptrace.c
@@ -46,8 +46,7 @@ static const struct pt_regs_offset regoffset_table[] = {
        REG_OFFSET_NAME(r0),
        REG_OFFSET_NAME(sp),
        REG_OFFSET_NAME(orig_r0),
-       REG_OFFSET_NAME(event),
-       REG_OFFSET_NAME(user_r25),
+       REG_OFFSET_NAME(ecr),
        REG_OFFSET_END,
 };
 
@@ -55,9 +54,8 @@ static const struct pt_regs_offset regoffset_table[] = {
 
 static const struct pt_regs_offset regoffset_table[] = {
        REG_OFFSET_NAME(orig_r0),
-       REG_OFFSET_NAME(event),
+       REG_OFFSET_NAME(ecr),
        REG_OFFSET_NAME(bta),
-       REG_OFFSET_NAME(user_r25),
        REG_OFFSET_NAME(r26),
        REG_OFFSET_NAME(fp),
        REG_OFFSET_NAME(sp),
@@ -341,7 +339,7 @@ long arch_ptrace(struct task_struct *child, long request,
        return ret;
 }
 
-asmlinkage int syscall_trace_entry(struct pt_regs *regs)
+asmlinkage int syscall_trace_enter(struct pt_regs *regs)
 {
        if (test_thread_flag(TIF_SYSCALL_TRACE))
                if (ptrace_report_syscall_entry(regs))