From c2fb7f985330fd2666f36b960f33d181f6f5c9a4 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 17 May 2010 10:40:06 +0000 Subject: [PATCH] Revert previous change that inadvertently added reset_schedlock, and revert changes done on top on that. --- gdb/ChangeLog | 11 ----------- gdb/infrun.c | 13 ------------- gdb/target.c | 3 --- gdb/target.h | 2 -- 4 files changed, 29 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5d35d00..d509d03 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,14 +1,3 @@ -2010-05-17 Joel Brobecker - - * 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 - - * target.c (target_mourn_inferior): Extern reset_schedlock. - 2010-05-16 Michael Snyder * target.c: White space. diff --git a/gdb/infrun.c b/gdb/infrun.c index 025ba0a..9f4c298 100644 --- 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 ebcf51c..d60ef2a 100644 --- 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 cd2e82b..d4bd007 100644 --- 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); -- 2.7.4