diff options
author | Keith Owens <kaos@sgi.com> | 2005-12-01 21:40:15 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-12-05 14:49:17 -0500 |
commit | 05f70395c642bed0300bc1955bfa8c0f93de2bc2 (patch) | |
tree | c73f6ddd31d53863a569f234792719e3f77cb416 /arch/ia64/kernel/salinfo.c | |
parent | 885da19e8044051a92cfd70099398c373245c431 (diff) |
[IA64] Allow salinfo_decode to detect signals on read
Return -EINTR instead of -ERESTARTSYS when signals are delivered during
a blocked read of /proc/sal/*/event. This allows salinfo_decode to
detect signals when it is blocked on a read of those files.
Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/kernel/salinfo.c')
-rw-r--r-- | arch/ia64/kernel/salinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c index ca68e6e44a72..1461dc660b43 100644 --- a/arch/ia64/kernel/salinfo.c +++ b/arch/ia64/kernel/salinfo.c | |||
@@ -293,7 +293,7 @@ retry: | |||
293 | if (file->f_flags & O_NONBLOCK) | 293 | if (file->f_flags & O_NONBLOCK) |
294 | return -EAGAIN; | 294 | return -EAGAIN; |
295 | if (down_interruptible(&data->sem)) | 295 | if (down_interruptible(&data->sem)) |
296 | return -ERESTARTSYS; | 296 | return -EINTR; |
297 | } | 297 | } |
298 | 298 | ||
299 | n = data->cpu_check; | 299 | n = data->cpu_check; |