diff options
| author | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
| commit | 32032df6c2f6c9c6b2ada2ce42322231824f70c2 (patch) | |
| tree | b1ce838a37044bb38dfc128e2116ca35630e629a /arch/sparc/lib/memset.S | |
| parent | 22b737f4c75197372d64afc6ed1bccd58c00e549 (diff) | |
| parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (diff) | |
Merge branch 'master' into percpu
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h
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 |