Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
7a879a94
K
Kernel
项目概览
openeuler
/
Kernel
12 个月 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7a879a94
编写于
12月 23, 2012
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
sh: switch to generic sigaltstack
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
0aa0203f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
5 addition
and
38 deletion
+5
-38
arch/sh/Kconfig
arch/sh/Kconfig
+1
-0
arch/sh/include/asm/syscalls_32.h
arch/sh/include/asm/syscalls_32.h
+0
-3
arch/sh/kernel/signal_32.c
arch/sh/kernel/signal_32.c
+2
-18
arch/sh/kernel/signal_64.c
arch/sh/kernel/signal_64.c
+2
-17
未找到文件。
arch/sh/Kconfig
浏览文件 @
7a879a94
...
...
@@ -40,6 +40,7 @@ config SUPERH
select GENERIC_STRNLEN_USER
select HAVE_MOD_ARCH_SPECIFIC if DWARF_UNWINDER
select MODULES_USE_ELF_RELA
select GENERIC_SIGALTSTACK
help
The SuperH is a RISC processor targeted for use in embedded systems
and consumer electronics; it was also used in the Sega Dreamcast
...
...
arch/sh/include/asm/syscalls_32.h
浏览文件 @
7a879a94
...
...
@@ -12,9 +12,6 @@ struct pt_regs;
asmlinkage
int
sys_sigsuspend
(
old_sigset_t
mask
);
asmlinkage
int
sys_sigaction
(
int
sig
,
const
struct
old_sigaction
__user
*
act
,
struct
old_sigaction
__user
*
oact
);
asmlinkage
int
sys_sigaltstack
(
const
stack_t
__user
*
uss
,
stack_t
__user
*
uoss
,
unsigned
long
r6
,
unsigned
long
r7
,
struct
pt_regs
__regs
);
asmlinkage
int
sys_sigreturn
(
unsigned
long
r4
,
unsigned
long
r5
,
unsigned
long
r6
,
unsigned
long
r7
,
struct
pt_regs
__regs
);
...
...
arch/sh/kernel/signal_32.c
浏览文件 @
7a879a94
...
...
@@ -89,17 +89,6 @@ sys_sigaction(int sig, const struct old_sigaction __user *act,
return
ret
;
}
asmlinkage
int
sys_sigaltstack
(
const
stack_t
__user
*
uss
,
stack_t
__user
*
uoss
,
unsigned
long
r6
,
unsigned
long
r7
,
struct
pt_regs
__regs
)
{
struct
pt_regs
*
regs
=
RELOC_HIDE
(
&
__regs
,
0
);
return
do_sigaltstack
(
uss
,
uoss
,
regs
->
regs
[
15
]);
}
/*
* Do a signal return; undo the signal stack.
*/
...
...
@@ -257,8 +246,7 @@ asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,
if
(
restore_sigcontext
(
regs
,
&
frame
->
uc
.
uc_mcontext
,
&
r0
))
goto
badframe
;
if
(
do_sigaltstack
(
&
frame
->
uc
.
uc_stack
,
NULL
,
regs
->
regs
[
15
])
==
-
EFAULT
)
if
(
restore_altstack
(
&
frame
->
uc
.
uc_stack
))
goto
badframe
;
return
r0
;
...
...
@@ -423,11 +411,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
/* Create the ucontext. */
err
|=
__put_user
(
0
,
&
frame
->
uc
.
uc_flags
);
err
|=
__put_user
(
NULL
,
&
frame
->
uc
.
uc_link
);
err
|=
__put_user
((
void
*
)
current
->
sas_ss_sp
,
&
frame
->
uc
.
uc_stack
.
ss_sp
);
err
|=
__put_user
(
sas_ss_flags
(
regs
->
regs
[
15
]),
&
frame
->
uc
.
uc_stack
.
ss_flags
);
err
|=
__put_user
(
current
->
sas_ss_size
,
&
frame
->
uc
.
uc_stack
.
ss_size
);
err
|=
__save_altstack
(
&
frame
->
uc
.
uc_stack
,
regs
->
regs
[
15
]);
err
|=
setup_sigcontext
(
&
frame
->
uc
.
uc_mcontext
,
regs
,
set
->
sig
[
0
]);
err
|=
__copy_to_user
(
&
frame
->
uc
.
uc_sigmask
,
set
,
sizeof
(
*
set
));
...
...
arch/sh/kernel/signal_64.c
浏览文件 @
7a879a94
...
...
@@ -170,15 +170,6 @@ sys_sigaction(int sig, const struct old_sigaction __user *act,
return
ret
;
}
asmlinkage
int
sys_sigaltstack
(
const
stack_t
__user
*
uss
,
stack_t
__user
*
uoss
,
unsigned
long
r4
,
unsigned
long
r5
,
unsigned
long
r6
,
unsigned
long
r7
,
struct
pt_regs
*
regs
)
{
return
do_sigaltstack
(
uss
,
uoss
,
REF_REG_SP
);
}
/*
* Do a signal return; undo the signal stack.
*/
...
...
@@ -364,9 +355,7 @@ asmlinkage int sys_rt_sigreturn(unsigned long r2, unsigned long r3,
goto
badframe
;
regs
->
pc
-=
4
;
/* It is more difficult to avoid calling this function than to
call it and ignore errors. */
if
(
do_sigaltstack
(
&
frame
->
uc
.
uc_stack
,
NULL
,
REF_REG_SP
)
==
-
EFAULT
)
if
(
restore_altstack
(
&
frame
->
uc
.
uc_stack
))
goto
badframe
;
return
(
int
)
ret
;
...
...
@@ -560,11 +549,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
/* Create the ucontext. */
err
|=
__put_user
(
0
,
&
frame
->
uc
.
uc_flags
);
err
|=
__put_user
(
0
,
&
frame
->
uc
.
uc_link
);
err
|=
__put_user
((
void
*
)
current
->
sas_ss_sp
,
&
frame
->
uc
.
uc_stack
.
ss_sp
);
err
|=
__put_user
(
sas_ss_flags
(
regs
->
regs
[
REG_SP
]),
&
frame
->
uc
.
uc_stack
.
ss_flags
);
err
|=
__put_user
(
current
->
sas_ss_size
,
&
frame
->
uc
.
uc_stack
.
ss_size
);
err
|=
__save_altstack
(
&
frame
->
uc
.
uc_stack
,
regs
->
regs
[
REG_SP
]);
err
|=
setup_sigcontext
(
&
frame
->
uc
.
uc_mcontext
,
regs
,
set
->
sig
[
0
]);
err
|=
__copy_to_user
(
&
frame
->
uc
.
uc_sigmask
,
set
,
sizeof
(
*
set
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录