mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
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>
This commit is contained in:
parent
7f9c2d71cf
commit
dda4fca309
4 changed files with 5 additions and 3 deletions
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue