diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
| commit | 4ba24fef3eb3b142197135223b90ced2f319cd53 (patch) | |
| tree | a20c125b27740ec7b4c761b11d801108e1b316b2 /kernel/trace/trace_output.h | |
| parent | 47c1ffb2b6b630894e9a16442611c056ab21c057 (diff) | |
| parent | 98a4a59ee31a12105a2b84f5b8b515ac2cb208ef (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.20.
Diffstat (limited to 'kernel/trace/trace_output.h')
| -rw-r--r-- | kernel/trace/trace_output.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/kernel/trace/trace_output.h b/kernel/trace/trace_output.h index 80b25b585a70..8ef2c40efb3c 100644 --- a/kernel/trace/trace_output.h +++ b/kernel/trace/trace_output.h | |||
| @@ -35,17 +35,11 @@ trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry); | |||
| 35 | extern int __unregister_ftrace_event(struct trace_event *event); | 35 | extern int __unregister_ftrace_event(struct trace_event *event); |
| 36 | extern struct rw_semaphore trace_event_sem; | 36 | extern struct rw_semaphore trace_event_sem; |
| 37 | 37 | ||
| 38 | #define SEQ_PUT_FIELD_RET(s, x) \ | 38 | #define SEQ_PUT_FIELD(s, x) \ |
| 39 | do { \ | 39 | trace_seq_putmem(s, &(x), sizeof(x)) |
| 40 | if (!trace_seq_putmem(s, &(x), sizeof(x))) \ | 40 | |
| 41 | return TRACE_TYPE_PARTIAL_LINE; \ | 41 | #define SEQ_PUT_HEX_FIELD(s, x) \ |
| 42 | } while (0) | 42 | trace_seq_putmem_hex(s, &(x), sizeof(x)) |
| 43 | |||
| 44 | #define SEQ_PUT_HEX_FIELD_RET(s, x) \ | ||
| 45 | do { \ | ||
| 46 | if (!trace_seq_putmem_hex(s, &(x), sizeof(x))) \ | ||
| 47 | return TRACE_TYPE_PARTIAL_LINE; \ | ||
| 48 | } while (0) | ||
| 49 | 43 | ||
| 50 | #endif | 44 | #endif |
| 51 | 45 | ||