From b7ca50c08217dfbec90dc3bfc155bd079eb69caf Mon Sep 17 00:00:00 2001 From: Jon Medhurst Date: Thu, 8 May 2014 11:10:03 +0100 Subject: Revert "spinlock" This reverts commit fbb064def7e584caf60296b8eadf007f9c284f96. because it causes this compile error: /tmp/ccSkGqVZ.s: Assembler messages: /tmp/ccSkGqVZ.s:15: Error: operand mismatch -- `add w3,w3,x1' /tmp/ccSkGqVZ.s:508: Error: operand mismatch -- `add w4,w4,x1' make[3]: *** [kernel/locking/spinlock.o] Error 1 Signed-off-by: Jon Medhurst --- arch/arm64/include/asm/spinlock.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/spinlock.h b/arch/arm64/include/asm/spinlock.h index 682508bb1456..c45b7b1b7197 100644 --- a/arch/arm64/include/asm/spinlock.h +++ b/arch/arm64/include/asm/spinlock.h @@ -58,7 +58,7 @@ static inline void arch_spin_lock(arch_spinlock_t *lock) /* We got the lock. Critical section starts here. */ "3:" : "=&r" (lockval), "=&r" (newval), "=&r" (tmp), "+Q" (*lock) - : "Q" (lock->owner), "r" (1 << TICKET_SHIFT) + : "Q" (lock->owner), "I" (1 << TICKET_SHIFT) : "memory"); } @@ -77,7 +77,7 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock) " cbnz %w1, 1b\n" "2:" : "=&r" (lockval), "=&r" (tmp), "+Q" (*lock) - : "r" (1 << TICKET_SHIFT) + : "I" (1 << TICKET_SHIFT) : "memory"); return !tmp; -- cgit v1.2.3