Module Name: src
Committed By: skrll
Date: Tue Mar 23 06:35:24 UTC 2021
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Re-enable kpreemption in an error path. Spotted by nat@
To generate a diff of this commit:
cvs rdiff -u -r1.426 -r1.427 src/sys/arch/arm/arm32/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.426 src/sys/arch/arm/arm32/pmap.c:1.427
--- src/sys/arch/arm/arm32/pmap.c:1.426 Sun Mar 14 10:36:46 2021
+++ src/sys/arch/arm/arm32/pmap.c Tue Mar 23 06:35:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.426 2021/03/14 10:36:46 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.427 2021/03/23 06:35:24 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -192,7 +192,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.426 2021/03/14 10:36:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.427 2021/03/23 06:35:24 skrll Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -3281,6 +3281,8 @@ pmap_enter(pmap_t pm, vaddr_t va, paddr_
pmap_free_l2_bucket(pm, l2b, 0);
UVMHIST_LOG(maphist, " <-- done (ENOMEM)",
0, 0, 0, 0);
+ kpreempt_enable();
+
return ENOMEM;
}
}
