commit:     5b73bbee19e8b9b38023f7b2c6a0178498e62b93
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 21 19:37:22 2021 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Tue Dec 21 19:37:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=5b73bbee

Move X86 and ARM only config settings to their respective sections

Thanks to gyakovlev

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 4567_distro-Gentoo-Kconfig.patch | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/4567_distro-Gentoo-Kconfig.patch b/4567_distro-Gentoo-Kconfig.patch
index 95a64aa2..91c92074 100644
--- a/4567_distro-Gentoo-Kconfig.patch
+++ b/4567_distro-Gentoo-Kconfig.patch
@@ -6,9 +6,9 @@
  source "Documentation/Kconfig"
 +
 +source "distro/Kconfig"
---- /dev/null  2021-08-24 15:34:24.700702871 -0400
-+++ b/distro/Kconfig   2021-08-24 15:49:16.965525424 -0400
-@@ -0,0 +1,281 @@
+--- /dev/null  2021-12-21 08:57:43.779324794 -0500
++++ b/distro/Kconfig   2021-12-21 14:33:33.759225728 -0500
+@@ -0,0 +1,283 @@
 +menu "Gentoo Linux"
 +
 +config GENTOO_LINUX
@@ -211,7 +211,6 @@
 +      select PAGE_POISONING_ZERO
 +      select INIT_ON_ALLOC_DEFAULT_ON
 +      select INIT_ON_FREE_DEFAULT_ON
-+      select VMAP_STACK
 +      select REFCOUNT_FULL
 +      select FORTIFY_SOURCE
 +      select SECURITY_DMESG_RESTRICT
@@ -219,7 +218,6 @@
 +      select GCC_PLUGIN_LATENT_ENTROPY
 +      select GCC_PLUGIN_STRUCTLEAK
 +      select GCC_PLUGIN_STRUCTLEAK_BYREF_ALL
-+      select GCC_PLUGIN_STACKLEAK
 +      select GCC_PLUGIN_RANDSTRUCT
 +      select GCC_PLUGIN_RANDSTRUCT_PERFORMANCE
 +
@@ -239,6 +237,8 @@
 +      select RELOCATABLE
 +      select LEGACY_VSYSCALL_NONE
 +      select PAGE_TABLE_ISOLATION
++      select GCC_PLUGIN_STACKLEAK
++      select VMAP_STACK
 +
 +
 +config GENTOO_KERNEL_SELF_PROTECTION_ARM64
@@ -251,6 +251,8 @@
 +      select RELOCATABLE
 +      select ARM64_SW_TTBR0_PAN
 +      select CONFIG_UNMAP_KERNEL_AT_EL0
++      select GCC_PLUGIN_STACKLEAK
++      select VMAP_STACK
 +
 +config GENTOO_KERNEL_SELF_PROTECTION_X86_32
 +      bool "X86_32 KSPP Settings"

Reply via email to