Commit 01b4ff58 authored by Marco Elver's avatar Marco Elver Committed by Paul E. McKenney
Browse files

kcsan: Move kcsan_{disable,enable}_current() to kcsan-checks.h 



Both affect access checks, and should therefore be in kcsan-checks.h.
This is in preparation to use these in compiler.h.

Acked-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarMarco Elver <elver@google.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent d8949ef1

include/linux/kcsan-checks.h

+16 −0
Original line number Diff line number Diff line
@@ -36,6 +36,20 @@ 
 */

void __kcsan_check_access(const volatile void *ptr, size_t size, int type);



/**

 * kcsan_disable_current - disable KCSAN for the current context

 *

 * Supports nesting.

 */

void kcsan_disable_current(void);



/**

 * kcsan_enable_current - re-enable KCSAN for the current context

 *

 * Supports nesting.

 */

void kcsan_enable_current(void);



/**

 * kcsan_nestable_atomic_begin - begin nestable atomic region

 *
@@ -133,6 +147,8 @@ void kcsan_end_scoped_access(struct kcsan_scoped_access *sa); 
static inline void __kcsan_check_access(const volatile void *ptr, size_t size,

					int type) { }



static inline void kcsan_disable_current(void)		{ }

static inline void kcsan_enable_current(void)		{ }

static inline void kcsan_nestable_atomic_begin(void)	{ }

static inline void kcsan_nestable_atomic_end(void)	{ }

static inline void kcsan_flat_atomic_begin(void)	{ }

include/linux/kcsan.h

+0 −16
Original line number Diff line number Diff line
@@ -50,25 +50,9 @@ struct kcsan_ctx { 
 */

void kcsan_init(void);



/**

 * kcsan_disable_current - disable KCSAN for the current context

 *

 * Supports nesting.

 */

void kcsan_disable_current(void);



/**

 * kcsan_enable_current - re-enable KCSAN for the current context

 *

 * Supports nesting.

 */

void kcsan_enable_current(void);



#else /* CONFIG_KCSAN */



static inline void kcsan_init(void)			{ }

static inline void kcsan_disable_current(void)		{ }

static inline void kcsan_enable_current(void)		{ }



#endif /* CONFIG_KCSAN */