|
0 |
From: Dmitry Shachnev <mitya57@debian.org>
|
|
1 |
Date: Tue, 7 May 2019 18:08:35 +0300
|
|
2 |
Subject: cpufreq: really fix build with kernel 5.1+
|
|
3 |
|
|
4 |
Bug-Upstream: https://gitlab.gnome.org/GNOME/gnome-applets/issues/9
|
|
5 |
---
|
|
6 |
cpufreq/src/cpufreq-monitor.c | 5 +++--
|
|
7 |
cpufreq/src/cpufreq-selector/cpufreq-selector.c | 5 +++--
|
|
8 |
2 files changed, 6 insertions(+), 4 deletions(-)
|
|
9 |
|
|
10 |
diff --git a/cpufreq/src/cpufreq-monitor.c b/cpufreq/src/cpufreq-monitor.c
|
|
11 |
index 680c9dc..21aed0f 100644
|
|
12 |
--- a/cpufreq/src/cpufreq-monitor.c
|
|
13 |
+++ b/cpufreq/src/cpufreq-monitor.c
|
|
14 |
@@ -30,13 +30,14 @@
|
|
15 |
#define CPUFREQ_MONITOR_INTERVAL 1
|
|
16 |
|
|
17 |
#ifdef HAVE_GET_FREQUENCIES
|
|
18 |
-typedef struct cpufreq_frequencies cpufreq_available_frequencies;
|
|
19 |
+typedef struct cpufreq_frequencies CPUFreqFrequencyList;
|
|
20 |
#define cpufreq_get_available_frequencies(cpu) cpufreq_get_frequencies ("available", cpu)
|
|
21 |
#define cpufreq_put_available_frequencies(first) cpufreq_put_frequencies (first)
|
|
22 |
+#else
|
|
23 |
+typedef struct cpufreq_available_frequencies CPUFreqFrequencyList;
|
|
24 |
#endif
|
|
25 |
|
|
26 |
typedef struct cpufreq_policy CPUFreqPolicy;
|
|
27 |
-typedef struct cpufreq_available_frequencies CPUFreqFrequencyList;
|
|
28 |
typedef struct cpufreq_available_governors CPUFreqGovernorList;
|
|
29 |
|
|
30 |
struct _CPUFreqMonitor
|
|
31 |
diff --git a/cpufreq/src/cpufreq-selector/cpufreq-selector.c b/cpufreq/src/cpufreq-selector/cpufreq-selector.c
|
|
32 |
index 855f247..edc93df 100644
|
|
33 |
--- a/cpufreq/src/cpufreq-selector/cpufreq-selector.c
|
|
34 |
+++ b/cpufreq/src/cpufreq-selector/cpufreq-selector.c
|
|
35 |
@@ -37,13 +37,14 @@ typedef enum
|
|
36 |
#define CPUFREQ_SELECTOR_ERROR cpufreq_selector_error_quark ()
|
|
37 |
|
|
38 |
#ifdef HAVE_GET_FREQUENCIES
|
|
39 |
-typedef struct cpufreq_frequencies cpufreq_available_frequencies;
|
|
40 |
+typedef struct cpufreq_frequencies CPUFreqFrequencyList;
|
|
41 |
#define cpufreq_get_available_frequencies(cpu) cpufreq_get_frequencies ("available", cpu)
|
|
42 |
#define cpufreq_put_available_frequencies(first) cpufreq_put_frequencies (first)
|
|
43 |
+#else
|
|
44 |
+typedef struct cpufreq_available_frequencies CPUFreqFrequencyList;
|
|
45 |
#endif
|
|
46 |
|
|
47 |
typedef struct cpufreq_policy CPUFreqPolicy;
|
|
48 |
-typedef struct cpufreq_available_frequencies CPUFreqFrequencyList;
|
|
49 |
typedef struct cpufreq_available_governors CPUFreqGovernorList;
|
|
50 |
|
|
51 |
struct _CPUFreqSelector
|