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 /include/net/tc_wrapper.h | |
| parent | Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branch (diff) | |
| parent | x86/retpoline: Ensure default return thunk isn't used at runtime (diff) | |
| download | wireguard-linux-4589f199eb68afd462bd792f730c7936fe3dafb5.tar.xz wireguard-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 'include/net/tc_wrapper.h')
| -rw-r--r-- | include/net/tc_wrapper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/tc_wrapper.h b/include/net/tc_wrapper.h index a608546bcefc..ffe58a02537c 100644 --- a/include/net/tc_wrapper.h +++ b/include/net/tc_wrapper.h @@ -4,7 +4,7 @@ #include <net/pkt_cls.h> -#if IS_ENABLED(CONFIG_RETPOLINE) +#if IS_ENABLED(CONFIG_MITIGATION_RETPOLINE) #include <linux/cpufeature.h> #include <linux/static_key.h> |