[PATCH] No arch-specific strpbrk implementations
authorKyle McMartin <kyle@parisc-linux.org>
Tue, 11 Apr 2006 05:53:56 +0000 (22:53 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 11 Apr 2006 13:18:40 +0000 (06:18 -0700)
While cleaning up parisc_ksyms.c earlier, I noticed that strpbrk wasn't
being exported from lib/string.c.  Investigating further, I noticed a
changeset that removed its export and added it to _ksyms.c on a few more
architectures.  The justification was that "other arches do it."

I think this is wrong, since no architecture currently defines
__HAVE_ARCH_STRPBRK, there's no reason for any of them to be exporting it
themselves.  Therefore, consolidate the export to lib/string.c.

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
20 files changed:
arch/alpha/kernel/alpha_ksyms.c
arch/arm/kernel/armksyms.c
arch/arm26/kernel/armksyms.c
arch/cris/kernel/crisksyms.c
arch/frv/kernel/frv_ksyms.c
arch/h8300/kernel/h8300_ksyms.c
arch/i386/kernel/i386_ksyms.c
arch/m32r/kernel/m32r_ksyms.c
arch/m68k/kernel/m68k_ksyms.c
arch/m68knommu/kernel/m68k_ksyms.c
arch/mips/kernel/mips_ksyms.c
arch/parisc/kernel/parisc_ksyms.c
arch/sh/kernel/sh_ksyms.c
arch/sh64/kernel/sh_ksyms.c
arch/sparc/kernel/sparc_ksyms.c
arch/sparc64/kernel/sparc64_ksyms.c
arch/v850/kernel/v850_ksyms.c
arch/x86_64/kernel/x8664_ksyms.c
arch/xtensa/kernel/xtensa_ksyms.c
lib/string.c

index 9d6186d50245c24624229ebd5ccb753ede91f8b3..c645c5e14786fdd17efddf40bb3ae2b40524ffd8 100644 (file)
@@ -76,7 +76,6 @@ EXPORT_SYMBOL(strncpy);
 EXPORT_SYMBOL(strnlen);
 EXPORT_SYMBOL(strncat);
 EXPORT_SYMBOL(strstr);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strchr);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(memcmp);
index ee083b3f05220aee308aba8a8f0eff7f27100a30..c49b5d4d7fca2a77217c15732c0fbeeefdf90f6f 100644 (file)
@@ -101,7 +101,6 @@ EXPORT_SYMBOL(__raw_writesl);
 
        /* string / mem functions */
 EXPORT_SYMBOL(strchr);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(memset);
 EXPORT_SYMBOL(memcpy);
index a6a1b33734440bf177f0312e835589bafed83128..9d66c27f272415a47ae11ccbda61e2c462b4c552 100644 (file)
@@ -152,7 +152,6 @@ EXPORT_SYMBOL(strncmp);
 EXPORT_SYMBOL(strchr);
 EXPORT_SYMBOL(strlen);
 EXPORT_SYMBOL(strnlen);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(memset);
index de39725da9202e1940230bb42eb66203ad71d1b4..d57859053ce7a5ec7d64a70fb2cb02ab0dba10c0 100644 (file)
@@ -39,7 +39,6 @@ EXPORT_SYMBOL(loops_per_usec);
 /* String functions */
 EXPORT_SYMBOL(memcmp);
 EXPORT_SYMBOL(memmove);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(strcpy);
 EXPORT_SYMBOL(strchr);
index 07c8ffa0dd3912e278a6e6316120f4af49d41535..0f273a7aca5ae841691fae203728249511c85499 100644 (file)
@@ -27,7 +27,6 @@ EXPORT_SYMBOL(__ioremap);
 EXPORT_SYMBOL(iounmap);
 
 EXPORT_SYMBOL(strnlen);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(strchr);
index b6cd78c972bb4a1a7cee5ce6202ce5879843a51a..f8d6dee8478112e92b1dc44e2c8d95c5a5afc740 100644 (file)
@@ -25,7 +25,6 @@ extern char h8300_debug_device[];
 /* platform dependent support */
 
 EXPORT_SYMBOL(strnlen);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(strchr);
index 055325056a74aa7769d658b459f4840d7ffa328c..036a9857936fa26816ca97b3a74021399909a0e8 100644 (file)
@@ -19,7 +19,6 @@ EXPORT_SYMBOL(__put_user_2);
 EXPORT_SYMBOL(__put_user_4);
 EXPORT_SYMBOL(__put_user_8);
 
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strstr);
 
 #ifdef CONFIG_SMP
index 92d66fd17186f45415e2a510ac95f7dc98e96329..c50330fa83b98a33ef58e40f6751671835ed3aee 100644 (file)
@@ -35,8 +35,6 @@ EXPORT_SYMBOL(__udelay);
 EXPORT_SYMBOL(__delay);
 EXPORT_SYMBOL(__const_udelay);
 
-EXPORT_SYMBOL(strpbrk);
-
 EXPORT_SYMBOL(strncpy_from_user);
 EXPORT_SYMBOL(__strncpy_from_user);
 EXPORT_SYMBOL(clear_user);
index c3319514a85ed000686cb947d0f679d0b474d0fb..5b7952ea2bae431dde15bd7c04c48068d529e7c2 100644 (file)
@@ -57,7 +57,6 @@ EXPORT_SYMBOL(dump_thread);
 EXPORT_SYMBOL(strnlen);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(strstr);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(enable_irq);
 EXPORT_SYMBOL(disable_irq);
 EXPORT_SYMBOL(kernel_thread);
