提交 78511edc 编写于 作者: L Linus Torvalds

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

Pull power management fix from Rafael Wysocki:
 "Fix cpupower utility build failures with -fno-common enabled (Mike
  Gilbert)"

* tag 'pm-5.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpupower: avoid multiple definition with gcc -fno-common
无相关合并请求
......@@ -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 {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册
反馈
建议
客服 返回
顶部