diff options
| author |   Matthew Wilcox <willy@parisc-linux.org> | 2005-10-21 22:41:25 -0400 |
|---|---|---|
| committer |   Kyle McMartin <kyle@parisc-linux.org> | 2005-10-21 22:41:25 -0400 |
| commit | 14e256c107304367eff401d20f2ab9fa72e33136 (patch) | |
| tree | beff45e23977abbb89aa3cc4851ad4f98b283bff /include/asm-parisc/spinlock_types.h | |
| parent | [PARISC] Move pa_tlb_lock to tlb_flush.h (diff) | |
| download | linux-dev-14e256c107304367eff401d20f2ab9fa72e33136.tar.xz linux-dev-14e256c107304367eff401d20f2ab9fa72e33136.zip | |
[PARISC] Update spinlocks from parisc tree
Neaten up the CONFIG_PA20 ifdefs
More merge fixes, this time for SMP
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Prettify the CONFIG_DEBUG_SPINLOCK __SPIN_LOCK_UNLOCKED initializers.
Clean up some warnings with CONFIG_DEBUG_SPINLOCK enabled.
Fix build with spinlock debugging turned on. Patch is cleaner like this,
too.
Remove mandatory 16-byte alignment requirement on PA2.0 processors by
using the ldcw,CO completer. Provides a nice insn savings.
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'include/asm-parisc/spinlock_types.h')
| -rw-r--r-- | include/asm-parisc/spinlock_types.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-parisc/spinlock_types.h b/include/asm-parisc/spinlock_types.h index 785bba822fbf..d6b479bdb886 100644 --- a/include/asm-parisc/spinlock_types.h +++ b/include/asm-parisc/spinlock_types.h @@ -6,11 +6,15 @@ #endif typedef struct { +#ifdef CONFIG_PA20 + volatile unsigned int slock; +# define __RAW_SPIN_LOCK_UNLOCKED { 1 } +#else volatile unsigned int lock[4]; +# define __RAW_SPIN_LOCK_UNLOCKED { { 1, 1, 1, 1 } } +#endif } raw_spinlock_t; -#define __RAW_SPIN_LOCK_UNLOCKED { { 1, 1, 1, 1 } } - typedef struct { raw_spinlock_t lock; volatile int counter; |