diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2020-03-12 01:37:24 +0300 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2020-03-25 04:19:43 +0300 |
| commit | 51e406417950d9a614ddbb1d7769ea210b8717b0 (patch) | |
| tree | 9d2c898d4e8ebd5edc6af4755f9689dcfc0d33c4 /arch/sparc | |
| parent | aefd80307a05e529b3bcd28f96a7b49528697f60 (diff) | |
| download | linux-51e406417950d9a614ddbb1d7769ea210b8717b0.tar.xz | |
sparc: revive __HAVE_ARCH_STRLEN for 32bit sparc
Prior to commit 70a6fcf3283a ("[sparc] unify 32bit and 64bit string.h"),
__HAVE_ARCH_STRLEN was defined in both of string_32.h and string_64.h
It did not unify __HAVE_ARCH_STRLEN, but deleted it from string_32.h
This issue was reported by the kbuild test robot in the trial of
forcible linking of $(lib-y) to vmlinux.
Fixes: 70a6fcf3283a ("[sparc] unify 32bit and 64bit string.h")
Reported-by: kbuild test robot <lkp@intel.com>
Suggested-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Acked-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/include/asm/string.h | 4 | ||||
| -rw-r--r-- | arch/sparc/include/asm/string_64.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/include/asm/string.h b/arch/sparc/include/asm/string.h index 3d9cd082716b..001a17baf2d5 100644 --- a/arch/sparc/include/asm/string.h +++ b/arch/sparc/include/asm/string.h @@ -37,6 +37,10 @@ void *memmove(void *, const void *, __kernel_size_t); #define __HAVE_ARCH_MEMCMP int memcmp(const void *,const void *,__kernel_size_t); +/* Now the str*() stuff... */ +#define __HAVE_ARCH_STRLEN +__kernel_size_t strlen(const char *); + #define __HAVE_ARCH_STRNCMP int strncmp(const char *, const char *, __kernel_size_t); diff --git a/arch/sparc/include/asm/string_64.h b/arch/sparc/include/asm/string_64.h index ee9ba67321bd..d5c563058a5b 100644 --- a/arch/sparc/include/asm/string_64.h +++ b/arch/sparc/include/asm/string_64.h @@ -12,8 +12,4 @@ #include <asm/asi.h> -/* Now the str*() stuff... */ -#define __HAVE_ARCH_STRLEN -__kernel_size_t strlen(const char *); - #endif /* !(__SPARC64_STRING_H__) */ |