From 4895a85e769d51fd6b3aa1fcc689d9c6784582bc Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 13 Aug 2017 16:16:26 +0100 Subject: [PATCH] cpupower: Add/update definition of MSRHEADER macro for turbostat and x86_energy_perf_policy Closes: #872414 (cherry picked from commit 58cec05a0ea38f525b6edf24ba464930245c6fab) --- debian/changelog | 2 ++ debian/rules.d/tools/power/x86/turbostat/Makefile | 2 +- debian/rules.d/tools/power/x86/x86_energy_perf_policy/Makefile | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 36bf73d5a..6388fc4ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ linux (4.12.6-2) UNRELEASED; urgency=medium * [alpha] udeb: Add i2c-modules (fixes FTBFS) + * cpupower: Add/update definition of MSRHEADER macro for turbostat and + x86_energy_perf_policy (Closes: #872414) -- Ben Hutchings Mon, 14 Aug 2017 19:47:30 +0100 diff --git a/debian/rules.d/tools/power/x86/turbostat/Makefile b/debian/rules.d/tools/power/x86/turbostat/Makefile index 2dfac1b1c..0e5a2a0ec 100644 --- a/debian/rules.d/tools/power/x86/turbostat/Makefile +++ b/debian/rules.d/tools/power/x86/turbostat/Makefile @@ -4,4 +4,4 @@ installdir = /usr/sbin include $(top_rulesdir)/Makefile.inc -CPPFLAGS += -DMSRHEADER='' -DINTEL_FAMILY_HEADER='"$(top_srcdir)/arch/x86/include/asm/intel-family.h"' +CPPFLAGS += -DMSRHEADER='"$(top_srcdir)/arch/x86/include/asm/msr-index.h"' -DINTEL_FAMILY_HEADER='"$(top_srcdir)/arch/x86/include/asm/intel-family.h"' diff --git a/debian/rules.d/tools/power/x86/x86_energy_perf_policy/Makefile b/debian/rules.d/tools/power/x86/x86_energy_perf_policy/Makefile index 6abb9188a..0011ca945 100644 --- a/debian/rules.d/tools/power/x86/x86_energy_perf_policy/Makefile +++ b/debian/rules.d/tools/power/x86/x86_energy_perf_policy/Makefile @@ -3,3 +3,5 @@ PROGS = x86_energy_perf_policy installdir = /usr/sbin include $(top_rulesdir)/Makefile.inc + +CPPFLAGS += -DMSRHEADER='"$(top_srcdir)/arch/x86/include/asm/msr-index.h"'