x86: fix fortified memcpy
PATCH 1/1 x86: fix fortified memcpy
__memcpy3d is not available when CONFIG_FORTIFY_SOURCE is enabled, leading to a link error on 32-bit kernels:
arch/x86/lib/memcpy_32.c: In function 'memcpy':arch/x86/lib/memcpy_32.c:10:9: error: implicit declaration of function '__memcpy3d'; did you mean '__memcpy'? [-Werror=implicit-function-declaration]
This uses the same #ifdef around the use of the function that now protects the definition.
Fixes mmotm ("include/linux/string.h: add the option of fortified string.h functions")
Signed-off-by Arnd Bergmann <[email protected]>
--- arch/x86/lib/memcpy_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/lib/memcpy_32.c +1 -1
@@ -6,7 +6,7 @@ __visible void *memcpy(void *to, const void *from, size_t n) { -#ifdef CONFIG_X86_USE_3DNOW +#if defined(CONFIG_X86_USE_3DNOW ) && !defined(CONFIG_FORTIFY_SOURCE )return __memcpy3d (to, from, n);#else return __memcpy (to, from, n);
Signature · 1 line
2.9.0