evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

microblaze: uaccess: Unify __copy_tofrom_user

Browse source 
Move to generic location.

Signed-off-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
Michal Simek 2010-03-22 18:39:20 +01:00
parent cca79120c2
commit 94804a9b3d
2 changed files with 22 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
arch/microblaze/include/asm/uaccess.h
View file

@ -111,6 +111,9 @@ static inline int ___range_ok(unsigned long addr, unsigned long size)
# define __EX_TABLE_SECTION ".section .discard,\"a\"\n" # define __EX_TABLE_SECTION ".section .discard,\"a\"\n"
#endif #endif
extern unsigned long __copy_tofrom_user(void __user *to,
const void __user *from, unsigned long size);
/* Return: number of not copied bytes, i.e. 0 if OK or non-zero if fail. */ /* Return: number of not copied bytes, i.e. 0 if OK or non-zero if fail. */
static inline unsigned long __must_check __clear_user(void __user *to, static inline unsigned long __must_check __clear_user(void __user *to,
unsigned long n) unsigned long n)
@ -322,23 +325,6 @@ static inline long strncpy_from_user(char *dst,
return res; return res;
} }
static inline unsigned long __copy_tofrom_user(void __user *to,
const void __user *from, unsigned long size)
{
memcpy(to, from, size);
return 0;
}
#define copy_to_user(to, from, n) (memcpy((to), (from), (n)), 0)
#define copy_from_user(to, from, n) (memcpy((to), (from), (n)), 0)
#define __copy_to_user(to, from, n) (copy_to_user((to), (from), (n)))
#define __copy_from_user(to, from, n) (copy_from_user((to), (from), (n)))
#define __copy_to_user_inatomic(to, from, n) \
(__copy_to_user((to), (from), (n)))
#define __copy_from_user_inatomic(to, from, n) \
(__copy_from_user((to), (from), (n)))
extern long strncpy_from_user(char *dst, const char *src, long count); extern long strncpy_from_user(char *dst, const char *src, long count);
extern long strnlen_user(const char *src, long count); extern long strnlen_user(const char *src, long count);
@ -350,8 +336,24 @@ extern long strnlen_user(const char *src, long count);
? __put_user((x), (ptr)) : -EFAULT; \ ? __put_user((x), (ptr)) : -EFAULT; \
}) })
extern unsigned long __copy_tofrom_user(void __user *to, extern int __strncpy_user(char *to, const char __user *from, int len);
const void __user *from, unsigned long size);
#define __strncpy_from_user __strncpy_user
static inline long
strncpy_from_user(char *dst, const char __user *src, long count)
{
if (!access_ok(VERIFY_READ, src, 1))
return -EFAULT;
return __strncpy_from_user(dst, src, count);
}
extern int __strnlen_user(const char __user *sstr, int len);
#define strnlen_user(str, len) \
(access_ok(VERIFY_READ, str, 1) ? __strnlen_user(str, len) : 0)
#endif /* CONFIG_MMU */
#define __copy_from_user(to, from, n) \ #define __copy_from_user(to, from, n) \
__copy_tofrom_user((__force void __user *)(to), \ __copy_tofrom_user((__force void __user *)(to), \
@ -384,25 +386,6 @@ static inline long copy_to_user(void __user *to,
return n; return n;
} }
extern int __strncpy_user(char *to, const char __user *from, int len);
#define __strncpy_from_user __strncpy_user
static inline long
strncpy_from_user(char *dst, const char __user *src, long count)
{
if (!access_ok(VERIFY_READ, src, 1))
return -EFAULT;
return __strncpy_from_user(dst, src, count);
}
extern int __strnlen_user(const char __user *sstr, int len);
#define strnlen_user(str, len) \
(access_ok(VERIFY_READ, str, 1) ? __strnlen_user(str, len) : 0)
#endif /* CONFIG_MMU */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

2
arch/microblaze/lib/Makefile
View file

@ -10,4 +10,4 @@ else
lib-y += memcpy.o memmove.o lib-y += memcpy.o memmove.o
endif endif
lib-$(CONFIG_MMU) += uaccess_old.o lib-y += uaccess_old.o