projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v4.4.12' into linux-linaro-lsk-v4.4
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
compiler.h
diff --git
a/include/linux/compiler.h
b/include/linux/compiler.h
index 4dac1036594f2a06418506d1a56b8e446462049e..6fc9a6dd5ed23dab4e7da9b0909fb0cf4a608fa0 100644
(file)
--- a/
include/linux/compiler.h
+++ b/
include/linux/compiler.h
@@
-144,7
+144,7
@@
void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
*/
#define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
#define __trace_if(cond) \
- if (__builtin_constant_p(
(cond)) ? !!(cond) :
\
+ if (__builtin_constant_p(
!!(cond)) ? !!(cond) :
\
({ \
int ______r; \
static struct ftrace_branch_data \