From 4d8ad74401a2a62650291d4c3ce866cef328529f Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Thu, 11 Nov 2010 14:05:20 -0800
Subject: [PATCH] --- yaml --- r: 221727 b: refs/heads/master c:
 52ca0e84b05595cf74f1ff772b3f9807256b1b27 h: refs/heads/master i:   221725:
 20bb52977c40d65a68fcf262ae44afd9706917c8   221723:
 e6ec87704df8ef2c30a0f7115b4a44e81834f3a9   221719:
 51a2fc3071ef5ed8c392d954c7ec81a6b36e2377   221711:
 5c26854b9898a44bb2fd80ecc0e581b6aefe158e   221695:
 b5656fafc1b8fd2a08b51f138033a12144491414 v: v3

---
 [refs]                     | 2 +-
 trunk/fs/hugetlbfs/inode.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bcfe47d5cfa1..e086b6f3b970 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27d20fddc8af539464fc3ba499d6a830054c3bd6
+refs/heads/master: 52ca0e84b05595cf74f1ff772b3f9807256b1b27
diff --git a/trunk/fs/hugetlbfs/inode.c b/trunk/fs/hugetlbfs/inode.c
index d6cfac1f0a40..a5fe68189eed 100644
--- a/trunk/fs/hugetlbfs/inode.c
+++ b/trunk/fs/hugetlbfs/inode.c
@@ -932,8 +932,7 @@ struct file *hugetlb_file_setup(const char *name, size_t size, int acctflag,
 	if (creat_flags == HUGETLB_SHMFS_INODE && !can_do_hugetlb_shm()) {
 		*user = current_user();
 		if (user_shm_lock(size, *user)) {
-			WARN_ONCE(1,
-			  "Using mlock ulimits for SHM_HUGETLB deprecated\n");
+			printk_once(KERN_WARNING "Using mlock ulimits for SHM_HUGETLB is deprecated\n");
 		} else {
 			*user = NULL;
 			return ERR_PTR(-EPERM);