1 From 7dddfb8fec5317ea16154d30e8e18b6559979b60 Mon Sep 17 00:00:00 2001
2 From: Bruce Ashfield <bruce.ashfield@windriver.com>
3 Date: Sun, 25 Aug 2013 22:51:07 -0400
4 Subject: [PATCH] ptrace.h: remove ptrace_peeksiginfo_args
6 The addition of ptrace_peeksiginfo_args to the uapi in kernel commit
7 84c751bd [ptrace: add ability to retrieve signals without removing from a queue (v4)]
8 means that existing applications using glibc versions that define ptrace_peeksiginfo_args
9 in sys/ptrace.h will get duplicate structure definitions like:
11 | In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:
12 | /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8: error: redefinition of 'struct ptrace_peeksiginfo_args'
13 | struct ptrace_peeksiginfo_args {
15 | In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,
16 | from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:
17 | /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8: note: originally defined here
18 | struct ptrace_peeksiginfo_args
20 | make[2]: *** [process.o] Error 1
22 Reverting to the previous status of not exporting this structure temporarily
23 fixes applications, until they can be adjusted to not mix sys/ptrace.h and
24 linux/ptrace.h includes.
26 Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
28 include/uapi/linux/ptrace.h | 6 ------
29 1 file changed, 6 deletions(-)
31 diff --git a/include/uapi/linux/ptrace.h b/include/uapi/linux/ptrace.h
32 index 52ebcc8..524599d 100644
33 --- a/include/uapi/linux/ptrace.h
34 +++ b/include/uapi/linux/ptrace.h
37 #define PTRACE_PEEKSIGINFO 0x4209
39 -struct ptrace_peeksiginfo_args {
40 - __u64 off; /* from which siginfo to start */
42 - __s32 nr; /* how may siginfos to take */
45 /* Read signals from a shared (process wide) queue */
46 #define PTRACE_PEEKSIGINFO_SHARED (1 << 0)
