X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=arch%2Fx86%2Fboot%2Fstring.c;h=16f49123d747b7a1c224b75c60d8a3af1e8e701c;hb=89a55278dee487b172fb16295ccb2d0b2a1b319b;hp=630e3664906bfc399c885ff7c3525fc27bfb7218;hpb=264e22afa3aee4017ef5be42c7d5069560334c44;p=karo-tx-linux.git

diff --git a/arch/x86/boot/string.c b/arch/x86/boot/string.c
index 630e3664906b..16f49123d747 100644
--- a/arch/x86/boot/string.c
+++ b/arch/x86/boot/string.c
@@ -16,6 +16,15 @@
 #include "ctype.h"
 #include "string.h"
 
+/*
+ * Undef these macros so that the functions that we provide
+ * here will have the correct names regardless of how string.h
+ * may have chosen to #define them.
+ */
+#undef memcpy
+#undef memset
+#undef memcmp
+
 int memcmp(const void *s1, const void *s2, size_t len)
 {
 	bool diff;