diff --git a/[refs] b/[refs]
index cf0d3128f202..b1150d2ff589 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f90a851800e88436873c8d27238cf219b9ef48e
+refs/heads/master: d7b37889650bb316f5c4ad4b0569ba897120d70d
diff --git a/trunk/fs/sysfs/file.c b/trunk/fs/sysfs/file.c
index 4045bdcc4b33..09a0611b3364 100644
--- a/trunk/fs/sysfs/file.c
+++ b/trunk/fs/sysfs/file.c
@@ -66,7 +66,7 @@ static struct sysfs_ops subsys_sysfs_ops = {
  * sysfs_dirent->s_attr.open points to sysfs_open_dirent.  s_attr.open
  * is protected by sysfs_open_dirent_lock.
  */
-static spinlock_t sysfs_open_dirent_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
 
 struct sysfs_open_dirent {
 	atomic_t		refcnt;