summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-06-11 15:51:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-06-11 15:51:56 -0700
commit6d53cefb18e4646fb4bf62ccb6098fb3808486df (patch)
tree6e0db894dc3861cb6119a3a22d3add8f692f75ec
parent5ad9345d2321eb1442794098506d136d01cf8345 (diff)
downloadlinux-sh-6d53cefb18e4646fb4bf62ccb6098fb3808486df.tar.gz
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>
-rw-r--r--include/linux/compiler-clang.h3
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