Index: sys/arm/arm/machdep_kdb.c
===================================================================
--- sys/arm/arm/machdep_kdb.c
+++ sys/arm/arm/machdep_kdb.c
@@ -120,9 +120,9 @@
 	}
 	KASSERT(pcb->pcb_vfpsaved == &pcb->pcb_vfpstate,
 	    ("Called fill_fpregs while the kernel is using the VFP"));
-	memcpy(regs->fpr_r, pcb->pcb_vfpstate.reg,
-	    sizeof(regs->fpr_r));
-	regs->fpr_fpscr = pcb->pcb_vfpstate.fpscr;
+	memcpy(regs->fpr, pcb->pcb_vfpstate.reg,
+	    sizeof(regs->fpr));
+	regs->fpr_fpsr = pcb->pcb_vfpstate.fpscr;
 #else
 	memset(regs, 0, sizeof(*regs));
 #endif
@@ -152,8 +152,8 @@
 	pcb = td->td_pcb;
 	KASSERT(pcb->pcb_vfpsaved == &pcb->pcb_vfpstate,
 	    ("Called set_fpregs while the kernel is using the VFP"));
-	memcpy(pcb->pcb_vfpstate.reg, regs->fpr_r, sizeof(regs->fpr_r));
-	pcb->pcb_vfpstate.fpscr = regs->fpr_fpscr;
+	memcpy(pcb->pcb_vfpstate.reg, regs->fpr, sizeof(regs->fpr));
+	pcb->pcb_vfpstate.fpscr = regs->fpr_fpsr;
 #endif
 	return (0);
 }
Index: sys/arm/include/reg.h
===================================================================
--- sys/arm/include/reg.h
+++ sys/arm/include/reg.h
@@ -14,8 +14,8 @@
 };
 
 struct fpreg {
-	__uint64_t	fpr_r[32];
-	__uint32_t	fpr_fpscr;
+	__uint64_t	fpr[32];
+	__uint32_t	fpr_fpsr;
 };
 
 struct dbreg {