diff options
| author | Andreas Jaeger <aj@suse.de> | 2012-07-26 13:13:26 +0200 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2012-07-26 13:13:26 +0200 |
| commit | b1b2aaf8eb9eed301ea8f65b96844568ca017f8b (patch) | |
| tree | 4737800f75320e53d5f23b0070ffb33868bbfb46 /sysdeps/unix/sysv/linux/s390 | |
| parent | f8d44fdc72253347dae69fd2c4a231efba4fec98 (diff) | |
| download | glibc-b1b2aaf8eb9eed301ea8f65b96844568ca017f8b.tar.gz glibc-b1b2aaf8eb9eed301ea8f65b96844568ca017f8b.tar.xz glibc-b1b2aaf8eb9eed301ea8f65b96844568ca017f8b.zip | |
Merge Linux 3.5 ptrace changes
(__ptrace_eventcodes): Add new value PTRACE_EVENT_SECCOMP from Linux 3.5. (__ptrace_setoptions): Add new value PTRACE_O_TRACESECCOMP, adjust PTRACE_O_MASK.
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390')
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/sys/ptrace.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h index 4bc7768801..e9181cb1bf 100644 --- a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h +++ b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h @@ -1,5 +1,5 @@ /* `ptrace' debugger support interface. Linux version. - Copyright (C) 2000, 2006, 2007, 2011 Free Software Foundation, Inc. + Copyright (C) 2000-2012 Free Software Foundation, Inc. Contributed by Denis Joseph Barrow (djbarrow@de.ibm.com). This file is part of the GNU C Library. @@ -165,7 +165,8 @@ enum __ptrace_flags }; /* Options set using PTRACE_SETOPTIONS. */ -enum __ptrace_setoptions { +enum __ptrace_setoptions +{ PTRACE_O_TRACESYSGOOD = 0x00000001, PTRACE_O_TRACEFORK = 0x00000002, PTRACE_O_TRACEVFORK = 0x00000004, @@ -173,17 +174,20 @@ enum __ptrace_setoptions { PTRACE_O_TRACEEXEC = 0x00000010, PTRACE_O_TRACEVFORKDONE = 0x00000020, PTRACE_O_TRACEEXIT = 0x00000040, - PTRACE_O_MASK = 0x0000007f + PTRACE_O_TRACESECCOMP = 0x00000080, + PTRACE_O_MASK = 0x000000ff }; /* Wait extended result codes for the above trace options. */ -enum __ptrace_eventcodes { +enum __ptrace_eventcodes +{ PTRACE_EVENT_FORK = 1, PTRACE_EVENT_VFORK = 2, PTRACE_EVENT_CLONE = 3, PTRACE_EVENT_EXEC = 4, PTRACE_EVENT_VFORK_DONE = 5, - PTRACE_EVENT_EXIT = 6 + PTRACE_EVENT_EXIT = 6, + PTRACE_EVENT_SECCOMP = 7 }; /* Perform process tracing functions. REQUEST is one of the values @@ -195,7 +199,7 @@ enum __ptrace_eventcodes { appear (those that are used for the particular request) as: pid_t PID, void *ADDR, int DATA, void *ADDR2 after REQUEST. */ -extern long int ptrace (enum __ptrace_request __request, ...); +extern long int ptrace (enum __ptrace_request __request, ...) __THROW; __END_DECLS |