diff options
| author | KATO Takenori <kato@FreeBSD.org> | 1999-10-13 11:03:41 +0000 |
|---|---|---|
| committer | KATO Takenori <kato@FreeBSD.org> | 1999-10-13 11:03:41 +0000 |
| commit | 41edac7f872d65fb0dbfe386db0f0236cb5aa9a0 (patch) | |
| tree | 27701c9c33d146a45d7a6c72e0cd746cfac40666 /sys/pc98 | |
| parent | 7b51ebbd9416aa7bb0ea4ff48915ce74c6860607 (diff) | |
| download | src-41edac7f872d65fb0dbfe386db0f0236cb5aa9a0.tar.gz src-41edac7f872d65fb0dbfe386db0f0236cb5aa9a0.zip | |
Sync with sys/i386/i386/machdep.c revision 1.370.
Notes
Notes:
svn path=/head/; revision=52206
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/i386/machdep.c | 4 | ||||
| -rw-r--r-- | sys/pc98/pc98/machdep.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index c69e33958490..560f8a34b775 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -42,6 +42,7 @@ #include "ether.h" #include "npx.h" #include "opt_atalk.h" +#include "opt_compat.h" #include "opt_cpu.h" #include "opt_ddb.h" #include "opt_inet.h" @@ -921,7 +922,8 @@ sigreturn(p, uap) vm86->vm86_eflags = eflags; /* save VIF, VIP */ eflags = (tf->tf_eflags & ~VM_USERCHANGE) | (eflags & VM_USERCHANGE) | PSL_VM; } - bcopy(&ucp->uc_mcontext.mc_fs, regs, sizeof(struct trapframe)); + bcopy(&ucp->uc_mcontext.mc_fs, tf, sizeof(struct trapframe)); + tf->tf_eflags = eflags; tf->tf_vm86_ds = tf->tf_ds; tf->tf_vm86_es = tf->tf_es; tf->tf_vm86_fs = tf->tf_fs; diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index c69e33958490..560f8a34b775 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -42,6 +42,7 @@ #include "ether.h" #include "npx.h" #include "opt_atalk.h" +#include "opt_compat.h" #include "opt_cpu.h" #include "opt_ddb.h" #include "opt_inet.h" @@ -921,7 +922,8 @@ sigreturn(p, uap) vm86->vm86_eflags = eflags; /* save VIF, VIP */ eflags = (tf->tf_eflags & ~VM_USERCHANGE) | (eflags & VM_USERCHANGE) | PSL_VM; } - bcopy(&ucp->uc_mcontext.mc_fs, regs, sizeof(struct trapframe)); + bcopy(&ucp->uc_mcontext.mc_fs, tf, sizeof(struct trapframe)); + tf->tf_eflags = eflags; tf->tf_vm86_ds = tf->tf_ds; tf->tf_vm86_es = tf->tf_es; tf->tf_vm86_fs = tf->tf_fs; |