diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/setitimer.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index b373406c03..e49be8d466 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-05-10 Samuel Thibault <samuel.thibault@ens-lyon.org> + * sysdeps/mach/hurd/setitimer.c (setitimer_locked): Use common exit + path instead of returning without unlocking. + * sysdeps/mach/hurd/bits/ioctls.h (_IOIW): New macro for immediate-write ioctls. * sysdeps/mach/hurd/ioctl.c: Handle cases with no arguments. diff --git a/sysdeps/mach/hurd/setitimer.c b/sysdeps/mach/hurd/setitimer.c index a7b2e29d16..00cd0cc445 100644 --- a/sysdeps/mach/hurd/setitimer.c +++ b/sysdeps/mach/hurd/setitimer.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1994,1995,1996,1997,2000,2001,2005 - Free Software Foundation, Inc. +/* Copyright (C) 1994-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -219,7 +218,7 @@ setitimer_locked (const struct itimerval *new, struct itimerval *old, /* Start up the itimer thread running `timer_thread' (below). */ if (err = __thread_create (__mach_task_self (), &_hurd_itimer_thread)) - return __hurd_fail (err); + goto out; _hurd_itimer_thread_stack_base = 0; /* Anywhere. */ _hurd_itimer_thread_stack_size = __vm_page_size; /* Small stack. */ if (err = __mach_setup_thread (__mach_task_self (), |