summaryrefslogtreecommitdiff
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorVivek Goyal <vgoyal@redhat.com>2014-03-18 15:26:36 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2014-03-19 15:43:37 -0700
commitaad830938ed8ba175d8060751654f78d4115ea0a (patch)
treed339dd0575a9a2f0a3283727a7ce102aabf30b4c /arch/x86/boot
parentdcb99fd9b08cfe1afe426af4d8d3cbc429190f15 (diff)
x86, boot: Undef memcmp before providing a new definition
With CONFIG_X86_32=y, string_32.h gets pulled in compressed/string.c by "misch.h". string_32.h defines a macro to map memcmp to __builtin_memcmp(). And that macro in turn changes the name of memcmp() defined here and converts it to __builtin_memcmp(). I thought that's not the intention though. We probably want to provide our own optimized definition of memcmp(). If yes, then undef the memcmp before we define a new memcmp. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> Link: http://lkml.kernel.org/r/1395170800-11059-2-git-send-email-vgoyal@redhat.com Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/boot')
-rw-r--r--arch/x86/boot/compressed/string.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/string.c b/arch/x86/boot/compressed/string.c
index ffb9c5c9d748..212004ec787d 100644
--- a/arch/x86/boot/compressed/string.c
+++ b/arch/x86/boot/compressed/string.c
@@ -1,5 +1,7 @@
#include "misc.h"
+/* Avoid intereference from any defines in string_32.h */
+#undef memcmp
int memcmp(const void *s1, const void *s2, size_t len)
{
u8 diff;