[linux] 01/01: 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 sid
in repository linux.

commit 4895a85e769d51fd6b3aa1fcc689d9c6784582bc
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
    
    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 36bf73d..6388fc4 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 <ben at decadent.org.uk>  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 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