| Andrew Geissler | 4b740dc | 2020-05-05 08:54:39 -0500 | [diff] [blame^] | 1 | From 0a4035ff2e4fd5b5ae0cf8f8665696c2aff53b75 Mon Sep 17 00:00:00 2001 |
| 2 | From: Karel Zak <kzak@redhat.com> |
| 3 | Date: Tue, 10 Mar 2020 11:43:16 +0100 |
| 4 | Subject: [PATCH] include: cleanup pidfd inckudes |
| 5 | |
| 6 | Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/0a4035ff2e4fd5b5ae0cf8f8665696c2aff53b75] |
| 7 | |
| 8 | Signed-off-by: Karel Zak <kzak@redhat.com> |
| 9 | Signed-off-by: Benjamin Fair <benjaminfair@google.com> |
| 10 | --- |
| 11 | include/pidfd-utils.h | 6 +++--- |
| 12 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 13 | |
| 14 | diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h |
| 15 | index 0baedd2c9..4a6c3a604 100644 |
| 16 | --- a/include/pidfd-utils.h |
| 17 | +++ b/include/pidfd-utils.h |
| 18 | @@ -3,10 +3,10 @@ |
| 19 | |
| 20 | #if defined(__linux__) |
| 21 | # include <sys/syscall.h> |
| 22 | -# if defined(SYS_pidfd_send_signal) |
| 23 | +# if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open) |
| 24 | # include <sys/types.h> |
| 25 | |
| 26 | -# ifndef HAVE_PIDFD_OPEN |
| 27 | +# ifndef HAVE_PIDFD_SEND_SIGNAL |
| 28 | static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, |
| 29 | unsigned int flags) |
| 30 | { |
| 31 | @@ -14,7 +14,7 @@ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, |
| 32 | } |
| 33 | # endif |
| 34 | |
| 35 | -# ifndef HAVE_PIDFD_SEND_SIGNAL |
| 36 | +# ifndef HAVE_PIDFD_OPEN |
| 37 | static inline int pidfd_open(pid_t pid, unsigned int flags) |
| 38 | { |
| 39 | return syscall(SYS_pidfd_open, pid, flags); |
| 40 | -- |
| 41 | 2.26.1.301.g55bc3eb7cb9-goog |
| 42 | |