[Kinetic][Unstable][PATCH] UBUNTU: SAUCE: uapi: Fixup strace compile error

[Dimitri John Ledkov]

From: Guo Ren <guoren at linux.alibaba.com>

BugLink: https://bugs.launchpad.net/bugs/1990964

Export F_*64 definitions to userspace permanently. "ifndef" usage made it
vailable at all times to the userspace, and this change has actually broken
building strace with the latest kernel headers. There could be some debate
whether having these F_*64 definitions exposed to the user space 64-bit
applications, but it seems that were no harm (as they were exposed already
for quite some time), and they are useful at least for strace for compat
application tracing purposes.

Fixes: 306f7cc1e9061 "uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h"
Signed-off-by: Guo Ren <guoren at linux.alibaba.com>
Signed-off-by: Guo Ren <guoren at kernel.org>
Reported-by: Eugene Syromiatnikov <esyr at redhat.com>
Acked-by: Palmer Dabbelt <palmer at rivosinc.com>
Cc: Christoph Hellwig <hch at lst.de>
Cc: Arnd Bergmann <arnd at arndb.de>
Cc: Heiko Stuebner <heiko at sntech.de>
Link: https://lore.kernel.org/lkml/20220804025448.1240780-1-guoren@kernel.org/raw
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
---
 include/uapi/asm-generic/fcntl.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h
index 1ecdb911ad..3a38989532 100644
--- a/include/uapi/asm-generic/fcntl.h
+++ b/include/uapi/asm-generic/fcntl.h
@@ -116,13 +116,11 @@
 #define F_GETSIG	11	/* for sockets. */
 #endif
 
-#if __BITS_PER_LONG == 32 || defined(__KERNEL__)
 #ifndef F_GETLK64
 #define F_GETLK64	12	/*  using 'struct flock64' */
 #define F_SETLK64	13
 #define F_SETLKW64	14
 #endif
-#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */
 
 #ifndef F_SETOWN_EX
 #define F_SETOWN_EX	15
-- 
2.34.1