Pull pvops into release branch

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

diff --git a/include/asm-s390/spinlock_types.h b/include/asm-s390/spinlock_types.h
index f79a2216204f523bac490f3d0009dd01a33b307f..654abc40de04a7b7729e3802b9d9b86244982da2 100644 (file)
--- a/include/asm-s390/spinlock_types.h
+++ b/include/asm-s390/spinlock_types.h
@@ -6,16 +6,15 @@
 #endif
 
 typedef struct {
-       volatile unsigned int lock;
+       volatile unsigned int owner_cpu;
 } __attribute__ ((aligned (4))) raw_spinlock_t;
 
 #define __RAW_SPIN_LOCK_UNLOCKED       { 0 }
 
 typedef struct {
        volatile unsigned int lock;
-       volatile unsigned int owner_pc;
 } raw_rwlock_t;
 
-#define __RAW_RW_LOCK_UNLOCKED         { 0, 0 }
+#define __RAW_RW_LOCK_UNLOCKED         { 0 }
 
 #endif