Module Name: src
Committed By: maxv
Date: Sat Feb 23 10:59:12 UTC 2019
Modified Files:
src/sys/arch/x86/include: pmap.h
src/sys/arch/x86/x86: pmap.c
Log Message:
Move PATENTRY into pmap.h, will be used outside.
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/x86/include/pmap.h
cvs rdiff -u -r1.326 -r1.327 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.97 src/sys/arch/x86/include/pmap.h:1.98
--- src/sys/arch/x86/include/pmap.h:1.97 Wed Feb 13 08:38:25 2019
+++ src/sys/arch/x86/include/pmap.h Sat Feb 23 10:59:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.97 2019/02/13 08:38:25 maxv Exp $ */
+/* $NetBSD: pmap.h,v 1.98 2019/02/23 10:59:12 maxv Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -114,6 +114,14 @@
#include <x86/pmap_pv.h>
#include <uvm/pmap/pmap_pvt.h>
+#define PATENTRY(n, type) (type << ((n) * 8))
+#define PAT_UC 0x0ULL
+#define PAT_WC 0x1ULL
+#define PAT_WT 0x4ULL
+#define PAT_WP 0x5ULL
+#define PAT_WB 0x6ULL
+#define PAT_UCMINUS 0x7ULL
+
#define BTSEG_NONE 0
#define BTSEG_TEXT 1
#define BTSEG_RODATA 2
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.326 src/sys/arch/x86/x86/pmap.c:1.327
--- src/sys/arch/x86/x86/pmap.c:1.326 Sat Feb 23 10:43:37 2019
+++ src/sys/arch/x86/x86/pmap.c Sat Feb 23 10:59:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.326 2019/02/23 10:43:37 maxv Exp $ */
+/* $NetBSD: pmap.c,v 1.327 2019/02/23 10:59:12 maxv Exp $ */
/*
* Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.326 2019/02/23 10:43:37 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.327 2019/02/23 10:59:12 maxv Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -287,14 +287,6 @@ struct evcnt pmap_ldt_evcnt;
/*
* PAT
*/
-#define PATENTRY(n, type) (type << ((n) * 8))
-#define PAT_UC 0x0ULL
-#define PAT_WC 0x1ULL
-#define PAT_WT 0x4ULL
-#define PAT_WP 0x5ULL
-#define PAT_WB 0x6ULL
-#define PAT_UCMINUS 0x7ULL
-
static bool cpu_pat_enabled __read_mostly = false;
/*
