From: Helge Deller <deller@gmx.de>
Date: Sat, 9 Apr 2016 06:27:08 +0000 (+0200)
Subject: parisc: Add 64bit get_user() and put_user() for 32bit kernel
X-Git-Tag: MMI-PSA29.97-13-9~7838^2~11
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d2ad824f4bb8d146ea6e5f440dddb30b9ccfd98c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

parisc: Add 64bit get_user() and put_user() for 32bit kernel

Allow accessing 64-bit values in userspace from a 32-bit kernel.
The access is not atomic.

Signed-off-by: Helge Deller <deller@gmx.de>
---

diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
index 56b7208da9a4..0f59fd9ca205 100644
--- a/arch/parisc/include/asm/uaccess.h
+++ b/arch/parisc/include/asm/uaccess.h
@@ -40,7 +40,7 @@ static inline long access_ok(int type, const void __user * addr,
 #define get_user __get_user
 
 #if !defined(CONFIG_64BIT)
-#define LDD_USER(ptr)		BUILD_BUG()
+#define LDD_USER(ptr)		__get_user_asm64(ptr)
 #define STD_USER(x, ptr)	__put_user_asm64(x, ptr)
 #else
 #define LDD_USER(ptr)		__get_user_asm("ldd", ptr)
@@ -114,6 +114,20 @@ struct exception_data {
 		: "r"(ptr), "1"(__gu_err)		\
 		: "r1");
 
+#if !defined(CONFIG_64BIT)
+
+#define __get_user_asm64(ptr) 				\
+	__asm__("\n1:\tldw 0(%%sr2,%2),%0"		\
+		"\n2:\tldw 4(%%sr2,%2),%R0\n\t"		\
+		ASM_EXCEPTIONTABLE_ENTRY(1b, fixup_get_user_skip_2)\
+		ASM_EXCEPTIONTABLE_ENTRY(2b, fixup_get_user_skip_1)\
+		: "=r"(__gu_val), "=r"(__gu_err)	\
+		: "r"(ptr), "1"(__gu_err)		\
+		: "r1");
+
+#endif /* !defined(CONFIG_64BIT) */
+
+
 #define __put_user(x, ptr)                                      \
 ({								\
 	register long __pu_err __asm__ ("r8") = 0;      	\