diff options
| author | Mark Brown <broonie@kernel.org> | 2021-06-09 11:52:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-06-09 11:52:35 +0100 |
| commit | c441bfb5f2866de71e092c1b9d866a65978dfe1a (patch) | |
| tree | 51aca8f1e4b2de5819d4b83a4646f8448de75546 /include/linux/init.h | |
| parent | bcc0f0c078771e983a7e602eb14efa02f811445f (diff) | |
| parent | c4681547bcce777daf576925a966ffa824edd09d (diff) | |
| download | cachepc-linux-c441bfb5f2866de71e092c1b9d866a65978dfe1a.tar.gz cachepc-linux-c441bfb5f2866de71e092c1b9d866a65978dfe1a.zip | |
Merge tag 'v5.13-rc3' into asoc-5.13
Linux 5.13-rc3
Diffstat (limited to 'include/linux/init.h')
| -rw-r--r-- | include/linux/init.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index 31f54de58429..045ad1650ed1 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -47,7 +47,7 @@ /* These are for everybody (although not all archs will actually discard it in modules) */ -#define __init __section(".init.text") __cold __latent_entropy __noinitretpoline +#define __init __section(".init.text") __cold __latent_entropy __noinitretpoline __nocfi #define __initdata __section(".init.data") #define __initconst __section(".init.rodata") #define __exitdata __section(".exit.data") @@ -220,8 +220,8 @@ extern bool initcall_debug; __initcall_name(initstub, __iid, id) #define __define_initcall_stub(__stub, fn) \ - int __init __stub(void); \ - int __init __stub(void) \ + int __init __cficanonical __stub(void); \ + int __init __cficanonical __stub(void) \ { \ return fn(); \ } \ |