3 files changed, 41 insertions, 111 deletions

diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
index 5db7e1d85385..9ddc5b9ce3bd 100644
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
@@ -7,7 +7,7 @@ EXTRA_AFLAGS := -ansi -DST_DIV0=0x02
 lib-y := mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o memcpy.o memset.o \
          strlen.o checksum.o blockops.o memscan.o memcmp.o strncmp.o \
          strncpy_from_user.o divdi3.o udivdi3.o strlen_user.o \
-         copy_user.o locks.o atomic.o atomic32.o bitops.o \
+         copy_user.o locks.o atomic.o \
          lshrdi3.o ashldi3.o rwsem.o muldi3.o bitext.o
 
-obj-y += iomap.o
+obj-y += iomap.o atomic32.o
diff --git a/arch/sparc/lib/atomic32.c b/arch/sparc/lib/atomic32.c
index de84f8534bac..53ddcd9d1e60 100644
--- a/arch/sparc/lib/atomic32.c
+++ b/arch/sparc/lib/atomic32.c
@@ -76,3 +76,42 @@ void atomic_set(atomic_t *v, int i)
         spin_unlock_irqrestore(ATOMIC_HASH(v), flags);
 }
 EXPORT_SYMBOL(atomic_set);
+
+unsigned long ___set_bit(unsigned long *addr, unsigned long mask)
+{
+        unsigned long old, flags;
+
+        spin_lock_irqsave(ATOMIC_HASH(addr), flags);
+        old = *addr;
+        *addr = old | mask;
+        spin_unlock_irqrestore(ATOMIC_HASH(addr), flags);
+
+        return old & mask;
+}
+EXPORT_SYMBOL(___set_bit);
+
+unsigned long ___clear_bit(unsigned long *addr, unsigned long mask)
+{
+        unsigned long old, flags;
+
+        spin_lock_irqsave(ATOMIC_HASH(addr), flags);
+        old = *addr;
+        *addr = old & ~mask;
+        spin_unlock_irqrestore(ATOMIC_HASH(addr), flags);
+
+        return old & mask;
+}
+EXPORT_SYMBOL(___clear_bit);
+
+unsigned long ___change_bit(unsigned long *addr, unsigned long mask)
+{
+        unsigned long old, flags;
+
+        spin_lock_irqsave(ATOMIC_HASH(addr), flags);
+        old = *addr;
+        *addr = old ^ mask;
+        spin_unlock_irqrestore(ATOMIC_HASH(addr), flags);
+
+        return old & mask;
+}
+EXPORT_SYMBOL(___change_bit);
diff --git a/arch/sparc/lib/bitops.S b/arch/sparc/lib/bitops.S
deleted file mode 100644
index cb7fb66a40c8..000000000000
--- a/arch/sparc/lib/bitops.S
+++ /dev/null
@@ -1,109 +0,0 @@
-/* bitops.S: Low level assembler bit operations.
- *
- * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
- */
-
-#include <asm/ptrace.h>
-#include <asm/psr.h>
-
-        .text
-        .align  4
-
-        .globl  __bitops_begin
-__bitops_begin:
-
-        /* Take bits in %g2 and set them in word at %g1,
-         * return whether bits were set in original value
-         * in %g2.  %g4 holds value to restore into %o7
-         * in delay slot of jmpl return, %g3 + %g5 + %g7 can be
-         * used as temporaries and thus is considered clobbered
-         * by all callers.
-         */
-        .globl  ___set_bit
-___set_bit:
-        rd      %psr, %g3
-        nop; nop; nop;
-        or      %g3, PSR_PIL, %g5
-        wr      %g5, 0x0, %psr
-        nop; nop; nop
-#ifdef CONFIG_SMP
-        set     bitops_spinlock, %g5
-2:      ldstub  [%g5], %g7              ! Spin on the byte lock for SMP.
-        orcc    %g7, 0x0, %g0           ! Did we get it?
-        bne     2b                      ! Nope...
-#endif
-         ld     [%g1], %g7
-        or      %g7, %g2, %g5
-        and     %g7, %g2, %g2
-#ifdef CONFIG_SMP
-        st      %g5, [%g1]
-        set     bitops_spinlock, %g5
-        stb     %g0, [%g5]
-#else
-        st      %g5, [%g1]
-#endif
-        wr      %g3, 0x0, %psr
-        nop; nop; nop
-        jmpl    %o7, %g0
-         mov    %g4, %o7
-
-        /* Same as above, but clears the bits from %g2 instead. */
-        .globl  ___clear_bit
-___clear_bit:
-        rd      %psr, %g3
-        nop; nop; nop
-        or      %g3, PSR_PIL, %g5
-        wr      %g5, 0x0, %psr
-        nop; nop; nop
-#ifdef CONFIG_SMP
-        set     bitops_spinlock, %g5
-2:      ldstub  [%g5], %g7              ! Spin on the byte lock for SMP.
-        orcc    %g7, 0x0, %g0           ! Did we get it?
-        bne     2b                      ! Nope...
-#endif
-         ld     [%g1], %g7
-        andn    %g7, %g2, %g5
-        and     %g7, %g2, %g2
-#ifdef CONFIG_SMP
-        st      %g5, [%g1]
-        set     bitops_spinlock, %g5
-        stb     %g0, [%g5]
-#else
-        st      %g5, [%g1]
-#endif
-        wr      %g3, 0x0, %psr
-        nop; nop; nop
-        jmpl    %o7, %g0
-         mov    %g4, %o7
-
-        /* Same thing again, but this time toggles the bits from %g2. */
-        .globl  ___change_bit
-___change_bit:
-        rd      %psr, %g3
-        nop; nop; nop
-        or      %g3, PSR_PIL, %g5
-        wr      %g5, 0x0, %psr
-        nop; nop; nop
-#ifdef CONFIG_SMP
-        set     bitops_spinlock, %g5
-2:      ldstub  [%g5], %g7              ! Spin on the byte lock for SMP.
-        orcc    %g7, 0x0, %g0           ! Did we get it?
-        bne     2b                      ! Nope...
-#endif
-         ld     [%g1], %g7
-        xor     %g7, %g2, %g5
-        and     %g7, %g2, %g2
-#ifdef CONFIG_SMP
-        st      %g5, [%g1]
-        set     bitops_spinlock, %g5
-        stb     %g0, [%g5]
-#else
-        st      %g5, [%g1]
-#endif
-        wr      %g3, 0x0, %psr
-        nop; nop; nop
-        jmpl    %o7, %g0
-         mov    %g4, %o7
-
-        .globl  __bitops_end
-__bitops_end: