diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-14 14:12:24 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-14 14:12:24 +0800 |
| commit | 34e0913e457f8469667faf5fa600447aa93371cf (patch) | |
| tree | 03a33cde6e4ee41d03ffdb8eb18d63ecbffbc614 /include/linux/compiler.h | |
| parent | af1d34c770588a9ec6041292b7cd08e2fbc4f3a3 (diff) | |
| parent | f3542ea105aefbb16cbcac4f30e2cf583a66d3d8 (diff) | |
Merge tag 'v3.14.64' into linux-linaro-lsk-v3.14
This is the 3.14.64 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 2472740d7ab2..6977192bdb59 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -131,7 +131,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 \ |