diff options
| author | Vivek Goyal <vgoyal@redhat.com> | 2014-03-18 15:26:39 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-03-19 15:44:04 -0700 |
| commit | fb4cac573ef6dce8d7543b68306566561c2e5725 (patch) | |
| tree | 9eea125e337817ac302d99878e12609bb5514bde /arch/x86/boot/compressed/string.c | |
| parent | 820e8feca06ff744f60e5036c3178dde40b91afc (diff) | |
x86, boot: Move memcmp() into string.h and string.c
Try to treat memcmp() in same way as memcpy() and memset(). Provide a
declaration in boot/string.h and by default user gets a memcmp() which
maps to builtin function.
Move optimized definition of memcmp() in boot/string.c. Now a user can
do #undef memcmp and link against string.c to use optimzied memcmp().
It also simplifies boot/compressed/string.c where we had to redefine
memcmp(). That extra definition is gone now.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Link: http://lkml.kernel.org/r/1395170800-11059-5-git-send-email-vgoyal@redhat.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/boot/compressed/string.c')
| -rw-r--r-- | arch/x86/boot/compressed/string.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/x86/boot/compressed/string.c b/arch/x86/boot/compressed/string.c index 3b5a82fc6ad7..920b55e3e241 100644 --- a/arch/x86/boot/compressed/string.c +++ b/arch/x86/boot/compressed/string.c @@ -1,15 +1,4 @@ #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; - asm("repe; cmpsb; setnz %0" - : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); - return diff; -} - #include "../string.c" /* misc.h might pull in string_32.h which has a macro for memcpy. undef that */ |