diff options
author | James Bottomley <JBottomley@Parallels.com> | 2012-05-26 04:48:19 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-05-31 06:14:37 -0400 |
commit | b1195c0e3ee1a1ba986923bf3ed8311b7b336432 (patch) | |
tree | 026ecd136a3001db5699baf499f061cc971f66e2 /arch/parisc/include | |
parent | 8275b91aad22144c4e2ea0c68b8d51090a81ba31 (diff) |
[PARISC] update parisc to use generic strncpy_from_user()
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'arch/parisc/include')
-rw-r--r-- | arch/parisc/include/asm/uaccess.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h index 9ac066086f03..4ba2c93770f1 100644 --- a/arch/parisc/include/asm/uaccess.h +++ b/arch/parisc/include/asm/uaccess.h | |||
@@ -218,15 +218,14 @@ struct exception_data { | |||
218 | extern unsigned long lcopy_to_user(void __user *, const void *, unsigned long); | 218 | extern unsigned long lcopy_to_user(void __user *, const void *, unsigned long); |
219 | extern unsigned long lcopy_from_user(void *, const void __user *, unsigned long); | 219 | extern unsigned long lcopy_from_user(void *, const void __user *, unsigned long); |
220 | extern unsigned long lcopy_in_user(void __user *, const void __user *, unsigned long); | 220 | extern unsigned long lcopy_in_user(void __user *, const void __user *, unsigned long); |
221 | extern long lstrncpy_from_user(char *, const char __user *, long); | 221 | extern long strncpy_from_user(char *, const char __user *, long); |
222 | extern unsigned lclear_user(void __user *,unsigned long); | 222 | extern unsigned lclear_user(void __user *,unsigned long); |
223 | extern long lstrnlen_user(const char __user *,long); | 223 | extern long lstrnlen_user(const char __user *,long); |
224 | |||
225 | /* | 224 | /* |
226 | * Complex access routines -- macros | 225 | * Complex access routines -- macros |
227 | */ | 226 | */ |
227 | #define user_addr_max() (~0UL) | ||
228 | 228 | ||
229 | #define strncpy_from_user lstrncpy_from_user | ||
230 | #define strnlen_user lstrnlen_user | 229 | #define strnlen_user lstrnlen_user |
231 | #define strlen_user(str) lstrnlen_user(str, 0x7fffffffL) | 230 | #define strlen_user(str) lstrnlen_user(str, 0x7fffffffL) |
232 | #define clear_user lclear_user | 231 | #define clear_user lclear_user |