Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161838Ab3DEN1R (ORCPT ); Fri, 5 Apr 2013 09:27:17 -0400 Received: from seldrel01.sonyericsson.com ([212.209.106.2]:6213 "EHLO seldrel01.sonyericsson.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161812Ab3DEN1Q (ORCPT ); Fri, 5 Apr 2013 09:27:16 -0400 From: Oskar Andero To: CC: , Masami Hiramatsu , , , , Joonsoo Kim , , , Subject: [PATCH v3 4/4] kprobes: replace printk with pr_-functions Date: Fri, 5 Apr 2013 15:26:40 +0200 Message-ID: <1365168400-17954-5-git-send-email-oskar.andero@sonymobile.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1365168400-17954-1-git-send-email-oskar.andero@sonymobile.com> References: <1365168400-17954-1-git-send-email-oskar.andero@sonymobile.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3316 Lines: 97 Instead of using printk use pr_info/pr_err/pr_warn. This was detected by the checkpatch.pl script. Cc: Masami Hiramatsu Cc: David S. Miller Signed-off-by: Oskar Andero Acked-by: Masami Hiramatsu --- kernel/kprobes.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index b289384..08facfc 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -172,7 +172,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); } } @@ -787,7 +787,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; @@ -894,7 +894,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 */ @@ -918,7 +918,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; @@ -989,7 +989,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)); } @@ -2103,8 +2103,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); } @@ -2300,7 +2300,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); @@ -2322,7 +2322,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]; -- 1.8.1.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/