diff options
Diffstat (limited to 'arch/um/os-Linux/start_up.c')
-rw-r--r-- | arch/um/os-Linux/start_up.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c index 02ee9adff54a..425162e22af5 100644 --- a/arch/um/os-Linux/start_up.c +++ b/arch/um/os-Linux/start_up.c | |||
@@ -13,12 +13,10 @@ | |||
13 | #include <signal.h> | 13 | #include <signal.h> |
14 | #include <string.h> | 14 | #include <string.h> |
15 | #include <sys/mman.h> | 15 | #include <sys/mman.h> |
16 | #include <sys/ptrace.h> | ||
17 | #include <sys/stat.h> | 16 | #include <sys/stat.h> |
18 | #include <sys/wait.h> | 17 | #include <sys/wait.h> |
19 | #include <asm/unistd.h> | 18 | #include <asm/unistd.h> |
20 | #include "init.h" | 19 | #include "init.h" |
21 | #include "kern_constants.h" | ||
22 | #include "os.h" | 20 | #include "os.h" |
23 | #include "mem_user.h" | 21 | #include "mem_user.h" |
24 | #include "ptrace_user.h" | 22 | #include "ptrace_user.h" |
@@ -225,7 +223,7 @@ static void __init check_sysemu(void) | |||
225 | goto fail; | 223 | goto fail; |
226 | } | 224 | } |
227 | 225 | ||
228 | n = ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_RET_OFFSET, os_getpid()); | 226 | n = ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_RET_OFFSET, os_getpid()); |
229 | if (n < 0) { | 227 | if (n < 0) { |
230 | non_fatal("check_sysemu : failed to modify system call " | 228 | non_fatal("check_sysemu : failed to modify system call " |
231 | "return"); | 229 | "return"); |
@@ -261,7 +259,7 @@ static void __init check_sysemu(void) | |||
261 | "doesn't singlestep"); | 259 | "doesn't singlestep"); |
262 | goto fail; | 260 | goto fail; |
263 | } | 261 | } |
264 | n = ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_RET_OFFSET, | 262 | n = ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_RET_OFFSET, |
265 | os_getpid()); | 263 | os_getpid()); |
266 | if (n < 0) | 264 | if (n < 0) |
267 | fatal_perror("check_sysemu : failed to modify " | 265 | fatal_perror("check_sysemu : failed to modify " |
@@ -317,10 +315,10 @@ static void __init check_ptrace(void) | |||
317 | fatal("check_ptrace : expected (SIGTRAP|0x80), " | 315 | fatal("check_ptrace : expected (SIGTRAP|0x80), " |
318 | "got status = %d", status); | 316 | "got status = %d", status); |
319 | 317 | ||
320 | syscall = ptrace(PTRACE_PEEKUSR, pid, PT_SYSCALL_NR_OFFSET, | 318 | syscall = ptrace(PTRACE_PEEKUSER, pid, PT_SYSCALL_NR_OFFSET, |
321 | 0); | 319 | 0); |
322 | if (syscall == __NR_getpid) { | 320 | if (syscall == __NR_getpid) { |
323 | n = ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_NR_OFFSET, | 321 | n = ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_NR_OFFSET, |
324 | __NR_getppid); | 322 | __NR_getppid); |
325 | if (n < 0) | 323 | if (n < 0) |
326 | fatal_perror("check_ptrace : failed to modify " | 324 | fatal_perror("check_ptrace : failed to modify " |