CVS commit: src/sys/arch/aarch64/aarch64

[Ryo Shimizu]

Module Name:    src
Committed By:   ryo
Date:           Mon Mar  2 08:39:36 UTC 2020

Modified Files:
        src/sys/arch/aarch64/aarch64: pmap.c

Log Message:
oops, fix incorrect usage of daif_enable() in my previous commit.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/aarch64/aarch64/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/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.66 src/sys/arch/aarch64/aarch64/pmap.c:1.67
--- src/sys/arch/aarch64/aarch64/pmap.c:1.66	Sat Feb 29 21:34:37 2020
+++ src/sys/arch/aarch64/aarch64/pmap.c	Mon Mar  2 08:39:36 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.66 2020/02/29 21:34:37 ryo Exp $	*/
+/*	$NetBSD: pmap.c,v 1.67 2020/03/02 08:39:36 ryo Exp $	*/
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.66 2020/02/29 21:34:37 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.67 2020/03/02 08:39:36 ryo Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_ddb.h"
@@ -776,7 +776,7 @@ pmap_extract(struct pmap *pm, vaddr_t va
 			reg_s1e1r_write(va);
 			__asm __volatile ("isb");
 			uint64_t par = reg_par_el1_read();
-			daif_enable(s);
+			reg_daif_write(s);
 
 			if (par & PAR_F)
 				return false;