Module Name: src
Committed By: jdolecek
Date: Sun Mar 4 10:13:09 UTC 2018
Modified Files:
src/sys/arch/x86/include: pmap.h
src/sys/arch/x86/x86: pmap.c
Log Message:
drop pmap_update_2pg(), just call pmap_update_pg() separately for each
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/x86/include/pmap.h
cvs rdiff -u -r1.282 -r1.283 src/sys/arch/x86/x86/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/x86/include/pmap.h
diff -u src/sys/arch/x86/include/pmap.h:1.75 src/sys/arch/x86/include/pmap.h:1.76
--- src/sys/arch/x86/include/pmap.h:1.75 Thu Jan 18 07:25:34 2018
+++ src/sys/arch/x86/include/pmap.h Sun Mar 4 10:13:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.75 2018/01/18 07:25:34 maxv Exp $ */
+/* $NetBSD: pmap.h,v 1.76 2018/03/04 10:13:08 jdolecek Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -398,17 +398,6 @@ pmap_update_pg(vaddr_t va)
}
/*
- * pmap_update_2pg: flush two pages from the TLB
- */
-
-__inline static void __unused
-pmap_update_2pg(vaddr_t va, vaddr_t vb)
-{
- invlpg(va);
- invlpg(vb);
-}
-
-/*
* pmap_page_protect: change the protection of all recorded mappings
* of a managed page
*
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.282 src/sys/arch/x86/x86/pmap.c:1.283
--- src/sys/arch/x86/x86/pmap.c:1.282 Thu Mar 1 16:55:01 2018
+++ src/sys/arch/x86/x86/pmap.c Sun Mar 4 10:13:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.282 2018/03/01 16:55:01 maxv Exp $ */
+/* $NetBSD: pmap.c,v 1.283 2018/03/04 10:13:09 jdolecek Exp $ */
/*
* Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -170,7 +170,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.282 2018/03/01 16:55:01 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.283 2018/03/04 10:13:09 jdolecek Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -3388,7 +3388,8 @@ pmap_copy_page(paddr_t srcpa, paddr_t ds
pmap_pte_set(srcpte, pmap_pa2pte(srcpa) | pteflags);
pmap_pte_set(dstpte, pmap_pa2pte(dstpa) | pteflags | PG_M);
pmap_pte_flush();
- pmap_update_2pg(srcva, dstva);
+ pmap_update_pg(srcva);
+ pmap_update_pg(dstva);
memcpy((void *)dstva, (void *)srcva, PAGE_SIZE);
