From 3936d83c6d808985d88cc5710f7aae98aa31b513 Mon Sep 17 00:00:00 2001
From: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Sat, 10 Sep 2005 00:27:25 -0700
Subject: [PATCH] --- yaml --- r: 8415 b: refs/heads/master c:
 20c6abd1fd3a6296282f63fae82e589aa81862ff h: refs/heads/master i:   8413:
 46d3538b6e533862f38ad7fe496da5de78750c82   8411:
 891fbd9f631bfcfa690bdf799104b802c1ea8327   8407:
 f52ed54f5c8da4a7fc222cb41594621fa2560fc8   8399:
 60a11a128e64889c9df62ba3c8b7eb9d87ffa850   8383:
 6d6e7fb8017056969a873aaa3b90088e22650073 v: v3

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

diff --git a/[refs] b/[refs]
index b5c05e1d88fb..b674f154dfba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13e4b57f6a4e23ceb99794a650d777e74831f4a6
+refs/heads/master: 20c6abd1fd3a6296282f63fae82e589aa81862ff
diff --git a/trunk/arch/alpha/kernel/osf_sys.c b/trunk/arch/alpha/kernel/osf_sys.c
index 2b034182a0ca..0636116210d2 100644
--- a/trunk/arch/alpha/kernel/osf_sys.c
+++ b/trunk/arch/alpha/kernel/osf_sys.c
@@ -1154,8 +1154,7 @@ osf_usleep_thread(struct timeval32 __user *sleep, struct timeval32 __user *remai
 
 	ticks = timeval_to_jiffies(&tmp);
 
-	current->state = TASK_INTERRUPTIBLE;
-	ticks = schedule_timeout(ticks);
+	ticks = schedule_timeout_interruptible(ticks);
 
 	if (remain) {
 		jiffies_to_timeval(ticks, &tmp);