diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-11 15:51:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-22 14:27:35 +0200 |
| commit | f276b50c3a5b01c1b6636adb3e4eba67d187d218 (patch) | |
| tree | e68b9dfa0193824d1ef2026b02c6ec7a53594327 /include | |
| parent | 94cc698fdaa7250c117343b34432ea6431b3856b (diff) | |
compiler, clang: properly override 'inline' for clang
commit 6d53cefb18e4646fb4bf62ccb6098fb3808486df upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -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 5ce62d3e69b5..8a97da12ea26 100644 --- a/include/linux/compiler-clang.h +++ b/include/linux/compiler-clang.h @@ -21,7 +21,8 @@ * -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 /* Clang doesn't have a way to turn it off per-function, yet. */ #ifdef __noretpoline |