Content-Type: multipart/mixed; boundary="===============8419819391168275291==" MIME-Version: 1.0 From: Ivan Shapovalov Subject: [Powertop] [RFC] [PATCHv2 01/10] Fix includes: do not include intel_cpus.h inside cpu.h Date: Mon, 24 Dec 2012 03:08:43 +0400 Message-ID: <1356304132-3889-2-git-send-email-intelfx100@gmail.com> In-Reply-To: 1356304132-3889-1-git-send-email-intelfx100@gmail.com To: powertop@lists.01.org List-ID: --===============8419819391168275291== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable The file "cpu.h" is generic (unlike "intel_cpus.h"), so the existing order = seems illogical. Signed-off-by: Ivan Shapovalov --- src/cpu/cpu.cpp | 1 + src/cpu/cpu.h | 2 -- src/cpu/intel_cpus.cpp | 2 +- src/cpu/intel_cpus.h | 2 ++ src/cpu/intel_gpu.cpp | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp index 7f3af69..3314e82 100644 --- a/src/cpu/cpu.cpp +++ b/src/cpu/cpu.cpp @@ -31,6 +31,7 @@ #include #include "cpu.h" #include "cpudevice.h" +#include "intel_cpus.h" #include "../parameters/parameters.h" = #include "../perf/perf_bundle.h" diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 781e33c..2304cd5 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -215,8 +215,6 @@ public: = }; = -#include "intel_cpus.h" - extern void enumerate_cpus(void); = extern void report_display_cpu_pstates(void); diff --git a/src/cpu/intel_cpus.cpp b/src/cpu/intel_cpus.cpp index 19ad85c..d43e917 100644 --- a/src/cpu/intel_cpus.cpp +++ b/src/cpu/intel_cpus.cpp @@ -22,7 +22,7 @@ * Authors: * Arjan van de Ven */ -#include "cpu.h" +#include "intel_cpus.h" #include #include #include diff --git a/src/cpu/intel_cpus.h b/src/cpu/intel_cpus.h index 1949af1..a8bb892 100644 --- a/src/cpu/intel_cpus.h +++ b/src/cpu/intel_cpus.h @@ -25,6 +25,8 @@ #include #include = +#include "cpu.h" + = #define MSR_TSC 0x10 #define MSR_NEHALEM_PLATFORM_INFO 0xCE diff --git a/src/cpu/intel_gpu.cpp b/src/cpu/intel_gpu.cpp index 57474f1..e0f4ac2 100644 --- a/src/cpu/intel_gpu.cpp +++ b/src/cpu/intel_gpu.cpp @@ -22,7 +22,7 @@ * Authors: * Arjan van de Ven */ -#include "cpu.h" +#include "intel_cpus.h" #include #include #include -- = 1.8.0.2 --===============8419819391168275291==--