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
Kirill Smelkov
linux
Commits
ceee83c0
Commit
ceee83c0
authored
Sep 20, 2004
by
Richard Henderson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct prototypes for sys_wait4 and sys_waitpid.
parent
0f7a6be6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
include/linux/syscalls.h
include/linux/syscalls.h
+2
-2
kernel/exit.c
kernel/exit.c
+3
-3
No files found.
include/linux/syscalls.h
View file @
ceee83c0
...
@@ -160,11 +160,11 @@ asmlinkage long sys_kexec_load(void *entry, unsigned long nr_segments,
...
@@ -160,11 +160,11 @@ asmlinkage long sys_kexec_load(void *entry, unsigned long nr_segments,
asmlinkage
long
sys_exit
(
int
error_code
);
asmlinkage
long
sys_exit
(
int
error_code
);
asmlinkage
void
sys_exit_group
(
int
error_code
);
asmlinkage
void
sys_exit_group
(
int
error_code
);
asmlinkage
long
sys_wait4
(
pid_t
pid
,
unsigned
int
__user
*
stat_addr
,
asmlinkage
long
sys_wait4
(
pid_t
pid
,
int
__user
*
stat_addr
,
int
options
,
struct
rusage
__user
*
ru
);
int
options
,
struct
rusage
__user
*
ru
);
asmlinkage
long
sys_waitid
(
int
which
,
pid_t
pid
,
asmlinkage
long
sys_waitid
(
int
which
,
pid_t
pid
,
struct
siginfo
__user
*
infop
,
int
options
);
struct
siginfo
__user
*
infop
,
int
options
);
asmlinkage
long
sys_waitpid
(
pid_t
pid
,
unsigned
int
__user
*
stat_addr
,
int
options
);
asmlinkage
long
sys_waitpid
(
pid_t
pid
,
int
__user
*
stat_addr
,
int
options
);
asmlinkage
long
sys_set_tid_address
(
int
__user
*
tidptr
);
asmlinkage
long
sys_set_tid_address
(
int
__user
*
tidptr
);
asmlinkage
long
sys_futex
(
u32
__user
*
uaddr
,
int
op
,
int
val
,
asmlinkage
long
sys_futex
(
u32
__user
*
uaddr
,
int
op
,
int
val
,
struct
timespec
__user
*
utime
,
u32
__user
*
uaddr2
,
struct
timespec
__user
*
utime
,
u32
__user
*
uaddr2
,
...
...
kernel/exit.c
View file @
ceee83c0
...
@@ -1401,7 +1401,7 @@ asmlinkage long sys_waitid(int which, pid_t pid,
...
@@ -1401,7 +1401,7 @@ asmlinkage long sys_waitid(int which, pid_t pid,
return
do_wait
(
pid
,
options
,
infop
,
NULL
,
ru
);
return
do_wait
(
pid
,
options
,
infop
,
NULL
,
ru
);
}
}
asmlinkage
long
sys_wait4
(
pid_t
pid
,
unsigned
int
__user
*
stat_addr
,
asmlinkage
long
sys_wait4
(
pid_t
pid
,
int
__user
*
stat_addr
,
int
options
,
struct
rusage
__user
*
ru
)
int
options
,
struct
rusage
__user
*
ru
)
{
{
if
(
options
&
~
(
WNOHANG
|
WUNTRACED
|
__WNOTHREAD
|
__WCLONE
|
__WALL
))
if
(
options
&
~
(
WNOHANG
|
WUNTRACED
|
__WNOTHREAD
|
__WCLONE
|
__WALL
))
...
@@ -1415,7 +1415,7 @@ asmlinkage long sys_wait4(pid_t pid, unsigned int __user *stat_addr,
...
@@ -1415,7 +1415,7 @@ asmlinkage long sys_wait4(pid_t pid, unsigned int __user *stat_addr,
* sys_waitpid() remains for compatibility. waitpid() should be
* sys_waitpid() remains for compatibility. waitpid() should be
* implemented by calling sys_wait4() from libc.a.
* implemented by calling sys_wait4() from libc.a.
*/
*/
asmlinkage
long
sys_waitpid
(
pid_t
pid
,
unsigned
__user
*
stat_addr
,
int
options
)
asmlinkage
long
sys_waitpid
(
pid_t
pid
,
int
__user
*
stat_addr
,
int
options
)
{
{
return
sys_wait4
(
pid
,
stat_addr
,
options
,
NULL
);
return
sys_wait4
(
pid
,
stat_addr
,
options
,
NULL
);
}
}
...
...
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