aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-vanilla/kernelconfig.x86
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-09-10 07:00:55 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-09-10 07:00:55 +0000
commit03fbac2fb3856cefedbb6c5b4c69b5d0d54ec8f5 (patch)
treee367e59b93c476a6815438cc8e1397287fec7e7b /main/linux-vanilla/kernelconfig.x86
parent727f38810c48dea818e1ceb081ae2b2b8ca122f5 (diff)
downloadaports-03fbac2fb3856cefedbb6c5b4c69b5d0d54ec8f5.tar.gz
aports-03fbac2fb3856cefedbb6c5b4c69b5d0d54ec8f5.tar.bz2
aports-03fbac2fb3856cefedbb6c5b4c69b5d0d54ec8f5.tar.xz
main/linux-vanilla: upgrade to 3.14.18
Diffstat (limited to 'main/linux-vanilla/kernelconfig.x86')
-rw-r--r--main/linux-vanilla/kernelconfig.x867
1 files changed, 5 insertions, 2 deletions
diff --git a/main/linux-vanilla/kernelconfig.x86 b/main/linux-vanilla/kernelconfig.x86
index d1943657b0..011eb8eee5 100644
--- a/main/linux-vanilla/kernelconfig.x86
+++ b/main/linux-vanilla/kernelconfig.x86
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.16 Kernel Configuration
+# Linux/x86 3.14.18 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -484,7 +484,10 @@ CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x1000000
-# CONFIG_RELOCATABLE is not set
+CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x20000000
+CONFIG_X86_NEED_RELOCS=y
CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_HOTPLUG_CPU=y
# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set