On Fri, Sep 18, 2020 at 12:52 PM Marco Elver <elver@xxxxxxxxxx> wrote: > > On Tue, Sep 15, 2020 at 11:16PM +0200, Andrey Konovalov wrote: > [...] > > arch/s390/boot/string.c | 1 + > > arch/x86/boot/compressed/misc.h | 1 + > > 2 files changed, 2 insertions(+) > > > > diff --git a/arch/s390/boot/string.c b/arch/s390/boot/string.c > > index b11e8108773a..faccb33b462c 100644 > > --- a/arch/s390/boot/string.c > > +++ b/arch/s390/boot/string.c > > @@ -3,6 +3,7 @@ > > #include <linux/kernel.h> > > #include <linux/errno.h> > > #undef CONFIG_KASAN > > +#undef CONFIG_KASAN_GENERIC > > Is CONFIG_KASAN still used to guard instrumented versions of functions? > > It looks like #undef CONFIG_KASAN is no longer needed -- at least > <linux/string.h> no longer mentions it. I'm pretty sure this is still necessary (something didn't work when I forgot to make this change), but I'll check again.