diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
| commit | 230e5ab6a084ed50470f101934782dbf54b0d06b (patch) | |
| tree | 5dd821c8d33f450470588e7a543f74bf74306e9e /ipc/msg.c | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'ipc/msg.c')
| -rw-r--r-- | ipc/msg.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -136,7 +136,7 @@ static int real_msgsnd (int msqid, struct msgbuf *msgp, size_t msgsz, int msgflg /* still no space in queue */ if (msgflg & IPC_NOWAIT) return -EAGAIN; - if (current->signal & ~current->blocked) + if (signal_pending(current)) return -EINTR; if (in_interrupt()) { /* Very unlikely, but better safe than sorry */ @@ -383,7 +383,7 @@ static int real_msgrcv (int msqid, struct msgbuf *msgp, size_t msgsz, long msgty DROP_TIMER; return -ENOMSG; } - if (current->signal & ~current->blocked) { + if (signal_pending(current)) { DROP_TIMER; return -EINTR; } |