diff --git a/[refs] b/[refs]
index 54071cf3c3d7..3c13883fc909 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e577a80ea85e2557831fd44064f809646f260b4
+refs/heads/master: 16afea0255cf6963eb924d4334cdb5acb9074581
diff --git a/trunk/include/asm-i386/spinlock_types.h b/trunk/include/asm-i386/spinlock_types.h
index 59efe849f351..4da9345c1500 100644
--- a/trunk/include/asm-i386/spinlock_types.h
+++ b/trunk/include/asm-i386/spinlock_types.h
@@ -6,13 +6,13 @@
 #endif
 
 typedef struct {
-	volatile unsigned int slock;
+	unsigned int slock;
 } raw_spinlock_t;
 
 #define __RAW_SPIN_LOCK_UNLOCKED	{ 1 }
 
 typedef struct {
-	volatile unsigned int lock;
+	unsigned int lock;
 } raw_rwlock_t;
 
 #define __RAW_RW_LOCK_UNLOCKED		{ RW_LOCK_BIAS }
diff --git a/trunk/include/asm-x86_64/spinlock_types.h b/trunk/include/asm-x86_64/spinlock_types.h
index 59efe849f351..4da9345c1500 100644
--- a/trunk/include/asm-x86_64/spinlock_types.h
+++ b/trunk/include/asm-x86_64/spinlock_types.h
@@ -6,13 +6,13 @@
 #endif
 
 typedef struct {
-	volatile unsigned int slock;
+	unsigned int slock;
 } raw_spinlock_t;
 
 #define __RAW_SPIN_LOCK_UNLOCKED	{ 1 }
 
 typedef struct {
-	volatile unsigned int lock;
+	unsigned int lock;
 } raw_rwlock_t;
 
 #define __RAW_RW_LOCK_UNLOCKED		{ RW_LOCK_BIAS }