linux-kernel - [PATCH] trace_syscalls.c: Use pr_fmt and pr

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <1260694735.8189.38.camel@Joe-Laptop.home>
Date:	Sun, 13 Dec 2009 00:58:55 -0800
From:	Joe Perches <joe@...ches.com>
To:	Steven Rostedt <rostedt@...dmis.org>,
	Frederic Weisbecker <fweisbec@...il.com>,
	Ingo Molnar <mingo@...hat.com>
Cc:	LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH] trace_syscalls.c: Use pr_fmt and pr_<level>

I can't tell if the pr_info formats should be newline
terminated or not, so I left them as is.

Add #define pr_fmt(fmt) "event trace: " fmt
Remove prefixes from pr_info
Coalesce pr_<level> format strings
Add spaces between "activate" and "syscalls"
Fix pr_info entry/exit copy/paste typo

Signed-off-by: Joe Perches <joe@...ches.com>
---
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 57501d9..35ca3e8 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -1,3 +1,5 @@
+#define pr_fmt(fmt) "event trace: " fmt
+
 #include <trace/syscall.h>
 #include <trace/events/syscalls.h>
 #include <linux/kernel.h>
@@ -334,8 +336,7 @@ int reg_event_syscall_enter(struct ftrace_event_call *call)
 	if (!sys_refcount_enter)
 		ret = register_trace_sys_enter(ftrace_syscall_enter);
 	if (ret) {
-		pr_info("event trace: Could not activate"
-				"syscall entry trace point");
+		pr_info("Could not activate syscall entry trace point");
 	} else {
 		set_bit(num, enabled_enter_syscalls);
 		sys_refcount_enter++;
@@ -371,8 +372,7 @@ int reg_event_syscall_exit(struct ftrace_event_call *call)
 	if (!sys_refcount_exit)
 		ret = register_trace_sys_exit(ftrace_syscall_exit);
 	if (ret) {
-		pr_info("event trace: Could not activate"
-				"syscall exit trace point");
+		pr_info("Could not activate syscall exit trace point");
 	} else {
 		set_bit(num, enabled_exit_syscalls);
 		sys_refcount_exit++;
@@ -515,8 +515,7 @@ int prof_sysenter_enable(struct ftrace_event_call *call)
 	if (!sys_prof_refcount_enter)
 		ret = register_trace_sys_enter(prof_syscall_enter);
 	if (ret) {
-		pr_info("event trace: Could not activate"
-				"syscall entry trace point");
+		pr_info("Could not activate syscall entry trace point");
 	} else {
 		set_bit(num, enabled_prof_enter_syscalls);
 		sys_prof_refcount_enter++;
@@ -616,8 +615,7 @@ int prof_sysexit_enable(struct ftrace_event_call *call)
 	if (!sys_prof_refcount_exit)
 		ret = register_trace_sys_exit(prof_syscall_exit);
 	if (ret) {
-		pr_info("event trace: Could not activate"
-				"syscall entry trace point");
+		pr_info("Could not activate syscall exit trace point");
 	} else {
 		set_bit(num, enabled_prof_exit_syscalls);
 		sys_prof_refcount_exit++;


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/