Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab3c9c68 authored by Linus Torvalds's avatar Linus Torvalds Committed by Ingo Molnar
Browse files

branch tracer, intel-iommu: fix build with CONFIG_BRANCH_TRACER=y 



Fix the branch tracer barfing on comma statements within if ()
statements.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d9ad8bc0

include/linux/compiler.h

+3 −1
Original line number Diff line number Diff line
@@ -115,7 +115,9 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); 
 * "Define 'is'", Bill Clinton

 * "Define 'if'", Steven Rostedt

 */

#define if(cond) if (__builtin_constant_p((cond)) ? !!(cond) :		\

#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )

#define __trace_if(cond) \

	if (__builtin_constant_p((cond)) ? !!(cond) :			\

	({								\

		int ______r;						\

		static struct ftrace_branch_data			\