svn commit: r251595 - in stable/8/sys: amd64/amd64 i386/i386

[Konstantin Belousov]

Author: kib
Date: Mon Jun 10 04:23:11 2013
New Revision: 251595
URL: http://svnweb.freebsd.org/changeset/base/251595

Log:
  MFC r251324:
  Assert that interrupts are enabled in the trap handlers on x86 before
  calling generic code to deliver signals.

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

Modified: stable/8/sys/amd64/amd64/trap.c
==============================================================================
--- stable/8/sys/amd64/amd64/trap.c	Mon Jun 10 04:12:48 2013	(r251594)
+++ stable/8/sys/amd64/amd64/trap.c	Mon Jun 10 04:23:11 2013	(r251595)
@@ -610,6 +610,7 @@ trap(struct trapframe *frame)
 	ksi.ksi_code = ucode;
 	ksi.ksi_trapno = type;
 	ksi.ksi_addr = (void *)addr;
+	KASSERT((read_rflags() & PSL_I) != 0, ("interrupts disabled"));
 	trapsignal(td, &ksi);
 
 user:

Modified: stable/8/sys/i386/i386/trap.c
==============================================================================
--- stable/8/sys/i386/i386/trap.c	Mon Jun 10 04:12:48 2013	(r251594)
+++ stable/8/sys/i386/i386/trap.c	Mon Jun 10 04:23:11 2013	(r251595)
@@ -755,6 +755,7 @@ trap(struct trapframe *frame)
 	ksi.ksi_code = ucode;
 	ksi.ksi_addr = (void *)addr;
 	ksi.ksi_trapno = type;
+	KASSERT((read_eflags() & PSL_I) != 0, ("interrupts disabled"));
 	trapsignal(td, &ksi);
 
 #ifdef DEBUG