---

yaml --- r: 221727 b: refs/heads/master c: 52ca0e8 h: refs/heads/master i: 221725: 20bb529 221723: e6ec877 221719: 51a2fc3 221711: 5c26854 221695: b5656fa v: v3
git-mirror · Nov 12, 2010 · 4d8ad74 · 4d8ad74
1 parent 3c34f9d
commit 4d8ad74
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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);