diff options
-rw-r--r-- | arch/alpha/kernel/alpha_ksyms.c | 1 | ||||
-rw-r--r-- | arch/arm/kernel/armksyms.c | 1 | ||||
-rw-r--r-- | arch/arm26/kernel/armksyms.c | 1 | ||||
-rw-r--r-- | arch/cris/kernel/crisksyms.c | 1 | ||||
-rw-r--r-- | arch/frv/kernel/frv_ksyms.c | 1 | ||||
-rw-r--r-- | arch/h8300/kernel/h8300_ksyms.c | 1 | ||||
-rw-r--r-- | arch/i386/kernel/i386_ksyms.c | 1 | ||||
-rw-r--r-- | arch/m32r/kernel/m32r_ksyms.c | 2 | ||||
-rw-r--r-- | arch/m68k/kernel/m68k_ksyms.c | 1 | ||||
-rw-r--r-- | arch/m68knommu/kernel/m68k_ksyms.c | 1 | ||||
-rw-r--r-- | arch/mips/kernel/mips_ksyms.c | 1 | ||||
-rw-r--r-- | arch/parisc/kernel/parisc_ksyms.c | 1 | ||||
-rw-r--r-- | arch/sh/kernel/sh_ksyms.c | 1 | ||||
-rw-r--r-- | arch/sh64/kernel/sh_ksyms.c | 1 | ||||
-rw-r--r-- | arch/sparc/kernel/sparc_ksyms.c | 1 | ||||
-rw-r--r-- | arch/sparc64/kernel/sparc64_ksyms.c | 1 | ||||
-rw-r--r-- | arch/v850/kernel/v850_ksyms.c | 1 | ||||
-rw-r--r-- | arch/x86_64/kernel/x8664_ksyms.c | 1 | ||||
-rw-r--r-- | arch/xtensa/kernel/xtensa_ksyms.c | 1 | ||||
-rw-r--r-- | lib/string.c | 1 |
20 files changed, 1 insertions, 20 deletions
diff --git a/arch/alpha/kernel/alpha_ksyms.c b/arch/alpha/kernel/alpha_ksyms.c index 9d6186d50245..c645c5e14786 100644 --- a/arch/alpha/kernel/alpha_ksyms.c +++ b/arch/alpha/kernel/alpha_ksyms.c | |||
@@ -76,7 +76,6 @@ EXPORT_SYMBOL(strncpy); | |||
76 | EXPORT_SYMBOL(strnlen); | 76 | EXPORT_SYMBOL(strnlen); |
77 | EXPORT_SYMBOL(strncat); | 77 | EXPORT_SYMBOL(strncat); |
78 | EXPORT_SYMBOL(strstr); | 78 | EXPORT_SYMBOL(strstr); |
79 | EXPORT_SYMBOL(strpbrk); | ||
80 | EXPORT_SYMBOL(strchr); | 79 | EXPORT_SYMBOL(strchr); |
81 | EXPORT_SYMBOL(strrchr); | 80 | EXPORT_SYMBOL(strrchr); |
82 | EXPORT_SYMBOL(memcmp); | 81 | EXPORT_SYMBOL(memcmp); |
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index ee083b3f0522..c49b5d4d7fca 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c | |||
@@ -101,7 +101,6 @@ EXPORT_SYMBOL(__raw_writesl); | |||
101 | 101 | ||
102 | /* string / mem functions */ | 102 | /* string / mem functions */ |
103 | EXPORT_SYMBOL(strchr); | 103 | EXPORT_SYMBOL(strchr); |
104 | EXPORT_SYMBOL(strpbrk); | ||
105 | EXPORT_SYMBOL(strrchr); | 104 | EXPORT_SYMBOL(strrchr); |
106 | EXPORT_SYMBOL(memset); | 105 | EXPORT_SYMBOL(memset); |
107 | EXPORT_SYMBOL(memcpy); | 106 | EXPORT_SYMBOL(memcpy); |
diff --git a/arch/arm26/kernel/armksyms.c b/arch/arm26/kernel/armksyms.c index a6a1b3373444..9d66c27f2724 100644 --- a/arch/arm26/kernel/armksyms.c +++ b/arch/arm26/kernel/armksyms.c | |||
@@ -152,7 +152,6 @@ EXPORT_SYMBOL(strncmp); | |||
152 | EXPORT_SYMBOL(strchr); | 152 | EXPORT_SYMBOL(strchr); |
153 | EXPORT_SYMBOL(strlen); | 153 | EXPORT_SYMBOL(strlen); |
154 | EXPORT_SYMBOL(strnlen); | 154 | EXPORT_SYMBOL(strnlen); |
155 | EXPORT_SYMBOL(strpbrk); | ||
156 | EXPORT_SYMBOL(strrchr); | 155 | EXPORT_SYMBOL(strrchr); |
157 | EXPORT_SYMBOL(strstr); | 156 | EXPORT_SYMBOL(strstr); |
158 | EXPORT_SYMBOL(memset); | 157 | EXPORT_SYMBOL(memset); |
diff --git a/arch/cris/kernel/crisksyms.c b/arch/cris/kernel/crisksyms.c index de39725da920..d57859053ce7 100644 --- a/arch/cris/kernel/crisksyms.c +++ b/arch/cris/kernel/crisksyms.c | |||
@@ -39,7 +39,6 @@ EXPORT_SYMBOL(loops_per_usec); | |||
39 | /* String functions */ | 39 | /* String functions */ |
40 | EXPORT_SYMBOL(memcmp); | 40 | EXPORT_SYMBOL(memcmp); |
41 | EXPORT_SYMBOL(memmove); | 41 | EXPORT_SYMBOL(memmove); |
42 | EXPORT_SYMBOL(strpbrk); | ||
43 | EXPORT_SYMBOL(strstr); | 42 | EXPORT_SYMBOL(strstr); |
44 | EXPORT_SYMBOL(strcpy); | 43 | EXPORT_SYMBOL(strcpy); |
45 | EXPORT_SYMBOL(strchr); | 44 | EXPORT_SYMBOL(strchr); |
diff --git a/arch/frv/kernel/frv_ksyms.c b/arch/frv/kernel/frv_ksyms.c index 07c8ffa0dd39..0f273a7aca5a 100644 --- a/arch/frv/kernel/frv_ksyms.c +++ b/arch/frv/kernel/frv_ksyms.c | |||
@@ -27,7 +27,6 @@ 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); | ||
31 | EXPORT_SYMBOL(strrchr); | 30 | EXPORT_SYMBOL(strrchr); |
32 | EXPORT_SYMBOL(strstr); | 31 | EXPORT_SYMBOL(strstr); |
33 | EXPORT_SYMBOL(strchr); | 32 | EXPORT_SYMBOL(strchr); |
diff --git a/arch/h8300/kernel/h8300_ksyms.c b/arch/h8300/kernel/h8300_ksyms.c index b6cd78c972bb..f8d6dee84781 100644 --- a/arch/h8300/kernel/h8300_ksyms.c +++ b/arch/h8300/kernel/h8300_ksyms.c | |||
@@ -25,7 +25,6 @@ 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); | ||
29 | EXPORT_SYMBOL(strrchr); | 28 | EXPORT_SYMBOL(strrchr); |
30 | EXPORT_SYMBOL(strstr); | 29 | EXPORT_SYMBOL(strstr); |
31 | EXPORT_SYMBOL(strchr); | 30 | EXPORT_SYMBOL(strchr); |
diff --git a/arch/i386/kernel/i386_ksyms.c b/arch/i386/kernel/i386_ksyms.c index 055325056a74..036a9857936f 100644 --- a/arch/i386/kernel/i386_ksyms.c +++ b/arch/i386/kernel/i386_ksyms.c | |||
@@ -19,7 +19,6 @@ EXPORT_SYMBOL(__put_user_2); | |||
19 | EXPORT_SYMBOL(__put_user_4); | 19 | EXPORT_SYMBOL(__put_user_4); |
20 | EXPORT_SYMBOL(__put_user_8); | 20 | EXPORT_SYMBOL(__put_user_8); |
21 | 21 | ||
22 | EXPORT_SYMBOL(strpbrk); | ||
23 | EXPORT_SYMBOL(strstr); | 22 | EXPORT_SYMBOL(strstr); |
24 | 23 | ||
25 | #ifdef CONFIG_SMP | 24 | #ifdef CONFIG_SMP |
diff --git a/arch/m32r/kernel/m32r_ksyms.c b/arch/m32r/kernel/m32r_ksyms.c index 92d66fd17186..c50330fa83b9 100644 --- a/arch/m32r/kernel/m32r_ksyms.c +++ b/arch/m32r/kernel/m32r_ksyms.c | |||
@@ -35,8 +35,6 @@ EXPORT_SYMBOL(__udelay); | |||
35 | EXPORT_SYMBOL(__delay); | 35 | EXPORT_SYMBOL(__delay); |
36 | EXPORT_SYMBOL(__const_udelay); | 36 | EXPORT_SYMBOL(__const_udelay); |
37 | 37 | ||
38 | EXPORT_SYMBOL(strpbrk); | ||
39 | |||
40 | EXPORT_SYMBOL(strncpy_from_user); | 38 | EXPORT_SYMBOL(strncpy_from_user); |
41 | EXPORT_SYMBOL(__strncpy_from_user); | 39 | EXPORT_SYMBOL(__strncpy_from_user); |
42 | EXPORT_SYMBOL(clear_user); | 40 | EXPORT_SYMBOL(clear_user); |
diff --git a/arch/m68k/kernel/m68k_ksyms.c b/arch/m68k/kernel/m68k_ksyms.c index c3319514a85e..5b7952ea2bae 100644 --- a/arch/m68k/kernel/m68k_ksyms.c +++ b/arch/m68k/kernel/m68k_ksyms.c | |||
@@ -57,7 +57,6 @@ EXPORT_SYMBOL(dump_thread); | |||
57 | EXPORT_SYMBOL(strnlen); | 57 | EXPORT_SYMBOL(strnlen); |
58 | EXPORT_SYMBOL(strrchr); | 58 | EXPORT_SYMBOL(strrchr); |
59 | EXPORT_SYMBOL(strstr); | 59 | EXPORT_SYMBOL(strstr); |
60 | EXPORT_SYMBOL(strpbrk); | ||
61 | EXPORT_SYMBOL(enable_irq); | 60 | EXPORT_SYMBOL(enable_irq); |
62 | EXPORT_SYMBOL(disable_irq); | 61 | EXPORT_SYMBOL(disable_irq); |
63 | EXPORT_SYMBOL(kernel_thread); | 62 | EXPORT_SYMBOL(kernel_thread); |
diff --git a/arch/m68knommu/kernel/m68k_ksyms.c b/arch/m68knommu/kernel/m68k_ksyms.c index f9b4ea16c099..4320d5dcc9cb 100644 --- a/arch/m68knommu/kernel/m68k_ksyms.c +++ b/arch/m68knommu/kernel/m68k_ksyms.c | |||
@@ -26,7 +26,6 @@ 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); | ||
30 | EXPORT_SYMBOL(strrchr); | 29 | EXPORT_SYMBOL(strrchr); |
31 | EXPORT_SYMBOL(strstr); | 30 | EXPORT_SYMBOL(strstr); |
32 | EXPORT_SYMBOL(strchr); | 31 | EXPORT_SYMBOL(strchr); |
diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c index 86e42c633f73..e042f9d2ba31 100644 --- a/arch/mips/kernel/mips_ksyms.c +++ b/arch/mips/kernel/mips_ksyms.c | |||
@@ -39,7 +39,6 @@ EXPORT_SYMBOL(strchr); | |||
39 | EXPORT_SYMBOL(strncmp); | 39 | EXPORT_SYMBOL(strncmp); |
40 | #endif | 40 | #endif |
41 | EXPORT_SYMBOL(strlen); | 41 | EXPORT_SYMBOL(strlen); |
42 | EXPORT_SYMBOL(strpbrk); | ||
43 | EXPORT_SYMBOL(strncat); | 42 | EXPORT_SYMBOL(strncat); |
44 | EXPORT_SYMBOL(strnlen); | 43 | EXPORT_SYMBOL(strnlen); |
45 | EXPORT_SYMBOL(strrchr); | 44 | EXPORT_SYMBOL(strrchr); |
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c index 47ca5c0a323b..fc107add627c 100644 --- a/arch/parisc/kernel/parisc_ksyms.c +++ b/arch/parisc/kernel/parisc_ksyms.c | |||
@@ -31,7 +31,6 @@ | |||
31 | 31 | ||
32 | #include <linux/string.h> | 32 | #include <linux/string.h> |
33 | EXPORT_SYMBOL(memset); | 33 | EXPORT_SYMBOL(memset); |
34 | EXPORT_SYMBOL(strpbrk); | ||
35 | 34 | ||
36 | #include <asm/atomic.h> | 35 | #include <asm/atomic.h> |
37 | EXPORT_SYMBOL(__xchg8); | 36 | EXPORT_SYMBOL(__xchg8); |
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c index 1cf94a618be3..d5d032533a8b 100644 --- a/arch/sh/kernel/sh_ksyms.c +++ b/arch/sh/kernel/sh_ksyms.c | |||
@@ -37,7 +37,6 @@ EXPORT_SYMBOL(disable_irq_nosync); | |||
37 | EXPORT_SYMBOL(irq_desc); | 37 | EXPORT_SYMBOL(irq_desc); |
38 | EXPORT_SYMBOL(no_irq_type); | 38 | EXPORT_SYMBOL(no_irq_type); |
39 | 39 | ||
40 | EXPORT_SYMBOL(strpbrk); | ||
41 | EXPORT_SYMBOL(strstr); | 40 | EXPORT_SYMBOL(strstr); |
42 | EXPORT_SYMBOL(strlen); | 41 | EXPORT_SYMBOL(strlen); |
43 | EXPORT_SYMBOL(strnlen); | 42 | EXPORT_SYMBOL(strnlen); |
diff --git a/arch/sh64/kernel/sh_ksyms.c b/arch/sh64/kernel/sh_ksyms.c index de29c45f23a7..6f3a1c946339 100644 --- a/arch/sh64/kernel/sh_ksyms.c +++ b/arch/sh64/kernel/sh_ksyms.c | |||
@@ -41,7 +41,6 @@ EXPORT_SYMBOL(kernel_thread); | |||
41 | /* Networking helper routines. */ | 41 | /* Networking helper routines. */ |
42 | EXPORT_SYMBOL(csum_partial_copy); | 42 | EXPORT_SYMBOL(csum_partial_copy); |
43 | 43 | ||
44 | EXPORT_SYMBOL(strpbrk); | ||
45 | EXPORT_SYMBOL(strstr); | 44 | EXPORT_SYMBOL(strstr); |
46 | 45 | ||
47 | #ifdef CONFIG_VT | 46 | #ifdef CONFIG_VT |
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c index 2c21d7907635..ec1c9687d679 100644 --- a/arch/sparc/kernel/sparc_ksyms.c +++ b/arch/sparc/kernel/sparc_ksyms.c | |||
@@ -263,7 +263,6 @@ EXPORT_SYMBOL(strcmp); | |||
263 | EXPORT_SYMBOL(strncmp); | 263 | EXPORT_SYMBOL(strncmp); |
264 | EXPORT_SYMBOL(strchr); | 264 | EXPORT_SYMBOL(strchr); |
265 | EXPORT_SYMBOL(strrchr); | 265 | EXPORT_SYMBOL(strrchr); |
266 | EXPORT_SYMBOL(strpbrk); | ||
267 | EXPORT_SYMBOL(strstr); | 266 | EXPORT_SYMBOL(strstr); |
268 | EXPORT_SYMBOL(page_kernel); | 267 | EXPORT_SYMBOL(page_kernel); |
269 | 268 | ||
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c index f5e8db1de76b..62d8a99271ea 100644 --- a/arch/sparc64/kernel/sparc64_ksyms.c +++ b/arch/sparc64/kernel/sparc64_ksyms.c | |||
@@ -276,7 +276,6 @@ EXPORT_SYMBOL(__prom_getsibling); | |||
276 | EXPORT_SYMBOL(strlen); | 276 | EXPORT_SYMBOL(strlen); |
277 | EXPORT_SYMBOL(__strlen_user); | 277 | EXPORT_SYMBOL(__strlen_user); |
278 | EXPORT_SYMBOL(__strnlen_user); | 278 | EXPORT_SYMBOL(__strnlen_user); |
279 | EXPORT_SYMBOL(strpbrk); | ||
280 | 279 | ||
281 | #ifdef CONFIG_SOLARIS_EMUL_MODULE | 280 | #ifdef CONFIG_SOLARIS_EMUL_MODULE |
282 | EXPORT_SYMBOL(linux_sparc_syscall); | 281 | EXPORT_SYMBOL(linux_sparc_syscall); |
diff --git a/arch/v850/kernel/v850_ksyms.c b/arch/v850/kernel/v850_ksyms.c index 8ffc29c1c89d..6bcfcfe88384 100644 --- a/arch/v850/kernel/v850_ksyms.c +++ b/arch/v850/kernel/v850_ksyms.c | |||
@@ -43,7 +43,6 @@ EXPORT_SYMBOL (strncmp); | |||
43 | EXPORT_SYMBOL (strchr); | 43 | EXPORT_SYMBOL (strchr); |
44 | EXPORT_SYMBOL (strlen); | 44 | EXPORT_SYMBOL (strlen); |
45 | EXPORT_SYMBOL (strnlen); | 45 | EXPORT_SYMBOL (strnlen); |
46 | EXPORT_SYMBOL (strpbrk); | ||
47 | EXPORT_SYMBOL (strrchr); | 46 | EXPORT_SYMBOL (strrchr); |
48 | EXPORT_SYMBOL (strstr); | 47 | EXPORT_SYMBOL (strstr); |
49 | EXPORT_SYMBOL (memset); | 48 | EXPORT_SYMBOL (memset); |
diff --git a/arch/x86_64/kernel/x8664_ksyms.c b/arch/x86_64/kernel/x8664_ksyms.c index fec4e521c01c..1def21c9f7cd 100644 --- a/arch/x86_64/kernel/x8664_ksyms.c +++ b/arch/x86_64/kernel/x8664_ksyms.c | |||
@@ -120,7 +120,6 @@ extern void * memcpy(void *,const void *,__kernel_size_t); | |||
120 | extern void * __memcpy(void *,const void *,__kernel_size_t); | 120 | extern void * __memcpy(void *,const void *,__kernel_size_t); |
121 | 121 | ||
122 | EXPORT_SYMBOL(memset); | 122 | EXPORT_SYMBOL(memset); |
123 | EXPORT_SYMBOL(strpbrk); | ||
124 | EXPORT_SYMBOL(memmove); | 123 | EXPORT_SYMBOL(memmove); |
125 | EXPORT_SYMBOL(memcpy); | 124 | EXPORT_SYMBOL(memcpy); |
126 | EXPORT_SYMBOL(__memcpy); | 125 | EXPORT_SYMBOL(__memcpy); |
diff --git a/arch/xtensa/kernel/xtensa_ksyms.c b/arch/xtensa/kernel/xtensa_ksyms.c index 152b9370789b..a15b6e3e72c8 100644 --- a/arch/xtensa/kernel/xtensa_ksyms.c +++ b/arch/xtensa/kernel/xtensa_ksyms.c | |||
@@ -48,7 +48,6 @@ EXPORT_SYMBOL(memchr); | |||
48 | EXPORT_SYMBOL(strcat); | 48 | EXPORT_SYMBOL(strcat); |
49 | EXPORT_SYMBOL(strchr); | 49 | EXPORT_SYMBOL(strchr); |
50 | EXPORT_SYMBOL(strlen); | 50 | EXPORT_SYMBOL(strlen); |
51 | EXPORT_SYMBOL(strpbrk); | ||
52 | EXPORT_SYMBOL(strncat); | 51 | EXPORT_SYMBOL(strncat); |
53 | EXPORT_SYMBOL(strnlen); | 52 | EXPORT_SYMBOL(strnlen); |
54 | EXPORT_SYMBOL(strrchr); | 53 | EXPORT_SYMBOL(strrchr); |
diff --git a/lib/string.c b/lib/string.c index b3c28a3f6332..037a48acedbb 100644 --- a/lib/string.c +++ b/lib/string.c | |||
@@ -403,6 +403,7 @@ char *strpbrk(const char *cs, const char *ct) | |||
403 | } | 403 | } |
404 | return NULL; | 404 | return NULL; |
405 | } | 405 | } |
406 | EXPORT_SYMBOL(strpbrk); | ||
406 | #endif | 407 | #endif |
407 | 408 | ||
408 | #ifndef __HAVE_ARCH_STRSEP | 409 | #ifndef __HAVE_ARCH_STRSEP |