SHA256
1
0
forked from pool/cpupower

Accepting request 531730 from home:jmoellers:branches:hardware

OBS-URL: https://build.opensuse.org/request/show/531730
OBS-URL: https://build.opensuse.org/package/show/hardware/cpupower?expand=0&rev=67
This commit is contained in:
Josef Möllers 2017-10-05 14:08:00 +00:00 committed by Git OBS Bridge
parent 33d8b08f68
commit 88eeebbf14
3 changed files with 24 additions and 0 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Oct 5 12:02:46 UTC 2017 - josef.moellers@suse.com
- Enter decode_misc_enable_msr() only if genuine_intel.
[bsc#1048546,
turbostat_decode_MSR_IA32_MISC_ENABLE_only_on_Intel.patch]
-------------------------------------------------------------------
Wed May 3 11:13:53 UTC 2017 - trenn@suse.de

View File

@ -33,6 +33,8 @@ Source2: cpupower_export_tarball_from_git.sh
Patch20: turbostat_fix_man_perm.patch
Patch22: turbostat_makefile_fix_asm_header.patch
# Fixes bsc#1048546:
Patch23: turbostat_decode_MSR_IA32_MISC_ENABLE_only_on_Intel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gettext-tools
BuildRequires: pciutils
@ -80,6 +82,7 @@ powersave module.
cd ../turbostat-%{tsversion}
%patch20 -p1
%patch22 -p1
%patch23 -p1
%build
# This package failed when testing with -Wl,-as-needed being default.

View File

@ -0,0 +1,14 @@
Index: turbostat-17.04.12/turbostat.c
===================================================================
--- turbostat-17.04.12.orig/turbostat.c
+++ turbostat-17.04.12/turbostat.c
@@ -3895,6 +3895,9 @@ void decode_misc_enable_msr(void)
{
unsigned long long msr;
+ if (!genuine_intel)
+ return;
+
if (!get_msr(base_cpu, MSR_IA32_MISC_ENABLE, &msr))
fprintf(outf, "cpu%d: MSR_IA32_MISC_ENABLE: 0x%08llx (%sTCC %sEIST %sMWAIT %sPREFETCH %sTURBO)\n",
base_cpu, msr,