UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

kernel/gcov/fs.c: use pr_warn() 

pr_warning() is deprecated in favor of pr_warn()

Cc: Andy Gospodarek <agospoda@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Frantisek Hrbata <fhrbata@redhat.com>
Cc: Jan Stancek <jstancek@redhat.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton 2013-11-12 15:11:29 -08:00 committed by Linus Torvalds
parent bddb12b32f
commit a5ebb87508
1 changed files with 17 additions and 17 deletions
kernel/gcov
fs.c

34
kernel/gcov/fs.c
View File

@ -75,7 +75,7 @@ static int __init gcov_persist_setup(char *str)
unsigned long val; unsigned long val;
if (kstrtoul(str, 0, &val)) { if (kstrtoul(str, 0, &val)) {
pr_warning("invalid gcov_persist parameter '%s'\n", str); pr_warn("invalid gcov_persist parameter '%s'\n", str);
return 0; return 0;
} }
gcov_persist = val; gcov_persist = val;
@ -451,7 +451,7 @@ static struct gcov_node *new_node(struct gcov_node *parent,
} else } else
node->dentry = debugfs_create_dir(node->name, parent->dentry); node->dentry = debugfs_create_dir(node->name, parent->dentry);
if (!node->dentry) { if (!node->dentry) {
pr_warning("could not create file\n"); pr_warn("could not create file\n");
kfree(node); kfree(node);
return NULL; return NULL;
} }
@ -464,7 +464,7 @@ static struct gcov_node *new_node(struct gcov_node *parent,
err_nomem: err_nomem:
kfree(node); kfree(node);
pr_warning("out of memory\n"); pr_warn("out of memory\n");
return NULL; return NULL;
} }
@ -631,8 +631,8 @@ static void add_info(struct gcov_node *node, struct gcov_info *info)
*/ */
loaded_info = kcalloc(num + 1, sizeof(struct gcov_info *), GFP_KERNEL); loaded_info = kcalloc(num + 1, sizeof(struct gcov_info *), GFP_KERNEL);
if (!loaded_info) { if (!loaded_info) {
pr_warning("could not add '%s' (out of memory)\n", pr_warn("could not add '%s' (out of memory)\n",
gcov_info_filename(info)); gcov_info_filename(info));
return; return;
} }
memcpy(loaded_info, node->loaded_info, memcpy(loaded_info, node->loaded_info,
@ -645,9 +645,9 @@ static void add_info(struct gcov_node *node, struct gcov_info *info)
* data set replaces the copy of the last one. * data set replaces the copy of the last one.
*/ */
if (!gcov_info_is_compatible(node->unloaded_info, info)) { if (!gcov_info_is_compatible(node->unloaded_info, info)) {
pr_warning("discarding saved data for %s " pr_warn("discarding saved data for %s "
"(incompatible version)\n", "(incompatible version)\n",
gcov_info_filename(info)); gcov_info_filename(info));
gcov_info_free(node->unloaded_info); gcov_info_free(node->unloaded_info);
node->unloaded_info = NULL; node->unloaded_info = NULL;
} }
@ -657,8 +657,8 @@ static void add_info(struct gcov_node *node, struct gcov_info *info)
* The initial one takes precedence. * The initial one takes precedence.
*/ */
if (!gcov_info_is_compatible(node->loaded_info[0], info)) { if (!gcov_info_is_compatible(node->loaded_info[0], info)) {
pr_warning("could not add '%s' (incompatible " pr_warn("could not add '%s' (incompatible "
"version)\n", gcov_info_filename(info)); "version)\n", gcov_info_filename(info));
kfree(loaded_info); kfree(loaded_info);
return; return;
} }
@ -693,9 +693,9 @@ static void save_info(struct gcov_node *node, struct gcov_info *info)
else { else {
node->unloaded_info = gcov_info_dup(info); node->unloaded_info = gcov_info_dup(info);
if (!node->unloaded_info) { if (!node->unloaded_info) {
pr_warning("could not save data for '%s' " pr_warn("could not save data for '%s' "
"(out of memory)\n", "(out of memory)\n",
gcov_info_filename(info)); gcov_info_filename(info));
} }
} }
} }
@ -710,8 +710,8 @@ static void remove_info(struct gcov_node *node, struct gcov_info *info)
i = get_info_index(node, info); i = get_info_index(node, info);
if (i < 0) { if (i < 0) {
pr_warning("could not remove '%s' (not found)\n", pr_warn("could not remove '%s' (not found)\n",
gcov_info_filename(info)); gcov_info_filename(info));
return; return;
} }
if (gcov_persist) if (gcov_persist)
@ -750,8 +750,8 @@ void gcov_event(enum gcov_action action, struct gcov_info *info)
if (node) if (node)
remove_info(node, info); remove_info(node, info);
else { else {
pr_warning("could not remove '%s' (not found)\n", pr_warn("could not remove '%s' (not found)\n",
gcov_info_filename(info)); gcov_info_filename(info));
} }
break; break;
} }