summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorChristoph Hellwig2019-06-13 09:08:59 +0200
committerGreg Ungerer2019-06-24 01:16:47 +0200
commit7a8998c9d830b59626e049a827678ba444fcf8e2 (patch)
treee49c18fba9af2e182f1675ebb8025dcbb1277da6 /arch/m68k
parentbinfmt_flat: make support for old format binaries optional (diff)
downloadkernel-qcow2-linux-7a8998c9d830b59626e049a827678ba444fcf8e2.tar.gz
kernel-qcow2-linux-7a8998c9d830b59626e049a827678ba444fcf8e2.tar.xz
kernel-qcow2-linux-7a8998c9d830b59626e049a827678ba444fcf8e2.zip
binfmt_flat: provide an asm-generic/flat.h
This file implements the flat get/put reloc helpers for architectures that do not need to overload the relocs by simply using get_user/put_user. Note that many nommu architectures currently use {get,put}_unaligned, which looks a little bogus and should probably later be switched over to this version as well. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Vladimir Murzin <vladimir.murzin@arm.com> Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/flat.h21
1 files changed, 1 insertions, 20 deletions
diff --git a/arch/m68k/include/asm/flat.h b/arch/m68k/include/asm/flat.h
index d7102fcd43eb..46379e08cdd6 100644
--- a/arch/m68k/include/asm/flat.h
+++ b/arch/m68k/include/asm/flat.h
@@ -6,26 +6,7 @@
#ifndef __M68KNOMMU_FLAT_H__
#define __M68KNOMMU_FLAT_H__
-#include <linux/uaccess.h>
-
-static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
- u32 *addr, u32 *persistent)
-{
-#ifdef CONFIG_CPU_HAS_NO_UNALIGNED
- return copy_from_user(addr, rp, 4) ? -EFAULT : 0;
-#else
- return get_user(*addr, rp);
-#endif
-}
-
-static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)
-{
-#ifdef CONFIG_CPU_HAS_NO_UNALIGNED
- return copy_to_user(rp, &addr, 4) ? -EFAULT : 0;
-#else
- return put_user(addr, rp);
-#endif
-}
+#include <asm-generic/flat.h>
#define FLAT_PLAT_INIT(regs) \
do { \