| From foo@baz Wed Aug 9 11:19:16 PDT 2017 |
| From: Nicholas Mc Guire <hofrat@osadl.org> |
| Date: Sat, 7 Jan 2017 10:38:31 +0100 |
| Subject: x86/boot: Add missing declaration of string functions |
| |
| From: Nicholas Mc Guire <hofrat@osadl.org> |
| |
| |
| [ Upstream commit fac69d0efad08fc15e4dbfc116830782acc0dc9a ] |
| |
| Add the missing declarations of basic string functions to string.h to allow |
| a clean build. |
| |
| Fixes: 5be865661516 ("String-handling functions for the new x86 setup code.") |
| Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> |
| Link: http://lkml.kernel.org/r/1483781911-21399-1-git-send-email-hofrat@osadl.org |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/x86/boot/string.c | 1 + |
| arch/x86/boot/string.h | 9 +++++++++ |
| 2 files changed, 10 insertions(+) |
| |
| --- a/arch/x86/boot/string.c |
| +++ b/arch/x86/boot/string.c |
| @@ -14,6 +14,7 @@ |
| |
| #include <linux/types.h> |
| #include "ctype.h" |
| +#include "string.h" |
| |
| int memcmp(const void *s1, const void *s2, size_t len) |
| { |
| --- a/arch/x86/boot/string.h |
| +++ b/arch/x86/boot/string.h |
| @@ -18,4 +18,13 @@ int memcmp(const void *s1, const void *s |
| #define memset(d,c,l) __builtin_memset(d,c,l) |
| #define memcmp __builtin_memcmp |
| |
| +extern int strcmp(const char *str1, const char *str2); |
| +extern int strncmp(const char *cs, const char *ct, size_t count); |
| +extern size_t strlen(const char *s); |
| +extern char *strstr(const char *s1, const char *s2); |
| +extern size_t strnlen(const char *s, size_t maxlen); |
| +extern unsigned int atou(const char *s); |
| +extern unsigned long long simple_strtoull(const char *cp, char **endp, |
| + unsigned int base); |
| + |
| #endif /* BOOT_STRING_H */ |