diff --git a/[refs] b/[refs]
index ab8d4b765356..64fc85ef8170 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98f176fb32f33795b6d0f83856008b932123ab38
+refs/heads/master: 0ac230699a0f3f0d15ad4e4ad99446dac5b4a21f
diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c
index 3c2ff81c84e2..f130f9894bda 100644
--- a/trunk/fs/gfs2/glock.c
+++ b/trunk/fs/gfs2/glock.c
@@ -96,7 +96,7 @@ static inline rwlock_t *gl_lock_addr(unsigned int x)
 	return &gl_hash_locks[x & (GL_HASH_LOCK_SZ-1)];
 }
 #else /* not SMP, so no spinlocks required */
-static inline rwlock_t *gl_lock_addr(x)
+static inline rwlock_t *gl_lock_addr(unsigned int x)
 {
 	return NULL;
 }