diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-08-27 21:47:49 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-08-27 21:47:49 +0200 |
| commit | 03288d33127f65ec3696603563f14f0a2f09af85 (patch) | |
| tree | e5944918f588af9378437dd56d409b1bd8943014 /hurd | |
| parent | e3fdf006aeda6352bf4df8858ae30bd0456d40f3 (diff) | |
| parent | adb9c13ccfa6cba955c7700c9277f1e274ce3b8e (diff) | |
Merge branch 't/thread-cancel' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/hurdexec.c | 1 | ||||
| -rw-r--r-- | hurd/thread-cancel.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/hurd/hurdexec.c b/hurd/hurdexec.c index 77bf833742..eb2d2bfc22 100644 --- a/hurd/hurdexec.c +++ b/hurd/hurdexec.c @@ -104,7 +104,6 @@ _hurd_exec (task_t task, file_t file, ss = _hurd_self_sigstate (); - assert (! __spin_lock_locked (&ss->critical_section_lock)); __spin_lock (&ss->critical_section_lock); _hurd_sigstate_lock (ss); diff --git a/hurd/thread-cancel.c b/hurd/thread-cancel.c index 2e8d91e7ba..eaf3d9e342 100644 --- a/hurd/thread-cancel.c +++ b/hurd/thread-cancel.c @@ -90,7 +90,6 @@ hurd_check_cancel (void) int cancel; __spin_lock (&ss->lock); - assert (! __spin_lock_locked (&ss->critical_section_lock)); cancel = ss->cancel; ss->cancel = 0; __spin_unlock (&ss->lock); |