 @@ -1,14 +1,14 @@
-/*	$NetBSD: amiga_init.c,v 1.101 2008/12/31 10:33:13 tsutsui Exp $	*/
+/*	$NetBSD: amiga_init.c,v 1.102 2008/12/31 18:48:14 tsutsui Exp $	*/
 /*
  * Copyright (c) 1994 Michael L. Hitch
  * Copyright (c) 1993 Markus Wild
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -26,27 +26,27 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "opt_amigaccgrf.h"
 #include "opt_p5ppc68kboard.h"
 #include "opt_devreload.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amiga_init.c,v 1.101 2008/12/31 10:33:13 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amiga_init.c,v 1.102 2008/12/31 18:48:14 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <uvm/uvm_extern.h>
 #include <sys/user.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/tty.h>
 #include <sys/buf.h>
 #include <sys/msgbuf.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 @@ -198,27 +198,27 @@ start_c(id, fphystart, fphysize, cphysiz
 	boot_part, loadbase)
 	int id;
 	u_int fphystart, fphysize, cphysize;
 	char *esym_addr;
 	u_int flags;
 	u_long inh_sync;
 	u_long boot_part;
 	u_int loadbase;
+{
 	extern char end[];
 	extern u_int protorp[2];
 	struct cfdev *cd;
 	u_int pstart, pend, vstart, vend, avail;
-	u_int pt, ptpa, ptsize, ptextra, kstsize;
+	u_int ptpa, ptsize, ptextra, kstsize;
 	u_int Sysptmap_pa;
 	register st_entry_t sg_proto, *sg, *esg;
 	register pt_entry_t pg_proto, *pg;
 	u_int end_loaded, ncd, i;
 	struct boot_memlist *ml;
 #ifdef DEBUG_KERNEL_START
 	/* XXX this only is valid if Altais is in slot 0 */
 	volatile u_int8_t *altaiscolpt = (u_int8_t *)0x200003c8;
 	volatile u_int8_t *altaiscol = (u_int8_t *)0x200003c9;
 #endif
 #ifdef DEBUG_KERNEL_START
 @@ -372,52 +372,45 @@ start_c(id, fphystart, fphysize, cphysiz
 	/*
 	 * allocate kernel page table map
 	 */
 	RELOC(Sysptmap, u_int) = vstart;
 	Sysptmap_pa = pstart;
 	vstart += PAGE_SIZE;
 	pstart += PAGE_SIZE;
 	avail -= PAGE_SIZE;
 	/*
 	 * allocate initial page table pages
 	 */
 	pt = vstart;
 	ptpa = pstart;
 #ifdef DRACO
 	if ((id>>24)==0x7D) {
 		ptextra = NDRCCPG
 		    + RELOC(NZTWOMEMPG, u_int)
 		    + btoc(RELOC(ZBUSAVAIL, u_int));
 	} else
 #endif
 	ptextra = NCHIPMEMPG + NCIAPG + NZTWOROMPG + RELOC(NZTWOMEMPG, u_int) +
 	    btoc(RELOC(ZBUSAVAIL, u_int)) + NPCMCIAPG;
 	ptsize = (RELOC(Sysptsize, u_int) +
 	    howmany(ptextra, NPTEPG)) << PGSHIFT;
 	vstart += ptsize;
 	pstart += ptsize;
 	avail -= ptsize;
 	/*
 	 * pt maps the first N megs of ram Sysptmap comes directly
 	 * after pt (ptpa) and so it must map >= N meg + Its one
 	 * page and so it must map 8M of space.  Specifically
 	 * Sysptmap holds the pte's that map the kernel page tables.
 	 * We want Sysmap to be the first address mapped by Sysptmap.
 	 * Sysmap is now placed at the end of Supervisor virtual address space.
 	 */
 	RELOC(Sysmap, u_int *) = (u_int *)-(NPTEPG * PAGE_SIZE);
 	/*
 	 * initialize segment table and page table map
 	 */
 #if defined(M68040) || defined(M68060)
 	if (RELOC(mmutype, int) == MMU_68040) {
 		/*
 		 * First invalidate the entire "segment table" pages
 		 * (levels 1 and 2 have the same "invalid" values).
 		 */