diff options
author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2005-05-05 19:15:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 19:36:33 -0400 |
commit | 0c28130b5c9e8f0b153436d3dae39482e5a70af1 (patch) | |
tree | df2c3f91108cc897cd799196b6044ebb617a8f0a /arch | |
parent | 23352fc252495fdc072b3bd29f57c4c6b7a6bd83 (diff) |
[PATCH] x86_64: make string func definition work as intended
In include/asm-x86_64/string.h there are such comments:
/* Use C out of line version for memcmp */
#define memcmp __builtin_memcmp
int memcmp(const void * cs,const void * ct,size_t count);
This would mean that if the compiler does not decide to use __builtin_memcmp,
it emits a call to memcmp to be satisfied by the C out-of-line version in
lib/string.c. What happens is that after preprocessing, in lib/string.i you
may find the definition of "__builtin_strcmp".
Actually, by accident, in the object you will find the definition of strcmp
and such (maybe a trick intended to redirect calls to __builtin_memcmp to the
default memcmp when the definition is not expanded); however, this particular
case is not a documented feature as far as I can see.
Also, the EXPORT_SYMBOL does not work, so it's duplicated in the arch.
I simply added some #undef to lib/string.c and removed the (now duplicated)
exports in x86-64 and UML/x86_64 subarchs (the second ones are introduced by
another patch I just posted for -mm).
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
CC: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/i386/kernel/i386_ksyms.c | 4 | ||||
-rw-r--r-- | arch/um/sys-x86_64/ksyms.c | 3 | ||||
-rw-r--r-- | arch/x86_64/kernel/x8664_ksyms.c | 13 |
3 files changed, 0 insertions, 20 deletions
diff --git a/arch/i386/kernel/i386_ksyms.c b/arch/i386/kernel/i386_ksyms.c index 14ec354bec92..903190a4b3ff 100644 --- a/arch/i386/kernel/i386_ksyms.c +++ b/arch/i386/kernel/i386_ksyms.c | |||
@@ -169,10 +169,6 @@ EXPORT_SYMBOL(rtc_lock); | |||
169 | EXPORT_SYMBOL_GPL(set_nmi_callback); | 169 | EXPORT_SYMBOL_GPL(set_nmi_callback); |
170 | EXPORT_SYMBOL_GPL(unset_nmi_callback); | 170 | EXPORT_SYMBOL_GPL(unset_nmi_callback); |
171 | 171 | ||
172 | #undef memcmp | ||
173 | extern int memcmp(const void *,const void *,__kernel_size_t); | ||
174 | EXPORT_SYMBOL(memcmp); | ||
175 | |||
176 | EXPORT_SYMBOL(register_die_notifier); | 172 | EXPORT_SYMBOL(register_die_notifier); |
177 | #ifdef CONFIG_HAVE_DEC_LOCK | 173 | #ifdef CONFIG_HAVE_DEC_LOCK |
178 | EXPORT_SYMBOL(_atomic_dec_and_lock); | 174 | EXPORT_SYMBOL(_atomic_dec_and_lock); |
diff --git a/arch/um/sys-x86_64/ksyms.c b/arch/um/sys-x86_64/ksyms.c index 8d30fa8393c8..a27f0ee6a4f6 100644 --- a/arch/um/sys-x86_64/ksyms.c +++ b/arch/um/sys-x86_64/ksyms.c | |||
@@ -14,9 +14,6 @@ EXPORT_SYMBOL(__up_wakeup); | |||
14 | 14 | ||
15 | /*XXX: we need them because they would be exported by x86_64 */ | 15 | /*XXX: we need them because they would be exported by x86_64 */ |
16 | EXPORT_SYMBOL(__memcpy); | 16 | EXPORT_SYMBOL(__memcpy); |
17 | EXPORT_SYMBOL(strcmp); | ||
18 | EXPORT_SYMBOL(strcat); | ||
19 | EXPORT_SYMBOL(strcpy); | ||
20 | 17 | ||
21 | /* Networking helper routines. */ | 18 | /* Networking helper routines. */ |
22 | /*EXPORT_SYMBOL(csum_partial_copy_from); | 19 | /*EXPORT_SYMBOL(csum_partial_copy_from); |
diff --git a/arch/x86_64/kernel/x8664_ksyms.c b/arch/x86_64/kernel/x8664_ksyms.c index 88626e626886..a43dedb58fa2 100644 --- a/arch/x86_64/kernel/x8664_ksyms.c +++ b/arch/x86_64/kernel/x8664_ksyms.c | |||
@@ -139,35 +139,23 @@ EXPORT_SYMBOL_GPL(unset_nmi_callback); | |||
139 | #undef memmove | 139 | #undef memmove |
140 | #undef memchr | 140 | #undef memchr |
141 | #undef strlen | 141 | #undef strlen |
142 | #undef strcpy | ||
143 | #undef strncmp | 142 | #undef strncmp |
144 | #undef strncpy | 143 | #undef strncpy |
145 | #undef strchr | 144 | #undef strchr |
146 | #undef strcmp | ||
147 | #undef strcpy | ||
148 | #undef strcat | ||
149 | #undef memcmp | ||
150 | 145 | ||
151 | extern void * memset(void *,int,__kernel_size_t); | 146 | extern void * memset(void *,int,__kernel_size_t); |
152 | extern size_t strlen(const char *); | 147 | extern size_t strlen(const char *); |
153 | extern void * memmove(void * dest,const void *src,size_t count); | 148 | extern void * memmove(void * dest,const void *src,size_t count); |
154 | extern char * strcpy(char * dest,const char *src); | ||
155 | extern int strcmp(const char * cs,const char * ct); | ||
156 | extern void *memchr(const void *s, int c, size_t n); | 149 | extern void *memchr(const void *s, int c, size_t n); |
157 | extern void * memcpy(void *,const void *,__kernel_size_t); | 150 | extern void * memcpy(void *,const void *,__kernel_size_t); |
158 | extern void * __memcpy(void *,const void *,__kernel_size_t); | 151 | extern void * __memcpy(void *,const void *,__kernel_size_t); |
159 | extern char * strcat(char *, const char *); | ||
160 | extern int memcmp(const void * cs,const void * ct,size_t count); | ||
161 | 152 | ||
162 | EXPORT_SYMBOL(memset); | 153 | EXPORT_SYMBOL(memset); |
163 | EXPORT_SYMBOL(strlen); | 154 | EXPORT_SYMBOL(strlen); |
164 | EXPORT_SYMBOL(memmove); | 155 | EXPORT_SYMBOL(memmove); |
165 | EXPORT_SYMBOL(strcpy); | ||
166 | EXPORT_SYMBOL(strncmp); | 156 | EXPORT_SYMBOL(strncmp); |
167 | EXPORT_SYMBOL(strncpy); | 157 | EXPORT_SYMBOL(strncpy); |
168 | EXPORT_SYMBOL(strchr); | 158 | EXPORT_SYMBOL(strchr); |
169 | EXPORT_SYMBOL(strcmp); | ||
170 | EXPORT_SYMBOL(strcat); | ||
171 | EXPORT_SYMBOL(strncat); | 159 | EXPORT_SYMBOL(strncat); |
172 | EXPORT_SYMBOL(memchr); | 160 | EXPORT_SYMBOL(memchr); |
173 | EXPORT_SYMBOL(strrchr); | 161 | EXPORT_SYMBOL(strrchr); |
@@ -175,7 +163,6 @@ EXPORT_SYMBOL(strnlen); | |||
175 | EXPORT_SYMBOL(memscan); | 163 | EXPORT_SYMBOL(memscan); |
176 | EXPORT_SYMBOL(memcpy); | 164 | EXPORT_SYMBOL(memcpy); |
177 | EXPORT_SYMBOL(__memcpy); | 165 | EXPORT_SYMBOL(__memcpy); |
178 | EXPORT_SYMBOL(memcmp); | ||
179 | 166 | ||
180 | #ifdef CONFIG_RWSEM_XCHGADD_ALGORITHM | 167 | #ifdef CONFIG_RWSEM_XCHGADD_ALGORITHM |
181 | /* prototypes are wrong, these are assembly with custom calling functions */ | 168 | /* prototypes are wrong, these are assembly with custom calling functions */ |