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
8d2d5c4a
Commit
8d2d5c4a
authored
Mar 03, 2013
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
switch getrusage() to COMPAT_SYSCALL_DEFINE
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
35280bd4
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
27 deletions
+16
-27
arch/s390/kernel/compat_wrapper.S
arch/s390/kernel/compat_wrapper.S
+0
-5
arch/s390/kernel/syscalls.S
arch/s390/kernel/syscalls.S
+1
-1
arch/sparc/kernel/sys32.S
arch/sparc/kernel/sys32.S
+0
-1
arch/sparc/kernel/systbls_64.S
arch/sparc/kernel/systbls_64.S
+1
-1
kernel/compat.c
kernel/compat.c
+0
-19
kernel/sys.c
kernel/sys.c
+14
-0
No files found.
arch/s390/kernel/compat_wrapper.S
View file @
8d2d5c4a
...
@@ -258,11 +258,6 @@ ENTRY(sys32_mmap2_wrapper)
...
@@ -258,11 +258,6 @@ ENTRY(sys32_mmap2_wrapper)
llgtr
%
r2
,%
r2
#
struct
mmap_arg_struct_emu31
*
llgtr
%
r2
,%
r2
#
struct
mmap_arg_struct_emu31
*
jg
sys32_mmap2
#
branch
to
system
call
jg
sys32_mmap2
#
branch
to
system
call
ENTRY
(
compat_sys_getrusage_wrapper
)
lgfr
%
r2
,%
r2
#
int
llgtr
%
r3
,%
r3
#
struct
rusage_emu31
*
jg
compat_sys_getrusage
#
branch
to
system
call
ENTRY
(
compat_sys_gettimeofday_wrapper
)
ENTRY
(
compat_sys_gettimeofday_wrapper
)
llgtr
%
r2
,%
r2
#
struct
timeval_emu31
*
llgtr
%
r2
,%
r2
#
struct
timeval_emu31
*
llgtr
%
r3
,%
r3
#
struct
timezone
*
llgtr
%
r3
,%
r3
#
struct
timezone
*
...
...
arch/s390/kernel/syscalls.S
View file @
8d2d5c4a
...
@@ -85,7 +85,7 @@ SYSCALL(sys_sigpending,sys_sigpending,compat_sys_sigpending_wrapper)
...
@@ -85,7 +85,7 @@ SYSCALL(sys_sigpending,sys_sigpending,compat_sys_sigpending_wrapper)
SYSCALL
(
sys_sethostname
,
sys_sethostname
,
sys32_sethostname_wrapper
)
SYSCALL
(
sys_sethostname
,
sys_sethostname
,
sys32_sethostname_wrapper
)
SYSCALL
(
sys_setrlimit
,
sys_setrlimit
,
compat_sys_setrlimit_wrapper
)
/
*
75
*/
SYSCALL
(
sys_setrlimit
,
sys_setrlimit
,
compat_sys_setrlimit_wrapper
)
/
*
75
*/
SYSCALL
(
sys_old_getrlimit
,
sys_getrlimit
,
compat_sys_old_getrlimit_wrapper
)
SYSCALL
(
sys_old_getrlimit
,
sys_getrlimit
,
compat_sys_old_getrlimit_wrapper
)
SYSCALL
(
sys_getrusage
,
sys_getrusage
,
compat_sys_getrusage
_wrapper
)
SYSCALL
(
sys_getrusage
,
sys_getrusage
,
compat_sys_getrusage
)
SYSCALL
(
sys_gettimeofday
,
sys_gettimeofday
,
compat_sys_gettimeofday_wrapper
)
SYSCALL
(
sys_gettimeofday
,
sys_gettimeofday
,
compat_sys_gettimeofday_wrapper
)
SYSCALL
(
sys_settimeofday
,
sys_settimeofday
,
compat_sys_settimeofday_wrapper
)
SYSCALL
(
sys_settimeofday
,
sys_settimeofday
,
compat_sys_settimeofday_wrapper
)
SYSCALL
(
sys_getgroups16
,
sys_ni_syscall
,
sys32_getgroups16_wrapper
)
/
*
80
old
getgroups16
syscall
*/
SYSCALL
(
sys_getgroups16
,
sys_ni_syscall
,
sys32_getgroups16_wrapper
)
/
*
80
old
getgroups16
syscall
*/
...
...
arch/sparc/kernel/sys32.S
View file @
8d2d5c4a
...
@@ -36,7 +36,6 @@ STUB: sra REG1, 0, REG1; \
...
@@ -36,7 +36,6 @@ STUB: sra REG1, 0, REG1; \
jmpl
%
g1
+
%
lo
(
SYSCALL
),
%
g0
; \
jmpl
%
g1
+
%
lo
(
SYSCALL
),
%
g0
; \
sra
REG3
,
0
,
REG3
sra
REG3
,
0
,
REG3
SIGN1
(
sys32_getrusage
,
compat_sys_getrusage
,
%
o0
)
SIGN1
(
sys32_readahead
,
compat_sys_readahead
,
%
o0
)
SIGN1
(
sys32_readahead
,
compat_sys_readahead
,
%
o0
)
SIGN2
(
sys32_fadvise64
,
compat_sys_fadvise64
,
%
o0
,
%
o4
)
SIGN2
(
sys32_fadvise64
,
compat_sys_fadvise64
,
%
o0
,
%
o4
)
SIGN2
(
sys32_fadvise64_64
,
compat_sys_fadvise64_64
,
%
o0
,
%
o5
)
SIGN2
(
sys32_fadvise64_64
,
compat_sys_fadvise64_64
,
%
o0
,
%
o5
)
...
...
arch/sparc/kernel/systbls_64.S
View file @
8d2d5c4a
...
@@ -41,7 +41,7 @@ sys_call_table32:
...
@@ -41,7 +41,7 @@ sys_call_table32:
/*
100
*/
.
word
sys_getpriority
,
sys32_rt_sigreturn
,
compat_sys_rt_sigaction
,
compat_sys_rt_sigprocmask
,
compat_sys_rt_sigpending
/*
100
*/
.
word
sys_getpriority
,
sys32_rt_sigreturn
,
compat_sys_rt_sigaction
,
compat_sys_rt_sigprocmask
,
compat_sys_rt_sigpending
.
word
compat_sys_rt_sigtimedwait
,
compat_sys_rt_sigqueueinfo
,
compat_sys_rt_sigsuspend
,
sys_setresuid
,
sys_getresuid
.
word
compat_sys_rt_sigtimedwait
,
compat_sys_rt_sigqueueinfo
,
compat_sys_rt_sigsuspend
,
sys_setresuid
,
sys_getresuid
/*
110
*/
.
word
sys_setresgid
,
sys_getresgid
,
sys_setregid
,
sys_nis_syscall
,
sys_nis_syscall
/*
110
*/
.
word
sys_setresgid
,
sys_getresgid
,
sys_setregid
,
sys_nis_syscall
,
sys_nis_syscall
.
word
sys_getgroups
,
compat_sys_gettimeofday
,
sys32
_getrusage
,
sys_nis_syscall
,
sys_getcwd
.
word
sys_getgroups
,
compat_sys_gettimeofday
,
compat_sys
_getrusage
,
sys_nis_syscall
,
sys_getcwd
/*
120
*/
.
word
compat_sys_readv
,
compat_sys_writev
,
compat_sys_settimeofday
,
sys_fchown16
,
sys_fchmod
/*
120
*/
.
word
compat_sys_readv
,
compat_sys_writev
,
compat_sys_settimeofday
,
sys_fchown16
,
sys_fchmod
.
word
sys_nis_syscall
,
sys_setreuid16
,
sys_setregid16
,
sys_rename
,
compat_sys_truncate
.
word
sys_nis_syscall
,
sys_setreuid16
,
sys_setregid16
,
sys_rename
,
compat_sys_truncate
/*
130
*/
.
word
compat_sys_ftruncate
,
sys_flock
,
compat_sys_lstat64
,
sys_nis_syscall
,
sys_nis_syscall
/*
130
*/
.
word
compat_sys_ftruncate
,
sys_flock
,
compat_sys_lstat64
,
sys_nis_syscall
,
sys_nis_syscall
...
...
kernel/compat.c
View file @
8d2d5c4a
...
@@ -516,25 +516,6 @@ int put_compat_rusage(const struct rusage *r, struct compat_rusage __user *ru)
...
@@ -516,25 +516,6 @@ int put_compat_rusage(const struct rusage *r, struct compat_rusage __user *ru)
return
0
;
return
0
;
}
}
asmlinkage
long
compat_sys_getrusage
(
int
who
,
struct
compat_rusage
__user
*
ru
)
{
struct
rusage
r
;
int
ret
;
mm_segment_t
old_fs
=
get_fs
();
set_fs
(
KERNEL_DS
);
ret
=
sys_getrusage
(
who
,
(
struct
rusage
__user
*
)
&
r
);
set_fs
(
old_fs
);
if
(
ret
)
return
ret
;
if
(
put_compat_rusage
(
&
r
,
ru
))
return
-
EFAULT
;
return
0
;
}
COMPAT_SYSCALL_DEFINE4
(
wait4
,
COMPAT_SYSCALL_DEFINE4
(
wait4
,
compat_pid_t
,
pid
,
compat_pid_t
,
pid
,
compat_uint_t
__user
*
,
stat_addr
,
compat_uint_t
__user
*
,
stat_addr
,
...
...
kernel/sys.c
View file @
8d2d5c4a
...
@@ -1784,6 +1784,20 @@ SYSCALL_DEFINE2(getrusage, int, who, struct rusage __user *, ru)
...
@@ -1784,6 +1784,20 @@ SYSCALL_DEFINE2(getrusage, int, who, struct rusage __user *, ru)
return
getrusage
(
current
,
who
,
ru
);
return
getrusage
(
current
,
who
,
ru
);
}
}
#ifdef CONFIG_COMPAT
COMPAT_SYSCALL_DEFINE2
(
getrusage
,
int
,
who
,
struct
compat_rusage
__user
*
,
ru
)
{
struct
rusage
r
;
if
(
who
!=
RUSAGE_SELF
&&
who
!=
RUSAGE_CHILDREN
&&
who
!=
RUSAGE_THREAD
)
return
-
EINVAL
;
k_getrusage
(
current
,
who
,
&
r
);
return
put_compat_rusage
(
&
r
,
ru
);
}
#endif
SYSCALL_DEFINE1
(
umask
,
int
,
mask
)
SYSCALL_DEFINE1
(
umask
,
int
,
mask
)
{
{
mask
=
xchg
(
&
current
->
fs
->
umask
,
mask
&
S_IRWXUGO
);
mask
=
xchg
(
&
current
->
fs
->
umask
,
mask
&
S_IRWXUGO
);
...
...
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