summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2013-09-17 19:16:38 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-09-18 10:58:23 +0100
commitc89efa731e70a12908a0c155518ebbfd2d6ca605 (patch)
tree87ed5ffda3458119cf06bd4986aca160dc2bcdd6 /arch/arm
parent272b98c6455f00884f0350f775c5342358ebb73f (diff)
downloadlinux-c89efa731e70a12908a0c155518ebbfd2d6ca605.tar.bz2
ARM: 7836/1: add __get_user_unaligned/__put_user_unaligned
BTRFS is now relying on those since v3.12-rc1. Signed-off-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/uaccess.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
index 7e1f76027f66..72abdc541f38 100644
--- a/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
@@ -19,6 +19,13 @@
#include <asm/unified.h>
#include <asm/compiler.h>
+#if __LINUX_ARM_ARCH__ < 6
+#include <asm-generic/uaccess-unaligned.h>
+#else
+#define __get_user_unaligned __get_user
+#define __put_user_unaligned __put_user
+#endif
+
#define VERIFY_READ 0
#define VERIFY_WRITE 1