aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/gcov
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2013-11-12 18:11:29 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-12 22:09:34 -0500
commita5ebb87508a48d7816a6897ed53419e46a507eb5 (patch)
treeab31064d8ff84471a69b7ae1b8a3c8ef74286b8a /kernel/gcov
parentbddb12b32f90c571b177439a650f1046c3185c2e (diff)
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>
Diffstat (limited to 'kernel/gcov')
-rw-r--r--kernel/gcov/fs.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/kernel/gcov/fs.c b/kernel/gcov/fs.c
index b49dfce8e8a1..e892ad9ea065 100644
--- a/kernel/gcov/fs.c
+++ b/kernel/gcov/fs.c
@@ -75,7 +75,7 @@ static int __init gcov_persist_setup(char *str)
75 unsigned long val; 75 unsigned long val;
76 76
77 if (kstrtoul(str, 0, &val)) { 77 if (kstrtoul(str, 0, &val)) {
78 pr_warning("invalid gcov_persist parameter '%s'\n", str); 78 pr_warn("invalid gcov_persist parameter '%s'\n", str);
79 return 0; 79 return 0;
80 } 80 }
81 gcov_persist = val; 81 gcov_persist = val;
@@ -451,7 +451,7 @@ static struct gcov_node *new_node(struct gcov_node *parent,
451 } else 451 } else
452 node->dentry = debugfs_create_dir(node->name, parent->dentry); 452 node->dentry = debugfs_create_dir(node->name, parent->dentry);
453 if (!node->dentry) { 453 if (!node->dentry) {
454 pr_warning("could not create file\n"); 454 pr_warn("could not create file\n");
455 kfree(node); 455 kfree(node);
456 return NULL; 456 return NULL;
457 } 457 }
@@ -464,7 +464,7 @@ static struct gcov_node *new_node(struct gcov_node *parent,
464 464
465err_nomem: 465err_nomem:
466 kfree(node); 466 kfree(node);
467 pr_warning("out of memory\n"); 467 pr_warn("out of memory\n");
468 return NULL; 468 return NULL;
469} 469}
470 470
@@ -631,8 +631,8 @@ static void add_info(struct gcov_node *node, struct gcov_info *info)
631 */ 631 */
632 loaded_info = kcalloc(num + 1, sizeof(struct gcov_info *), GFP_KERNEL); 632 loaded_info = kcalloc(num + 1, sizeof(struct gcov_info *), GFP_KERNEL);
633 if (!loaded_info) { 633 if (!loaded_info) {
634 pr_warning("could not add '%s' (out of memory)\n", 634 pr_warn("could not add '%s' (out of memory)\n",
635 gcov_info_filename(info)); 635 gcov_info_filename(info));
636 return; 636 return;
637 } 637 }
638 memcpy(loaded_info, node->loaded_info, 638 memcpy(loaded_info, node->loaded_info,
@@ -645,9 +645,9 @@ static void add_info(struct gcov_node *node, struct gcov_info *info)
645 * data set replaces the copy of the last one. 645 * data set replaces the copy of the last one.
646 */ 646 */
647 if (!gcov_info_is_compatible(node->unloaded_info, info)) { 647 if (!gcov_info_is_compatible(node->unloaded_info, info)) {
648 pr_warning("discarding saved data for %s " 648 pr_warn("discarding saved data for %s "
649 "(incompatible version)\n", 649 "(incompatible version)\n",
650 gcov_info_filename(info)); 650 gcov_info_filename(info));
651 gcov_info_free(node->unloaded_info); 651 gcov_info_free(node->unloaded_info);
652 node->unloaded_info = NULL; 652 node->unloaded_info = NULL;
653 } 653 }
@@ -657,8 +657,8 @@ static void add_info(struct gcov_node *node, struct gcov_info *info)
657 * The initial one takes precedence. 657 * The initial one takes precedence.
658 */ 658 */
659 if (!gcov_info_is_compatible(node->loaded_info[0], info)) { 659 if (!gcov_info_is_compatible(node->loaded_info[0], info)) {
660 pr_warning("could not add '%s' (incompatible " 660 pr_warn("could not add '%s' (incompatible "
661 "version)\n", gcov_info_filename(info)); 661 "version)\n", gcov_info_filename(info));
662 kfree(loaded_info); 662 kfree(loaded_info);
663 return; 663 return;
664 } 664 }
@@ -693,9 +693,9 @@ static void save_info(struct gcov_node *node, struct gcov_info *info)
693 else { 693 else {
694 node->unloaded_info = gcov_info_dup(info); 694 node->unloaded_info = gcov_info_dup(info);
695 if (!node->unloaded_info) { 695 if (!node->unloaded_info) {
696 pr_warning("could not save data for '%s' " 696 pr_warn("could not save data for '%s' "
697 "(out of memory)\n", 697 "(out of memory)\n",
698 gcov_info_filename(info)); 698 gcov_info_filename(info));
699 } 699 }
700 } 700 }
701} 701}
@@ -710,8 +710,8 @@ static void remove_info(struct gcov_node *node, struct gcov_info *info)
710 710
711 i = get_info_index(node, info); 711 i = get_info_index(node, info);
712 if (i < 0) { 712 if (i < 0) {
713 pr_warning("could not remove '%s' (not found)\n", 713 pr_warn("could not remove '%s' (not found)\n",
714 gcov_info_filename(info)); 714 gcov_info_filename(info));
715 return; 715 return;
716 } 716 }
717 if (gcov_persist) 717 if (gcov_persist)
@@ -750,8 +750,8 @@ void gcov_event(enum gcov_action action, struct gcov_info *info)
750 if (node) 750 if (node)
751 remove_info(node, info); 751 remove_info(node, info);
752 else { 752 else {
753 pr_warning("could not remove '%s' (not found)\n", 753 pr_warn("could not remove '%s' (not found)\n",
754 gcov_info_filename(info)); 754 gcov_info_filename(info));
755 } 755 }
756 break; 756 break;
757 } 757 }