diff options
author | Andreas Schwab <schwab@redhat.com> | 2009-08-24 10:15:51 +0200 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2009-08-24 10:15:51 +0200 |
commit | 255acd161cc2d7752a4e79234dcba5d929c3e0a4 (patch) | |
tree | 94c1d111cce2137ee948ff0e9d735f7a3643ef78 /nptl_db/td_ta_map_lwp2thr.c | |
parent | 593eff0f9e5bed517e0a8434507ee9f3f4d45b87 (diff) | |
parent | a0e25a886a9128b280b4c05bc9c6dd12377ea868 (diff) |
Merge commit 'origin/master' into fedora/master
Conflicts:
sysdeps/powerpc/powerpc64/____longjmp_chk.S
sysdeps/unix/sysv/linux/powerpc/powerpc64/____longjmp_chk.S
Diffstat (limited to 'nptl_db/td_ta_map_lwp2thr.c')
-rw-r--r-- | nptl_db/td_ta_map_lwp2thr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nptl_db/td_ta_map_lwp2thr.c b/nptl_db/td_ta_map_lwp2thr.c index 78cfcab769..4835f31f94 100644 --- a/nptl_db/td_ta_map_lwp2thr.c +++ b/nptl_db/td_ta_map_lwp2thr.c @@ -1,5 +1,5 @@ /* Which thread is running on an LWP? - Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc. + Copyright (C) 2003,2004,2007,2009 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 @@ -33,12 +33,6 @@ __td_ta_lookup_th_unique (const td_thragent_t *ta_arg, prgregset_t regs; psaddr_t addr; - LOG ("td_ta_map_lwp2thr"); - - /* Test whether the TA parameter is ok. */ - if (! ta_ok (ta)) - return TD_BADTA; - if (ta->ta_howto == ta_howto_unknown) { /* We need to read in from the inferior the instructions what to do. */ @@ -181,6 +175,12 @@ td_ta_map_lwp2thr (const td_thragent_t *ta_arg, { td_thragent_t *const ta = (td_thragent_t *) ta_arg; + LOG ("td_ta_map_lwp2thr"); + + /* Test whether the TA parameter is ok. */ + if (! ta_ok (ta)) + return TD_BADTA; + /* We cannot rely on thread registers and such information at all before __pthread_initialize_minimal has gotten far enough. They sometimes contain garbage that would confuse us, left by the kernel |