diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:47:05 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:47:05 -0500 |
| commit | d1397f837647d8b6b3c9253a7e713d203f3cbb26 (patch) | |
| tree | 0bfe939169987703e63f3624d5dbb38938253760 /arch/ia64/kernel/salinfo.c | |
| parent | 278efe950988e72e2d0cea35059438fc27035d13 (diff) | |
| parent | d00d598ffbba974d9045ba8b95296655fe2162c5 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'arch/ia64/kernel/salinfo.c')
| -rw-r--r-- | arch/ia64/kernel/salinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
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: | |||
| 293 | if (file->f_flags & O_NONBLOCK) | 293 | if (file->f_flags & O_NONBLOCK) |
| 294 | return -EAGAIN; | 294 | return -EAGAIN; |
| 295 | if (down_interruptible(&data->sem)) | 295 | if (down_interruptible(&data->sem)) |
| 296 | return -ERESTARTSYS; | 296 | return -EINTR; |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | n = data->cpu_check; | 299 | n = data->cpu_check; |