From: Nicolas Pitre <nicolas.pitre@linaro.org>
Date: Tue, 17 Sep 2013 18:16:38 +0000 (+0100)
Subject: ARM: 7836/1: add __get_user_unaligned/__put_user_unaligned
X-Git-Tag: v3.12-rc3~17^2~3
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=c89efa731e70a12908a0c155518ebbfd2d6ca605;p=~andy%2Flinux

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>
---

diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
index 7e1f76027f6..72abdc541f3 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