Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 8415
b: refs/heads/master
c: 20c6abd
h: refs/heads/master
i:
  8413: 46d3538
  8411: 891fbd9
  8407: f52ed54
  8399: 60a11a1
  8383: 6d6e7fb
v: v3
  • Loading branch information
Nishanth Aravamudan authored and Linus Torvalds committed Sep 10, 2005
1 parent 426bf57 commit 3936d83
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 13e4b57f6a4e23ceb99794a650d777e74831f4a6
refs/heads/master: 20c6abd1fd3a6296282f63fae82e589aa81862ff
3 changes: 1 addition & 2 deletions trunk/arch/alpha/kernel/osf_sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 3936d83

Please sign in to comment.