Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move sun3x _pmap_fault macro from pmap.h to trap.c

This commit is contained in:
gwr 1998-06-09 19:58:50 +00:00
parent a3db0f915e
commit 557be5668b
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/sun3/include/pmap3x.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap3x.h,v 1.9 1998/03/16 16:25:38 gwr Exp $ */
/* $NetBSD: pmap3x.h,v 1.10 1998/06/09 19:58:50 gwr Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -53,13 +53,6 @@ struct pmap {
extern struct pmap kernel_pmap;
#define pmap_kernel() (&kernel_pmap)
/*
* The sun3 wants faults to go through the pmap code, but
* the sun3x just goes directly to the common VM code.
*/
#define _pmap_fault(map, va, ftype) \
vm_fault(map, va, ftype, 0)
/* Common function for pmap_resident_count(), pmap_wired_count() */
segsz_t pmap_count __P((pmap_t, int));

16
sys/arch/sun3/sun3/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.76 1998/06/08 20:47:47 gwr Exp $ */
/* $NetBSD: trap.c,v 1.77 1998/06/09 19:58:50 gwr Exp $ */
/*
* Copyright (c) 1994 Gordon W. Ross
@ -87,6 +87,20 @@ void regdump __P((struct trapframe *, int));
extern struct emul emul_sunos;
#endif
/*
* The sun3 wants faults to go through the pmap code, but
* the sun3x just goes directly to the common VM code.
*/
#ifdef _SUN3X_
#if defined(UVM)
# define _pmap_fault(map, va, ftype) \
uvm_fault(map, va, 0, ftype)
#else /* UVM */
# define _pmap_fault(map, va, ftype) \
vm_fault(map, va, ftype, 0)
#endif /* UVM */
#endif /* SUN3X */
/* Special labels in m68k/copy.s */
extern char fubail[], subail[];