Gitlab 现已全面支持 git over ssh 与 git over https。通过 HTTPS 访问请配置带有 read_repository / write_repository 权限的 Personal access token。通过 SSH 端口访问请使用 22 端口或 13389 端口。如果使用CAS注册了账户但不知道密码，可以自行至设置中更改；如有其他问题，请发邮件至 service@cra.moe 寻求协助。

Commit 2de7fb60 authored Feb 26, 2020 by Mike Gilbert Committed by Shuah Khan Mar 02, 2020

cpupower: avoid multiple definition with gcc -fno-common

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>

parent bb6d3fb3

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -82,7 +82,7 @@ static struct pci_access *pci_acc;
	static struct pci_dev *amd_fam14h_pci_dev;		static struct pci_dev *amd_fam14h_pci_dev;
	static int nbp1_entered;		static int nbp1_entered;

	struct timespec start_time;		static struct timespec start_time;
	static unsigned long long timediff;		static unsigned long long timediff;

	#ifdef DEBUG		#ifdef DEBUG

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

+1 −1

Original line number	Original line	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 **previous_count;
	static unsigned long long **current_count;		static unsigned long long **current_count;
	struct timespec start_time;		static struct timespec start_time;
	static unsigned long long timediff;		static unsigned long long timediff;

	static int cpuidle_get_count_percent(unsigned int id, double *percent,		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	Original line	Diff line number	Diff line
	@@ -27,6 +27,8 @@ struct cpuidle_monitor *all_monitors[] = {
	0		0
	};		};

			int cpu_count;

	static struct cpuidle_monitor *monitors[MONITORS_MAX];		static struct cpuidle_monitor *monitors[MONITORS_MAX];
	static unsigned int avail_monitors;		static unsigned int avail_monitors;

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,7 @@
	#endif		#endif
	#define CSTATE_DESC_LEN 60		#define CSTATE_DESC_LEN 60

	int cpu_count;		extern int cpu_count;

	/* Hard to define the right names ...: */		/* Hard to define the right names ...: */
	enum power_range_e {		enum power_range_e {

CRA Git | Maintained and supported by SUSTech CRA and CCSE