diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 63f0f281b1..0dde7729c5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-01  Andrew Cagney  <cagney@redhat.com>
+
+	* infrun.c (check_sigtramp2): Delete check for
+	DEPRECATED_PC_IN_SIGTRAMP and INNER_THAN.
+
 2004-05-01  Mark Kettenis  <kettenis@gnu.org>
 
 	* m68k-tdep.h (m68kbsd_fpreg_offset): New prototype.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 5f114750ea..4e127444b9 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2715,14 +2715,6 @@ check_sigtramp2 (struct execution_control_state *ecs)
     return;
   if (get_frame_type (get_current_frame ()) != SIGTRAMP_FRAME)
     return;
-  /* Long term, this function can be eliminated, replaced by the code:
-     get_frame_type(current_frame()) == SIGTRAMP_FRAME (for new
-     architectures this is very cheap).  */
-  find_pc_partial_function (prev_pc, &name, NULL, NULL);
-  if (DEPRECATED_PC_IN_SIGTRAMP (prev_pc, name))
-    return;
-  if (!INNER_THAN (read_sp (), step_sp))
-    return;
 
   /* So we need to set a step_resume_break_address breakpoint and
      continue until we hit it, and then step.  FIXME: This should be