From: Keith Owens Date: Fri, 2 Dec 2005 02:40:15 +0000 (+1100) Subject: [IA64] Allow salinfo_decode to detect signals on read X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=05f70395c642bed0300bc1955bfa8c0f93de2bc2;p=openwrt%2Fstaging%2Fblogic.git [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 Signed-off-by: Tony Luck --- 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;