diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-06 14:14:25 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-06 14:14:24 -0700 |
| commit | c44da670c28766ea7fa8b46453e9111965bf2eb2 (patch) | |
| tree | 79d7b94b76dc3eb27d74ef7be44e2f88e1dc39f8 /kernel/trace/trace.c | |
| parent | 356bd90ee7d4caac787e2c4c9da68b585b7cf48b (diff) | |
| parent | b87d31674ac9e8203f3a30b53f6a697bf5cf36b6 (diff) | |
Merge "Merge android-4.4.153 (5e24b4e) into msm-4.4"
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index e62c44cb8b74..b30adaae739a 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2237,6 +2237,7 @@ out: } EXPORT_SYMBOL_GPL(trace_vbprintk); +__printf(3, 0) static int __trace_array_vprintk(struct ring_buffer *buffer, unsigned long ip, const char *fmt, va_list args) @@ -2288,12 +2289,14 @@ __trace_array_vprintk(struct ring_buffer *buffer, return len; } +__printf(3, 0) int trace_array_vprintk(struct trace_array *tr, unsigned long ip, const char *fmt, va_list args) { return __trace_array_vprintk(tr->trace_buffer.buffer, ip, fmt, args); } +__printf(3, 0) int trace_array_printk(struct trace_array *tr, unsigned long ip, const char *fmt, ...) { @@ -2309,6 +2312,7 @@ int trace_array_printk(struct trace_array *tr, return ret; } +__printf(3, 4) int trace_array_printk_buf(struct ring_buffer *buffer, unsigned long ip, const char *fmt, ...) { @@ -2324,6 +2328,7 @@ int trace_array_printk_buf(struct ring_buffer *buffer, return ret; } +__printf(2, 0) int trace_vprintk(unsigned long ip, const char *fmt, va_list args) { return trace_array_vprintk(&global_trace, ip, fmt, args); |