Skip to content

Commit

Permalink
kcsan: Prefer '__no_kcsan inline' in test
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Marco Elver authored and Paul E. McKenney committed Jun 29, 2020
1 parent 33190b6 commit 2888557
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions kernel/kcsan/kcsan-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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)) {
Expand Down

0 comments on commit 2888557

Please sign in to comment.