diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2019-04-13 12:36:20 -0700 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2019-04-13 12:36:20 -0700 |
commit | 3b6caf5e6d0fd5470f7049b28159c02988f7d334 (patch) | |
tree | 6f8bb3d4e09604f9c3429bc4eb53816841928b2c /modify-ck-for-hardned.patch | |
parent | Updated to 5.0.5.a (diff) | |
download | linux-hardened-ck-3b6caf5e6d0fd5470f7049b28159c02988f7d334.tar.xz |
Updated to 5.0.7
Add patches to modify ck rather than modifying the ck patch directly
Sync with upstream
Remove needless git commit fingerprint
Use single line for linux source archive and sig
Add missing line to disable raid6 algorithm scanning
Diffstat (limited to 'modify-ck-for-hardned.patch')
-rw-r--r-- | modify-ck-for-hardned.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/modify-ck-for-hardned.patch b/modify-ck-for-hardned.patch new file mode 100644 index 0000000..c54860a --- /dev/null +++ b/modify-ck-for-hardned.patch @@ -0,0 +1,44 @@ +--- a/patch-5.0-ck1 ++++ b/patch-5.0-ck1 +@@ -16348,15 +16348,11 @@ + index ba4d9e85feb8..226771720139 100644 + --- a/kernel/sysctl.c + +++ b/kernel/sysctl.c +-@@ -127,9 +127,17 @@ static int __maybe_unused one = 1; +- static int __maybe_unused two = 2; +- static int __maybe_unused four = 4; +- static unsigned long one_ul = 1; +--static int one_hundred = 100; +--static int one_thousand = 1000; ++@@ -127,7 +127,15 @@ static int __maybe_unused four __read_only = 4; ++ static unsigned long one_ul __read_only = 1; ++ 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 */ + @@ -313,6 +321,7 @@ static int max_extfrag_threshold = 1000; + #endif + |