Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4a641d6 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] multiple exports of strpbrk 



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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 83485f82

arch/frv/kernel/frv_ksyms.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

arch/h8300/kernel/h8300_ksyms.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

arch/m68knommu/kernel/m68k_ksyms.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

arch/x86_64/kernel/x8664_ksyms.c

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ extern void * __memcpy(void *,const void *,__kernel_size_t); 


EXPORT_SYMBOL(memset);

EXPORT_SYMBOL(strlen);

EXPORT_SYMBOL(strpbrk);

EXPORT_SYMBOL(memmove);

EXPORT_SYMBOL(memcpy);

EXPORT_SYMBOL(__memcpy);

lib/string.c

+0 −1
Original line number Diff line number Diff line
@@ -403,7 +403,6 @@ char *strpbrk(const char *cs, const char *ct) 
	}

	return NULL;

}

EXPORT_SYMBOL(strpbrk);

#endif



#ifndef __HAVE_ARCH_STRSEP