Index: src/gdb/linux-thread-db.c
===================================================================
--- gdb-cvs.orig/gdb/linux-thread-db.c	2006-01-23 14:20:23.331552656 +0530
+++ gdb-cvs/gdb/linux-thread-db.c	2006-01-23 14:25:29.955938664 +0530
@@ -1104,13 +1104,12 @@
 static void
 thread_db_mourn_inferior (void)
 {
-  remove_thread_event_breakpoints ();
-
   /* Forget about the child's process ID.  We shouldn't need it
      anymore.  */
   proc_handle.pid = 0;
 
   target_beneath->to_mourn_inferior ();
+  remove_thread_event_breakpoints ();
 
   /* Detach thread_db target ops.  */
   unpush_target (&thread_db_ops);