|
@@ -185,23 +185,21 @@ void __read_once_size(const volatile void *p, void *res, int size)
|
|
|
|
|
|
#ifdef CONFIG_KASAN
|
|
|
/*
|
|
|
- * This function is not 'inline' because __no_sanitize_address confilcts
|
|
|
+ * We can't declare function 'inline' because __no_sanitize_address confilcts
|
|
|
* with inlining. Attempt to inline it may cause a build failure.
|
|
|
* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368
|
|
|
* '__maybe_unused' allows us to avoid defined-but-not-used warnings.
|
|
|
*/
|
|
|
-static __no_sanitize_address __maybe_unused
|
|
|
-void __read_once_size_nocheck(const volatile void *p, void *res, int size)
|
|
|
-{
|
|
|
- __READ_ONCE_SIZE;
|
|
|
-}
|
|
|
+# define __no_kasan_or_inline __no_sanitize_address __maybe_unused
|
|
|
#else
|
|
|
-static __always_inline
|
|
|
+# define __no_kasan_or_inline __always_inline
|
|
|
+#endif
|
|
|
+
|
|
|
+static __no_kasan_or_inline
|
|
|
void __read_once_size_nocheck(const volatile void *p, void *res, int size)
|
|
|
{
|
|
|
__READ_ONCE_SIZE;
|
|
|
}
|
|
|
-#endif
|
|
|
|
|
|
static __always_inline void __write_once_size(volatile void *p, void *res, int size)
|
|
|
{
|