diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-02-29 10:11:03 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-02-29 10:11:03 +0800 |
| commit | f041be68a6a9529c9adbb2bf0bbf6d8adfd5c05e (patch) | |
| tree | f4417dde853c08d86f1394ac6c97e391d336883a /include/linux/compiler.h | |
| parent | b41d58cfa9422ed49dd9c6e43f24d766de791873 (diff) | |
| parent | 2134d97aa3a7ce38bb51f933f2e20cafde371085 (diff) | |
Merge tag 'v4.4.3' into linux-linaro-lsk-v4.4
This is the 4.4.3 stable release
Diffstat (limited to 'include/linux/compiler.h')
| -rw-r--r-- | include/linux/compiler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 4dac1036594f..6fc9a6dd5ed2 100644 --- 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 \ |