diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2020-09-24 20:22:51 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2020-09-24 20:22:51 +0000 |
| commit | bb20519b0afbc8116db9bdf097ee1783a48132a9 (patch) | |
| tree | 73566f17d8904443a64de066059b3c701f01c888 /sys | |
| parent | c5137d30028239faa7f2467c3299be5658414b6d (diff) | |
mi_ast() should not use the old cpu, but the cpu (after potential sleep
in refreshcreds()
ok kettenis
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/i386/trap.c | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc/powerpc/trap.c | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc64/powerpc64/trap.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c index e3a5c7e5264..74359a00f3d 100644 --- a/sys/arch/i386/i386/trap.c +++ b/sys/arch/i386/i386/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.148 2020/09/24 17:54:29 deraadt Exp $ */ +/* $OpenBSD: trap.c,v 1.149 2020/09/24 20:21:50 deraadt Exp $ */ /* $NetBSD: trap.c,v 1.95 1996/05/05 06:50:02 mycroft Exp $ */ /*- @@ -476,7 +476,7 @@ ast(struct trapframe *frame) p->p_md.md_regs = frame; refreshcreds(p); uvmexp.softs++; - mi_ast(p, want_resched); + mi_ast(p, curcpu()->ci_want_resched); userret(p); } diff --git a/sys/arch/powerpc/powerpc/trap.c b/sys/arch/powerpc/powerpc/trap.c index f039aeda230..227b4f067f2 100644 --- a/sys/arch/powerpc/powerpc/trap.c +++ b/sys/arch/powerpc/powerpc/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.116 2020/09/24 17:54:30 deraadt Exp $ */ +/* $OpenBSD: trap.c,v 1.117 2020/09/24 20:22:50 deraadt Exp $ */ /* $NetBSD: trap.c,v 1.3 1996/10/13 03:31:37 christos Exp $ */ /* @@ -522,7 +522,7 @@ brain_damage: case EXC_AST|EXC_USER: p->p_md.md_astpending = 0; /* we are about to do it */ uvmexp.softs++; - mi_ast(p, ci->ci_want_resched); + mi_ast(p, curcpu()->ci_want_resched); break; } diff --git a/sys/arch/powerpc64/powerpc64/trap.c b/sys/arch/powerpc64/powerpc64/trap.c index 20b01e93e83..827ae07bd6e 100644 --- a/sys/arch/powerpc64/powerpc64/trap.c +++ b/sys/arch/powerpc64/powerpc64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.38 2020/09/24 17:54:30 deraadt Exp $ */ +/* $OpenBSD: trap.c,v 1.39 2020/09/24 20:22:15 deraadt Exp $ */ /* * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org> @@ -258,7 +258,7 @@ trap(struct trapframe *frame) case EXC_AST|EXC_USER: p->p_md.md_astpending = 0; uvmexp.softs++; - mi_ast(p, ci->ci_want_resched); + mi_ast(p, curcpu()->ci_want_resched); break; case EXC_ALI|EXC_USER: |