diff mbox series

[GIT,PULL] cpupower update for Linux 5.6-rc6

Message ID fcbb3dc4-38ae-8361-bd6b-a00ae00c189c@linuxfoundation.org (mailing list archive)
State Mainlined, archived
Headers show
Series [GIT,PULL] cpupower update for Linux 5.6-rc6 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux tags/linux-cpupower-5.6-rc6

Commit Message

Shuah Khan March 7, 2020, 12:14 a.m. UTC
Hi Rafael,

Please pull the following cpupower update for Linux 5.6-rc6.

This cpupower update for Linux 5.6-rc6 consists of a fix from
Mike Gilbert for build failures when -fno-common is enabled.
-fno-common will be default in gcc v10.

Diff is attached.

thanks,
-- Shuah


----------------------------------------------------------------
The following changes since commit bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9:

   Linux 5.6-rc1 (2020-02-09 16:08:48 -0800)

are available in the Git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux 
tags/linux-cpupower-5.6-rc6

for you to fetch changes up to 2de7fb60a4740135e03cf55c1982e393ccb87b6b:

   cpupower: avoid multiple definition with gcc -fno-common (2020-03-02 
08:53:34 -0700)

----------------------------------------------------------------
linux-cpupower-5.6-rc6

This cpupower update for Linux 5.6-rc6 consists of a fix from
Mike Gilbert for build failures when -fno-common is enabled.
-fno-common will be default in gcc v10.

----------------------------------------------------------------
Mike Gilbert (1):
       cpupower: avoid multiple definition with gcc -fno-common

  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(-)
----------------------------------------------------------------

Comments

Rafael J. Wysocki March 10, 2020, 8:55 a.m. UTC | #1
Hi Shuah,

On Sat, Mar 7, 2020 at 1:14 AM Shuah Khan <skhan@linuxfoundation.org> wrote:
>
> Hi Rafael,
>
> Please pull the following cpupower update for Linux 5.6-rc6.
>
> This cpupower update for Linux 5.6-rc6 consists of a fix from
> Mike Gilbert for build failures when -fno-common is enabled.
> -fno-common will be default in gcc v10.
>
> Diff is attached.

Pulled, thanks!
diff mbox series

Patch

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 33dc34db4f3c..20f46348271b 100644
--- a/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
+++ b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
@@ -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
diff --git a/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c b/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
index 3c4cee160b0e..a65f7d011513 100644
--- a/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
+++ b/tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
@@ -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,
diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
index 6d44fec55ad5..7c77045fef52 100644
--- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
+++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
@@ -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;
 
diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
index 5b5eb1da0cce..c559d3115330 100644
--- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
+++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
@@ -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 {