Merge tag 'kbuild-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[linux-2.6-microblaze.git] / kernel / ptrace.c

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 79de129..61db50f 100644 (file)
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -57,7 +57,7 @@ int ptrace_access_vm(struct task_struct *tsk, unsigned long addr,
                return 0;
        }
 
-       ret = __access_remote_vm(tsk, mm, addr, buf, len, gup_flags);
+       ret = __access_remote_vm(mm, addr, buf, len, gup_flags);
        mmput(mm);
 
        return ret;
@@ -117,9 +117,9 @@ void __ptrace_unlink(struct task_struct *child)
        const struct cred *old_cred;
        BUG_ON(!child->ptrace);
 
-       clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-#ifdef TIF_SYSCALL_EMU
-       clear_tsk_thread_flag(child, TIF_SYSCALL_EMU);
+       clear_task_syscall_work(child, SYSCALL_TRACE);
+#if defined(CONFIG_GENERIC_ENTRY) || defined(TIF_SYSCALL_EMU)
+       clear_task_syscall_work(child, SYSCALL_EMU);
 #endif
 
        child->parent = child->real_parent;
@@ -806,15 +806,15 @@ static int ptrace_resume(struct task_struct *child, long request,
                return -EIO;
 
        if (request == PTRACE_SYSCALL)
-               set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
+               set_task_syscall_work(child, SYSCALL_TRACE);
        else
-               clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
+               clear_task_syscall_work(child, SYSCALL_TRACE);
 
-#ifdef TIF_SYSCALL_EMU
+#if defined(CONFIG_GENERIC_ENTRY) || defined(TIF_SYSCALL_EMU)
        if (request == PTRACE_SYSEMU || request == PTRACE_SYSEMU_SINGLESTEP)
-               set_tsk_thread_flag(child, TIF_SYSCALL_EMU);
+               set_task_syscall_work(child, SYSCALL_EMU);
        else
-               clear_tsk_thread_flag(child, TIF_SYSCALL_EMU);
+               clear_task_syscall_work(child, SYSCALL_EMU);
 #endif
 
        if (is_singleblock(request)) {