The patch titled
Subject: kasan-mm-check-kasan_enabled-in-annotations-fix
has been added to the -mm tree. Its filename is
kasan-mm-check-kasan_enabled-in-annotations-fix.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/kasan-mm-check-kasan_enabled-in-annotations-fix.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/kasan-mm-check-kasan_enabled-in-annotations-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: kasan-mm-check-kasan_enabled-in-annotations-fix
build fix: add kasan_enabled() return type
Cc: Alexander Potapenko <glider@xxxxxxxxxx>
Cc: Andrey Konovalov <andreyknvl@xxxxxxxxxx>
Cc: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx>
Cc: Branislav Rankov <Branislav.Rankov@xxxxxxx>
Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
Cc: Dmitry Vyukov <dvyukov@xxxxxxxxxx>
Cc: Evgenii Stepanov <eugenis@xxxxxxxxxx>
Cc: Kevin Brodsky <kevin.brodsky@xxxxxxx>
Cc: Marco Elver <elver@xxxxxxxxxx>
Cc: Vincenzo Frascino <vincenzo.frascino@xxxxxxx>
Cc: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/kasan.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/include/linux/kasan.h~kasan-mm-check-kasan_enabled-in-annotations-fix
+++ a/include/linux/kasan.h
@@ -82,12 +82,12 @@ struct kasan_cache {
#ifdef CONFIG_KASAN_HW_TAGS
DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled);
-static inline kasan_enabled(void)
+static inline bool kasan_enabled(void)
{
return static_branch_likely(&kasan_flag_enabled);
}
#else
-static inline kasan_enabled(void)
+static inline bool kasan_enabled(void)
{
return true;
}
@@ -236,7 +236,7 @@ void kasan_restore_multi_shot(bool enabl
#else /* CONFIG_KASAN */
-static inline kasan_enabled(void)
+static inline bool kasan_enabled(void)
{
return false;
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
kthread_worker-document-cpu-hotplug-handling-fix.patch
mm.patch
mm-swap_state-skip-meaningless-swap-cache-readahead-when-ra_infowin-==-0-fix.patch
mm-vmallocc-__vmalloc_area_node-avoid-32-bit-overflow.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
lib-test_bitmapc-add-for_each_set_clump-test-cases-checkpatch-fixes.patch
linux-next-rejects.patch
kasan-split-out-shadowc-from-commonc-fix.patch
kasan-mm-check-kasan_enabled-in-annotations-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
