From 341a788ad81417b9ea41894a7f5e65f536201c4e Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Mon, 14 Feb 2022 14:41:56 -0800 Subject: [PATCH] ANDROID: gki_defconfig: remove CONFIG_UBSAN_OBJECT_SIZE This configs does not exist any more. So drop itfrom the gki_defconfig. Fixes: 69d0db01e210 ("ubsan: remove CONFIG_UBSAN_OBJECT_SIZE") Signed-off-by: Will McVicker Signed-off-by: Greg Kroah-Hartman Change-Id: Ia747661e4226dc6a27c0ccfe4668f048bd286e91 --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index ca156ddea892..464bb0812bfb 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -656,7 +656,6 @@ CONFIG_UBSAN=y CONFIG_UBSAN_TRAP=y CONFIG_UBSAN_LOCAL_BOUNDS=y # 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 diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index c752f7a7baf1..b44e37dc6c77 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -597,7 +597,6 @@ CONFIG_UBSAN=y CONFIG_UBSAN_TRAP=y CONFIG_UBSAN_LOCAL_BOUNDS=y # 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