summaryrefslogtreecommitdiff
path: root/sys-kernel/hardened-sources/files/9999_revert-conflicts-v2.patch
blob: 365adfea7a889449aa1f4d3edf05d2f9463bb388 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
Reverse conflicting patches

--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -321,8 +321,6 @@ config KSM
 config DEFAULT_MMAP_MIN_ADDR
 	int "Low address space to protect from user allocation"
 	depends on MMU
-	default 65536 if ( X86_64 || X86_32 || PPC64 || IA64 ) && GENTOO_KERNEL_SELF_PROTECTION
-	default 32768 if ( ARM64 || ARM ) && GENTOO_KERNEL_SELF_PROTECTION
 	default 4096
 	help
 	  This is the portion of low virtual memory which should be protected