Messages in this thread Patch in this message | | | From | Arnd Bergmann <> | Subject | [PATCH] x86: fix fortified memcpy | Date | Tue, 27 Jun 2017 17:00:06 +0200 |
| |
__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 <arnd@arndb.de> --- arch/x86/lib/memcpy_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/lib/memcpy_32.c b/arch/x86/lib/memcpy_32.c index cad12634d6bd..2eab7d0bfedd 100644 --- a/arch/x86/lib/memcpy_32.c +++ b/arch/x86/lib/memcpy_32.c @@ -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); -- 2.9.0
| |