(2013/04/03 17:28), oskar.and...@sonymobile.com wrote:
> Instead of using printk use pr_info/pr_err/pr_warn. This was
> detected by the checkpatch.pl script.
Thank you for cleaning this up ! :)
Acked-by: Masami Hiramatsu <masami.hiramatsu...@hitachi.com>
>
> Signed-off-by: Oskar Andero <oskar.and...@sonymobile.com>
> ---
> kernel/kprobes.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/kernel/kprobes.c b/kernel/kprobes.c
> index 3396eb8..03a9dd3 100644
> --- a/kernel/kprobes.c
> +++ b/kernel/kprobes.c
> @@ -168,7 +168,7 @@ static void init_kprobe_blacklist(void)
> kprobe_lookup_name(kretprobe_blacklist[i].name,
> kretprobe_blacklist[i].addr);
> if (!kretprobe_blacklist[i].addr)
> - printk("kretprobe: lookup failed: %s\n",
> + pr_err("kretprobe: lookup failed: %s\n",
> kretprobe_blacklist[i].name);
> }
> }
> @@ -777,7 +777,7 @@ static void reuse_unused_kprobe(struct kprobe *ap)
> */
> op = container_of(ap, struct optimized_kprobe, kp);
> if (unlikely(list_empty(&op->list)))
> - printk(KERN_WARNING "Warning: found a stray unused "
> + pr_warn("Warning: found a stray unused "
> "aggrprobe@%p\n", ap->addr);
> /* Enable the probe again */
> ap->flags &= ~KPROBE_FLAG_DISABLED;
> @@ -884,7 +884,7 @@ static void __kprobes optimize_all_kprobes(void)
> if (!kprobe_disabled(p))
> optimize_kprobe(p);
> }
> - printk(KERN_INFO "Kprobes globally optimized\n");
> + pr_info("Kprobes globally optimized\n");
> }
>
> /* This should be called with kprobe_mutex locked */
> @@ -908,7 +908,7 @@ static void __kprobes unoptimize_all_kprobes(void)
> }
> /* Wait for unoptimizing completion */
> wait_for_kprobe_optimizer();
> - printk(KERN_INFO "Kprobes globally unoptimized\n");
> + pr_info("Kprobes globally unoptimized\n");
> }
>
> int sysctl_kprobes_optimization;
> @@ -979,7 +979,7 @@ static void __kprobes __disarm_kprobe(struct kprobe *p,
> bool reopt)
> /* There should be no unused kprobes can be reused without optimization */
> static void reuse_unused_kprobe(struct kprobe *ap)
> {
> - printk(KERN_ERR "Error: There should be no unused kprobe here.\n");
> + pr_err("Error: There should be no unused kprobe here.\n");
> BUG_ON(kprobe_unused(ap));
> }
>
> @@ -2093,8 +2093,8 @@ EXPORT_SYMBOL_GPL(enable_kprobe);
>
> void __kprobes dump_kprobe(struct kprobe *kp)
> {
> - printk(KERN_WARNING "Dumping kprobe:\n");
> - printk(KERN_WARNING "Name: %s\nAddress: %p\nOffset: %x\n",
> + pr_warn("Dumping kprobe:\n");
> + pr_warn("Name: %s\nAddress: %p\nOffset: %x\n",
> kp->symbol_name, kp->addr, kp->offset);
> }
>
> @@ -2290,7 +2290,7 @@ static void __kprobes arm_all_kprobes(void)
> }
>
> kprobes_all_disarmed = false;
> - printk(KERN_INFO "Kprobes globally enabled\n");
> + pr_info("Kprobes globally enabled\n");
>
> already_enabled:
> mutex_unlock(&kprobe_mutex);
> @@ -2312,7 +2312,7 @@ static void __kprobes disarm_all_kprobes(void)
> }
>
> kprobes_all_disarmed = true;
> - printk(KERN_INFO "Kprobes globally disabled\n");
> + pr_info("Kprobes globally disabled\n");
>
> for (i = 0; i < KPROBE_TABLE_SIZE; i++) {
> head = &kprobe_table[i];
>
--
Masami HIRAMATSU
IT Management Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: masami.hiramatsu...@hitachi.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
