diff --git a/[refs] b/[refs] index 1ff9c81daf03..f99f184e18c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc182a4330fc22ea1b68fa3d5064dd85a73a4c4a +refs/heads/master: b78825d608f30a47e3154ab6872a03f0de0c9d45 diff --git a/trunk/kernel/trace/blktrace.c b/trunk/kernel/trace/blktrace.c index 921ef5d1f0ba..e45e1af13563 100644 --- a/trunk/kernel/trace/blktrace.c +++ b/trunk/kernel/trace/blktrace.c @@ -1182,7 +1182,7 @@ static enum print_line_t print_one_line(struct trace_iterator *iter, } if (unlikely(what == 0 || what >= ARRAY_SIZE(what2act))) - ret = trace_seq_printf(s, "Bad pc action %x\n", what); + ret = trace_seq_printf(s, "Unknown action %x\n", what); else { ret = log_action(iter, what2act[what].act[long_act]); if (ret)