diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-02-24 07:29:30 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-02-24 07:29:30 -0800 |
| commit | 9b91e15be1064f3b9b75be8fa44f5fffe0c14c9c (patch) | |
| tree | c52b55e6b2843d93b75b6cf31e07482cf3af7d44 /include | |
| parent | 61e7d4eb42c5e71e647ac7275f16be56036ad865 (diff) | |
| parent | d6c90be10ece90d36a76975be330f638495c3d36 (diff) | |
Merge bk://bk.phunnypharm.org/sparc-2.6
into nuts.davemloft.net:/disk1/BK/sparc-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/spinlock.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-sparc64/spinlock.h b/include/asm-sparc64/spinlock.h index 201472fc01bc..8387816e4ac2 100644 --- a/include/asm-sparc64/spinlock.h +++ b/include/asm-sparc64/spinlock.h @@ -7,6 +7,7 @@ #define __SPARC64_SPINLOCK_H #include <linux/config.h> +#include <linux/threads.h> /* For NR_CPUS */ #ifndef __ASSEMBLY__ @@ -131,7 +132,7 @@ extern int __write_trylock(rwlock_t *); typedef struct { unsigned long lock; unsigned int writer_pc, writer_cpu; - unsigned int reader_pc[4]; + unsigned int reader_pc[NR_CPUS]; } rwlock_t; #define RW_LOCK_UNLOCKED (rwlock_t) { 0, 0, 0xff, { 0, 0, 0, 0 } } #define rwlock_init(lp) do { *(lp) = RW_LOCK_UNLOCKED; } while(0) |