Skip to content

Commit 04019dc

Browse files
cyringcyring
committed
[Kernel][v7.1-rc1] Merge branch 'cppc_reference_perf'
2 parents ff98043 + 3149baa commit 04019dc

4 files changed

Lines changed: 22 additions & 9 deletions

File tree

‎aarch64/corefreqk.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2621,9 +2621,12 @@ static signed int Get_ACPI_CPPC_Registers(unsigned int cpu, void *arg)
26212621
.Minimum = CPPC_Caps.lowest_perf,
26222622
#endif
26232623
.Maximum = CPPC_Caps.highest_perf,
2624-
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
2624+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) \
2625+
&& LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0)
26252626
.Desired = CPPC_Perf.reference_perf,
2626-
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
2627+
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) \
2628+
&& LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0)) \
2629+
|| LINUX_VERSION_CODE >= KERNEL_VERSION(7, 0, 0)
26272630
.Desired = CPPC_Caps.reference_perf,
26282631
#else
26292632
.Desired = 0,

‎ppc64le/corefreqk.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,9 +1256,12 @@ static signed int Get_ACPI_CPPC_Registers(unsigned int cpu, void *arg)
12561256
.Minimum = CPPC_Caps.lowest_perf,
12571257
#endif
12581258
.Maximum = CPPC_Caps.highest_perf,
1259-
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
1259+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) \
1260+
&& LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0)
12601261
.Desired = CPPC_Perf.reference_perf,
1261-
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
1262+
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) \
1263+
&& LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0)) \
1264+
|| LINUX_VERSION_CODE >= KERNEL_VERSION(7, 0, 0)
12621265
.Desired = CPPC_Caps.reference_perf,
12631266
#else
12641267
.Desired = 0,

‎riscv64/corefreqk.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,9 +1263,12 @@ static signed int Get_ACPI_CPPC_Registers(unsigned int cpu, void *arg)
12631263
.Minimum = CPPC_Caps.lowest_perf,
12641264
#endif
12651265
.Maximum = CPPC_Caps.highest_perf,
1266-
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
1266+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) \
1267+
&& LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0)
12671268
.Desired = CPPC_Perf.reference_perf,
1268-
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
1269+
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) \
1270+
&& LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0)) \
1271+
|| LINUX_VERSION_CODE >= KERNEL_VERSION(7, 0, 0)
12691272
.Desired = CPPC_Caps.reference_perf,
12701273
#else
12711274
.Desired = 0,

‎x86_64/corefreqk.c‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4279,9 +4279,12 @@ static signed int Get_ACPI_CPPC_Registers(unsigned int cpu, void *arg)
42794279
.Minimum = CPPC_Caps.lowest_perf,
42804280
#endif
42814281
.Maximum = CPPC_Caps.highest_perf,
4282-
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
4282+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) \
4283+
&& LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0)
42834284
.Desired = CPPC_Perf.reference_perf,
4284-
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
4285+
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) \
4286+
&& LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0)) \
4287+
|| LINUX_VERSION_CODE >= KERNEL_VERSION(7, 0, 0)
42854288
.Desired = CPPC_Caps.reference_perf,
42864289
#else
42874290
.Desired = 0,
@@ -8628,7 +8631,8 @@ static signed int Put_ACPI_CPPC_Registers(unsigned int cpu, void *arg)
86288631
#else
86298632
.min_perf = CPPC_Caps.lowest_perf,
86308633
#endif
8631-
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
8634+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) \
8635+
&& LINUX_VERSION_CODE < KERNEL_VERSION(7, 0, 0)
86328636
.desired_perf = CPPC_Perf.reference_perf
86338637
#else
86348638
.desired_perf = CPPC_Caps.reference_perf

0 commit comments

Comments
 (0)