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
50b3c9e3
Commit
50b3c9e3
authored
Dec 23, 2012
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
unicore32: switch to generic sigaltstack
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
0aa0203f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
15 deletions
+3
-15
arch/unicore32/Kconfig
arch/unicore32/Kconfig
+1
-0
arch/unicore32/kernel/entry.S
arch/unicore32/kernel/entry.S
+0
-5
arch/unicore32/kernel/signal.c
arch/unicore32/kernel/signal.c
+2
-10
No files found.
arch/unicore32/Kconfig
View file @
50b3c9e3
...
@@ -16,6 +16,7 @@ config UNICORE32
...
@@ -16,6 +16,7 @@ config UNICORE32
select ARCH_WANT_FRAME_POINTERS
select ARCH_WANT_FRAME_POINTERS
select GENERIC_IOMAP
select GENERIC_IOMAP
select MODULES_USE_ELF_REL
select MODULES_USE_ELF_REL
select GENERIC_SIGALTSTACK
help
help
UniCore-32 is 32-bit Instruction Set Architecture,
UniCore-32 is 32-bit Instruction Set Architecture,
including a series of low-power-consumption RISC chip
including a series of low-power-consumption RISC chip
...
...
arch/unicore32/kernel/entry.S
View file @
50b3c9e3
...
@@ -674,11 +674,6 @@ ENTRY(sys_rt_sigreturn)
...
@@ -674,11 +674,6 @@ ENTRY(sys_rt_sigreturn)
b
__sys_rt_sigreturn
b
__sys_rt_sigreturn
ENDPROC
(
sys_rt_sigreturn
)
ENDPROC
(
sys_rt_sigreturn
)
ENTRY
(
sys_sigaltstack
)
ldw
r2
,
[
sp
+],
#
S_OFF
+
S_SP
b
do_sigaltstack
ENDPROC
(
sys_sigaltstack
)
__INIT
__INIT
/*
/*
...
...
arch/unicore32/kernel/signal.c
View file @
50b3c9e3
...
@@ -123,8 +123,7 @@ asmlinkage int __sys_rt_sigreturn(struct pt_regs *regs)
...
@@ -123,8 +123,7 @@ asmlinkage int __sys_rt_sigreturn(struct pt_regs *regs)
if
(
restore_sigframe
(
regs
,
&
frame
->
sig
))
if
(
restore_sigframe
(
regs
,
&
frame
->
sig
))
goto
badframe
;
goto
badframe
;
if
(
do_sigaltstack
(
&
frame
->
sig
.
uc
.
uc_stack
,
NULL
,
regs
->
UCreg_sp
)
if
(
restore_altstack
(
&
frame
->
sig
.
uc
.
uc_stack
))
==
-
EFAULT
)
goto
badframe
;
goto
badframe
;
return
regs
->
UCreg_00
;
return
regs
->
UCreg_00
;
...
@@ -265,7 +264,6 @@ static int setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
...
@@ -265,7 +264,6 @@ static int setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
{
{
struct
rt_sigframe
__user
*
frame
=
struct
rt_sigframe
__user
*
frame
=
get_sigframe
(
ka
,
regs
,
sizeof
(
*
frame
));
get_sigframe
(
ka
,
regs
,
sizeof
(
*
frame
));
stack_t
stack
;
int
err
=
0
;
int
err
=
0
;
if
(
!
frame
)
if
(
!
frame
)
...
@@ -275,13 +273,7 @@ static int setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
...
@@ -275,13 +273,7 @@ static int setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
err
|=
__put_user
(
0
,
&
frame
->
sig
.
uc
.
uc_flags
);
err
|=
__put_user
(
0
,
&
frame
->
sig
.
uc
.
uc_flags
);
err
|=
__put_user
(
NULL
,
&
frame
->
sig
.
uc
.
uc_link
);
err
|=
__put_user
(
NULL
,
&
frame
->
sig
.
uc
.
uc_link
);
err
|=
__save_altstack
(
&
frame
->
sig
.
uc
.
uc_stack
,
regs
->
UCreg_sp
);
memset
(
&
stack
,
0
,
sizeof
(
stack
));
stack
.
ss_sp
=
(
void
__user
*
)
current
->
sas_ss_sp
;
stack
.
ss_flags
=
sas_ss_flags
(
regs
->
UCreg_sp
);
stack
.
ss_size
=
current
->
sas_ss_size
;
err
|=
__copy_to_user
(
&
frame
->
sig
.
uc
.
uc_stack
,
&
stack
,
sizeof
(
stack
));
err
|=
setup_sigframe
(
&
frame
->
sig
,
regs
,
set
);
err
|=
setup_sigframe
(
&
frame
->
sig
,
regs
,
set
);
if
(
err
==
0
)
if
(
err
==
0
)
err
|=
setup_return
(
regs
,
ka
,
frame
->
sig
.
retcode
,
frame
,
usig
);
err
|=
setup_return
(
regs
,
ka
,
frame
->
sig
.
retcode
,
frame
,
usig
);
...
...
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