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
8be433ab
Commit
8be433ab
authored
Dec 25, 2012
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
m68k: switch to generic old sigaction()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
1ba3e7ef
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
39 deletions
+1
-39
arch/m68k/Kconfig
arch/m68k/Kconfig
+1
-0
arch/m68k/include/asm/signal.h
arch/m68k/include/asm/signal.h
+0
-7
arch/m68k/kernel/signal.c
arch/m68k/kernel/signal.c
+0
-32
No files found.
arch/m68k/Kconfig
View file @
8be433ab
...
@@ -20,6 +20,7 @@ config M68K
...
@@ -20,6 +20,7 @@ config M68K
select MODULES_USE_ELF_RELA
select MODULES_USE_ELF_RELA
select GENERIC_SIGALTSTACK
select GENERIC_SIGALTSTACK
select OLD_SIGSUSPEND3
select OLD_SIGSUSPEND3
select OLD_SIGACTION
config RWSEM_GENERIC_SPINLOCK
config RWSEM_GENERIC_SPINLOCK
bool
bool
...
...
arch/m68k/include/asm/signal.h
View file @
8be433ab
...
@@ -16,13 +16,6 @@ typedef struct {
...
@@ -16,13 +16,6 @@ typedef struct {
unsigned
long
sig
[
_NSIG_WORDS
];
unsigned
long
sig
[
_NSIG_WORDS
];
}
sigset_t
;
}
sigset_t
;
struct
old_sigaction
{
__sighandler_t
sa_handler
;
old_sigset_t
sa_mask
;
unsigned
long
sa_flags
;
__sigrestore_t
sa_restorer
;
};
#define __ARCH_HAS_SA_RESTORER
#define __ARCH_HAS_SA_RESTORER
#include <asm/sigcontext.h>
#include <asm/sigcontext.h>
...
...
arch/m68k/kernel/signal.c
View file @
8be433ab
...
@@ -224,38 +224,6 @@ static inline void push_cache(unsigned long vaddr)
...
@@ -224,38 +224,6 @@ static inline void push_cache(unsigned long vaddr)
#endif
/* CONFIG_MMU */
#endif
/* CONFIG_MMU */
asmlinkage
int
sys_sigaction
(
int
sig
,
const
struct
old_sigaction
__user
*
act
,
struct
old_sigaction
__user
*
oact
)
{
struct
k_sigaction
new_ka
,
old_ka
;
int
ret
;
if
(
act
)
{
old_sigset_t
mask
;
if
(
!
access_ok
(
VERIFY_READ
,
act
,
sizeof
(
*
act
))
||
__get_user
(
new_ka
.
sa
.
sa_handler
,
&
act
->
sa_handler
)
||
__get_user
(
new_ka
.
sa
.
sa_restorer
,
&
act
->
sa_restorer
)
||
__get_user
(
new_ka
.
sa
.
sa_flags
,
&
act
->
sa_flags
)
||
__get_user
(
mask
,
&
act
->
sa_mask
))
return
-
EFAULT
;
siginitset
(
&
new_ka
.
sa
.
sa_mask
,
mask
);
}
ret
=
do_sigaction
(
sig
,
act
?
&
new_ka
:
NULL
,
oact
?
&
old_ka
:
NULL
);
if
(
!
ret
&&
oact
)
{
if
(
!
access_ok
(
VERIFY_WRITE
,
oact
,
sizeof
(
*
oact
))
||
__put_user
(
old_ka
.
sa
.
sa_handler
,
&
oact
->
sa_handler
)
||
__put_user
(
old_ka
.
sa
.
sa_restorer
,
&
oact
->
sa_restorer
)
||
__put_user
(
old_ka
.
sa
.
sa_flags
,
&
oact
->
sa_flags
)
||
__put_user
(
old_ka
.
sa
.
sa_mask
.
sig
[
0
],
&
oact
->
sa_mask
))
return
-
EFAULT
;
}
return
ret
;
}
/*
/*
* Do a signal return; undo the signal stack.
* Do a signal return; undo the signal stack.
*
*
...
...
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