diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 18:00:19 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 18:00:19 +0100 |
| commit | 17c330f98383629cfd359ee62b3adde1d2a3ff7c (patch) | |
| tree | 876bed8fc7de7d404fae579035a948c46a7f05d4 /arch/sparc/lib/memset.S | |
| parent | Merge git://git.infradead.org/battery-2.6 (diff) | |
| parent | sparc64: Fix clock event multiplier printf format. (diff) | |
| download | linux-17c330f98383629cfd359ee62b3adde1d2a3ff7c.tar.xz linux-17c330f98383629cfd359ee62b3adde1d2a3ff7c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix clock event multiplier printf format.
sparc64: Use clock{source,events}_calc_mult_shift().
sparc64: Use free_bootmem_late() in mdesc_lmb_free().
sparc: Add alignment and emulation fault perf events.
sparc64: Add syscall tracepoint support.
sparc: Stop trying to be so fancy and use __builtin_{memcpy,memset}()
sparc: Use __builtin_object_size() to validate the buffer size for copy_from_user()
sparc64: Add some missing __kprobes annotations to kernel fault paths.
sparc64: Use kprobes_built_in() to avoid ifdefs in fault_64.c
sparc: Validate that kprobe address is 4-byte aligned.
sparc64: Don't specify IRQF_SHARED for LDC interrupts.
sparc64: Fix stack debugging IRQ stack regression.
sparc64: Fix overly strict range type matching for PCI devices.
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 @@ .globl __bzero_begin __bzero_begin: - .globl __bzero, __memset, + .globl __bzero .globl memset .globl __memset_start, __memset_end __memset_start: -__memset: memset: and %o1, 0xff, %g3 sll %g3, 8, %g2 |