diff options
| author | Greg Hartman <ghartman@google.com> | 2018-05-04 14:45:44 -0700 |
|---|---|---|
| committer | Greg Hartman <ghartman@google.com> | 2018-05-04 22:35:36 +0000 |
| commit | 6ec0e3f3a9468f34ae9f6a1bf095a6ec1756b60c (patch) | |
| tree | e956e90e834bc2bbfbf9f9747fdd07d49fab2aa3 | |
| parent | 31f312b49b72ba8f255364b249282f88c6b4cbaf (diff) | |
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
Merged-In: I5ba126b08678fcb8fd7bc31fe79de80fa81cf869
Signed-off-by: Greg Hartman <ghartman@google.com>
Signed-off-by: Alistair Strachan <astrachan@google.com>
| -rw-r--r-- | arch/x86/configs/x86_64_cuttlefish_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig index 512d009146dd..9f0107157b8f 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -55,7 +55,7 @@ CONFIG_PHYSICAL_START=0x200000 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 |