commit 34ca10e862b096312c4e2abd5fe916b8b645622f
author Greg Hartman <ghartman@google.com> Fri May 04 14:45:44 2018 -0700
committer Alistair Strachan <astrachan@google.com> Mon May 07 12:06:57 2018 -0700
tree 534187db2f49aba9237a3bff287ce179faadf62a
parent 97eabd2a8588be0f1f4890cc4ba0a59718f9dc2e

ANDROID: x86_64_cuttlefish_defconfig: Disable KPTI

Disable page table isolation to avoid kernel panics when booting kernels
under KVM. Temporary workaround while this issue is investigated.

Bug: 78252157
Bug: 71362031
Change-Id: I5ba126b08678fcb8fd7bc31fe79de80fa81cf869
Signed-off-by: Greg Hartman <ghartman@google.com>
Signed-off-by: Alistair Strachan <astrachan@google.com>

arch/x86/configs/x86_64_cuttlefish_defconfig

diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig
index 43c9575..5b06edd 100644
--- a/arch/x86/configs/x86_64_cuttlefish_defconfig
+++ b/arch/x86/configs/x86_64_cuttlefish_defconfig
@@ -59,7 +59,7 @@
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttyS0 reboot=p"
+CONFIG_CMDLINE="console=ttyS0 reboot=p nopti"
 CONFIG_PM_WAKELOCKS=y
 CONFIG_PM_WAKELOCKS_LIMIT=0
 # CONFIG_PM_WAKELOCKS_GC is not set