summarylogtreecommitdiffstats
path: root/config.x86_64
diff options
context:
space:
mode:
authorMikael Eriksson2016-12-05 14:19:04 +0100
committerMikael Eriksson2016-12-05 14:19:04 +0100
commit8d147024018616bfa7e04cf704ed527e78d9a1e9 (patch)
tree88d690aedeb6cd5dfe806f034d1f765c9e1be240 /config.x86_64
parentcfa832d84d5ca01bb166a630600b319d23d14108 (diff)
downloadaur-8d147024018616bfa7e04cf704ed527e78d9a1e9.tar.gz
Merged configs from 4.8.12-1
Diffstat (limited to 'config.x86_64')
-rw-r--r--config.x86_644
1 files changed, 1 insertions, 3 deletions
diff --git a/config.x86_64 b/config.x86_64
index e7431d740b63..5560048795eb 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -585,11 +585,9 @@ CONFIG_CRASH_DUMP=y
CONFIG_KEXEC_JUMP=y
CONFIG_PHYSICAL_START=0x1000000
CONFIG_RELOCATABLE=y
-CONFIG_RANDOMIZE_BASE=y
+# CONFIG_RANDOMIZE_BASE is not set
CONFIG_X86_NEED_RELOCS=y
CONFIG_PHYSICAL_ALIGN=0x1000000
-CONFIG_RANDOMIZE_MEMORY=y
-CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
CONFIG_HOTPLUG_CPU=y
# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set