diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-06-06 09:41:01 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-06-06 09:41:01 +0300 |
| commit | 5202e32db01c2249abff22060970e5a6aa4344b6 (patch) | |
| tree | 912636a99831a6514ffe29acfe99627ab7c4d4be /tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h | |
| parent | 3c89adb0d11117f64d5b501730be7fb2bf53a479 (diff) | |
| parent | f9652d5cae04eb5e85303c087f5842d320499c65 (diff) | |
| download | linux-5202e32db01c2249abff22060970e5a6aa4344b6.tar.xz | |
Merge tag 'linux-cpupower-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux
Pull cpupower updates for v4.18-rc1 from Shuah Khan:
"This cpupower update for 4.18-rc1 consists of two minor fixes."
* tag 'linux-cpupower-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
cpupower : Fix header name to read idle state name
cpupower: fix spelling mistake: "logilename" -> "logfilename"
Diffstat (limited to 'tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h')
| -rw-r--r-- | tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h index 9e43f3371fbc..2ae50b499e0a 100644 --- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h +++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h @@ -15,7 +15,16 @@ #define MONITORS_MAX 20 #define MONITOR_NAME_LEN 20 + +/* CSTATE_NAME_LEN is limited by header field width defined + * in cpupower-monitor.c. Header field width is defined to be + * sum of percent width and two spaces for padding. + */ +#ifdef __powerpc__ +#define CSTATE_NAME_LEN 7 +#else #define CSTATE_NAME_LEN 5 +#endif #define CSTATE_DESC_LEN 60 int cpu_count; |