 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcb.h,v 1.7 2007/03/04 06:00:04 christos Exp $	*/
+/*	$NetBSD: pcb.h,v 1.8 2009/12/02 15:47:45 tsutsui Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -95,14 +95,17 @@ struct pcb {
 /* Positions within pcb_regs[] of A6 and A7 (FP and SP). For m68k DDB. */
 #define PCB_REGS_FP	10
 #define PCB_REGS_SP	11
 /*
  * The pcb is augmented with machine-dependent additional data for
  * core dumps. For the hp300, this includes an HP-UX exec header
  * which is dumped for HP-UX processes.
  */
 struct md_coredump {
 	int	md_exec[16];	/* exec structure for HP-UX core dumps */
 };
 extern struct pcb *curpcb;
 #endif /* _M68K_PCB_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap_motorola.h,v 1.21 2009/08/26 00:30:02 thorpej Exp $	*/
+/*	$NetBSD: pmap_motorola.h,v 1.22 2009/12/02 15:47:45 tsutsui Exp $	*/
 /*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -181,26 +181,30 @@ pmap_remove_all(struct pmap *pmap)
+}
 extern st_entry_t	*Sysseg;
 extern pt_entry_t	*Sysmap, *Sysptmap;
 extern vsize_t		Sysptsize;
 extern vsize_t		mem_size;
 extern vaddr_t		virtual_avail, virtual_end;
 extern u_int		protection_codes[];
 extern char		*vmmap;		/* map for mem, dumps, etc. */
 extern void		*CADDR1, *CADDR2;
 extern void		*msgbufaddr;
 /* for lwp0 uarea initialization after MMU enabled */
 extern vaddr_t		lwp0uarea;
 void	pmap_bootstrap_finalize(void);
 vaddr_t	pmap_map(vaddr_t, paddr_t, paddr_t, int);
 void	pmap_procwr(struct proc *, vaddr_t, size_t);
 #define	PMAP_NEED_PROCWR
 #ifdef CACHE_HAVE_VAC
 void	pmap_prefer(vaddr_t, vaddr_t *);
 #define	PMAP_PREFER(foff, vap, sz, td)	pmap_prefer((foff), (vap))
 #endif
 void	_pmap_set_page_cacheable(struct pmap *, vaddr_t);
 void	_pmap_set_page_cacheinhibit(struct pmap *, vaddr_t);
 int	_pmap_page_is_cacheable(struct pmap *, vaddr_t);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap_motorola.c,v 1.51 2009/11/23 00:11:44 rmind Exp $        */
+/*	$NetBSD: pmap_motorola.c,v 1.52 2009/12/02 15:47:45 tsutsui Exp $        */
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -107,27 +107,27 @@
  *	of virtual-to-physical mappings must be done as
  *	requested.
+ *
  *	In order to cope with hardware architectures which
  *	make virtual-to-physical map invalidates expensive,
  *	this module may delay invalidate or reduced protection
  *	operations until such time as they are actually
  *	necessary.  This module is given full information as
  *	to which processors are currently using which maps,
  *	and to when physical maps must be made correct.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.51 2009/11/23 00:11:44 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.52 2009/12/02 15:47:45 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <machine/pte.h>
 #include <uvm/uvm.h>
 #include <machine/cpu.h>
 #include <m68k/cacheops.h>
 @@ -230,26 +230,28 @@ struct kpt_page *kpt_pages;
  * Segtabzero is an empty segment table which all processes share til they
  * reference something.
  */
 st_entry_t	*Sysseg;
 pt_entry_t	*Sysmap, *Sysptmap;
 st_entry_t	*Segtabzero, *Segtabzeropa;
 vsize_t		Sysptsize = VM_KERNEL_PT_PAGES;
 static struct pmap kernel_pmap_store;
 struct pmap	*const kernel_pmap_ptr = &kernel_pmap_store;
 struct vm_map	*st_map, *pt_map;
 struct vm_map_kernel st_map_store, pt_map_store;
 vaddr_t		lwp0uarea;	/* lwp0 u-area VA, initialized in bootstrap */
 paddr_t		avail_start;	/* PA of first available physical page */
 paddr_t		avail_end;	/* PA of last available physical page */
 vsize_t		mem_size;	/* memory size in bytes */
 vaddr_t		virtual_avail;  /* VA of first avail page (after kernel bss)*/
 vaddr_t		virtual_end;	/* VA of last avail page (end of kernel AS) */
 int		page_cnt;	/* number of pages managed by VM system */
 bool		pmap_initialized = false;	/* Has pmap_init completed? */
 struct pv_header {
 	struct pv_entry		pvh_first;	/* first PV entry */
 	uint16_t		pvh_attrs;	/* attributes:
 						   bits 0-7: PTE bits
 @@ -304,26 +306,42 @@ void	pmap_pinit(pmap_t);
 void	pmap_release(pmap_t);
 #ifdef DEBUG
 void pmap_pvdump(paddr_t);
 void pmap_check_wiring(const char *, vaddr_t);
 #endif
 /* pmap_remove_mapping flags */
 #define	PRM_TFLUSH	0x01
 #define	PRM_CFLUSH	0x02
 #define	PRM_KEEPPTPAGE	0x04
 /*
  * pmap_bootstrap_finalize:	[ INTERFACE ]
+ *
  *	Initialize lwp0 uarea, curlwp, and curpcb after MMU is turned on,
  *	using lwp0uarea variable saved during pmap_bootstrap().
  */
 void
 pmap_bootstrap_finalize(void)
+{
 	memset((void *)lwp0uarea, 0, USPACE);
 	uvm_lwp_setuarea(&lwp0, lwp0uarea);
 	curlwp = &lwp0;
 	curpcb = lwp_getpcb(&lwp0);
+}
 /*
  * pmap_virtual_space:		[ INTERFACE ]
+ *
  *	Report the range of available kernel virtual address
  *	space to the VM system during bootstrap.
+ *
  *	This is only an interface function if we do not use
  *	pmap_steal_memory()!
+ *
  *	Note: no locking is necessary in this function.
  */
 void
 pmap_virtual_space(vaddr_t *vstartp, vaddr_t *vendp)
+{