lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tracing: trace_bprintk() cleanups

Browse Source 
Impact: cleanup

Remove a few leftovers and clean up the code a bit.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <1236356510-8381-5-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-03-06 17:52:03 +01:00
parent 769b0441f4
commit 9de36825b3
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/module.c
View File

@@ -2158,12 +2158,6 @@ static noinline struct module *load_module(void __user *umod,
&mod->num_tracepoints); &mod->num_tracepoints);
#endif #endif
#ifdef CONFIG_TRACE_BPRINTK
mod->trace_bprintk_fmt_start = section_objs(hdr, sechdrs, secstrings,
"__trace_bprintk_fmt", sizeof(char *),
&mod->num_trace_bprintk_fmt);
#endif
#ifdef CONFIG_MODVERSIONS #ifdef CONFIG_MODVERSIONS
if ((mod->num_syms && !mod->crcs) if ((mod->num_syms && !mod->crcs)
|| (mod->num_gpl_syms && !mod->gpl_crcs) || (mod->num_gpl_syms && !mod->gpl_crcs)

19
kernel/trace/trace.h
View File

@@ -119,14 +119,11 @@ struct userstack_entry {
*/ */
struct print_entry { struct print_entry {
struct trace_entry ent; struct trace_entry ent;
unsigned long ip; unsigned long ip;
int depth; int depth;
const char *fmt; const char *fmt;
u32 buf[]; u32 buf[];
}; };
#ifdef CONFIG_TRACE_BPRINTK
extern int trace_bprintk_enable;
#endif
#define TRACE_OLD_SIZE 88 #define TRACE_OLD_SIZE 88
@@ -199,7 +196,7 @@ struct kmemtrace_free_entry {
* trace_flag_type is an enumeration that holds different * trace_flag_type is an enumeration that holds different
* states when a trace occurs. These are: * states when a trace occurs. These are:
* IRQS_OFF - interrupts were disabled * IRQS_OFF - interrupts were disabled
* IRQS_NOSUPPORT - arch does not support irqs_disabled_flags * IRQS_NOSUPPORT - arch does not support irqs_disabled_flags
* NEED_RESCED - reschedule is requested * NEED_RESCED - reschedule is requested
* HARDIRQ - inside an interrupt handler * HARDIRQ - inside an interrupt handler
* SOFTIRQ - inside a softirq handler * SOFTIRQ - inside a softirq handler
@@ -302,7 +299,7 @@ extern void __ftrace_bad_type(void);
IF_ASSIGN(var, ent, struct ftrace_graph_ret_entry, \ IF_ASSIGN(var, ent, struct ftrace_graph_ret_entry, \
TRACE_GRAPH_RET); \ TRACE_GRAPH_RET); \
IF_ASSIGN(var, ent, struct hw_branch_entry, TRACE_HW_BRANCHES);\ IF_ASSIGN(var, ent, struct hw_branch_entry, TRACE_HW_BRANCHES);\
IF_ASSIGN(var, ent, struct trace_power, TRACE_POWER); \ IF_ASSIGN(var, ent, struct trace_power, TRACE_POWER); \
IF_ASSIGN(var, ent, struct kmemtrace_alloc_entry, \ IF_ASSIGN(var, ent, struct kmemtrace_alloc_entry, \
TRACE_KMEM_ALLOC); \ TRACE_KMEM_ALLOC); \
IF_ASSIGN(var, ent, struct kmemtrace_free_entry, \ IF_ASSIGN(var, ent, struct kmemtrace_free_entry, \
@@ -325,8 +322,8 @@ enum print_line_t {
* flags value in struct tracer_flags. * flags value in struct tracer_flags.
*/ */
struct tracer_opt { struct tracer_opt {
const char *name; /* Will appear on the trace_options file */ const char *name; /* Will appear on the trace_options file */
u32 bit; /* Mask assigned in val field in tracer_flags */ u32 bit; /* Mask assigned in val field in tracer_flags */
}; };
/* /*
@@ -335,7 +332,7 @@ struct tracer_opt {
*/ */
struct tracer_flags { struct tracer_flags {
u32 val; u32 val;
struct tracer_opt *opts; struct tracer_opt *opts;
}; };
/* Makes more easy to define a tracer opt */ /* Makes more easy to define a tracer opt */
@@ -390,7 +387,7 @@ struct tracer {
int (*set_flag)(u32 old_flags, u32 bit, int set); int (*set_flag)(u32 old_flags, u32 bit, int set);
struct tracer *next; struct tracer *next;
int print_max; int print_max;
struct tracer_flags *flags; struct tracer_flags *flags;
struct tracer_stat *stats; struct tracer_stat *stats;
}; };