| 1 |
commit: 496e70b91eb471600da511d058d5f507d170c1de |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Sat Jun 4 18:49:01 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 4 20:38:45 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=496e70b9 |
| 7 |
|
| 8 |
sys-power/cpupower: remove unused patch |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/25754 |
| 13 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-power/cpupower/files/cpupower-5.4-gcc-10.patch | 57 ---------------------- |
| 16 |
1 file changed, 57 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-power/cpupower/files/cpupower-5.4-gcc-10.patch b/sys-power/cpupower/files/cpupower-5.4-gcc-10.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 56540d2bc562..000000000000 |
| 21 |
--- a/sys-power/cpupower/files/cpupower-5.4-gcc-10.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,57 +0,0 @@ |
| 24 |
-From 8db4ea3227554fb80ad766936a4c21cc901beb29 Mon Sep 17 00:00:00 2001 |
| 25 |
-From: Mike Gilbert <floppym@g.o> |
| 26 |
-Date: Sat, 1 Feb 2020 12:44:30 -0500 |
| 27 |
-Subject: [PATCH] cpupower: avoid multiple definition with gcc -fno-common |
| 28 |
- |
| 29 |
-The -fno-common option will be enabled by default in GCC 10. |
| 30 |
- |
| 31 |
-Bug: https://bugs.gentoo.org/707462 |
| 32 |
-Signed-off-by: Mike Gilbert <floppym@g.o> |
| 33 |
---- |
| 34 |
- tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c | 2 +- |
| 35 |
- tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c | 2 ++ |
| 36 |
- tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h | 2 +- |
| 37 |
- 3 files changed, 4 insertions(+), 2 deletions(-) |
| 38 |
- |
| 39 |
-diff --git a/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c |
| 40 |
-index 33dc34db4f3c..1b69f25a1281 100644 |
| 41 |
---- a/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c |
| 42 |
-+++ b/tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c |
| 43 |
-@@ -82,7 +82,7 @@ static struct pci_access *pci_acc; |
| 44 |
- static struct pci_dev *amd_fam14h_pci_dev; |
| 45 |
- static int nbp1_entered; |
| 46 |
- |
| 47 |
--struct timespec start_time; |
| 48 |
-+extern struct timespec start_time; |
| 49 |
- static unsigned long long timediff; |
| 50 |
- |
| 51 |
- #ifdef DEBUG |
| 52 |
-diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c |
| 53 |
-index 6d44fec55ad5..7c77045fef52 100644 |
| 54 |
---- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c |
| 55 |
-+++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c |
| 56 |
-@@ -27,6 +27,8 @@ struct cpuidle_monitor *all_monitors[] = { |
| 57 |
- 0 |
| 58 |
- }; |
| 59 |
- |
| 60 |
-+int cpu_count; |
| 61 |
-+ |
| 62 |
- static struct cpuidle_monitor *monitors[MONITORS_MAX]; |
| 63 |
- static unsigned int avail_monitors; |
| 64 |
- |
| 65 |
-diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h |
| 66 |
-index 5b5eb1da0cce..c559d3115330 100644 |
| 67 |
---- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h |
| 68 |
-+++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h |
| 69 |
-@@ -25,7 +25,7 @@ |
| 70 |
- #endif |
| 71 |
- #define CSTATE_DESC_LEN 60 |
| 72 |
- |
| 73 |
--int cpu_count; |
| 74 |
-+extern int cpu_count; |
| 75 |
- |
| 76 |
- /* Hard to define the right names ...: */ |
| 77 |
- enum power_range_e { |
| 78 |
--- |
| 79 |
-2.25.0 |
| 80 |
- |
Archives