[SPARC64]: __bzero_noasi --> __clear_user
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
46f8604714
commit
c857e3fdbc
3 changed files with 11 additions and 18 deletions
|
@ -335,7 +335,7 @@ EXPORT_SYMBOL(copy_to_user_fixup);
|
|||
EXPORT_SYMBOL(copy_from_user_fixup);
|
||||
EXPORT_SYMBOL(copy_in_user_fixup);
|
||||
EXPORT_SYMBOL(__strncpy_from_user);
|
||||
EXPORT_SYMBOL(__bzero_noasi);
|
||||
EXPORT_SYMBOL(__clear_user);
|
||||
|
||||
/* Various address conversion macros use this. */
|
||||
EXPORT_SYMBOL(phys_base);
|
||||
|
|
|
@ -98,12 +98,12 @@ __bzero_done:
|
|||
.text; \
|
||||
.align 4;
|
||||
|
||||
.globl __bzero_noasi
|
||||
.type __bzero_noasi, #function
|
||||
__bzero_noasi: /* %o0=buf, %o1=len */
|
||||
brz,pn %o1, __bzero_noasi_done
|
||||
.globl __clear_user
|
||||
.type __clear_user, #function
|
||||
__clear_user: /* %o0=buf, %o1=len */
|
||||
brz,pn %o1, __clear_user_done
|
||||
cmp %o1, 16
|
||||
bl,pn %icc, __bzero_noasi_tiny
|
||||
bl,pn %icc, __clear_user_tiny
|
||||
EX_ST(prefetcha [%o0 + 0x00] %asi, #n_writes)
|
||||
andcc %o0, 0x3, %g0
|
||||
be,pt %icc, 2f
|
||||
|
@ -145,14 +145,14 @@ __bzero_noasi: /* %o0=buf, %o1=len */
|
|||
subcc %g1, 8, %g1
|
||||
bne,pt %icc, 5b
|
||||
add %o0, 0x8, %o0
|
||||
6: brz,pt %o1, __bzero_noasi_done
|
||||
6: brz,pt %o1, __clear_user_done
|
||||
nop
|
||||
__bzero_noasi_tiny:
|
||||
__clear_user_tiny:
|
||||
1: EX_ST(stba %g0, [%o0 + 0x00] %asi)
|
||||
subcc %o1, 1, %o1
|
||||
bne,pt %icc, 1b
|
||||
add %o0, 1, %o0
|
||||
__bzero_noasi_done:
|
||||
__clear_user_done:
|
||||
retl
|
||||
clr %o0
|
||||
.size __bzero_noasi, .-__bzero_noasi
|
||||
.size __clear_user, .-__clear_user
|
||||
|
|
|
@ -252,14 +252,7 @@ copy_in_user(void __user *to, void __user *from, unsigned long size)
|
|||
}
|
||||
#define __copy_in_user copy_in_user
|
||||
|
||||
extern unsigned long __must_check __bzero_noasi(void __user *, unsigned long);
|
||||
|
||||
static inline unsigned long __must_check
|
||||
__clear_user(void __user *addr, unsigned long size)
|
||||
{
|
||||
|
||||
return __bzero_noasi(addr, size);
|
||||
}
|
||||
extern unsigned long __must_check __clear_user(void __user *, unsigned long);
|
||||
|
||||
#define clear_user __clear_user
|
||||
|
||||
|
|
Loading…
Reference in a new issue