diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2020-06-02 18:04:03 +0300 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2020-06-15 15:10:08 +0300 |
| commit | e79302ae8c8cceb51cf642d5ace9da02668cb7b4 (patch) | |
| tree | b1cd14b8163c65658d46b0f2a30ae479bd71ed9b | |
| parent | e82587336695f14283987c9aa0bfd775b520856d (diff) | |
| download | linux-e79302ae8c8cceb51cf642d5ace9da02668cb7b4.tar.xz | |
kcsan: Remove __no_kcsan_or_inline
There are no more user of this function attribute, also, with us now
actively supporting '__no_kcsan inline' it doesn't make sense to have
in any case.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
| -rw-r--r-- | Documentation/dev-tools/kcsan.rst | 6 | ||||
| -rw-r--r-- | include/linux/compiler_types.h | 5 |
2 files changed, 1 insertions, 10 deletions
diff --git a/Documentation/dev-tools/kcsan.rst b/Documentation/dev-tools/kcsan.rst index ce4bbd918648..b38379f06194 100644 --- a/Documentation/dev-tools/kcsan.rst +++ b/Documentation/dev-tools/kcsan.rst @@ -114,12 +114,6 @@ the below options are available: To dynamically limit for which functions to generate reports, see the `DebugFS interface`_ blacklist/whitelist feature. - For ``__always_inline`` functions, replace ``__always_inline`` with - ``__no_kcsan_or_inline`` (which implies ``__always_inline``):: - - static __no_kcsan_or_inline void foo(void) { - ... - * To disable data race detection for a particular compilation unit, add to the ``Makefile``:: diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h index 21aed0981edf..938249809511 100644 --- a/include/linux/compiler_types.h +++ b/include/linux/compiler_types.h @@ -193,10 +193,7 @@ struct ftrace_likely_data { #define __no_kcsan __no_sanitize_thread #ifdef __SANITIZE_THREAD__ -# define __no_kcsan_or_inline __no_kcsan notrace __maybe_unused -# define __no_sanitize_or_inline __no_kcsan_or_inline -#else -# define __no_kcsan_or_inline __always_inline +# define __no_sanitize_or_inline __no_kcsan notrace __maybe_unused #endif #ifndef __no_sanitize_or_inline |