Index: head/sys/arm/arm/trap-v6.c
===================================================================
--- head/sys/arm/arm/trap-v6.c
+++ head/sys/arm/arm/trap-v6.c
@@ -169,7 +169,8 @@
 };
 
 static __inline void
-call_trapsignal(struct thread *td, int sig, int code, vm_offset_t addr)
+call_trapsignal(struct thread *td, int sig, int code, vm_offset_t addr,
+    int trapno)
 {
 	ksiginfo_t ksi;
 
@@ -185,6 +186,7 @@
 	ksi.ksi_signo = sig;
 	ksi.ksi_code = code;
 	ksi.ksi_addr = (void *)addr;
+	ksi.ksi_trapno = trapno;
 	trapsignal(td, &ksi);
 }
 
@@ -252,7 +254,7 @@
 		struct thread *td;
 
 		td = curthread;
-		call_trapsignal(td, SIGTRAP, TRAP_BRKPT, far);
+		call_trapsignal(td, SIGTRAP, TRAP_BRKPT, far, FAULT_DEBUG);
 		userret(td, tf);
 	} else {
 #ifdef KDB
@@ -523,7 +525,7 @@
 	ksig.addr = far;
 
 do_trapsignal:
-	call_trapsignal(td, ksig.sig, ksig.code, ksig.addr);
+	call_trapsignal(td, ksig.sig, ksig.code, ksig.addr, idx);
 out:
 	if (usermode)
 		userret(td, tf);