From owner-p4-projects@FreeBSD.ORG Sat Jun 5 17:09:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E52416A4D0; Sat, 5 Jun 2004 17:09:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E344A16A4CE for ; Sat, 5 Jun 2004 17:09:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C719643D2F for ; Sat, 5 Jun 2004 17:09:40 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5609eM5057004 for ; Sun, 6 Jun 2004 00:09:40 GMT (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5609eCj057001 for perforce@freebsd.org; Sun, 6 Jun 2004 00:09:40 GMT (envelope-from jmallett@freebsd.org) Date: Sun, 6 Jun 2004 00:09:40 GMT Message-Id: <200406060009.i5609eCj057001@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 54244 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jun 2004 00:09:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=54244 Change 54244 by jmallett@jmallett_oingo on 2004/06/06 00:08:43 Catch up with the wide world of current. Affected files ... .. //depot/projects/mips/sys/conf/Makefile.mips#14 edit .. //depot/projects/mips/sys/conf/files.mips#31 edit .. //depot/projects/mips/sys/mips/include/pmap.h#14 edit .. //depot/projects/mips/sys/mips/mips/elf_machdep.c#3 edit .. //depot/projects/mips/sys/mips/mips/pmap.c#35 edit .. //depot/projects/mips/sys/mips/mips/uio_machdep.c#1 add .. //depot/projects/mips/sys/mips/mips/vm_machdep.c#14 edit Differences ... ==== //depot/projects/mips/sys/conf/Makefile.mips#14 (text+ko) ==== @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 500012 +%VERSREQ= 500013 # We support multiple platforms, and would do well to have a variable for # the platform we are building for. ==== //depot/projects/mips/sys/conf/files.mips#31 (text+ko) ==== @@ -26,6 +26,7 @@ mips/mips/syscall.c standard mips/mips/tlb.c standard mips/mips/trap.c standard +mips/mips/uio_machdep.c standard mips/mips/vm_machdep.c standard # XXX cache code needs to be split up per CPU type, but yuck. mips/mips/cache.c standard ==== //depot/projects/mips/sys/mips/include/pmap.h#14 (text+ko) ==== @@ -68,6 +68,8 @@ vm_page_t pv_ptem; /* VM page for pte */ } *pv_entry_t; +#define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) + extern pmap_t kernel_pmap; extern vm_offset_t avail_start; extern vm_offset_t avail_end; ==== //depot/projects/mips/sys/mips/mips/elf_machdep.c#3 (text+ko) ==== @@ -46,14 +46,14 @@ } int -elf_reloc(linker_file_t fil, const void *data, int rmode) +elf_reloc(linker_file_t fil, Elf_Addr relocbase, const void *data, int type, elf_lookup_fn lookup) { printf("%s unimplemented at %s:%d, returning error.\n", __func__, __FILE__, __LINE__); return (ENXIO); } int -elf_reloc_local(linker_file_t fil, const void *data, int rmode) +elf_reloc_local(linker_file_t fil, Elf_Addr relocbase, const void *data, int type, elf_lookup_fn lookup) { printf("%s unimplemented at %s:%d, returning error.\n", __func__, __FILE__, __LINE__); return (ENXIO); ==== //depot/projects/mips/sys/mips/mips/pmap.c#35 (text+ko) ==== @@ -359,8 +359,7 @@ * way, discontiguous physical memory. */ void -pmap_init(phys_start, phys_end) - vm_offset_t phys_start, phys_end; +pmap_init(void) { int i; int initial_pvs; @@ -1176,16 +1175,6 @@ tlb_enter(pmap, va, pa, PG_V | wired); } -/* - * Make temporary mapping for a physical address. This is called - * during dump. - */ -void * -pmap_kenter_temporary(vm_offset_t pa, int i) -{ - return (void *) MIPS_PHYS_TO_KSEG1(pa - (i * PAGE_SIZE)); -} - vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { ==== //depot/projects/mips/sys/mips/mips/vm_machdep.c#14 (text+ko) ==== @@ -94,12 +94,6 @@ } void -cpu_sched_exit(struct thread *td) -{ - panic("%s", __func__); -} - -void cpu_switch(struct thread *old, struct thread *new) { if (!savectx(old->td_pcb)) { @@ -162,7 +156,7 @@ } struct sf_buf * -sf_buf_alloc(struct vm_page *m) +sf_buf_alloc(struct vm_page *m, int pri) { panic("%s", __func__); return (NULL);