svn commit: r268661 - in stable/10/sys: amd64/amd64 i386/i386

[Konstantin Belousov]

Author: kib
Date: Tue Jul 15 10:01:33 2014
New Revision: 268661
URL: http://svnweb.freebsd.org/changeset/base/268661

Log:
  MFC r268383:
  Correct si_code for the SIGBUS signal generated by the alignment trap.

Modified:
  stable/10/sys/amd64/amd64/trap.c
  stable/10/sys/i386/i386/trap.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/amd64/amd64/trap.c
==============================================================================
--- stable/10/sys/amd64/amd64/trap.c	Tue Jul 15 09:30:43 2014	(r268660)
+++ stable/10/sys/amd64/amd64/trap.c	Tue Jul 15 10:01:33 2014	(r268661)
@@ -345,6 +345,10 @@ trap(struct trapframe *frame)
 			i = SIGBUS;
 			ucode = BUS_OBJERR;
 			break;
+		case T_ALIGNFLT:
+			i = SIGBUS;
+			ucode = BUS_ADRALN;
+			break;
 		case T_DOUBLEFLT:	/* double fault */
 		default:
 			i = SIGBUS;

Modified: stable/10/sys/i386/i386/trap.c
==============================================================================
--- stable/10/sys/i386/i386/trap.c	Tue Jul 15 09:30:43 2014	(r268660)
+++ stable/10/sys/i386/i386/trap.c	Tue Jul 15 10:01:33 2014	(r268661)
@@ -398,6 +398,10 @@ trap(struct trapframe *frame)
 			i = SIGBUS;
 			ucode = BUS_OBJERR;
 			break;
+		case T_ALIGNFLT:
+			i = SIGBUS;
+			ucode = BUS_ADRALN;
+			break;
 		case T_DOUBLEFLT:	/* double fault */
 		default:
 			i = SIGBUS;