diff options
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index c637cb687cf2..f7f359d45823 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -1194,7 +1194,7 @@ void trace_graph_return(struct ftrace_graph_ret *trace) | |||
1194 | * trace_vbprintk - write binary msg to tracing buffer | 1194 | * trace_vbprintk - write binary msg to tracing buffer |
1195 | * | 1195 | * |
1196 | */ | 1196 | */ |
1197 | int trace_vbprintk(unsigned long ip, int depth, const char *fmt, va_list args) | 1197 | int trace_vbprintk(unsigned long ip, const char *fmt, va_list args) |
1198 | { | 1198 | { |
1199 | static raw_spinlock_t trace_buf_lock = | 1199 | static raw_spinlock_t trace_buf_lock = |
1200 | (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED; | 1200 | (raw_spinlock_t)__RAW_SPIN_LOCK_UNLOCKED; |
@@ -1236,7 +1236,6 @@ int trace_vbprintk(unsigned long ip, int depth, const char *fmt, va_list args) | |||
1236 | goto out_unlock; | 1236 | goto out_unlock; |
1237 | entry = ring_buffer_event_data(event); | 1237 | entry = ring_buffer_event_data(event); |
1238 | entry->ip = ip; | 1238 | entry->ip = ip; |
1239 | entry->depth = depth; | ||
1240 | entry->fmt = fmt; | 1239 | entry->fmt = fmt; |
1241 | 1240 | ||
1242 | memcpy(entry->buf, trace_buf, sizeof(u32) * len); | 1241 | memcpy(entry->buf, trace_buf, sizeof(u32) * len); |
@@ -1254,7 +1253,7 @@ out: | |||
1254 | } | 1253 | } |
1255 | EXPORT_SYMBOL_GPL(trace_vbprintk); | 1254 | EXPORT_SYMBOL_GPL(trace_vbprintk); |
1256 | 1255 | ||
1257 | int trace_vprintk(unsigned long ip, int depth, const char *fmt, va_list args) | 1256 | int trace_vprintk(unsigned long ip, const char *fmt, va_list args) |
1258 | { | 1257 | { |
1259 | static raw_spinlock_t trace_buf_lock = __RAW_SPIN_LOCK_UNLOCKED; | 1258 | static raw_spinlock_t trace_buf_lock = __RAW_SPIN_LOCK_UNLOCKED; |
1260 | static char trace_buf[TRACE_BUF_SIZE]; | 1259 | static char trace_buf[TRACE_BUF_SIZE]; |
@@ -1291,7 +1290,6 @@ int trace_vprintk(unsigned long ip, int depth, const char *fmt, va_list args) | |||
1291 | goto out_unlock; | 1290 | goto out_unlock; |
1292 | entry = ring_buffer_event_data(event); | 1291 | entry = ring_buffer_event_data(event); |
1293 | entry->ip = ip; | 1292 | entry->ip = ip; |
1294 | entry->depth = depth; | ||
1295 | 1293 | ||
1296 | memcpy(&entry->buf, trace_buf, len); | 1294 | memcpy(&entry->buf, trace_buf, len); |
1297 | entry->buf[len] = 0; | 1295 | entry->buf[len] = 0; |
@@ -3140,7 +3138,7 @@ static int mark_printk(const char *fmt, ...) | |||
3140 | int ret; | 3138 | int ret; |
3141 | va_list args; | 3139 | va_list args; |
3142 | va_start(args, fmt); | 3140 | va_start(args, fmt); |
3143 | ret = trace_vprintk(0, -1, fmt, args); | 3141 | ret = trace_vprintk(0, fmt, args); |
3144 | va_end(args); | 3142 | va_end(args); |
3145 | return ret; | 3143 | return ret; |
3146 | } | 3144 | } |