diff options
| author | Mark Brown <[email protected]> | 2022-10-19 16:37:01 +0100 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2022-10-19 16:37:01 +0100 |
| commit | 008f05a72d32dcc14038801649ec67af765fcc3c (patch) | |
| tree | c958a2ab7039ea3e03621b1cbae4fcad41ee947c /include/linux/module.h | |
| parent | 32def55d237e8507d4eb8442628fc2e59a899ea0 (diff) | |
| parent | df496157a5afa1b6d1f4c46ad6549c2c346d1e59 (diff) | |
ASoC: jz4752b: Capture fixes
Merge series from Siarhei Volkau <[email protected]>:
The patchset fixes:
- Line In path stays powered off during capturing or
bypass to mixer.
- incorrectly represented dB values in alsamixer, et al.
- incorrect represented Capture input selector in alsamixer
in Playback tab.
- wrong control selected as Capture Master
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 518296ea7f73..ec61fb53979a 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -27,7 +27,6 @@ #include <linux/tracepoint-defs.h> #include <linux/srcu.h> #include <linux/static_call_types.h> -#include <linux/cfi.h> #include <linux/percpu.h> #include <asm/module.h> @@ -132,7 +131,7 @@ extern void cleanup_module(void); { return initfn; } \ int init_module(void) __copy(initfn) \ __attribute__((alias(#initfn))); \ - __CFI_ADDRESSABLE(init_module, __initdata); + ___ADDRESSABLE(init_module, __initdata); /* This is only required if you want to be unloadable. */ #define module_exit(exitfn) \ @@ -140,7 +139,7 @@ extern void cleanup_module(void); { return exitfn; } \ void cleanup_module(void) __copy(exitfn) \ __attribute__((alias(#exitfn))); \ - __CFI_ADDRESSABLE(cleanup_module, __exitdata); + ___ADDRESSABLE(cleanup_module, __exitdata); #endif @@ -387,8 +386,9 @@ struct module { const s32 *crcs; unsigned int num_syms; -#ifdef CONFIG_CFI_CLANG - cfi_check_fn cfi_check; +#ifdef CONFIG_ARCH_USES_CFI_TRAPS + s32 *kcfi_traps; + s32 *kcfi_traps_end; #endif /* Kernel parameters. */ |