1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
--- a/patch-5.1-ck1
+++ b/patch-5.1-ck1
@@ -16348,15 +16348,13 @@ diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index c9ec050bcf46..8f91e2a76e29 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
-@@ -131,9 +131,17 @@ static int __maybe_unused four = 4;
- static unsigned long zero_ul;
- static unsigned long one_ul = 1;
- static unsigned long long_max = LONG_MAX;
--static int one_hundred = 100;
--static int one_thousand = 1000;
+@@ -131,9 +131,17 @@ static int __maybe_unused four __read_only = 4;
+ static unsigned long zero_ul __read_only;
+ static unsigned long one_ul __read_only = 1;
+ static unsigned long long_max __read_only = LONG_MAX;
+ static int one_hundred __read_only = 100;
+ static int one_thousand __read_only = 1000;
-#ifdef CONFIG_PRINTK
-+static int __read_mostly one_hundred = 100;
-+static int __read_mostly one_thousand = 1000;
+#ifdef CONFIG_SCHED_MUQSS
+extern int rr_interval;
+extern int sched_interactive;
@@ -16366,7 +16362,7 @@
+extern int hrtimer_granularity_us;
+extern int hrtimeout_min_us;
+#if defined(CONFIG_PRINTK) || defined(CONFIG_SCHED_MUQSS)
- static int ten_thousand = 10000;
+ static int ten_thousand __read_only = 10000;
#endif
#ifdef CONFIG_PERF_EVENTS
@@ -296,7 +304,7 @@ static struct ctl_table sysctl_base_table[] = {
@@ -16375,9 +16371,9 @@ };
-#ifdef CONFIG_SCHED_DEBUG
+#if defined(CONFIG_SCHED_DEBUG) && !defined(CONFIG_SCHED_MUQSS)
- static int min_sched_granularity_ns = 100000; /* 100 usecs */
- static int max_sched_granularity_ns = NSEC_PER_SEC; /* 1 second */
- static int min_wakeup_granularity_ns; /* 0 usecs */
+ static int min_sched_granularity_ns __read_only = 100000; /* 100 usecs */
+ static int max_sched_granularity_ns __read_only = NSEC_PER_SEC; /* 1 second */
+ static int min_wakeup_granularity_ns __read_only; /* 0 usecs */
@@ -322,6 +330,7 @@ static int max_extfrag_threshold = 1000;
#endif
|
