diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dadea24fa0..66f20879da 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-20  Will Newton  <will.newton@linaro.org>
+
+	* arm-tdep.c (arm_get_next_pc): Remove "Infinite loop detected"
+	error message.
+
 2013-11-20  Yao Qi  <yao@codesourcery.com>
 
 	* progspace.h (struct address_space_data): Declare.
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 74e2f48237..ff6548bfd1 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -4970,17 +4970,9 @@ arm_get_next_pc (struct frame_info *frame, CORE_ADDR pc)
   CORE_ADDR nextpc;
 
   if (arm_frame_is_thumb (frame))
-    {
-      nextpc = thumb_get_next_pc_raw (frame, pc);
-      if (nextpc == MAKE_THUMB_ADDR (pc))
-	error (_("Infinite loop detected"));
-    }
+    nextpc = thumb_get_next_pc_raw (frame, pc);
   else
-    {
-      nextpc = arm_get_next_pc_raw (frame, pc);
-      if (nextpc == pc)
-	error (_("Infinite loop detected"));
-    }
+    nextpc = arm_get_next_pc_raw (frame, pc);
 
   return nextpc;
 }