Module Name: src
Committed By: thorpej
Date: Tue Dec 26 17:48:38 UTC 2023
Modified Files:
src/sys/arch/m68k/include: pmap_motorola.h
src/sys/arch/m68k/m68k: pmap_motorola.c
Log Message:
Move active_pmap() and active_user_pmap() macros into pmap_motorola.c
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/m68k/include/pmap_motorola.h
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/m68k/m68k/pmap_motorola.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/m68k/include/pmap_motorola.h
diff -u src/sys/arch/m68k/include/pmap_motorola.h:1.40 src/sys/arch/m68k/include/pmap_motorola.h:1.41
--- src/sys/arch/m68k/include/pmap_motorola.h:1.40 Tue Dec 26 17:42:43 2023
+++ src/sys/arch/m68k/include/pmap_motorola.h Tue Dec 26 17:48:38 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.h,v 1.40 2023/12/26 17:42:43 thorpej Exp $ */
+/* $NetBSD: pmap_motorola.h,v 1.41 2023/12/26 17:48:38 thorpej Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -182,12 +182,6 @@ struct pv_entry {
struct pmap *pv_ptpmap; /* if pv_ptste, pmap for PT page */
};
-#define active_pmap(pm) \
- ((pm) == pmap_kernel() || (pm) == curproc->p_vmspace->vm_map.pmap)
-#define active_user_pmap(pm) \
- (curproc && \
- (pm) != pmap_kernel() && (pm) == curproc->p_vmspace->vm_map.pmap)
-
extern struct pv_header *pv_table; /* array of entries, one per page */
#define pmap_resident_count(pmap) ((pmap)->pm_stats.resident_count)
Index: src/sys/arch/m68k/m68k/pmap_motorola.c
diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.81 src/sys/arch/m68k/m68k/pmap_motorola.c:1.82
--- src/sys/arch/m68k/m68k/pmap_motorola.c:1.81 Tue Dec 26 17:42:43 2023
+++ src/sys/arch/m68k/m68k/pmap_motorola.c Tue Dec 26 17:48:38 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.c,v 1.81 2023/12/26 17:42:43 thorpej Exp $ */
+/* $NetBSD: pmap_motorola.c,v 1.82 2023/12/26 17:48:38 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@
#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.81 2023/12/26 17:42:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.82 2023/12/26 17:48:38 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -325,6 +325,13 @@ void pmap_check_wiring(const char *, vad
#define PRM_CFLUSH 0x02
#define PRM_KEEPPTPAGE 0x04
+#define active_pmap(pm) \
+ ((pm) == pmap_kernel() || (pm) == curproc->p_vmspace->vm_map.pmap)
+
+#define active_user_pmap(pm) \
+ (curproc && \
+ (pm) != pmap_kernel() && (pm) == curproc->p_vmspace->vm_map.pmap)
+
/*
* pmap_bootstrap_finalize: [ INTERFACE ]
*
