aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-12-12 18:15:25 +0100
committerArnd Bergmann <arnd@arndb.de>2020-01-03 09:32:51 +0100
commit202bf8d7583f2b6e28de2e9edf6fcd7e3667a173 (patch)
treeacc551431ec00ecd6c4935a7d4a2de51c0cae4c6 /arch/s390
parentcompat: ARM64: always include asm-generic/compat.h (diff)
downloadlinux-dev-202bf8d7583f2b6e28de2e9edf6fcd7e3667a173.tar.xz
linux-dev-202bf8d7583f2b6e28de2e9edf6fcd7e3667a173.zip
compat: provide compat_ptr() on all architectures
In order to avoid needless #ifdef CONFIG_COMPAT checks, move the compat_ptr() definition to linux/compat.h where it can be seen by any file regardless of the architecture. Only s390 needs a special definition, this can use the self-#define trick we have elsewhere. Reviewed-by: Ben Hutchings <ben.hutchings@codethink.co.uk> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/include/asm/compat.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h
index 63b46e30b2c3..9547cd5d6cdc 100644
--- a/arch/s390/include/asm/compat.h
+++ b/arch/s390/include/asm/compat.h
@@ -177,11 +177,7 @@ static inline void __user *compat_ptr(compat_uptr_t uptr)
{
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