diff --git a/[refs] b/[refs]
index b3d2cf385e9a..1350e17ac8c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 526c420c44b45b11e25a98f37702cc3044ba9bdc
+refs/heads/master: 53937c52c3f1dff6100174f50a85c068f16713ae
diff --git a/trunk/fs/xfs/linux-2.6/spin.h b/trunk/fs/xfs/linux-2.6/spin.h
index bcf60a0b8df0..0039504069a5 100644
--- a/trunk/fs/xfs/linux-2.6/spin.h
+++ b/trunk/fs/xfs/linux-2.6/spin.h
@@ -45,6 +45,9 @@
 typedef spinlock_t lock_t;
 
 #define SPLDECL(s)			unsigned long s
+#ifndef DEFINE_SPINLOCK
+#define DEFINE_SPINLOCK(s)		spinlock_t s = SPIN_LOCK_UNLOCKED
+#endif
 
 #define spinlock_init(lock, name)	spin_lock_init(lock)
 #define	spinlock_destroy(lock)