~hc/RK356X_SDK_RELEASE.git

summary
commits
tree
docs
forks
compare

blame | history | patch | commit | commitdiff

2024-05-10 61598093bbdd283a7edc367d900f223070ead8d2

 kernel/kernel/trace/blktrace.c
.. .. @@ -1602,7 +1602,8 @@
1602 1602  
1603 1603  static enum print_line_t blk_tracer_print_line(struct trace_iterator *iter)
1604 1604  {
1605 -	if (!(blk_tracer_flags.val & TRACE_BLK_OPT_CLASSIC))
1605 +	if ((iter->ent->type != TRACE_BLK) ||
1606 +	    !(blk_tracer_flags.val & TRACE_BLK_OPT_CLASSIC))
1606 1607  		return TRACE_TYPE_UNHANDLED;
1607 1608  
1608 1609  	return print_one_line(iter, true);

..	..	@@ -1602,7 +1602,8 @@
1602	1602
1603	1603	static enum print_line_t blk_tracer_print_line(struct trace_iterator *iter)
1604	1604	{
1605		- if (!(blk_tracer_flags.val & TRACE_BLK_OPT_CLASSIC))
	1605	+ if ((iter->ent->type != TRACE_BLK) \|\|
	1606	+ !(blk_tracer_flags.val & TRACE_BLK_OPT_CLASSIC))
1606	1607	return TRACE_TYPE_UNHANDLED;
1607	1608
1608	1609	return print_one_line(iter, true);