summaryrefslogtreecommitdiff
path: root/hurd/hurd
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-02-20 02:51:10 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-02-20 02:51:10 +0100
commit651da7c2b92868b89437994478ddf09589059ce0 (patch)
treea1a64ccf88068f894ab7cd2193130d6f1dce2ad5 /hurd/hurd
parentccd397539e78bfcf44cb44d67776dfd4bfb3e4bb (diff)
parent07f1b2e21570b936609feeedc5b188e337fe2bf3 (diff)
Merge branch 't/critical-sections' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'hurd/hurd')
-rw-r--r--hurd/hurd/fd.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/hurd/hurd/fd.h b/hurd/hurd/fd.h
index 2cf45be9a7..2422e42cf9 100644
--- a/hurd/hurd/fd.h
+++ b/hurd/hurd/fd.h
@@ -68,6 +68,7 @@ _hurd_fd_get (int fd)
{
struct hurd_fd *descriptor;
+ HURD_CRITICAL_BEGIN;
__mutex_lock (&_hurd_dtable_lock);
if (fd < 0 || fd >= _hurd_dtablesize)
descriptor = NULL;
@@ -90,6 +91,7 @@ _hurd_fd_get (int fd)
}
}
__mutex_unlock (&_hurd_dtable_lock);
+ HURD_CRITICAL_END;
return descriptor;
}