vkernel: revert two commits that break i386 vkernel
authorMarkus Pfeiffer <markus.pfeiffer@morphism.de>
Sun, 17 Jun 2012 19:38:49 +0000 (19:38 +0000)
committerMarkus Pfeiffer <markus.pfeiffer@morphism.de>
Sun, 17 Jun 2012 19:41:51 +0000 (19:41 +0000)
revert i386 parts of
  commit c55fa5eeab3eaf11e01222d6412b91dafdcd9e94
  commit 1a482e3fea833c34264b54d566ddd0f4276d8bcf
because it breaks build. This is still a kludge.

sys/platform/vkernel/i386/cpu_regs.c

index c386fdc..b700d40 100644 (file)
@@ -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;
        }