diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d035f9504b5b0fb24f92cd278997cf1dc4df5e74..dc5497e1decfc9de801f555b831d7aa7c0d1d1b6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-13  Andrew Cagney  <cagney@redhat.com>
+
+	* infrun.c (handle_inferior_event): Use frame_unwind_id.
+
 2004-05-13  Bryce McKinlay  <mckinlay@redhat.com>
 
 	* dwarf2loc.c (find_location_expression): Use ANOFFSET to adjust
diff --git a/gdb/infrun.c b/gdb/infrun.c
index bec87465bdfd0c5e8916b5209b24b76be7ba22f9..0ba857bb115037b8b7e275bc6173f2eaa7760bbd 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2437,7 +2437,7 @@ handle_inferior_event (struct execution_control_state *ecs)
       return;
     }
 
-  if (frame_id_eq (get_frame_id (get_prev_frame (get_current_frame ())),
+  if (frame_id_eq (frame_unwind_id (get_current_frame ()),
                    step_frame_id))
     {
       /* It's a subroutine call.  */