diff --git a/fs/xfs/linux-2.6/xfs_message.c b/fs/xfs/linux-2.6/xfs_message.c
index 8fe8cf6..508e06f 100644
--- a/fs/xfs/linux-2.6/xfs_message.c
+++ b/fs/xfs/linux-2.6/xfs_message.c
@@ -96,13 +96,13 @@
 {
 	struct va_format	vaf;
 	va_list			args;
-	int			panic = 0;
-	int			 r;
+	int			do_panic = 0;
+	int			r;
 
 	if (xfs_panic_mask && (xfs_panic_mask & panic_tag)) {
 		xfs_printk(KERN_ALERT, mp,
 			"XFS: Transforming an alert into a BUG.");
-		panic = 1;
+		do_panic = 1;
 	}
 
 	va_start(args, fmt);
@@ -113,7 +113,7 @@
 	r = __xfs_printk(KERN_ALERT, mp, &vaf);
 	va_end(args);
 
-	BUG_ON(panic);
+	BUG_ON(do_panic);
 
 	return r;
 }