diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-18 17:35:02 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-18 17:35:02 +0100 |
commit | 723a64e10a4e23eba40af1c0b56e49955cc6799f (patch) | |
tree | 5deed4bd4afeb7b21bfaaa57d5161e8ae3d9d837 /kernel-x86_64-fedora.config | |
parent | dff20fd44fc496eaf2f3d53edfac28e4f2284cb8 (diff) | |
parent | fd9011d43a02cf5bf091d387510cb00f912965ee (diff) | |
download | kernel-723a64e10a4e23eba40af1c0b56e49955cc6799f.tar.gz kernel-723a64e10a4e23eba40af1c0b56e49955cc6799f.tar.xz kernel-723a64e10a4e23eba40af1c0b56e49955cc6799f.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc1.20211118git42eb8fdac2fc.16.vanilla.1.fc35
Diffstat (limited to 'kernel-x86_64-fedora.config')
-rw-r--r-- | kernel-x86_64-fedora.config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 6c8796cd8..2cbfd5f01 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -4997,12 +4997,15 @@ CONFIG_PPS_CLIENT_PARPORT=m # CONFIG_PPS_DEBUG is not set CONFIG_PPS=y CONFIG_PPTP=m +# CONFIG_PREEMPT_BEHAVIOUR is not set CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPTIRQ_EVENTS is not set # CONFIG_PREEMPT is not set +# CONFIG_PREEMPT_NONE_BEHAVIOUR is not set # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_TRACER is not set +CONFIG_PREEMPT_VOLUNTARY_BEHAVIOUR=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m |