diff options
author | Huang Shijie <shijie.huang@arm.com> | 2016-08-03 16:46:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-04 08:50:07 -0400 |
commit | 613413143faa3432e436674f1c2e57ad7d290ae1 (patch) | |
tree | 6683bb3db61636849a6009db94048fdbfe2d5634 /samples | |
parent | 468b88956c3317de6cf2317374faf671f950724b (diff) |
samples/kretprobe: convert the printk to pr_info/pr_err
We prefer to use the pr_* to print out the log now, this patch converts
the printk to pr_info. In the error path, use the pr_err to replace the
printk.
Link: http://lkml.kernel.org/r/1464143083-3877-3-git-send-email-shijie.huang@arm.com
Signed-off-by: Huang Shijie <shijie.huang@arm.com>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Steve Capper <steve.capper@arm.com>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'samples')
-rw-r--r-- | samples/kprobes/kretprobe_example.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/samples/kprobes/kretprobe_example.c b/samples/kprobes/kretprobe_example.c index ebb1d1aed547..adc83e9f59d0 100644 --- a/samples/kprobes/kretprobe_example.c +++ b/samples/kprobes/kretprobe_example.c | |||
@@ -62,7 +62,7 @@ static int ret_handler(struct kretprobe_instance *ri, struct pt_regs *regs) | |||
62 | 62 | ||
63 | now = ktime_get(); | 63 | now = ktime_get(); |
64 | delta = ktime_to_ns(ktime_sub(now, data->entry_stamp)); | 64 | delta = ktime_to_ns(ktime_sub(now, data->entry_stamp)); |
65 | printk(KERN_INFO "%s returned %d and took %lld ns to execute\n", | 65 | pr_info("%s returned %d and took %lld ns to execute\n", |
66 | func_name, retval, (long long)delta); | 66 | func_name, retval, (long long)delta); |
67 | return 0; | 67 | return 0; |
68 | } | 68 | } |
@@ -82,11 +82,10 @@ static int __init kretprobe_init(void) | |||
82 | my_kretprobe.kp.symbol_name = func_name; | 82 | my_kretprobe.kp.symbol_name = func_name; |
83 | ret = register_kretprobe(&my_kretprobe); | 83 | ret = register_kretprobe(&my_kretprobe); |
84 | if (ret < 0) { | 84 | if (ret < 0) { |
85 | printk(KERN_INFO "register_kretprobe failed, returned %d\n", | 85 | pr_err("register_kretprobe failed, returned %d\n", ret); |
86 | ret); | ||
87 | return -1; | 86 | return -1; |
88 | } | 87 | } |
89 | printk(KERN_INFO "Planted return probe at %s: %p\n", | 88 | pr_info("Planted return probe at %s: %p\n", |
90 | my_kretprobe.kp.symbol_name, my_kretprobe.kp.addr); | 89 | my_kretprobe.kp.symbol_name, my_kretprobe.kp.addr); |
91 | return 0; | 90 | return 0; |
92 | } | 91 | } |
@@ -94,11 +93,10 @@ static int __init kretprobe_init(void) | |||
94 | static void __exit kretprobe_exit(void) | 93 | static void __exit kretprobe_exit(void) |
95 | { | 94 | { |
96 | unregister_kretprobe(&my_kretprobe); | 95 | unregister_kretprobe(&my_kretprobe); |
97 | printk(KERN_INFO "kretprobe at %p unregistered\n", | 96 | pr_info("kretprobe at %p unregistered\n", my_kretprobe.kp.addr); |
98 | my_kretprobe.kp.addr); | ||
99 | 97 | ||
100 | /* nmissed > 0 suggests that maxactive was set too low. */ | 98 | /* nmissed > 0 suggests that maxactive was set too low. */ |
101 | printk(KERN_INFO "Missed probing %d instances of %s\n", | 99 | pr_info("Missed probing %d instances of %s\n", |
102 | my_kretprobe.nmissed, my_kretprobe.kp.symbol_name); | 100 | my_kretprobe.nmissed, my_kretprobe.kp.symbol_name); |
103 | } | 101 | } |
104 | 102 | ||