redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

cpupower: avoid multiple definition with gcc -fno-common 

[ Upstream commit 2de7fb60a4 ]

Building cpupower with -fno-common in CFLAGS results in errors due to
multiple definitions of the 'cpu_count' and 'start_time' variables.

./utils/idle_monitor/snb_idle.o:./utils/idle_monitor/cpupower-monitor.h:28:
multiple definition of `cpu_count';
./utils/idle_monitor/nhm_idle.o:./utils/idle_monitor/cpupower-monitor.h:28:
first defined here
...
./utils/idle_monitor/cpuidle_sysfs.o:./utils/idle_monitor/cpuidle_sysfs.c:22:
multiple definition of `start_time';
./utils/idle_monitor/amd_fam14h_idle.o:./utils/idle_monitor/amd_fam14h_idle.c:85:
first defined here

The -fno-common option will be enabled by default in GCC 10.

Bug: https://bugs.gentoo.org/707462
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
5.4-rM2-2.2.x-imx-squashed
Mike Gilbert 2020-02-26 14:33:59 -05:00 committed by Greg Kroah-Hartman
parent 7f9c2d71cf
commit dda4fca309
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
View File

@ -82,7 +82,7 @@ static struct pci_access *pci_acc;
static struct pci_dev *amd_fam14h_pci_dev;
static int nbp1_entered;
struct timespec start_time;
static struct timespec start_time;
static unsigned long long timediff;
#ifdef DEBUG

2
tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
View File

@ -19,7 +19,7 @@ struct cpuidle_monitor cpuidle_sysfs_monitor;
static unsigned long long **previous_count;
static unsigned long long **current_count;
struct timespec start_time;
static struct timespec start_time;
static unsigned long long timediff;
static int cpuidle_get_count_percent(unsigned int id, double *percent,

2
tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
View File

@ -27,6 +27,8 @@ struct cpuidle_monitor *all_monitors[] = {
0
};
int cpu_count;
static struct cpuidle_monitor *monitors[MONITORS_MAX];
static unsigned int avail_monitors;

2
tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
View File

@ -25,7 +25,7 @@
#endif
#define CSTATE_DESC_LEN 60
int cpu_count;
extern int cpu_count;
/* Hard to define the right names ...: */
enum power_range_e {