diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-11-27 12:51:22 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-11-27 12:51:22 +0000 |
| commit | 9f76e9b56e327eab43f8c21304174f403f1d7941 (patch) | |
| tree | aed6763f5abd41cf874f54391cc75f2e8a3ee352 /sys/lib/libkern/arch | |
| parent | 37554207f12bf7314b90eaef75bbb7a6a23664e9 (diff) | |
Oops, jsing@ changed spcopy.S without realizing that that file is generated
from bcopy.m4. Fix that.
Diffstat (limited to 'sys/lib/libkern/arch')
| -rw-r--r-- | sys/lib/libkern/arch/hppa/bcopy.m4 | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/lib/libkern/arch/hppa/bcopy.m4 b/sys/lib/libkern/arch/hppa/bcopy.m4 index 3dc4cb552a3..7ea605f340a 100644 --- a/sys/lib/libkern/arch/hppa/bcopy.m4 +++ b/sys/lib/libkern/arch/hppa/bcopy.m4 @@ -1,4 +1,4 @@ -define(_rcsid,``$OpenBSD: bcopy.m4,v 1.17 2007/11/24 19:42:00 deraadt Exp $'')dnl +define(_rcsid,``$OpenBSD: bcopy.m4,v 1.18 2011/11/27 12:51:21 kettenis Exp $'')dnl dnl dnl dnl This is the source file for bcopy.S, spcopy.S @@ -225,12 +225,8 @@ ifelse(NAME, `spcopy', * * assumes that spaces do not clash, otherwise we lose */ - .import curproc, data - .import cpu_info_primary, data .import copy_on_fault, code -#define curproc (cpu_info_primary + CI_CURPROC) - LEAF_ENTRY(spcopy) ldw HPPA_FRAME_ARG(4)(sp), ret0 sub,<> r0, ret0, r0 @@ -240,8 +236,8 @@ LEAF_ENTRY(spcopy) ldo 64(sp), sp stw rp, HPPA_FRAME_CRP(sp) /* setup fault handler */ - ldil L%curproc, t1 - ldw R%curproc(t1), t3 + mfctl cr29, t1 + ldw CI_CURPROC(t1), t3 ldil L%copy_on_fault, t2 ldw P_ADDR(t3), r2 ldo R%copy_on_fault(t2), t2 |