Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
0fdee0d4
Commit
0fdee0d4
authored
Aug 23, 2004
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SPARC64]: Kill bogus __strlen symbol and strncmp inline cruft.
Signed-off-by:
David S. Miller
<
davem@redhat.com
>
parent
e3c47cfb
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
72 deletions
+4
-72
arch/sparc64/kernel/sparc64_ksyms.c
arch/sparc64/kernel/sparc64_ksyms.c
+1
-4
arch/sparc64/lib/strlen.S
arch/sparc64/lib/strlen.S
+1
-2
arch/sparc64/lib/strncmp.S
arch/sparc64/lib/strncmp.S
+1
-2
include/asm-sparc64/string.h
include/asm-sparc64/string.h
+1
-64
No files found.
arch/sparc64/kernel/sparc64_ksyms.c
View file @
0fdee0d4
...
...
@@ -74,8 +74,6 @@ extern void *__bzero(void *, size_t);
extern
void
*
__memscan_zero
(
void
*
,
size_t
);
extern
void
*
__memscan_generic
(
void
*
,
int
,
size_t
);
extern
int
__memcmp
(
const
void
*
,
const
void
*
,
__kernel_size_t
);
extern
int
__strncmp
(
const
char
*
,
const
char
*
,
__kernel_size_t
);
extern
__kernel_size_t
__strlen
(
const
char
*
);
extern
__kernel_size_t
strlen
(
const
char
*
);
extern
void
linux_sparc_syscall
(
void
);
extern
void
rtrap
(
void
);
...
...
@@ -295,7 +293,6 @@ EXPORT_SYMBOL(__prom_getchild);
EXPORT_SYMBOL
(
__prom_getsibling
);
/* sparc library symbols */
EXPORT_SYMBOL
(
__strlen
);
EXPORT_SYMBOL
(
strlen
);
EXPORT_SYMBOL
(
strnlen
);
EXPORT_SYMBOL
(
__strlen_user
);
...
...
@@ -341,7 +338,6 @@ EXPORT_SYMBOL(__bzero);
EXPORT_SYMBOL
(
__memscan_zero
);
EXPORT_SYMBOL
(
__memscan_generic
);
EXPORT_SYMBOL
(
__memcmp
);
EXPORT_SYMBOL
(
__strncmp
);
EXPORT_SYMBOL
(
__memset
);
EXPORT_SYMBOL
(
memchr
);
...
...
@@ -376,6 +372,7 @@ EXPORT_SYMBOL_NOVERS(memcmp);
EXPORT_SYMBOL_NOVERS
(
memcpy
);
EXPORT_SYMBOL_NOVERS
(
memset
);
EXPORT_SYMBOL_NOVERS
(
memmove
);
EXPORT_SYMBOL_NOVERS
(
strncmp
);
void
VISenter
(
void
);
/* RAID code needs this */
...
...
arch/sparc64/lib/strlen.S
View file @
0fdee0d4
...
...
@@ -9,9 +9,8 @@
#define HI_MAGIC 0x80808080
.
align
32
.
global
strlen
,
__strlen
.
global
strlen
strlen
:
__strlen
:
mov
%
o0
,
%
o1
andcc
%
o0
,
3
,
%
g0
be
,
pt
%
icc
,
9
f
...
...
arch/sparc64/lib/strncmp.S
View file @
0fdee0d4
...
...
@@ -8,8 +8,7 @@
.
text
.
align
4
.
global
__strncmp
,
strncmp
__strncmp
:
.
global
strncmp
strncmp
:
brlez
,
pn
%
o2
,
3
f
lduba
[%
o0
]
(
ASI_PNF
),
%
o3
...
...
include/asm-sparc64/string.h
View file @
0fdee0d4
...
...
@@ -71,73 +71,10 @@ extern int memcmp(const void *,const void *,__kernel_size_t);
/* Now the str*() stuff... */
#define __HAVE_ARCH_STRLEN
extern
__kernel_size_t
__strlen
(
const
char
*
);
extern
__kernel_size_t
strlen
(
const
char
*
);
#define __HAVE_ARCH_STRNCMP
extern
int
__strncmp
(
const
char
*
,
const
char
*
,
__kernel_size_t
);
static
inline
int
__constant_strncmp
(
const
char
*
src
,
const
char
*
dest
,
__kernel_size_t
count
)
{
register
int
retval
;
switch
(
count
)
{
case
0
:
return
0
;
case
1
:
return
(
src
[
0
]
-
dest
[
0
]);
case
2
:
retval
=
(
src
[
0
]
-
dest
[
0
]);
if
(
!
retval
&&
src
[
0
])
retval
=
(
src
[
1
]
-
dest
[
1
]);
return
retval
;
case
3
:
retval
=
(
src
[
0
]
-
dest
[
0
]);
if
(
!
retval
&&
src
[
0
])
{
retval
=
(
src
[
1
]
-
dest
[
1
]);
if
(
!
retval
&&
src
[
1
])
retval
=
(
src
[
2
]
-
dest
[
2
]);
}
return
retval
;
case
4
:
retval
=
(
src
[
0
]
-
dest
[
0
]);
if
(
!
retval
&&
src
[
0
])
{
retval
=
(
src
[
1
]
-
dest
[
1
]);
if
(
!
retval
&&
src
[
1
])
{
retval
=
(
src
[
2
]
-
dest
[
2
]);
if
(
!
retval
&&
src
[
2
])
retval
=
(
src
[
3
]
-
dest
[
3
]);
}
}
return
retval
;
case
5
:
retval
=
(
src
[
0
]
-
dest
[
0
]);
if
(
!
retval
&&
src
[
0
])
{
retval
=
(
src
[
1
]
-
dest
[
1
]);
if
(
!
retval
&&
src
[
1
])
{
retval
=
(
src
[
2
]
-
dest
[
2
]);
if
(
!
retval
&&
src
[
2
])
{
retval
=
(
src
[
3
]
-
dest
[
3
]);
if
(
!
retval
&&
src
[
3
])
retval
=
(
src
[
4
]
-
dest
[
4
]);
}
}
}
return
retval
;
default:
retval
=
(
src
[
0
]
-
dest
[
0
]);
if
(
!
retval
&&
src
[
0
])
{
retval
=
(
src
[
1
]
-
dest
[
1
]);
if
(
!
retval
&&
src
[
1
])
{
retval
=
(
src
[
2
]
-
dest
[
2
]);
if
(
!
retval
&&
src
[
2
])
retval
=
__strncmp
(
src
+
3
,
dest
+
3
,
count
-
3
);
}
}
return
retval
;
}
}
#undef strncmp
#define strncmp(__arg0, __arg1, __arg2) \
(__builtin_constant_p(__arg2) ? \
__constant_strncmp(__arg0, __arg1, __arg2) : \
__strncmp(__arg0, __arg1, __arg2))
extern
int
strncmp
(
const
char
*
,
const
char
*
,
__kernel_size_t
);
#endif
/* !EXPORT_SYMTAB_STROPS */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment