mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 18:00:53 +07:00
fs/hugetlbfs/inode.c: complete conversion to pr_foo()
Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
03afc0e25f
commit
9b857d26d0
@ -6,6 +6,8 @@
|
||||
* Copyright (C) 2002 Linus Torvalds.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/thread_info.h>
|
||||
#include <asm/current.h>
|
||||
@ -823,8 +825,7 @@ hugetlbfs_parse_options(char *options, struct hugetlbfs_config *pconfig)
|
||||
ps = memparse(args[0].from, &rest);
|
||||
pconfig->hstate = size_to_hstate(ps);
|
||||
if (!pconfig->hstate) {
|
||||
printk(KERN_ERR
|
||||
"hugetlbfs: Unsupported page size %lu MB\n",
|
||||
pr_err("Unsupported page size %lu MB\n",
|
||||
ps >> 20);
|
||||
return -EINVAL;
|
||||
}
|
||||
@ -832,8 +833,7 @@ hugetlbfs_parse_options(char *options, struct hugetlbfs_config *pconfig)
|
||||
}
|
||||
|
||||
default:
|
||||
printk(KERN_ERR "hugetlbfs: Bad mount option: \"%s\"\n",
|
||||
p);
|
||||
pr_err("Bad mount option: \"%s\"\n", p);
|
||||
return -EINVAL;
|
||||
break;
|
||||
}
|
||||
@ -853,8 +853,7 @@ hugetlbfs_parse_options(char *options, struct hugetlbfs_config *pconfig)
|
||||
return 0;
|
||||
|
||||
bad_val:
|
||||
printk(KERN_ERR "hugetlbfs: Bad value '%s' for mount option '%s'\n",
|
||||
args[0].from, p);
|
||||
pr_err("Bad value '%s' for mount option '%s'\n", args[0].from, p);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@ -970,8 +969,7 @@ struct file *hugetlb_file_setup(const char *name, size_t size,
|
||||
*user = current_user();
|
||||
if (user_shm_lock(size, *user)) {
|
||||
task_lock(current);
|
||||
printk_once(KERN_WARNING
|
||||
"%s (%d): Using mlock ulimits for SHM_HUGETLB is deprecated\n",
|
||||
pr_warn_once("%s (%d): Using mlock ulimits for SHM_HUGETLB is deprecated\n",
|
||||
current->comm, current->pid);
|
||||
task_unlock(current);
|
||||
} else {
|
||||
@ -1031,7 +1029,7 @@ static int __init init_hugetlbfs_fs(void)
|
||||
int i;
|
||||
|
||||
if (!hugepages_supported()) {
|
||||
pr_info("hugetlbfs: disabling because there are no supported hugepage sizes\n");
|
||||
pr_info("disabling because there are no supported hugepage sizes\n");
|
||||
return -ENOTSUPP;
|
||||
}
|
||||
|
||||
@ -1060,7 +1058,7 @@ static int __init init_hugetlbfs_fs(void)
|
||||
buf);
|
||||
|
||||
if (IS_ERR(hugetlbfs_vfsmount[i])) {
|
||||
pr_err("hugetlb: Cannot mount internal hugetlbfs for "
|
||||
pr_err("Cannot mount internal hugetlbfs for "
|
||||
"page size %uK", ps_kb);
|
||||
error = PTR_ERR(hugetlbfs_vfsmount[i]);
|
||||
hugetlbfs_vfsmount[i] = NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user