Commit eec013bb authored by Heiko Carstens's avatar Heiko Carstens Committed by Vasily Gorbik
Browse files

s390/string: use generic strrchr 



Use generic strrchr instead of an optimized architecture specific
variant. Performance of strrchr is not relevant for real life
workloads, since the only user which may call this more frequently
would be kbasename().

Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/lkml/CAHk-=whoe211F8ND-9hZvfnib0UA4gga8DZJ+YaBZNbE4fubdg@mail.gmail.com/


Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 132c1e74

arch/s390/include/asm/string.h

+0 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ void *memmove(void *dest, const void *src, size_t n); 
#define __HAVE_ARCH_STRNCAT	/* arch function */

#define __HAVE_ARCH_STRNCPY	/* arch function */

#define __HAVE_ARCH_STRNLEN	/* inline & arch function */

#define __HAVE_ARCH_STRRCHR	/* arch function */

#define __HAVE_ARCH_STRSTR	/* arch function */



/* Prototypes for non-inlined arch strings functions. */
@@ -46,7 +45,6 @@ size_t strlcat(char *dest, const char *src, size_t n); 
size_t strlcpy(char *dest, const char *src, size_t size);

char *strncat(char *dest, const char *src, size_t n);

char *strncpy(char *dest, const char *src, size_t n);

char *strrchr(const char *s, int c);

char *strstr(const char *s1, const char *s2);

#endif /* !CONFIG_KASAN */

arch/s390/lib/string.c

+0 −19
Original line number Diff line number Diff line
@@ -251,25 +251,6 @@ int strcmp(const char *s1, const char *s2) 
EXPORT_SYMBOL(strcmp);

#endif



/**

 * strrchr - Find the last occurrence of a character in a string

 * @s: The string to be searched

 * @c: The character to search for

 */

#ifdef __HAVE_ARCH_STRRCHR

char *strrchr(const char *s, int c)

{

	ssize_t len = __strend(s) - s;



	do {

		if (s[len] == (char)c)

			return (char *)s + len;

	} while (--len >= 0);

	return NULL;

}

EXPORT_SYMBOL(strrchr);

#endif



static inline int clcle(const char *s1, unsigned long l1,

			const char *s2, unsigned long l2)

{