diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-11 15:51:56 -0700 |
|---|---|---|
| committer | Greg Hackmann <ghackmann@google.com> | 2017-10-09 14:00:13 -0700 |
| commit | f2ea3999ecf1108b3ae0dcc14eab420701e4cf0a (patch) | |
| tree | 7fa9903e0c1dc90079f605084989fdf528976bd4 /include/linux | |
| parent | 79ec10f9925af458c1cb5dfe31cbb12a7f841d1c (diff) | |
UPSTREAM: compiler, clang: properly override 'inline' for clang
Commit abb2ea7dfd82 ("compiler, clang: suppress warning for unused
static inline functions") just caused more warnings due to re-defining
the 'inline' macro.
So undef it before re-defining it, and also add the 'notrace' attribute
like the gcc version that this is overriding does.
Maybe this makes clang happier.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 6d53cefb18e4646fb4bf62ccb6098fb3808486df)
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Change-Id: Ie01b45583954c6104c854a3810e35c1171764e78
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/compiler-clang.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/compiler-clang.h b/include/linux/compiler-clang.h index ea9126006a69..d614c5ea1b5e 100644 --- a/include/linux/compiler-clang.h +++ b/include/linux/compiler-clang.h @@ -21,4 +21,5 @@ * -Wunused-function. This turns out to avoid the need for complex #ifdef * directives. Suppress the warning in clang as well. */ -#define inline inline __attribute__((unused)) +#undef inline +#define inline inline __attribute__((unused)) notrace |