diff options
| author |   Marco Elver <elver@google.com> | 2020-06-02 16:36:33 +0200 |
|---|---|---|
| committer |   Paul E. McKenney <paulmck@kernel.org> | 2020-06-29 12:04:48 -0700 |
| commit | 2888557f68db334a3839dcc262264a4c436f576b (patch) | |
| tree | 3db938e75964fc0cd84a6fea52733c118ba243dd /kernel/kcsan | |
| parent | locking/osq_lock: Annotate a data race in osq_lock (diff) | |
| download | linux-dev-2888557f68db334a3839dcc262264a4c436f576b.tar.xz linux-dev-2888557f68db334a3839dcc262264a4c436f576b.zip | |
kcsan: Prefer '__no_kcsan inline' in test
Instead of __no_kcsan_or_inline, prefer '__no_kcsan inline' in test --
this is in case we decide to remove __no_kcsan_or_inline.
Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Marco Elver <elver@google.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'kernel/kcsan')
| -rw-r--r-- | kernel/kcsan/kcsan-test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/kcsan/kcsan-test.c b/kernel/kcsan/kcsan-test.c index a8c11506dd2a..3af420ad6ee7 100644 --- a/kernel/kcsan/kcsan-test.c +++ b/kernel/kcsan/kcsan-test.c @@ -43,7 +43,7 @@ static struct { }; /* Setup test checking loop. */ -static __no_kcsan_or_inline void +static __no_kcsan inline void begin_test_checks(void (*func1)(void), void (*func2)(void)) { kcsan_disable_current(); @@ -60,7 +60,7 @@ begin_test_checks(void (*func1)(void), void (*func2)(void)) } /* End test checking loop. */ -static __no_kcsan_or_inline bool +static __no_kcsan inline bool end_test_checks(bool stop) { if (!stop && time_before(jiffies, end_time)) { |