Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tlb_exception: in slow path, check for usermode before calling userret().

Browse Source
This commit is contained in:
ad 2019-12-03 12:39:00 +00:00
parent d2098312a4
commit fded62536f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/sh3/sh3/exception.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: exception.c,v 1.71 2019/12/01 12:19:28 ad Exp $ */
/* $NetBSD: exception.c,v 1.72 2019/12/03 12:39:00 ad Exp $ */
/*-
* Copyright (c) 2002, 2019 The NetBSD Foundation, Inc. All rights reserved.
@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exception.c,v 1.71 2019/12/01 12:19:28 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: exception.c,v 1.72 2019/12/03 12:39:00 ad Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -233,6 +233,7 @@ general_exception(struct lwp *l, struct trapframe *tf, uint32_t va)
return;
trapsignal:
KASSERT(usermode);
ksi.ksi_trap = tf->tf_expevt;
trapsignal(l, &ksi);
userret(l);
@ -400,7 +401,8 @@ tlb_exception(struct lwp *l, struct trapframe *tf, uint32_t va)
/* Page in. load PTE to TLB. */
if (err == 0) {
bool loaded;
userret(l);
if (usermode)
userret(l);
loaded = __pmap_pte_load(pmap, va, track);
#if 0
/*