linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Mike Gilbert <floppym@gentoo.org>,
	Shuah Khan <skhan@linuxfoundation.org>,
	Sasha Levin <sashal@kernel.org>,
	linux-pm@vger.kernel.org
Subject: [PATCH AUTOSEL 4.19 09/37] cpupower: avoid multiple definition with gcc -fno-common
Date: Wed, 18 Mar 2020 16:54:41 -0400	[thread overview]
Message-ID: <20200318205509.17053-9-sashal@kernel.org> (raw)
In-Reply-To: <20200318205509.17053-1-sashal@kernel.org>

From: Mike Gilbert <floppym@gentoo.org>

[ Upstream commit 2de7fb60a4740135e03cf55c1982e393ccb87b6b ]

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>
---
 tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c  | 2 +-
 tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c    | 2 +-
 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c | 2 ++
 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
index 2116df9ad8325..c097a3748674f 100644
--- a/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
+++ b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
@@ -83,7 +83,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
diff --git a/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c b/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
index 5b8c4956ff9a1..85a8f0cc01a19 100644
--- a/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
+++ b/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
@@ -21,7 +21,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,
diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
index 051da0a7c4548..4a27c55d50d80 100644
--- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
+++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
@@ -29,6 +29,8 @@ struct cpuidle_monitor *all_monitors[] = {
 0
 };
 
+int cpu_count;
+
 static struct cpuidle_monitor *monitors[MONITORS_MAX];
 static unsigned int avail_monitors;
 
diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
index 2ae50b499e0a6..06b3cd6de0180 100644
--- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
+++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
@@ -27,7 +27,7 @@
 #endif
 #define CSTATE_DESC_LEN 60
 
-int cpu_count;
+extern int cpu_count;
 
 /* Hard to define the right names ...: */
 enum power_range_e {
-- 
2.20.1


  parent reply	other threads:[~2020-03-18 21:04 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-18 20:54 [PATCH AUTOSEL 4.19 01/37] cgroup-v1: cgroup_pidlist_next should update position index Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 02/37] cgroup: Iterate tasks that did not finish do_exit() Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 03/37] batman-adv: Don't schedule OGM for disabled interface Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 04/37] pinctrl: meson-gxl: fix GPIOX sdio pins Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 05/37] nfs: add minor version to nfs_server_key for fscache Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 06/37] pinctrl: core: Remove extra kref_get which blocks hogs being freed Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 07/37] r8152: check disconnect status after long sleep Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 08/37] bnxt_en: reinitialize IRQs when MTU is modified Sasha Levin
2020-03-18 20:54 ` Sasha Levin [this message]
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 10/37] fib: add missing attribute validation for tun_id Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 11/37] can: add missing attribute validation for termination Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 12/37] macsec: add missing attribute validation for port Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 13/37] team: add missing attribute validation for port ifindex Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 14/37] team: add missing attribute validation for array index Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 15/37] netfilter: cthelper: add missing attribute validation for cthelper Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 16/37] netfilter: nft_payload: add missing attribute validation for payload csum flags Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 17/37] netfilter: nft_tunnel: add missing attribute validation for tunnels Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 18/37] drivers/of/of_mdio.c:fix of_mdiobus_register() Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 19/37] cgroup1: don't call release_agent when it is "" Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 20/37] dt-bindings: net: FMan erratum A050385 Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 21/37] arm64: dts: ls1043a: " Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 22/37] fsl/fman: detect " Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 23/37] virtio-blk: fix hw_queue stopped on arbitrary error Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 24/37] ipvlan: do not add hardware address of master to its unicast filter list Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 25/37] net: stmmac: dwmac1000: Disable ACS if enhanced descs are not used Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 26/37] ipvlan: don't deref eth hdr before checking it's set Sasha Levin
2020-03-18 20:54 ` [PATCH AUTOSEL 4.19 27/37] ipvlan: add cond_resched_rcu() while processing muticast backlog Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.19 28/37] ipvlan: do not use cond_resched_rcu() in ipvlan_process_multicast() Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.19 29/37] i2c: gpio: suppress error on probe defer Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.19 30/37] s390/qeth: handle error when backing RX buffer Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.19 31/37] scsi: ipr: Fix softlockup when rescanning devices in petitboot Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.19 32/37] mac80211: Do not send mesh HWMP PREQ if HWMP is disabled Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.19 33/37] dpaa_eth: Remove unnecessary boolean expression in dpaa_get_headroom Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.19 34/37] sxgbe: Fix off by one in samsung driver strncpy size arg Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.19 35/37] net: systemport: fix index check to avoid an array out of bounds access Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.19 36/37] iommu/vt-d: quirk_ioat_snb_local_iommu: replace WARN_TAINT with pr_warn + add_taint Sasha Levin
2020-03-18 20:55 ` [PATCH AUTOSEL 4.19 37/37] iommu/vt-d: Fix the wrong printing in RHSA parsing Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200318205509.17053-9-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=floppym@gentoo.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=skhan@linuxfoundation.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).