From a2e2706c6cb5531d018e5ce73921b2e94e471210 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 3 Nov 2022 02:31:52 +0100 Subject: [PATCH] ANDROID: gki_defconfig: remove CONFIG_INIT_STACK_ALL_ZERO=y Thanks to commit bdcb1d7cf285 ("hardening: Avoid harmless Clang option under CONFIG_INIT_STACK_ALL_ZERO"), this is now the default, no need to specify it explicitly. So remove it from the gki_defconfig files so that the build works properly again. Fixes: bdcb1d7cf285 ("hardening: Avoid harmless Clang option under CONFIG_INIT_STACK_ALL_ZERO") Signed-off-by: Greg Kroah-Hartman Change-Id: I32715acc4fcdd98f6ab05fa698571cf3e744db41 --- 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 8d7d21d82630..97039ed7a44d 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -660,7 +660,6 @@ CONFIG_HARDENED_USERCOPY=y CONFIG_STATIC_USERMODEHELPER=y CONFIG_STATIC_USERMODEHELPER_PATH="" CONFIG_SECURITY_SELINUX=y -CONFIG_INIT_STACK_ALL_ZERO=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_ADIANTUM=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index e36b48bb1242..f240feaf7672 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -592,7 +592,6 @@ CONFIG_HARDENED_USERCOPY=y CONFIG_STATIC_USERMODEHELPER=y CONFIG_STATIC_USERMODEHELPER_PATH="" CONFIG_SECURITY_SELINUX=y -CONFIG_INIT_STACK_ALL_ZERO=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_ADIANTUM=y