|
1 | 1 | From: LiqXanMod Project <liqxanmod@example.com> |
2 | | -Subject: [PATCH 3/3] liqxanmod: deduplicate sched_nr_latency definition |
| 2 | +Subject: [PATCH 3/3] liqxanmod: no-op for XanMod 6.19+ (sched_nr_latency removed) |
3 | 3 |
|
4 | | -Both XanMod and Zen patches add a definition of sched_nr_latency in |
5 | | -kernel/sched/fair.c. When both patch sets are applied together this |
6 | | -causes a duplicate-symbol link error. |
| 4 | +XanMod 6.19 removed sched_nr_latency and the old sysctl_sched_latency |
| 5 | +API in favour of sysctl_sched_base_slice. The deduplication this patch |
| 6 | +previously performed is no longer needed. |
7 | 7 |
|
8 | | -This patch removes the XanMod-side definition and declaration, leaving |
9 | | -the Zen-side definition in place. The LiqXanMod sysfs bridge |
10 | | -(liqxanmod_sysfs.c) writes sched_nr_latency directly, so both the |
11 | | -XanMod throughput profile and the Zen latency profile continue to work |
12 | | -correctly. |
13 | | - |
14 | | ---- a/kernel/sched/fair.c |
15 | | -+++ b/kernel/sched/fair.c |
16 | | -@@ -80,11 +80,8 @@ unsigned int sysctl_sched_latency = 6000000ULL; |
17 | | - static unsigned int normalized_sysctl_sched_latency = 6000000ULL; |
18 | | - |
19 | | - /* |
20 | | -- * XanMod: increased nr_latency for throughput workloads. |
21 | | -- * In LiqXanMod hybrid builds this is managed by liqxanmod_sysfs.c. |
22 | | -+ * Number of tasks in a latency period. Managed by liqxanmod_sysfs.c |
23 | | -+ * in hybrid builds; set directly in single-mode builds. |
24 | | - */ |
25 | | --#ifdef CONFIG_LIQXANMOD_HYBRID |
26 | | --/* Defined by Zen patch; liqxanmod_sysfs.c adjusts it at runtime. */ |
27 | | --#else |
28 | | - unsigned int sched_nr_latency = 8; |
29 | | --#endif |
30 | | - |
31 | | ---- a/include/linux/sched/sysctl.h |
32 | | -+++ b/include/linux/sched/sysctl.h |
33 | | -@@ -14,9 +14,7 @@ extern unsigned int sysctl_sched_latency; |
34 | | - extern unsigned int sysctl_sched_min_granularity; |
35 | | - extern unsigned int sysctl_sched_wakeup_granularity; |
36 | | - extern unsigned int sysctl_sched_child_runs_first; |
37 | | --#ifndef CONFIG_LIQXANMOD_HYBRID |
38 | | - extern unsigned int sched_nr_latency; |
39 | | --#endif |
| 8 | +Retained as a placeholder to keep the series numbering stable. |
0 commit comments