summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Owens <kaos@sgi.com>2005-12-02 03:40:15 +0100
committerTony Luck <tony.luck@intel.com>2005-12-05 20:49:17 +0100
commit05f70395c642bed0300bc1955bfa8c0f93de2bc2 (patch)
treec73f6ddd31d53863a569f234792719e3f77cb416
parent[IA64] refresh tiger_defconfig ready for 2.6.15 (diff)
downloadlinux-05f70395c642bed0300bc1955bfa8c0f93de2bc2.tar.xz
linux-05f70395c642bed0300bc1955bfa8c0f93de2bc2.zip
[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>
-rw-r--r--arch/ia64/kernel/salinfo.c2
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:
if (file->f_flags & O_NONBLOCK)
return -EAGAIN;
if (down_interruptible(&data->sem))
- return -ERESTARTSYS;
+ return -EINTR;
}
n = data->cpu_check;