diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-10-08 19:51:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-14 04:39:25 -0400 |
| commit | 2fbc474901933c8f0c09b0280dfbb6780cb8bd60 (patch) | |
| tree | f73b8d74c1da044cecbba6c50e8b674ae885d425 /kernel/trace | |
| parent | ddc7a01aad195708fc943d9446411d11e3547784 (diff) | |
ftrace: fix hex output mode of ftrace
Fix the output of ftrace in hex mode as the hi/lo nibbles are output in
reverse order. Without this patch, the output of ftrace is:
raw mode : 6474 0 141531612444 0 140 + 6402 120 S
hex mode : 000091a4 00000000 000000023f1f50c1 00000000 c8 000000b2 00009120 87 ffff00c8 00000035
There is an inversion on ouput hex(6474) is 194a
[based on a patch by Philippe Reynes <tremyfr@yahoo.fr>]
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 78d56614c95b..36cbb873845f 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
| @@ -336,14 +336,12 @@ trace_seq_putmem(struct trace_seq *s, void *mem, size_t len) | |||
| 336 | } | 336 | } |
| 337 | 337 | ||
| 338 | #define HEX_CHARS 17 | 338 | #define HEX_CHARS 17 |
| 339 | static const char hex2asc[] = "0123456789abcdef"; | ||
| 340 | 339 | ||
| 341 | static int | 340 | static int |
| 342 | trace_seq_putmem_hex(struct trace_seq *s, void *mem, size_t len) | 341 | trace_seq_putmem_hex(struct trace_seq *s, void *mem, size_t len) |
| 343 | { | 342 | { |
| 344 | unsigned char hex[HEX_CHARS]; | 343 | unsigned char hex[HEX_CHARS]; |
| 345 | unsigned char *data = mem; | 344 | unsigned char *data = mem; |
| 346 | unsigned char byte; | ||
| 347 | int i, j; | 345 | int i, j; |
| 348 | 346 | ||
| 349 | BUG_ON(len >= HEX_CHARS); | 347 | BUG_ON(len >= HEX_CHARS); |
| @@ -353,10 +351,8 @@ trace_seq_putmem_hex(struct trace_seq *s, void *mem, size_t len) | |||
| 353 | #else | 351 | #else |
| 354 | for (i = len-1, j = 0; i >= 0; i--) { | 352 | for (i = len-1, j = 0; i >= 0; i--) { |
| 355 | #endif | 353 | #endif |
| 356 | byte = data[i]; | 354 | hex[j++] = hex_asc_hi(data[i]); |
| 357 | 355 | hex[j++] = hex_asc_lo(data[i]); | |
| 358 | hex[j++] = hex2asc[byte & 0x0f]; | ||
| 359 | hex[j++] = hex2asc[byte >> 4]; | ||
| 360 | } | 356 | } |
| 361 | hex[j++] = ' '; | 357 | hex[j++] = ' '; |
| 362 | 358 | ||
