diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/sparc/lib/memset.S | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/sparc/lib/memset.S')
| -rw-r--r-- | arch/sparc/lib/memset.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/lib/memset.S b/arch/sparc/lib/memset.S index 1c37ea892deb..99c017be8719 100644 --- a/arch/sparc/lib/memset.S +++ b/arch/sparc/lib/memset.S | |||
| @@ -60,11 +60,10 @@ | |||
| 60 | .globl __bzero_begin | 60 | .globl __bzero_begin |
| 61 | __bzero_begin: | 61 | __bzero_begin: |
| 62 | 62 | ||
| 63 | .globl __bzero, __memset, | 63 | .globl __bzero |
| 64 | .globl memset | 64 | .globl memset |
| 65 | .globl __memset_start, __memset_end | 65 | .globl __memset_start, __memset_end |
| 66 | __memset_start: | 66 | __memset_start: |
| 67 | __memset: | ||
| 68 | memset: | 67 | memset: |
| 69 | and %o1, 0xff, %g3 | 68 | and %o1, 0xff, %g3 |
| 70 | sll %g3, 8, %g2 | 69 | sll %g3, 8, %g2 |