[linux] 02/04: cpupower: Add/update definition of MSRHEADER macro for turbostat and x86_energy_perf_policy

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 58cec05a0ea38f525b6edf24ba464930245c6fab
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Aug 13 16:16:26 2017 +0100

    cpupower: Add/update definition of MSRHEADER macro for turbostat and x86_energy_perf_policy
---
 debian/changelog                                               | 4 ++++
 debian/rules.d/tools/power/x86/turbostat/Makefile              | 2 +-
 debian/rules.d/tools/power/x86/x86_energy_perf_policy/Makefile | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7040145..44594e0 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 <ben at decadent.org.uk>  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 2dfac1b..0e5a2a0 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='<asm/msr-index.h>' -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 6abb918..0011ca9 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"'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git