From b2d72c89032119ab8b1b37b0836724d272dbee23 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Fri, 28 Nov 2008 14:23:33 +1100
Subject: [PATCH] --- yaml --- r: 124885 b: refs/heads/master c:
 65795910c1b798f8a47181b48cf6eb163a15e778 h: refs/heads/master i:   124883:
 85460fcc829a6db2908de5451450acdaeaf0e402 v: v3

---
 [refs]                             | 2 +-
 trunk/fs/xfs/linux-2.6/xfs_stats.c | 2 +-
 trunk/fs/xfs/linux-2.6/xfs_super.c | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0deb125d5595..ab547d56c96b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c31b93a14a453c8756ffd228e24910ffdf30c5d
+refs/heads/master: 65795910c1b798f8a47181b48cf6eb163a15e778
diff --git a/trunk/fs/xfs/linux-2.6/xfs_stats.c b/trunk/fs/xfs/linux-2.6/xfs_stats.c
index 64f4ec90b8b2..c3526d445f6a 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_stats.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_stats.c
@@ -61,7 +61,7 @@ xfs_read_xfsstats(
 
 	/* Loop over all stats groups */
 	for (i=j=len = 0; i < ARRAY_SIZE(xstats); i++) {
-		len += sprintf(buffer + len, xstats[i].desc);
+		len += sprintf(buffer + len, "%s", xstats[i].desc);
 		/* inner loop does each group */
 		while (j < xstats[i].endpoint) {
 			val = 0;
diff --git a/trunk/fs/xfs/linux-2.6/xfs_super.c b/trunk/fs/xfs/linux-2.6/xfs_super.c
index c3d004bc4621..cc5e07e3e7a1 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_super.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_super.c
@@ -1848,10 +1848,9 @@ STATIC int __init
 init_xfs_fs(void)
 {
 	int			error;
-	static char		message[] __initdata = KERN_INFO \
-		XFS_VERSION_STRING " with " XFS_BUILD_OPTIONS " enabled\n";
 
-	printk(message);
+	printk(KERN_INFO XFS_VERSION_STRING " with "
+			 XFS_BUILD_OPTIONS " enabled\n");
 
 	ktrace_init(64);
 	vn_init();