aboutsummaryrefslogtreecommitdiff
path: root/scripts/mod
diff options
context:
space:
mode:
authorGravatar Ingo Molnar <mingo@kernel.org> 2024-02-14 10:48:28 +0100
committerGravatar Ingo Molnar <mingo@kernel.org> 2024-02-14 10:49:37 +0100
commit4589f199eb68afd462bd792f730c7936fe3dafb5 (patch)
tree3c12ca1431b72ec6746df4d8b99780a3ba0d5cc5 /scripts/mod
parentMerge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the br... (diff)
parentx86/retpoline: Ensure default return thunk isn't used at runtime (diff)
downloadlinux-4589f199eb68afd462bd792f730c7936fe3dafb5.tar.gz
linux-4589f199eb68afd462bd792f730c7936fe3dafb5.tar.bz2
linux-4589f199eb68afd462bd792f730c7936fe3dafb5.zip
Merge branch 'x86/bugs' into x86/core, to pick up pending changes before dependent patches
Merge in pending alternatives patching infrastructure changes, before applying more patches. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/mod')
-rw-r--r--scripts/mod/modpost.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 267b9a0a3abc..bf7c4b4b5ff4 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1848,7 +1848,7 @@ static void add_header(struct buffer *b, struct module *mod)
buf_printf(b,
"\n"
- "#ifdef CONFIG_RETPOLINE\n"
+ "#ifdef CONFIG_MITIGATION_RETPOLINE\n"
"MODULE_INFO(retpoline, \"Y\");\n"
"#endif\n");