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
80b249b7
Commit
80b249b7
authored
Oct 14, 2012
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sh: convert to generic sys_execve()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
7147e215
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 addition
and
56 deletions
+1
-56
arch/sh/include/asm/syscalls_32.h
arch/sh/include/asm/syscalls_32.h
+0
-4
arch/sh/include/asm/syscalls_64.h
arch/sh/include/asm/syscalls_64.h
+0
-4
arch/sh/include/asm/unistd.h
arch/sh/include/asm/unistd.h
+1
-0
arch/sh/kernel/process_32.c
arch/sh/kernel/process_32.c
+0
-23
arch/sh/kernel/process_64.c
arch/sh/kernel/process_64.c
+0
-25
No files found.
arch/sh/include/asm/syscalls_32.h
View file @
80b249b7
...
...
@@ -19,10 +19,6 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
asmlinkage
int
sys_vfork
(
unsigned
long
r4
,
unsigned
long
r5
,
unsigned
long
r6
,
unsigned
long
r7
,
struct
pt_regs
__regs
);
asmlinkage
int
sys_execve
(
const
char
__user
*
ufilename
,
const
char
__user
*
const
__user
*
uargv
,
const
char
__user
*
const
__user
*
uenvp
,
unsigned
long
r7
,
struct
pt_regs
__regs
);
asmlinkage
int
sys_sigsuspend
(
old_sigset_t
mask
);
asmlinkage
int
sys_sigaction
(
int
sig
,
const
struct
old_sigaction
__user
*
act
,
struct
old_sigaction
__user
*
oact
);
...
...
arch/sh/include/asm/syscalls_64.h
View file @
80b249b7
...
...
@@ -21,10 +21,6 @@ asmlinkage int sys_vfork(unsigned long r2, unsigned long r3,
unsigned
long
r4
,
unsigned
long
r5
,
unsigned
long
r6
,
unsigned
long
r7
,
struct
pt_regs
*
pregs
);
asmlinkage
int
sys_execve
(
const
char
*
ufilename
,
char
**
uargv
,
char
**
uenvp
,
unsigned
long
r5
,
unsigned
long
r6
,
unsigned
long
r7
,
struct
pt_regs
*
pregs
);
/* Misc syscall related bits */
asmlinkage
long
long
do_syscall_trace_enter
(
struct
pt_regs
*
regs
);
...
...
arch/sh/include/asm/unistd.h
View file @
80b249b7
...
...
@@ -29,6 +29,7 @@
# define __ARCH_WANT_SYS_SIGPENDING
# define __ARCH_WANT_SYS_SIGPROCMASK
# define __ARCH_WANT_SYS_RT_SIGACTION
# define __ARCH_WANT_SYS_EXECVE
/*
* "Conditional" syscalls
...
...
arch/sh/kernel/process_32.c
View file @
80b249b7
...
...
@@ -262,29 +262,6 @@ asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,
0
,
NULL
,
NULL
);
}
/*
* sys_execve() executes a new program.
*/
asmlinkage
int
sys_execve
(
const
char
__user
*
ufilename
,
const
char
__user
*
const
__user
*
uargv
,
const
char
__user
*
const
__user
*
uenvp
,
unsigned
long
r7
,
struct
pt_regs
__regs
)
{
struct
pt_regs
*
regs
=
RELOC_HIDE
(
&
__regs
,
0
);
int
error
;
struct
filename
*
filename
;
filename
=
getname
(
ufilename
);
error
=
PTR_ERR
(
filename
);
if
(
IS_ERR
(
filename
))
goto
out
;
error
=
do_execve
(
filename
->
name
,
uargv
,
uenvp
,
regs
);
putname
(
filename
);
out:
return
error
;
}
unsigned
long
get_wchan
(
struct
task_struct
*
p
)
{
unsigned
long
pc
;
...
...
arch/sh/kernel/process_64.c
View file @
80b249b7
...
...
@@ -454,31 +454,6 @@ asmlinkage int sys_vfork(unsigned long r2, unsigned long r3,
return
do_fork
(
CLONE_VFORK
|
CLONE_VM
|
SIGCHLD
,
pregs
->
regs
[
15
],
pregs
,
0
,
0
,
0
);
}
/*
* sys_execve() executes a new program.
*/
asmlinkage
int
sys_execve
(
const
char
*
ufilename
,
char
**
uargv
,
char
**
uenvp
,
unsigned
long
r5
,
unsigned
long
r6
,
unsigned
long
r7
,
struct
pt_regs
*
pregs
)
{
int
error
;
struct
filename
*
filename
;
filename
=
getname
((
char
__user
*
)
ufilename
);
error
=
PTR_ERR
(
filename
);
if
(
IS_ERR
(
filename
))
goto
out
;
error
=
do_execve
(
filename
->
name
,
(
const
char
__user
*
const
__user
*
)
uargv
,
(
const
char
__user
*
const
__user
*
)
uenvp
,
pregs
);
putname
(
filename
);
out:
return
error
;
}
#ifdef CONFIG_FRAME_POINTER
static
int
in_sh64_switch_to
(
unsigned
long
pc
)
{
...
...
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