From faf06a9f38ee5c6ac354dff0ea2a8c5056a0d179 Mon Sep 17 00:00:00 2001 From: gaochao Date: Fri, 10 Feb 2023 09:28:33 +0000 Subject: [PATCH] fix build error for yangfan Signed-off-by: gaochao --------------------------------------- --- linux-5.10/yangfan_patch/others.patch | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/linux-5.10/yangfan_patch/others.patch b/linux-5.10/yangfan_patch/others.patch index b129f33..f9364c2 100644 --- a/linux-5.10/yangfan_patch/others.patch +++ b/linux-5.10/yangfan_patch/others.patch @@ -748,16 +748,15 @@ diff --git a/security/Kconfig.hardening b/security/Kconfig.hardening index 269967c4f..9eb73dc1b 100644 --- a/security/Kconfig.hardening +++ b/security/Kconfig.hardening -@@ -29,7 +29,7 @@ choice - prompt "Initialize kernel stack variables at function entry" +@@ -39,7 +39,6 @@ choice default GCC_PLUGIN_STRUCTLEAK_BYREF_ALL if COMPILE_TEST && GCC_PLUGINS default INIT_STACK_ALL_PATTERN if COMPILE_TEST && CC_HAS_AUTO_VAR_INIT_PATTERN + default INIT_STACK_ALL_ZERO if CC_HAS_AUTO_VAR_INIT_ZERO - default INIT_STACK_NONE -+ default INIT_STACK_ALL_ZERO help This option enables initialization of stack variables at function entry time. This has the possibility to have the -@@ -190,6 +190,7 @@ config STACKLEAK_RUNTIME_DISABLE +@@ -211,6 +210,7 @@ config STACKLEAK_RUNTIME_DISABLE config INIT_ON_ALLOC_DEFAULT_ON bool "Enable heap memory zeroing on allocation by default" @@ -765,8 +764,6 @@ index 269967c4f..9eb73dc1b 100644 help This has the effect of setting "init_on_alloc=1" on the kernel command line. This can be disabled with "init_on_alloc=0". -diff --git a/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c b/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c -index aaca1f44e..8643beaf2 100644 --- a/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c +++ b/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c @@ -57,16 +57,30 @@ static const struct { -- Gitee