summaryrefslogtreecommitdiffstats
path: root/arch/sparc/include
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2022-04-05 09:12:57 +0200
committerPalmer Dabbelt <palmer@rivosinc.com>2022-04-26 22:35:28 +0200
commit3ce0f2373f7073f04715b1ffd7b1812d3183f79a (patch)
tree700aeba9d83ac68bdebd2cd977eed1767a7e93f4 /arch/sparc/include
parentuapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h (diff)
downloadlinux-3ce0f2373f7073f04715b1ffd7b1812d3183f79a.tar.xz
linux-3ce0f2373f7073f04715b1ffd7b1812d3183f79a.zip
compat: consolidate the compat_flock{,64} definition
Provide a single common definition for the compat_flock and compat_flock64 structures using the same tricks as for the native variants. Another extra define is added for the packing required on x86. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Guo Ren <guoren@kernel.org> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Tested-by: Heiko Stuebner <heiko@sntech.de> Acked-by: Helge Deller <deller@gmx.de> # parisc Link: https://lore.kernel.org/r/20220405071314.3225832-4-guoren@kernel.org Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Diffstat (limited to 'arch/sparc/include')
-rw-r--r--arch/sparc/include/asm/compat.h18
1 files changed, 1 insertions, 17 deletions
diff --git a/arch/sparc/include/asm/compat.h b/arch/sparc/include/asm/compat.h
index 108078751bb5..d78fb44942e0 100644
--- a/arch/sparc/include/asm/compat.h
+++ b/arch/sparc/include/asm/compat.h
@@ -75,23 +75,7 @@ struct compat_stat64 {
unsigned int __unused5;
};
-struct compat_flock {
- short l_type;
- short l_whence;
- compat_off_t l_start;
- compat_off_t l_len;
- compat_pid_t l_pid;
- short __unused;
-};
-
-struct compat_flock64 {
- short l_type;
- short l_whence;
- compat_loff_t l_start;
- compat_loff_t l_len;
- compat_pid_t l_pid;
- short __unused;
-};
+#define __ARCH_COMPAT_FLOCK_PAD short __unused;
struct compat_statfs {
int f_type;