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
0fca786c
Commit
0fca786c
authored
Nov 15, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://bk.arm.linux.org.uk/linux-2.6-rmk
into home.osdl.org:/home/torvalds/v2.5/linux
parents
d6f5ede4
ff6852e4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
arch/arm/kernel/signal.c
arch/arm/kernel/signal.c
+6
-2
No files found.
arch/arm/kernel/signal.c
View file @
0fca786c
...
@@ -187,6 +187,9 @@ asmlinkage int sys_sigreturn(struct pt_regs *regs)
...
@@ -187,6 +187,9 @@ asmlinkage int sys_sigreturn(struct pt_regs *regs)
struct
sigframe
*
frame
;
struct
sigframe
*
frame
;
sigset_t
set
;
sigset_t
set
;
/* Always make any pending restarted system calls return -EINTR */
current_thread_info
()
->
restart_block
.
fn
=
do_no_restart_syscall
;
/*
/*
* Since we stacked the signal on a 64-bit boundary,
* Since we stacked the signal on a 64-bit boundary,
* then 'sp' should be word aligned here. If it's
* then 'sp' should be word aligned here. If it's
...
@@ -232,6 +235,9 @@ asmlinkage int sys_rt_sigreturn(struct pt_regs *regs)
...
@@ -232,6 +235,9 @@ asmlinkage int sys_rt_sigreturn(struct pt_regs *regs)
struct
rt_sigframe
*
frame
;
struct
rt_sigframe
*
frame
;
sigset_t
set
;
sigset_t
set
;
/* Always make any pending restarted system calls return -EINTR */
current_thread_info
()
->
restart_block
.
fn
=
do_no_restart_syscall
;
/*
/*
* Since we stacked the signal on a 64-bit boundary,
* Since we stacked the signal on a 64-bit boundary,
* then 'sp' should be word aligned here. If it's
* then 'sp' should be word aligned here. If it's
...
@@ -462,8 +468,6 @@ handle_signal(unsigned long sig, siginfo_t *info, sigset_t *oldset,
...
@@ -462,8 +468,6 @@ handle_signal(unsigned long sig, siginfo_t *info, sigset_t *oldset,
if
(
syscall
)
{
if
(
syscall
)
{
switch
(
regs
->
ARM_r0
)
{
switch
(
regs
->
ARM_r0
)
{
case
-
ERESTART_RESTARTBLOCK
:
case
-
ERESTART_RESTARTBLOCK
:
current_thread_info
()
->
restart_block
.
fn
=
do_no_restart_syscall
;
case
-
ERESTARTNOHAND
:
case
-
ERESTARTNOHAND
:
regs
->
ARM_r0
=
-
EINTR
;
regs
->
ARM_r0
=
-
EINTR
;
break
;
break
;
...
...
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