From 44b339535eb67a5c888edf01edc32b8b8a697e2e Mon Sep 17 00:00:00 2001 From: Yee Lee Date: Mon, 27 Sep 2021 11:13:57 +0800 Subject: [PATCH] ANDROID: gki_defconfig: remove CONFIG_UBSAN_MISC entry CONFIG_UBSAN_MISC is seperated to individual options and no longer existed in configuration. Hence, remove the entry from gki_defconfig. The other UBSAN configs are unset to align with android-mainline. Bug: 199373673 Ref: https://android-review.googlesource.com/c/kernel/common/+/1584824 Signed-off-by: Yee Lee Change-Id: I9f525fcd386eb7cc2503afb130a5230b5e730bee --- arch/arm64/configs/gki_defconfig | 5 ++++- arch/x86/configs/gki_defconfig | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 30bd964dd2c8..ecb15f5a0888 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -667,7 +667,10 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_UBSAN=y CONFIG_UBSAN_TRAP=y CONFIG_UBSAN_LOCAL_BOUNDS=y -# CONFIG_UBSAN_MISC is not set +# CONFIG_UBSAN_SHIFT is not set +# CONFIG_UBSAN_OBJECT_SIZE is not set +# CONFIG_UBSAN_BOOL is not set +# CONFIG_UBSAN_ENUM is not set CONFIG_PAGE_OWNER=y CONFIG_PAGE_PINNER=y CONFIG_DEBUG_MEMORY_INIT=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 332d9b539ed8..41a1b44c4e0a 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -601,7 +601,10 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_UBSAN=y CONFIG_UBSAN_TRAP=y CONFIG_UBSAN_LOCAL_BOUNDS=y -# CONFIG_UBSAN_MISC is not set +# CONFIG_UBSAN_SHIFT is not set +# CONFIG_UBSAN_OBJECT_SIZE is not set +# CONFIG_UBSAN_BOOL is not set +# CONFIG_UBSAN_ENUM is not set CONFIG_PAGE_OWNER=y CONFIG_PAGE_PINNER=y CONFIG_DEBUG_MEMORY_INIT=y