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/bzero.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/bzero.S')
| -rw-r--r-- | arch/sparc/lib/bzero.S | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/sparc/lib/bzero.S b/arch/sparc/lib/bzero.S index b6557297440f..615f401edf69 100644 --- a/arch/sparc/lib/bzero.S +++ b/arch/sparc/lib/bzero.S | |||
| @@ -6,10 +6,6 @@ | |||
| 6 | 6 | ||
| 7 | .text | 7 | .text |
| 8 | 8 | ||
| 9 | .globl __memset | ||
| 10 | .type __memset, #function | ||
| 11 | __memset: /* %o0=buf, %o1=pat, %o2=len */ | ||
| 12 | |||
| 13 | .globl memset | 9 | .globl memset |
| 14 | .type memset, #function | 10 | .type memset, #function |
| 15 | memset: /* %o0=buf, %o1=pat, %o2=len */ | 11 | memset: /* %o0=buf, %o1=pat, %o2=len */ |
| @@ -83,7 +79,6 @@ __bzero_done: | |||
| 83 | retl | 79 | retl |
| 84 | mov %o3, %o0 | 80 | mov %o3, %o0 |
| 85 | .size __bzero, .-__bzero | 81 | .size __bzero, .-__bzero |
| 86 | .size __memset, .-__memset | ||
| 87 | .size memset, .-memset | 82 | .size memset, .-memset |
| 88 | 83 | ||
| 89 | #define EX_ST(x,y) \ | 84 | #define EX_ST(x,y) \ |