aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-parisc
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-parisc')
-rw-r--r--include/asm-parisc/uaccess.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-parisc/uaccess.h b/include/asm-parisc/uaccess.h
index 98c36dcadf80..d5d831ea7bc6 100644
--- a/include/asm-parisc/uaccess.h
+++ b/include/asm-parisc/uaccess.h
@@ -42,7 +42,7 @@ static inline long access_ok(int type, const void __user * addr,
42#define put_user __put_user 42#define put_user __put_user
43#define get_user __get_user 43#define get_user __get_user
44 44
45#if !defined(__LP64__) 45#if !defined(CONFIG_64BIT)
46#define LDD_KERNEL(ptr) __get_kernel_bad(); 46#define LDD_KERNEL(ptr) __get_kernel_bad();
47#define LDD_USER(ptr) __get_user_bad(); 47#define LDD_USER(ptr) __get_user_bad();
48#define STD_KERNEL(x, ptr) __put_kernel_asm64(x,ptr) 48#define STD_KERNEL(x, ptr) __put_kernel_asm64(x,ptr)
@@ -185,7 +185,7 @@ struct exception_data {
185 : "r1") 185 : "r1")
186 186
187 187
188#if !defined(__LP64__) 188#if !defined(CONFIG_64BIT)
189 189
190#define __put_kernel_asm64(__val,ptr) do { \ 190#define __put_kernel_asm64(__val,ptr) do { \
191 u64 __val64 = (u64)(__val); \ 191 u64 __val64 = (u64)(__val); \
@@ -211,15 +211,15 @@ struct exception_data {
211 "\n1:\tstw %2,0(%%sr3,%1)\n" \ 211 "\n1:\tstw %2,0(%%sr3,%1)\n" \
212 "\n2:\tstw %3,4(%%sr3,%1)\n" \ 212 "\n2:\tstw %3,4(%%sr3,%1)\n" \
213 "\t.section __ex_table,\"aw\"\n" \ 213 "\t.section __ex_table,\"aw\"\n" \
214 "\t.word\t1b,fixup_get_user_skip_2\n" \ 214 "\t.word\t1b,fixup_put_user_skip_2\n" \
215 "\t.word\t2b,fixup_get_user_skip_1\n" \ 215 "\t.word\t2b,fixup_put_user_skip_1\n" \
216 "\t.previous" \ 216 "\t.previous" \
217 : "=r"(__pu_err) \ 217 : "=r"(__pu_err) \
218 : "r"(ptr), "r"(hi), "r"(lo), "0"(__pu_err) \ 218 : "r"(ptr), "r"(hi), "r"(lo), "0"(__pu_err) \
219 : "r1"); \ 219 : "r1"); \
220} while (0) 220} while (0)
221 221
222#endif /* !defined(__LP64__) */ 222#endif /* !defined(CONFIG_64BIT) */
223 223
224 224
225/* 225/*