diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 18bb4ba539..16759d3e64 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-17  Stan Shebs  <stan@codesourcery.com>
+
+	* breakpoint.c (bpstat_check_location): Check for tracepoints.
+
 2009-12-16  Michael Snyder  <msnyder@vmware.com>
 
 	* i386-tdep.c (i386_process_record): Reformat comments.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 5394ae408b..47a10f6886 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -3306,6 +3306,11 @@ bpstat_check_location (const struct bp_location *bl,
 {
   struct breakpoint *b = bl->owner;
 
+  /* By definition, the inferior does not report stops at
+     tracepoints.  */
+  if (b->type == bp_tracepoint)
+    return 0;
+
   if (b->type != bp_watchpoint
       && b->type != bp_hardware_watchpoint
       && b->type != bp_read_watchpoint