aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/include
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2016-04-09 02:27:08 -0400
committerHelge Deller <deller@gmx.de>2016-05-22 15:39:04 -0400
commitd2ad824f4bb8d146ea6e5f440dddb30b9ccfd98c (patch)
treebfc218919d3d8a93f46ad29cf2a19a847e8665a2 /arch/parisc/include
parent06bff6b9d7d50566a9320f64b0624957798cb08b (diff)
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>
Diffstat (limited to 'arch/parisc/include')
-rw-r--r--arch/parisc/include/asm/uaccess.h16
1 files changed, 15 insertions, 1 deletions
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,
40#define get_user __get_user 40#define get_user __get_user
41 41
42#if !defined(CONFIG_64BIT) 42#if !defined(CONFIG_64BIT)
43#define LDD_USER(ptr) BUILD_BUG() 43#define LDD_USER(ptr) __get_user_asm64(ptr)
44#define STD_USER(x, ptr) __put_user_asm64(x, ptr) 44#define STD_USER(x, ptr) __put_user_asm64(x, ptr)
45#else 45#else
46#define LDD_USER(ptr) __get_user_asm("ldd", ptr) 46#define LDD_USER(ptr) __get_user_asm("ldd", ptr)
@@ -114,6 +114,20 @@ struct exception_data {
114 : "r"(ptr), "1"(__gu_err) \ 114 : "r"(ptr), "1"(__gu_err) \
115 : "r1"); 115 : "r1");
116 116
117#if !defined(CONFIG_64BIT)
118
119#define __get_user_asm64(ptr) \
120 __asm__("\n1:\tldw 0(%%sr2,%2),%0" \
121 "\n2:\tldw 4(%%sr2,%2),%R0\n\t" \
122 ASM_EXCEPTIONTABLE_ENTRY(1b, fixup_get_user_skip_2)\
123 ASM_EXCEPTIONTABLE_ENTRY(2b, fixup_get_user_skip_1)\
124 : "=r"(__gu_val), "=r"(__gu_err) \
125 : "r"(ptr), "1"(__gu_err) \
126 : "r1");
127
128#endif /* !defined(CONFIG_64BIT) */
129
130
117#define __put_user(x, ptr) \ 131#define __put_user(x, ptr) \
118({ \ 132({ \
119 register long __pu_err __asm__ ("r8") = 0; \ 133 register long __pu_err __asm__ ("r8") = 0; \