diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-27 12:27:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-27 12:27:44 -0500 |
| commit | 981a2edd1922c00e747680f30734ea50c86af28d (patch) | |
| tree | e32a9896900ea525eeb6019e618f8fa9d233d81e /arch/s390/kernel/signal.c | |
| parent | 4bdadb9785696439c6e2b3efe34aa76df1149c83 (diff) | |
| parent | 21ec7f6dbf10492ce9a21718040677d3e68bd57d (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] fix single stepped svcs with TRACE_IRQFLAGS=y
[S390] zcrypt: Do not remove coprocessor for error 8/72
[S390] sclp_vt220: set initial terminal window size
[S390] use set_current_state in sigsuspend
[S390] irqflags: add missing types.h include
[S390] dasd: fix possible NULL pointer errors
Diffstat (limited to 'arch/s390/kernel/signal.c')
| -rw-r--r-- | arch/s390/kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c index 1675c48b9145..6289945562b0 100644 --- a/arch/s390/kernel/signal.c +++ b/arch/s390/kernel/signal.c | |||
| @@ -64,7 +64,7 @@ SYSCALL_DEFINE3(sigsuspend, int, history0, int, history1, old_sigset_t, mask) | |||
| 64 | recalc_sigpending(); | 64 | recalc_sigpending(); |
| 65 | spin_unlock_irq(¤t->sighand->siglock); | 65 | spin_unlock_irq(¤t->sighand->siglock); |
| 66 | 66 | ||
| 67 | current->state = TASK_INTERRUPTIBLE; | 67 | set_current_state(TASK_INTERRUPTIBLE); |
| 68 | schedule(); | 68 | schedule(); |
| 69 | set_thread_flag(TIF_RESTORE_SIGMASK); | 69 | set_thread_flag(TIF_RESTORE_SIGMASK); |
| 70 | 70 | ||