diff options
| author | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-01-28 16:53:19 +0100 |
|---|---|---|
| committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-02-08 11:06:38 +0100 |
| commit | 209e9c43ade3938feab8abcc7978c0e17c79cdc3 (patch) | |
| tree | 1a68fb77d3dbd5a652f73e8acc320a01bd4ebfbe /include | |
| parent | e52c2c72ddfa7460f0a959e26f84d74180ca0a1b (diff) | |
| download | blackbird-op-linux-209e9c43ade3938feab8abcc7978c0e17c79cdc3.tar.gz blackbird-op-linux-209e9c43ade3938feab8abcc7978c0e17c79cdc3.zip | |
CRIS v32: Adjust arch-v32/atomic.h for new spinlock/rwlock infrastructure
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-cris/arch-v32/atomic.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-cris/arch-v32/atomic.h b/include/asm-cris/arch-v32/atomic.h index bbfb7a5ae315..852ceff8013f 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 <asm/system.h> +#include <linux/spinlock_types.h> 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); \ } |
