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
9b2f107f
Commit
9b2f107f
authored
Dec 20, 2004
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents
59b17c27
0233f53f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
arch/x86_64/kernel/signal.c
arch/x86_64/kernel/signal.c
+2
-2
No files found.
arch/x86_64/kernel/signal.c
View file @
9b2f107f
...
...
@@ -357,7 +357,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
#endif
/* Are we from a system call? */
if
(
regs
->
orig_rax
>=
0
)
{
if
(
(
long
)
regs
->
orig_rax
>=
0
)
{
/* If so, check system call restarting.. */
switch
(
regs
->
rax
)
{
case
-
ERESTART_RESTARTBLOCK
:
...
...
@@ -442,7 +442,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
no_signal:
/* Did we come from a system call? */
if
(
regs
->
orig_rax
>=
0
)
{
if
(
(
long
)
regs
->
orig_rax
>=
0
)
{
/* Restart the system call - no handlers present */
long
res
=
regs
->
rax
;
if
(
res
==
-
ERESTARTNOHAND
||
...
...
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