From fa4df40307a457e203b3892abf783e0c0d09a561 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 21 Apr 2022 16:22:23 +0200 Subject: [PATCH] ANDROID: GKI: remove CONFIG_UBSAN_OBJECT_SIZE from gki_defconfig In commit 33db9912ff7c ("ubsan: remove CONFIG_UBSAN_OBJECT_SIZE"), UBSAN_OBJECT_SIZE was removed, so also remove it from the gki_defconfig files to allow the build to work properly. Fixes: 33db9912ff7c ("ubsan: remove CONFIG_UBSAN_OBJECT_SIZE") Signed-off-by: Greg Kroah-Hartman Change-Id: I19e943648d438644dffc5ebd13f1e1b7c660e7b5 --- 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 61376548ecc9..62683f5e7645 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -671,7 +671,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 4d91bac9c9ef..60ba8e3a9220 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -610,7 +610,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