From e067b296e0e064651e5d9ddb7ec903040bf258e0 Mon Sep 17 00:00:00 2001 From: Steve Muckle Date: Thu, 5 Nov 2020 00:02:51 +0000 Subject: [PATCH] Revert "ANDROID: gki_defconfig: Enable CONFIG_PAGE_OWNER" This reverts commit c0856ae51802a62acd1a617dbfb2f185a72a2910. Reason for revert: broken boot on arm64 CF (b/172506883) Change-Id: I7cd4c4d0a0169dc92f1ec0317efa1e7b4eec999e Signed-off-by: Steve Muckle --- arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index cf473986523e..810b0481b52b 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -574,7 +574,7 @@ CONFIG_DEBUG_INFO_DWARF4=y CONFIG_HEADERS_INSTALL=y # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=y -CONFIG_PAGE_OWNER=y +CONFIG_DEBUG_FS=y CONFIG_DEBUG_STACK_USAGE=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_PANIC_ON_OOPS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 163c3af2b5d4..c5508eeae9b4 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -517,7 +517,7 @@ CONFIG_DEBUG_INFO_DWARF4=y CONFIG_HEADERS_INSTALL=y # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=y -CONFIG_PAGE_OWNER=y +CONFIG_DEBUG_FS=y CONFIG_DEBUG_STACK_USAGE=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_PANIC_ON_OOPS=y