Merge tag 'vfio-v4.11-rc1' of git://github.com/awilliam/linux-vfio

[karo-tx-linux.git] / arch / mips / kernel / ptrace32.c

diff --git a/arch/mips/kernel/ptrace32.c b/arch/mips/kernel/ptrace32.c
index 7e71a4e0281ba9cc3c2190dd9a06d958754155fb..4f0998525626678d9f154bf76ecb9d08c9fe2cf5 100644 (file)
--- a/arch/mips/kernel/ptrace32.c
+++ b/arch/mips/kernel/ptrace32.c
@@ -32,7 +32,7 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/reg.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/bootinfo.h>
 
 /*
@@ -69,7 +69,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
                if (get_user(addrOthers, (u32 __user * __user *) (unsigned long) addr) != 0)
                        break;
 
-               copied = access_process_vm(child, (u64)addrOthers, &tmp,
+               copied = ptrace_access_vm(child, (u64)addrOthers, &tmp,
                                sizeof(tmp), FOLL_FORCE);
                if (copied != sizeof(tmp))
                        break;
@@ -178,7 +178,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
                if (get_user(addrOthers, (u32 __user * __user *) (unsigned long) addr) != 0)
                        break;
                ret = 0;
-               if (access_process_vm(child, (u64)addrOthers, &data,
+               if (ptrace_access_vm(child, (u64)addrOthers, &data,
                                        sizeof(data),
                                        FOLL_FORCE | FOLL_WRITE) == sizeof(data))
                        break;