diff options
| author | James Bottomley <James.Bottomley@suse.de> | 2010-05-18 16:33:43 +0200 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-05-18 16:37:41 +0200 |
| commit | 95bb335c0ebe96afe926387a1ef3a096bd884a82 (patch) | |
| tree | 56115332b4f2f7ef300c36248a6a7d20db2e639d /kernel | |
| parent | [SCSI] libsas: fix deref before check in commit 70b25f890ce (diff) | |
| parent | [SCSI] aacraid: add an ifdef'd device delete case instead of taking the devic... (diff) | |
| download | linux-95bb335c0ebe96afe926387a1ef3a096bd884a82.tar.xz linux-95bb335c0ebe96afe926387a1ef3a096bd884a82.zip | |
[SCSI] Merge scsi-misc-2.6 into scsi-rc-fixes-2.6
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_output.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index 8e46b3323cdc..9cb5df5dc656 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -209,6 +209,7 @@ int trace_seq_putc(struct trace_seq *s, unsigned char c) return 1; } +EXPORT_SYMBOL(trace_seq_putc); int trace_seq_putmem(struct trace_seq *s, const void *mem, size_t len) { @@ -355,6 +356,21 @@ ftrace_print_symbols_seq(struct trace_seq *p, unsigned long val, } EXPORT_SYMBOL(ftrace_print_symbols_seq); +const char * +ftrace_print_hex_seq(struct trace_seq *p, const unsigned char *buf, int buf_len) +{ + int i; + const char *ret = p->buffer + p->len; + + for (i = 0; i < buf_len; i++) + trace_seq_printf(p, "%s%2.2x", i == 0 ? "" : " ", buf[i]); + + trace_seq_putc(p, 0); + + return ret; +} +EXPORT_SYMBOL(ftrace_print_hex_seq); + #ifdef CONFIG_KRETPROBES static inline const char *kretprobed(const char *name) { |