diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-07 13:27:42 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-07 13:27:42 +1000 |
commit | 6c76650b6e643ed2665c72305c47f08f0babd07a (patch) | |
tree | 0e9dc0ac01586e3a0342a9e09eec0f969f1efb54 /arch/x86/um/asm/ptrace.h | |
parent | 6b382d660242a32d063d0a7e5200c3e5e702c243 (diff) | |
parent | 71c4271c9a58a75e2b6f0ffa81292befdfb02e93 (diff) | |
download | linux-next-6c76650b6e643ed2665c72305c47f08f0babd07a.tar.gz |
Merge remote-tracking branch 'tip/auto-latest'
Diffstat (limited to 'arch/x86/um/asm/ptrace.h')
-rw-r--r-- | arch/x86/um/asm/ptrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/um/asm/ptrace.h b/arch/x86/um/asm/ptrace.h index e59eef20647b..b291ca5cf66b 100644 --- a/arch/x86/um/asm/ptrace.h +++ b/arch/x86/um/asm/ptrace.h @@ -78,7 +78,7 @@ static inline int ptrace_set_thread_area(struct task_struct *child, int idx, return -ENOSYS; } -extern long arch_prctl(struct task_struct *task, int code, +extern long arch_prctl(struct task_struct *task, int option, unsigned long __user *addr); #endif |