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
bdcf0318
Commit
bdcf0318
authored
Dec 25, 2012
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
s390: switch to generic compat rt_sigpending()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
74260224
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
22 deletions
+2
-22
arch/s390/Kconfig
arch/s390/Kconfig
+1
-0
arch/s390/kernel/compat_linux.c
arch/s390/kernel/compat_linux.c
+0
-20
arch/s390/kernel/compat_linux.h
arch/s390/kernel/compat_linux.h
+0
-1
arch/s390/kernel/compat_wrapper.S
arch/s390/kernel/compat_wrapper.S
+1
-1
No files found.
arch/s390/Kconfig
View file @
bdcf0318
...
...
@@ -142,6 +142,7 @@ config S390
select CLONE_BACKWARDS2
select GENERIC_SIGALTSTACK
select GENERIC_COMPAT_RT_SIGPROCMASK
select GENERIC_COMPAT_RT_SIGPENDING
config SCHED_OMIT_FRAME_POINTER
def_bool y
...
...
arch/s390/kernel/compat_linux.c
View file @
bdcf0318
...
...
@@ -368,26 +368,6 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
return
ret
;
}
asmlinkage
long
sys32_rt_sigpending
(
compat_sigset_t
__user
*
set
,
size_t
sigsetsize
)
{
sigset_t
s
;
compat_sigset_t
s32
;
int
ret
;
mm_segment_t
old_fs
=
get_fs
();
set_fs
(
KERNEL_DS
);
ret
=
sys_rt_sigpending
((
sigset_t
__force
__user
*
)
&
s
,
sigsetsize
);
set_fs
(
old_fs
);
if
(
!
ret
)
{
s32
.
sig
[
1
]
=
(
s
.
sig
[
0
]
>>
32
);
s32
.
sig
[
0
]
=
s
.
sig
[
0
];
if
(
copy_to_user
(
set
,
&
s32
,
sizeof
(
compat_sigset_t
)))
return
-
EFAULT
;
}
return
ret
;
}
asmlinkage
long
sys32_rt_sigqueueinfo
(
int
pid
,
int
sig
,
compat_siginfo_t
__user
*
uinfo
)
{
...
...
arch/s390/kernel/compat_linux.h
View file @
bdcf0318
...
...
@@ -115,7 +115,6 @@ long sys32_truncate64(const char __user * path, unsigned long high,
long
sys32_ftruncate64
(
unsigned
int
fd
,
unsigned
long
high
,
unsigned
long
low
);
long
sys32_sched_rr_get_interval
(
compat_pid_t
pid
,
struct
compat_timespec
__user
*
interval
);
long
sys32_rt_sigpending
(
compat_sigset_t
__user
*
set
,
size_t
sigsetsize
);
long
sys32_rt_sigqueueinfo
(
int
pid
,
int
sig
,
compat_siginfo_t
__user
*
uinfo
);
long
sys32_init_module
(
void
__user
*
umod
,
unsigned
long
len
,
const
char
__user
*
uargs
);
...
...
arch/s390/kernel/compat_wrapper.S
View file @
bdcf0318
...
...
@@ -703,7 +703,7 @@ ENTRY(sys32_rt_sigprocmask_wrapper)
ENTRY
(
sys32_rt_sigpending_wrapper
)
llgtr
%
r2
,%
r2
#
sigset_emu31
*
llgfr
%
r3
,%
r3
#
size_t
jg
sys32
_rt_sigpending
#
branch
to
system
call
jg
compat_sys
_rt_sigpending
#
branch
to
system
call
ENTRY
(
compat_sys_rt_sigtimedwait_wrapper
)
llgtr
%
r2
,%
r2
#
const
sigset_emu31_t
*
...
...
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