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>
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