diff options
| author | Jon Medhurst <tixy@linaro.org> | 2014-05-08 11:10:03 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2014-05-08 11:14:35 +0100 |
| commit | 83158b14be851b99bae59d62d0998bbff7a302b4 (patch) | |
| tree | 04d222769c53645d77223555c5a39f00394a8718 | |
| parent | ae543a7570a00091abd4c444bac011598bde8d6a (diff) | |
Revert "spinlock"tracking-integration-linaro-vexpress-ll-20140508.0
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 <tixy@linaro.org>
| -rw-r--r-- | arch/arm64/include/asm/spinlock.h | 4 |
1 files 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; |