diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-13 22:07:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-13 22:07:16 +0200 |
| commit | 73c1377da9fb732bf8ff1b262a92507e8736b1bf (patch) | |
| tree | fb978e875640b2959f32bb5cdbcaa5335bce9642 /arch/sparc/lib | |
| parent | sparc32: drop unused clear_cpu_int (diff) | |
| download | linux-73c1377da9fb732bf8ff1b262a92507e8736b1bf.tar.xz linux-73c1377da9fb732bf8ff1b262a92507e8736b1bf.zip | |
sparc32: Kill btfixup for xchg()'s 'swap' instruction.
We always have this instruction available, so no need to use
btfixup for it any more.
This also eradicates the whole of atomic_32.S and thus the
__atomic_begin and __atomic_end symbols completely.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/lib')
| -rw-r--r-- | arch/sparc/lib/Makefile | 2 | ||||
| -rw-r--r-- | arch/sparc/lib/atomic_32.S | 24 |
2 files changed, 1 insertions, 25 deletions
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile index a3fc4375a150..33d8d85ad594 100644 --- a/arch/sparc/lib/Makefile +++ b/arch/sparc/lib/Makefile @@ -13,7 +13,7 @@ lib-y += memscan_$(BITS).o memcmp.o strncmp_$(BITS).o lib-y += strncpy_from_user_$(BITS).o strlen_user_$(BITS).o lib-$(CONFIG_SPARC32) += divdi3.o udivdi3.o lib-$(CONFIG_SPARC32) += copy_user.o locks.o -lib-y += atomic_$(BITS).o +lib-$(CONFIG_SPARC64) += atomic_64.o lib-$(CONFIG_SPARC32) += lshrdi3.o ashldi3.o lib-$(CONFIG_SPARC32) += muldi3.o bitext.o cmpdi2.o diff --git a/arch/sparc/lib/atomic_32.S b/arch/sparc/lib/atomic_32.S deleted file mode 100644 index e2a9085bd5be..000000000000 --- a/arch/sparc/lib/atomic_32.S +++ /dev/null @@ -1,24 +0,0 @@ -/* atomic.S: Move this stuff here for better ICACHE hit rates. - * - * Copyright (C) 1996 David S. Miller (davem@caipfs.rutgers.edu) - */ - -#include <asm/ptrace.h> -#include <asm/psr.h> - - .text - .align 4 - - .globl __atomic_begin -__atomic_begin: - -#ifndef CONFIG_SMP - .globl ___xchg32_sun4md -___xchg32_sun4md: - swap [%g1], %g2 - jmpl %o7 + 8, %g0 - mov %g4, %o7 -#endif - - .globl __atomic_end -__atomic_end: |