diff --git a/[refs] b/[refs]
index 82d7a982e3d7..2b0033907ebf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c34482c17d8fd07966328c7b1cfc35ee290bd1c
+refs/heads/master: cf78859f520f8275318f47d7864f4459d940cb6b
diff --git a/trunk/fs/xfs/support/debug.c b/trunk/fs/xfs/support/debug.c
index e6cf955ec0fc..0df88897ef84 100644
--- a/trunk/fs/xfs/support/debug.c
+++ b/trunk/fs/xfs/support/debug.c
@@ -75,11 +75,11 @@ xfs_cmn_err(
 {
 	struct va_format	vaf;
 	va_list			args;
-	int			panic = 0;
+	int			do_panic = 0;
 
 	if (xfs_panic_mask && (xfs_panic_mask & panic_tag)) {
 		printk(KERN_ALERT "XFS: Transforming an alert into a BUG.");
-		panic = 1;
+		do_panic = 1;
 	}
 
 	va_start(args, fmt);
@@ -89,7 +89,7 @@ xfs_cmn_err(
 	printk(KERN_ALERT "Filesystem %s: %pV", mp->m_fsname, &vaf);
 	va_end(args);
 
-	BUG_ON(panic);
+	BUG_ON(do_panic);
 }
 
 void