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.

Marco Elver committed 6 years ago

Commit 01b4ff51 parent d8949ef2 files · +16 −16Browse files

Showing the changes to include/linux (2 of 2 files). Show all

Unified · Split

2 files

@@ -36,6 +36,20 @@ · 35 unmodified lines
36	36	*/
37	37	void __kcsan_check_access(const volatile void *ptr, size_t size, int type);
38	38
	39	+/**
	40	+ * kcsan_disable_current - disable KCSAN for the current context
	41	+ *
	42	+ * Supports nesting.
	43	+ */
	44	+void kcsan_disable_current(void);
	45	+
	46	+/**
	47	+ * kcsan_enable_current - re-enable KCSAN for the current context
	48	+ *
	49	+ * Supports nesting.
	50	+ */
	51	+void kcsan_enable_current(void);
	52	+
39	53	/**
40	54	* kcsan_nestable_atomic_begin - begin nestable atomic region
41	55	*
@@ -133,6 +147,8 @@ void kcsan_end_scoped_access(struct kcsan_scoped_access *sa); · 91 unmodified lines
133	147	static inline void __kcsan_check_access(const volatile void *ptr, size_t size,
134	148	int type) { }
135	149
	150	+static inline void kcsan_disable_current(void) { }
	151	+static inline void kcsan_enable_current(void) { }
136	152	static inline void kcsan_nestable_atomic_begin(void) { }
137	153	static inline void kcsan_nestable_atomic_end(void) { }
138	154	static inline void kcsan_flat_atomic_begin(void) { }

@@ -50,25 +50,9 @@ struct kcsan_ctx { · 49 unmodified lines
50	50	*/
51	51	void kcsan_init(void);
52	52
53		−/**
54		− * kcsan_disable_current - disable KCSAN for the current context
55		− *
56		− * Supports nesting.
57		− */
58		−void kcsan_disable_current(void);
59		−
60		−/**
61		− * kcsan_enable_current - re-enable KCSAN for the current context
62		− *
63		− * Supports nesting.
64		− */
65		−void kcsan_enable_current(void);
66		−
67	53	#else /* CONFIG_KCSAN */
68	54
69	55	static inline void kcsan_init(void) { }
70		−static inline void kcsan_disable_current(void) { }
71		−static inline void kcsan_enable_current(void) { }
72	56
73	57	#endif /* CONFIG_KCSAN */
74	58