diff --git a/[refs] b/[refs] index 8f9f44c214f4..f8a609c6e91a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 451931702017951f74624ddc4f7f02e4641b0e20 +refs/heads/master: 49833fc232bd6a5076496994d855f601354501d7 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index d55ccfc8d674..dbbdacfaaf9e 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -205,7 +205,7 @@ static DEFINE_MUTEX(trace_types_lock); static DECLARE_WAIT_QUEUE_HEAD(trace_wait); /* trace_flags holds iter_ctrl options */ -unsigned long trace_flags = TRACE_ITER_PRINT_PARENT; +unsigned long trace_flags = TRACE_ITER_PRINT_PARENT | TRACE_ITER_PRINTK; /** * trace_wake_up - wake up tasks waiting for trace input