Make the vm_pmap field of struct vmspace the last field in the

structure. This allows per-CPU variations of struct pmap on a
single architecture without affecting the machine-independent
fields. As such, the PMAP variations don't affect the ABI. They
become part of it.

1 files changed, 6 insertions, 1 deletions

diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index 1d3d90d..28479e3 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -233,7 +233,6 @@ vm_map_modflags(vm_map_t map, vm_flags_t set, vm_flags_t clear)
  */
 struct vmspace {
 	struct vm_map vm_map;	/* VM address map */
-	struct pmap vm_pmap;	/* private physical map */
 	struct shmmap_state *vm_shm;	/* SYS5 shared memory private data XXX */
 	segsz_t vm_swrss;	/* resident set size before last swap */
 	segsz_t vm_tsize;	/* text size (pages) XXX */
@@ -243,6 +242,12 @@ struct vmspace {
 	caddr_t vm_daddr;	/* (c) user virtual address of data */
 	caddr_t vm_maxsaddr;	/* user VA at max stack growth */
 	int	vm_refcnt;	/* number of references */
+	/*
+	 * Keep the PMAP last, so that CPU-specific variations of that
+	 * structure on a single architecture don't result in offset
+	 * variations of the machine-independent fields in the vmspace.
+	 */
+	struct pmap vm_pmap;	/* private physical map */
 };
 
 #ifdef	_KERNEL