Commit c857e3fd authored by David S. Miller's avatar David S. Miller

[SPARC64]: __bzero_noasi --> __clear_user

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 46f86047
...@@ -335,7 +335,7 @@ EXPORT_SYMBOL(copy_to_user_fixup); ...@@ -335,7 +335,7 @@ EXPORT_SYMBOL(copy_to_user_fixup);
EXPORT_SYMBOL(copy_from_user_fixup); EXPORT_SYMBOL(copy_from_user_fixup);
EXPORT_SYMBOL(copy_in_user_fixup); EXPORT_SYMBOL(copy_in_user_fixup);
EXPORT_SYMBOL(__strncpy_from_user); EXPORT_SYMBOL(__strncpy_from_user);
EXPORT_SYMBOL(__bzero_noasi); EXPORT_SYMBOL(__clear_user);
/* Various address conversion macros use this. */ /* Various address conversion macros use this. */
EXPORT_SYMBOL(phys_base); EXPORT_SYMBOL(phys_base);
......
...@@ -98,12 +98,12 @@ __bzero_done: ...@@ -98,12 +98,12 @@ __bzero_done:
.text; \ .text; \
.align 4; .align 4;
.globl __bzero_noasi .globl __clear_user
.type __bzero_noasi, #function .type __clear_user, #function
__bzero_noasi: /* %o0=buf, %o1=len */ __clear_user: /* %o0=buf, %o1=len */
brz,pn %o1, __bzero_noasi_done brz,pn %o1, __clear_user_done
cmp %o1, 16 cmp %o1, 16
bl,pn %icc, __bzero_noasi_tiny bl,pn %icc, __clear_user_tiny
EX_ST(prefetcha [%o0 + 0x00] %asi, #n_writes) EX_ST(prefetcha [%o0 + 0x00] %asi, #n_writes)
andcc %o0, 0x3, %g0 andcc %o0, 0x3, %g0
be,pt %icc, 2f be,pt %icc, 2f
...@@ -145,14 +145,14 @@ __bzero_noasi: /* %o0=buf, %o1=len */ ...@@ -145,14 +145,14 @@ __bzero_noasi: /* %o0=buf, %o1=len */
subcc %g1, 8, %g1 subcc %g1, 8, %g1
bne,pt %icc, 5b bne,pt %icc, 5b
add %o0, 0x8, %o0 add %o0, 0x8, %o0
6: brz,pt %o1, __bzero_noasi_done 6: brz,pt %o1, __clear_user_done
nop nop
__bzero_noasi_tiny: __clear_user_tiny:
1: EX_ST(stba %g0, [%o0 + 0x00] %asi) 1: EX_ST(stba %g0, [%o0 + 0x00] %asi)
subcc %o1, 1, %o1 subcc %o1, 1, %o1
bne,pt %icc, 1b bne,pt %icc, 1b
add %o0, 1, %o0 add %o0, 1, %o0
__bzero_noasi_done: __clear_user_done:
retl retl
clr %o0 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) ...@@ -252,14 +252,7 @@ copy_in_user(void __user *to, void __user *from, unsigned long size)
} }
#define __copy_in_user copy_in_user #define __copy_in_user copy_in_user
extern unsigned long __must_check __bzero_noasi(void __user *, unsigned long); extern unsigned long __must_check __clear_user(void __user *, unsigned long);
static inline unsigned long __must_check
__clear_user(void __user *addr, unsigned long size)
{
return __bzero_noasi(addr, size);
}
#define clear_user __clear_user #define clear_user __clear_user
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment