diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-01-07 20:51:39 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-01-07 20:51:39 +0300 |
| commit | 7b62275507232f01f66d3e7d05c77bbd9009b726 (patch) | |
| tree | 172dd8a7632877df2b623462bc871ab42e093bcc /include/linux/moduleloader.h | |
| parent | 91bc156817a3c2007332b64b4f85c32aafbbbea6 (diff) | |
| parent | 1f092d1c8819679d78a7d9c62a46d4939d217a9d (diff) | |
| download | linux-7b62275507232f01f66d3e7d05c77bbd9009b726.tar.xz | |
Merge tag 'asoc-fix-v5.11-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.11
A collection of mostly driver specific fixes, plus a maintainership
update for TI and a fix for DAPM driver removal paths.
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 |