coreos-kernel: roll forward to 3.16 again, minus KASLR

Our Xen boot failure appears to be related to enabling KASLR and
helpuflly the 'nokaslr' command line option does not help. Disable the
feature entirely until the bugs are shaken out.
This commit is contained in:
Michael Marineau 2014-09-04 13:53:40 -07:00
parent 0fff9d827d
commit ee589472fa
2 changed files with 2 additions and 4 deletions

View File

@ -13,5 +13,5 @@ DESCRIPTION="CoreOS kernel"
HOMEPAGE="http://www.kernel.org" HOMEPAGE="http://www.kernel.org"
SRC_URI="" SRC_URI=""
KEYWORDS="~amd64" KEYWORDS="amd64"
IUSE="" IUSE=""

View File

@ -516,9 +516,7 @@ CONFIG_CRASH_DUMP=y
CONFIG_KEXEC_JUMP=y CONFIG_KEXEC_JUMP=y
CONFIG_PHYSICAL_START=0x1000000 CONFIG_PHYSICAL_START=0x1000000
CONFIG_RELOCATABLE=y CONFIG_RELOCATABLE=y
CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_BASE is not set
CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000
CONFIG_X86_NEED_RELOCS=y
CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_HOTPLUG_CPU=y CONFIG_HOTPLUG_CPU=y
# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set