From 94769442ed6c933ba9d5709d632d79220c24d77a Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Wed, 8 Oct 2008 16:51:49 -0700
Subject: [PATCH] --- yaml --- r: 116681 b: refs/heads/master c:
 2fbc474901933c8f0c09b0280dfbb6780cb8bd60 h: refs/heads/master i:   116679:
 a4c6060e4ff85dc24c7a89f4e5a84db99941da94 v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 7dd0a6c3990a..bdd391002f2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddc7a01aad195708fc943d9446411d11e3547784
+refs/heads/master: 2fbc474901933c8f0c09b0280dfbb6780cb8bd60
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 78d56614c95b..36cbb873845f 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -336,14 +336,12 @@ trace_seq_putmem(struct trace_seq *s, void *mem, size_t len)
 }
 
 #define HEX_CHARS 17
-static const char hex2asc[] = "0123456789abcdef";
 
 static int
 trace_seq_putmem_hex(struct trace_seq *s, void *mem, size_t len)
 {
 	unsigned char hex[HEX_CHARS];
 	unsigned char *data = mem;
-	unsigned char byte;
 	int i, j;
 
 	BUG_ON(len >= HEX_CHARS);
@@ -353,10 +351,8 @@ trace_seq_putmem_hex(struct trace_seq *s, void *mem, size_t len)
 #else
 	for (i = len-1, j = 0; i >= 0; i--) {
 #endif
-		byte = data[i];
-
-		hex[j++] = hex2asc[byte & 0x0f];
-		hex[j++] = hex2asc[byte >> 4];
+		hex[j++] = hex_asc_hi(data[i]);
+		hex[j++] = hex_asc_lo(data[i]);
 	}
 	hex[j++] = ' ';