From 209e9c43ade3938feab8abcc7978c0e17c79cdc3 Mon Sep 17 00:00:00 2001 From: Jesper Nilsson Date: Mon, 28 Jan 2008 16:53:19 +0100 Subject: [PATCH] CRIS v32: Adjust arch-v32/atomic.h for new spinlock/rwlock infrastructure --- include/asm-cris/arch-v32/atomic.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/asm-cris/arch-v32/atomic.h b/include/asm-cris/arch-v32/atomic.h index bbfb7a5ae3..852ceff801 100644 --- a/include/asm-cris/arch-v32/atomic.h +++ b/include/asm-cris/arch-v32/atomic.h @@ -1,7 +1,7 @@ #ifndef __ASM_CRIS_ARCH_ATOMIC__ #define __ASM_CRIS_ARCH_ATOMIC__ -#include +#include extern void cris_spin_unlock(void *l, int val); extern void cris_spin_lock(void *l); @@ -18,15 +18,15 @@ extern spinlock_t cris_atomic_locks[]; #define cris_atomic_save(addr, flags) \ local_irq_save(flags); \ - cris_spin_lock((void*)&cris_atomic_locks[HASH_ADDR(addr)].lock); + cris_spin_lock((void *)&cris_atomic_locks[HASH_ADDR(addr)].raw_lock.slock); #define cris_atomic_restore(addr, flags) \ { \ spinlock_t *lock = (void*)&cris_atomic_locks[HASH_ADDR(addr)]; \ __asm__ volatile ("move.d %1,%0" \ - : "=m" (lock->lock) \ - : "r" (1) \ - : "memory"); \ + : "=m" (lock->raw_lock.slock) \ + : "r" (1) \ + : "memory"); \ local_irq_restore(flags); \ } -- 2.39.5