From 4aa47c6a7ac9a30aaa691f76a40401d3da59a82f Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sat, 13 Apr 2019 12:51:53 -0700 Subject: Typo --- PKGBUILD | 4 ++-- modify-ck-for-hardened.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++ modify-ck-for-hardned.patch | 44 -------------------------------------------- 3 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 modify-ck-for-hardened.patch delete mode 100644 modify-ck-for-hardned.patch diff --git a/PKGBUILD b/PKGBUILD index 57fc872..43ee693 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -39,7 +39,7 @@ source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/lin https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnupkgver}/patch-${_gnumajver}-${_gnupkgver}.xz{,.sign} https://github.com/anthraxx/linux-hardened/releases/download/${pkgver}/linux-hardened-${pkgver}.patch{,.sig} remove-excess-ck-extraversion.patch - modify-ck-for-hardned.patch + modify-ck-for-hardened.patch http://ck.kolivas.org/patches/5.0/${_majver}/${_majver}-ck${_ckpatchversion}/${_ckpatch}.xz enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz ath9k-regdom-hack.patch @@ -90,7 +90,7 @@ prepare() { # ck hotfixes msg2 "Applying ck patch hotfixes" patch -p1 -i ../remove-excess-ck-extraversion.patch "$srcdir/${_ckpatch}" - patch -p1 -i ../modify-ck-for-hardned.patch "$srcdir/${_ckpatch}" + patch -p1 -i ../modify-ck-for-hardened.patch "$srcdir/${_ckpatch}" sed -i '/-CFLAGS/ s/$/ \$(LIBELF_FLAGS)/' "$srcdir/${_ckpatch}" # ck patch diff --git a/modify-ck-for-hardened.patch b/modify-ck-for-hardened.patch new file mode 100644 index 0000000..c54860a --- /dev/null +++ b/modify-ck-for-hardened.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 + diff --git a/modify-ck-for-hardned.patch b/modify-ck-for-hardned.patch deleted file mode 100644 index c54860a..0000000 --- a/modify-ck-for-hardned.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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 - -- cgit v1.2.1