diff options
| author | David S. Miller | 2017-08-10 21:09:13 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-08-10 21:09:13 +0200 |
| commit | 2f7043a37708110aa98262b91702da6bc32e17b6 (patch) | |
| tree | de0525dae8420a56f9a00def631ccc0108d9d091 /arch/x86/boot/string.c | |
| parent | sparc64: Revert 16GB huge page support. (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-2f7043a37708110aa98262b91702da6bc32e17b6.tar.gz kernel-qcow2-linux-2f7043a37708110aa98262b91702da6bc32e17b6.tar.xz kernel-qcow2-linux-2f7043a37708110aa98262b91702da6bc32e17b6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Diffstat (limited to 'arch/x86/boot/string.c')
| -rw-r--r-- | arch/x86/boot/string.c | 9 |
1 files changed, 9 insertions, 0 deletions
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; |