From dbaefeab6c03c36985bb4f749152f240a9362864 Mon Sep 17 00:00:00 2001
From: Keith Owens <kaos@sgi.com>
Date: Fri, 2 Dec 2005 13:40:15 +1100
Subject: [PATCH] --- yaml --- r: 15076 b: refs/heads/master c:
 05f70395c642bed0300bc1955bfa8c0f93de2bc2 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/ia64/kernel/salinfo.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 62819f521691..e720431f22ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 885da19e8044051a92cfd70099398c373245c431
+refs/heads/master: 05f70395c642bed0300bc1955bfa8c0f93de2bc2
diff --git a/trunk/arch/ia64/kernel/salinfo.c b/trunk/arch/ia64/kernel/salinfo.c
index ca68e6e44a72..1461dc660b43 100644
--- a/trunk/arch/ia64/kernel/salinfo.c
+++ b/trunk/arch/ia64/kernel/salinfo.c
@@ -293,7 +293,7 @@ salinfo_event_read(struct file *file, char __user *buffer, size_t count, loff_t
 		if (file->f_flags & O_NONBLOCK)
 			return -EAGAIN;
 		if (down_interruptible(&data->sem))
-			return -ERESTARTSYS;
+			return -EINTR;
 	}
 
 	n = data->cpu_check;