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 /net/sched | |
| parent | 03c11eb3b16dc0058589751dfd91f254be2be613 (diff) | |
| parent | 4461438a8405e800f90e0e40409e5f3d07eed381 (diff) | |
| download | linux-4589f199eb68afd462bd792f730c7936fe3dafb5.tar.gz | |
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 'net/sched')
| -rw-r--r-- | net/sched/sch_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 36b025cc4fd26..87f6e3c6daa86 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -2410,7 +2410,7 @@ static struct pernet_operations psched_net_ops = { .exit = psched_net_exit, }; -#if IS_ENABLED(CONFIG_RETPOLINE) +#if IS_ENABLED(CONFIG_MITIGATION_RETPOLINE) DEFINE_STATIC_KEY_FALSE(tc_skip_wrapper); #endif |