diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-18 22:33:50 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-18 22:33:50 +0100 |
| commit | 21f6bed4c5d547b980864fc8b2a1b427656fc277 (patch) | |
| tree | 75a89aef667fad8e8886a852e42bf38c1ce50f55 /kernel-s390x-fedora.config | |
| parent | c7bf71da500a033912e796e04a1fb69f99672f1b (diff) | |
| parent | 34e72e260d2243c99f47241939d53c9ca746b617 (diff) | |
| download | kernel-21f6bed4c5d547b980864fc8b2a1b427656fc277.tar.gz kernel-21f6bed4c5d547b980864fc8b2a1b427656fc277.tar.xz kernel-21f6bed4c5d547b980864fc8b2a1b427656fc277.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.5.0-0.rc2.git2.1.vanilla.knurd.1.fc31
Diffstat (limited to 'kernel-s390x-fedora.config')
| -rw-r--r-- | kernel-s390x-fedora.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 9262ddacb..a4f28e711 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -777,6 +777,7 @@ CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONSOLE_LOGLEVEL_QUIET=3 CONFIG_CONTEXT_SWITCH_TRACER=y +# CONFIG_CONTEXT_TRACKING_FORCE is not set CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_CORTINA_PHY=m @@ -803,7 +804,7 @@ CONFIG_CPU_FREQ=y # CONFIG_CPU_IDLE_GOV_LADDER is not set # CONFIG_CPU_IDLE_GOV_TEO is not set # CONFIG_CPU_IDLE is not set -# CONFIG_CPU_ISOLATION is not set +CONFIG_CPU_ISOLATION=y CONFIG_CPUMASK_OFFSTACK=y CONFIG_CPUSETS=y # CONFIG_CPU_THERMAL is not set |