diff --git a/debian/changelog b/debian/changelog index 7040145e7..44594e06d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ linux (4.13~rc4-1~exp1) UNRELEASED; urgency=medium * New upstream release candidate + [ Ben Hutchings ] + * cpupower: Add/update definition of MSRHEADER macro for turbostat and + x86_energy_perf_policy + -- Ben Hutchings Sun, 13 Aug 2017 14:10:41 +0100 linux (4.12.6-1) unstable; urgency=medium 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"'