Revert previous change that inadvertently added reset_schedlock, and

revert changes done on top on that.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5d35d00773b90bfa2cf4646614930b9ccb1d3b34..d509d033ebcbb87cc19749c411cbdbe275e3fd1a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,14 +1,3 @@
-2010-05-17  Joel Brobecker  <brobecker@adacore.com>
-
-       * target.h (reset_schedlock): Add declaration.
-       * infrun.c (reset_schedlock): Add missing void in function profile.
-       * target.c (target_mourn_inferior): Delete local declaration of
-       reset_schedlock.  Style-fix in comment.
-
-2010-05-17  Hui Zhu  <teawater@gmail.com>
-
-       * target.c (target_mourn_inferior): Extern reset_schedlock.
-
 2010-05-16  Michael Snyder  <msnyder@vmware.com>
 
        * target.c: White space.

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 025ba0ae1a08773afb025f86fed92c0f35588f14..9f4c298ebee870cfe24182b1565622aa03161b91 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1420,19 +1420,6 @@ set_schedlock_func (char *args, int from_tty, struct cmd_list_element *c)
     }
 }
 
-/* If SCHEDULER_MODE is on, then set it back to off.  Warn the user
-   about the change.  */
- 
-void
-reset_schedlock (void)
-{
-  if (scheduler_mode == schedlock_on)
-    {
-      warning ("Resetting scheduler-lock mode to 'off'");
-      scheduler_mode = schedlock_off;
-    }
-}
-
 /* True if execution commands resume all threads of all processes by
    default; otherwise, resume only threads of the current inferior
    process.  */

diff --git a/gdb/target.c b/gdb/target.c
index ebcf51cd0f3e524d0474453e551c453cff5c8532..d60ef2a98fb48e0f0a43015dc104cc8ec530f18e 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -2245,9 +2245,6 @@ target_mourn_inferior (void)
 {
   struct target_ops *t;
 
-  /* Clear schedlock in infrun.c.  */
-  reset_schedlock ();
-
   for (t = current_target.beneath; t != NULL; t = t->beneath)
     {
       if (t->to_mourn_inferior != NULL)        

diff --git a/gdb/target.h b/gdb/target.h
index cd2e82bf8d07aa3afeb876308ded3c6602326e76..d4bd00759b0fcdf65b2cf1b6084366139dfcc077 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -873,8 +873,6 @@ int target_write_memory_blocks (VEC(memory_write_request_s) *requests,
 
 /* From infrun.c.  */
 
-extern void reset_schedlock (void);
-
 extern int inferior_has_forked (ptid_t pid, ptid_t *child_pid);
 
 extern int inferior_has_vforked (ptid_t pid, ptid_t *child_pid);