diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-23 08:28:19 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-23 08:28:19 +0100 |
| commit | 1f9ca184049724209cddbddac593d13eb87e48c0 (patch) | |
| tree | a96bfd7bad95b717d2cabfd1e00e8803e998c23d /arch/x86/um/os-Linux/prctl.c | |
| parent | b23adb7d3f7d1d7cce03db9704de67a99ceeda38 (diff) | |
| parent | d582799fe5de1c1ca127d7f364db12a660cf46d4 (diff) | |
| download | linux-1f9ca184049724209cddbddac593d13eb87e48c0.tar.gz linux-1f9ca184049724209cddbddac593d13eb87e48c0.tar.bz2 linux-1f9ca184049724209cddbddac593d13eb87e48c0.zip | |
Merge branch 'x86/process' into x86/mm, to create new base for further patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/um/os-Linux/prctl.c')
| -rw-r--r-- | arch/x86/um/os-Linux/prctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/um/os-Linux/prctl.c b/arch/x86/um/os-Linux/prctl.c index 96eb2bd28832..8431e87ac333 100644 --- a/arch/x86/um/os-Linux/prctl.c +++ b/arch/x86/um/os-Linux/prctl.c @@ -6,7 +6,7 @@ #include <sys/ptrace.h> #include <asm/ptrace.h> -int os_arch_prctl(int pid, int code, unsigned long *addr) +int os_arch_prctl(int pid, int option, unsigned long *arg2) { - return ptrace(PTRACE_ARCH_PRCTL, pid, (unsigned long) addr, code); + return ptrace(PTRACE_ARCH_PRCTL, pid, (unsigned long) arg2, option); } |