Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[deliverable/linux.git] / arch / alpha / lib / dec_and_lock.c

diff --git a/arch/alpha/lib/dec_and_lock.c b/arch/alpha/lib/dec_and_lock.c
index 6ae2500a9d9e8dec21fd4fb05302ef1c6dae11ca..0f5520d2f45fc41d72d2d333fb291c50517bfa3c 100644 (file)
--- a/arch/alpha/lib/dec_and_lock.c
+++ b/arch/alpha/lib/dec_and_lock.c
@@ -30,8 +30,7 @@ _atomic_dec_and_lock:                         \n\
        .previous                               \n\
        .end _atomic_dec_and_lock");
 
-static int __attribute_used__
-atomic_dec_and_lock_1(atomic_t *atomic, spinlock_t *lock)
+static int __used atomic_dec_and_lock_1(atomic_t *atomic, spinlock_t *lock)
 {
        /* Slow path */
        spin_lock(lock);