aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.h
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r--kernel/trace/trace.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 336324d717f8..cede1ab49d07 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -20,6 +20,7 @@ enum trace_type {
20 TRACE_WAKE, 20 TRACE_WAKE,
21 TRACE_STACK, 21 TRACE_STACK,
22 TRACE_PRINT, 22 TRACE_PRINT,
23 TRACE_BPRINT,
23 TRACE_SPECIAL, 24 TRACE_SPECIAL,
24 TRACE_MMIO_RW, 25 TRACE_MMIO_RW,
25 TRACE_MMIO_MAP, 26 TRACE_MMIO_MAP,
@@ -117,7 +118,7 @@ struct userstack_entry {
117/* 118/*
118 * trace_printk entry: 119 * trace_printk entry:
119 */ 120 */
120struct print_entry { 121struct bprint_entry {
121 struct trace_entry ent; 122 struct trace_entry ent;
122 unsigned long ip; 123 unsigned long ip;
123 int depth; 124 int depth;
@@ -125,6 +126,13 @@ struct print_entry {
125 u32 buf[]; 126 u32 buf[];
126}; 127};
127 128
129struct print_entry {
130 struct trace_entry ent;
131 unsigned long ip;
132 int depth;
133 char buf[];
134};
135
128#define TRACE_OLD_SIZE 88 136#define TRACE_OLD_SIZE 88
129 137
130struct trace_field_cont { 138struct trace_field_cont {
@@ -286,6 +294,7 @@ extern void __ftrace_bad_type(void);
286 IF_ASSIGN(var, ent, struct stack_entry, TRACE_STACK); \ 294 IF_ASSIGN(var, ent, struct stack_entry, TRACE_STACK); \
287 IF_ASSIGN(var, ent, struct userstack_entry, TRACE_USER_STACK);\ 295 IF_ASSIGN(var, ent, struct userstack_entry, TRACE_USER_STACK);\
288 IF_ASSIGN(var, ent, struct print_entry, TRACE_PRINT); \ 296 IF_ASSIGN(var, ent, struct print_entry, TRACE_PRINT); \
297 IF_ASSIGN(var, ent, struct bprint_entry, TRACE_BPRINT); \
289 IF_ASSIGN(var, ent, struct special_entry, 0); \ 298 IF_ASSIGN(var, ent, struct special_entry, 0); \
290 IF_ASSIGN(var, ent, struct trace_mmiotrace_rw, \ 299 IF_ASSIGN(var, ent, struct trace_mmiotrace_rw, \
291 TRACE_MMIO_RW); \ 300 TRACE_MMIO_RW); \
@@ -570,6 +579,8 @@ extern int trace_selftest_startup_branch(struct tracer *trace,
570extern void *head_page(struct trace_array_cpu *data); 579extern void *head_page(struct trace_array_cpu *data);
571extern long ns2usecs(cycle_t nsec); 580extern long ns2usecs(cycle_t nsec);
572extern int 581extern int
582trace_vbprintk(unsigned long ip, int depth, const char *fmt, va_list args);
583extern int
573trace_vprintk(unsigned long ip, int depth, const char *fmt, va_list args); 584trace_vprintk(unsigned long ip, int depth, const char *fmt, va_list args);
574 585
575extern unsigned long trace_flags; 586extern unsigned long trace_flags;