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/memcpy.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/memcpy.S')
| -rw-r--r-- | arch/sparc/lib/memcpy.S | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sparc/lib/memcpy.S b/arch/sparc/lib/memcpy.S index ce10bc869af9..34fe65751737 100644 --- a/arch/sparc/lib/memcpy.S +++ b/arch/sparc/lib/memcpy.S | |||
| @@ -543,9 +543,6 @@ FUNC(memmove) | |||
| 543 | b 3f | 543 | b 3f |
| 544 | add %o0, 2, %o0 | 544 | add %o0, 2, %o0 |
| 545 | 545 | ||
| 546 | #ifdef __KERNEL__ | ||
| 547 | FUNC(__memcpy) | ||
| 548 | #endif | ||
| 549 | FUNC(memcpy) /* %o0=dst %o1=src %o2=len */ | 546 | FUNC(memcpy) /* %o0=dst %o1=src %o2=len */ |
| 550 | 547 | ||
| 551 | sub %o0, %o1, %o4 | 548 | sub %o0, %o1, %o4 |