diff --git a/powertop-2.7-baytrail-no-c7.patch b/powertop-2.7-baytrail-no-c7.patch new file mode 100644 index 0000000..d618198 --- /dev/null +++ b/powertop-2.7-baytrail-no-c7.patch @@ -0,0 +1,16 @@ +diff --git a/src/cpu/intel_cpus.cpp b/src/cpu/intel_cpus.cpp +index 167f1a7..e019484 100644 +--- a/src/cpu/intel_cpus.cpp ++++ b/src/cpu/intel_cpus.cpp +@@ -131,11 +131,6 @@ nhm_core::nhm_core(int model) + if (model == 0x37) { + has_c3_res = 0; + has_c1_res = 1; +- this->byt_has_ahci(); +- if ((this->get_byt_ahci_support()) == 0) +- has_c7_res = 1;/*BYT-T PC7 <- S0iX*/ +- else +- has_c7_res = 0; + } else { + has_c3_res = 1; + has_c1_res = 0; diff --git a/powertop.spec b/powertop.spec index 11a99d1..5c192f5 100644 --- a/powertop.spec +++ b/powertop.spec @@ -1,6 +1,6 @@ Name: powertop Version: 2.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Power consumption monitor Group: Applications/System @@ -16,6 +16,8 @@ Patch1: powertop-2.7-tunable-overflow-fix.patch Patch2: powertop-2.7-auto-tune-crash-fix.patch # Sent upstream, patch by Pierre-Yves Chibon Patch3: powertop-2.7-navigate-hint.patch +# Backported from upstream +Patch4: powertop-2.7-baytrail-no-c7.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext, ncurses-devel, pciutils-devel, zlib-devel, libnl3-devel BuildRequires: systemd @@ -33,6 +35,7 @@ computer use more power than necessary while it is idle. %patch1 -p1 -b .tunable-overfow-fix %patch2 -p1 -b .autotune-crash-fix %patch3 -p1 -b .navigate-hint +%patch4 -p1 -b .baytrail-no-c7 %build %configure @@ -73,6 +76,10 @@ rm -rf %{buildroot} %{_unitdir}/powertop.service %changelog +* Wed May 6 2015 Jaroslav Škarvada - 2.7-4 +- Fixed crash on Baytrail CPUs (by bytrail-no-c7 patch) + Resolves: rhbz#1208600 + * Wed Feb 11 2015 Jaroslav Škarvada - 2.7-3 - Added hint how to navigate through panes, (by navigate-hint patch) Resolves: rhbz#1191112