diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-07-15 11:43:45 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-07-15 11:43:45 +0200 |
| commit | f43b738b33b04c2cbadcbaa704922491e54fe739 (patch) | |
| tree | 92a08066a1d515dafdd4959755834c6f05593e5b /kernel-x86_64-fedora.config | |
| parent | 2eefdb322ecbf26d2cff213e0b5bef6c473c7551 (diff) | |
| parent | bc7c58aaf5a029a445cccee79f1471e456037f2f (diff) | |
| download | kernel-f43b738b33b04c2cbadcbaa704922491e54fe739.tar.gz kernel-f43b738b33b04c2cbadcbaa704922491e54fe739.tar.xz kernel-f43b738b33b04c2cbadcbaa704922491e54fe739.zip | |
Merge remote-tracking branch 'origin/f36' into f36-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-x86_64-fedora.config')
| -rw-r--r-- | kernel-x86_64-fedora.config | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 1356bcdc4..1a389e88a 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1008,6 +1008,8 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_THERMAL=y CONFIG_CPU_FREQ=y # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set +CONFIG_CPU_IBPB_ENTRY=y +CONFIG_CPU_IBRS_ENTRY=y CONFIG_CPU_IDLE_GOV_HALTPOLL=y # CONFIG_CPU_IDLE_GOV_LADDER is not set # CONFIG_CPU_IDLE_GOV_TEO is not set @@ -1017,6 +1019,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPUMASK_OFFSTACK=y CONFIG_CPUSETS=y # CONFIG_CPU_THERMAL is not set +CONFIG_CPU_UNRET_ENTRY=y # CONFIG_CRAMFS is not set # CONFIG_CRAMFS_MTD is not set CONFIG_CRASH_DUMP=y @@ -5216,6 +5219,7 @@ CONFIG_REMOTEPROC=y # CONFIG_RESET_INTEL_GW is not set # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RESOURCE_KUNIT_TEST is not set +CONFIG_RETHUNK=y CONFIG_RETPOLINE=y # CONFIG_RFD77402 is not set # CONFIG_RFD_FTL is not set @@ -6592,6 +6596,7 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m # CONFIG_SPI_ALTERA is not set |