diff options
author | Andrew Morton <akpm@osdl.org> | 2006-03-22 03:07:46 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 10:53:56 -0500 |
commit | f4a641d66c6e135dcfc861521e8008faed2411e1 (patch) | |
tree | 0d8e93949c646479ac39760bd6c0e7afcb96e4a6 /arch | |
parent | 83485f826bea154a0ab41e9b8689105531dd7cb2 (diff) |
[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: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/frv/kernel/frv_ksyms.c | 1 | ||||
-rw-r--r-- | arch/h8300/kernel/h8300_ksyms.c | 1 | ||||
-rw-r--r-- | arch/m68knommu/kernel/m68k_ksyms.c | 1 | ||||
-rw-r--r-- | arch/x86_64/kernel/x8664_ksyms.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/arch/frv/kernel/frv_ksyms.c b/arch/frv/kernel/frv_ksyms.c index 0f1c6cbc4f50..aa6b7d0a2109 100644 --- a/arch/frv/kernel/frv_ksyms.c +++ b/arch/frv/kernel/frv_ksyms.c | |||
@@ -27,6 +27,7 @@ EXPORT_SYMBOL(__ioremap); | |||
27 | EXPORT_SYMBOL(iounmap); | 27 | EXPORT_SYMBOL(iounmap); |
28 | 28 | ||
29 | EXPORT_SYMBOL(strnlen); | 29 | EXPORT_SYMBOL(strnlen); |
30 | EXPORT_SYMBOL(strpbrk); | ||
30 | EXPORT_SYMBOL(strrchr); | 31 | EXPORT_SYMBOL(strrchr); |
31 | EXPORT_SYMBOL(strstr); | 32 | EXPORT_SYMBOL(strstr); |
32 | EXPORT_SYMBOL(strchr); | 33 | EXPORT_SYMBOL(strchr); |
diff --git a/arch/h8300/kernel/h8300_ksyms.c b/arch/h8300/kernel/h8300_ksyms.c index 5cc76efaf7aa..69d6ad32d56c 100644 --- a/arch/h8300/kernel/h8300_ksyms.c +++ b/arch/h8300/kernel/h8300_ksyms.c | |||
@@ -25,6 +25,7 @@ extern char h8300_debug_device[]; | |||
25 | /* platform dependent support */ | 25 | /* platform dependent support */ |
26 | 26 | ||
27 | EXPORT_SYMBOL(strnlen); | 27 | EXPORT_SYMBOL(strnlen); |
28 | EXPORT_SYMBOL(strpbrk); | ||
28 | EXPORT_SYMBOL(strrchr); | 29 | EXPORT_SYMBOL(strrchr); |
29 | EXPORT_SYMBOL(strstr); | 30 | EXPORT_SYMBOL(strstr); |
30 | EXPORT_SYMBOL(strchr); | 31 | EXPORT_SYMBOL(strchr); |
diff --git a/arch/m68knommu/kernel/m68k_ksyms.c b/arch/m68knommu/kernel/m68k_ksyms.c index eddb8d3e130a..d844c755945a 100644 --- a/arch/m68knommu/kernel/m68k_ksyms.c +++ b/arch/m68knommu/kernel/m68k_ksyms.c | |||
@@ -26,6 +26,7 @@ EXPORT_SYMBOL(__ioremap); | |||
26 | EXPORT_SYMBOL(iounmap); | 26 | EXPORT_SYMBOL(iounmap); |
27 | EXPORT_SYMBOL(dump_fpu); | 27 | EXPORT_SYMBOL(dump_fpu); |
28 | EXPORT_SYMBOL(strnlen); | 28 | EXPORT_SYMBOL(strnlen); |
29 | EXPORT_SYMBOL(strpbrk); | ||
29 | EXPORT_SYMBOL(strrchr); | 30 | EXPORT_SYMBOL(strrchr); |
30 | EXPORT_SYMBOL(strstr); | 31 | EXPORT_SYMBOL(strstr); |
31 | EXPORT_SYMBOL(strchr); | 32 | EXPORT_SYMBOL(strchr); |
diff --git a/arch/x86_64/kernel/x8664_ksyms.c b/arch/x86_64/kernel/x8664_ksyms.c index 3496abc8d372..c9dc7e46731e 100644 --- a/arch/x86_64/kernel/x8664_ksyms.c +++ b/arch/x86_64/kernel/x8664_ksyms.c | |||
@@ -124,6 +124,7 @@ extern void * __memcpy(void *,const void *,__kernel_size_t); | |||
124 | 124 | ||
125 | EXPORT_SYMBOL(memset); | 125 | EXPORT_SYMBOL(memset); |
126 | EXPORT_SYMBOL(strlen); | 126 | EXPORT_SYMBOL(strlen); |
127 | EXPORT_SYMBOL(strpbrk); | ||
127 | EXPORT_SYMBOL(memmove); | 128 | EXPORT_SYMBOL(memmove); |
128 | EXPORT_SYMBOL(memcpy); | 129 | EXPORT_SYMBOL(memcpy); |
129 | EXPORT_SYMBOL(__memcpy); | 130 | EXPORT_SYMBOL(__memcpy); |