From 608b8a8ca345c49ba0a791fa2fdd903a711bac2a Mon Sep 17 00:00:00 2001
From: kettenis <kettenis@openbsd.org>
Date: Fri, 19 Aug 2016 19:07:37 +0000
Subject: [PATCH] Make the FSR encoding strings match the ARMv7 ARM.

---
 sys/arch/arm/arm/fault.c | 42 ++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/sys/arch/arm/arm/fault.c b/sys/arch/arm/arm/fault.c
index d30455a666e..0cb36aea8f2 100644
--- a/sys/arch/arm/arm/fault.c
+++ b/sys/arch/arm/arm/fault.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fault.c,v 1.21 2016/08/19 13:56:08 kettenis Exp $	*/
+/*	$OpenBSD: fault.c,v 1.22 2016/08/19 19:07:37 kettenis Exp $	*/
 /*	$NetBSD: fault.c,v 1.46 2004/01/21 15:39:21 skrll Exp $	*/
 
 /*
@@ -152,36 +152,36 @@ static const struct data_abort data_aborts[] = {
 	{NULL,		"Permission Fault (P)"}
 #else
 	{dab_fatal,	"V7 fault 00000"},
-	{dab_align,	"Alignment Fault 1"},
-	{dab_fatal,	"Debug Event"},
-	{NULL,		"Access Flag Fault (S)"},
-	{dab_buserr,	"External Linefetch Abort (S)"},
-	{NULL,		"Translation Fault (S)"},
-	{NULL,		"Access Flag Fault (P)"},
-	{NULL,		"Translation Fault (P)"},
-	{dab_buserr,	"External Non-Linefetch Abort (S)"},
-	{NULL,		"Domain Fault (S)"},
+	{dab_align,	"Alignment fault"},
+	{dab_fatal,	"Debug event"},
+	{NULL,		"Access flag fault (L1)"},
+	{dab_buserr,	"Fault on instruction cache maintenance"},
+	{NULL,		"Translation fault (L1)"},
+	{NULL,		"Access flag fault (L2)"},
+	{NULL,		"Translation fault (L2)"},
+	{dab_buserr,	"Synchronous external abort"},
+	{NULL,		"Domain fault (L1)"},
 	{dab_fatal,	"V7 fault 01010"},
-	{NULL,		"Domain Fault (P)"},
-	{dab_buserr,	"External Translation Abort (L1)"},
-	{NULL,		"Permission Fault (S)"},
-	{dab_buserr,	"External Translation Abort (L2)"},
-	{NULL,		"Permission Fault (P)"},
-	{dab_fatal,	"V7 fault 10000"},
+	{NULL,		"Domain fault (L2)"},
+	{dab_buserr,	"Synchronous external abort on translation table walk (L1)"},
+	{NULL,		"Permission fault (L1)"},
+	{dab_buserr,	"Synchronous external abort on translation table walk (L2)"},
+	{NULL,		"Permission fault (L2)"},
+	{dab_fatal,	"TLB conflict abort"},
 	{dab_fatal,	"V7 fault 10001"},
 	{dab_fatal,	"V7 fault 10010"},
 	{dab_fatal,	"V7 fault 10011"},
 	{dab_fatal,	"Lockdown"},
 	{dab_fatal,	"V7 fault 10101"},
-	{dab_fatal,	"Asynchronous External Abort"},
+	{dab_fatal,	"Asynchronous external abort"},
 	{dab_fatal,	"V7 fault 10111"},
-	{dab_fatal,	"Memory Asynchronous Parity Error"},
-	{dab_fatal,	"Memory Synchronous Parity Error"},
+	{dab_fatal,	"Asynchronous parity error on memory access"},
+	{dab_fatal,	"Synchronous parity error on memory access"},
 	{dab_fatal,	"Coprocessor Abort"},
 	{dab_fatal,	"V7 fault 11011"},
-	{dab_buserr,	"External Translation Abort (L1)"},
+	{dab_buserr,	"Synchronous parity error on translation table walk (L1)"},
 	{dab_fatal,	"V7 fault 11101"},
-	{dab_buserr,	"External Translation Abort (L2)"},
+	{dab_buserr,	"Synchronous parity error on translation table walk (L2)"},
 	{NULL,		"V7 fault 11111"},
 #endif
 };
-- 
2.20.1