aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristen Carlson Accardi <kristen@linux.intel.com>2011-04-21 13:40:32 -0700
committerKristen Carlson Accardi <kristen@linux.intel.com>2011-04-21 14:48:58 -0700
commitc0887e0c619d879fa2ae35e8d7337d091da067dc (patch)
treede33db577f37b22a825fa57f63f80d76c8dedfa2
parent00215302bfe36b7d12d90a0dbcb9f1c78fec0861 (diff)
downloadpowertop-c0887e0c619d879fa2ae35e8d7337d091da067dc.tar.gz
Frequency stats reporting was broken on ARM platforms since power_entry on ARM includes the "dummy" field. Modified power_entry's structure definition to include dummy on all platforms except i386.
I have verified that with this fix in place, frequency stats reporting works correctly on an ARM as well as a 32-bit x86 platform. Signed-off-by: Sameer Nanda <snanda at chromium.org> Signed-off-by: Kristen Carlson Accardi <kristen@linux.intel.com>
-rw-r--r--cpu/cpu.cpp2
-rw-r--r--po/powertop.pot2
2 files changed, 2 insertions, 2 deletions
diff --git a/cpu/cpu.cpp b/cpu/cpu.cpp
index 2fcced8..0b6af82 100644
--- a/cpu/cpu.cpp
+++ b/cpu/cpu.cpp
@@ -745,7 +745,7 @@ void w_display_cpu_pstates(void)
struct power_entry {
-#ifdef __x86_64__
+#ifndef __i386__
int dummy;
#endif
int64_t type;
diff --git a/po/powertop.pot b/po/powertop.pot
index 0d2ef97..e9b75c5 100644
--- a/po/powertop.pot
+++ b/po/powertop.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-21 13:32-0700\n"
+"POT-Creation-Date: 2011-04-21 13:40-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"