diff options
author | David S. Miller <davem@davemloft.net> | 2012-05-11 22:53:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-11 22:53:29 -0400 |
commit | b55e81b9f8cf0256bcfc548360aef642630c2919 (patch) | |
tree | 6a4374703f104ddc4cbc3b5f599fd52937000bc5 /arch/sparc/lib | |
parent | afaedde7c9bcbae4ea9ece34990da72da9c360af (diff) |
sparc32: Remove inline strncmp "optimization" for constant counts.
Let the compiler do stuff like this.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/lib')
-rw-r--r-- | arch/sparc/lib/ksyms.c | 5 | ||||
-rw-r--r-- | arch/sparc/lib/strncmp_32.S | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c index f73c2240fe60..1bc8972f029f 100644 --- a/arch/sparc/lib/ksyms.c +++ b/arch/sparc/lib/ksyms.c | |||
@@ -56,8 +56,6 @@ extern int __divdi3(int, int); | |||
56 | extern void (*__copy_1page)(void *, const void *); | 56 | extern void (*__copy_1page)(void *, const void *); |
57 | extern void (*bzero_1page)(void *); | 57 | extern void (*bzero_1page)(void *); |
58 | 58 | ||
59 | extern int __strncmp(const char *, const char *, __kernel_size_t); | ||
60 | |||
61 | extern void ___rw_read_enter(void); | 59 | extern void ___rw_read_enter(void); |
62 | extern void ___rw_read_try(void); | 60 | extern void ___rw_read_try(void); |
63 | extern void ___rw_read_exit(void); | 61 | extern void ___rw_read_exit(void); |
@@ -81,9 +79,6 @@ EXPORT_SYMBOL(__copy_1page); | |||
81 | EXPORT_SYMBOL(__memmove); | 79 | EXPORT_SYMBOL(__memmove); |
82 | EXPORT_SYMBOL(bzero_1page); | 80 | EXPORT_SYMBOL(bzero_1page); |
83 | 81 | ||
84 | /* string functions */ | ||
85 | EXPORT_SYMBOL(__strncmp); | ||
86 | |||
87 | /* Moving data to/from/in userspace. */ | 82 | /* Moving data to/from/in userspace. */ |
88 | EXPORT_SYMBOL(__copy_user); | 83 | EXPORT_SYMBOL(__copy_user); |
89 | 84 | ||
diff --git a/arch/sparc/lib/strncmp_32.S b/arch/sparc/lib/strncmp_32.S index 494ec664537a..1476f574db22 100644 --- a/arch/sparc/lib/strncmp_32.S +++ b/arch/sparc/lib/strncmp_32.S | |||
@@ -5,8 +5,7 @@ | |||
5 | 5 | ||
6 | .text | 6 | .text |
7 | .align 4 | 7 | .align 4 |
8 | .global __strncmp, strncmp | 8 | .global strncmp |
9 | __strncmp: | ||
10 | strncmp: | 9 | strncmp: |
11 | mov %o0, %g3 | 10 | mov %o0, %g3 |
12 | mov 0, %o3 | 11 | mov 0, %o3 |