diff --git a/[refs] b/[refs] index c2312ff4b677..e705b1c9e606 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4671c79408a3f8a5a6a45e39c4c164dada3a5678 +refs/heads/master: 049862579333cc6cd9e6edfd6987cd0addfd8c59 diff --git a/trunk/kernel/trace/blktrace.c b/trunk/kernel/trace/blktrace.c index e099f8cc1d1c..05b4747fd873 100644 --- a/trunk/kernel/trace/blktrace.c +++ b/trunk/kernel/trace/blktrace.c @@ -1065,7 +1065,7 @@ static int blk_log_action(struct trace_iterator *iter, const char *act) static int blk_log_dump_pdu(struct trace_seq *s, const struct trace_entry *ent) { - const char *pdu_buf; + const unsigned char *pdu_buf; int pdu_len; int i, end, ret;