From: Markus Pfeiffer <markus.pfeiffer@morphism.de>
Date: Sun, 17 Jun 2012 19:38:49 +0000 (+0000)
Subject: vkernel: revert two commits that break i386 vkernel
X-Git-Tag: v3.2.0~761
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/bd764d1212e85459cd331273b7d2b183f1ca4ffc

vkernel: revert two commits that break i386 vkernel

revert i386 parts of
  commit c55fa5eeab3eaf11e01222d6412b91dafdcd9e94
  commit 1a482e3fea833c34264b54d566ddd0f4276d8bcf
because it breaks build. This is still a kludge.
---

diff --git a/sys/platform/vkernel/i386/cpu_regs.c b/sys/platform/vkernel/i386/cpu_regs.c
index c386fdcd47..b700d40506 100644
--- a/sys/platform/vkernel/i386/cpu_regs.c
+++ b/sys/platform/vkernel/i386/cpu_regs.c
@@ -262,12 +262,12 @@ sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code)
 		/* fill siginfo structure */
 		sf.sf_si.si_signo = sig;
 		sf.sf_si.si_code = code;
-		sf.sf_si.si_addr = (void*)regs->tf_addr;
+		sf.sf_si.si_addr = (void*)regs->tf_err;
 	}
 	else {
 		/* Old FreeBSD-style arguments. */
 		sf.sf_siginfo = code;
-		sf.sf_addr = regs->tf_addr;
+		sf.sf_addr = regs->tf_err;
 		sf.sf_ahu.sf_handler = catcher;
 	}