From: Andrew Morton <akpm@osdl.org>

Sam's tree includes a new check, which found that we're exporting strpbrk()
multiple times.

It seems that the convention is that this is exported from the arch files, so
reove the lib/string.c export. 

Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: David Howells <dhowells@redhat.com>
Cc: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/frv/kernel/frv_ksyms.c        |    1 +
 arch/h8300/kernel/h8300_ksyms.c    |    1 +
 arch/m68knommu/kernel/m68k_ksyms.c |    1 +
 arch/x86_64/kernel/x8664_ksyms.c   |    1 +
 lib/string.c                       |    1 -
 5 files changed, 4 insertions(+), 1 deletion(-)

diff -puN arch/frv/kernel/frv_ksyms.c~multiple-exports-of-strpbrk arch/frv/kernel/frv_ksyms.c
--- devel/arch/frv/kernel/frv_ksyms.c~multiple-exports-of-strpbrk	2006-02-10 01:52:59.000000000 -0800
+++ devel-akpm/arch/frv/kernel/frv_ksyms.c	2006-02-10 01:52:59.000000000 -0800
@@ -27,6 +27,7 @@ EXPORT_SYMBOL(__ioremap);
 EXPORT_SYMBOL(iounmap);
 
 EXPORT_SYMBOL(strnlen);
+EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(strchr);
diff -puN arch/h8300/kernel/h8300_ksyms.c~multiple-exports-of-strpbrk arch/h8300/kernel/h8300_ksyms.c
--- devel/arch/h8300/kernel/h8300_ksyms.c~multiple-exports-of-strpbrk	2006-02-10 01:52:59.000000000 -0800
+++ devel-akpm/arch/h8300/kernel/h8300_ksyms.c	2006-02-10 01:52:59.000000000 -0800
@@ -25,6 +25,7 @@ extern char h8300_debug_device[];
 /* platform dependent support */
 
 EXPORT_SYMBOL(strnlen);
+EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(strstr);
 EXPORT_SYMBOL(strchr);
diff -puN arch/m68knommu/kernel/m68k_ksyms.c~multiple-exports-of-strpbrk arch/m68knommu/kernel/m68k_ksyms.c
--- devel/arch/m68knommu/kernel/m68k_ksyms.c~multiple-exports-of-strpbrk	2006-02-10 01:52:59.000000000 -0800
+++ devel-akpm/arch/m68knommu/kernel/m68k_ksyms.c	2006-02-10 01:52:59.000000000 -0800
@@ -26,6 +26,7 @@ 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);
diff -puN lib/string.c~multiple-exports-of-strpbrk lib/string.c
--- devel/lib/string.c~multiple-exports-of-strpbrk	2006-02-10 01:52:59.000000000 -0800
+++ devel-akpm/lib/string.c	2006-02-10 01:52:59.000000000 -0800
@@ -403,7 +403,6 @@ char *strpbrk(const char *cs, const char
 	}
 	return NULL;
 }
-EXPORT_SYMBOL(strpbrk);
 #endif
 
 #ifndef __HAVE_ARCH_STRSEP
diff -puN arch/x86_64/kernel/x8664_ksyms.c~multiple-exports-of-strpbrk arch/x86_64/kernel/x8664_ksyms.c
--- devel/arch/x86_64/kernel/x8664_ksyms.c~multiple-exports-of-strpbrk	2006-02-10 01:53:01.000000000 -0800
+++ devel-akpm/arch/x86_64/kernel/x8664_ksyms.c	2006-02-10 01:53:01.000000000 -0800
@@ -124,6 +124,7 @@ extern void * __memcpy(void *,const void
 
 EXPORT_SYMBOL(memset);
 EXPORT_SYMBOL(strlen);
+EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(memmove);
 EXPORT_SYMBOL(memcpy);
 EXPORT_SYMBOL(__memcpy);
_