git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'upstream/master'
[pandora-kernel.git]
/
arch
/
sparc64
/
kernel
/
signal.c
diff --git
a/arch/sparc64/kernel/signal.c
b/arch/sparc64/kernel/signal.c
index
2378482
..
9667e96
100644
(file)
--- a/
arch/sparc64/kernel/signal.c
+++ b/
arch/sparc64/kernel/signal.c
@@
-1,4
+1,4
@@
-/*
$Id: signal.c,v 1.60 2002/02/09 19:49:31 davem Exp $
+/*
* arch/sparc64/kernel/signal.c
*
* Copyright (C) 1991, 1992 Linus Torvalds
* arch/sparc64/kernel/signal.c
*
* Copyright (C) 1991, 1992 Linus Torvalds
@@
-247,7
+247,9
@@
static long _sigpause_common(old_sigset_t set)
current->state = TASK_INTERRUPTIBLE;
schedule();
current->state = TASK_INTERRUPTIBLE;
schedule();
- set_thread_flag(TIF_RESTORE_SIGMASK);
+
+ set_restore_sigmask();
+
return -ERESTARTNOHAND;
}
return -ERESTARTNOHAND;
}
@@
-537,7
+539,7
@@
static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
} else
restart_syscall = 0;
} else
restart_syscall = 0;
- if (
test_thread_flag(TIF_RESTORE_SIGMASK)
)
+ if (
current_thread_info()->status & TS_RESTORE_SIGMASK
)
oldset = ¤t->saved_sigmask;
else
oldset = ¤t->blocked;
oldset = ¤t->saved_sigmask;
else
oldset = ¤t->blocked;
@@
-566,13
+568,12
@@
static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
syscall_restart(orig_i0, regs, &ka.sa);
handle_signal(signr, &ka, &info, oldset, regs);
syscall_restart(orig_i0, regs, &ka.sa);
handle_signal(signr, &ka, &info, oldset, regs);
- /*
a
signal was successfully delivered; the saved
+ /*
A
signal was successfully delivered; the saved
* sigmask will have been stored in the signal frame,
* and will be restored by sigreturn, so we can simply
* sigmask will have been stored in the signal frame,
* and will be restored by sigreturn, so we can simply
- * clear the T
IF
_RESTORE_SIGMASK flag.
+ * clear the T
S
_RESTORE_SIGMASK flag.
*/
*/
- if (test_thread_flag(TIF_RESTORE_SIGMASK))
- clear_thread_flag(TIF_RESTORE_SIGMASK);
+ current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
return;
}
if (restart_syscall &&
return;
}
if (restart_syscall &&
@@
-591,17
+592,17
@@
static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
regs->tnpc -= 4;
}
regs->tnpc -= 4;
}
- /*
i
f there's no signal to deliver, we just put the saved sigmask
+ /*
I
f there's no signal to deliver, we just put the saved sigmask
* back
*/
* back
*/
- if (
test_thread_flag(TIF_RESTORE_SIGMASK)
) {
- c
lear_thread_flag(TIF_RESTORE_SIGMASK)
;
+ if (
current_thread_info()->status & TS_RESTORE_SIGMASK
) {
+ c
urrent_thread_info()->status &= ~TS_RESTORE_SIGMASK
;
sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL);
}
}
void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0, unsigned long thread_info_flags)
{
sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL);
}
}
void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0, unsigned long thread_info_flags)
{
- if (thread_info_flags &
(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)
)
+ if (thread_info_flags &
_TIF_SIGPENDING
)
do_signal(regs, orig_i0);
}
do_signal(regs, orig_i0);
}