kcsan: Prefer '__no_kcsan inline' in test

melver · paulmckrcu · commit 2888557f68db · 2020-06-29T12:04:48.000-07:00
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 &lt;peterz@infradead.org&gt;
Signed-off-by: Marco Elver &lt;elver@google.com&gt;
Signed-off-by: Paul E. McKenney &lt;paulmck@kernel.org&gt;
diff --git 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)) {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ static struct {`
`43`	`43`	`};`
`44`	`44`
`45`	`45`	`/* Setup test checking loop. */`
`46`		`-static __no_kcsan_or_inline void`
	`46`	`+static __no_kcsan inline void`
`47`	`47`	`begin_test_checks(void (func1)(void), void (func2)(void))`
`48`	`48`	`{`
`49`	`49`	`kcsan_disable_current();`
`@@ -60,7 +60,7 @@ begin_test_checks(void (func1)(void), void (func2)(void))`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/* End test checking loop. */`
`63`		`-static __no_kcsan_or_inline bool`
	`63`	`+static __no_kcsan inline bool`
`64`	`64`	`end_test_checks(bool stop)`
`65`	`65`	`{`
`66`	`66`	`if (!stop && time_before(jiffies, end_time)) {`