From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:09:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 001DD1065793; Fri, 4 Apr 2008 18:09:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 799E81065760 for ; Fri, 4 Apr 2008 18:09:00 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F7178FC0C for ; Fri, 4 Apr 2008 18:09:00 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34I90X3089295 for ; Fri, 4 Apr 2008 18:09:00 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34I90rk089293 for perforce@freebsd.org; Fri, 4 Apr 2008 18:09:00 GMT (envelope-from imp@freebsd.org) Date: Fri, 4 Apr 2008 18:09:00 GMT Message-Id: <200804041809.m34I90rk089293@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 139352 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Apr 2008 18:09:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=139352 Change 139352 by imp@imp_paco-paco on 2008/04/04 18:08:43 IFC @139351 Affected files ... .. //depot/projects/arm/src/share/man/man9/sleep.9#6 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#41 integrate .. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#18 integrate .. //depot/projects/arm/src/sys/conf/Makefile.arm#22 integrate Differences ... ==== //depot/projects/arm/src/share/man/man9/sleep.9#6 (text+ko) ==== @@ -23,9 +23,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/sleep.9,v 1.61 2007/03/30 18:07:26 julian Exp $ +.\" $FreeBSD: src/share/man/man9/sleep.9,v 1.62 2008/04/04 16:59:58 imp Exp $ .\" -.Dd February 27, 2007 +.Dd April 4, 2008 .Os .Dt SLEEP 9 .Sh NAME @@ -93,6 +93,10 @@ runnable with the specified .Fa priority when it resumes. +.Dv PZERO +should never be used, as it is for compatibility only. +A new priority of 0 means to use the thread's current priority when +it is made runnable again. If .Fa priority includes the ==== //depot/projects/arm/src/sys/amd64/amd64/pmap.c#41 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.611 2008/04/02 04:39:47 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.612 2008/04/04 18:00:22 alc Exp $"); /* * Manages physical address maps. @@ -2904,12 +2904,6 @@ panic("pmap_enter: attempted pmap_enter on 2MB page"); pte = pmap_pde_to_pte(pde, va); } else - pte = NULL; - - /* - * Page Directory table entry not valid, we need a new PT page - */ - if (pte == NULL) panic("pmap_enter: invalid page directory va=%#lx", va); pa = VM_PAGE_TO_PHYS(m); ==== //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#18 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.19 2008/03/22 20:34:07 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.20 2008/04/04 17:35:24 raj Exp $"); #include #include #include @@ -59,6 +59,8 @@ #define cpu_idcache_wbinv_all arm8_cache_purgeID #elif defined(CPU_ARM9) #define cpu_idcache_wbinv_all arm9_idcache_wbinv_all +#elif defined(CPU_ARM9E) +#define cpu_idcache_wbinv_all armv5_ec_idcache_wbinv_all #elif defined(CPU_ARM10) #define cpu_idcache_wbinv_all arm10_idcache_wbinv_all #elif defined(CPU_SA110) || defined(CPU_SA1110) || defined(CPU_SA1100) || \ ==== //depot/projects/arm/src/sys/conf/Makefile.arm#22 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.36 2008/04/03 20:42:36 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.37 2008/04/04 17:35:24 raj Exp $ # # Makefile for FreeBSD # @@ -71,7 +71,7 @@ $S/$M/$M/cpufunc_asm_arm8.S $S/$M/$M/cpufunc_asm_arm9.S \ $S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \ $S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \ - $S/$M/$M/cpufunc_asm_xscale_c3.S + $S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S KERNEL_EXTRA=trampoline KERNEL_EXTRA_INSTALL=kernel.gz.tramp trampoline: ${KERNEL_KO}.tramp