diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d47b862f4a8..b1fb9477a96 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-05  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Code cleanup.
+	* breakpoint.c (bpstat_stop_status): Use bpstat_causes_stop.
+
 2010-04-04  Stan Shebs  <stan@codesourcery.com>
 	    Nathan Sidwell  <nathan@codesourcery.com>
 
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 2efb76683af..36a28f6143d 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -4141,12 +4141,8 @@ bpstat_stop_status (struct address_space *aspace,
      not have changed, but the intermediate memory locations we are
      watching may have.  Don't bother if we're stopping; this will get
      done later.  */
-  for (bs = root_bs->next; bs != NULL; bs = bs->next)
-    if (bs->stop)
-      break;
-
   need_remove_insert = 0;
-  if (bs == NULL)
+  if (! bpstat_causes_stop (root_bs->next))
     for (bs = root_bs->next; bs != NULL; bs = bs->next)
       if (!bs->stop
 	  && bs->breakpoint_at->owner