Index: head/gnu/usr.bin/gdb/kgdb/kthr.c
===================================================================
--- head/gnu/usr.bin/gdb/kgdb/kthr.c
+++ head/gnu/usr.bin/gdb/kgdb/kthr.c
@@ -96,7 +96,7 @@
 			kt->kaddr = addr;
 			if (td.td_tid == dumptid)
 				kt->pcb = dumppcb;
-			else if (td.td_state == TDS_RUNNING &&
+			else if (td.td_oncpu != NOCPU &&
 			    CPU_ISSET(td.td_oncpu, &stopped_cpus))
 				kt->pcb = kgdb_trgt_core_pcb(td.td_oncpu);
 			else