[PATCH] Clean up arch-overrides in linux/string.h

[firefly-linux-kernel-4.4.55.git] / lib / string.c

diff --git a/lib/string.c b/lib/string.c
index 037a48acedbb21aae00269c87ef9f1821fb1bb67..7be6f0a87e837638b0ecdf83db9324f0373bdedd 100644 (file)
--- a/lib/string.c
+++ b/lib/string.c
@@ -362,6 +362,7 @@ size_t strspn(const char *s, const char *accept)
 EXPORT_SYMBOL(strspn);
 #endif
 
+#ifndef __HAVE_ARCH_STRCSPN
 /**
  * strcspn - Calculate the length of the initial substring of @s which does
  *     not contain letters in @reject
@@ -384,6 +385,7 @@ size_t strcspn(const char *s, const char *reject)
        return count;
 }
 EXPORT_SYMBOL(strcspn);
+#endif
 
 #ifndef __HAVE_ARCH_STRPBRK
 /**