diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-02-14 10:48:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-02-14 10:49:37 +0100 |
| commit | 4589f199eb68afd462bd792f730c7936fe3dafb5 (patch) | |
| tree | 3c12ca1431b72ec6746df4d8b99780a3ba0d5cc5 /scripts/mod | |
| parent | 03c11eb3b16dc0058589751dfd91f254be2be613 (diff) | |
| parent | 4461438a8405e800f90e0e40409e5f3d07eed381 (diff) | |
| download | linux-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.c | 2 |
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"); |