Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From 560347f77236616a635b4a997a0596b8da4d0799 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 8 Jan 2016 07:08:25 +0000 |
| 4 | Subject: [PATCH 23/32] ptrace: Use int instead of enum __ptrace_request |
| 5 | |
| 6 | __ptrace_request is only available with glibc |
| 7 | |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | --- |
| 10 | testcases/kernel/syscalls/ptrace/ptrace03.c | 4 ++++ |
| 11 | testcases/kernel/syscalls/ptrace/spawn_ptrace_child.h | 4 ++++ |
| 12 | 2 files changed, 8 insertions(+) |
| 13 | |
| 14 | diff --git a/testcases/kernel/syscalls/ptrace/ptrace03.c b/testcases/kernel/syscalls/ptrace/ptrace03.c |
| 15 | index a4028fc..f1880cd 100644 |
| 16 | --- a/testcases/kernel/syscalls/ptrace/ptrace03.c |
| 17 | +++ b/testcases/kernel/syscalls/ptrace/ptrace03.c |
| 18 | @@ -102,7 +102,11 @@ static pid_t unused_pid; |
| 19 | static pid_t zero_pid; |
| 20 | |
| 21 | struct test_case_t { |
| 22 | +#ifdef __GLIBC__ |
| 23 | enum __ptrace_request request; |
| 24 | +#else |
| 25 | + int request; |
| 26 | +#endif |
| 27 | pid_t *pid; |
| 28 | int exp_errno; |
| 29 | } test_cases[] = { |
| 30 | diff --git a/testcases/kernel/syscalls/ptrace/spawn_ptrace_child.h b/testcases/kernel/syscalls/ptrace/spawn_ptrace_child.h |
| 31 | index ae538e9..85aa89d 100644 |
| 32 | --- a/testcases/kernel/syscalls/ptrace/spawn_ptrace_child.h |
| 33 | +++ b/testcases/kernel/syscalls/ptrace/spawn_ptrace_child.h |
| 34 | @@ -130,7 +130,11 @@ static char *strings[] = { |
| 35 | SPT(KILL) |
| 36 | SPT(SINGLESTEP) |
| 37 | }; |
| 38 | +#ifdef __GLIBC__ |
| 39 | static inline char *strptrace(enum __ptrace_request request) |
| 40 | +#else |
| 41 | +static inline char *strptrace(int request) |
| 42 | +#endif |
| 43 | { |
| 44 | return strings[request]; |
| 45 | } |
| 46 | -- |
| 47 | 2.7.0 |
| 48 | |