diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-09-19 14:40:35 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-09-19 14:40:35 -0400 |
| commit | fe33fe10550ec372fe16ae955a179135c28ddd55 (patch) | |
| tree | f3ae487d6f0f699aa60567b52079f6694e49e128 | |
| parent | 7c202583fca7126ccd572e24f7193c9f8c21101a (diff) | |
| download | kernel-fe33fe10550ec372fe16ae955a179135c28ddd55.tar.gz kernel-fe33fe10550ec372fe16ae955a179135c28ddd55.tar.xz kernel-fe33fe10550ec372fe16ae955a179135c28ddd55.zip | |
Disable NO_HZ_FULL again
- Enable early microcode loading (rhbz 1083716)
| -rw-r--r-- | config-x86-generic | 4 | ||||
| -rw-r--r-- | config-x86_64-generic | 4 | ||||
| -rw-r--r-- | kernel.spec | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/config-x86-generic b/config-x86-generic index 98385cf05..768e8f061 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -10,10 +10,12 @@ CONFIG_HPET_TIMER=y CONFIG_I8K=m CONFIG_SONYPI_COMPAT=y -CONFIG_MICROCODE=m +CONFIG_MICROCODE=y +CONFIG_MICROCODE_EARLY=y CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_INTEL_EARLY=y CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_AMD_EARLY=y CONFIG_X86_MSR=y CONFIG_X86_CPUID=y diff --git a/config-x86_64-generic b/config-x86_64-generic index b2b3a7854..2f6155f66 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -184,10 +184,8 @@ CONFIG_SFC_MTD=y CONFIG_MTD_CHAR=m CONFIG_MTD_BLOCK=m -# CONFIG_NO_HZ_IDLE is not set CONFIG_NO_HZ_FULL=y # CONFIG_NO_HZ_IDLE is not set -CONFIG_NO_HZ_FULL=y -CONFIG_NO_HZ_FULL_ALL=y +# CONFIG_NO_HZ_FULL_ALL is not set # CONFIG_NO_HZ_FULL_SYSIDLE is not set # CONFIG_CONTEXT_TRACKING_FORCE is not set diff --git a/kernel.spec b/kernel.spec index 8b2f25c9f..874ea0a5c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -42,7 +42,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2215,6 +2215,10 @@ fi # ||----w | # || || %changelog +* Fri Sep 19 2014 Josh Boyer <jwboyer@fedoraproject.org> +- Disable NO_HZ_FULL again +- Enable early microcode loading (rhbz 1083716) + * Fri Sep 19 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc5.git4.1 - Linux v3.17-rc5-63-gd9773ceabfaf - Enable infiniband on s390x |