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
4ff3fccd
Commit
4ff3fccd
authored
Nov 04, 2014
by
Ralf Baechle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MIPS: Remove __strlen_user().
Signed-off-by:
Ralf Baechle
<
ralf@linux-mips.org
>
parent
e5810fa0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
34 deletions
+0
-34
arch/mips/include/asm/uaccess.h
arch/mips/include/asm/uaccess.h
+0
-27
arch/mips/kernel/mips_ksyms.c
arch/mips/kernel/mips_ksyms.c
+0
-4
arch/mips/lib/strlen_user.S
arch/mips/lib/strlen_user.S
+0
-3
No files found.
arch/mips/include/asm/uaccess.h
View file @
4ff3fccd
...
@@ -1325,33 +1325,6 @@ strncpy_from_user(char *__to, const char __user *__from, long __len)
...
@@ -1325,33 +1325,6 @@ strncpy_from_user(char *__to, const char __user *__from, long __len)
return
res
;
return
res
;
}
}
/* Returns: 0 if bad, string length+1 (memory size) of string if ok */
static
inline
long
__strlen_user
(
const
char
__user
*
s
)
{
long
res
;
if
(
segment_eq
(
get_fs
(),
get_ds
()))
{
__asm__
__volatile__
(
"move
\t
$4, %1
\n\t
"
__MODULE_JAL
(
__strlen_kernel_nocheck_asm
)
"move
\t
%0, $2"
:
"=r"
(
res
)
:
"r"
(
s
)
:
"$2"
,
"$4"
,
__UA_t0
,
"$31"
);
}
else
{
might_fault
();
__asm__
__volatile__
(
"move
\t
$4, %1
\n\t
"
__MODULE_JAL
(
__strlen_user_nocheck_asm
)
"move
\t
%0, $2"
:
"=r"
(
res
)
:
"r"
(
s
)
:
"$2"
,
"$4"
,
__UA_t0
,
"$31"
);
}
return
res
;
}
/*
/*
* strlen_user: - Get the size of a string in user space.
* strlen_user: - Get the size of a string in user space.
* @str: The string to measure.
* @str: The string to measure.
...
...
arch/mips/kernel/mips_ksyms.c
View file @
4ff3fccd
...
@@ -24,9 +24,7 @@ extern long __strncpy_from_user_nocheck_asm(char *__to,
...
@@ -24,9 +24,7 @@ extern long __strncpy_from_user_nocheck_asm(char *__to,
const
char
*
__from
,
long
__len
);
const
char
*
__from
,
long
__len
);
extern
long
__strncpy_from_user_asm
(
char
*
__to
,
const
char
*
__from
,
extern
long
__strncpy_from_user_asm
(
char
*
__to
,
const
char
*
__from
,
long
__len
);
long
__len
);
extern
long
__strlen_kernel_nocheck_asm
(
const
char
*
s
);
extern
long
__strlen_kernel_asm
(
const
char
*
s
);
extern
long
__strlen_kernel_asm
(
const
char
*
s
);
extern
long
__strlen_user_nocheck_asm
(
const
char
*
s
);
extern
long
__strlen_user_asm
(
const
char
*
s
);
extern
long
__strlen_user_asm
(
const
char
*
s
);
extern
long
__strnlen_kernel_nocheck_asm
(
const
char
*
s
);
extern
long
__strnlen_kernel_nocheck_asm
(
const
char
*
s
);
extern
long
__strnlen_kernel_asm
(
const
char
*
s
);
extern
long
__strnlen_kernel_asm
(
const
char
*
s
);
...
@@ -62,9 +60,7 @@ EXPORT_SYMBOL(__strncpy_from_kernel_nocheck_asm);
...
@@ -62,9 +60,7 @@ EXPORT_SYMBOL(__strncpy_from_kernel_nocheck_asm);
EXPORT_SYMBOL
(
__strncpy_from_kernel_asm
);
EXPORT_SYMBOL
(
__strncpy_from_kernel_asm
);
EXPORT_SYMBOL
(
__strncpy_from_user_nocheck_asm
);
EXPORT_SYMBOL
(
__strncpy_from_user_nocheck_asm
);
EXPORT_SYMBOL
(
__strncpy_from_user_asm
);
EXPORT_SYMBOL
(
__strncpy_from_user_asm
);
EXPORT_SYMBOL
(
__strlen_kernel_nocheck_asm
);
EXPORT_SYMBOL
(
__strlen_kernel_asm
);
EXPORT_SYMBOL
(
__strlen_kernel_asm
);
EXPORT_SYMBOL
(
__strlen_user_nocheck_asm
);
EXPORT_SYMBOL
(
__strlen_user_asm
);
EXPORT_SYMBOL
(
__strlen_user_asm
);
EXPORT_SYMBOL
(
__strnlen_kernel_nocheck_asm
);
EXPORT_SYMBOL
(
__strnlen_kernel_nocheck_asm
);
EXPORT_SYMBOL
(
__strnlen_kernel_asm
);
EXPORT_SYMBOL
(
__strnlen_kernel_asm
);
...
...
arch/mips/lib/strlen_user.S
View file @
4ff3fccd
...
@@ -28,7 +28,6 @@ LEAF(__strlen_\func\()_asm)
...
@@ -28,7 +28,6 @@ LEAF(__strlen_\func\()_asm)
and
v0
,
a0
and
v0
,
a0
bnez
v0
,
.
Lfault
\
@
bnez
v0
,
.
Lfault
\
@
FEXPORT
(
__strlen_
\
func
\()
_nocheck_asm
)
move
v0
,
a0
move
v0
,
a0
.
ifeqs
"\
func
",
"kernel"
.
ifeqs
"\
func
",
"kernel"
1
:
EX
(
lbu
,
v1
,
(
v0
),
.
Lfault
\
@
)
1
:
EX
(
lbu
,
v1
,
(
v0
),
.
Lfault
\
@
)
...
@@ -48,9 +47,7 @@ FEXPORT(__strlen_\func\()_nocheck_asm)
...
@@ -48,9 +47,7 @@ FEXPORT(__strlen_\func\()_nocheck_asm)
#ifndef CONFIG_EVA
#ifndef CONFIG_EVA
/
*
Set
aliases
*/
/
*
Set
aliases
*/
.
global
__strlen_user_asm
.
global
__strlen_user_asm
.
global
__strlen_user_nocheck_asm
.
set
__strlen_user_asm
,
__strlen_kernel_asm
.
set
__strlen_user_asm
,
__strlen_kernel_asm
.
set
__strlen_user_nocheck_asm
,
__strlen_kernel_nocheck_asm
#endif
#endif
__BUILD_STRLEN_ASM
kernel
__BUILD_STRLEN_ASM
kernel
...
...
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