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 18:44:04 -0400 |
commit | fb4cac573ef6dce8d7543b68306566561c2e5725 (patch) | |
tree | 9eea125e337817ac302d99878e12609bb5514bde /arch/x86/boot/string.h | |
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/string.h')
-rw-r--r-- | arch/x86/boot/string.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/boot/string.h b/arch/x86/boot/string.h index 10939d8da2e0..725e820602b1 100644 --- a/arch/x86/boot/string.h +++ b/arch/x86/boot/string.h | |||
@@ -8,6 +8,7 @@ | |||
8 | 8 | ||
9 | void *memcpy(void *dst, const void *src, size_t len); | 9 | void *memcpy(void *dst, const void *src, size_t len); |
10 | void *memset(void *dst, int c, size_t len); | 10 | void *memset(void *dst, int c, size_t len); |
11 | int memcmp(const void *s1, const void *s2, size_t len); | ||
11 | 12 | ||
12 | /* | 13 | /* |
13 | * Access builtin version by default. If one needs to use optimized version, | 14 | * Access builtin version by default. If one needs to use optimized version, |
@@ -15,5 +16,6 @@ void *memset(void *dst, int c, size_t len); | |||
15 | */ | 16 | */ |
16 | #define memcpy(d,s,l) __builtin_memcpy(d,s,l) | 17 | #define memcpy(d,s,l) __builtin_memcpy(d,s,l) |
17 | #define memset(d,c,l) __builtin_memset(d,c,l) | 18 | #define memset(d,c,l) __builtin_memset(d,c,l) |
19 | #define memcmp __builtin_memcmp | ||
18 | 20 | ||
19 | #endif /* BOOT_STRING_H */ | 21 | #endif /* BOOT_STRING_H */ |