commit | 157378f43faad830e4aa3815bde5fa9f9a9f5be6 | [log] [tgz] |
---|---|---|
author | Olivier Deprez <olivier.deprez@arm.com> | Mon Apr 04 15:47:50 2022 +0200 |
committer | Olivier Deprez <olivier.deprez@arm.com> | Mon Apr 04 17:19:45 2022 +0200 |
tree | a6c9afae04d547459872e71460db6f8a454a070c | |
parent | 0e64123141f3854e695eb4924d82b52856691466 [diff] [blame] |
Update Linux to v5.10.109 Sourced from [1] [1] https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.109.tar.xz Change-Id: I19bca9fc6762d4e63bcf3e4cba88bbe560d9c76c Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h index 63b46e3..ea5b9c3 100644 --- a/arch/s390/include/asm/compat.h +++ b/arch/s390/include/asm/compat.h
@@ -63,8 +63,6 @@ typedef u16 compat_ipc_pid_t; typedef u32 compat_caddr_t; typedef __kernel_fsid_t compat_fsid_t; -typedef s64 compat_s64; -typedef u64 compat_u64; typedef struct { u32 mask; @@ -177,11 +175,7 @@ { return (void __user *)(unsigned long)(uptr & 0x7fffffffUL); } - -static inline compat_uptr_t ptr_to_compat(void __user *uptr) -{ - return (u32)(unsigned long)uptr; -} +#define compat_ptr(uptr) compat_ptr(uptr) #ifdef CONFIG_COMPAT