diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2011-10-20 17:04:43 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2011-10-20 17:07:46 +0200 |
| commit | 221b60d8f0cf39511d26e275b3a0e26a4bdc4f15 (patch) | |
| tree | 3709e6de0bce10163a85421fc2376fe35863c312 /sysdeps/mach/hurd/pt-docancel.c | |
| parent | 33d3344be6ab376cc73f12c8355a262cb3057021 (diff) | |
| parent | 1b37ff3740644d3febf6ae6e7f756a8d152a37e6 (diff) | |
Merge branch 'tls'
Conflicts:
ChangeLog
Makefile
pthread/pt-exit.c
pthread/pt-internal.h
sysdeps/mach/hurd/ia32/pt-setup.c
sysdeps/mach/hurd/pt-docancel.c
sysdeps/mach/hurd/pt-sysdep.h
Diffstat (limited to 'sysdeps/mach/hurd/pt-docancel.c')
| -rw-r--r-- | sysdeps/mach/hurd/pt-docancel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/mach/hurd/pt-docancel.c b/sysdeps/mach/hurd/pt-docancel.c index b81a5c70..105c6fda 100644 --- a/sysdeps/mach/hurd/pt-docancel.c +++ b/sysdeps/mach/hurd/pt-docancel.c @@ -1,5 +1,5 @@ /* Cancel a thread. - Copyright (C) 2002, 2008 Free Software Foundation, Inc. + Copyright (C) 2002, 2007, 2008 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 @@ -52,8 +52,8 @@ __pthread_do_cancel (struct __pthread *p) err = __thread_abort (p->kernel_thread); assert_perror (err); - err = __thread_set_pcsp (p->kernel_thread, - 1, (void *) call_exit, 0, 0); + err = __thread_set_pcsptp (p->kernel_thread, + 1, (void *) call_exit, 0, 0, 0, 0); assert_perror (err); err = __thread_resume (p->kernel_thread); |