| From 3fb25be83f9acaa10e6e1cea7a52e9e06983b1b8 Mon Sep 17 00:00:00 2001 |
| From: Nathan Chancellor <natechancellor@gmail.com> |
| Date: Fri, 27 Sep 2019 09:26:42 -0700 |
| Subject: [PATCH] tools/power/cpupower: Fix initializer override in |
| hsw_ext_cstates |
| |
| commit 7e5705c635ecfccde559ebbbe1eaf05b5cc60529 upstream. |
| |
| When building cpupower with clang, the following warning appears: |
| |
| utils/idle_monitor/hsw_ext_idle.c:42:16: warning: initializer overrides |
| prior initialization of this subobject [-Winitializer-overrides] |
| .desc = N_("Processor Package C2"), |
| ^~~~~~~~~~~~~~~~~~~~~~ |
| ./utils/helpers/helpers.h:25:33: note: expanded from macro 'N_' |
| #define N_(String) gettext_noop(String) |
| ^~~~~~ |
| ./utils/helpers/helpers.h:23:30: note: expanded from macro |
| 'gettext_noop' |
| #define gettext_noop(String) String |
| ^~~~~~ |
| utils/idle_monitor/hsw_ext_idle.c:41:16: note: previous initialization |
| is here |
| .desc = N_("Processor Package C9"), |
| ^~~~~~~~~~~~~~~~~~~~~~ |
| ./utils/helpers/helpers.h:25:33: note: expanded from macro 'N_' |
| #define N_(String) gettext_noop(String) |
| ^~~~~~ |
| ./utils/helpers/helpers.h:23:30: note: expanded from macro |
| 'gettext_noop' |
| #define gettext_noop(String) String |
| ^~~~~~ |
| 1 warning generated. |
| |
| This appears to be a copy and paste or merge mistake because the name |
| and id fields both have PC9 in them, not PC2. Remove the second |
| assignment to fix the warning. |
| |
| Fixes: 7ee767b69b68 ("cpupower: Add Haswell family 0x45 specific idle monitor to show PC8,9,10 states") |
| Link: https://github.com/ClangBuiltLinux/linux/issues/718 |
| Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> |
| Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c b/tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c |
| index 7c7451d3f494..58dbdfd4fa13 100644 |
| --- a/tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c |
| +++ b/tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c |
| @@ -39,7 +39,6 @@ static cstate_t hsw_ext_cstates[HSW_EXT_CSTATE_COUNT] = { |
| { |
| .name = "PC9", |
| .desc = N_("Processor Package C9"), |
| - .desc = N_("Processor Package C2"), |
| .id = PC9, |
| .range = RANGE_PACKAGE, |
| .get_count_percent = hsw_ext_get_count_percent, |
| -- |
| 2.7.4 |
| |
