diff options
| author | Mark Brown <broonie@kernel.org> | 2020-12-28 14:16:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-28 14:16:53 +0000 |
| commit | f81325a05e9317f09a2e4ec57a52e4e49eb42b54 (patch) | |
| tree | a5a91589c9ef8e212f2899f1462cfb5c3f0130ef /include/linux/moduleloader.h | |
| parent | 671ee4db952449acde126965bf76817a3159040d (diff) | |
| parent | 5c8fe583cce542aa0b84adc939ce85293de36e5e (diff) | |
| download | cachepc-linux-f81325a05e9317f09a2e4ec57a52e4e49eb42b54.tar.gz cachepc-linux-f81325a05e9317f09a2e4ec57a52e4e49eb42b54.zip | |
Merge tag 'v5.11-rc1' into asoc-5.11
Linux 5.11-rc1
Diffstat (limited to 'include/linux/moduleloader.h')
| -rw-r--r-- | include/linux/moduleloader.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h index 4fa67a8b2265..9e09d11ffe5b 100644 --- a/include/linux/moduleloader.h +++ b/include/linux/moduleloader.h @@ -96,7 +96,8 @@ void module_arch_cleanup(struct module *mod); /* Any cleanup before freeing mod->module_init */ void module_arch_freeing_init(struct module *mod); -#if defined(CONFIG_KASAN) && !defined(CONFIG_KASAN_VMALLOC) +#if (defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)) && \ + !defined(CONFIG_KASAN_VMALLOC) #include <linux/kasan.h> #define MODULE_ALIGN (PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT) #else |