]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[IA64] Allow salinfo_decode to detect signals on read
authorKeith Owens <kaos@sgi.com>
Fri, 2 Dec 2005 02:40:15 +0000 (13:40 +1100)
committerTony Luck <tony.luck@intel.com>
Mon, 5 Dec 2005 19:49:17 +0000 (11:49 -0800)
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>
arch/ia64/kernel/salinfo.c

index ca68e6e44a7272275602b8914cd87166a70f5d3e..1461dc660b43af305b6b0687518f0e771b7d8dfe 100644 (file)
@@ -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;