| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame] | 1 | From a33c262f828f803fffdad8e1f44d524dc9c75856 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ben Hutchings <ben@decadent.org.uk> |
| 3 | Date: Wed, 3 Aug 2022 01:10:01 +0200 |
| 4 | Subject: [PATCH] fcntl: Fix build failure for some architectures with Linux |
| 5 | 5.19 |
| 6 | |
| 7 | Starting from Linux 5.19, the kernel UAPI headers now only define |
| 8 | __ARCH_FLOCK64_PAD if the architecture actually needs padding in |
| 9 | struct flock64. Wrap its use with #ifdef, |
| 10 | |
| 11 | Upstream-Status: Backport [https://git.kernel.org/pub/scm/libs/klibc/klibc.git/commit/?id=bb2fde5ddbc18a2e7795ca4d24759230c2aae9d0] |
| 12 | Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | --- |
| 15 | usr/include/fcntl.h | 2 ++ |
| 16 | 1 file changed, 2 insertions(+) |
| 17 | |
| 18 | diff --git a/usr/include/fcntl.h b/usr/include/fcntl.h |
| 19 | index ed703a6..cb2e4e5 100644 |
| 20 | --- a/usr/include/fcntl.h |
| 21 | +++ b/usr/include/fcntl.h |
| 22 | @@ -33,7 +33,9 @@ struct flock { |
| 23 | __kernel_loff_t l_start; |
| 24 | __kernel_loff_t l_len; |
| 25 | __kernel_pid_t l_pid; |
| 26 | +#ifdef __ARCH_FLOCK64_PAD |
| 27 | __ARCH_FLOCK64_PAD |
| 28 | +#endif |
| 29 | }; |
| 30 | |
| 31 | #ifdef F_GETLK64 |
| 32 | -- |
| 33 | 2.37.2 |
| 34 | |