diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-03-16 13:20:44 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-03-16 13:20:44 +0000 |
| commit | 26241d20b20c6ba9e1f41bb8648486195029f4b4 (patch) | |
| tree | 88f5c961a5631b1baa8bcef92c87f796e2e28114 | |
| parent | 02fba3d027f4efd08514fa37cf17cfe89865f07c (diff) | |
play the relied-upon-xlation proper; deraadt@ ok
| -rw-r--r-- | sys/arch/hppa/hppa/locore.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/hppa/hppa/locore.S b/sys/arch/hppa/hppa/locore.S index 6ad9ac43690..7e40e593286 100644 --- a/sys/arch/hppa/hppa/locore.S +++ b/sys/arch/hppa/hppa/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.145 2005/01/23 16:28:29 mickey Exp $ */ +/* $OpenBSD: locore.S,v 1.146 2005/03/16 13:20:43 mickey Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -818,12 +818,12 @@ $syscall_return * sp will be left in virtual until restored from trapframe, * since we don't use it anyway. */ - rsm RESET_PSL, r0 - nop ! nop ! nop ! nop ! nop ! nop ! nop -$syscall_return_phys - + ssm 0, r0 ldil L%$trap_tmp_save, t3 ldo R%$trap_tmp_save(t3), t3 + nop ! nop ! nop ! nop ! nop + rsm RESET_PSL, r0 +$syscall_return_phys /* finally we can restore the space and offset queues and the ipsw */ ldw TF_IISQH(t3), t1 |