index f9b4ea16c0998625fd0cd747bc2b62b4d8154f18..4320d5dcc9cb9b7e632bd98d8bf74d49b4ab3652 100644 (file)
@@ -26,7 +26,6 @@ EXPORT_SYMBOL(__ioremap);
 EXPORT_SYMBOL(iounmap);
 EXPORT_SYMBOL(dump_fpu);
 EXPORT_SYMBOL(strnlen);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(strchr);
index 86e42c633f73a60e95a939a7433b18b89118dd1b..e042f9d2ba31fb58b2960b4ed6cafc84c88823fc 100644 (file)
@@ -39,7 +39,6 @@ EXPORT_SYMBOL(strchr);
 EXPORT_SYMBOL(strncmp);
 #endif
 EXPORT_SYMBOL(strlen);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strncat);
 EXPORT_SYMBOL(strnlen);
 EXPORT_SYMBOL(strrchr);
index 47ca5c0a323b4542d120487c81198f6667fcd961..fc107add627cce2608d2699c2e608e8f72205c67 100644 (file)
@@ -31,7 +31,6 @@
 
 #include <linux/string.h>
 EXPORT_SYMBOL(memset);
-EXPORT_SYMBOL(strpbrk);
 
 #include <asm/atomic.h>
 EXPORT_SYMBOL(__xchg8);
index 1cf94a618be3c97fa21207b4811e36e88634f780..d5d032533a8b3b1445f70ab6430b5e4deb6e7fa5 100644 (file)
@@ -37,7 +37,6 @@ EXPORT_SYMBOL(disable_irq_nosync);
 EXPORT_SYMBOL(irq_desc);
 EXPORT_SYMBOL(no_irq_type);
 
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(strlen);
 EXPORT_SYMBOL(strnlen);
index de29c45f23a7278ee01fb2930d3afc20d1cbed6e..6f3a1c946339442301f66de7e5ce78dc19ed5f69 100644 (file)
@@ -41,7 +41,6 @@ EXPORT_SYMBOL(kernel_thread);
 /* Networking helper routines. */
 EXPORT_SYMBOL(csum_partial_copy);
 
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strstr);
 
 #ifdef CONFIG_VT
index 2c21d79076356e2a0c617bb290109fd8705f92b2..ec1c9687d67920312df790ec0b550d3740c1c08c 100644 (file)
@@ -263,7 +263,6 @@ EXPORT_SYMBOL(strcmp);
 EXPORT_SYMBOL(strncmp);
 EXPORT_SYMBOL(strchr);
 EXPORT_SYMBOL(strrchr);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(page_kernel);
 
index f5e8db1de76b590400f8a143fa5a3ee107cef1c7..62d8a99271eac044e66906d15f3435944eaa3845 100644 (file)
@@ -276,7 +276,6 @@ EXPORT_SYMBOL(__prom_getsibling);
 EXPORT_SYMBOL(strlen);
 EXPORT_SYMBOL(__strlen_user);
 EXPORT_SYMBOL(__strnlen_user);
-EXPORT_SYMBOL(strpbrk);
 
 #ifdef CONFIG_SOLARIS_EMUL_MODULE
 EXPORT_SYMBOL(linux_sparc_syscall);
index 8ffc29c1c89df749f71e0d3954e01642ede3770d..6bcfcfe88384b7d0a573f496d1f2afedd5e2f99e 100644 (file)
@@ -43,7 +43,6 @@ EXPORT_SYMBOL (strncmp);
 EXPORT_SYMBOL (strchr);
 EXPORT_SYMBOL (strlen);
 EXPORT_SYMBOL (strnlen);
-EXPORT_SYMBOL (strpbrk);
 EXPORT_SYMBOL (strrchr);
 EXPORT_SYMBOL (strstr);
 EXPORT_SYMBOL (memset);
index fec4e521c01cf31f930ff710c1c996fef6746949..1def21c9f7cd9f426cd29b1fc0c7a425d32411e4 100644 (file)
@@ -120,7 +120,6 @@ extern void * memcpy(void *,const void *,__kernel_size_t);
 extern void * __memcpy(void *,const void *,__kernel_size_t);
 
 EXPORT_SYMBOL(memset);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(memmove);
 EXPORT_SYMBOL(memcpy);
 EXPORT_SYMBOL(__memcpy);
index 152b9370789b194c0904ee2cabeb7f7258c5e1a4..a15b6e3e72c86d2d097baf57cd664b23d0303a84 100644 (file)
@@ -48,7 +48,6 @@ EXPORT_SYMBOL(memchr);
 EXPORT_SYMBOL(strcat);
 EXPORT_SYMBOL(strchr);
 EXPORT_SYMBOL(strlen);
-EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strncat);
 EXPORT_SYMBOL(strnlen);
 EXPORT_SYMBOL(strrchr);
index b3c28a3f63322ff528a38df4895020c257b20050..037a48acedbb21aae00269c87ef9f1821fb1bb67 100644 (file)
@@ -403,6 +403,7 @@ char *strpbrk(const char *cs, const char *ct)
        }
        return NULL;
 }
+EXPORT_SYMBOL(strpbrk);
 #endif
 
 #ifndef __HAVE_ARCH_STRSEP