Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus

[linux-2.6-omap-h63xx.git] / include / asm-sh / spinlock_types.h

diff --git a/include/asm-sh/spinlock_types.h b/include/asm-sh/spinlock_types.h
index 8c41b6c3aac87adc4fbd73d5320b95e7592c6b18..b4d244e7b60ca7532f7193e7365a9a67a293482f 100644 (file)
--- a/include/asm-sh/spinlock_types.h
+++ b/include/asm-sh/spinlock_types.h
@@ -6,17 +6,16 @@
 #endif
 
 typedef struct {
-       volatile unsigned long lock;
+       volatile unsigned int lock;
 } raw_spinlock_t;
 
-#define __SPIN_LOCK_UNLOCKED           { 0 }
+#define __RAW_SPIN_LOCK_UNLOCKED               { 1 }
 
 typedef struct {
-       raw_spinlock_t lock;
-       atomic_t counter;
+       volatile unsigned int lock;
 } raw_rwlock_t;
 
 #define RW_LOCK_BIAS                   0x01000000
-#define __RAW_RW_LOCK_UNLOCKED         { { 0 }, { RW_LOCK_BIAS } }
+#define __RAW_RW_LOCK_UNLOCKED         { RW_LOCK_BIAS }
 
 #endif