diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-01-07 12:45:42 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-01-07 12:45:42 -0500 |
| commit | f5e13a9223c4f8e3e8fb11636a7623958beac293 (patch) | |
| tree | 3221de2ed19334bfea3dbaf411f6f9602c672944 | |
| parent | e058acab450e054f8cab5b5730f4feefaaf8e6bf (diff) | |
| download | kernel-f5e13a9223c4f8e3e8fb11636a7623958beac293.tar.gz kernel-f5e13a9223c4f8e3e8fb11636a7623958beac293.tar.xz kernel-f5e13a9223c4f8e3e8fb11636a7623958beac293.zip | |
Enable POWERCAP and INTEL_RAPL
| -rw-r--r-- | config-generic | 2 | ||||
| -rw-r--r-- | config-x86-generic | 1 | ||||
| -rw-r--r-- | kernel.spec | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/config-generic b/config-generic index 27edd891..c3f8d1e0 100644 --- a/config-generic +++ b/config-generic @@ -5192,7 +5192,7 @@ CONFIG_FMC_CHARDEV=m # CONFIG_GENWQE is not set -# CONFIG_POWERCAP is not set +CONFIG_POWERCAP=y # CONFIG_THUNDERBOLT is not set # CONFIG_HSI is not set diff --git a/config-x86-generic b/config-x86-generic index 686972fd..1d392375 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -488,6 +488,7 @@ CONFIG_PINCTRL_BAYTRAIL=y CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_ACPI_INT3403_THERMAL=m CONFIG_INTEL_SOC_DTS_THERMAL=m +CONFIG_INTEL_RAPL=m CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m diff --git a/kernel.spec b/kernel.spec index ecf08241..35f9c0e2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2347,6 +2347,9 @@ fi # ||----w | # || || %changelog +* Wed Jan 07 2015 Josh Boyer <jwboyer@fedoraproject.org> +- Enable POWERCAP and INTEL_RAPL + * Tue Jan 06 2015 Josh Boyer <jwboyer@fedoraproject.org> - CVE-2014-9419 partial ASLR bypass through TLS base addr leak (rhbz 1177260 1177263) - CVE-2014-9428 remote DoS via batman-adv (rhbz 1178826 1178833) |