Commit bce74b1f authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'linux-cpupower-5.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux 

Pull cpupower utility fix for v5.6 from Shuah Khan:

"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."

* tag 'linux-cpupower-5.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
  cpupower: avoid multiple definition with gcc -fno-common
parents 2c523b34 2de7fb60

tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c

+1 −1
Original line number Diff line number Diff line
@@ -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

tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h

+1 −1
Original line number Diff line number Diff line
@@ -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 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE