From owner-p4-projects@FreeBSD.ORG Sun Dec 11 06:04:39 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 539AE16A422; Sun, 11 Dec 2005 06:04:39 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1836016A41F for ; Sun, 11 Dec 2005 06:04:39 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D83B143D4C for ; Sun, 11 Dec 2005 06:04:38 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBB64cIh083053 for ; Sun, 11 Dec 2005 06:04:38 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBB64cbC083050 for perforce@freebsd.org; Sun, 11 Dec 2005 06:04:38 GMT (envelope-from imp@freebsd.org) Date: Sun, 11 Dec 2005 06:04:38 GMT Message-Id: <200512110604.jBB64cbC083050@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 88021 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: Sun, 11 Dec 2005 06:04:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=88021 Change 88021 by imp@imp_plunger on 2005/12/11 06:03:45 Remove debug. Also, remove the VA == PA hack. I think I've found the problem. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#11 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#11 (text+ko) ==== @@ -185,23 +185,11 @@ uint32_t fake_preload[35]; uint32_t memsize = 32 * 1024 * 1024; - int pc; -#if 0 - volatile uint32_t *ptr = (uint32_t *)(0xfffff830); /* PIOC_SODR */ - *ptr = AT91RM92_PIO_PC18; - *ptr = AT91RM92_PIO_PC19; - *ptr = AT91RM92_PIO_PC20; - ptr = (uint32_t *)(0xfffff834); /* PIOC_CODR */ -#endif - i = 0; set_cpufuncs(); cninit(); - printf("CNINIT DONE\n"); - __asm __volatile("mov %0, pc" : "=r" (pc)); - printf("pc is %x\n", pc); fake_preload[i++] = MODINFO_NAME; fake_preload[i++] = strlen("elf kernel") + 1; strcpy((char*)&fake_preload[i++], "elf kernel"); @@ -227,7 +215,6 @@ #define KERNEL_TEXT_BASE (KERNBASE) freemempos = ((vm_offset_t)&end + PAGE_MASK) & ~PAGE_MASK; /* Define a macro to simplify memory allocation */ - printf("freemempos %x\n", freemempos); #define valloc_pages(var, np) \ alloc_pages((var).pv_va, (np)); \ (var).pv_pa = (var).pv_va + (KERNPHYSADDR - KERNVIRTADDR); @@ -284,7 +271,7 @@ pmap_map_chunk(l1pagetable, KERNBASE, KERNPHYSADDR, (((uint32_t)(&end) - KERNBASE) + PAGE_SIZE) & ~(PAGE_SIZE - 1), VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); -#if 1 +#if 0 /* XXX PA == VA XXX */ pmap_map_chunk(l1pagetable, KERNPHYSADDR, KERNPHYSADDR, (((uint32_t)(&end) - KERNBASE) + L1_S_SIZE) & ~(L1_S_SIZE - 1), @@ -325,7 +312,6 @@ VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE); } - printf("pa is %x va is %x\n", kernel_l1pt.pv_pa, kernel_l1pt.pv_va); pmap_devmap_bootstrap(l1pagetable, kb920x_devmap); cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT); setttb(kernel_l1pt.pv_pa); From owner-p4-projects@FreeBSD.ORG Sun Dec 11 06:07:43 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F8E816A422; Sun, 11 Dec 2005 06:07:43 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 42F8D16A41F for ; Sun, 11 Dec 2005 06:07:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D42C43D53 for ; Sun, 11 Dec 2005 06:07:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBB67gRH083190 for ; Sun, 11 Dec 2005 06:07:42 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBB67g9e083187 for perforce@freebsd.org; Sun, 11 Dec 2005 06:07:42 GMT (envelope-from imp@freebsd.org) Date: Sun, 11 Dec 2005 06:07:42 GMT Message-Id: <200512110607.jBB67g9e083187@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 88022 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: Sun, 11 Dec 2005 06:07:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=88022 Change 88022 by imp@imp_plunger on 2005/12/11 06:07:13 Minor uart tweaks. The console is on DBGU not USART0 on the KB9202, so hard wire it there. Add commented out x86 specific code that I hope to soon make non x86 specific. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm92usart.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm92usart.c#4 (text+ko) ==== @@ -54,20 +54,23 @@ int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - uint32_t *ptr = (uint32_t *)(AT91RM92_BASE + AT91RM92_SYS_BASE); - *(uint32_t *)((char *)ptr + PIOC_SODR) = AT91RM92_PIO_PC18; - *(uint32_t *)((char *)ptr + PIOC_SODR) = AT91RM92_PIO_PC19; - *(uint32_t *)((char *)ptr + PIOC_SODR) = AT91RM92_PIO_PC20; - +#if 0 + /* + * We can't enable this yet since it is ns8250 specific + * at the moment. + */ + /* Check the environment. */ + if (uart_getenv(devtype, di) == 0) + return (0); +#endif #ifdef CONSOLE_USART di->ops = usart_at91rm92_ops; di->bas.chan = 0; di->bas.bst = &at91rm92_bs_tag; /* * XXX: Not pretty, but will work because we map VA == PA early - * for some devices. + * for the last 1MB of memory. */ - di->bas.bsh = AT91RM92_BASE + AT91RM92_USART0_BASE; di->bas.bsh = AT91RM92_BASE + AT91RM92_SYS_BASE + DBGU_CR; di->bas.regshft = 0; di->bas.rclk = 0; From owner-p4-projects@FreeBSD.ORG Sun Dec 11 06:22:02 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9A3516A422; Sun, 11 Dec 2005 06:22:01 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 B37CC16A41F for ; Sun, 11 Dec 2005 06:22:01 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6108B43D5C for ; Sun, 11 Dec 2005 06:22:01 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBB6M1RK083821 for ; Sun, 11 Dec 2005 06:22:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBB6M1bq083813 for perforce@freebsd.org; Sun, 11 Dec 2005 06:22:01 GMT (envelope-from imp@freebsd.org) Date: Sun, 11 Dec 2005 06:22:01 GMT Message-Id: <200512110622.jBB6M1bq083813@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 88024 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: Sun, 11 Dec 2005 06:22:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=88024 Change 88024 by imp@imp_plunger on 2005/12/11 06:21:10 Remove some debug LED wiggling. Hopefully, properly implement the following bit if C code to determine if we need to adjust the pc from PA to VA: #if KERNVIRTADDR > KERNPHYSADDR if (pc < KERNVIRTADDR) pc += KERNVIRTADDR - KERNPHYSADDR; #else if (pc > KERNPHYSADDR) pc -= KERNVIRTADDR - KERNPHYSADDR; #endif If va > pa, then we need to test to see if the pc is already > va (since we know it will already be > pa). If pa > va, then we check to see if it is below pa, in which case we know it is already adjusted. This eliminates the need for the va == pa hack in initarm, and we get all the way to the mountroot> prompt. Of course, we have a lot of work to do before that will work... Affected files ... .. //depot/projects/arm/src/sys/arm/arm/locore.S#11 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/locore.S#11 (text+ko) ==== @@ -155,7 +155,6 @@ Lunmapped: R7SYS - LED1ON #ifdef STARTUP_PAGETABLE_ADDR /* build page table from scratch */ ldr r0, Lstartup_pagetable @@ -202,16 +201,17 @@ subs r2, r2, #4 bgt .L1 - ldr r4, =KERNVIRTADDR - cmp pc, r4 #if KERNVIRTADDR > KERNPHYSADDR - bgt virt_done ldr r4, =KERNVIRTADDR + cmp r4, pc + bgt virt_done /* if pc is > KERNVIRTADDR, no adj */ ldr r5, =KERNPHYSADDR sub r4, r4, r5 add pc, pc, r4 #else - blt virt_done + ldr r4, =KERNPHYSADDR + cmp r4, pc + blt virt_done /* if pc is < KERNPHYSADDR, no adj */ ldr r4, =KERNPHYSADDR ldr r5, =KERNVIRTADDR sub r4, r4, r5 @@ -219,14 +219,12 @@ #endif virt_done: nop - LED2ON mov fp, #0 /* trace back starts here */ bl _C_LABEL(initarm) /* Off we go */ /* init arm will return the new stack pointer. */ mov sp, r0 - LED3ON bl _C_LABEL(mi_startup) /* call mi_startup()! */ adr r0, .Lmainreturned From owner-p4-projects@FreeBSD.ORG Sun Dec 11 18:58:46 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 640A416A422; Sun, 11 Dec 2005 18:58:46 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 2554D16A41F for ; Sun, 11 Dec 2005 18:58:46 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BDCF43D5F for ; Sun, 11 Dec 2005 18:58:45 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBBIwjoH044034 for ; Sun, 11 Dec 2005 18:58:45 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBBIwjJK044031 for perforce@freebsd.org; Sun, 11 Dec 2005 18:58:45 GMT (envelope-from cognet@freebsd.org) Date: Sun, 11 Dec 2005 18:58:45 GMT Message-Id: <200512111858.jBBIwjJK044031@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 88038 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: Sun, 11 Dec 2005 18:58:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=88038 Change 88038 by cognet@cognet on 2005/12/11 18:58:30 pc apparently can't be used as the first operand for cmp, so move its value to r0 first. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/locore.S#12 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/locore.S#12 (text+ko) ==== @@ -201,21 +201,19 @@ subs r2, r2, #4 bgt .L1 + ldr r4, =KERNVIRTADDR + mov r0, pc + cmp r0, r4 #if KERNVIRTADDR > KERNPHYSADDR - ldr r4, =KERNVIRTADDR - cmp r4, pc - bgt virt_done /* if pc is > KERNVIRTADDR, no adj */ + bgt virt_done ldr r5, =KERNPHYSADDR sub r4, r4, r5 add pc, pc, r4 #else - ldr r4, =KERNPHYSADDR - cmp r4, pc - blt virt_done /* if pc is < KERNPHYSADDR, no adj */ - ldr r4, =KERNPHYSADDR - ldr r5, =KERNVIRTADDR - sub r4, r4, r5 - sub pc, pc, r4 + blt virt_done + ldr r5, =KERNPHYSADDR + sub r5, r5, r4 + sub pc, pc, r5 #endif virt_done: nop From owner-p4-projects@FreeBSD.ORG Mon Dec 12 07:03:28 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B41A916A422; Mon, 12 Dec 2005 07:03:27 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 87BF416A41F for ; Mon, 12 Dec 2005 07:03:27 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F7D243D5F for ; Mon, 12 Dec 2005 07:03:27 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBC73RY5002201 for ; Mon, 12 Dec 2005 07:03:27 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBC73QTM002198 for perforce@freebsd.org; Mon, 12 Dec 2005 07:03:26 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 12 Dec 2005 07:03:26 GMT Message-Id: <200512120703.jBC73QTM002198@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 88060 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: Mon, 12 Dec 2005 07:03:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=88060 Change 88060 by soc-andrew@soc-andrew_serv on 2005/12/12 07:03:01 Fix the name of the Select Distributions menu [1] Add a note that the base distribution is required [1] Don't make the kern.geom.debugflags sysctl 16 as it is unneeded [1] Fix vi by creating /var/tmp [1] Noticed by: marius (dot) nuennerich (At) gmx (dot) net Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/430_select_dists.lua#3 edit .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#19 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/430_select_dists.lua#3 (text+ko) ==== @@ -16,8 +16,9 @@ end local response = App.ui:present({ id = "select_dists", - name = _("Select Packages"), - short_desc = _("Select the distributions you wish to install."), + name = _("Select Distributions"), + short_desc = _("Select the distributions you wish to " .. + "install. The `base' distribution is required."), multiple = "true", actions = { { ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#19 (text+ko) ==== @@ -785,7 +785,6 @@ @echo "dumpdev=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf @echo "syslogd_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf @echo "update_motd=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf - @echo "kern.geom.debugflags=16" >> ${RD}/bsdinstaller/root/etc/sysctl.conf @cat ${.CURDIR}/bsdinstaller/gettytab >> ${RD}/bsdinstaller/root/etc/gettytab ( if [ -f ${.CURDIR}/bsdinstaller/ttys.${TARGET_ARCH} ]; then \ cp ${.CURDIR}/bsdinstaller/ttys.${TARGET_ARCH} \ @@ -794,6 +793,7 @@ @mkdir -p ${RD}/bsdinstaller/root/var/db @mkdir -p ${RD}/bsdinstaller/root/var/empty @mkdir -p ${RD}/bsdinstaller/root/var/run + @mkdir -p ${RD}/bsdinstaller/root/var/tmp cp ${.CURDIR}/bsdinstaller/bsdinstaller_shell.sh ${RD}/bsdinstaller/root/ chmod u+x ${RD}/bsdinstaller/root/bsdinstaller_shell.sh cp ${.CURDIR}/bsdinstaller/bsdinstaller ${RD}/bsdinstaller/root/etc/rc.d/ From owner-p4-projects@FreeBSD.ORG Mon Dec 12 18:16:23 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CA5B16A422; Mon, 12 Dec 2005 18:16:23 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0D54616A41F for ; Mon, 12 Dec 2005 18:16:23 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 127C843D66 for ; Mon, 12 Dec 2005 18:16:22 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBCIGL17053424 for ; Mon, 12 Dec 2005 18:16:21 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBCIGLDA053421 for perforce@freebsd.org; Mon, 12 Dec 2005 18:16:21 GMT (envelope-from csjp@freebsd.org) Date: Mon, 12 Dec 2005 18:16:21 GMT Message-Id: <200512121816.jBCIGLDA053421@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 88084 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: Mon, 12 Dec 2005 18:16:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=88084 Change 88084 by csjp@csjp_xor on 2005/12/12 18:16:04 Add a note that this module will not break circular dependencies. Affected files ... .. //depot/projects/trustedbsd/mac/share/man/man4/mac_chkexec.4#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/share/man/man4/mac_chkexec.4#4 (text+ko) ==== @@ -139,3 +139,7 @@ .An Christian S.J. Peron Aq csjp@FreeBSD.org . This manual page was written by .An Tom Rhodes Aq trhodes@FreeBSD.org . +.Sh BUGS +Currently the +.Nm +module will not break circular dependencies for executable objects. From owner-p4-projects@FreeBSD.ORG Mon Dec 12 21:57:59 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69E9F16A423; Mon, 12 Dec 2005 21:57:58 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 4059216A41F for ; Mon, 12 Dec 2005 21:57:58 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CFF7943D64 for ; Mon, 12 Dec 2005 21:57:56 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBCLvudn085632 for ; Mon, 12 Dec 2005 21:57:56 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBCLvueO085629 for perforce@freebsd.org; Mon, 12 Dec 2005 21:57:56 GMT (envelope-from imp@freebsd.org) Date: Mon, 12 Dec 2005 21:57:56 GMT Message-Id: <200512122157.jBCLvueO085629@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 88099 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: Mon, 12 Dec 2005 21:57:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=88099 Change 88099 by imp@imp_Speedy on 2005/12/12 21:57:20 turn on some space saving options. MUTEX_NOINLINE helps the most! Affected files ... .. //depot/projects/arm/src/sys/arm/conf/KB920X#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#5 (text+ko) ==== @@ -58,7 +58,10 @@ options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev -#options SYSCTL_OMIT_DESCR +options SYSCTL_OMIT_DESCR +options MUTEX_NOINLINE +options NO_FFS_SNAPSHOT +options NO_SWAPPING device genclock device loop device ether From owner-p4-projects@FreeBSD.ORG Mon Dec 12 21:58:00 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B233916A440; Mon, 12 Dec 2005 21:57:58 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 558FE16A420 for ; Mon, 12 Dec 2005 21:57:58 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F99243D68 for ; Mon, 12 Dec 2005 21:57:57 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBCLvvTZ085638 for ; Mon, 12 Dec 2005 21:57:57 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBCLvu36085635 for perforce@freebsd.org; Mon, 12 Dec 2005 21:57:56 GMT (envelope-from imp@freebsd.org) Date: Mon, 12 Dec 2005 21:57:56 GMT Message-Id: <200512122157.jBCLvu36085635@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 88100 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: Mon, 12 Dec 2005 21:58:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=88100 Change 88100 by imp@imp_Speedy on 2005/12/12 21:57:39 NO_FFS_SNAPSHOT Affected files ... .. //depot/projects/arm/src/sys/conf/options#8 edit Differences ... ==== //depot/projects/arm/src/sys/conf/options#8 (text+ko) ==== @@ -214,6 +214,11 @@ # otherwise a STUB module will be compiled in. SOFTUPDATES opt_ffs.h +# On small, embedded systems, it can be useful to turn off support for +# snapshots. It saves about 30-40k for a feature that would be lightly +# used, if it is used at all. +NO_FFS_SNAPSHOT opt_ffs.h + # Enabling this option turns on support for Access Control Lists in UFS, # which can be used to support high security configurations. Depends on # UFS_EXTATTR. From owner-p4-projects@FreeBSD.ORG Mon Dec 12 21:58:59 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AEF516A423; Mon, 12 Dec 2005 21:58:59 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1694C16A420 for ; Mon, 12 Dec 2005 21:58:59 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3D7C43D46 for ; Mon, 12 Dec 2005 21:58:58 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBCLwwvf085737 for ; Mon, 12 Dec 2005 21:58:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBCLwwRC085734 for perforce@freebsd.org; Mon, 12 Dec 2005 21:58:58 GMT (envelope-from imp@freebsd.org) Date: Mon, 12 Dec 2005 21:58:58 GMT Message-Id: <200512122158.jBCLwwRC085734@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 88101 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: Mon, 12 Dec 2005 21:59:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=88101 Change 88101 by imp@imp_Speedy on 2005/12/12 21:58:12 NO_FFS_SNAPSHOT Affected files ... .. //depot/projects/arm/src/sys/ufs/ffs/ffs_snapshot.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/ufs/ffs/ffs_snapshot.c#5 (text+ko) ==== @@ -66,6 +66,62 @@ #define KERNCRED thread0.td_ucred #define DEBUG 1 +#include "opt_ffs.h" + +#ifdef NO_FFS_SNAPSHOT +int +ffs_snapshot(mp, snapfile) + struct mount *mp; + char *snapfile; +{ + return (EINVAL); +} + +int +ffs_snapblkfree(fs, devvp, bno, size, inum) + struct fs *fs; + struct vnode *devvp; + ufs2_daddr_t bno; + long size; + ino_t inum; +{ + return (EINVAL); +} + +void +ffs_snapremove(vp) + struct vnode *vp; +{ +} + +void +ffs_snapshot_mount(mp) + struct mount *mp; +{ +} + +void +ffs_snapshot_unmount(mp) + struct mount *mp; +{ +} + +void +ffs_snapgone(ip) + struct inode *ip; +{ +} + +int +ffs_copyonwrite(devvp, bp) + struct vnode *devvp; + struct buf *bp; +{ + return (EINVAL); +} + +#else + TAILQ_HEAD(snaphead, inode); struct snapdata { @@ -2171,3 +2227,5 @@ g_destroy_bio(bip); return (bp->b_error); } + +#endif From owner-p4-projects@FreeBSD.ORG Mon Dec 12 21:59:00 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5BFF16A435; Mon, 12 Dec 2005 21:58:59 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 83AE816A442 for ; Mon, 12 Dec 2005 21:58:59 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32A4B43D46 for ; Mon, 12 Dec 2005 21:58:59 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBCLwxU8085743 for ; Mon, 12 Dec 2005 21:58:59 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBCLwwCt085740 for perforce@freebsd.org; Mon, 12 Dec 2005 21:58:58 GMT (envelope-from imp@freebsd.org) Date: Mon, 12 Dec 2005 21:58:58 GMT Message-Id: <200512122158.jBCLwwCt085740@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 88102 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: Mon, 12 Dec 2005 21:59:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=88102 Change 88102 by imp@imp_Speedy on 2005/12/12 21:58:35 Make uart_subr not depend on ns8250.o Affected files ... .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_alpha.c#3 edit .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_amd64.c#2 edit .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_i386.c#2 edit .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_ia64.c#2 edit .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_pc98.c#2 edit .. //depot/projects/arm/src/sys/dev/uart/uart_subr.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/dev/uart/uart_cpu_alpha.c#3 (text+ko) ==== @@ -95,6 +95,7 @@ } /* Check the environment. */ + di->ops = uart_ns8250_ops; if (uart_getenv(devtype, di) == 0) return (0); ==== //depot/projects/arm/src/sys/dev/uart/uart_cpu_amd64.c#2 (text+ko) ==== @@ -52,6 +52,7 @@ unsigned int i, ivar; /* Check the environment. */ + di->ops = uart_ns8250_ops; if (uart_getenv(devtype, di) == 0) return (0); ==== //depot/projects/arm/src/sys/dev/uart/uart_cpu_i386.c#2 (text+ko) ==== @@ -52,6 +52,7 @@ unsigned int i, ivar; /* Check the environment. */ + di->ops = uart_ns8250_ops; if (uart_getenv(devtype, di) == 0) return (0); ==== //depot/projects/arm/src/sys/dev/uart/uart_cpu_ia64.c#2 (text+ko) ==== @@ -104,5 +104,6 @@ } /* Check the environment. */ + di->ops = uart_ns8250_ops; return (uart_getenv(devtype, di)); } ==== //depot/projects/arm/src/sys/dev/uart/uart_cpu_pc98.c#2 (text+ko) ==== @@ -52,6 +52,7 @@ unsigned int i, ivar, flags; /* Check the environment. */ + di->ops = uart_ns8250_ops; if (uart_getenv(devtype, di) == 0) return (0); ==== //depot/projects/arm/src/sys/dev/uart/uart_subr.c#2 (text+ko) ==== @@ -182,7 +182,6 @@ return (ENXIO); /* Set defaults. */ - di->ops = uart_ns8250_ops; di->bas.chan = 0; di->bas.regshft = 0; di->bas.rclk = 0; From owner-p4-projects@FreeBSD.ORG Mon Dec 12 22:07:42 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FA1816A43A; Mon, 12 Dec 2005 22:07:42 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 3432716A43B for ; Mon, 12 Dec 2005 22:07:41 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAFC943D4C for ; Mon, 12 Dec 2005 22:07:17 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBCM7AlX086202 for ; Mon, 12 Dec 2005 22:07:10 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBCM79AW086199 for perforce@freebsd.org; Mon, 12 Dec 2005 22:07:09 GMT (envelope-from imp@freebsd.org) Date: Mon, 12 Dec 2005 22:07:09 GMT Message-Id: <200512122207.jBCM79AW086199@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 88103 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: Mon, 12 Dec 2005 22:07:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=88103 Change 88103 by imp@imp_Speedy on 2005/12/12 22:06:36 IFC @88102 Affected files ... .. //depot/projects/arm/src/sys/alpha/alpha/pmap.c#4 integrate .. //depot/projects/arm/src/sys/alpha/alpha/trap.c#3 integrate .. //depot/projects/arm/src/sys/alpha/include/param.h#3 integrate .. //depot/projects/arm/src/sys/alpha/include/pmap.h#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/arm/src/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/arm/src/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/arm/src/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/arm/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/arm/src/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/arm/src/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/frame.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/param.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/arm/src/sys/amd64/include/smp.h#4 integrate .. //depot/projects/arm/src/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/arm/src/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/arm/src/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/arm/src/sys/arm/arm/bcopyinout_xscale.S#3 integrate .. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/arm/src/sys/arm/arm/inckern.S#2 integrate .. //depot/projects/arm/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/arm/src/sys/arm/include/atomic.h#3 integrate .. //depot/projects/arm/src/sys/arm/include/param.h#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_aau.c#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_timer.c#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/std.iq31244#2 integrate .. //depot/projects/arm/src/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/arm/src/sys/coda/coda_psdev.c#3 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/arm/src/sys/compat/ia32/ia32_signal.h#3 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_util.h#3 integrate .. //depot/projects/arm/src/sys/conf/Makefile.arm#6 integrate .. //depot/projects/arm/src/sys/conf/NOTES#8 integrate .. //depot/projects/arm/src/sys/conf/files#8 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#6 integrate .. //depot/projects/arm/src/sys/conf/files.i386#8 integrate .. //depot/projects/arm/src/sys/conf/files.pc98#4 integrate .. //depot/projects/arm/src/sys/conf/kern.post.mk#5 integrate .. //depot/projects/arm/src/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/arm/src/sys/conf/options#9 integrate .. //depot/projects/arm/src/sys/conf/options.amd64#3 integrate .. //depot/projects/arm/src/sys/conf/options.arm#5 integrate .. //depot/projects/arm/src/sys/conf/options.i386#5 integrate .. //depot/projects/arm/src/sys/conf/options.pc98#4 integrate .. //depot/projects/arm/src/sys/conf/systags.sh#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/nve/adapter.h#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/arm/src/sys/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/if_pflog.c#3 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_norm.c#3 integrate .. //depot/projects/arm/src/sys/ddb/db_access.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pcib.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_perf.c#5 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/arm/src/sys/dev/advansys/adv_pci.c#4 integrate .. //depot/projects/arm/src/sys/dev/advansys/advlib.c#3 integrate .. //depot/projects/arm/src/sys/dev/advansys/adw_pci.c#4 integrate .. //depot/projects/arm/src/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate .. //depot/projects/arm/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/arm/src/sys/dev/asr/dptsig.h#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-lowlevel.c#6 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.h#4 integrate .. //depot/projects/arm/src/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/arm/src/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_card.c#3 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_core.c#3 integrate .. //depot/projects/arm/src/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/arm/src/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/arm/src/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/drm-preprocess.sh#2 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/arm/src/sys/dev/drm/i915_drv.c#3 integrate .. //depot/projects/arm/src/sys/dev/drm/radeon_state.c#5 integrate .. //depot/projects/arm/src/sys/dev/em/README#3 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#7 integrate .. //depot/projects/arm/src/sys/dev/em/if_em_osdep.h#3 integrate .. //depot/projects/arm/src/sys/dev/esp/ncr53c9x.c#4 integrate .. //depot/projects/arm/src/sys/dev/esp/ncr53c9xvar.h#3 integrate .. //depot/projects/arm/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/arm/src/sys/dev/fb/fbreg.h#3 integrate .. //depot/projects/arm/src/sys/dev/fb/vga.c#3 integrate .. //depot/projects/arm/src/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/arm/src/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/arm/src/sys/dev/hptmv/hptproc.c#4 integrate .. //depot/projects/arm/src/sys/dev/hptmv/mvOs.h#3 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/arm/src/sys/dev/ic/via6522reg.h#1 branch .. //depot/projects/arm/src/sys/dev/ie/if_ie_isa.c#3 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/arm/src/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/arm/src/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/arm/src/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/arm/src/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/arm/src/sys/dev/my/if_my.c#4 integrate .. //depot/projects/arm/src/sys/dev/nve/if_nve.c#4 integrate .. //depot/projects/arm/src/sys/dev/nve/if_nvereg.h#4 integrate .. //depot/projects/arm/src/sys/dev/ppc/ppc.c#3 integrate .. //depot/projects/arm/src/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/arm/src/sys/dev/ral/if_ral.c#3 integrate .. //depot/projects/arm/src/sys/dev/ral/if_ralreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/rp/rp.c#3 integrate .. //depot/projects/arm/src/sys/dev/rp/rp_isa.c#2 integrate .. //depot/projects/arm/src/sys/dev/rp/rp_pci.c#4 integrate .. //depot/projects/arm/src/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/sio/sio.c#3 integrate .. //depot/projects/arm/src/sys/dev/snc/dp83932.c#4 integrate .. //depot/projects/arm/src/sys/dev/snc/dp83932var.h#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/csa.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/arm/src/sys/dev/sym/sym_hipd.c#5 integrate .. //depot/projects/arm/src/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/arm/src/sys/dev/syscons/scterm-dumb.c#2 integrate .. //depot/projects/arm/src/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/arm/src/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/arm/src/sys/dev/syscons/sysmouse.c#3 integrate .. //depot/projects/arm/src/sys/dev/ti/if_ti.c#1 branch .. //depot/projects/arm/src/sys/dev/ti/if_tireg.h#1 branch .. //depot/projects/arm/src/sys/dev/ti/ti_fw.h#1 branch .. //depot/projects/arm/src/sys/dev/ti/ti_fw2.h#1 branch .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_alpha.c#4 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_amd64.c#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_i386.c#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_ia64.c#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_pc98.c#3 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_subr.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_udavreg.h#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_uralreg.h#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_uralvar.h#3 integrate .. //depot/projects/arm/src/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdi.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/arm/src/sys/fs/hpfs/hpfs_vnops.c#5 integrate .. //depot/projects/arm/src/sys/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/arm/src/sys/fs/ntfs/ntfs_vnops.c#4 integrate .. //depot/projects/arm/src/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/arm/src/sys/geom/bde/g_bde_lock.c#3 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli.c#2 integrate .. //depot/projects/arm/src/sys/geom/geom_aes.c#3 integrate .. //depot/projects/arm/src/sys/geom/geom_apple.c#2 integrate .. //depot/projects/arm/src/sys/geom/geom_bsd.c#3 integrate .. //depot/projects/arm/src/sys/geom/geom_fox.c#2 integrate .. //depot/projects/arm/src/sys/geom/geom_gpt.c#3 integrate .. //depot/projects/arm/src/sys/geom/geom_mbr.c#4 integrate .. //depot/projects/arm/src/sys/geom/geom_pc98.c#3 integrate .. //depot/projects/arm/src/sys/geom/geom_sunlabel.c#3 integrate .. //depot/projects/arm/src/sys/geom/geom_vol_ffs.c#2 integrate .. //depot/projects/arm/src/sys/geom/label/g_label_iso9660.c#3 integrate .. //depot/projects/arm/src/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/arm/src/sys/geom/label/g_label_ufs.c#3 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/arm/src/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/arm/src/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/arm/src/sys/geom/uzip/g_uzip.c#3 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_drive.c#6 integrate .. //depot/projects/arm/src/sys/geom/zero/g_zero.c#2 integrate .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_alloc.c#2 integrate .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_balloc.c#2 integrate .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#2 integrate .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/arm/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/debug.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/debug.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/kmem.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/ktrace.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/move.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/mutex.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/rwsem.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/sema.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/spin.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/support.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/sv.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/time.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/uuid.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/support/uuid.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_config.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_cred.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_node.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_stats.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_stats.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_version.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_acl.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_acl.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_ag.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_alloc.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_alloc.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_alloc_btree.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_alloc_btree.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_arch.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_attr.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_attr.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_attr_leaf.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_attr_leaf.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_attr_sf.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_behavior.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_behavior.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_bit.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_bit.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_bmap.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_bmap.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_bmap_btree.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_bmap_btree.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_btree.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_btree.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_buf_item.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_buf_item.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_cap.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_cap.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_clnt.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_da_btree.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_da_btree.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dfrag.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dfrag.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dinode.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir2.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir2.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir2_block.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir2_block.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir2_data.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir2_data.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir2_leaf.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir2_leaf.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir2_node.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir2_node.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir2_sf.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir2_sf.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir2_trace.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir2_trace.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir_leaf.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir_leaf.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dir_sf.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dmapi.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_dmops.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_error.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_error.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_extfree_item.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_extfree_item.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_fs.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_fsops.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_fsops.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_ialloc.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_ialloc.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_ialloc_btree.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_ialloc_btree.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_imap.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_inode.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_inode.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_inode_item.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_inode_item.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_inum.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_iocore.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_iomap.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_iomap.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_itable.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_itable.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_log.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_log.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_log_priv.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_log_recover.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_log_recover.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_mac.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_mac.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_macros.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_macros.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_mount.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_mount.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_qmops.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_quota.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_refcache.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_refcache.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_rename.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_rtalloc.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_rtalloc.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_rw.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_rw.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_sb.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_trans.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_trans.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_trans_ail.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_trans_buf.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_trans_extfree.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_trans_inode.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_trans_item.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_trans_priv.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_trans_space.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_types.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_utils.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_utils.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_vfsops.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfs_vnodeops.c#1 branch .. //depot/projects/arm/src/sys/gnu/fs/xfs/xfsidbg.c#1 branch .. //depot/projects/arm/src/sys/i386/conf/NOTES#7 integrate .. //depot/projects/arm/src/sys/i386/i386/apic_vector.s#4 integrate .. //depot/projects/arm/src/sys/i386/i386/bpf_jit_machdep.c#1 branch .. //depot/projects/arm/src/sys/i386/i386/bpf_jit_machdep.h#1 branch .. //depot/projects/arm/src/sys/i386/i386/db_trace.c#3 integrate .. //depot/projects/arm/src/sys/i386/i386/exception.s#3 integrate .. //depot/projects/arm/src/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/arm/src/sys/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/arm/src/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/arm/src/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/arm/src/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/arm/src/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/bus.h#3 integrate .. //depot/projects/arm/src/sys/i386/include/frame.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/intr_machdep.h#3 integrate .. //depot/projects/arm/src/sys/i386/include/param.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/pmap.h#3 integrate .. //depot/projects/arm/src/sys/i386/include/smp.h#4 integrate .. //depot/projects/arm/src/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/arm/src/sys/i386/isa/atpic_vector.s#2 integrate .. //depot/projects/arm/src/sys/i386/isa/icu.h#2 integrate .. //depot/projects/arm/src/sys/i386/isa/npx.c#4 integrate .. //depot/projects/arm/src/sys/i386/isa/pcvt/pcvt_hdr.h#3 integrate .. //depot/projects/arm/src/sys/i386/isa/vesa.c#5 integrate .. //depot/projects/arm/src/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/arm/src/sys/i4b/layer1/itjc/i4b_itjc_pci.c#3 integrate .. //depot/projects/arm/src/sys/i4b/layer2/i4b_l2timer.c#2 integrate .. //depot/projects/arm/src/sys/i4b/layer4/i4b_i4bdrv.c#2 integrate .. //depot/projects/arm/src/sys/i4b/layer4/i4b_l4.c#2 integrate .. //depot/projects/arm/src/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/arm/src/sys/ia64/include/param.h#3 integrate .. //depot/projects/arm/src/sys/ia64/include/pmap.h#3 integrate .. //depot/projects/arm/src/sys/isa/vga_isa.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_thread.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_time.c#5 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#5 integrate .. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#7 integrate .. //depot/projects/arm/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/arm/src/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/arm/src/sys/kern/vfs_cluster.c#3 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/arm/src/sys/modules/Makefile#6 integrate .. //depot/projects/arm/src/sys/modules/drm/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/if_gif/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/ipfw/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/netgraph/bpf/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/ti/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/xfs/Makefile#1 branch .. //depot/projects/arm/src/sys/net/bpf.c#5 integrate .. //depot/projects/arm/src/sys/net/bpf_filter.c#2 integrate .. //depot/projects/arm/src/sys/net/bpf_jitter.c#1 branch .. //depot/projects/arm/src/sys/net/bpf_jitter.h#1 branch .. //depot/projects/arm/src/sys/net/bpfdesc.h#3 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#2 integrate .. //depot/projects/arm/src/sys/net/if_ppp.c#3 integrate .. //depot/projects/arm/src/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/arm/src/sys/net80211/_ieee80211.h#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_crypto_ccmp.c#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_crypto_tkip.c#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_crypto_wep.c#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_node.c#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate .. //depot/projects/arm/src/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_hole.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_vjc.c#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#6 integrate .. //depot/projects/arm/src/sys/netinet/ip_output.c#5 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/arm/src/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/arm/src/sys/netipsec/key_debug.c#2 integrate .. //depot/projects/arm/src/sys/netkey/key_debug.c#2 integrate .. //depot/projects/arm/src/sys/pc98/cbus/fdc.c#2 integrate .. //depot/projects/arm/src/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/arm/src/sys/pc98/cbus/ppc.c#2 integrate .. //depot/projects/arm/src/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/arm/src/sys/pc98/conf/NOTES#5 integrate .. //depot/projects/arm/src/sys/pc98/include/bus.h#2 integrate .. //depot/projects/arm/src/sys/pc98/include/param.h#2 integrate .. //depot/projects/arm/src/sys/pci/agp_i810.c#3 integrate .. //depot/projects/arm/src/sys/pci/agpreg.h#3 integrate .. //depot/projects/arm/src/sys/pci/if_de.c#5 integrate .. //depot/projects/arm/src/sys/pci/if_devar.h#4 integrate .. //depot/projects/arm/src/sys/pci/if_ti.c#4 delete .. //depot/projects/arm/src/sys/pci/if_tireg.h#3 delete .. //depot/projects/arm/src/sys/pci/ti_fw.h#2 delete .. //depot/projects/arm/src/sys/pci/ti_fw2.h#2 delete .. //depot/projects/arm/src/sys/pci/viapm.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/include/param.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/pmap.h#3 integrate .. //depot/projects/arm/src/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/powermac/maciovar.h#2 integrate .. //depot/projects/arm/src/sys/rpc/rpcclnt.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/central/central.c#5 integrate .. //depot/projects/arm/src/sys/sparc64/fhc/clkbrd.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/elf.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/ktr.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/ofw_upa.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/param.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/pci/apb.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pci.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/pci/psychoreg.h#3 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/eeprom.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/rtc.c#3 integrate .. //depot/projects/arm/src/sys/sys/_lock.h#2 integrate .. //depot/projects/arm/src/sys/sys/buf.h#3 integrate .. //depot/projects/arm/src/sys/sys/condvar.h#2 integrate .. //depot/projects/arm/src/sys/sys/kbio.h#3 integrate .. //depot/projects/arm/src/sys/sys/ktr.h#4 integrate .. //depot/projects/arm/src/sys/sys/limits.h#2 integrate .. //depot/projects/arm/src/sys/sys/lock.h#3 integrate .. //depot/projects/arm/src/sys/sys/mbuf.h#6 integrate .. //depot/projects/arm/src/sys/sys/mouse.h#3 integrate .. //depot/projects/arm/src/sys/sys/mqueue.h#2 integrate .. //depot/projects/arm/src/sys/sys/param.h#5 integrate .. //depot/projects/arm/src/sys/sys/pmc.h#2 integrate .. //depot/projects/arm/src/sys/sys/proc.h#4 integrate .. //depot/projects/arm/src/sys/sys/signal.h#3 integrate .. //depot/projects/arm/src/sys/sys/signalvar.h#3 integrate .. //depot/projects/arm/src/sys/sys/timers.h#3 integrate .. //depot/projects/arm/src/sys/sys/unistd.h#3 integrate .. //depot/projects/arm/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/arm/src/sys/vm/vm_map.c#4 integrate .. //depot/projects/arm/src/sys/vm/vm_map.h#2 integrate .. //depot/projects/arm/src/sys/vm/vm_object.c#3 integrate .. //depot/projects/arm/src/usr.sbin/config/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/config/config.5#1 branch .. //depot/projects/arm/src/usr.sbin/config/lang.l#3 integrate .. //depot/projects/arm/src/usr.sbin/config/main.c#3 integrate Differences ... ==== //depot/projects/arm/src/sys/alpha/alpha/pmap.c#4 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.186 2005/11/20 06:09:47 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.187 2005/12/02 18:02:54 alc Exp $"); #include #include @@ -1941,11 +1941,12 @@ pmap->pm_stats.resident_count++; /* - * Now validate mapping with RO protection + * Validate the mapping with limited access, read and/or execute but + * not write. */ - *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | managed; + *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | pte_prot(pmap, + prot & (VM_PROT_READ | VM_PROT_EXECUTE)) | managed; out: - alpha_pal_imb(); /* XXX overkill? */ PMAP_UNLOCK(pmap); return mpte; } ==== //depot/projects/arm/src/sys/alpha/alpha/trap.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.126 2005/10/14 12:43:42 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.127 2005/12/06 11:19:36 ru Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" @@ -656,7 +656,7 @@ framep->tf_regs[FRAME_TRAPARG_A0] = 0; framep->tf_regs[FRAME_TRAPARG_A1] = 0; framep->tf_regs[FRAME_TRAPARG_A2] = 0; -#if notdef /* can't happen, ever. */ +#ifdef notdef /* can't happen, ever. */ if ((framep->tf_regs[FRAME_PS] & ALPHA_PSL_USERMODE) == 0) panic("syscall"); #endif ==== //depot/projects/arm/src/sys/alpha/include/param.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/param.h,v 1.39 2005/09/11 20:51:14 alc Exp $ */ +/* $FreeBSD: src/sys/alpha/include/param.h,v 1.40 2005/12/06 13:27:20 ru Exp $ */ /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */ /*- @@ -64,13 +64,6 @@ #define _ALIGNED_POINTER(p,t) ((((u_long)(p)) & (sizeof(t)-1)) == 0) #endif -#ifndef _MACHINE -#define _MACHINE alpha -#endif -#ifndef _MACHINE_ARCH -#define _MACHINE_ARCH alpha -#endif - #ifndef _NO_NAMESPACE_POLLUTION #ifndef _MACHINE_PARAM_H_ ==== //depot/projects/arm/src/sys/alpha/include/pmap.h#3 (text+ko) ==== @@ -39,7 +39,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.36 2005/09/19 23:33:00 ticso Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.37 2005/12/06 21:09:00 jhb Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -126,6 +126,7 @@ */ #define vtopte(va) (PTmap + (alpha_btop(va) \ & ((1 << 3*ALPHA_PTSHIFT)-1))) +#define vtophys(va) pmap_kextract((vm_offset_t)(va)) /* * Routine: pmap_kextract @@ -145,8 +146,6 @@ return pa; } -#define vtophys(va) pmap_kextract(((vm_offset_t) (va))) - static __inline vm_offset_t alpha_XXX_dmamap(vm_offset_t va) { ==== //depot/projects/arm/src/sys/amd64/amd64/apic_vector.S#4 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.105 2005/11/16 20:55:57 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.106 2005/12/08 18:33:29 jhb Exp $ */ /* @@ -42,53 +42,6 @@ #include "assym.s" /* - * Macros to create and destroy a trap frame. - */ -#define PUSH_FRAME \ - subq $TF_RIP,%rsp ; /* skip dummy tf_err and tf_trapno */ \ - testb $SEL_RPL_MASK,TF_CS(%rsp) ; /* come from kernel? */ \ - jz 1f ; /* Yes, dont swapgs again */ \ - swapgs ; \ -1: movq %rdi,TF_RDI(%rsp) ; \ - movq %rsi,TF_RSI(%rsp) ; \ - movq %rdx,TF_RDX(%rsp) ; \ - movq %rcx,TF_RCX(%rsp) ; \ - movq %r8,TF_R8(%rsp) ; \ - movq %r9,TF_R9(%rsp) ; \ - movq %rax,TF_RAX(%rsp) ; \ - movq %rbx,TF_RBX(%rsp) ; \ - movq %rbp,TF_RBP(%rsp) ; \ - movq %r10,TF_R10(%rsp) ; \ - movq %r11,TF_R11(%rsp) ; \ - movq %r12,TF_R12(%rsp) ; \ - movq %r13,TF_R13(%rsp) ; \ - movq %r14,TF_R14(%rsp) ; \ - movq %r15,TF_R15(%rsp) - -#define POP_FRAME \ - movq TF_RDI(%rsp),%rdi ; \ - movq TF_RSI(%rsp),%rsi ; \ - movq TF_RDX(%rsp),%rdx ; \ - movq TF_RCX(%rsp),%rcx ; \ - movq TF_R8(%rsp),%r8 ; \ - movq TF_R9(%rsp),%r9 ; \ - movq TF_RAX(%rsp),%rax ; \ - movq TF_RBX(%rsp),%rbx ; \ - movq TF_RBP(%rsp),%rbp ; \ - movq TF_R10(%rsp),%r10 ; \ - movq TF_R11(%rsp),%r11 ; \ - movq TF_R12(%rsp),%r12 ; \ - movq TF_R13(%rsp),%r13 ; \ - movq TF_R14(%rsp),%r14 ; \ - movq TF_R15(%rsp),%r15 ; \ - testb $SEL_RPL_MASK,TF_CS(%rsp) ; /* come from kernel? */ \ - jz 1f ; /* keep kernel GS.base */ \ - cli ; \ - swapgs ; \ -1: addq $TF_RIP,%rsp /* skip over tf_err, tf_trapno */ - - -/* * I/O Interrupt Entry Point. Rather than having one entry point for * each interrupt source, we use one entry point for each 32-bit word * in the ISR. The handler determines the highest bit set in the ISR, @@ -107,7 +60,7 @@ jz 2f ; \ addl $(32 * index),%eax ; \ 1: ; \ - movq %rax, %rdi ; /* pass the IRQ */ \ + movl %eax, %edi ; /* pass the IRQ */ \ call lapic_handle_intr ; \ MEXITCOUNT ; \ jmp doreti ; \ @@ -144,10 +97,6 @@ SUPERALIGN_TEXT IDTVEC(timerint) PUSH_FRAME - - movq lapic, %rdx - movl $0, LA_EOI(%rdx) /* End Of Interrupt to APIC */ - FAKE_MCOUNT(TF_RIP(%rsp)) call lapic_handle_timer @@ -227,8 +176,7 @@ */ .text SUPERALIGN_TEXT -IDTVEC(ipi_intr_bitmap_handler) - +IDTVEC(ipi_intr_bitmap_handler) PUSH_FRAME movq lapic, %rdx @@ -241,27 +189,6 @@ jmp doreti /* - * Executed by a CPU when it receives an Xcpuast IPI from another CPU, - * - * The other CPU has already executed aston() or need_resched() on our - * current process, so we simply need to ack the interrupt and return - * via doreti to run ast(). - */ - - .text - SUPERALIGN_TEXT -IDTVEC(cpuast) - PUSH_FRAME - - movq lapic, %rdx - movl $0, LA_EOI(%rdx) /* End Of Interrupt to APIC */ - - FAKE_MCOUNT(TF_RIP(%rsp)) - - MEXITCOUNT - jmp doreti - -/* * Executed by a CPU when it receives an Xcpustop IPI from another CPU, * * - Signals its receipt. @@ -276,34 +203,8 @@ movq lapic, %rax movl $0, LA_EOI(%rax) /* End Of Interrupt to APIC */ - movl PCPU(CPUID), %eax - imull $PCB_SIZE, %eax - leaq stoppcbs(%rax), %rdi - call savectx /* Save process context */ - - movl PCPU(CPUID), %eax - - lock - btsl %eax, stopped_cpus /* stopped_cpus |= (1< -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.70 2005/09/10 03:01:24 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.71 2005/12/08 18:33:29 jhb Exp $"); #include #include @@ -318,8 +318,11 @@ strcmp(name, "nmi_calltrap") == 0) frame_type = TRAP; else if (strncmp(name, "Xatpic_intr", 11) == 0 || - strncmp(name, "Xatpic_fastintr", 15) == 0 || - strncmp(name, "Xapic_isr", 9) == 0) + strncmp(name, "Xapic_isr", 9) == 0 || + strcmp(name, "Xtimerint") == 0 || + strcmp(name, "Xipi_intr_bitmap_handler") == 0 || + strcmp(name, "Xcpustop") == 0 || + strcmp(name, "Xrendezvous") == 0) frame_type = INTERRUPT; else if (strcmp(name, "Xfast_syscall") == 0) frame_type = SYSCALL; ==== //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.17 2005/11/28 20:18:43 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.18 2005/12/08 18:33:29 jhb Exp $ */ /* @@ -149,7 +149,7 @@ } void -intr_execute_handlers(struct intsrc *isrc, struct intrframe *iframe) +intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) { struct thread *td; struct intr_event *ie; @@ -197,7 +197,7 @@ * Execute fast interrupt handlers directly. * To support clock handlers, if a handler registers * with a NULL argument, then we pass it a pointer to - * an intrframe as its argument. + * a trapframe as its argument. */ td->td_intr_nesting_level++; thread = 0; @@ -208,10 +208,10 @@ continue; } CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, - ih->ih_handler, ih->ih_argument == NULL ? iframe : + ih->ih_handler, ih->ih_argument == NULL ? frame : ih->ih_argument, ih->ih_name); if (ih->ih_argument == NULL) - ih->ih_handler(iframe); + ih->ih_handler(frame); else ih->ih_handler(ih->ih_argument); } ==== //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.19 2005/11/02 20:11:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.20 2005/12/08 18:33:29 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -46,7 +46,6 @@ #include #include #include -#include #include #include @@ -607,14 +606,13 @@ } void -lapic_handle_intr(void *cookie, struct intrframe frame) +lapic_handle_intr(int vector, struct trapframe frame) { struct intsrc *isrc; - int vec = (uintptr_t)cookie; - if (vec == -1) + if (vector == -1) panic("Couldn't get vector from ISR!"); - isrc = intr_lookup_source(apic_idt_to_irq(vec)); + isrc = intr_lookup_source(apic_idt_to_irq(vector)); intr_execute_handlers(isrc, &frame); } @@ -623,6 +621,10 @@ { struct lapic *la; + /* Send EOI first thing. */ + lapic_eoi(); + + /* Look up our local APIC structure for the tick counters. */ la = &lapics[PCPU_GET(apic_id)]; (*la->la_timer_count)++; critical_enter(); ==== //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.265 2005/11/16 20:58:39 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.266 2005/12/08 18:33:29 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -1068,15 +1068,29 @@ } int -ipi_nmi_handler() +ipi_nmi_handler(void) { - int cpu = PCPU_GET(cpuid); int cpumask = PCPU_GET(cpumask); if (!(ipi_nmi_pending & cpumask)) return 1; atomic_clear_int(&ipi_nmi_pending, cpumask); + cpustop_handler(); + return 0; +} + +#endif /* STOP_NMI */ + +/* + * Handle an IPI_STOP by saving our current context and spinning until we + * are resumed. + */ +void +cpustop_handler(void) +{ + int cpu = PCPU_GET(cpuid); + int cpumask = PCPU_GET(cpumask); savectx(&stoppcbs[cpu]); @@ -1094,11 +1108,7 @@ cpustop_restartfunc(); cpustop_restartfunc = NULL; } - - return 0; } - -#endif /* STOP_NMI */ /* * This is called once the rest of the system is up and running and we're ==== //depot/projects/arm/src/sys/amd64/amd64/trap.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.297 2005/11/18 19:26:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.298 2005/12/09 13:30:34 davidxu Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 12 22:34:46 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0737F16A422; Mon, 12 Dec 2005 22:34:46 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 D570416A41F for ; Mon, 12 Dec 2005 22:34:45 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71C0143D58 for ; Mon, 12 Dec 2005 22:34:45 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBCMYjhL087529 for ; Mon, 12 Dec 2005 22:34:45 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBCMYjjT087526 for perforce@freebsd.org; Mon, 12 Dec 2005 22:34:45 GMT (envelope-from cognet@freebsd.org) Date: Mon, 12 Dec 2005 22:34:45 GMT Message-Id: <200512122234.jBCMYjjT087526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 88106 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: Mon, 12 Dec 2005 22:34:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=88106 Change 88106 by cognet@cognet on 2005/12/12 22:33:47 Cleanup Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91rm92usart.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91rm92usart.c#2 (text+ko) ==== @@ -44,21 +44,6 @@ #define DEFAULT_RCLK 3686400 -static __inline -void do_shit(void) -{ - int a, b; - - __asm __volatile("ldr %0, =0xfffc001c\n" - "mov %1, #'c'\n" - "strb %1, [%0]\n" - "mov %1, #'\n'\n" - "strb %1, [%0]\n" - : "=r" (a), "=r" (b)); -} - -extern int got_mmu; - /* * Low-level UART interface. */ From owner-p4-projects@FreeBSD.ORG Mon Dec 12 23:24:04 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27D2D16A424; Mon, 12 Dec 2005 23:24:04 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 D624216A41F for ; Mon, 12 Dec 2005 23:24:03 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9705C43D90 for ; Mon, 12 Dec 2005 23:23:50 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBCNNn8e089562 for ; Mon, 12 Dec 2005 23:23:49 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBCNNmlJ089559 for perforce@freebsd.org; Mon, 12 Dec 2005 23:23:48 GMT (envelope-from peter@freebsd.org) Date: Mon, 12 Dec 2005 23:23:48 GMT Message-Id: <200512122323.jBCNNmlJ089559@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 88110 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: Mon, 12 Dec 2005 23:24:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=88110 Change 88110 by peter@peter_daintree on 2005/12/12 23:23:32 IFC @88105 Affected files ... .. //depot/projects/hammer/MAINTAINERS#38 integrate .. //depot/projects/hammer/Makefile.inc1#110 integrate .. //depot/projects/hammer/UPDATING#87 integrate .. //depot/projects/hammer/bin/sh/output.c#5 integrate .. //depot/projects/hammer/bin/sh/sh.1#24 integrate .. //depot/projects/hammer/bin/sh/trap.c#6 integrate .. //depot/projects/hammer/etc/defaults/Makefile#6 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#64 integrate .. //depot/projects/hammer/etc/devd.conf#24 integrate .. //depot/projects/hammer/etc/mtree/BSD.root.dist#15 integrate .. //depot/projects/hammer/etc/rc#18 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#43 integrate .. //depot/projects/hammer/etc/rc.d/devfs#11 integrate .. //depot/projects/hammer/etc/rc.d/dumpon#11 integrate .. //depot/projects/hammer/etc/rc.d/initrandom#6 integrate .. //depot/projects/hammer/etc/rc.d/mixer#6 integrate .. //depot/projects/hammer/etc/rc.d/rcconf.sh#4 delete .. //depot/projects/hammer/etc/rc.d/resolv#5 integrate .. //depot/projects/hammer/etc/rc.subr#31 integrate .. //depot/projects/hammer/etc/usbd.conf#5 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#55 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#24 integrate .. //depot/projects/hammer/lib/msun/src/e_scalbf.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_cbrt.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_cbrtf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_tanhf.c#2 integrate .. //depot/projects/hammer/release/scripts/package-split.py#6 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient.c#9 integrate .. //depot/projects/hammer/sbin/geom/class/concat/geom_concat.c#9 integrate .. //depot/projects/hammer/sbin/geom/class/eli/geom_eli.c#5 integrate .. //depot/projects/hammer/sbin/geom/class/label/geom_label.c#7 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/geom_mirror.c#9 integrate .. //depot/projects/hammer/sbin/geom/class/nop/geom_nop.c#6 integrate .. //depot/projects/hammer/sbin/geom/class/nop/gnop.8#11 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#13 integrate .. //depot/projects/hammer/sbin/geom/class/shsec/geom_shsec.c#5 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#12 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#12 integrate .. //depot/projects/hammer/sbin/geom/misc/subr.c#5 integrate .. //depot/projects/hammer/sbin/geom/misc/subr.h#5 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#32 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#19 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#46 integrate .. //depot/projects/hammer/sbin/ldconfig/ldconfig.8#7 integrate .. //depot/projects/hammer/sbin/mount/mount.c#22 integrate .. //depot/projects/hammer/share/examples/ses/Makefile.inc#3 integrate .. //depot/projects/hammer/share/examples/ses/getencstat/Makefile#2 integrate .. //depot/projects/hammer/share/examples/ses/sesd/Makefile#2 integrate .. //depot/projects/hammer/share/examples/ses/setencstat/Makefile#2 integrate .. //depot/projects/hammer/share/examples/ses/setobjstat/Makefile#2 integrate .. //depot/projects/hammer/share/man/man4/ataraid.4#6 integrate .. //depot/projects/hammer/share/man/man4/crypto.4#5 integrate .. //depot/projects/hammer/share/man/man4/iwi.4#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#33 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/padlock.4#1 branch .. //depot/projects/hammer/share/man/man5/Makefile#15 integrate .. //depot/projects/hammer/share/man/man5/config.5#7 delete .. //depot/projects/hammer/share/man/man5/rc.conf.5#66 integrate .. //depot/projects/hammer/share/man/man8/diskless.8#13 integrate .. //depot/projects/hammer/sys/alpha/include/pmap.h#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#35 integrate .. //depot/projects/hammer/sys/amd64/amd64/bpf_jit_machdep.h#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#34 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#43 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#61 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#112 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#83 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#19 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#38 integrate .. //depot/projects/hammer/sys/amd64/include/asmacros.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/frame.h#15 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#20 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#57 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#29 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#53 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#22 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#54 integrate .. //depot/projects/hammer/sys/amd64/isa/icu.h#23 integrate .. //depot/projects/hammer/sys/arm/arm/bcopyinout_xscale.S#6 integrate .. //depot/projects/hammer/sys/arm/include/atomic.h#13 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_aau.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_timer.c#7 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#16 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/std.iq31244#3 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#38 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#37 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#35 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#35 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#35 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#39 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_signal.h#13 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#29 integrate .. //depot/projects/hammer/sys/compat/linux/linux_util.h#8 integrate .. //depot/projects/hammer/sys/conf/NOTES#102 integrate .. //depot/projects/hammer/sys/conf/files#133 integrate .. //depot/projects/hammer/sys/conf/files.amd64#82 integrate .. //depot/projects/hammer/sys/conf/files.i386#69 integrate .. //depot/projects/hammer/sys/conf/files.pc98#52 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#42 integrate .. //depot/projects/hammer/sys/conf/options#90 integrate .. //depot/projects/hammer/sys/conf/options.amd64#40 integrate .. //depot/projects/hammer/sys/conf/options.arm#6 integrate .. //depot/projects/hammer/sys/conf/options.i386#44 integrate .. //depot/projects/hammer/sys/conf/options.pc98#40 integrate .. //depot/projects/hammer/sys/contrib/dev/nve/adapter.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpi_perf.c#10 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#64 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#31 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#58 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#28 integrate .. //depot/projects/hammer/sys/dev/em/README#10 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#55 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#21 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#15 integrate .. //depot/projects/hammer/sys/dev/nve/if_nvereg.h#6 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#24 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#50 integrate .. //depot/projects/hammer/sys/dev/ti/if_ti.c#1 branch .. //depot/projects/hammer/sys/dev/ti/if_tireg.h#1 branch .. //depot/projects/hammer/sys/dev/ti/ti_fw.h#1 branch .. //depot/projects/hammer/sys/dev/ti/ti_fw2.h#1 branch .. //depot/projects/hammer/sys/dev/uart/uart_cpu_alpha.c#9 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_amd64.c#8 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_i386.c#8 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_ia64.c#9 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_pc98.c#10 integrate .. //depot/projects/hammer/sys/dev/uart/uart_subr.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#23 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.c#13 integrate .. //depot/projects/hammer/sys/geom/nop/g_nop.c#7 integrate .. //depot/projects/hammer/sys/geom/nop/g_nop.h#4 integrate .. //depot/projects/hammer/sys/geom/zero/g_zero.c#2 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/debug.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/debug.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/kdb.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/kmem.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/ktrace.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/move.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/mutex.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/rwsem.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/sema.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/spin.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/support.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/sv.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/time.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/uuid.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/uuid.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_config.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_cred.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_node.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_stats.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_stats.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_version.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_acl.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_acl.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_ag.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_alloc.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_alloc.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_alloc_btree.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_alloc_btree.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_arch.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_attr.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_attr.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_attr_leaf.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_attr_leaf.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_attr_sf.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_behavior.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_behavior.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_bit.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_bit.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_bmap.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_bmap.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_bmap_btree.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_bmap_btree.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_btree.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_btree.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_buf_item.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_buf_item.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_cap.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_cap.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_clnt.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_da_btree.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_da_btree.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dfrag.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dfrag.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dinode.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_block.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_block.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_data.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_data.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_leaf.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_leaf.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_node.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_node.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_sf.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_sf.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_trace.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_trace.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir_leaf.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir_leaf.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir_sf.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dmapi.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dmops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_error.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_error.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_extfree_item.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_extfree_item.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_fs.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_fsops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_fsops.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_ialloc.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_ialloc.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_ialloc_btree.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_ialloc_btree.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_imap.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_inode.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_inode.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_inode_item.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_inode_item.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_inum.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_iocore.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_iomap.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_iomap.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_itable.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_itable.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_log.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_log.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_log_priv.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_log_recover.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_log_recover.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_mac.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_mac.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_macros.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_macros.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_mount.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_mount.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_qmops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_quota.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_refcache.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_refcache.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_rename.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_rtalloc.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_rtalloc.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_rw.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_rw.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_sb.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans_ail.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans_buf.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans_extfree.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans_inode.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans_item.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans_priv.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans_space.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_types.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_utils.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_utils.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_vfsops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_vnodeops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfsidbg.c#1 branch .. //depot/projects/hammer/sys/i386/i386/bpf_jit_machdep.h#2 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#24 integrate .. //depot/projects/hammer/sys/i386/isa/atpic.c#17 integrate .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#26 integrate .. //depot/projects/hammer/sys/ia64/include/pmap.h#18 integrate .. //depot/projects/hammer/sys/kern/kern_condvar.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#59 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#54 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#67 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#85 integrate .. //depot/projects/hammer/sys/kern/kern_time.c#23 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#35 integrate .. //depot/projects/hammer/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#62 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#31 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#63 integrate .. //depot/projects/hammer/sys/modules/Makefile#93 integrate .. //depot/projects/hammer/sys/modules/netgraph/bpf/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ti/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/xfs/Makefile#1 branch .. //depot/projects/hammer/sys/net/bpf.c#43 integrate .. //depot/projects/hammer/sys/net/bpf_filter.c#4 integrate .. //depot/projects/hammer/sys/net/bpf_jitter.c#2 integrate .. //depot/projects/hammer/sys/net/bpf_jitter.h#2 integrate .. //depot/projects/hammer/sys/net80211/_ieee80211.h#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#19 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_ccmp.c#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_tkip.c#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_wep.c#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#26 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#25 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#28 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#19 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#20 integrate .. //depot/projects/hammer/sys/netgraph/ng_bpf.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_hole.c#5 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#16 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#19 integrate .. //depot/projects/hammer/sys/pc98/include/param.h#2 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#38 delete .. //depot/projects/hammer/sys/pci/if_tireg.h#9 delete .. //depot/projects/hammer/sys/pci/ti_fw.h#2 delete .. //depot/projects/hammer/sys/pci/ti_fw2.h#2 delete .. //depot/projects/hammer/sys/powerpc/include/pmap.h#11 integrate .. //depot/projects/hammer/sys/sparc64/include/elf.h#5 integrate .. //depot/projects/hammer/sys/sparc64/include/pmap.h#18 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib_subr.c#6 integrate .. //depot/projects/hammer/sys/sys/buf.h#27 integrate .. //depot/projects/hammer/sys/sys/condvar.h#6 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#48 integrate .. //depot/projects/hammer/sys/sys/param.h#71 integrate .. //depot/projects/hammer/sys/sys/signal.h#15 integrate .. //depot/projects/hammer/sys/sys/timers.h#5 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#34 integrate .. //depot/projects/hammer/tools/regression/geom_concat/Makefile#2 delete .. //depot/projects/hammer/tools/regression/geom_concat/conf.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_concat/runtests.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_concat/test-1.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_concat/test-1.t#2 integrate .. //depot/projects/hammer/tools/regression/geom_concat/test-2.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_concat/test-2.t#2 integrate .. //depot/projects/hammer/tools/regression/geom_mirror/Makefile#2 delete .. //depot/projects/hammer/tools/regression/geom_mirror/conf.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_mirror/runtests.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_mirror/test-1.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_mirror/test-1.t#1 branch .. //depot/projects/hammer/tools/regression/geom_mirror/test-2.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_mirror/test-2.t#1 branch .. //depot/projects/hammer/tools/regression/geom_mirror/test-3.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_mirror/test-3.t#1 branch .. //depot/projects/hammer/tools/regression/geom_mirror/test-4.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_mirror/test-4.t#1 branch .. //depot/projects/hammer/tools/regression/geom_mirror/test-5.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_mirror/test-5.t#1 branch .. //depot/projects/hammer/tools/regression/geom_mirror/test-6.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_mirror/test-6.t#1 branch .. //depot/projects/hammer/tools/regression/geom_mirror/test-7.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_mirror/test-7.t#1 branch .. //depot/projects/hammer/tools/regression/geom_nop/Makefile#2 delete .. //depot/projects/hammer/tools/regression/geom_nop/conf.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_nop/runtests.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_nop/test-1.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_nop/test-1.t#1 branch .. //depot/projects/hammer/tools/regression/geom_nop/test-2.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_nop/test-2.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/Makefile#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/conf.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/runtests.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-1.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-1.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-10.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-10.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-11.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-11.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-12.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-12.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-2.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-2.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-3.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-3.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-4.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-4.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-5.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-5.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-6.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-6.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-7.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-7.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-8.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-8.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-9.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-9.t#1 branch .. //depot/projects/hammer/tools/regression/geom_shsec/Makefile#2 delete .. //depot/projects/hammer/tools/regression/geom_shsec/conf.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_shsec/runtests.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_shsec/test-1.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_shsec/test-1.t#1 branch .. //depot/projects/hammer/tools/regression/geom_shsec/test-2.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_shsec/test-2.t#1 branch .. //depot/projects/hammer/tools/regression/geom_stripe/Makefile#2 delete .. //depot/projects/hammer/tools/regression/geom_stripe/conf.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_stripe/runtests.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_stripe/test-1.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_stripe/test-1.t#1 branch .. //depot/projects/hammer/tools/regression/geom_stripe/test-2.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_stripe/test-2.t#1 branch .. //depot/projects/hammer/tools/regression/geom_subr.sh#1 branch .. //depot/projects/hammer/tools/tools/ath/80211debug.c#5 delete .. //depot/projects/hammer/tools/tools/ath/80211stats.c#7 delete .. //depot/projects/hammer/tools/tools/ath/80211watch.c#3 delete .. //depot/projects/hammer/tools/tools/ath/Makefile#6 integrate .. //depot/projects/hammer/tools/tools/ath/athdebug.c#2 delete .. //depot/projects/hammer/tools/tools/ath/athdebug/Makefile#1 branch .. //depot/projects/hammer/tools/tools/ath/athdebug/athdebug.c#1 branch .. //depot/projects/hammer/tools/tools/ath/athstats.c#7 delete .. //depot/projects/hammer/tools/tools/ath/athstats/Makefile#1 branch .. //depot/projects/hammer/tools/tools/ath/athstats/athstats.c#1 branch .. //depot/projects/hammer/tools/tools/net80211/Makefile#1 branch .. //depot/projects/hammer/tools/tools/net80211/wlandebug/Makefile#1 branch .. //depot/projects/hammer/tools/tools/net80211/wlandebug/wlandebug.c#1 branch .. //depot/projects/hammer/tools/tools/net80211/wlanstats/Makefile#1 branch .. //depot/projects/hammer/tools/tools/net80211/wlanstats/wlanstats.c#1 branch .. //depot/projects/hammer/tools/tools/net80211/wlanwatch/Makefile#1 branch .. //depot/projects/hammer/tools/tools/net80211/wlanwatch/wlanwatch.c#1 branch .. //depot/projects/hammer/tools/tools/umastat/umastat.c#2 integrate .. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#8 integrate .. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#7 integrate .. //depot/projects/hammer/usr.bin/ktrdump/ktrdump.c#10 integrate .. //depot/projects/hammer/usr.bin/locate/locate/fastfind.c#2 integrate .. //depot/projects/hammer/usr.bin/locate/locate/locate.1#8 integrate .. //depot/projects/hammer/usr.bin/locate/locate/locate.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.1#20 integrate .. //depot/projects/hammer/usr.bin/xargs/xargs.1#9 integrate .. //depot/projects/hammer/usr.bin/xargs/xargs.c#11 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#10 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/scr.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/sdpd.8#5 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/server.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/server.h#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/srr.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/sur.c#2 integrate .. //depot/projects/hammer/usr.sbin/config/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/config/config.5#1 branch .. //depot/projects/hammer/usr.sbin/sysinstall/ftp.c#3 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#38 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.126 2005/10/24 08:15:58 ceri Exp $ +$FreeBSD: src/MAINTAINERS,v 1.128 2005/12/12 01:28:19 rodrigc Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -125,6 +125,7 @@ rpc.lockd alfred Will be happy to review code, but not mandatory. truss alfred Will be happy to review code, but not mandatory. rpc alfred Pre-commit review requested. +xfs kan,rodrigc Pre-commit review preferred. pkg_install krion Pre-commit review or approval from portmgr@ requested. linux emul emulation Please discuss changes here. bs{diff,patch} cperciva Pre-commit review requested. ==== //depot/projects/hammer/Makefile.inc1#110 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.526 2005/12/03 05:11:07 ambrisko Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.531 2005/12/07 22:55:29 obrien Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -209,7 +209,12 @@ # 32 bit world LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 -LIB32PREFLAGS= -m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT +.if empty(TARGET_CPUTYPE) +LIB32CPUTYPE= k8 +.else +LIB32CPUTYPE= ${TARGET_CPUTYPE} +.endif +LIB32PREFLAGS= -m32 -march=${LIB32CPUTYPE} -mfancy-math-387 -DCOMPAT_32BIT LIB32POSTFLAGS= -I${LIB32TMP}/usr/include \ -L${LIB32TMP}/usr/lib32 \ -B${LIB32TMP}/usr/lib32 @@ -280,7 +285,7 @@ .endif .else rm -rf ${WORLDTMP}/legacy/usr/include - # XXX - These two can depend on any header file. +# XXX - These two can depend on any header file. rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif @@ -482,7 +487,7 @@ buildenv: @echo Entering world for ${TARGET_ARCH}:${TARGET} - @cd ${.CURDIR} && env ${WMAKEENV} ${SHELL} || true + @cd ${.CURDIR} && env ${WMAKEENV} sh || true TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything:Nbuild32} toolchain: ${TOOLCHAIN_TGTS} @@ -904,24 +909,20 @@ # # cross-tools: Build cross-building tools # -.if (${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386") && \ - ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld .endif - -.if (!defined(NO_RESCUE) || defined(RELEASEDIR)) && \ - ${TARGET_ARCH} != ${MACHINE_ARCH} +.if !defined(NO_RESCUE) || defined(RELEASEDIR) _crunchide= usr.sbin/crunch/crunchide .endif - -.if ${TARGET_ARCH} == "alpha" && ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} == "alpha" _elf2exe= usr.sbin/elf2exe .endif - -.if ${TARGET_ARCH} == "i386" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \ - defined(RELEASEDIR) +.if ${TARGET_ARCH} == "i386" && defined(RELEASEDIR) _kgzip= usr.sbin/kgzip .endif +.endif cross-tools: .for _tool in \ ==== //depot/projects/hammer/UPDATING#87 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20051211: + The net80211-related tools in the tools/tools/ath directory + have been moved to tools/tools/net80211 and renamed with a + "wlan" prefix. Scripts that use them should be adjusted + accordingly. + 20051202: Scripts in the local_startup directories (as defined in /etc/defaults/rc.conf) that have the new rc.d semantics will @@ -267,6 +273,13 @@ prefix all make commands with 'env -i '. See the env(1) manual page for more details. + When upgrading from one major version to another it is generally + best to upgrade to the latest code in the currently installed branch + first, then do an upgrade to the new branch. This is the best-tested + upgrade path, and has the highest probability of being successful. + Please try this approach before reporting problems with a major + version upgrade. + To build a kernel ----------------- If you are updating from a prior version of FreeBSD (even one just @@ -445,4 +458,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.427 2005/12/06 10:39:14 glebius Exp $ +$FreeBSD: src/UPDATING,v 1.429 2005/12/11 23:18:58 sam Exp $ ==== //depot/projects/hammer/bin/sh/output.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.19 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.20 2005/12/08 21:00:39 stefanf Exp $"); /* * Shell output routines. We use our own output routines because: @@ -134,6 +134,10 @@ { char ch; + if (p[0] == '\0') { + outstr("''", file); + return; + } if (p[strcspn(p, "|&;<>()$`\\\"'")] == '\0' && (!ifsset() || p[strcspn(p, ifsval())] == '\0')) { outstr(p, file); ==== //depot/projects/hammer/bin/sh/sh.1#24 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.115 2005/12/04 18:44:21 stefanf Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.117 2005/12/08 21:18:59 stefanf Exp $ .\" -.Dd December 4, 2005 +.Dd December 8, 2005 .Dt SH 1 .Os .Sh NAME @@ -1509,10 +1509,9 @@ or an alias for . Ar value . -.It Ic echo Oo Fl e | n Oc Op Ar string -Print -.Ar string -to the standard output with a newline appended. +.It Ic echo Oo Fl e | n Oc Op Ar string ... +Print a space-separated list of the arguments to the standard output +and append a newline character. .Bl -tag -width indent .It Fl n Suppress the output of the trailing newline. @@ -1958,6 +1957,7 @@ itself, the second one contains the user and system times for the children. .It Ic trap Oo Ar action Oc Ar signal ... +.It Ic trap Fl l Cause the shell to parse and execute .Ar action when any specified @@ -1969,14 +1969,25 @@ may be used to specify an action that is performed when the shell terminates. The .Ar action -may be null or omitted; +may be an empty string or a dash +.Pq Ar - ; the former causes the specified signal to be ignored and the latter causes the default action to be taken. +Omitting the +.Ar action +is another way to request the default action, for compatibility reasons this +usage is not recommended though. When the shell forks off a subshell, it resets trapped (but not ignored) signals to the default action. The .Ic trap command has no effect on signals that were ignored on entry to the shell. +.Pp +Option +.Fl l +causes the +.Ic trap +command to display a list of valid signal names. .It Ic type Op Ar name ... Interpret each .Ar name ==== //depot/projects/hammer/bin/sh/trap.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.30 2005/09/06 19:30:00 rse Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.31 2005/12/08 20:08:36 stefanf Exp $"); #include #include @@ -153,15 +153,14 @@ if (argc <= 1) { for (signo = 0 ; signo < sys_nsig ; signo++) { if (signo < NSIG && trap[signo] != NULL) { + out1str("trap -- "); + out1qstr(trap[signo]); if (signo == 0) { - out1fmt("trap -- '%s' %s\n", - trap[signo], "exit"); + out1str(" exit\n"); } else if (sys_signame[signo]) { - out1fmt("trap -- '%s' %s\n", - trap[signo], sys_signame[signo]); + out1fmt(" %s\n", sys_signame[signo]); } else { - out1fmt("trap -- '%s' %d\n", - trap[signo], signo); + out1fmt(" %d\n", signo); } } } ==== //depot/projects/hammer/etc/defaults/Makefile#6 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/etc/defaults/Makefile,v 1.6 2005/11/10 19:09:22 emax Exp $ +# $FreeBSD: src/etc/defaults/Makefile,v 1.7 2005/12/09 15:19:31 ru Exp $ FILES= bluetooth.device.conf devfs.rules pccard.conf periodic.conf rc.conf NO_OBJ= FILESDIR= /etc/defaults -FILESMODE= 444 .include ==== //depot/projects/hammer/etc/defaults/rc.conf#64 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.265 2005/11/24 14:39:41 jkoshy Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.266 2005/12/10 20:21:45 dougb Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -24,6 +24,11 @@ rc_debug="NO" # Set to YES to enable debugging output from rc.d rc_info="NO" # Enables display of informational messages at boot. rcshutdown_timeout="30" # Seconds to wait before terminating rc.shutdown +early_late_divider="mountcritlocal" # Script that separates early/late + # stages of the boot process. Make sure you know + # the ramifications if you change this. + # See rc.conf(5) for more details. + swapfile="NO" # Set to name of swapfile if aux swapfile desired. apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. ==== //depot/projects/hammer/etc/devd.conf#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.29 2005/11/12 03:42:56 emax Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.30 2005/12/11 00:18:28 iedowse Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -113,6 +113,35 @@ action "/etc/rc.d/moused start $device-name"; }; +# Firmware download into the ActiveWire board. After the firmware download is +# done the device detaches and reappears as something new and shiny +# automatically. +attach 100 { + match "vendor" "0x0854"; + match "product" "0x0100"; + match "release" "0x0000"; + action "/usr/local/bin/ezdownload -f /usr/local/share/usb/firmware/0854.0100.0_01.hex $device-name"; +}; + +# Firmware download for Entrega Serial DB25 adapter. +attach 100 { + match "vendor" "0x1645"; + match "product" "0x8001"; + match "release" "0x0101"; + action "if ! kldstat -n usio > /dev/null 2>&1 ; then kldload usio; fi /usr/sbin/ezdownload -v -f /usr/share/usb/firmware/1645.8001.0101 /dev/$device-name"; +}; + +# This entry starts the ColdSync tool in daemon mode. Make sure you have an up +# to date /usr/local/etc/palms. We override the 'listen' settings for port and +# type in /usr/local/etc/coldsync.conf. +attach 100 { + device-name "ugen[0-9]+"; + match "vendor" "0x082d"; + match "product" "0x0100"; + match "release" "0x0100"; + action "/usr/local/bin/coldsync -md -p /dev/$device-name -t usb"; +}; + # # Rescan scsi device-names on attach, but not detach. However, it is # disabled by default due to reports of problems. ==== //depot/projects/hammer/etc/mtree/BSD.root.dist#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.74 2005/05/30 20:51:13 rwatson Exp $ +# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.75 2005/12/11 15:21:18 delphij Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -10,6 +10,8 @@ boot defaults .. + firmware + .. kernel .. modules ==== //depot/projects/hammer/etc/rc#18 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.337 2005/12/02 20:06:07 dougb Exp $ +# $FreeBSD: src/etc/rc,v 1.338 2005/12/10 20:21:45 dougb Exp $ # # System startup script run by init on autoboot @@ -50,12 +50,6 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin export HOME PATH -. /etc/rc.subr - -# Note: the system configuration files are loaded as part of -# the rc.d system (rc.d/rcconf.sh). Do not load them here as it may -# interfere with diskless booting. -# if [ "$1" = autoboot ]; then autoboot=yes _boot="faststart" @@ -70,10 +64,18 @@ sh /etc/rc.initdiskless fi +# Run these after determining whether we are booting diskless in order +# to minimize the number of files that are needed on a diskless system, +# and to make the configuration file variables available to rc itself. +# +. /etc/rc.subr +echo "Loading configuration files." +load_rc_config 'XXX' + skip="-s nostart" [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip -s nojail" -# Do a first pass to get everything up to mountcritremote so that +# Do a first pass to get everything up to $early_late_divider so that # we can do a second pass that includes $local_startup directories # files=`rcorder ${skip} /etc/rc.d/* 2>/dev/null` @@ -82,7 +84,7 @@ run_rc_script ${_rc_elem} ${_boot} case "$_rc_elem" in - */mountcritremote) break ;; + */${early_late_divider}) break ;; esac done @@ -101,7 +103,7 @@ for _rc_elem in ${files}; do case "$_skip_early" in 1) case "$_rc_elem" in - */mountcritremote) _skip_early=0 ;; + */${early_late_divider}) _skip_early=0 ;; esac continue ;; ==== //depot/projects/hammer/etc/rc.d/Makefile#43 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.60 2005/11/10 19:09:22 emax Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.61 2005/12/10 23:23:09 dougb Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -29,7 +29,7 @@ pccard pcvt pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ quota \ - ramdisk ramdisk-own random rarpd rcconf.sh resolv root \ + ramdisk ramdisk-own random rarpd resolv root \ route6d routed routing rpcbind rtadvd rwho \ savecore sdpd securelevel sendmail \ serial sppp swap1 \ ==== //depot/projects/hammer/etc/rc.d/devfs#11 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.10 2004/10/23 06:50:50 mtm Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.11 2005/12/10 20:21:45 dougb Exp $ # # PROVIDE: devfs -# REQUIRE: rcconf mountcritremote +# REQUIRE: mountcritremote # BEFORE: SERVERS securelevel # KEYWORD: nojail ==== //depot/projects/hammer/etc/rc.d/dumpon#11 (text+ko) ==== @@ -1,10 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/dumpon,v 1.10 2005/09/13 19:07:02 rwatson Exp $ +# $FreeBSD: src/etc/rc.d/dumpon,v 1.11 2005/12/10 20:21:45 dougb Exp $ # # PROVIDE: dumpon -# REQUIRE: rcconf # BEFORE: disks savecore initrandom # KEYWORD: nojail ==== //depot/projects/hammer/etc/rc.d/initrandom#6 (text+ko) ==== @@ -1,10 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/initrandom,v 1.5 2005/03/02 19:03:08 brooks Exp $ +# $FreeBSD: src/etc/rc.d/initrandom,v 1.6 2005/12/10 20:21:45 dougb Exp $ # # PROVIDE: initrandom -# REQUIRE: rcconf # BEFORE: disks # KEYWORD: nojail ==== //depot/projects/hammer/etc/rc.d/mixer#6 (text+ko) ==== @@ -24,11 +24,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/mixer,v 1.5 2005/03/17 22:36:16 njl Exp $ +# $FreeBSD: src/etc/rc.d/mixer,v 1.6 2005/12/10 19:49:03 dougb Exp $ # # PROVIDE: mixer -# BEFORE: LOGIN +# REQUIRE: cleanvar # KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/resolv#5 (text+ko) ==== @@ -24,11 +24,10 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/resolv,v 1.35 2005/03/02 19:03:08 brooks Exp $ +# $FreeBSD: src/etc/rc.d/resolv,v 1.36 2005/12/10 20:21:45 dougb Exp $ # # PROVIDE: resolv -# REQUIRE: rcconf # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.subr#31 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.46 2005/12/06 05:27:11 yar Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.47 2005/12/10 20:19:08 dougb Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -1380,7 +1380,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 12 23:49:22 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2BF816A423; Mon, 12 Dec 2005 23:49:21 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 C89E116A420 for ; Mon, 12 Dec 2005 23:49:21 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8110143D58 for ; Mon, 12 Dec 2005 23:49:20 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBCNnK80090531 for ; Mon, 12 Dec 2005 23:49:20 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBCNnKeZ090528 for perforce@freebsd.org; Mon, 12 Dec 2005 23:49:20 GMT (envelope-from soc-saturnero@freebsd.org) Date: Mon, 12 Dec 2005 23:49:20 GMT Message-Id: <200512122349.jBCNnKeZ090528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 88111 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: Mon, 12 Dec 2005 23:49:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=88111 Change 88111 by soc-saturnero@soc-saturnero_sberta on 2005/12/12 23:48:57 "Integrate" (by hand) from FreeSBIE.org cvs. If someone knows how to do it automatically, please tell! Affected files ... .. //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#15 edit .. //depot/projects/soc2005/freesbie/extra/adduser.sh#1 add .. //depot/projects/soc2005/freesbie/extra/adduser/homemfs.rc#1 add .. //depot/projects/soc2005/freesbie/extra/buildmodules.sh#1 add .. //depot/projects/soc2005/freesbie/extra/comconsole.sh#1 add .. //depot/projects/soc2005/freesbie/extra/customroot.sh#3 edit .. //depot/projects/soc2005/freesbie/extra/customscripts.sh#1 add .. //depot/projects/soc2005/freesbie/extra/customscripts/README#1 add .. //depot/projects/soc2005/freesbie/extra/etcmfs.sh#3 edit .. //depot/projects/soc2005/freesbie/extra/etcmfs/etcmfs.rc#3 edit .. //depot/projects/soc2005/freesbie/extra/sound.sh#1 add .. //depot/projects/soc2005/freesbie/extra/sound/snd_card_ids.txt#1 add .. //depot/projects/soc2005/freesbie/extra/sound/sound_detect.sh#1 add .. //depot/projects/soc2005/freesbie/extra/xconfig-probe.sh#1 add .. //depot/projects/soc2005/freesbie/extra/xconfig-probe/xconfig-probe.sh#1 add .. //depot/projects/soc2005/freesbie/extra/xconfig-probe/xkbdlayout.sh#1 add .. //depot/projects/soc2005/freesbie/extra/xconfig-probe/xorg.conf.orig#1 add .. //depot/projects/soc2005/freesbie/extra/xconfig.sh#1 add .. //depot/projects/soc2005/freesbie/extra/xconfig/Cards#1 add .. //depot/projects/soc2005/freesbie/extra/xconfig/pcitable.gz#1 add .. //depot/projects/soc2005/freesbie/extra/xconfig/xconfig.sh#1 add .. //depot/projects/soc2005/freesbie/extra/xconfig/xkbdlayout.sh#1 add .. //depot/projects/soc2005/freesbie/extra/xconfig/xorg.conf.orig#1 add .. //depot/projects/soc2005/freesbie/extra/xconfig/xorg.conf.vmware#1 add .. //depot/projects/soc2005/freesbie/scripts/buildkernel.sh#6 edit .. //depot/projects/soc2005/freesbie/scripts/buildworld.sh#7 edit .. //depot/projects/soc2005/freesbie/scripts/clonefs.sh#6 edit .. //depot/projects/soc2005/freesbie/scripts/img.sh#7 edit .. //depot/projects/soc2005/freesbie/scripts/installkernel.sh#5 edit .. //depot/projects/soc2005/freesbie/scripts/installworld.sh#4 edit .. //depot/projects/soc2005/freesbie/scripts/iso.sh#6 edit .. //depot/projects/soc2005/freesbie/scripts/launch.sh#10 edit .. //depot/projects/soc2005/freesbie/scripts/pkginstall.sh#5 edit .. //depot/projects/soc2005/freesbie/scripts/powerpc/iso.sh#6 edit Differences ... ==== //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#15 (text+ko) ==== @@ -7,40 +7,46 @@ # See COPYING for license terms. # # $FreeBSD$ -# $Id: freesbie.defaults.conf,v 1.4 2005/10/30 13:53:53 saturnero Exp $ +# $Id: freesbie.defaults.conf,v 1.6 2005/11/15 22:59:42 saturnero Exp $ # # Don't modify it, create your own conf/freesbie.conf instead, or set # an environment variable called FREESBIE_CONF to the absolute path of -# your configuration file. +# your configuration file. Alternatively, you can set the variables +# you want to override as environment variables # Variables # Path where files are installed. -BASEDIR="/usr/local/freesbie-fs" +BASEDIR=${BASEDIR:-"/usr/local/freesbie-fs"} # Temporary directory used when building images -CLONEDIR="/usr/local/freesbie-clone" +CLONEDIR=${CLONEDIR:-"/usr/local/freesbie-clone"} # Directory with system sources -SRCDIR="/usr/src" +SRCDIR=${SRCDIR:-"/usr/src"} # Path of the built iso, use absolute path -ISOPATH="/usr/obj/FreeSBIE.iso" +ISOPATH=${ISOPATH:-"/usr/obj/FreeSBIE.iso"} # Path of the built image, use absolute path -IMGPATH="/usr/obj/FreeSBIE.img" +IMGPATH=${IMGPATH:-"/usr/obj/FreeSBIE.img"} # Default parameters for the image, use diskinfo(1) to obtain yours -SECTS=501760 # Total number of sectors -SECTT=32 # Sectors/track -HEADS=16 # Heads +SECTS=${SECTS:-501760} # Total number of sectors +SECTT=${SECTT:-32} # Sectors/track +HEADS=${HEADS:-16} # Heads # # Optional variables -# Arguments passed to make(1) when building world and kernel +# Arguments passed to make(1) when building world and kernel. +# Cannot be an environment variable. +MAKEJ=${MAKEJ:-"-j3"} + +# Arguments passed to make(1) when building world and kernel. +# Can also be an environment variable. # -MAKEOPT="-j3" +#MAKEOPT="-DNO_CLEAN" # Kernel configuration file, with complete path # @@ -102,4 +108,3 @@ # system # NO_UNIONFS=YES # Unionfs is broken in > 6.0, so disable it by default - ==== //depot/projects/soc2005/freesbie/extra/customroot.sh#3 (text+ko) ==== @@ -5,7 +5,7 @@ # See COPYING for licence terms. # # $FreeBSD$ -# $Id$ +# $Id: customroot.sh,v 1.3 2005/11/27 22:54:08 saturnero Exp $ set -e -u @@ -24,4 +24,8 @@ find . -not -name 'README' -not -path '*CVS*' | \ cpio -dump -v ${BASEDIR} >> ${LOGFILE} 2>&1 +if [ -f ${CUSTOMROOT}/etc/master.passwd ]; then + chroot ${BASEDIR} cap_mkdb /etc/master.passwd +fi + cd ${LOCALDIR} ==== //depot/projects/soc2005/freesbie/extra/etcmfs.sh#3 (text+ko) ==== @@ -5,7 +5,7 @@ # See COPYING for licence terms. # # $FreeBSD$ -# $Id$ +# $Id: etcmfs.sh,v 1.3 2005/12/01 00:14:23 saturnero Exp $ set -e -u @@ -26,3 +26,8 @@ mtree -Pcp ${BASEDIR}/etc > ${TMPFILE} mv ${TMPFILE} ${BASEDIR}/etc/mtree/etc.dist + +if [ -d ${BASEDIR}/usr/local/etc ]; then + mtree -Pcp ${BASEDIR}/usr/local/etc > ${TMPFILE} + mv ${TMPFILE} ${BASEDIR}/etc/mtree/localetc.dist +fi ==== //depot/projects/soc2005/freesbie/extra/etcmfs/etcmfs.rc#3 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # $FreeBSD$ -# $Id$ +# $Id: etcmfs.rc,v 1.3 2005/12/01 00:14:23 saturnero Exp $ # # PROVIDE: etcmfs @@ -36,6 +36,7 @@ name="etcmfs" etcsize="20m" +localetcsize="10m" load_rc_config $name @@ -58,4 +59,21 @@ umount ${tempdir} mount /dev/${device} /etc + +if [ -f /etc/mtree/localetc.dist ]; then + device=$(mdconfig -a -t malloc -s ${localetcsize}) + newfs /dev/${device} > /dev/null 2>&1 + mount /dev/${device} ${tempdir} + + cd /usr/local/etc + find . -print -depth | cpio -dump --quiet ${tempdir} + + cd $back + + mtree -PUer -q -p ${tempdir} < /etc/mtree/localetc.dist > /dev/null 2>&1 + + umount ${tempdir} + mount /dev/${device} /usr/local/etc +fi + rmdir ${tempdir} ==== //depot/projects/soc2005/freesbie/scripts/buildkernel.sh#6 (text+ko) ==== @@ -5,7 +5,7 @@ # See COPYING for licence terms. # # $FreeBSD$ -# $Id$ +# $Id: buildkernel.sh,v 1.4 2005/11/15 21:47:53 saturnero Exp $ set -e -u @@ -40,7 +40,7 @@ fi cd $SRCDIR - -(script -aq $LOGFILE make ${MAKEOPT:-} buildkernel __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} || print_error;) | grep '^>>>' +makeargs="${MAKEOPT:-} ${MAKEJ:-} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH}" +(script -aq $LOGFILE make $makeargs buildkernel || print_error;) | grep '^>>>' cd $LOCALDIR ==== //depot/projects/soc2005/freesbie/scripts/buildworld.sh#7 (text+ko) ==== @@ -5,7 +5,7 @@ # See COPYING for licence terms. # # $FreeBSD$ -# $Id$ +# $Id: buildworld.sh,v 1.4 2005/11/15 21:47:53 saturnero Exp $ set -e -u @@ -32,7 +32,8 @@ fi cd $SRCDIR - -(script -aq $LOGFILE make ${MAKEOPT:-} buildworld __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} || print_error;) | grep '^>>>' + +makeargs="${MAKEOPT:-} ${MAKEJ:-} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH}" +(script -aq $LOGFILE make ${makeargs:-} buildworld || print_error;) | grep '^>>>' cd $LOCALDIR ==== //depot/projects/soc2005/freesbie/scripts/clonefs.sh#6 (text+ko) ==== @@ -5,7 +5,7 @@ # See COPYING for licence terms. # # $FreeBSD$ -# $Id$ +# $Id: clonefs.sh,v 1.6 2005/11/27 22:42:52 saturnero Exp $ set -e -u @@ -33,7 +33,8 @@ cd $SOURCEDIR # Find the total dir size and initialize the vnode - FSSIZE=$(($(du -kd 0 | cut -f 1) + 64000)) + DIRSIZE=$(($(du -kd 0 | cut -f 1))) + FSSIZE=$(($DIRSIZE + ($DIRSIZE/5))) dd if=/dev/zero of=${UFSFILE} bs=1k count=${FSSIZE} >> ${LOGFILE} 2>&1 DEVICE=/dev/$(mdconfig -a -t vnode -f ${UFSFILE}) @@ -128,7 +129,7 @@ # else pass it to cpio if [ -f ${FILE_LIST} ]; then echo "Using ${FILE_LIST} as source" | tee -a ${LOGFILE} - cpio -dump -v ${CLONEDIR} < ${FILE_LIST} >> ${LOGFILE} 2>&1 + sed 's/^#.*//g' ${FILE_LIST} | cpio -dump -v ${CLONEDIR} >> ${LOGFILE} 2>&1 else echo "${FILE_LIST} is not a valid path, exiting..." \ | tee -a ${LOGFILE} @@ -143,7 +144,16 @@ if [ -n "${PRUNE_LIST:-}" ]; then if [ -f ${PRUNE_LIST} ]; then echo "Deleting files listed in ${PRUNE_LIST}" | tee -a ${LOGFILE} - (cd ${CLONEDIR} && cat ${PRUNE_LIST} | xargs rm -rvf >> ${LOGFILE} 2>&1) + set +e + (cd ${CLONEDIR} && sed 's/^#.*//g' ${PRUNE_LIST} | xargs rm -rvf >> ${LOGFILE} 2>&1) + if [ -z "${NO_COMPRESSEDFS:-}" ]; then + echo "Filling the uncompressed fs with zeros to compress better" + echo "Don't worry if you see a 'filesystem full' message here" + zerofile=$(env TMPDIR=${CLONEDIR}/usr mktemp -t zero) + dd if=/dev/zero of=${zerofile} >> ${LOGFILE} 2>&1 + rm ${zerofile} + fi + set -e else echo "${PRUNE_LIST} isn't a regular file, skipping file deletion" \ | tee -a ${LOGFILE} ==== //depot/projects/soc2005/freesbie/scripts/img.sh#7 (text+ko) ==== @@ -5,7 +5,7 @@ # See COPYING for licence terms. # # $FreeBSD$ -# $Id$ +# $Id: img.sh,v 1.3 2005/11/17 00:21:42 saturnero Exp $ set -e -u @@ -17,7 +17,7 @@ echo "#### Building bootable UFS image for ${ARCH} ####" -LABEL="FreeSBIE" # UFS label +FREESBIE_LABEL=${FREESBIE_LABEL:-"FreeSBIE"} # UFS label # Temp file and directory to be used later TMPFILE=`mktemp -t freesbie` @@ -48,14 +48,14 @@ bsdlabel -w -B ${DEVICE}s1 >> ${LOGFILE} 2>&1 -newfs -b 4096 -f 512 -i 8192 -L ${LABEL} -O1 -U ${DEVICE}s1a >> ${LOGFILE} 2>&1 +newfs -b 4096 -f 512 -i 8192 -L ${FREESBIE_LABEL} -O1 -U ${DEVICE}s1a >> ${LOGFILE} 2>&1 mount /dev/${DEVICE}s1a ${TMPDIR} echo "Writing files..." cd ${CLONEDIR} find . -print -depth | cpio -dump -v ${TMPDIR} >> ${LOGFILE} 2>&1 -echo "/dev/ufs/${LABEL} / ufs ro 1 1" > ${TMPDIR}/etc/fstab +echo "/dev/ufs/${FREESBIE_LABEL} / ufs ro 1 1" > ${TMPDIR}/etc/fstab umount ${TMPDIR} cd ${LOCALDIR} ==== //depot/projects/soc2005/freesbie/scripts/installkernel.sh#5 (text+ko) ==== @@ -5,7 +5,7 @@ # See COPYING for licence terms. # # $FreeBSD$ -# $Id$ +# $Id: installkernel.sh,v 1.4 2005/11/15 21:47:53 saturnero Exp $ set -e -u @@ -39,8 +39,9 @@ echo hint.psm.0.flags=0x1000 >> ${BASEDIR}/boot/device.hints cd ${SRCDIR} - -(script -aq $LOGFILE make ${MAKEOPT:-} installkernel __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} DESTDIR=${BASEDIR} || print_error;) | grep '^>>>' + +makeargs="${MAKEOPT:-} ${MAKEJ:-} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} DESTDIR=${BASEDIR}" +(script -aq $LOGFILE make ${makeargs:-} installkernel || print_error;) | grep '^>>>' cd ${BASEDIR}/boot/kernel if [ "${ARCH}" = "`uname -m`" -a -z "${DEBUG:-}" ]; then ==== //depot/projects/soc2005/freesbie/scripts/installworld.sh#4 (text+ko) ==== @@ -5,7 +5,7 @@ # See COPYING for licence terms. # # $FreeBSD$ -# $Id$ +# $Id: installworld.sh,v 1.5 2005/11/18 15:39:09 saturnero Exp $ set -e -u @@ -30,10 +30,13 @@ cd ${SRCDIR} -(script -aq $LOGFILE make ${MAKEOPT:-} installworld __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} DESTDIR=${BASEDIR} || print_error;) | grep '^>>>' +makeargs="${MAKEOPT:-} ${MAKEJ:-} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} DESTDIR=${BASEDIR}" +(script -aq $LOGFILE make ${makeargs:-} installworld || print_error;) | grep '^>>>' cd ${SRCDIR}/etc -(script -aq $LOGFILE make ${MAKEOPT:-} distribution __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} DESTDIR=${BASEDIR} || print_error;) | grep '^>>>' - +makeargs="${MAKEOPT:-} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${ARCH} DESTDIR=${BASEDIR}" +set +e +(script -aq $LOGFILE make ${makeargs:-} distribution || print_error;) | grep '^>>>' +set -e cd $LOCALDIR ==== //depot/projects/soc2005/freesbie/scripts/iso.sh#6 (text+ko) ==== @@ -5,7 +5,7 @@ # See COPYING for licence terms. # # $FreeBSD$ -# $Id$ +# $Id: iso.sh,v 1.5 2005/11/27 16:02:43 saturnero Exp $ set -e -u @@ -15,12 +15,13 @@ exit 1 fi -LABEL="FreeSBIE" +FREESBIE_LABEL=${FREESBIE_LABEL:-"FreeSBIE"} echo "#### Building bootable ISO image for ${ARCH} ####" # This part was taken from the mkisoimages.sh scripts under # /usr/src/release/${ARCH}/ +set +e type mkisofs 2>&1 | grep " is " >/dev/null if [ $? -ne 0 ]; then echo The cdrtools port is not installed. Trying to get it now. @@ -34,20 +35,20 @@ fi fi fi +set -e - echo "Saving mtree structure..." mtree -Pcp ${CLONEDIR} | bzip2 -9 > root.dist.bz2 mkdir -p ${CLONEDIR}/dist mv root.dist.bz2 ${CLONEDIR}/dist/ -echo "/dev/iso9660/${LABEL} / cd9660 ro 0 0" > ${CLONEDIR}/etc/fstab +echo "/dev/iso9660/${FREESBIE_LABEL} / cd9660 ro 0 0" > ${CLONEDIR}/etc/fstab cd ${CLONEDIR} echo "Running mkisofs..." -mkisofs -b boot/cdboot -no-emul-boot -J -r -ldots -l -L -V ${LABEL} -p FreeSBIE -o $ISOPATH . >> ${LOGFILE} 2>&1 +mkisofs -b boot/cdboot -no-emul-boot -J -r -ldots -l -L -V ${FREESBIE_LABEL} -p FreeSBIE -o $ISOPATH . >> ${LOGFILE} 2>&1 echo "ISO created:" ==== //depot/projects/soc2005/freesbie/scripts/launch.sh#10 (text+ko) ==== @@ -7,7 +7,7 @@ # See COPYING for license terms. # # $FreeBSD$ -# $Id: launch.sh,v 1.3 2005/10/29 18:46:07 drizzt Exp $ +# $Id: launch.sh,v 1.4 2005/12/11 10:43:32 saturnero Exp $ # # Usage: launch.sh ${TARGET} [ ${LOGFILE} ] @@ -56,16 +56,19 @@ kill $$ # XXX exit 1 won't work. } +# If SCRIPTS_OVERRIDE is not defined, set it to ${LOCALDIR}/scripts/custom +SCRIPTS_OVERRIDE=${SCRIPTS_OVERRIDE:-"${LOCALDIR}/scripts/custom"} + # Check order: -# - scripts/custom/${ARCH}/${TARGET}.sh -# - scripts/custom/${TARGET}.sh +# - ${SCRIPTS_OVERRIDE}/${ARCH}/${TARGET}.sh +# - ${SCRIPTS_OVERRIDE}/${TARGET}.sh # - scripts/${ARCH}/${TARGET}.sh # - scripts/${TARGET}.sh -if [ -f "${LOCALDIR}/scripts/custom/${ARCH}/${TARGET}.sh" ]; then - . ${LOCALDIR}/scripts/custom/${ARCH}/${TARGET}.sh -elif [ -f "${LOCALDIR}/scripts/custom/${TARGET}.sh" ]; then - . ${LOCALDIR}/scripts/custom/${TARGET}.sh +if [ -f "${SCRIPTS_OVERRIDE}/${ARCH}/${TARGET}.sh" ]; then + . ${SCRIPTS_OVERRIDE}/${ARCH}/${TARGET}.sh +elif [ -f "${SCRIPTS_OVERRIDE}/${TARGET}.sh" ]; then + . ${SCRIPTS_OVERRIDE}/${TARGET}.sh elif [ -f "${LOCALDIR}/scripts/${ARCH}/${TARGET}.sh" ]; then . ${LOCALDIR}/scripts/${ARCH}/${TARGET}.sh elif [ -f "${LOCALDIR}/scripts/${TARGET}.sh" ]; then ==== //depot/projects/soc2005/freesbie/scripts/pkginstall.sh#5 (text+ko) ==== @@ -5,7 +5,7 @@ # See COPYING for licence terms. # # $FreeBSD$ -# $Id$ +# $Id: pkginstall.sh,v 1.8 2005/12/11 12:27:41 saturnero Exp $ set -e -u @@ -39,7 +39,11 @@ touch origins echo -n "Finding origins... " while read row; do - if [ -z ${row} ]; then continue; fi + if [ -z "${row}" ]; then continue; fi + set +e + if (echo ${row} | grep -q "^#"); then continue; fi + set -e + pkg=$(echo $row | cut -d\ -f 1) # pkg_info might fail if the listed package isn't present @@ -92,17 +96,63 @@ fi } -create_packages() { +sort_packages() { cd ${WORKDIR} - sort -u origins deps > packages - totpkg=$(wc -l packages | awk '{print $1}') - echo "Creating ${totpkg} packages" + pkgfile=${WORKDIR}/packages + sortfile=${WORKDIR}/sortpkg + sort -u deps origins > $pkgfile + + [ -f $sortfile ] && rm $sortfile + touch $sortfile + + count() { + file=$1; + echo $(wc -l ${file} | awk '{print $1}') + } + + totpkg=$(wc -l $pkgfile | awk '{print $1}') + echo "Sorting ${totpkg} packages by dependencies" + echo -n "[0" + count=1 + + while [ "$(count $pkgfile)" != "$(count $sortfile)" ]; do + while read pkg; do + depnotfound=0 + if (grep -q "^${pkg}\$" ${sortfile}); then continue; fi + for dep in $(pkg_info -qr ${pkg} | cut -d ' ' -f 2); do + if (grep -q "^${dep}\$" ${sortfile}); then + continue; + else + depnotfound=1 + break; + fi + done + if [ "$depnotfound" = "0" ]; then + echo ${pkg} >> ${sortfile}; + # Progress bar + if [ $((${count} % 10)) -eq 0 ]; then + echo -n ${count} + else + echo -n "." + fi + count=$((${count} + 1)) + fi + done < $pkgfile + done + echo "]" +} + +copy_packages() { + chrootpkgpath=${CHROOTWD#$BASEDIR} + pkgfile=${WORKDIR}/sortpkg + pkgaddcmd="chroot ${BASEDIR} pkg_add -v" + totpkg=$(wc -l $pkgfile | awk '{print $1}') + echo "Copying ${totpkg} packages" cd ${CHROOTWD} set +e echo -n "[0" count=1 while read pkg; do - # Progress bar if [ $((${count} % 10)) -eq 0 ]; then echo -n ${count} @@ -111,8 +161,15 @@ fi count=$((${count} + 1)) - pkg_create -vb ${pkg} >> ${LOGFILE} 2>&1 - done < ${WORKDIR}/packages + echo "Running pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar" >> ${LOGFILE} + pkg_create -b ${pkg} ${CHROOTWD}/${pkg}.tar >> ${LOGFILE} 2>&1 + + echo "Running $pkgaddcmd ${chrootpkgpath}/${pkg}.tar" >> ${LOGFILE} + $pkgaddcmd ${chrootpkgpath}/${pkg}.tar >> ${LOGFILE} 2>&1 + + rm ${CHROOTWD}/${pkg}.tar + + done < $pkgfile echo "]" set -e } @@ -122,21 +179,6 @@ chroot ${BASEDIR} pkg_delete -a >> ${LOGFILE} 2>&1 } -install_packages() { - cd ${WORKDIR} - totorig=$(wc -l origins | awk '{print $1}') - totpkgs=$(wc -l packages | awk '{print $1}') - echo "Installing ${totorig} packages and their dependencies (${totpkgs} total)" - - export PKG_PATH=${CHROOTWD#$BASEDIR} - set +e - while read pkg; do - echo "-> ${pkg}" - chroot ${BASEDIR} pkg_add -v ${pkg} >> ${LOGFILE} 2>&1 - done < origins - set -e -} - # Deletes workdirs purge_wd() { cd ${LOCALDIR} @@ -148,8 +190,7 @@ echo "Installing packages listed in ${PKGFILE}" find_origins find_deps -create_packages +sort_packages delete_old_packages -install_packages - +copy_packages purge_wd ==== //depot/projects/soc2005/freesbie/scripts/powerpc/iso.sh#6 (text+ko) ==== @@ -5,7 +5,7 @@ # See COPYING for licence terms. # # $FreeBSD$ -# $Id$ +# $Id: iso.sh,v 1.4 2005/11/15 15:11:43 saturnero Exp $ if [ -z "${LOGFILE:-}" ]; then echo "This script can't run standalone." @@ -13,7 +13,7 @@ exit 1 fi -LABEL="FreeSBIE" +FREESBIE_LABEL=${FREESBIE_LABEL:-"FreeSBIE"} echo "#### Building bootable ISO image for ${ARCH} ####" @@ -39,14 +39,14 @@ mkdir -p ${CLONEDIR}/dist mv root.dist.bz2 ${CLONEDIR}/dist/ -echo "/dev/iso9660/${LABEL} / cd9660 rw 0 0" > ${CLONEDIR}/etc/fstab +echo "/dev/iso9660/${FREESBIE_LABEL} / cd9660 rw 0 0" > ${CLONEDIR}/etc/fstab cd ${CLONEDIR} cp ${SRCDIR}/release/powerpc/boot.tbxi boot echo "Running mkisofs..." -mkisofs -hfs-bless boot -map ${SRCDIR}/release/powerpc/hfs.map -r -hfs -part -no-desktop -hfs-volid ${LABEL} -V ${LABEL} -l -J -L -o $ISOPATH . >> ${LOGFILE} 2>&1 +mkisofs -hfs-bless boot -map ${SRCDIR}/release/powerpc/hfs.map -r -hfs -part -no-desktop -hfs-volid ${FREESBIE_LABEL} -V ${FREESBIE_LABEL} -l -J -L -o $ISOPATH . >> ${LOGFILE} 2>&1 echo "ISO created:" From owner-p4-projects@FreeBSD.ORG Tue Dec 13 00:45:48 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C4A316A422; Tue, 13 Dec 2005 00:45:48 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 BFC6F16A41F; Tue, 13 Dec 2005 00:45:47 +0000 (GMT) (envelope-from marcel@xcllnt.net) Received: from ns1.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 451BF43D77; Tue, 13 Dec 2005 00:45:41 +0000 (GMT) (envelope-from marcel@xcllnt.net) Received: from [192.168.4.250] (dhcp50.pn.xcllnt.net [192.168.4.250]) by ns1.xcllnt.net (8.13.4/8.13.4) with ESMTP id jBD0jZY5026437; Mon, 12 Dec 2005 16:45:37 -0800 (PST) (envelope-from marcel@xcllnt.net) In-Reply-To: <200512122158.jBCLwwCt085740@repoman.freebsd.org> References: <200512122158.jBCLwwCt085740@repoman.freebsd.org> Mime-Version: 1.0 (Apple Message framework v746.2) Content-Type: text/plain; charset=US-ASCII; format=flowed Message-Id: <3D3166CC-DBC3-45C1-B78B-5CFE5F57C580@xcllnt.net> Content-Transfer-Encoding: 7bit From: Marcel Moolenaar Date: Mon, 12 Dec 2005 16:45:32 -0800 To: Warner Losh X-Mailer: Apple Mail (2.746.2) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 88102 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: Tue, 13 Dec 2005 00:45:48 -0000 On Dec 12, 2005, at 9:58 PM, Warner Losh wrote: > http://perforce.freebsd.org/chv.cgi?CH=88102 > > Change 88102 by imp@imp_Speedy on 2005/12/12 21:58:35 > > Make uart_subr not depend on ns8250.o This is not such a good change. As the comment says in uart_subr.c, it's just a default. There's nothing PC specific about it. It's the the most common case and therefore a sensible default. Now, if it makes sense to have MD specific defaults and not MI defaults, then it makes sense to have ALL the defaults set in MD code and none in MI code (or if they are set in MI code, they should be set before MD defaults can be set to override the MI defaults). What really needs to be done is add support for the DT tag, so that you can set the device type in the environment.... -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Tue Dec 13 17:24:44 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C402116A423; Tue, 13 Dec 2005 17:24:43 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 98A8116A41F for ; Tue, 13 Dec 2005 17:24:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 467DE43D60 for ; Tue, 13 Dec 2005 17:24:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBDHOhqB070235 for ; Tue, 13 Dec 2005 17:24:43 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBDHOgb5070232 for perforce@freebsd.org; Tue, 13 Dec 2005 17:24:42 GMT (envelope-from imp@freebsd.org) Date: Tue, 13 Dec 2005 17:24:42 GMT Message-Id: <200512131724.jBDHOgb5070232@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 88132 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: Tue, 13 Dec 2005 17:24:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=88132 Change 88132 by imp@imp_Speedy on 2005/12/13 17:24:40 Allow uart_getenv to override defaults Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm92usart.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm92usart.c#5 (text+ko) ==== @@ -50,20 +50,9 @@ return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0); } -#define CONSOLE_USART int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { -#if 0 - /* - * We can't enable this yet since it is ns8250 specific - * at the moment. - */ - /* Check the environment. */ - if (uart_getenv(devtype, di) == 0) - return (0); -#endif -#ifdef CONSOLE_USART di->ops = usart_at91rm92_ops; di->bas.chan = 0; di->bas.bst = &at91rm92_bs_tag; @@ -78,7 +67,10 @@ di->databits = 8; di->stopbits = 1; di->parity = UART_PARITY_NONE; -#endif + /* Check the environment for overrides */ + if (uart_getenv(devtype, di) == 0) + return (0); + uart_bus_space_io = &at91rm92_bs_tag; uart_bus_space_mem = NULL; From owner-p4-projects@FreeBSD.ORG Tue Dec 13 17:24:45 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E162516A425; Tue, 13 Dec 2005 17:24:44 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 CA63216A41F for ; Tue, 13 Dec 2005 17:24:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA91743D5F for ; Tue, 13 Dec 2005 17:24:42 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBDHOgbT070229 for ; Tue, 13 Dec 2005 17:24:42 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBDHOggu070226 for perforce@freebsd.org; Tue, 13 Dec 2005 17:24:42 GMT (envelope-from imp@freebsd.org) Date: Tue, 13 Dec 2005 17:24:42 GMT Message-Id: <200512131724.jBDHOggu070226@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 88131 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: Tue, 13 Dec 2005 17:24:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=88131 Change 88131 by imp@imp_Speedy on 2005/12/13 17:24:06 nits Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_bus_at91rm92usart.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_bus_at91rm92usart.c#3 (text+ko) ==== @@ -72,7 +72,7 @@ sc->sc_sysdev = SLIST_FIRST(&uart_sysdevs); sc->sc_class = &usart_at91rm92_class; bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); - return(uart_bus_probe(dev, 0, 0, 0, 0, 0)); + return (uart_bus_probe(dev, 0, 0, 0, 0, 0)); } From owner-p4-projects@FreeBSD.ORG Tue Dec 13 17:25:46 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD09716A422; Tue, 13 Dec 2005 17:25:45 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 A6DDC16A41F for ; Tue, 13 Dec 2005 17:25:45 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C50243D60 for ; Tue, 13 Dec 2005 17:25:45 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBDHPiTb070362 for ; Tue, 13 Dec 2005 17:25:44 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBDHPii6070359 for perforce@freebsd.org; Tue, 13 Dec 2005 17:25:44 GMT (envelope-from imp@freebsd.org) Date: Tue, 13 Dec 2005 17:25:44 GMT Message-Id: <200512131725.jBDHPii6070359@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 88133 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: Tue, 13 Dec 2005 17:25:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=88133 Change 88133 by imp@imp_Speedy on 2005/12/13 17:25:04 whitespace nits Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91rm92usart.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91rm92usart.c#3 (text+ko) ==== @@ -79,10 +79,8 @@ { uart_setreg(bas, USART_CR, USART_CR_RSTRX | USART_CR_RSTTX); - uart_setreg(bas, USART_CR, - USART_CR_RXEN | USART_CR_TXEN); - uart_setreg(bas, USART_IER, - USART_CSR_TXRDY | USART_CSR_RXRDY); + uart_setreg(bas, USART_CR, USART_CR_RXEN | USART_CR_TXEN); + uart_setreg(bas, USART_IER, USART_CSR_TXRDY | USART_CSR_RXRDY); } static void From owner-p4-projects@FreeBSD.ORG Tue Dec 13 20:50:04 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4580916A422; Tue, 13 Dec 2005 20:50:04 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1BC5516A41F for ; Tue, 13 Dec 2005 20:50:04 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 565EF43D5F for ; Tue, 13 Dec 2005 20:50:03 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBDKo3Si086057 for ; Tue, 13 Dec 2005 20:50:03 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBDKo3Lu086050 for perforce@freebsd.org; Tue, 13 Dec 2005 20:50:03 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 13 Dec 2005 20:50:03 GMT Message-Id: <200512132050.jBDKo3Lu086050@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 88142 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: Tue, 13 Dec 2005 20:50:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=88142 Change 88142 by soc-andrew@soc-andrew_serv on 2005/12/13 20:49:03 Allow boot1 to be used rather than boot0 Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/270_install_bootblocks.lua#2 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/storage.lua#5 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/270_install_bootblocks.lua#2 (text+ko) ==== @@ -21,6 +21,7 @@ local dataset = { disk = raw_name, boot0cfg = "Y", + boot0 = "Y", packet = "N" } @@ -72,6 +73,12 @@ control = "checkbox" }, { + id = "boot0", + name = _("Use boot menu?"), + short_desc = _("Install the boot0 menu bootblock"), + control = "checkbox" + }, + { id = "packet", name = _("Packet mode?"), short_desc = _("Select this to use 'packet mode' to boot the disk"), @@ -109,6 +116,7 @@ if dataset.boot0cfg == "Y" then dd = disk_ref[dataset.disk] dd:cmds_install_bootblock(cmds, + (dataset.boot0 == "Y"), (dataset.packet == "Y")) end end ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/lib/storage.lua#5 (text+ko) ==== @@ -1111,7 +1111,18 @@ -- -- Create commands to install a bootblock on this disk. -- - method.cmds_install_bootblock = function(self, cmds, packet_mode) + method.cmds_install_bootblock = function(self, cmds, use_boot0, packet_mode) + if not use_boot0 then + cmds:add( + { + cmdline = "${root}${YES} | ${root}${FDISK} -B " .. + self:get_raw_device_name(), + failure = CmdChain.FAILURE_WARN, + tag = self + }) + return + end + local o = " " local s = " " From owner-p4-projects@FreeBSD.ORG Tue Dec 13 20:57:14 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A68D16A423; Tue, 13 Dec 2005 20:57:13 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 3A50316A420 for ; Tue, 13 Dec 2005 20:57:13 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E128543D78 for ; Tue, 13 Dec 2005 20:57:12 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBDKvCVi086320 for ; Tue, 13 Dec 2005 20:57:12 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBDKvCga086317 for perforce@freebsd.org; Tue, 13 Dec 2005 20:57:12 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 13 Dec 2005 20:57:12 GMT Message-Id: <200512132057.jBDKvCga086317@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 88143 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: Tue, 13 Dec 2005 20:57:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=88143 Change 88143 by soc-andrew@soc-andrew_serv on 2005/12/13 20:56:51 Remove unused options from the Select Task menu Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/base/Makefile#3 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/base/Makefile#3 (text+ko) ==== @@ -1,7 +1,6 @@ NOOBJ= -FILES= 200_install.lua 400_configure.lua 600_upgrade.lua \ - 800_netboot.lua 950_reboot.lua main.lua +FILES= 200_install.lua 400_configure.lua 950_reboot.lua main.lua FILESDIR= ${INST_DIR} From owner-p4-projects@FreeBSD.ORG Tue Dec 13 20:58:24 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9C5416A422; Tue, 13 Dec 2005 20:58:23 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 C35B916A41F for ; Tue, 13 Dec 2005 20:58:23 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5851043D68 for ; Tue, 13 Dec 2005 20:58:15 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBDKwEaS086364 for ; Tue, 13 Dec 2005 20:58:14 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBDKwEKE086358 for perforce@freebsd.org; Tue, 13 Dec 2005 20:58:14 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 13 Dec 2005 20:58:14 GMT Message-Id: <200512132058.jBDKwEKE086358@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 88144 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: Tue, 13 Dec 2005 20:58:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=88144 Change 88144 by soc-andrew@soc-andrew_serv on 2005/12/13 20:57:51 Remove two references to /README that imply there are install instructions there. Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/200_select_disk.lua#3 edit .. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#6 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/200_select_disk.lua#3 (text+ko) ==== @@ -20,7 +20,7 @@ "computer. If you wish to install %s" .. " on an unorthodox storage device, you will have to " .. "exit to a %s command prompt and install it " .. - "manually, using the file /README as a guide.", + "manually.", App.conf.product.name, App.conf.media_name) ) return nil ==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#6 (text+ko) ==== @@ -1,6 +1,6 @@ NOOBJ= -FILES= 100_welcome.lua 200_select_disk.lua 220_format_disk.lua \ +FILES= 200_select_disk.lua 220_format_disk.lua \ 250_partition_disk.lua 270_install_bootblocks.lua \ 300_select_part.lua 400_select_subparts.lua \ 405_warn_omitted_subparts.lua 407_create_subparts.lua \ From owner-p4-projects@FreeBSD.ORG Tue Dec 13 21:04:23 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7244216A422; Tue, 13 Dec 2005 21:04:23 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1C91516A41F for ; Tue, 13 Dec 2005 21:04:23 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98AD943D55 for ; Tue, 13 Dec 2005 21:04:22 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBDL4Mq5086621 for ; Tue, 13 Dec 2005 21:04:22 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBDL4MK8086618 for perforce@freebsd.org; Tue, 13 Dec 2005 21:04:22 GMT (envelope-from peter@freebsd.org) Date: Tue, 13 Dec 2005 21:04:22 GMT Message-Id: <200512132104.jBDL4MK8086618@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 88145 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: Tue, 13 Dec 2005 21:04:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=88145 Change 88145 by peter@peter_daintree on 2005/12/13 21:03:28 IFC @88141 Affected files ... .. //depot/projects/hammer/bin/setfacl/setfacl.1#8 integrate .. //depot/projects/hammer/lib/libarchive/tar.5#11 integrate .. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#19 integrate .. //depot/projects/hammer/lib/libc/sys/aio_read.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/aio_write.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/lio_listio.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/mq_notify.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/sigaction.2#13 integrate .. //depot/projects/hammer/lib/libc/sys/sigqueue.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/sigwaitinfo.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/timer_create.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/timer_settime.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/wait.2#8 integrate .. //depot/projects/hammer/lib/msun/src/s_cbrt.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_cbrtf.c#3 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#50 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#47 integrate .. //depot/projects/hammer/share/man/man3/Makefile#12 integrate .. //depot/projects/hammer/share/man/man3/siginfo.3#1 branch .. //depot/projects/hammer/share/man/man9/bus_dma.9#22 integrate .. //depot/projects/hammer/share/man/man9/namei.9#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#62 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#26 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#59 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#2 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#22 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#30 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#26 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#69 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#33 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#46 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#21 integrate .. //depot/projects/hammer/usr.sbin/lmcconfig/lmcconfig.8#3 integrate Differences ... ==== //depot/projects/hammer/bin/setfacl/setfacl.1#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.13 2005/02/09 17:37:39 ru Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.14 2005/12/13 17:07:52 ru Exp $ .\" .Dd January 7, 2001 .Dt SETFACL 1 @@ -252,7 +252,7 @@ .Pp Remove the group mail ACL entry containing read/write permissions from -.Pa file. +.Pa file . .Pp .Dl setfacl -bn file .Pp ==== //depot/projects/hammer/lib/libarchive/tar.5#11 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/tar.5,v 1.12 2005/06/15 19:04:03 ru Exp $ +.\" $FreeBSD: src/lib/libarchive/tar.5,v 1.13 2005/12/13 17:07:52 ru Exp $ .\" .Dd May 20, 2004 .Dt TAR 5 @@ -591,7 +591,7 @@ .It Va atime , Va ctime The time the file was last accessed and the time of last change of file information, stored in octal as with -.Va mtime. +.Va mtime . .It Va longnames This field is apparently no longer used. .It Sparse Va offset / Va numbytes ==== //depot/projects/hammer/lib/libc/stdio/vfprintf.c#19 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.70 2005/07/24 12:12:44 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.71 2005/12/13 13:23:27 phk Exp $"); /* * Actual printf innards. @@ -528,8 +528,8 @@ static char zeroes[PADSIZE] = {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'}; - static const char xdigs_lower[16] = "0123456789abcdef"; - static const char xdigs_upper[16] = "0123456789ABCDEF"; + static const char xdigs_lower[17] = "0123456789abcdef?"; + static const char xdigs_upper[17] = "0123456789ABCDEF?"; /* * BEWARE, these `goto error' on error, and PAD uses `n'. ==== //depot/projects/hammer/lib/libc/sys/aio_read.2#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/aio_read.2,v 1.21 2004/07/03 22:30:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/aio_read.2,v 1.23 2005/12/13 13:43:35 davidxu Exp $ .\" .Dd November 17, 1998 .Dt AIO_READ 2 @@ -192,6 +192,7 @@ .Xr aio_suspend 2 , .Xr aio_waitcomplete 2 , .Xr aio_write 2 , +.Xr siginfo 3 , .Xr aio 4 .Sh STANDARDS The ==== //depot/projects/hammer/lib/libc/sys/aio_write.2#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/aio_write.2,v 1.18 2004/07/03 22:30:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/aio_write.2,v 1.20 2005/12/13 13:43:35 davidxu Exp $ .\" .Dd June 2, 1999 .Dt AIO_WRITE 2 @@ -187,6 +187,7 @@ .Xr aio_return 2 , .Xr aio_suspend 2 , .Xr aio_waitcomplete 2 , +.Xr siginfo 3 , .Xr aio 4 .Sh STANDARDS The ==== //depot/projects/hammer/lib/libc/sys/lio_listio.2#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/lio_listio.2,v 1.3 2005/12/03 09:00:43 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/lio_listio.2,v 1.5 2005/12/13 13:43:35 davidxu Exp $ .\" .Dd January 12, 2003 .Dt LIO_LISTIO 2 @@ -166,6 +166,7 @@ .Xr aio_write 2 , .Xr read 2 , .Xr write 2 , +.Xr siginfo 3 , .Xr aio 4 .Sh STANDARDS The ==== //depot/projects/hammer/lib/libc/sys/mq_notify.2#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/mq_notify.2,v 1.6 2005/12/06 09:52:54 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/sys/mq_notify.2,v 1.7 2005/12/13 03:05:58 davidxu Exp $ .\" .Dd November 29, 2005 .Dt MQ_NOTIFY 2 @@ -117,7 +117,8 @@ .Sh SEE ALSO .Xr mq_open 2 , .Xr mq_send 2 , -.Xr mq_timedsend 2 +.Xr mq_timedsend 2 , +.Xr siginfo 3 .Sh STANDARDS The .Fn mq_notify ==== //depot/projects/hammer/lib/libc/sys/sigaction.2#13 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)sigaction.2 8.2 (Berkeley) 4/3/94 -.\" $FreeBSD: src/lib/libc/sys/sigaction.2,v 1.56 2005/01/20 09:17:05 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/sigaction.2,v 1.57 2005/12/13 03:05:58 davidxu Exp $ .\" .Dd June 7, 2004 .Dt SIGACTION 2 @@ -618,6 +618,7 @@ .Xr wait 2 , .Xr fpsetmask 3 , .Xr setjmp 3 , +.Xr siginfo 3 , .Xr siginterrupt 3 , .Xr sigsetops 3 , .Xr ucontext 3 , ==== //depot/projects/hammer/lib/libc/sys/sigqueue.2#4 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/sigqueue.2,v 1.5 2005/11/30 04:15:44 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/sys/sigqueue.2,v 1.7 2005/12/13 13:43:35 davidxu Exp $ .\" .Dd November 11, 2005 .Dt SIGQUEUE 2 @@ -135,6 +135,7 @@ .Xr sigwaitinfo 2 , .Xr pause 3 , .Xr pthread_sigmask 3 +.Xr siginfo 3 .Sh STANDARDS The .Fn sigqueue ==== //depot/projects/hammer/lib/libc/sys/sigwaitinfo.2#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/sigwaitinfo.2,v 1.5 2005/11/18 11:53:23 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/sigwaitinfo.2,v 1.7 2005/12/13 13:43:35 davidxu Exp $ .\" .Dd November 11, 2005 .Dt SIGTIMEDWAIT 2 @@ -188,7 +188,8 @@ .Xr sigsuspend 2 , .Xr sigwait 2 , .Xr pause 3 , -.Xr pthread_sigmask 3 +.Xr pthread_sigmask 3 , +.Xr siginfo 3 .Sh STANDARDS The .Fn sigtimedwait ==== //depot/projects/hammer/lib/libc/sys/timer_create.2#4 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/timer_create.2,v 1.5 2005/11/30 04:15:44 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/sys/timer_create.2,v 1.7 2005/12/13 13:43:35 davidxu Exp $ .\" .Dd September 11, 2000 .Dt TIMER_CREATE 2 @@ -150,7 +150,8 @@ .Sh SEE ALSO .Xr clock_getres 2 , .Xr timer_delete 2 , -.Xr timer_getoverun 2 +.Xr timer_getoverun 2 , +.Xr siginfo 3 .Sh STANDARDS The .Fn timer_create ==== //depot/projects/hammer/lib/libc/sys/timer_settime.2#4 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/timer_settime.2,v 1.4 2005/11/30 04:15:44 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/sys/timer_settime.2,v 1.6 2005/12/13 13:43:35 davidxu Exp $ .\" .Dd September 11, 2000 .Dt TIMER_SETTIME 2 @@ -248,7 +248,8 @@ .El .Sh SEE ALSO .Xr clock_getres 2 , -.Xr timer_create 2 +.Xr timer_create 2 , +.Xr siginfo 3 .Sh STANDARDS The .Fn timer_getoverrun , ==== //depot/projects/hammer/lib/libc/sys/wait.2#8 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)wait.2 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/sys/wait.2,v 1.24 2005/11/17 13:00:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/wait.2,v 1.26 2005/12/13 13:43:35 davidxu Exp $ .\" .Dd November 12, 2005 .Dt WAIT 2 @@ -322,7 +322,8 @@ .Xr _exit 2 , .Xr ptrace 2 , .Xr sigaction 2 , -.Xr exit 3 +.Xr exit 3 , +.Xr siginfo 3 .Sh STANDARDS The .Fn wait ==== //depot/projects/hammer/lib/msun/src/s_cbrt.c#3 (text+ko) ==== @@ -8,10 +8,12 @@ * software is freely granted, provided that this notice * is preserved. * ==================================================== + * + * Optimized by Bruce D. Evans. */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cbrt.c,v 1.8 2005/12/11 19:51:30 bde Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cbrt.c,v 1.10 2005/12/13 20:17:23 bde Exp $"; #endif #include "math.h" @@ -47,7 +49,6 @@ if((hx|low)==0) return(x); /* cbrt(0) is itself */ - SET_HIGH_WORD(x,hx); /* x <- |x| */ /* * Rough cbrt to 5 bits: * cbrt(2**e*(1+m) ~= 2**(e/3)*(1+(e%3+m)/3) @@ -63,19 +64,20 @@ * subtraction virtually to keep e >= 0 so that ordinary integer * division rounds towards minus infinity; this is also efficient. */ - if(hx<0x00100000) /* subnormal number */ - {SET_HIGH_WORD(t,0x43500000); /* set t= 2**54 */ - t*=x; GET_HIGH_WORD(high,t); SET_HIGH_WORD(t,high/3+B2); - } - else - SET_HIGH_WORD(t,hx/3+B1); + if(hx<0x00100000) { /* subnormal number */ + SET_HIGH_WORD(t,0x43500000); /* set t= 2**54 */ + t*=x; + GET_HIGH_WORD(high,t); + SET_HIGH_WORD(t,sign|((high&0x7fffffff)/3+B2)); + } else + SET_HIGH_WORD(t,sign|(hx/3+B1)); /* new cbrt to 23 bits; may be implemented in single precision */ r=t*t/x; s=C+r*t; t*=G+F/(s+E+D/s); - /* chop t to 20 bits and make it larger than cbrt(x) */ + /* chop t to 20 bits and make it larger in magnitude than cbrt(x) */ GET_HIGH_WORD(high,t); INSERT_WORDS(t,high+0x00000001,0); @@ -86,8 +88,5 @@ r=(r-t)/(w+r); /* r-t is exact */ t=t+t*r; - /* restore the sign bit */ - GET_HIGH_WORD(high,t); - SET_HIGH_WORD(t,high|sign); return(t); } ==== //depot/projects/hammer/lib/msun/src/s_cbrtf.c#3 (text+ko) ==== @@ -1,6 +1,6 @@ /* s_cbrtf.c -- float version of s_cbrt.c. * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com. - * Debugged by Bruce D. Evans. + * Debugged and optimized by Bruce D. Evans. */ /* @@ -15,7 +15,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cbrtf.c,v 1.10 2005/12/11 19:51:30 bde Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/msun/src/s_cbrtf.c,v 1.12 2005/12/13 20:17:23 bde Exp $"; #endif #include "math.h" @@ -50,21 +50,21 @@ if(hx==0) return(x); /* cbrt(0) is itself */ - SET_FLOAT_WORD(x,hx); /* x <- |x| */ /* rough cbrt to 5 bits */ - if(hx<0x00800000) /* subnormal number */ - {SET_FLOAT_WORD(t,0x4b800000); /* set t= 2**24 */ - t*=x; GET_FLOAT_WORD(high,t); SET_FLOAT_WORD(t,high/3+B2); - } - else - SET_FLOAT_WORD(t,hx/3+B1); + if(hx<0x00800000) { /* subnormal number */ + SET_FLOAT_WORD(t,0x4b800000); /* set t= 2**24 */ + t*=x; + GET_FLOAT_WORD(high,t); + SET_FLOAT_WORD(t,sign|((high&0x7fffffff)/3+B2)); + } else + SET_FLOAT_WORD(t,sign|(hx/3+B1)); /* new cbrt to 23 bits */ r=t*t/x; s=C+r*t; t*=G+F/(s+E+D/s); - /* chop t to 12 bits and make it larger than cbrt(x) */ + /* chop t to 12 bits and make it larger in magnitude than cbrt(x) */ GET_FLOAT_WORD(high,t); SET_FLOAT_WORD(t,(high&0xfffff000)+0x00001000); @@ -75,8 +75,5 @@ r=(r-t)/(w+r); /* r-t is exact */ t=t+t*r; - /* restore the sign bit */ - GET_FLOAT_WORD(high,t); - SET_FLOAT_WORD(t,high|sign); return(t); } ==== //depot/projects/hammer/sbin/ipfw/ipfw.8#50 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.180 2005/11/29 15:25:08 ume Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.181 2005/12/13 17:07:52 ru Exp $ .\" .Dd August 13, 2005 .Dt IPFW 8 @@ -1587,7 +1587,7 @@ and .Cm limit options of -.Nm rules. +.Nm rules . .Pp Dynamic rules are created when a packet matches a .Cm keep-state ==== //depot/projects/hammer/sbin/ipfw/ipfw2.c#47 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.81 2005/12/09 13:03:30 glebius Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.82 2005/12/13 12:16:02 glebius Exp $ */ #include @@ -420,6 +420,8 @@ { NULL, 0 } /* terminator */ }; +#define TABLEARG "tablearg" + static __inline uint64_t align_uint64(uint64_t *pll) { uint64_t ret; @@ -1457,33 +1459,28 @@ print_unreach6_code(cmd->arg1); break; - case O_SKIPTO: - printf("skipto %u", cmd->arg1); +#define PRINT_WITH_ARG(o) \ + if (cmd->arg1 == IP_FW_TABLEARG) \ + printf("%s tablearg", (o)); \ + else \ + printf("%s %u", (o), cmd->arg1); \ break; + case O_SKIPTO: + PRINT_WITH_ARG("skipto"); case O_PIPE: - printf("pipe %u", cmd->arg1); - break; - + PRINT_WITH_ARG("pipe"); case O_QUEUE: - printf("queue %u", cmd->arg1); - break; - + PRINT_WITH_ARG("queue"); case O_DIVERT: - printf("divert %u", cmd->arg1); - break; - + PRINT_WITH_ARG("divert"); case O_TEE: - printf("tee %u", cmd->arg1); - break; - + PRINT_WITH_ARG("tee"); case O_NETGRAPH: - printf("netgraph %u", cmd->arg1); - break; - + PRINT_WITH_ARG("netgraph"); case O_NGTEE: - printf("ngtee %u", cmd->arg1); - break; + PRINT_WITH_ARG("ngtee"); +#undef PRINT_WITH_ARG case O_FORWARD_IP: { @@ -3863,26 +3860,36 @@ break; case TOK_QUEUE: + action->opcode = O_QUEUE; + goto chkarg; case TOK_PIPE: - action->len = F_INSN_SIZE(ipfw_insn); + action->opcode = O_PIPE; + goto chkarg; case TOK_SKIPTO: - if (i == TOK_QUEUE) - action->opcode = O_QUEUE; - else if (i == TOK_PIPE) - action->opcode = O_PIPE; - else if (i == TOK_SKIPTO) - action->opcode = O_SKIPTO; - NEED1("missing skipto/pipe/queue number"); - action->arg1 = strtoul(*av, NULL, 10); - av++; ac--; - break; - + action->opcode = O_SKIPTO; + goto chkarg; + case TOK_NETGRAPH: + action->opcode = O_NETGRAPH; + goto chkarg; + case TOK_NGTEE: + action->opcode = O_NGTEE; + goto chkarg; case TOK_DIVERT: + action->opcode = O_DIVERT; + goto chkarg; case TOK_TEE: - action->opcode = (i == TOK_DIVERT) ? O_DIVERT : O_TEE; - NEED1("missing divert/tee port"); - action->arg1 = strtoul(*av, NULL, 0); - if (action->arg1 == 0) { + action->opcode = O_TEE; +chkarg: + if (!ac) + errx(EX_USAGE, "missing argument for %s", *(av - 1)); + if (isdigit(**av)) { + action->arg1 = strtoul(*av, NULL, 10); + if (action->arg1 <= 0 || action->arg1 >= IP_FW_TABLEARG) + errx(EX_DATAERR, "illegal argument for %s", + *(av - 1)); + } else if (_substrcmp(*av, TABLEARG) == 0) { + action->arg1 = IP_FW_TABLEARG; + } else if (i == TOK_DIVERT || i == TOK_TEE) { struct servent *s; setservent(1); s = getservbyname(av[0], "divert"); @@ -3890,17 +3897,8 @@ action->arg1 = ntohs(s->s_port); else errx(EX_DATAERR, "illegal divert/tee port"); - } - ac--; av++; - break; - - case TOK_NETGRAPH: - case TOK_NGTEE: - action->opcode = (i == TOK_NETGRAPH ) ? O_NETGRAPH : O_NGTEE; - NEED1("missing netgraph cookie"); - action->arg1 = strtoul(*av, NULL, 0); - if (action->arg1 == 0) - errx(EX_DATAERR, "illegal netgraph cookie"); + } else + errx(EX_DATAERR, "illegal argument for %s", *(av - 1)); ac--; av++; break; ==== //depot/projects/hammer/share/man/man3/Makefile#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 12/13/93 -# $FreeBSD: src/share/man/man3/Makefile,v 1.36 2005/05/18 16:23:11 keramida Exp $ +# $FreeBSD: src/share/man/man3/Makefile,v 1.37 2005/12/13 00:28:09 davidxu Exp $ MAN= assert.3 \ bitstring.3 \ @@ -8,6 +8,7 @@ intro.3 \ ${PTHREAD_MAN} \ queue.3 \ + siginfo.3 \ stdarg.3 \ sysexits.3 \ tgmath.3 \ ==== //depot/projects/hammer/share/man/man9/bus_dma.9#22 (text+ko) ==== @@ -57,7 +57,7 @@ .\" 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/bus_dma.9,v 1.30 2005/12/05 23:25:59 scottl Exp $ +.\" $FreeBSD: src/share/man/man9/bus_dma.9,v 1.31 2005/12/13 17:07:52 ru Exp $ .\" $NetBSD: bus_dma.9,v 1.25 2002/10/14 13:43:16 wiz Exp $ .\" .Dd December 5, 2005 @@ -337,7 +337,7 @@ for byte alignment. Hardware requiring DMA transfers to start on a multiple of 4K would specify -.Em 4096. +.Em 4096 . .It Fa boundary Boundary constraint, in bytes, of the target DMA memory region. The boundary indicates the set of addresses, all multiples of the @@ -376,7 +376,7 @@ map memory into the window described by .Fa lowaddr and -.Fa highaddr. +.Fa highaddr . A filter function is only required when the single window described by .Fa lowaddr @@ -496,7 +496,7 @@ .Bl -tag -width buflen -compact .It Fa dmat DMA tag used to allocate -.Fa map. +.Fa map . .It Fa map A DMA map without a currently active mapping. .It Fa buf ==== //depot/projects/hammer/share/man/man9/namei.9#8 (text+ko) ==== @@ -31,7 +31,7 @@ .\" If you integrate this manpage in another OS, I'd appreciate a note .\" - eivind@FreeBSD.org .\" -.\" $FreeBSD: src/share/man/man9/namei.9,v 1.28 2005/11/18 10:52:24 ru Exp $ +.\" $FreeBSD: src/share/man/man9/namei.9,v 1.29 2005/12/13 17:07:52 ru Exp $ .\" .Dd September 21, 2005 .Os @@ -82,7 +82,7 @@ in which case the caller must later release .Va Giant based on the results of -.Fn NDHASGIANT. +.Fn NDHASGIANT . .Pp The .Fn NDINIT ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#62 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.20 2005/12/08 18:33:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.22 2005/12/13 18:29:09 jhb Exp $"); #include "opt_hwpmc_hooks.h" ==== //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#26 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.130 2005/08/28 13:11:08 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.131 2005/12/13 15:32:52 delphij Exp $"); #include #include @@ -806,22 +806,22 @@ } case LINUX_TCFLSH: { - args->cmd = TIOCFLUSH; + int val; switch (args->arg) { case LINUX_TCIFLUSH: - args->arg = FREAD; + val = FREAD; break; case LINUX_TCOFLUSH: - args->arg = FWRITE; + val = FWRITE; break; case LINUX_TCIOFLUSH: - args->arg = FREAD | FWRITE; + val = FREAD | FWRITE; break; default: fdrop(fp, td); return (EINVAL); } - error = (ioctl(td, (struct ioctl_args *)args)); + error = (fo_ioctl(fp,TIOCFLUSH,(caddr_t)&val,td->td_ucred,td)); break; } ==== //depot/projects/hammer/sys/dev/bge/if_bge.c#59 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.103 2005/12/08 16:11:45 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.104 2005/12/13 06:14:14 marcel Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -3750,10 +3750,8 @@ * periods of heavy traffic. (There should be no * effect on copper NICs.) */ - if (sc->bge_tbi) status = CSR_READ_4(sc, BGE_MAC_STS); - - if (!sc->bge_tbi || !(status & (BGE_MACSTAT_PORT_DECODE_ERROR | - BGE_MACSTAT_MI_COMPLETE))) { + if (!sc->bge_tbi || ((status = CSR_READ_4(sc, BGE_MAC_STS)) & + (BGE_MACSTAT_PORT_DECODE_ERROR | BGE_MACSTAT_MI_COMPLETE)) == 0) { sc->bge_link = 0; callout_stop(&sc->bge_stat_ch); bge_tick_locked(sc); ==== //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#2 (text+ko) ==== @@ -118,20 +118,8 @@ #define NBPC PAGE_SIZE /* Number of bytes per click */ #define BPCSHIFT PAGE_SHIFT /* LOG2(NBPC) if exact */ -/* - * Size of block device i/o is parameterized here. - * Currently the system supports page-sized i/o. - */ -#define BLKDEV_IOSHIFT BPCSHIFT -#ifndef BLKDEV_IOSIZE -#define BLKDEV_IOSIZE (1<>BPCSHIFT) ==== //depot/projects/hammer/sys/i386/i386/local_apic.c#22 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.22 2005/12/05 22:39:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.24 2005/12/13 18:29:10 jhb Exp $"); #include "opt_hwpmc_hooks.h" ==== //depot/projects/hammer/sys/i386/isa/clock.c#30 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.224 2005/11/09 03:55:40 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.225 2005/12/13 19:08:55 peter Exp $"); /* * Routines to handle clock hardware. @@ -64,6 +64,7 @@ #include #include #include +#include #include #include #include @@ -288,7 +289,21 @@ int getit_calls = 1; int n1; static int state = 0; +#endif + if (tsc_freq != 0 && !tsc_is_broken) { + uint64_t start, end, now; + + sched_pin(); + start = rdtsc(); + end = start + (tsc_freq * n) / 1000000; + do { + now = rdtsc(); + } while (now < end || (now > start && end < start)); + sched_unpin(); + return; + } +#ifdef DELAYDEBUG if (state == 0) { state = 1; for (n1 = 1; n1 <= 10000000; n1 *= 10) ==== //depot/projects/hammer/sys/netinet/ip_fw.h#26 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.102 2005/11/29 08:59:41 glebius Exp $ + * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.103 2005/12/13 12:16:02 glebius Exp $ */ #ifndef _IPFW2_H @@ -461,6 +461,8 @@ ipfw_table_entry ent[0]; /* entries */ } ipfw_table; +#define IP_FW_TABLEARG 65535 + /* * Main firewall chains definitions and global var's definitions. */ ==== //depot/projects/hammer/sys/netinet/ip_fw2.c#69 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.118 2005/12/06 10:45:49 glebius Exp $ + * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.119 2005/12/13 12:16:03 glebius Exp $ */ #define DEB(x) @@ -2383,9 +2383,9 @@ * Now scan the rules, and parse microinstructions for each rule. */ for (; f; f = f->next) { - int l, cmdlen; ipfw_insn *cmd; - int skip_or; /* skip rest of OR block */ + uint32_t tablearg = 0; + int l, cmdlen, skip_or; /* skip rest of OR block */ again: if (set_disable & (1 << f->set) ) @@ -2548,6 +2548,8 @@ if (cmdlen == F_INSN_SIZE(ipfw_insn_u32)) match = ((ipfw_insn_u32 *)cmd)->d[0] == v; + else + tablearg = v; } break; @@ -2999,7 +3001,10 @@ case O_PIPE: case O_QUEUE: args->rule = f; /* report matching rule */ - args->cookie = cmd->arg1; + if (cmd->arg1 == IP_FW_TABLEARG) + args->cookie = tablearg; + else + args->cookie = cmd->arg1; retval = IP_FW_DUMMYNET; goto done; @@ -3020,7 +3025,10 @@ } dt = (struct divert_tag *)(mtag+1); dt->cookie = f->rulenum; - dt->info = cmd->arg1; + if (cmd->arg1 == IP_FW_TABLEARG) + dt->info = tablearg; + else + dt->info = cmd->arg1; m_tag_prepend(m, mtag); retval = (cmd->opcode == O_DIVERT) ? IP_FW_DIVERT : IP_FW_TEE; @@ -3085,7 +3093,10 @@ case O_NETGRAPH: case O_NGTEE: args->rule = f; /* report matching rule */ - args->cookie = cmd->arg1; + if (cmd->arg1 == IP_FW_TABLEARG) + args->cookie = tablearg; + else + args->cookie = cmd->arg1; retval = (cmd->opcode == O_NETGRAPH) ? IP_FW_NETGRAPH : IP_FW_NGTEE; goto done; ==== //depot/projects/hammer/sys/nfsclient/nfs_socket.c#33 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.133 2005/11/21 19:25:24 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.134 2005/12/12 23:18:05 ps Exp $"); /* * Socket operations for use by nfs @@ -523,17 +523,6 @@ return (error); } -static __inline int -nfs_cantrecvmore(struct socket *so) -{ - int ret; - - SOCKBUF_LOCK(&so->so_rcv); - ret = (so->so_rcv.sb_state & SBS_CANTRCVMORE); - SOCKBUF_UNLOCK(&so->so_rcv); - return ret; -} - int nfs_reply(struct nfsreq *rep) { @@ -563,7 +552,7 @@ } so = rep->r_nmp->nm_so; mtx_lock(&rep->r_nmp->nm_nfstcpstate.mtx); - if (!so || nfs_cantrecvmore(so) || + if (!so || (rep->r_nmp->nm_nfstcpstate.flags & NFS_TCP_FORCE_RECONNECT)) { mtx_unlock(&rep->r_nmp->nm_nfstcpstate.mtx); error = nfs_reconnect(rep); @@ -767,7 +756,7 @@ SOCKBUF_LOCK(&so->so_rcv); retval = (so->so_rcv.sb_cc >= (bytes) || - (so->so_state & SBS_CANTRCVMORE) || + (so->so_rcv.sb_state & SBS_CANTRCVMORE) || so->so_error); SOCKBUF_UNLOCK(&so->so_rcv); return (retval); ==== //depot/projects/hammer/sys/vm/vm_page.c#46 (text+ko) ==== @@ -97,7 +97,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.308 2005/11/08 06:33:21 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.309 2005/12/13 19:59:09 alc Exp $"); #include #include @@ -1012,6 +1012,8 @@ struct vpgqueues *pq; mtx_assert(&vm_page_queue_mtx, MA_OWNED); + KASSERT(!pmap_page_is_mapped(m), + ("vm_page_free_toq: freeing mapped page %p", m)); cnt.v_tfree++; if (m->busy || ((m->queue - m->pc) == PQ_FREE)) { ==== //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#21 (text+ko) ==== @@ -26,7 +26,7 @@ # (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/tools/tools/tinderbox/tinderbox.pl,v 1.44 2005/11/14 12:59:10 des Exp $ +# $FreeBSD: src/tools/tools/tinderbox/tinderbox.pl,v 1.45 2005/12/13 17:51:56 des Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 13 21:56:27 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06DA216A422; Tue, 13 Dec 2005 21:56:27 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 D4D8816A41F for ; Tue, 13 Dec 2005 21:56:26 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 995AB43D5E for ; Tue, 13 Dec 2005 21:56:26 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBDLuQmO088932 for ; Tue, 13 Dec 2005 21:56:26 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBDLuQdg088929 for perforce@freebsd.org; Tue, 13 Dec 2005 21:56:26 GMT (envelope-from jhb@freebsd.org) Date: Tue, 13 Dec 2005 21:56:26 GMT Message-Id: <200512132156.jBDLuQdg088929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 88148 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: Tue, 13 Dec 2005 21:56:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=88148 Change 88148 by jhb@jhb_slimer on 2005/12/13 21:55:37 Misc cleanups and one more test case. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#113 edit .. //depot/projects/smpng/sys/kern/kern_sx.c#29 edit .. //depot/projects/smpng/sys/modules/crash/crash.c#24 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#113 (text+ko) ==== @@ -990,6 +990,7 @@ db_printf(", RECURSE"); if (m->mtx_object.lo_flags & LO_DUPOK) db_printf(", DUPOK"); + db_printf("}\n"); db_printf(" state: {"); if (mtx_unowned(m)) db_printf("UNOWNED"); ==== //depot/projects/smpng/sys/kern/kern_sx.c#29 (text+ko) ==== @@ -393,12 +393,12 @@ db_printf(" state: "); if (sx->sx_cnt < 0) { td = sx->sx_xholder; - db_printf(" XLOCK: %p (tid %d, pid %d, \"%s\")\n", td, + db_printf("XLOCK: %p (tid %d, pid %d, \"%s\")\n", td, td->td_tid, td->td_proc->p_pid, td->td_proc->p_comm); } else if (sx->sx_cnt > 0) - db_printf(" SLOCK: %d locks\n", sx->sx_cnt); + db_printf("SLOCK: %d locks\n", sx->sx_cnt); else - db_printf(" UNLOCKED\n"); + db_printf("UNLOCKED\n"); db_printf(" waiters: %d shared, %d exclusive\n", sx->sx_shrd_wcnt, sx->sx_excl_wcnt); } ==== //depot/projects/smpng/sys/modules/crash/crash.c#24 (text+ko) ==== @@ -89,6 +89,9 @@ mtx_lock(&test_mtx); kdb_enter("test_mtx locked"); + mtx_lock(&test_mtx); + kdb_enter("test_mtx recursed"); + mtx_unlock(&test_mtx); mtx_unlock(&test_mtx); sx_slock(&foo); kdb_enter("foo slocked"); From owner-p4-projects@FreeBSD.ORG Tue Dec 13 22:03:47 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A1D216A422; Tue, 13 Dec 2005 22:03:46 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 7364916A41F for ; Tue, 13 Dec 2005 22:03:46 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0657643D4C for ; Tue, 13 Dec 2005 22:03:35 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBDM3Zr0089254 for ; Tue, 13 Dec 2005 22:03:35 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBDM3ZKL089251 for perforce@freebsd.org; Tue, 13 Dec 2005 22:03:35 GMT (envelope-from jhb@freebsd.org) Date: Tue, 13 Dec 2005 22:03:35 GMT Message-Id: <200512132203.jBDM3ZKL089251@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 88149 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: Tue, 13 Dec 2005 22:03:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=88149 Change 88149 by jhb@jhb_slimer on 2005/12/13 22:03:04 Bah, use Giant since it allows recursion and might even have MTX_CONTESTED set if we are lucky. Affected files ... .. //depot/projects/smpng/sys/modules/crash/crash.c#25 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash/crash.c#25 (text+ko) ==== @@ -87,12 +87,12 @@ ddblock_test(void) { - mtx_lock(&test_mtx); - kdb_enter("test_mtx locked"); - mtx_lock(&test_mtx); - kdb_enter("test_mtx recursed"); - mtx_unlock(&test_mtx); - mtx_unlock(&test_mtx); + mtx_lock(&Giant); + kdb_enter("Giant locked"); + mtx_lock(&Giant); + kdb_enter("Giant recursed"); + mtx_unlock(&Giant); + mtx_unlock(&Giant); sx_slock(&foo); kdb_enter("foo slocked"); sx_sunlock(&foo); From owner-p4-projects@FreeBSD.ORG Tue Dec 13 22:08:43 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEDA516A422; Tue, 13 Dec 2005 22:08:42 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 C7E3216A41F for ; Tue, 13 Dec 2005 22:08:42 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64F7C43D58 for ; Tue, 13 Dec 2005 22:08:42 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBDM8ggs089488 for ; Tue, 13 Dec 2005 22:08:42 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBDM8fNW089485 for perforce@freebsd.org; Tue, 13 Dec 2005 22:08:41 GMT (envelope-from jhb@freebsd.org) Date: Tue, 13 Dec 2005 22:08:41 GMT Message-Id: <200512132208.jBDM8fNW089485@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 88150 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: Tue, 13 Dec 2005 22:08:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=88150 Change 88150 by jhb@jhb_slimer on 2005/12/13 22:07:42 - Add a notion of a command_table to ddb where a table contains not just an array of commands, but also an optional linker set of additional commands. - Add a helper function db_match_cmd() to cut down on code duplication in db_cmd_search(). Fix a bug that could cause some added commands in a linker set to be ignored. Affected files ... .. //depot/projects/smpng/sys/ddb/db_command.c#26 edit .. //depot/projects/smpng/sys/ddb/ddb.h#19 edit Differences ... ==== //depot/projects/smpng/sys/ddb/db_command.c#26 (text+ko) ==== @@ -83,15 +83,25 @@ { (char *)0 } }; +static struct command_table db_show_all_table = { + db_show_all_cmds +}; + static struct command db_show_cmds[] = { - { "all", 0, 0, db_show_all_cmds }, + { "all", 0, 0, &db_show_all_table }, { "registers", db_show_regs, 0, 0 }, { "breaks", db_listbreak_cmd, 0, 0 }, { "threads", db_show_threads, 0, 0 }, { (char *)0, } }; -static struct command db_command_table[] = { +static struct command_table db_show_table = { + db_show_cmds, + SET_BEGIN(db_show_cmd_set), + SET_LIMIT(db_show_cmd_set) +}; + +static struct command db_commands[] = { { "print", db_print_cmd, 0, 0 }, { "p", db_print_cmd, 0, 0 }, { "examine", db_examine_cmd, CS_SET_DOT, 0 }, @@ -119,7 +129,7 @@ { "where", db_stack_trace, CS_OWN, 0 }, { "bt", db_stack_trace, CS_OWN, 0 }, { "call", db_fncall, CS_OWN, 0 }, - { "show", 0, 0, db_show_cmds }, + { "show", 0, 0, &db_show_table }, { "ps", db_ps, 0, 0 }, { "gdb", db_gdb, 0, 0 }, { "reset", db_reset, 0, 0 }, @@ -129,6 +139,12 @@ { (char *)0, } }; +static struct command_table db_command_table = { + db_commands, + SET_BEGIN(db_cmd_set), + SET_LIMIT(db_cmd_set) +}; + static struct command *db_last_command = 0; /* @@ -159,94 +175,81 @@ #define CMD_AMBIGUOUS 3 #define CMD_HELP 4 -static void db_cmd_list(struct command *table, struct command **aux_tablep, - struct command **aux_tablep_end); -static int db_cmd_search(char *name, struct command *table, - struct command **aux_tablep, - struct command **aux_tablep_end, struct command **cmdp); +static void db_cmd_match(char *name, struct command *cmd, + struct command **cmdp, int *resultp); +static void db_cmd_list(struct command_table *table); +static int db_cmd_search(char *name, struct command_table *table, + struct command **cmdp); static void db_command(struct command **last_cmdp, - struct command *cmd_table, struct command **aux_cmd_tablep, - struct command **aux_cmd_tablep_end); + struct command_table *cmd_table); /* - * Search for command prefix. + * Helper function to match a single command. */ -static int -db_cmd_search(name, table, aux_tablep, aux_tablep_end, cmdp) +static void +db_cmd_match(name, cmd, cmdp, resultp) char * name; - struct command *table; - struct command **aux_tablep; - struct command **aux_tablep_end; + struct command *cmd; struct command **cmdp; /* out */ + int * resultp; { - struct command *cmd; - struct command **aux_cmdp; - int result = CMD_NONE; + char *lp, *rp; + int c; - for (cmd = table; cmd->name != 0; cmd++) { - register char *lp; - register char *rp; - register int c; - - lp = name; - rp = cmd->name; - while ((c = *lp) == *rp) { + lp = name; + rp = cmd->name; + while ((c = *lp) == *rp) { if (c == 0) { - /* complete match */ - *cmdp = cmd; - return (CMD_UNIQUE); + /* complete match */ + *cmdp = cmd; + *resultp = CMD_UNIQUE; + return; } lp++; rp++; - } - if (c == 0) { + } + if (c == 0) { /* end of name, not end of command - partial match */ - if (result == CMD_FOUND) { - result = CMD_AMBIGUOUS; - /* but keep looking for a full match - - this lets us match single letters */ + if (*resultp == CMD_FOUND) { + *resultp = CMD_AMBIGUOUS; + /* but keep looking for a full match - + this lets us match single letters */ + } else { + *cmdp = cmd; + *resultp = CMD_FOUND; } - else { - *cmdp = cmd; - result = CMD_FOUND; - } - } } - if (result == CMD_NONE && aux_tablep != 0) - /* XXX repeat too much code. */ - for (aux_cmdp = aux_tablep; aux_cmdp < aux_tablep_end; aux_cmdp++) { - register char *lp; - register char *rp; - register int c; +} + +/* + * Search for command prefix. + */ +static int +db_cmd_search(name, table, cmdp) + char * name; + struct command_table *table; + struct command **cmdp; /* out */ +{ + struct command *cmd; + struct command **aux_cmdp; + int result = CMD_NONE; - lp = name; - rp = (*aux_cmdp)->name; - while ((c = *lp) == *rp) { - if (c == 0) { - /* complete match */ - *cmdp = *aux_cmdp; + for (cmd = table->table; cmd->name != 0; cmd++) { + db_cmd_match(name, cmd, cmdp, &result); + if (result == CMD_UNIQUE) return (CMD_UNIQUE); - } - lp++; - rp++; + } + if (table->aux_tablep != NULL) + for (aux_cmdp = table->aux_tablep; + aux_cmdp < table->aux_tablep_end; + aux_cmdp++) { + db_cmd_match(name, *aux_cmdp, cmdp, &result); + if (result == CMD_UNIQUE) + return (CMD_UNIQUE); } - if (c == 0) { - /* end of name, not end of command - - partial match */ - if (result == CMD_FOUND) { - result = CMD_AMBIGUOUS; - /* but keep looking for a full match - - this lets us match single letters */ - } - else { - *cmdp = *aux_cmdp; - result = CMD_FOUND; - } - } - } if (result == CMD_NONE) { - /* check for 'help' */ + /* check for 'help' */ if (name[0] == 'h' && name[1] == 'e' && name[2] == 'l' && name[3] == 'p') result = CMD_HELP; @@ -255,32 +258,29 @@ } static void -db_cmd_list(table, aux_tablep, aux_tablep_end) - struct command *table; - struct command **aux_tablep; - struct command **aux_tablep_end; +db_cmd_list(table) + struct command_table *table; { register struct command *cmd; register struct command **aux_cmdp; - for (cmd = table; cmd->name != 0; cmd++) { + for (cmd = table->table; cmd->name != 0; cmd++) { db_printf("%-12s", cmd->name); db_end_line(); } - if (aux_tablep == 0) + if (table->aux_tablep == NULL) return; - for (aux_cmdp = aux_tablep; aux_cmdp < aux_tablep_end; aux_cmdp++) { + for (aux_cmdp = table->aux_tablep; aux_cmdp < table->aux_tablep_end; + aux_cmdp++) { db_printf("%-12s", (*aux_cmdp)->name); db_end_line(); } } static void -db_command(last_cmdp, cmd_table, aux_cmd_tablep, aux_cmd_tablep_end) +db_command(last_cmdp, cmd_table) struct command **last_cmdp; /* IN_OUT */ - struct command *cmd_table; - struct command **aux_cmd_tablep; - struct command **aux_cmd_tablep_end; + struct command_table *cmd_table; { struct command *cmd; int t; @@ -314,8 +314,6 @@ while (cmd_table) { result = db_cmd_search(db_tok_string, cmd_table, - aux_cmd_tablep, - aux_cmd_tablep_end, &cmd); switch (result) { case CMD_NONE: @@ -327,23 +325,16 @@ db_flush_lex(); return; case CMD_HELP: - db_cmd_list(cmd_table, aux_cmd_tablep, aux_cmd_tablep_end); + db_cmd_list(cmd_table); db_flush_lex(); return; default: break; } - if ((cmd_table = cmd->more) != 0) { - /* XXX usually no more aux's. */ - aux_cmd_tablep = 0; - if (cmd_table == db_show_cmds) { - aux_cmd_tablep = SET_BEGIN(db_show_cmd_set); - aux_cmd_tablep_end = SET_LIMIT(db_show_cmd_set); - } - + if ((cmd_table = cmd->more) != NULL) { t = db_read_token(); if (t != tIDENT) { - db_cmd_list(cmd_table, aux_cmd_tablep, aux_cmd_tablep_end); + db_cmd_list(cmd_table); db_flush_lex(); return; } @@ -452,8 +443,7 @@ db_printf("db> "); (void) db_read_line(); - db_command(&db_last_command, db_command_table, - SET_BEGIN(db_cmd_set), SET_LIMIT(db_cmd_set)); + db_command(&db_last_command, &db_command_table); } } ==== //depot/projects/smpng/sys/ddb/ddb.h#19 (text+ko) ==== @@ -152,6 +152,14 @@ /* * Command table. */ +struct command; + +struct command_table { + struct command *table; + struct command **aux_tablep; + struct command **aux_tablep_end; +}; + struct command { char * name; /* command name */ db_cmdfcn_t *fcn; /* function to call */ @@ -160,7 +168,7 @@ #define CS_MORE 0x2 /* standard syntax, but may have other words * at end */ #define CS_SET_DOT 0x100 /* set dot after command */ - struct command *more; /* another level of command */ + struct command_table *more; /* another level of command */ }; #endif /* !_DDB_DDB_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Dec 14 02:33:20 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F185816A422; Wed, 14 Dec 2005 02:33:19 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 91FA116A41F for ; Wed, 14 Dec 2005 02:33:19 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (vc4-2-0-87.dsl.netrack.net [199.45.160.85]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26EE743D58 for ; Wed, 14 Dec 2005 02:33:19 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (localhost.village.org [127.0.0.1] (may be forged)) by harmony.bsdimp.com (8.13.3/8.13.3) with ESMTP id jBE2Vm47024700; Tue, 13 Dec 2005 19:31:52 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Tue, 13 Dec 2005 19:31:48 -0700 (MST) Message-Id: <20051213.193148.74726062.imp@bsdimp.com> To: marcel@xcllnt.net From: Warner Losh In-Reply-To: <3D3166CC-DBC3-45C1-B78B-5CFE5F57C580@xcllnt.net> References: <200512122158.jBCLwwCt085740@repoman.freebsd.org> <3D3166CC-DBC3-45C1-B78B-5CFE5F57C580@xcllnt.net> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (harmony.bsdimp.com [127.0.0.1]); Tue, 13 Dec 2005 19:31:53 -0700 (MST) Cc: perforce@freebsd.org Subject: uart change 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: Wed, 14 Dec 2005 02:33:20 -0000 From: Marcel Moolenaar Subject: Re: PERFORCE change 88102 for review Date: Mon, 12 Dec 2005 16:45:32 -0800 > > On Dec 12, 2005, at 9:58 PM, Warner Losh wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=88102 > > > > Change 88102 by imp@imp_Speedy on 2005/12/12 21:58:35 > > > > Make uart_subr not depend on ns8250.o > > This is not such a good change. As the comment says in uart_subr.c, it's > just a default. There's nothing PC specific about it. It's the the most > common case and therefore a sensible default. > > Now, if it makes sense to have MD specific defaults and not MI defaults, > then it makes sense to have ALL the defaults set in MD code and none in > MI code (or if they are set in MI code, they should be set before MD > defaults can be set to override the MI defaults). > > What really needs to be done is add support for the DT tag, so that you > can set the device type in the environment.... This is a good change. The problem is that it forces you to link in uart_dev_ns8250.o, even if your platform doesn't have one of those. That's the reason that I moved it out of there. It has nothing to do with what the default device should be, but rather the linkage dependency it creates Warner From owner-p4-projects@FreeBSD.ORG Wed Dec 14 04:03:25 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D89C16A422; Wed, 14 Dec 2005 04:03:24 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 49F7416A41F for ; Wed, 14 Dec 2005 04:03:24 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1FDE43D4C for ; Wed, 14 Dec 2005 04:03:23 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBE43Nub012102 for ; Wed, 14 Dec 2005 04:03:23 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBE43NlK012099 for perforce@freebsd.org; Wed, 14 Dec 2005 04:03:23 GMT (envelope-from imp@freebsd.org) Date: Wed, 14 Dec 2005 04:03:23 GMT Message-Id: <200512140403.jBE43NlK012099@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 88170 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: Wed, 14 Dec 2005 04:03:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=88170 Change 88170 by imp@imp_plunger on 2005/12/14 04:02:23 Extract out of today's work the cpu_reset implementation. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92.c#5 edit .. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92.c#5 (text+ko) ==== @@ -233,7 +233,17 @@ void cpu_reset(void) { - while (1); + struct at91rm92_softc *sc = at91rm92_softc; + + /* + * Reset the CPU by programmig the watchdog timer to reset the + * CPU after 128 'slow' clocks, or about ~4ms. Loop until + * the reset happens for safety. + */ + bus_space_write_4(sc->sc_st, sc->sc_sys_sh, ST_WDMR, ST_RSTEN | 2); + bus_space_write_4(sc->sc_st, sc->sc_sys_sh, ST_CR, ST_WDRST); + while (1) + continue; } static struct resource * ==== //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#6 (text+ko) ==== @@ -280,6 +280,19 @@ #define PIOD_OWDR (0xa00 + 164) /* Output write disable register */ #define PIOD_OWSR (0xa00 + 168) /* Output write status register */ +#define ST_CR (0xd00 + 0) /* Control register */ +#define ST_WDRST 1 +#define ST_PIMR (0xd00 + 4) /* Period Interval Mode register */ +#define ST_WDMR (0xd00 + 8) /* Watchdog Mode register */ +#define ST_RSTEN (1 << 16) +#define ST_RTMR (0xd00 + 12) /* Reat-time Mode register */ +#define ST_SR (0xd00 + 16) /* Status register */ +#define ST_IER (0xd00 + 20) /* Interrupt Enable register */ +#define ST_IDR (0xd00 + 24) /* Interrupt Disable register */ +#define ST_IMR (0xd00 + 28) /* Interrupt Mask register */ +#define ST_RTAR (0xd00 + 32) /* Real-time Alarm register */ +#define ST_CRTR (0xd00 + 36) /* Current Real-time register */ + /* IRQs : */ /* * 0: AIC From owner-p4-projects@FreeBSD.ORG Wed Dec 14 09:39:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2FD816A422; Wed, 14 Dec 2005 09:39:12 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 91B8F16A41F for ; Wed, 14 Dec 2005 09:39:12 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1748643D5D for ; Wed, 14 Dec 2005 09:39:12 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBE9dB71045065 for ; Wed, 14 Dec 2005 09:39:11 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBE9dBOL045061 for perforce@freebsd.org; Wed, 14 Dec 2005 09:39:11 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 14 Dec 2005 09:39:11 GMT Message-Id: <200512140939.jBE9dBOL045061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 88172 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: Wed, 14 Dec 2005 09:39:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=88172 Change 88172 by soc-andrew@soc-andrew_serv on 2005/12/14 09:38:33 Move release.9 to release.8 when BSDINSTALLER is defined Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#20 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#20 (text+ko) ==== @@ -694,6 +694,7 @@ .endif touch ${.TARGET} +.if !defined(BSDINSTALLER) # Build the memory root filesystem. release.8: cp ${RD}/trees/base/etc/disktab /etc @@ -758,9 +759,9 @@ ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} @gzip -9fnv ${RD}/mfsroot/mfsroot touch ${.TARGET} - +.else # Build the BSD Installer mfs images -release.9: +release.8: rm -rf ${RD}/bsdinstaller mkdir ${RD}/bsdinstaller ( for dir in root usr var ; do \ @@ -806,6 +807,7 @@ 10000 ${RD}/bsdinstaller/root ${MFSINODE} auto @gzip -9fnv ${RD}/bsdinstaller/mfsroot touch ${.TARGET} +.endif KERNFLOPPYSET= ${RD}/floppyset/kern/kernel.gz .if defined(SMALLFLOPPYSIZE) @@ -1176,7 +1178,7 @@ ) doRELEASE: release.1 release.2 ${DOCREL} release.3 release.4 \ - release.5 release.6 release.7 release.8 release.9 ${EXTRAS} + release.5 release.6 release.7 release.8 ${EXTRAS} @echo "Release done" floppies: From owner-p4-projects@FreeBSD.ORG Wed Dec 14 16:04:20 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11ABD16A422; Wed, 14 Dec 2005 16:04:20 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 C630416A41F for ; Wed, 14 Dec 2005 16:04:19 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B71E43D64 for ; Wed, 14 Dec 2005 16:04:19 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBEG4Jcl068250 for ; Wed, 14 Dec 2005 16:04:19 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBEG4J1q068247 for perforce@freebsd.org; Wed, 14 Dec 2005 16:04:19 GMT (envelope-from jhb@freebsd.org) Date: Wed, 14 Dec 2005 16:04:19 GMT Message-Id: <200512141604.jBEG4J1q068247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 88178 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: Wed, 14 Dec 2005 16:04:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=88178 Change 88178 by jhb@jhb_slimer on 2005/12/14 16:03:32 Don't destroy the linux_osname mutex twice on unload. Affected files ... .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#22 edit .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#12 edit .. //depot/projects/smpng/sys/compat/linux/linux_mib.c#12 edit .. //depot/projects/smpng/sys/compat/linux/linux_mib.h#7 edit .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#47 edit Differences ... ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#22 (text+ko) ==== @@ -263,7 +263,6 @@ linux_ioctl_unregister_handler(*lihp); if (bootverbose) printf("Linux ELF exec handler removed\n"); - linux_mib_destroy(); } else printf("Could not deinstall ELF interpreter entry\n"); break; ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#12 (text+ko) ==== @@ -1081,7 +1081,6 @@ linux_ioctl_unregister_handler(*lihp); if (bootverbose) printf("Linux ELF exec handler removed\n"); - linux_mib_destroy(); } else printf("Could not deinstall ELF interpreter entry\n"); break; ==== //depot/projects/smpng/sys/compat/linux/linux_mib.c#12 (text+ko) ==== @@ -156,13 +156,6 @@ } void -linux_mib_destroy(void) -{ - - mtx_destroy(&osname_lock); -} - -void linux_get_osname(struct thread *td, char *dst) { register struct prison *pr; ==== //depot/projects/smpng/sys/compat/linux/linux_mib.h#7 (text+ko) ==== @@ -31,8 +31,6 @@ #ifndef _LINUX_MIB_H_ #define _LINUX_MIB_H_ -void linux_mib_destroy(void); - void linux_get_osname(struct thread *td, char *dst); int linux_set_osname(struct thread *td, char *osname); ==== //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#47 (text+ko) ==== @@ -923,7 +923,6 @@ linux_ioctl_unregister_handler(*lihp); if (bootverbose) printf("Linux ELF exec handler removed\n"); - linux_mib_destroy(); } else printf("Could not deinstall ELF interpreter entry\n"); break; From owner-p4-projects@FreeBSD.ORG Wed Dec 14 18:20:16 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A40D016A42D; Wed, 14 Dec 2005 18:20:15 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 5DE9916A449 for ; Wed, 14 Dec 2005 18:20:15 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03D1B43D55 for ; Wed, 14 Dec 2005 18:20:11 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBEIK9gJ082257 for ; Wed, 14 Dec 2005 18:20:09 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBEIK94o082254 for perforce@freebsd.org; Wed, 14 Dec 2005 18:20:09 GMT (envelope-from imp@freebsd.org) Date: Wed, 14 Dec 2005 18:20:09 GMT Message-Id: <200512141820.jBEIK94o082254@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 88181 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: Wed, 14 Dec 2005 18:20:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=88181 Change 88181 by imp@imp_Speedy on 2005/12/14 18:19:26 Fix spacing nits Affected files ... .. //depot/projects/arm/src/sys/arm/conf/KB920X#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#6 (text+ko) ==== @@ -42,7 +42,7 @@ #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device -options ROOTDEVNAME=\"ufs:md0\" +options ROOTDEVNAME=\"ufs:md0\" #options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server #options NFS_ROOT #NFS usable as /, requires NFSCLIENT @@ -58,10 +58,10 @@ options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options SYSCTL_OMIT_DESCR -options MUTEX_NOINLINE -options NO_FFS_SNAPSHOT -options NO_SWAPPING +options SYSCTL_OMIT_DESCR +options MUTEX_NOINLINE +options NO_FFS_SNAPSHOT +options NO_SWAPPING device genclock device loop device ether @@ -76,4 +76,4 @@ #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed device mem # Memory and kernel memory devices -device md +device md From owner-p4-projects@FreeBSD.ORG Wed Dec 14 18:22:30 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B13416A426; Wed, 14 Dec 2005 18:22:30 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 B07AE16A428 for ; Wed, 14 Dec 2005 18:22:29 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BDC943D4C for ; Wed, 14 Dec 2005 18:22:17 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBEIMCVV082407 for ; Wed, 14 Dec 2005 18:22:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBEIMCK2082404 for perforce@freebsd.org; Wed, 14 Dec 2005 18:22:12 GMT (envelope-from imp@freebsd.org) Date: Wed, 14 Dec 2005 18:22:12 GMT Message-Id: <200512141822.jBEIMCK2082404@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 88182 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: Wed, 14 Dec 2005 18:22:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=88182 Change 88182 by imp@imp_Speedy on 2005/12/14 18:21:57 Slight reorg of the names of the serial devices. The USARTs are used in a variety of AT91 cpus. Hope I got them basically right. Moved USART defines from at91rm92reg.h to at92usartreg.h Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#7 edit .. //depot/projects/arm/src/sys/arm/at91/at91usartreg.h#1 add .. //depot/projects/arm/src/sys/arm/at91/files.at91rm92#3 edit .. //depot/projects/arm/src/sys/arm/at91/uart_bus_at91rm92usart.c#4 delete .. //depot/projects/arm/src/sys/arm/at91/uart_bus_at91usart.c#1 add .. //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 add .. //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm92usart.c#6 delete .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91rm92usart.c#4 delete .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#1 branch Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#7 (text+ko) ==== @@ -54,66 +54,6 @@ #define AT91RM92_USART3_PDC 0xffcc100 #define AT91RM92_USART_SIZE 0x4000 -#define USART_CR 0x00 /* Control register */ -#define USART_CR_RSTRX (1 << 2) /* Reset Receiver */ -#define USART_CR_RSTTX (1 << 3) /* Reset Transmitter */ -#define USART_CR_RXEN (1 << 4) /* Receiver Enable */ -#define USART_CR_RXDIS (1 << 5) /* Receiver Disable */ -#define USART_CR_TXEN (1 << 6) /* Transmitter Enable */ -#define USART_CR_TXDIS (1 << 7) /* Transmitter Disable */ -#define USART_CR_RSTSTA (1 << 8) /* Reset Status Bits */ -#define USART_CR_STTBRK (1 << 9) /* Start Break */ -#define USART_CR_STPBRK (1 << 10) /* Stop Break */ -#define USART_CR_STTTO (1 << 11) /* Start Time-out */ -#define USART_CR_SENDA (1 << 12) /* Send Address */ -#define USART_CR_RSTIT (1 << 13) /* Reset Iterations */ -#define USART_CR_RSTNACK (1 << 14) /* Reset Non Acknowledge */ -#define USART_CR_RETTO (1 << 15) /* Rearm Time-out */ -#define USART_CR_DTREN (1 << 16) /* Data Terminal ready Enable */ -#define USART_CR_DTRDIS (1 << 17) /* Data Terminal ready Disable */ -#define USART_CR_RTSEN (1 << 18) /* Request to Send enable */ -#define USART_CR_RTSDIS (1 << 19) /* Request to Send Disable */ - -#define USART_MR 0x04 /* Mode register */ -#define USART_IER 0x08 /* Interrupt enable register */ -#define USART_IDR 0x0c /* Interrupt disable register */ -#define USART_IMR 0x10 /* Interrupt mask register */ -#define USART_CSR 0x14 /* Channel status register */ - -#define USART_CSR_RXRDY (1 << 0) /* Receiver ready */ -#define USART_CSR_TXRDY (1 << 1) /* Transmitter ready */ - -#define USART_RHR 0x18 /* Receiver holding register */ -#define USART_THR 0x1c /* Transmitter holding register */ -#define USART_BRGR 0x20 /* Baud rate generator register */ -#define USART_RTOR 0x24 /* Receiver time-out register */ -#define USART_TTR 0x28 /* Transmitter timeguard register */ -/* 0x2c to 0x3c reserved */ -#define USART_FDRR 0x40 /* FI DI ratio register */ -#define USART_NER 0x44 /* Number of errors register */ -/* 0x48 reserved */ -#define USART_IFR 0x48 /* IrDA filter register */ - - -#define UART_RXRDY (0x1 << 0) /* RXRDY Interrupt */ -#define UART_TXRDY (0x1 << 1) /* TXRDY Interrupt */ -#define UART_RXBRK (0x1 << 2) /* Break Received/End of Break */ -#define UART_ENDRX (0x1 << 3) /* End of Receive Transfer Interrupt */ -#define UART_ENDTX (0x1 << 4) /* End of Transmit Interrupt */ -#define UART_OVRE (0x1 << 5) /* Overrun Interrupt */ -#define UART_FRAME (0x1 << 6) /* Framing Error Interrupt */ -#define UART_PARE (0x1 << 7) /* Parity Error Interrupt */ -#define UART_TIMEOUT ( 0x1 << 8) /* (USART) Receiver Time-out */ -#define UART_TXEMPTY ( 0x1 << 9) /* (USART) TXEMPTY Interrupt */ -#define UART_ITERATION ( 0x1 << 10) /* (USART) Max number of Repetitions Reached */ -#define UART_TXBUFE ( 0x1 << 11) /* (USART) TXBUFE Interrupt */ -#define UART_RXBUFF ( 0x1 << 12) /* (USART) RXBUFF Interrupt */ -#define UART_NACK ( 0x1 << 13) /* (USART) Non Acknowledge */ -#define UART_RIIC ( 0x1 << 16) /* (USART) Ring INdicator Input Change Flag */ -#define AT91RM92_US_DSRIC ( 0x1 << 17) /* (USART) Data Set Ready Input Change Flag */ -#define AT91RM92_US_DCDIC ( 0x1 << 18) /* (USART) Data Carrier Flag */ -#define AT91RM92_US_CTSIC ( 0x1 << 19) /* (USART) Clear To Send Input Change Flag */ - /* System Registers */ #define AT91RM92_SYS_BASE 0xffff000 @@ -140,28 +80,11 @@ /* DBGU */ -#define DBGU_CR (0x200) /* Control register */ -#define DBGU_MR (0x200 + 4) /* Mode register */ -#define DBGU_IER (0x200 + 8) /* Interrupt Enable Register */ -#define DBGU_IDR (0x200 + 12) /* Interrupt Disable Register */ -#define DBGU_IMR (0x200 + 16) /* Interrupt Mask Register */ -#define DBGU_CSR (0x200 + 20) /* Channel Status Register */ -#define DBGU_RHR (0x200 + 24) /* Receiver Holding Register */ -#define DBGU_THR (0x200 + 28) /* Transmitter Holding Register */ -#define DBGU_BRGR (0x200 + 32) /* Baud Rate Generator Register */ +#define DBGU 0x200 +#define DBGU_SIZE 0x200 #define DBGU_C1R (0x200 + 64) /* Chip ID1 Register */ #define DBGU_C2R (0x200 + 68) /* Chip ID2 Register */ #define DBGU_FNTR (0x200 + 72) /* Force NTRST Register */ -#define DBGU_RPR (0x200 + 256) /* Receive Pointer Register */ -#define DBGU_RCR (0x200 + 260) /* Receive Counter Register */ -#define DBGU_TPR (0x200 + 264) /* Transmit Pointer Register */ -#define DBGU_TCR (0x200 + 268) /* Transmit Counter Register */ -#define DBGU_RNPR (0x200 + 272) /* Receive Next Pointer Register */ -#define DBGU_RNCR (0x200 + 276) /* Receive Next Counter Register */ -#define DBGU_TNPR (0x200 + 280) /* Transmit Next Pointer Register */ -#define DBGU_TNCR (0x200 + 284) /* Transmit Next Counter Register */ -#define DBGU_PTCR (0x200 + 288) /* PDC Transfer Control Register */ -#define DBGU_PTSR (0x200 + 292) /* PDC Transfer Status Register */ #define PIOA_PER (0x400) /* PIO Enable Register */ #define PIOA_PDR (0x400 + 4) /* PIO Disable Register */ ==== //depot/projects/arm/src/sys/arm/at91/files.at91rm92#3 (text+ko) ==== @@ -3,6 +3,6 @@ arm/arm/irq_dispatch.S standard arm/at91/at91rm92.c standard arm/at91/at91rm92timer.c standard -arm/at91/uart_bus_at91rm92usart.c optional uart -arm/at91/uart_cpu_at91rm92usart.c optional uart -arm/at91/uart_dev_at91rm92usart.c optional uart +arm/at91/uart_bus_at91usart.c optional uart +arm/at91/uart_cpu_at91rm9200usart.c optional uart +arm/at91/uart_dev_at91usart.c optional uart From owner-p4-projects@FreeBSD.ORG Wed Dec 14 18:23:26 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E44616A422; Wed, 14 Dec 2005 18:23:26 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0821A16A41F for ; Wed, 14 Dec 2005 18:23:26 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB04D43D7B for ; Wed, 14 Dec 2005 18:23:20 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBEINE4w082432 for ; Wed, 14 Dec 2005 18:23:14 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBEINDpV082429 for perforce@freebsd.org; Wed, 14 Dec 2005 18:23:13 GMT (envelope-from imp@freebsd.org) Date: Wed, 14 Dec 2005 18:23:13 GMT Message-Id: <200512141823.jBEINDpV082429@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 88183 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: Wed, 14 Dec 2005 18:23:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=88183 Change 88183 by imp@imp_Speedy on 2005/12/14 18:22:43 Better panic message, allocate the interrupt shareable (but I just realized I didn't check to see if the ISR can cope). Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92timer.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92timer.c#3 (text+ko) ==== @@ -136,9 +136,10 @@ bus_space_write_4(timer_softc->sc_st, timer_softc->sc_sh, TIMER_IDR, 0xffffffff); /* The system timer shares the system irq (1) */ - irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 1, 1, 1, RF_ACTIVE); + irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 1, 1, 1, + RF_ACTIVE | RF_SHAREABLE); if (!irq) - panic("Unable to all irq for the system timer"); + panic("Unable to allocate irq for the system timer"); else bus_setup_intr(dev, irq, INTR_TYPE_CLK | INTR_FAST, clock_intr, NULL, &ih); From owner-p4-projects@FreeBSD.ORG Wed Dec 14 18:24:16 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72FB716A422; Wed, 14 Dec 2005 18:24:16 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 3584116A41F for ; Wed, 14 Dec 2005 18:24:16 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED87643D45 for ; Wed, 14 Dec 2005 18:24:15 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBEIOFid082498 for ; Wed, 14 Dec 2005 18:24:15 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBEIOFRd082495 for perforce@freebsd.org; Wed, 14 Dec 2005 18:24:15 GMT (envelope-from imp@freebsd.org) Date: Wed, 14 Dec 2005 18:24:15 GMT Message-Id: <200512141824.jBEIOFRd082495@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 88184 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: Wed, 14 Dec 2005 18:24:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=88184 Change 88184 by imp@imp_Speedy on 2005/12/14 18:23:17 Force single user mode, and bring back the VA == PA thing. I'll test it again with it off in a second. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#12 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#12 (text+ko) ==== @@ -271,7 +271,7 @@ pmap_map_chunk(l1pagetable, KERNBASE, KERNPHYSADDR, (((uint32_t)(&end) - KERNBASE) + PAGE_SIZE) & ~(PAGE_SIZE - 1), VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); -#if 0 +#if 1 /* XXX PA == VA XXX */ pmap_map_chunk(l1pagetable, KERNPHYSADDR, KERNPHYSADDR, (((uint32_t)(&end) - KERNBASE) + L1_S_SIZE) & ~(L1_S_SIZE - 1), @@ -389,6 +389,7 @@ init_param2(memsize / PAGE_SIZE); avail_end = KERNPHYSADDR + memsize - 1; kdb_init(); + boothowto = RB_SINGLE; return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } From owner-p4-projects@FreeBSD.ORG Wed Dec 14 18:24:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 666A916A478; Wed, 14 Dec 2005 18:24:17 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 B2A8216A444 for ; Wed, 14 Dec 2005 18:24:16 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FC1943D45 for ; Wed, 14 Dec 2005 18:24:16 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBEIOGbN082505 for ; Wed, 14 Dec 2005 18:24:16 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBEIOFc6082501 for perforce@freebsd.org; Wed, 14 Dec 2005 18:24:15 GMT (envelope-from imp@freebsd.org) Date: Wed, 14 Dec 2005 18:24:15 GMT Message-Id: <200512141824.jBEIOFc6082501@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 88185 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: Wed, 14 Dec 2005 18:24:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=88185 Change 88185 by imp@imp_Speedy on 2005/12/14 18:23:48 attempt to make the atmelarm bus do real resource allocation. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92.c#6 edit .. //depot/projects/arm/src/sys/arm/at91/at91rm92var.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92.c#6 (text+ko) ==== @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -160,7 +161,7 @@ static int at91rm92_probe(device_t dev) { - device_set_desc(dev, "AT91RM9200"); + device_set_desc(dev, "AT91 CPU"); return (0); } @@ -186,6 +187,30 @@ extern void irq_entry(void); +static void +at91rm92_add_child(device_t dev, int prio, const char *name, int unit, + bus_addr_t addr, bus_size_t size, int irq) +{ + device_t kid; + struct at91rm92_ivar *ivar; + + kid = device_add_child_ordered(dev, prio, name, unit); + if (kid == NULL) + return; + ivar = malloc(sizeof(*ivar), M_DEVBUF, M_WAITOK | M_ZERO); + if (ivar == NULL) { + device_delete_child(dev, kid); + return; + } + device_set_ivars(kid, ivar); + resource_list_init(&ivar->resources); + if (irq != -1) + bus_set_resource(kid, SYS_RES_IRQ, 0, irq, 1); + if (addr != 0) + bus_set_resource(kid, SYS_RES_MEMORY, 0, addr, size); +} + + static int at91rm92_attach(device_t dev) { @@ -196,14 +221,20 @@ sc->sc_st = &at91rm92_bs_tag; sc->sc_sh = AT91RM92_BASE; sc->dev = dev; - sc->sc_irq_rman.rm_type = RMAN_ARRAY; - sc->sc_irq_rman.rm_descr = "AT91RM92 IRQs"; if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91RM92_SYS_BASE, AT91RM92_SYS_SIZE, &sc->sc_sys_sh) != 0) panic("Enable to map IRQ registers"); + sc->sc_irq_rman.rm_type = RMAN_ARRAY; + sc->sc_irq_rman.rm_descr = "AT91RM92 IRQs"; + sc->sc_mem_rman.rm_type = RMAN_ARRAY; + sc->sc_mem_rman.rm_descr = "AT91RM92 Memory"; if (rman_init(&sc->sc_irq_rman) != 0 || rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0) panic("at91rm92_attach: failed to set up IRQ rman"); + if (rman_init(&sc->sc_mem_rman) != 0 || + rman_manage_region(&sc->sc_mem_rman, 0xfff00000ul, + 0xfffffffful) != 0) + panic("at91rm92_attach: failed to set up memory rman"); for (i = 0; i < 32; i++) { bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SVR + @@ -223,7 +254,18 @@ /* Disable and clear all interrupts. */ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IDCR, 0xffffffff); bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_ICCR, 0xffffffff); - device_add_child(dev, "at91rm92_timer", 0); + + at91rm92_add_child(dev, 0, "at91rm92_timer", 0, 0, 0, 1); + at91rm92_add_child(dev, 10, "uart", 0, AT91RM92_BASE + + AT91RM92_SYS_BASE + DBGU, DBGU_SIZE, 1); // DBGU + at91rm92_add_child(dev, 10, "uart", 1, AT91RM92_BASE + + AT91RM92_USART0_BASE, AT91RM92_USART_SIZE, 6); // USART0 + at91rm92_add_child(dev, 10, "uart", 2, AT91RM92_BASE + + AT91RM92_USART1_BASE, AT91RM92_USART_SIZE, 7); // USART1 + at91rm92_add_child(dev, 10, "uart", 3, AT91RM92_BASE + + AT91RM92_USART2_BASE, AT91RM92_USART_SIZE, 8); // USART2 + at91rm92_add_child(dev, 10, "uart", 4, AT91RM92_BASE + + AT91RM92_USART3_BASE, AT91RM92_USART_SIZE, 9); // USART3 bus_generic_probe(dev); bus_generic_attach(dev); enable_interrupts(I32_bit | F32_bit); @@ -251,11 +293,67 @@ u_long start, u_long end, u_long count, u_int flags) { struct at91rm92_softc *sc = device_get_softc(dev); + struct resource_list_entry *rle; + struct at91rm92_ivar *ivar = device_get_ivars(child); + struct resource_list *rl = &ivar->resources; + + if (device_get_parent(child) != dev) + return (BUS_ALLOC_RESOURCE(device_get_parent(dev), child, + type, rid, start, end, count, flags)); - if (type == SYS_RES_IRQ) - return (rman_reserve_resource(&sc->sc_irq_rman, - start, end, count, flags, child)); - return (NULL); + rle = resource_list_find(rl, type, *rid); + if (rle == NULL) + return (NULL); + if (rle->res) + panic("Resource rid %d type %d already in use", *rid, type); + if (start == 0UL && end == ~0UL) { + start = rle->start; + count = ulmax(count, rle->count); + end = ulmax(rle->end, start + count - 1); + } + switch (type) + { + case SYS_RES_IRQ: + rle->res = rman_reserve_resource(&sc->sc_irq_rman, + start, end, count, flags, child); + break; + case SYS_RES_MEMORY: + rle->res = rman_reserve_resource(&sc->sc_mem_rman, + start, end, count, flags, child); + } + if (rle->res) { + rle->start = rman_get_start(rle->res); + rle->end = rman_get_end(rle->res); + rle->count = count; + } + return (rle->res); +} + +static struct resource_list * +at91rm92_get_resource_list(device_t dev, device_t child) +{ + struct at91rm92_ivar *ivar; + + ivar = device_get_ivars(child); + return (&(ivar->resources)); +} + +static int +at91rm92_release_resource(device_t dev, device_t child, int type, + int rid, struct resource *r) +{ + struct resource_list *rl; + struct resource_list_entry *rle; + + rl = at91rm92_get_resource_list(dev, child); + if (rl == NULL) + return (EINVAL); + rle = resource_list_find(rl, type, rid); + if (rle == NULL) + return (EINVAL); + rman_release_resource(r); + rle->res = NULL; + return (0); } static int @@ -287,6 +385,7 @@ at91rm92_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { +#if 0 u_long p; int error; @@ -296,11 +395,34 @@ if (error) return (error); rman_set_bushandle(r, p); - } +#endif return (rman_activate_resource(r)); } +static int +at91rm92_print_child(device_t dev, device_t child) +{ + struct at91rm92_ivar *ivars; + struct resource_list *rl; + int retval = 0; + + ivars = device_get_ivars(child); + rl = &ivars->resources; + + retval += bus_print_child_header(dev, child); + + retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx"); + retval += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx"); + retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld"); + if (device_get_flags(dev)) + retval += printf(" flags %#x", device_get_flags(dev)); + + retval += bus_print_child_footer(dev, child); + + return (retval); +} + void arm_mask_irq(uintptr_t nb) { @@ -342,12 +464,17 @@ DEVMETHOD(device_probe, at91rm92_probe), DEVMETHOD(device_attach, at91rm92_attach), DEVMETHOD(device_identify, at91rm92_identify), + DEVMETHOD(bus_alloc_resource, at91rm92_alloc_resource), DEVMETHOD(bus_setup_intr, at91rm92_setup_intr), DEVMETHOD(bus_teardown_intr, at91rm92_teardown_intr), - DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, at91rm92_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_get_resource_list,at91rm92_get_resource_list), + DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource), + DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), + DEVMETHOD(bus_release_resource, at91rm92_release_resource), + DEVMETHOD(bus_print_child, at91rm92_print_child), {0, 0}, }; ==== //depot/projects/arm/src/sys/arm/at91/at91rm92var.h#3 (text+ko) ==== @@ -35,6 +35,12 @@ bus_space_handle_t sc_sh; bus_space_handle_t sc_sys_sh; struct rman sc_irq_rman; + struct rman sc_mem_rman; +}; + +struct at91rm92_ivar { + struct resource_list resources; }; + #endif /* _AT91RM92VAR_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Dec 14 18:30:57 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4140816A424; Wed, 14 Dec 2005 18:30:56 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 00E2016A423 for ; Wed, 14 Dec 2005 18:30:56 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7172043D8D for ; Wed, 14 Dec 2005 18:30:33 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBEIUO5T082783 for ; Wed, 14 Dec 2005 18:30:24 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBEIUNhS082780 for perforce@freebsd.org; Wed, 14 Dec 2005 18:30:23 GMT (envelope-from imp@freebsd.org) Date: Wed, 14 Dec 2005 18:30:23 GMT Message-Id: <200512141830.jBEIUNhS082780@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 88186 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: Wed, 14 Dec 2005 18:30:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=88186 Change 88186 by imp@imp_Speedy on 2005/12/14 18:30:16 Add back a couple of LED on things. We turn LED1 on now just before initarm, and LED2 on just before mi_startup. # All the led hacking in here should go away, since it doesn't # work on other platforms. We'll leave it here for a bit longer # until we've worked out the kinks in the system. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/locore.S#13 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/locore.S#13 (text+ko) ==== @@ -217,12 +217,14 @@ #endif virt_done: nop + LED1ON mov fp, #0 /* trace back starts here */ bl _C_LABEL(initarm) /* Off we go */ /* init arm will return the new stack pointer. */ mov sp, r0 + LED2ON bl _C_LABEL(mi_startup) /* call mi_startup()! */ adr r0, .Lmainreturned From owner-p4-projects@FreeBSD.ORG Wed Dec 14 20:37:12 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CC6D16A422; Wed, 14 Dec 2005 20:37:12 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1523B16A41F for ; Wed, 14 Dec 2005 20:37:12 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88A9343D46 for ; Wed, 14 Dec 2005 20:37:11 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBEKbBhR089498 for ; Wed, 14 Dec 2005 20:37:11 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBEKbBD4089495 for perforce@freebsd.org; Wed, 14 Dec 2005 20:37:11 GMT (envelope-from cognet@freebsd.org) Date: Wed, 14 Dec 2005 20:37:11 GMT Message-Id: <200512142037.jBEKbBD4089495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 88193 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: Wed, 14 Dec 2005 20:37:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=88193 Change 88193 by cognet@cognet on 2005/12/14 20:36:33 Of course Warner was right. We need to check the pc against KERNPHYSADDR if KERNPHYSADDR > KERNVIRTADDR Affected files ... .. //depot/projects/arm/src/sys/arm/arm/locore.S#14 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/locore.S#14 (text+ko) ==== @@ -201,17 +201,19 @@ subs r2, r2, #4 bgt .L1 + mov r0, pc +#if KERNVIRTADDR > KERNPHYSADDR ldr r4, =KERNVIRTADDR - mov r0, pc cmp r0, r4 -#if KERNVIRTADDR > KERNPHYSADDR bgt virt_done ldr r5, =KERNPHYSADDR sub r4, r4, r5 add pc, pc, r4 #else + ldr r5, =KERNPHYSADDR + cmp r0, r4 blt virt_done - ldr r5, =KERNPHYSADDR + ldr r4, =KERNVIRTADDR sub r5, r5, r4 sub pc, pc, r5 #endif From owner-p4-projects@FreeBSD.ORG Wed Dec 14 20:39:16 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F2EB16A422; Wed, 14 Dec 2005 20:39:15 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 565E616A41F for ; Wed, 14 Dec 2005 20:39:15 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C34443D5C for ; Wed, 14 Dec 2005 20:39:15 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBEKdEpQ089597 for ; Wed, 14 Dec 2005 20:39:14 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBEKdEja089594 for perforce@freebsd.org; Wed, 14 Dec 2005 20:39:14 GMT (envelope-from imp@freebsd.org) Date: Wed, 14 Dec 2005 20:39:14 GMT Message-Id: <200512142039.jBEKdEja089594@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 88195 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: Wed, 14 Dec 2005 20:39:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=88195 Change 88195 by imp@imp_Speedy on 2005/12/14 20:38:29 Compile! Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#2 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include "uart_if.h" From owner-p4-projects@FreeBSD.ORG Wed Dec 14 20:42:21 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C806216A422; Wed, 14 Dec 2005 20:42:20 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 9964216A424 for ; Wed, 14 Dec 2005 20:42:20 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 891F143D67 for ; Wed, 14 Dec 2005 20:42:19 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBEKgJ0u089781 for ; Wed, 14 Dec 2005 20:42:19 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBEKgIls089778 for perforce@freebsd.org; Wed, 14 Dec 2005 20:42:18 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 14 Dec 2005 20:42:18 GMT Message-Id: <200512142042.jBEKgIls089778@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 88196 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: Wed, 14 Dec 2005 20:42:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=88196 Change 88196 by soc-andrew@soc-andrew_serv on 2005/12/14 20:42:13 Do not build floppies for the BSD Installer as they will not work yet. Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#21 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#21 (text+ko) ==== @@ -225,7 +225,7 @@ MFSLABEL= auto SEPARATE_LIVEFS= .endif -.if defined(NO_FLOPPIES) +.if defined(NO_FLOPPIES) || defined(BSDINSTALLER) .undef MAKE_FLOPPIES .endif From owner-p4-projects@FreeBSD.ORG Wed Dec 14 21:22:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4266A16A422; Wed, 14 Dec 2005 21:22:13 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1153816A41F for ; Wed, 14 Dec 2005 21:22:13 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C14943D69 for ; Wed, 14 Dec 2005 21:22:11 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBELMBPa098948 for ; Wed, 14 Dec 2005 21:22:11 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBELM8BY098945 for perforce@freebsd.org; Wed, 14 Dec 2005 21:22:08 GMT (envelope-from jhb@freebsd.org) Date: Wed, 14 Dec 2005 21:22:08 GMT Message-Id: <200512142122.jBELM8BY098945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 88199 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: Wed, 14 Dec 2005 21:22:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=88199 Change 88199 by jhb@jhb_slimer on 2005/12/14 21:21:48 IFC @88192. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#11 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#15 integrate .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#15 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#18 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#30 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#39 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#9 integrate .. //depot/projects/smpng/sys/amd64/include/asmacros.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/frame.h#7 integrate .. //depot/projects/smpng/sys/amd64/include/intr_machdep.h#7 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#11 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic.c#12 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic_vector.S#4 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#16 integrate .. //depot/projects/smpng/sys/amd64/isa/icu.h#6 integrate .. //depot/projects/smpng/sys/arm/arm/bcopyinout_xscale.S#6 integrate .. //depot/projects/smpng/sys/arm/include/atomic.h#22 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_aau.c#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_timer.c#7 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#16 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/std.iq31244#3 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#30 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#24 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#24 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#24 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#24 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#24 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#46 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#42 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.h#13 integrate .. //depot/projects/smpng/sys/conf/NOTES#109 integrate .. //depot/projects/smpng/sys/conf/files#160 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#50 integrate .. //depot/projects/smpng/sys/conf/options#110 integrate .. //depot/projects/smpng/sys/conf/options.amd64#17 integrate .. //depot/projects/smpng/sys/conf/options.arm#6 integrate .. //depot/projects/smpng/sys/conf/options.i386#54 integrate .. //depot/projects/smpng/sys/conf/options.pc98#53 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_perf.c#8 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#36 integrate .. //depot/projects/smpng/sys/dev/amr/amr_cam.c#16 integrate .. //depot/projects/smpng/sys/dev/amr/amr_disk.c#18 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#24 integrate .. //depot/projects/smpng/sys/dev/amr/amrio.h#5 integrate .. //depot/projects/smpng/sys/dev/amr/amrreg.h#7 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#21 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#59 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#37 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#41 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.h#23 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#64 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#33 integrate .. //depot/projects/smpng/sys/dev/em/README#11 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#70 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#28 integrate .. //depot/projects/smpng/sys/dev/nve/if_nve.c#11 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#34 integrate .. //depot/projects/smpng/sys/dev/ti/if_ti.c#1 branch .. //depot/projects/smpng/sys/dev/ti/if_tireg.h#1 branch .. //depot/projects/smpng/sys/dev/ti/ti_fw.h#1 branch .. //depot/projects/smpng/sys/dev/ti/ti_fw2.h#1 branch .. //depot/projects/smpng/sys/dev/uart/uart_cpu_alpha.c#8 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_amd64.c#7 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_i386.c#7 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_ia64.c#8 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_pc98.c#8 integrate .. //depot/projects/smpng/sys/dev/uart/uart_subr.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#32 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.c#21 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#22 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#23 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#34 integrate .. //depot/projects/smpng/sys/geom/nop/g_nop.c#6 integrate .. //depot/projects/smpng/sys/geom/nop/g_nop.h#4 integrate .. //depot/projects/smpng/sys/geom/zero/g_zero.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/debug.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/debug.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/kdb.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/kmem.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/ktrace.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/move.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/mutex.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/rwsem.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/sema.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/spin.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/support.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/sv.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/time.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/uuid.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/support/uuid.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_config.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_cred.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_node.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_stats.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_stats.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_version.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_acl.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_acl.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_ag.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_alloc.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_alloc.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_alloc_btree.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_alloc_btree.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_arch.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_attr.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_attr.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_attr_leaf.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_attr_leaf.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_attr_sf.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_behavior.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_behavior.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_bit.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_bit.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_bmap.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_bmap.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_bmap_btree.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_bmap_btree.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_btree.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_btree.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_buf_item.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_buf_item.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_cap.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_cap.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_clnt.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_da_btree.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_da_btree.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dfrag.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dfrag.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dinode.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_block.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_block.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_data.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_data.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_leaf.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_leaf.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_node.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_node.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_sf.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_sf.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_trace.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir2_trace.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir_leaf.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir_leaf.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dir_sf.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dmapi.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_dmops.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_error.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_error.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_extfree_item.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_extfree_item.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_fs.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_fsops.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_fsops.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_ialloc.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_ialloc.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_ialloc_btree.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_ialloc_btree.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_imap.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_inode.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_inode.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_inode_item.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_inode_item.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_inum.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_iocore.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_iomap.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_iomap.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_itable.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_itable.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_log.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_log.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_log_priv.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_log_recover.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_log_recover.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_mac.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_mac.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_macros.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_macros.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_mount.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_mount.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_qmops.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_quota.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_refcache.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_refcache.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_rename.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_rtalloc.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_rtalloc.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_rw.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_rw.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_sb.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans_ail.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans_buf.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans_extfree.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans_inode.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans_item.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans_priv.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_trans_space.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_types.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_utils.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_utils.h#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_vfsops.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfs_vnodeops.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/xfsidbg.c#1 branch .. //depot/projects/smpng/sys/i386/i386/local_apic.c#38 integrate .. //depot/projects/smpng/sys/i386/isa/atpic.c#15 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#46 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#93 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#106 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#114 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#115 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#84 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#41 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#41 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#43 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#54 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#66 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#27 integrate .. //depot/projects/smpng/sys/modules/Makefile#112 integrate .. //depot/projects/smpng/sys/modules/ti/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/xfs/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf_filter.c#8 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#17 integrate .. //depot/projects/smpng/sys/net/if_bridgevar.h#5 integrate .. //depot/projects/smpng/sys/net80211/_ieee80211.h#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_ccmp.c#5 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_tkip.c#5 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_wep.c#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#25 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#22 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#10 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#22 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#15 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#10 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#16 integrate .. //depot/projects/smpng/sys/netgraph/ng_hole.c#4 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#32 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#64 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#23 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#21 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#40 integrate .. //depot/projects/smpng/sys/pc98/include/param.h#2 integrate .. //depot/projects/smpng/sys/pci/amdpm.c#14 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#52 delete .. //depot/projects/smpng/sys/pci/if_tireg.h#10 delete .. //depot/projects/smpng/sys/pci/ti_fw.h#3 delete .. //depot/projects/smpng/sys/pci/ti_fw2.h#3 delete .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib_subr.c#6 integrate .. //depot/projects/smpng/sys/sys/condvar.h#9 integrate .. //depot/projects/smpng/sys/sys/lock.h#34 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#57 integrate .. //depot/projects/smpng/sys/sys/mount.h#46 integrate .. //depot/projects/smpng/sys/sys/param.h#92 integrate .. //depot/projects/smpng/sys/sys/signal.h#24 integrate .. //depot/projects/smpng/sys/sys/timers.h#5 integrate .. //depot/projects/smpng/sys/sys/vnode.h#68 integrate .. //depot/projects/smpng/sys/tools/vnode_if.awk#14 integrate .. //depot/projects/smpng/sys/ufs/ufs/quota.h#11 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#29 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#22 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#51 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#68 integrate .. //depot/user/jhb/acpipci/amd64/amd64/apic_vector.S#14 integrate .. //depot/user/jhb/acpipci/amd64/amd64/db_trace.c#14 integrate .. //depot/user/jhb/acpipci/amd64/amd64/intr_machdep.c#20 integrate .. //depot/user/jhb/acpipci/amd64/amd64/local_apic.c#26 integrate .. //depot/user/jhb/acpipci/amd64/amd64/mp_machdep.c#34 integrate .. //depot/user/jhb/acpipci/amd64/amd64/trap.c#31 integrate .. //depot/user/jhb/acpipci/amd64/include/apicvar.h#15 integrate .. //depot/user/jhb/acpipci/amd64/include/asmacros.h#7 integrate .. //depot/user/jhb/acpipci/amd64/include/frame.h#8 integrate .. //depot/user/jhb/acpipci/amd64/include/intr_machdep.h#10 integrate .. //depot/user/jhb/acpipci/amd64/include/smp.h#12 integrate .. //depot/user/jhb/acpipci/amd64/isa/atpic.c#18 integrate .. //depot/user/jhb/acpipci/amd64/isa/atpic_vector.S#6 integrate .. //depot/user/jhb/acpipci/amd64/isa/clock.c#26 integrate .. //depot/user/jhb/acpipci/amd64/isa/icu.h#9 integrate .. //depot/user/jhb/acpipci/arm/arm/bcopyinout_xscale.S#6 integrate .. //depot/user/jhb/acpipci/arm/include/atomic.h#12 integrate .. //depot/user/jhb/acpipci/arm/xscale/i80321/i80321_aau.c#2 integrate .. //depot/user/jhb/acpipci/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/user/jhb/acpipci/arm/xscale/i80321/i80321_timer.c#9 integrate .. //depot/user/jhb/acpipci/arm/xscale/i80321/iq31244_machdep.c#14 integrate .. //depot/user/jhb/acpipci/arm/xscale/i80321/std.iq31244#3 integrate .. //depot/user/jhb/acpipci/compat/freebsd32/freebsd32_misc.c#26 integrate .. //depot/user/jhb/acpipci/compat/freebsd32/freebsd32_proto.h#23 integrate .. //depot/user/jhb/acpipci/compat/freebsd32/freebsd32_syscall.h#23 integrate .. //depot/user/jhb/acpipci/compat/freebsd32/freebsd32_syscalls.c#23 integrate .. //depot/user/jhb/acpipci/compat/freebsd32/freebsd32_sysent.c#23 integrate .. //depot/user/jhb/acpipci/compat/freebsd32/syscalls.master#23 integrate .. //depot/user/jhb/acpipci/compat/linprocfs/linprocfs.c#28 integrate .. //depot/user/jhb/acpipci/compat/linux/linux_ioctl.c#28 integrate .. //depot/user/jhb/acpipci/compat/linux/linux_util.h#8 integrate .. //depot/user/jhb/acpipci/conf/NOTES#72 integrate .. //depot/user/jhb/acpipci/conf/files#95 integrate .. //depot/user/jhb/acpipci/conf/kern.pre.mk#34 integrate .. //depot/user/jhb/acpipci/conf/options#63 integrate .. //depot/user/jhb/acpipci/conf/options.amd64#15 integrate .. //depot/user/jhb/acpipci/conf/options.arm#6 integrate .. //depot/user/jhb/acpipci/conf/options.i386#44 integrate .. //depot/user/jhb/acpipci/conf/options.pc98#33 integrate .. //depot/user/jhb/acpipci/dev/acpica/acpi_perf.c#6 integrate .. //depot/user/jhb/acpipci/dev/amr/amr.c#26 integrate .. //depot/user/jhb/acpipci/dev/amr/amr_cam.c#15 integrate .. //depot/user/jhb/acpipci/dev/amr/amr_disk.c#16 integrate .. //depot/user/jhb/acpipci/dev/amr/amr_pci.c#21 integrate .. //depot/user/jhb/acpipci/dev/amr/amrio.h#4 integrate .. //depot/user/jhb/acpipci/dev/amr/amrreg.h#4 integrate .. //depot/user/jhb/acpipci/dev/amr/amrvar.h#18 integrate .. //depot/user/jhb/acpipci/dev/ata/ata-chipset.c#47 integrate .. //depot/user/jhb/acpipci/dev/ata/ata-pci.h#31 integrate .. //depot/user/jhb/acpipci/dev/ata/ata-raid.c#26 integrate .. //depot/user/jhb/acpipci/dev/ata/ata-raid.h#14 integrate .. //depot/user/jhb/acpipci/dev/bge/if_bge.c#44 integrate .. //depot/user/jhb/acpipci/dev/bge/if_bgereg.h#25 integrate .. //depot/user/jhb/acpipci/dev/em/README#10 integrate .. //depot/user/jhb/acpipci/dev/fxp/if_fxp.c#58 integrate .. //depot/user/jhb/acpipci/dev/mii/brgphy.c#18 integrate .. //depot/user/jhb/acpipci/dev/nve/if_nve.c#27 integrate .. //depot/user/jhb/acpipci/dev/puc/pucdata.c#24 integrate .. //depot/user/jhb/acpipci/dev/ti/if_ti.c#1 branch .. //depot/user/jhb/acpipci/dev/ti/if_tireg.h#1 branch .. //depot/user/jhb/acpipci/dev/ti/ti_fw.h#1 branch .. //depot/user/jhb/acpipci/dev/ti/ti_fw2.h#1 branch .. //depot/user/jhb/acpipci/dev/uart/uart_cpu_alpha.c#8 integrate .. //depot/user/jhb/acpipci/dev/uart/uart_cpu_amd64.c#7 integrate .. //depot/user/jhb/acpipci/dev/uart/uart_cpu_i386.c#7 integrate .. //depot/user/jhb/acpipci/dev/uart/uart_cpu_ia64.c#8 integrate .. //depot/user/jhb/acpipci/dev/uart/uart_cpu_pc98.c#9 integrate .. //depot/user/jhb/acpipci/dev/uart/uart_subr.c#4 integrate .. //depot/user/jhb/acpipci/dev/usb/usb_quirks.c#12 integrate .. //depot/user/jhb/acpipci/dev/usb/usb_quirks.h#4 integrate .. //depot/user/jhb/acpipci/dev/usb/usb_subr.c#20 integrate .. //depot/user/jhb/acpipci/dev/usb/usbdi.c#12 integrate .. //depot/user/jhb/acpipci/fs/nullfs/null_vfsops.c#19 integrate .. //depot/user/jhb/acpipci/fs/nwfs/nwfs_vfsops.c#19 integrate .. //depot/user/jhb/acpipci/fs/smbfs/smbfs_vfsops.c#26 integrate .. //depot/user/jhb/acpipci/geom/nop/g_nop.c#6 integrate .. //depot/user/jhb/acpipci/geom/nop/g_nop.h#4 integrate .. //depot/user/jhb/acpipci/geom/zero/g_zero.c#2 integrate .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/atomic.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/debug.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/debug.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/kdb.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/kdb.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/kmem.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/kmem.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/ktrace.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/ktrace.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/move.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/mrlock.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/mrlock.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/mutex.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/rwlock.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/rwsem.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/sema.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/spin.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/support.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/sv.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/time.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/uuid.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/support/uuid.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_buf.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_buf.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_compat.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_config.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_cred.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_frw.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_frw.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_fs_subr.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_globals.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_iget.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_iops.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_mountops.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_mountops.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_node.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_stats.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_stats.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_super.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_super.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_sysctl.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_version.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_vfs.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_vfs.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_vnode.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_vnode.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfs_vnops.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_acl.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_acl.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_ag.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_alloc.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_alloc.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_alloc_btree.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_alloc_btree.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_arch.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_attr.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_attr.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_attr_leaf.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_attr_leaf.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_attr_sf.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_behavior.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_behavior.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_bit.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_bit.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_bmap.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_bmap.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_bmap_btree.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_bmap_btree.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_btree.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_btree.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_buf_item.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_buf_item.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_cap.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_cap.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_clnt.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_da_btree.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_da_btree.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dfrag.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dfrag.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dinode.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir2.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir2.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir2_block.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir2_block.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir2_data.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir2_data.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir2_leaf.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir2_leaf.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir2_node.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir2_node.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir2_sf.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir2_sf.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir2_trace.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir2_trace.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir_leaf.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir_leaf.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dir_sf.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dmapi.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_dmops.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_error.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_error.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_extfree_item.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_extfree_item.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_fs.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_fsops.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_fsops.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_ialloc.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_ialloc.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_ialloc_btree.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_ialloc_btree.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_imap.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_inode.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_inode.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_inode_item.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_inode_item.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_inum.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_iocore.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_iomap.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_iomap.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_itable.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_itable.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_log.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_log.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_log_priv.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_log_recover.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_log_recover.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_mac.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_mac.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_macros.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_macros.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_mount.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_mount.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_qmops.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_quota.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_refcache.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_refcache.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_rename.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_rtalloc.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_rtalloc.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_rw.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_rw.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_sb.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_trans.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_trans.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_trans_ail.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_trans_buf.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_trans_extfree.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_trans_inode.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_trans_item.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_trans_priv.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_trans_space.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_types.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_utils.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_utils.h#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_vfsops.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfs_vnodeops.c#1 branch .. //depot/user/jhb/acpipci/gnu/fs/xfs/xfsidbg.c#1 branch .. //depot/user/jhb/acpipci/i386/i386/local_apic.c#118 integrate .. //depot/user/jhb/acpipci/i386/isa/atpic.c#90 integrate .. //depot/user/jhb/acpipci/i386/isa/clock.c#58 integrate .. //depot/user/jhb/acpipci/i386/pci/pci_cfgreg.c#42 integrate .. //depot/user/jhb/acpipci/kern/kern_condvar.c#21 integrate .. //depot/user/jhb/acpipci/kern/kern_exec.c#51 integrate .. //depot/user/jhb/acpipci/kern/kern_exit.c#46 integrate .. //depot/user/jhb/acpipci/kern/kern_mbuf.c#11 integrate .. //depot/user/jhb/acpipci/kern/kern_mutex.c#29 integrate .. //depot/user/jhb/acpipci/kern/kern_sig.c#58 integrate .. //depot/user/jhb/acpipci/kern/kern_sx.c#9 integrate .. //depot/user/jhb/acpipci/kern/kern_thread.c#60 integrate .. //depot/user/jhb/acpipci/kern/kern_time.c#23 integrate .. //depot/user/jhb/acpipci/kern/uipc_mbuf.c#31 integrate .. //depot/user/jhb/acpipci/kern/uipc_mqueue.c#3 integrate .. //depot/user/jhb/acpipci/kern/vfs_default.c#31 integrate .. //depot/user/jhb/acpipci/kern/vfs_mount.c#41 integrate .. //depot/user/jhb/acpipci/kern/vfs_vnops.c#33 integrate .. //depot/user/jhb/acpipci/kern/vnode_if.src#20 integrate .. //depot/user/jhb/acpipci/modules/Makefile#70 integrate .. //depot/user/jhb/acpipci/modules/ti/Makefile#4 integrate .. //depot/user/jhb/acpipci/modules/xfs/Makefile#1 branch .. //depot/user/jhb/acpipci/net/bpf_filter.c#4 integrate .. //depot/user/jhb/acpipci/net/if_bridge.c#19 integrate .. //depot/user/jhb/acpipci/net/if_bridgevar.h#5 integrate .. //depot/user/jhb/acpipci/net80211/_ieee80211.h#4 integrate .. //depot/user/jhb/acpipci/net80211/ieee80211.c#18 integrate .. //depot/user/jhb/acpipci/net80211/ieee80211_crypto_ccmp.c#5 integrate .. //depot/user/jhb/acpipci/net80211/ieee80211_crypto_tkip.c#5 integrate .. //depot/user/jhb/acpipci/net80211/ieee80211_crypto_wep.c#4 integrate .. //depot/user/jhb/acpipci/net80211/ieee80211_freebsd.c#7 integrate .. //depot/user/jhb/acpipci/net80211/ieee80211_input.c#24 integrate .. //depot/user/jhb/acpipci/net80211/ieee80211_ioctl.c#26 integrate .. //depot/user/jhb/acpipci/net80211/ieee80211_ioctl.h#11 integrate .. //depot/user/jhb/acpipci/net80211/ieee80211_node.c#24 integrate .. //depot/user/jhb/acpipci/net80211/ieee80211_proto.c#16 integrate .. //depot/user/jhb/acpipci/net80211/ieee80211_proto.h#11 integrate .. //depot/user/jhb/acpipci/net80211/ieee80211_var.h#18 integrate .. //depot/user/jhb/acpipci/netgraph/ng_hole.c#4 integrate .. //depot/user/jhb/acpipci/netinet/ip_fw.h#22 integrate .. //depot/user/jhb/acpipci/netinet/ip_fw2.c#57 integrate .. //depot/user/jhb/acpipci/netinet6/ip6_mroute.c#17 integrate .. //depot/user/jhb/acpipci/netinet6/nd6_nbr.c#20 integrate .. //depot/user/jhb/acpipci/nfsclient/nfs_socket.c#32 integrate .. //depot/user/jhb/acpipci/pc98/include/param.h#2 integrate .. //depot/user/jhb/acpipci/pci/amdpm.c#10 integrate .. //depot/user/jhb/acpipci/pci/if_ti.c#32 delete .. //depot/user/jhb/acpipci/pci/if_tireg.h#10 delete .. //depot/user/jhb/acpipci/pci/ti_fw.h#2 delete .. //depot/user/jhb/acpipci/pci/ti_fw2.h#2 delete .. //depot/user/jhb/acpipci/sparc64/pci/ofw_pcib_subr.c#6 integrate .. //depot/user/jhb/acpipci/sys/condvar.h#6 integrate .. //depot/user/jhb/acpipci/sys/lock.h#11 integrate .. //depot/user/jhb/acpipci/sys/mbuf.h#38 integrate .. //depot/user/jhb/acpipci/sys/mount.h#30 integrate .. //depot/user/jhb/acpipci/sys/param.h#51 integrate .. //depot/user/jhb/acpipci/sys/signal.h#17 integrate .. //depot/user/jhb/acpipci/sys/timers.h#5 integrate .. //depot/user/jhb/acpipci/sys/vnode.h#42 integrate .. //depot/user/jhb/acpipci/tools/vnode_if.awk#14 integrate .. //depot/user/jhb/acpipci/ufs/ufs/quota.h#7 integrate .. //depot/user/jhb/acpipci/ufs/ufs/ufs_quota.c#15 integrate .. //depot/user/jhb/acpipci/ufs/ufs/ufs_vfsops.c#11 integrate .. //depot/user/jhb/acpipci/vm/vm_fault.c#30 integrate .. //depot/user/jhb/acpipci/vm/vm_page.c#42 integrate .. //depot/user/jhb/agp/amd64/amd64/apic_vector.S#4 integrate .. //depot/user/jhb/agp/amd64/amd64/db_trace.c#6 integrate .. //depot/user/jhb/agp/amd64/amd64/intr_machdep.c#7 integrate .. //depot/user/jhb/agp/amd64/amd64/local_apic.c#5 integrate .. //depot/user/jhb/agp/amd64/amd64/mp_machdep.c#6 integrate .. //depot/user/jhb/agp/amd64/amd64/trap.c#6 integrate .. //depot/user/jhb/agp/amd64/include/apicvar.h#5 integrate .. //depot/user/jhb/agp/amd64/include/asmacros.h#2 integrate .. //depot/user/jhb/agp/amd64/include/frame.h#3 integrate .. //depot/user/jhb/agp/amd64/include/intr_machdep.h#5 integrate .. //depot/user/jhb/agp/amd64/include/smp.h#3 integrate .. //depot/user/jhb/agp/amd64/isa/atpic.c#5 integrate .. //depot/user/jhb/agp/amd64/isa/atpic_vector.S#2 integrate .. //depot/user/jhb/agp/amd64/isa/clock.c#5 integrate .. //depot/user/jhb/agp/amd64/isa/icu.h#2 integrate .. //depot/user/jhb/agp/arm/arm/bcopyinout_xscale.S#4 integrate .. //depot/user/jhb/agp/arm/include/atomic.h#4 integrate .. //depot/user/jhb/agp/arm/xscale/i80321/i80321_aau.c#2 integrate .. //depot/user/jhb/agp/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/user/jhb/agp/arm/xscale/i80321/i80321_timer.c#3 integrate .. //depot/user/jhb/agp/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/user/jhb/agp/arm/xscale/i80321/std.iq31244#3 integrate .. //depot/user/jhb/agp/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/user/jhb/agp/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/user/jhb/agp/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/user/jhb/agp/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/user/jhb/agp/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/user/jhb/agp/compat/freebsd32/syscalls.master#6 integrate .. //depot/user/jhb/agp/compat/linprocfs/linprocfs.c#6 integrate .. //depot/user/jhb/agp/compat/linux/linux_ioctl.c#5 integrate .. //depot/user/jhb/agp/compat/linux/linux_util.h#4 integrate .. //depot/user/jhb/agp/conf/NOTES#7 integrate .. //depot/user/jhb/agp/conf/files#13 integrate .. //depot/user/jhb/agp/conf/kern.pre.mk#6 integrate .. //depot/user/jhb/agp/conf/options#8 integrate .. //depot/user/jhb/agp/conf/options.amd64#5 integrate .. //depot/user/jhb/agp/conf/options.arm#5 integrate .. //depot/user/jhb/agp/conf/options.i386#8 integrate .. //depot/user/jhb/agp/conf/options.pc98#8 integrate .. //depot/user/jhb/agp/dev/acpica/acpi_perf.c#2 integrate .. //depot/user/jhb/agp/dev/amr/amr.c#8 integrate .. //depot/user/jhb/agp/dev/amr/amr_cam.c#5 integrate .. //depot/user/jhb/agp/dev/amr/amr_disk.c#3 integrate .. //depot/user/jhb/agp/dev/amr/amr_pci.c#6 integrate .. //depot/user/jhb/agp/dev/amr/amrio.h#3 integrate .. //depot/user/jhb/agp/dev/amr/amrreg.h#3 integrate .. //depot/user/jhb/agp/dev/amr/amrvar.h#6 integrate .. //depot/user/jhb/agp/dev/ata/ata-chipset.c#7 integrate .. //depot/user/jhb/agp/dev/ata/ata-pci.h#6 integrate .. //depot/user/jhb/agp/dev/ata/ata-raid.c#6 integrate .. //depot/user/jhb/agp/dev/ata/ata-raid.h#5 integrate .. //depot/user/jhb/agp/dev/bge/if_bge.c#8 integrate .. //depot/user/jhb/agp/dev/bge/if_bgereg.h#6 integrate .. //depot/user/jhb/agp/dev/em/README#3 integrate .. //depot/user/jhb/agp/dev/fxp/if_fxp.c#7 integrate .. //depot/user/jhb/agp/dev/mii/brgphy.c#4 integrate .. //depot/user/jhb/agp/dev/nve/if_nve.c#6 integrate .. //depot/user/jhb/agp/dev/puc/pucdata.c#5 integrate .. //depot/user/jhb/agp/dev/ti/if_ti.c#1 branch .. //depot/user/jhb/agp/dev/ti/if_tireg.h#1 branch .. //depot/user/jhb/agp/dev/ti/ti_fw.h#1 branch .. //depot/user/jhb/agp/dev/ti/ti_fw2.h#1 branch .. //depot/user/jhb/agp/dev/uart/uart_cpu_alpha.c#5 integrate .. //depot/user/jhb/agp/dev/uart/uart_cpu_amd64.c#5 integrate .. //depot/user/jhb/agp/dev/uart/uart_cpu_i386.c#5 integrate .. //depot/user/jhb/agp/dev/uart/uart_cpu_ia64.c#5 integrate .. //depot/user/jhb/agp/dev/uart/uart_cpu_pc98.c#5 integrate .. //depot/user/jhb/agp/dev/uart/uart_subr.c#4 integrate .. //depot/user/jhb/agp/dev/usb/usb_quirks.c#6 integrate .. //depot/user/jhb/agp/dev/usb/usb_quirks.h#4 integrate .. //depot/user/jhb/agp/dev/usb/usb_subr.c#7 integrate .. //depot/user/jhb/agp/dev/usb/usbdi.c#5 integrate .. //depot/user/jhb/agp/fs/nullfs/null_vfsops.c#6 integrate .. //depot/user/jhb/agp/fs/nwfs/nwfs_vfsops.c#6 integrate .. //depot/user/jhb/agp/fs/smbfs/smbfs_vfsops.c#8 integrate .. //depot/user/jhb/agp/geom/nop/g_nop.c#4 integrate .. //depot/user/jhb/agp/geom/nop/g_nop.h#4 integrate .. //depot/user/jhb/agp/geom/zero/g_zero.c#2 integrate .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/atomic.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/debug.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/debug.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/kdb.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/kdb.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/kmem.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/kmem.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/ktrace.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/ktrace.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/move.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/mrlock.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/mrlock.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/mutex.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/rwlock.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/rwsem.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/sema.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/spin.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/support.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/sv.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/time.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/uuid.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/support/uuid.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_buf.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_buf.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_compat.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_config.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_cred.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_frw.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_frw.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_fs_subr.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_globals.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_iget.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_iops.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_mountops.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_mountops.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_node.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_stats.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_stats.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_super.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_super.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_sysctl.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_version.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_vfs.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_vfs.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_vnode.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_vnode.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfs_vnops.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_acl.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_acl.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_ag.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_alloc.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_alloc.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_alloc_btree.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_alloc_btree.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_arch.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_attr.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_attr.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_attr_leaf.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_attr_leaf.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_attr_sf.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_behavior.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_behavior.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_bit.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_bit.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_bmap.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_bmap.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_bmap_btree.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_bmap_btree.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_btree.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_btree.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_buf_item.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_buf_item.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_cap.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_cap.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_clnt.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_da_btree.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_da_btree.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dfrag.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dfrag.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dinode.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir2.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir2.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir2_block.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir2_block.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir2_data.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir2_data.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir2_leaf.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir2_leaf.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir2_node.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir2_node.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir2_sf.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir2_sf.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir2_trace.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir2_trace.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir_leaf.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir_leaf.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dir_sf.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dmapi.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_dmops.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_error.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_error.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_extfree_item.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_extfree_item.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_fs.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_fsops.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_fsops.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_ialloc.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_ialloc.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_ialloc_btree.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_ialloc_btree.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_imap.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_inode.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_inode.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_inode_item.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_inode_item.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_inum.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_iocore.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_iomap.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_iomap.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_itable.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_itable.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_log.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_log.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_log_priv.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_log_recover.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_log_recover.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_mac.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_mac.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_macros.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_macros.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_mount.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_mount.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_qmops.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_quota.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_refcache.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_refcache.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_rename.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_rtalloc.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_rtalloc.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_rw.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_rw.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_sb.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_trans.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_trans.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_trans_ail.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_trans_buf.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_trans_extfree.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_trans_inode.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_trans_item.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_trans_priv.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_trans_space.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_types.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_utils.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_utils.h#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_vfsops.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfs_vnodeops.c#1 branch .. //depot/user/jhb/agp/gnu/fs/xfs/xfsidbg.c#1 branch .. //depot/user/jhb/agp/i386/i386/local_apic.c#7 integrate .. //depot/user/jhb/agp/i386/isa/atpic.c#5 integrate .. //depot/user/jhb/agp/i386/isa/clock.c#5 integrate .. //depot/user/jhb/agp/i386/pci/pci_cfgreg.c#7 integrate .. //depot/user/jhb/agp/kern/kern_condvar.c#4 integrate .. //depot/user/jhb/agp/kern/kern_exec.c#8 integrate .. //depot/user/jhb/agp/kern/kern_exit.c#8 integrate .. //depot/user/jhb/agp/kern/kern_mbuf.c#5 integrate .. //depot/user/jhb/agp/kern/kern_mutex.c#5 integrate .. //depot/user/jhb/agp/kern/kern_sig.c#9 integrate .. //depot/user/jhb/agp/kern/kern_sx.c#3 integrate .. //depot/user/jhb/agp/kern/kern_thread.c#8 integrate .. //depot/user/jhb/agp/kern/kern_time.c#8 integrate .. //depot/user/jhb/agp/kern/uipc_mbuf.c#7 integrate .. //depot/user/jhb/agp/kern/uipc_mqueue.c#2 integrate .. //depot/user/jhb/agp/kern/vfs_default.c#6 integrate .. //depot/user/jhb/agp/kern/vfs_mount.c#9 integrate .. //depot/user/jhb/agp/kern/vfs_vnops.c#6 integrate .. //depot/user/jhb/agp/kern/vnode_if.src#5 integrate .. //depot/user/jhb/agp/modules/Makefile#8 integrate .. //depot/user/jhb/agp/modules/ti/Makefile#4 integrate .. //depot/user/jhb/agp/modules/xfs/Makefile#1 branch .. //depot/user/jhb/agp/net/bpf_filter.c#3 integrate .. //depot/user/jhb/agp/net/if_bridge.c#4 integrate .. //depot/user/jhb/agp/net/if_bridgevar.h#3 integrate .. //depot/user/jhb/agp/net80211/_ieee80211.h#3 integrate .. //depot/user/jhb/agp/net80211/ieee80211.c#5 integrate .. //depot/user/jhb/agp/net80211/ieee80211_crypto_ccmp.c#3 integrate .. //depot/user/jhb/agp/net80211/ieee80211_crypto_tkip.c#3 integrate .. //depot/user/jhb/agp/net80211/ieee80211_crypto_wep.c#3 integrate .. //depot/user/jhb/agp/net80211/ieee80211_freebsd.c#4 integrate .. //depot/user/jhb/agp/net80211/ieee80211_input.c#5 integrate .. //depot/user/jhb/agp/net80211/ieee80211_ioctl.c#5 integrate .. //depot/user/jhb/agp/net80211/ieee80211_ioctl.h#4 integrate .. //depot/user/jhb/agp/net80211/ieee80211_node.c#5 integrate .. //depot/user/jhb/agp/net80211/ieee80211_proto.c#5 integrate .. //depot/user/jhb/agp/net80211/ieee80211_proto.h#4 integrate .. //depot/user/jhb/agp/net80211/ieee80211_var.h#5 integrate .. //depot/user/jhb/agp/netgraph/ng_hole.c#3 integrate .. //depot/user/jhb/agp/netinet/ip_fw.h#5 integrate .. //depot/user/jhb/agp/netinet/ip_fw2.c#9 integrate .. //depot/user/jhb/agp/netinet6/ip6_mroute.c#3 integrate .. //depot/user/jhb/agp/netinet6/nd6_nbr.c#3 integrate .. //depot/user/jhb/agp/nfsclient/nfs_socket.c#9 integrate .. //depot/user/jhb/agp/pc98/include/param.h#2 integrate .. //depot/user/jhb/agp/pci/amdpm.c#3 integrate .. //depot/user/jhb/agp/pci/if_ti.c#7 delete .. //depot/user/jhb/agp/pci/if_tireg.h#3 delete .. //depot/user/jhb/agp/pci/ti_fw.h#2 delete .. //depot/user/jhb/agp/pci/ti_fw2.h#2 delete .. //depot/user/jhb/agp/sparc64/pci/ofw_pcib_subr.c#4 integrate .. //depot/user/jhb/agp/sys/condvar.h#2 integrate .. //depot/user/jhb/agp/sys/lock.h#4 integrate .. //depot/user/jhb/agp/sys/mbuf.h#8 integrate .. //depot/user/jhb/agp/sys/mount.h#8 integrate .. //depot/user/jhb/agp/sys/param.h#9 integrate .. //depot/user/jhb/agp/sys/signal.h#6 integrate .. //depot/user/jhb/agp/sys/timers.h#3 integrate .. //depot/user/jhb/agp/sys/vnode.h#6 integrate .. //depot/user/jhb/agp/tools/vnode_if.awk#4 integrate .. //depot/user/jhb/agp/ufs/ufs/quota.h#3 integrate .. //depot/user/jhb/agp/ufs/ufs/ufs_quota.c#4 integrate .. //depot/user/jhb/agp/ufs/ufs/ufs_vfsops.c#5 integrate .. //depot/user/jhb/agp/vm/vm_fault.c#5 integrate .. //depot/user/jhb/agp/vm/vm_page.c#7 integrate .. //depot/user/jhb/pat/amd64/amd64/apic_vector.S#5 integrate .. //depot/user/jhb/pat/amd64/amd64/db_trace.c#3 integrate .. //depot/user/jhb/pat/amd64/amd64/intr_machdep.c#5 integrate .. //depot/user/jhb/pat/amd64/amd64/local_apic.c#4 integrate .. //depot/user/jhb/pat/amd64/amd64/mp_machdep.c#5 integrate .. //depot/user/jhb/pat/amd64/amd64/trap.c#5 integrate .. //depot/user/jhb/pat/amd64/include/apicvar.h#3 integrate .. //depot/user/jhb/pat/amd64/include/asmacros.h#2 integrate .. //depot/user/jhb/pat/amd64/include/frame.h#2 integrate .. //depot/user/jhb/pat/amd64/include/intr_machdep.h#3 integrate .. //depot/user/jhb/pat/amd64/include/smp.h#3 integrate .. //depot/user/jhb/pat/amd64/isa/atpic.c#4 integrate .. //depot/user/jhb/pat/amd64/isa/atpic_vector.S#2 integrate .. //depot/user/jhb/pat/amd64/isa/clock.c#3 integrate .. //depot/user/jhb/pat/amd64/isa/icu.h#2 integrate .. //depot/user/jhb/pat/arm/arm/bcopyinout_xscale.S#3 integrate .. //depot/user/jhb/pat/arm/include/atomic.h#4 integrate .. //depot/user/jhb/pat/arm/xscale/i80321/i80321_aau.c#2 integrate .. //depot/user/jhb/pat/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/user/jhb/pat/arm/xscale/i80321/i80321_timer.c#4 integrate .. //depot/user/jhb/pat/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/user/jhb/pat/arm/xscale/i80321/std.iq31244#2 integrate .. //depot/user/jhb/pat/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/user/jhb/pat/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/user/jhb/pat/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/user/jhb/pat/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/user/jhb/pat/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/user/jhb/pat/compat/freebsd32/syscalls.master#4 integrate .. //depot/user/jhb/pat/compat/linprocfs/linprocfs.c#3 integrate .. //depot/user/jhb/pat/compat/linux/linux_ioctl.c#3 integrate .. //depot/user/jhb/pat/compat/linux/linux_util.h#2 integrate .. //depot/user/jhb/pat/conf/NOTES#4 integrate .. //depot/user/jhb/pat/conf/files#10 integrate .. //depot/user/jhb/pat/conf/kern.pre.mk#4 integrate .. //depot/user/jhb/pat/conf/options#6 integrate .. //depot/user/jhb/pat/conf/options.amd64#5 integrate .. //depot/user/jhb/pat/conf/options.arm#2 integrate .. //depot/user/jhb/pat/conf/options.i386#7 integrate .. //depot/user/jhb/pat/conf/options.pc98#7 integrate .. //depot/user/jhb/pat/dev/acpica/acpi_perf.c#3 integrate .. //depot/user/jhb/pat/dev/amr/amr.c#5 integrate .. //depot/user/jhb/pat/dev/amr/amr_cam.c#4 integrate .. //depot/user/jhb/pat/dev/amr/amr_disk.c#3 integrate .. //depot/user/jhb/pat/dev/amr/amr_pci.c#4 integrate .. //depot/user/jhb/pat/dev/amr/amrio.h#2 integrate .. //depot/user/jhb/pat/dev/amr/amrreg.h#2 integrate .. //depot/user/jhb/pat/dev/amr/amrvar.h#4 integrate .. //depot/user/jhb/pat/dev/ata/ata-chipset.c#4 integrate .. //depot/user/jhb/pat/dev/ata/ata-pci.h#4 integrate .. //depot/user/jhb/pat/dev/ata/ata-raid.c#5 integrate .. //depot/user/jhb/pat/dev/ata/ata-raid.h#4 integrate .. //depot/user/jhb/pat/dev/bge/if_bge.c#6 integrate .. //depot/user/jhb/pat/dev/bge/if_bgereg.h#4 integrate .. //depot/user/jhb/pat/dev/em/README#3 integrate .. //depot/user/jhb/pat/dev/fxp/if_fxp.c#4 integrate .. //depot/user/jhb/pat/dev/mii/brgphy.c#4 integrate .. //depot/user/jhb/pat/dev/nve/if_nve.c#8 integrate .. //depot/user/jhb/pat/dev/puc/pucdata.c#4 integrate .. //depot/user/jhb/pat/dev/ti/if_ti.c#1 branch .. //depot/user/jhb/pat/dev/ti/if_tireg.h#1 branch .. //depot/user/jhb/pat/dev/ti/ti_fw.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 15 01:30:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A0B716A423; Thu, 15 Dec 2005 01:30:17 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 CB0F616A41F for ; Thu, 15 Dec 2005 01:30:16 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7979143D5D for ; Thu, 15 Dec 2005 01:30:16 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBF1UGwi017098 for ; Thu, 15 Dec 2005 01:30:16 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBF1UGl2017094 for perforce@freebsd.org; Thu, 15 Dec 2005 01:30:16 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 15 Dec 2005 01:30:16 GMT Message-Id: <200512150130.jBF1UGl2017094@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 88213 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: Thu, 15 Dec 2005 01:30:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=88213 Change 88213 by soc-andrew@soc-andrew_serv on 2005/12/15 01:29:20 MAKE_FLOPPIES dosn't need to be exported as it will be defined in the chroot Makefile Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#22 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#22 (text+ko) ==== @@ -458,7 +458,6 @@ HTTP_PROXY \ KERNELS \ KERNEL_FLAGS \ - MAKE_FLOPPIES \ MAKE_ISOS \ NOCDROM \ NODOC \ From owner-p4-projects@FreeBSD.ORG Thu Dec 15 01:59:56 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0660516A422; Thu, 15 Dec 2005 01:59:56 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 C3C3C16A41F for ; Thu, 15 Dec 2005 01:59:55 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9501B43D6B for ; Thu, 15 Dec 2005 01:59:53 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBF1xrNn019149 for ; Thu, 15 Dec 2005 01:59:53 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBF1xrYw019146 for perforce@freebsd.org; Thu, 15 Dec 2005 01:59:53 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 15 Dec 2005 01:59:53 GMT Message-Id: <200512150159.jBF1xrYw019146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 88216 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: Thu, 15 Dec 2005 01:59:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=88216 Change 88216 by soc-andrew@soc-andrew_serv on 2005/12/15 01:59:00 Update the patch needed to be applyed to RELENG_6 to build a BSD Installer release Affected files ... .. //depot/projects/soc2005/bsdinstaller/scripts/RELENG_6_release_Makefile.patch#2 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/scripts/RELENG_6_release_Makefile.patch#2 (text+ko) ==== @@ -1,15 +1,23 @@ Index: release/Makefile =================================================================== RCS file: /cvsroot/src/release/Makefile,v -retrieving revision 1.853.2.16 -diff -u -3 -p -u -r1.853.2.16 Makefile ---- release/Makefile 5 May 2005 00:53:29 -0000 1.853.2.16 -+++ release/Makefile 2 Jul 2005 06:41:02 -0000 -@@ -443,6 +443,7 @@ release rerelease: +retrieving revision 1.887.2.3 +diff -u -3 -p -u -r1.887.2.3 Makefile +--- release/Makefile 16 Nov 2005 08:03:33 -0000 1.887.2.3 ++++ release/Makefile 15 Dec 2005 01:56:14 -0000 +@@ -447,6 +447,7 @@ release rerelease: + echo "_RELTARGET=\$${1:-doRELEASE}" >> ${_MK} .for var in \ AUTO_KEYBOARD_DETECT \ ++ BSDINSTALLER \ BUILDNAME \ -+ BSDINSTALLER \ CD_PACKAGE_TREE \ DISTRIBUTIONS \ - DOC_LANG \ +@@ -458,7 +459,6 @@ release rerelease: + HTTP_PROXY \ + KERNELS \ + KERNEL_FLAGS \ +- MAKE_FLOPPIES \ + MAKE_ISOS \ + NOCDROM \ + NODOC \ From owner-p4-projects@FreeBSD.ORG Thu Dec 15 02:01:58 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AB9C16A422; Thu, 15 Dec 2005 02:01:57 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 2D74C16A41F for ; Thu, 15 Dec 2005 02:01:57 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A840043D5C for ; Thu, 15 Dec 2005 02:01:56 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBF21uY3019308 for ; Thu, 15 Dec 2005 02:01:56 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBF21uPu019305 for perforce@freebsd.org; Thu, 15 Dec 2005 02:01:56 GMT (envelope-from soc-andrew@freebsd.org) Date: Thu, 15 Dec 2005 02:01:56 GMT Message-Id: <200512150201.jBF21uPu019305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 88217 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: Thu, 15 Dec 2005 02:01:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=88217 Change 88217 by soc-andrew@soc-andrew_serv on 2005/12/15 02:01:20 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#23 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/alpha/boot_crunch.conf#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#11 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#23 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.892 2005/11/03 07:27:50 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.893 2005/12/15 01:14:35 iedowse Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -713,7 +713,6 @@ cp ${.CURDIR}/../etc/defaults/pccard.conf \ ${RD}/mfsfd/etc/defaults/pccard.conf .endif - cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf cp ${.CURDIR}/../etc/master.passwd ${RD}/mfsfd/etc/master.passwd cp ${RD}/trees/base/etc/*pwd.db ${RD}/mfsfd/etc/ ( for F in defaults/rc.conf netconfig protocols ; do \ ==== //depot/projects/soc2005/bsdinstaller/src/release/alpha/boot_crunch.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/alpha/boot_crunch.conf,v 1.55 2004/10/01 07:54:36 ru Exp $ +# $FreeBSD: src/release/alpha/boot_crunch.conf,v 1.56 2005/12/15 01:04:49 iedowse Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -38,7 +38,6 @@ progs arp progs ppp progs sysinstall -progs usbd progs usbdevs libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph ==== //depot/projects/soc2005/bsdinstaller/src/release/amd64/boot_crunch.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.59 2004/10/01 07:54:36 ru Exp $ +# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.60 2005/12/15 01:04:49 iedowse Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -38,7 +38,6 @@ progs arp progs ppp progs sysinstall -progs usbd progs usbdevs libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -265,7 +265,7 @@ that. Kernel build times halved when I went to 32 Mbytes. Note that the SRM console steals 2Mbyte from the total system memory (and keeps it). For more serious work 128 Mbytes or more are recommended. - Although Alpha machines typically can accomodate large to very large + Although Alpha machines typically can accommodate large to very large physical memory sizes, &os; is limited to 1 or 2 Gbytes (dependent on the core chipset) of RAM. This restriction is due to the current implementation of the VM system. @@ -2108,7 +2108,7 @@ power it on/off remotely, reset it etc. See also the description for the RMC in the DS10 section of this document. RCM versus RMC is not a typo, the various documentation I consulted used both acronyms - interchangably. Note that if you want remote power on/off to function + interchangeably. Note that if you want remote power on/off to function you need to connect a small DC adapter to the machine in order to have the RCM logic powered. You need to supply 9-12V DC to the small inlet located next to the keyboard connector. @@ -2608,7 +2608,7 @@ driver). Some new SRM versions are known to recognize the Intel 8255x Ethernet chips as driven by the &os; &man.fxp.4; driver. But beware: the &man.fxp.4; driver is reported not to work correctly - with &os; (although it works excellently on &os;/x86). + with &os;/alpha (although it works excellently on &os;/x86). In general the SRM console emulates a VGA-compatibility mode on PCI VGA cards. This is, however, not guaranteed to work by ==== //depot/projects/soc2005/bsdinstaller/src/release/i386/boot_crunch.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.59 2004/10/01 07:54:36 ru Exp $ +# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.60 2005/12/15 01:04:50 iedowse Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -38,7 +38,6 @@ progs arp progs ppp progs sysinstall -progs usbd progs usbdevs libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph ==== //depot/projects/soc2005/bsdinstaller/src/release/ia64/boot_crunch.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.9 2004/10/01 07:54:37 ru Exp $ +# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.10 2005/12/15 01:04:50 iedowse Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -40,7 +40,6 @@ progs arp progs ppp progs sysinstall -progs usbd progs usbdevs libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph ==== //depot/projects/soc2005/bsdinstaller/src/release/powerpc/boot_crunch.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/powerpc/boot_crunch.conf,v 1.3 2004/10/01 07:54:37 ru Exp $ +# $FreeBSD: src/release/powerpc/boot_crunch.conf,v 1.4 2005/12/15 01:04:50 iedowse Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -40,7 +40,6 @@ progs arp progs ppp progs sysinstall -progs usbd progs usbdevs libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph ==== //depot/projects/soc2005/bsdinstaller/src/release/sparc64/boot_crunch.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/sparc64/boot_crunch.conf,v 1.7 2004/10/01 07:54:37 ru Exp $ +# $FreeBSD: src/release/sparc64/boot_crunch.conf,v 1.8 2005/12/15 01:04:50 iedowse Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -38,7 +38,6 @@ progs arp progs ppp progs sysinstall -progs usbd progs usbdevs libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.340 2005/10/17 20:47:44 phk Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.341 2005/12/15 01:04:49 iedowse Exp $ # XXX MISSING: mkproto SUBDIR= ac \ @@ -170,7 +170,6 @@ trpt \ tzsetup \ ugidfw \ - ${_usbd} \ ${_usbdevs} \ vidcontrol \ vipw \ @@ -256,7 +255,6 @@ .endif .if !defined(NO_USB) -_usbd= usbd _usbdevs= usbdevs .endif From owner-p4-projects@FreeBSD.ORG Thu Dec 15 02:51:44 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0424716A422; Thu, 15 Dec 2005 02:51:44 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 AE48116A41F for ; Thu, 15 Dec 2005 02:51:43 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41DA243D8B for ; Thu, 15 Dec 2005 02:51:17 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBF2pG18021279 for ; Thu, 15 Dec 2005 02:51:16 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBF2ovJA021272 for perforce@freebsd.org; Thu, 15 Dec 2005 02:50:57 GMT (envelope-from marcel@freebsd.org) Date: Thu, 15 Dec 2005 02:50:57 GMT Message-Id: <200512150250.jBF2ovJA021272@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 88219 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: Thu, 15 Dec 2005 02:51:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=88219 Change 88219 by marcel@marcel_nfs on 2005/12/15 02:49:57 IFC @88215 Affected files ... .. //depot/projects/uart/alpha/alpha/busdma_machdep.c#9 integrate .. //depot/projects/uart/alpha/alpha/clock.c#6 integrate .. //depot/projects/uart/alpha/alpha/db_trace.c#7 integrate .. //depot/projects/uart/alpha/alpha/interrupt.c#7 integrate .. //depot/projects/uart/alpha/alpha/machdep.c#15 integrate .. //depot/projects/uart/alpha/alpha/mp_machdep.c#13 integrate .. //depot/projects/uart/alpha/alpha/pmap.c#17 integrate .. //depot/projects/uart/alpha/alpha/promcons.c#6 integrate .. //depot/projects/uart/alpha/alpha/sgmap.c#4 integrate .. //depot/projects/uart/alpha/alpha/trap.c#7 integrate .. //depot/projects/uart/alpha/conf/DEFAULTS#1 branch .. //depot/projects/uart/alpha/conf/GENERIC#11 integrate .. //depot/projects/uart/alpha/conf/MAC#1 branch .. //depot/projects/uart/alpha/conf/NOTES#6 integrate .. //depot/projects/uart/alpha/include/atomic.h#5 integrate .. //depot/projects/uart/alpha/include/chipset.h#2 integrate .. //depot/projects/uart/alpha/include/param.h#6 integrate .. //depot/projects/uart/alpha/include/pmap.h#5 integrate .. //depot/projects/uart/alpha/include/smp.h#4 integrate .. //depot/projects/uart/alpha/include/vmparam.h#4 integrate .. //depot/projects/uart/alpha/isa/isa.c#4 integrate .. //depot/projects/uart/alpha/linux/linux_sysvec.c#7 integrate .. //depot/projects/uart/alpha/mcbus/mcpcia.c#5 integrate .. //depot/projects/uart/alpha/osf1/osf1_ioctl.c#5 integrate .. //depot/projects/uart/alpha/osf1/osf1_misc.c#8 integrate .. //depot/projects/uart/alpha/osf1/osf1_signal.c#6 integrate .. //depot/projects/uart/alpha/osf1/osf1_signal.h#2 integrate .. //depot/projects/uart/alpha/pci/apecs.c#5 integrate .. //depot/projects/uart/alpha/pci/cia.c#5 integrate .. //depot/projects/uart/alpha/pci/irongate.c#4 integrate .. //depot/projects/uart/alpha/pci/lca.c#4 integrate .. //depot/projects/uart/alpha/pci/pcibus.c#5 integrate .. //depot/projects/uart/alpha/pci/t2.c#6 integrate .. //depot/projects/uart/alpha/pci/tsunami.c#5 integrate .. //depot/projects/uart/alpha/pci/tsunami_pci.c#4 integrate .. //depot/projects/uart/alpha/tlsb/dwlpx.c#5 integrate .. //depot/projects/uart/alpha/tlsb/zs_tlsb.c#5 integrate .. //depot/projects/uart/amd64/acpica/OsdEnvironment.c#5 integrate .. //depot/projects/uart/amd64/acpica/acpi_machdep.c#6 integrate .. //depot/projects/uart/amd64/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/uart/amd64/acpica/madt.c#4 integrate .. //depot/projects/uart/amd64/amd64/apic_vector.S#5 integrate .. //depot/projects/uart/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/uart/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/uart/amd64/amd64/busdma_machdep.c#12 integrate .. //depot/projects/uart/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/uart/amd64/amd64/db_trace.c#8 integrate .. //depot/projects/uart/amd64/amd64/elf_machdep.c#6 integrate .. //depot/projects/uart/amd64/amd64/gdb_machdep.c#3 integrate .. //depot/projects/uart/amd64/amd64/genassym.c#7 integrate .. //depot/projects/uart/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/uart/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/uart/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/uart/amd64/amd64/io_apic.c#5 integrate .. //depot/projects/uart/amd64/amd64/local_apic.c#6 integrate .. //depot/projects/uart/amd64/amd64/machdep.c#16 integrate .. //depot/projects/uart/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/uart/amd64/amd64/mptable.c#5 integrate .. //depot/projects/uart/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/uart/amd64/amd64/nexus.c#6 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#25 integrate .. //depot/projects/uart/amd64/amd64/support.S#6 integrate .. //depot/projects/uart/amd64/amd64/trap.c#8 integrate .. //depot/projects/uart/amd64/amd64/vm_machdep.c#11 integrate .. //depot/projects/uart/amd64/conf/DEFAULTS#1 branch .. //depot/projects/uart/amd64/conf/GENERIC#12 integrate .. //depot/projects/uart/amd64/conf/MAC#1 branch .. //depot/projects/uart/amd64/conf/NOTES#5 integrate .. //depot/projects/uart/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/uart/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/uart/amd64/ia32/ia32_syscall.c#7 integrate .. //depot/projects/uart/amd64/include/apicvar.h#6 integrate .. //depot/projects/uart/amd64/include/asmacros.h#3 integrate .. //depot/projects/uart/amd64/include/atomic.h#5 integrate .. //depot/projects/uart/amd64/include/frame.h#4 integrate .. //depot/projects/uart/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/uart/amd64/include/legacyvar.h#5 integrate .. //depot/projects/uart/amd64/include/md_var.h#5 integrate .. //depot/projects/uart/amd64/include/param.h#8 integrate .. //depot/projects/uart/amd64/include/pcb.h#3 integrate .. //depot/projects/uart/amd64/include/pmap.h#8 integrate .. //depot/projects/uart/amd64/include/smp.h#7 integrate .. //depot/projects/uart/amd64/include/specialreg.h#4 integrate .. //depot/projects/uart/amd64/isa/atpic.c#3 integrate .. //depot/projects/uart/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/uart/amd64/isa/clock.c#9 integrate .. //depot/projects/uart/amd64/isa/icu.h#3 integrate .. //depot/projects/uart/amd64/linux32/linux32_sysvec.c#7 integrate .. //depot/projects/uart/amd64/pci/pci_bus.c#9 integrate .. //depot/projects/uart/amd64/pci/pci_cfgreg.c#6 integrate .. //depot/projects/uart/arm/arm/bcopy_page.S#4 integrate .. //depot/projects/uart/arm/arm/bcopyinout.S#5 integrate .. //depot/projects/uart/arm/arm/bcopyinout_xscale.S#5 integrate .. //depot/projects/uart/arm/arm/busdma_machdep.c#8 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_arm9.S#4 integrate .. //depot/projects/uart/arm/arm/db_trace.c#6 integrate .. //depot/projects/uart/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/uart/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/uart/arm/arm/genassym.c#5 integrate .. //depot/projects/uart/arm/arm/identcpu.c#4 integrate .. //depot/projects/uart/arm/arm/in_cksum.c#5 integrate .. //depot/projects/uart/arm/arm/in_cksum_arm.S#5 integrate .. //depot/projects/uart/arm/arm/inckern.S#1 branch .. //depot/projects/uart/arm/arm/intr.c#7 integrate .. //depot/projects/uart/arm/arm/locore.S#6 integrate .. //depot/projects/uart/arm/arm/machdep.c#7 integrate .. //depot/projects/uart/arm/arm/mem.c#2 integrate .. //depot/projects/uart/arm/arm/nexus.c#4 integrate .. //depot/projects/uart/arm/arm/pmap.c#9 integrate .. //depot/projects/uart/arm/arm/support.S#5 integrate .. //depot/projects/uart/arm/arm/swtch.S#7 integrate .. //depot/projects/uart/arm/arm/trap.c#8 integrate .. //depot/projects/uart/arm/arm/undefined.c#7 integrate .. //depot/projects/uart/arm/arm/vm_machdep.c#8 integrate .. //depot/projects/uart/arm/conf/IQ31244#8 integrate .. //depot/projects/uart/arm/conf/SIMICS#5 integrate .. //depot/projects/uart/arm/include/armreg.h#3 integrate .. //depot/projects/uart/arm/include/atomic.h#6 integrate .. //depot/projects/uart/arm/include/elf.h#4 integrate .. //depot/projects/uart/arm/include/in_cksum.h#3 integrate .. //depot/projects/uart/arm/include/md_var.h#2 integrate .. //depot/projects/uart/arm/include/param.h#6 integrate .. //depot/projects/uart/arm/include/pcpu.h#3 integrate .. //depot/projects/uart/arm/include/pmap.h#7 integrate .. //depot/projects/uart/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/uart/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/uart/arm/sa11x0/sa11x0_irqhandler.c#4 integrate .. //depot/projects/uart/arm/sa11x0/sa11x0_var.h#2 integrate .. //depot/projects/uart/arm/xscale/i80321/files.i80321#3 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/uart/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/uart/arm/xscale/i80321/i80321_pci.c#4 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_space.c#4 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_timer.c#5 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321var.h#3 integrate .. //depot/projects/uart/arm/xscale/i80321/iq31244_machdep.c#10 integrate .. //depot/projects/uart/arm/xscale/i80321/iq80321.c#7 integrate .. //depot/projects/uart/arm/xscale/i80321/obio.c#3 integrate .. //depot/projects/uart/arm/xscale/i80321/obiovar.h#3 integrate .. //depot/projects/uart/arm/xscale/i80321/std.iq31244#3 integrate .. //depot/projects/uart/boot/common/help.common#5 integrate .. //depot/projects/uart/boot/common/loader.8#8 integrate .. //depot/projects/uart/boot/efi/libefi/bootinfo.c#4 integrate .. //depot/projects/uart/boot/forth/beastie.4th#6 integrate .. //depot/projects/uart/boot/forth/loader.conf#9 integrate .. //depot/projects/uart/boot/forth/loader.conf.5#5 integrate .. //depot/projects/uart/boot/i386/boot2/boot2.c#6 integrate .. //depot/projects/uart/boot/i386/libi386/bootinfo.c#5 integrate .. //depot/projects/uart/boot/i386/libi386/libi386.h#5 integrate .. //depot/projects/uart/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/uart/boot/i386/loader/Makefile#5 integrate .. //depot/projects/uart/boot/i386/loader/loader.rc#4 branch .. //depot/projects/uart/boot/i386/loader/main.c#6 integrate .. //depot/projects/uart/boot/ia64/ski/bootinfo.c#3 integrate .. //depot/projects/uart/boot/ofw/libofw/devicename.c#3 integrate .. //depot/projects/uart/boot/ofw/libofw/elf_freebsd.c#4 integrate .. //depot/projects/uart/boot/ofw/libofw/libofw.h#4 integrate .. //depot/projects/uart/boot/ofw/libofw/ofw_console.c#4 integrate .. //depot/projects/uart/boot/ofw/libofw/ofw_disk.c#4 integrate .. //depot/projects/uart/boot/ofw/libofw/ofw_memory.c#4 integrate .. //depot/projects/uart/boot/ofw/libofw/openfirm.c#4 integrate .. //depot/projects/uart/boot/pc98/Makefile.inc#3 integrate .. //depot/projects/uart/boot/pc98/boot2/io.c#5 integrate .. //depot/projects/uart/boot/pc98/libpc98/comconsole.c#5 integrate .. //depot/projects/uart/boot/pc98/loader/Makefile#5 integrate .. //depot/projects/uart/boot/pc98/loader/main.c#5 integrate .. //depot/projects/uart/boot/powerpc/loader/metadata.c#4 integrate .. //depot/projects/uart/boot/sparc64/loader/metadata.c#5 integrate .. //depot/projects/uart/cam/cam_xpt.c#9 integrate .. //depot/projects/uart/cam/scsi/scsi_cd.c#11 integrate .. //depot/projects/uart/cam/scsi/scsi_da.c#14 integrate .. //depot/projects/uart/coda/coda_psdev.c#6 integrate .. //depot/projects/uart/coda/coda_vfsops.c#9 integrate .. //depot/projects/uart/compat/freebsd32/Makefile#3 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_proto.h#10 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscall.h#10 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscalls.c#10 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_sysent.c#10 integrate .. //depot/projects/uart/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/uart/compat/ia32/ia32_signal.h#4 integrate .. //depot/projects/uart/compat/ia32/ia32_sysvec.c#5 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#14 integrate .. //depot/projects/uart/compat/linux/linux_getcwd.c#6 integrate .. //depot/projects/uart/compat/linux/linux_ioctl.c#7 integrate .. //depot/projects/uart/compat/linux/linux_misc.c#11 integrate .. //depot/projects/uart/compat/linux/linux_signal.c#5 integrate .. //depot/projects/uart/compat/linux/linux_socket.c#8 integrate .. //depot/projects/uart/compat/linux/linux_util.h#5 integrate .. //depot/projects/uart/compat/ndis/kern_ndis.c#7 integrate .. //depot/projects/uart/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/uart/compat/ndis/ndis_var.h#6 integrate .. //depot/projects/uart/compat/ndis/ntoskrnl_var.h#6 integrate .. //depot/projects/uart/compat/ndis/pe_var.h#6 integrate .. //depot/projects/uart/compat/ndis/subr_hal.c#6 integrate .. //depot/projects/uart/compat/ndis/subr_ndis.c#7 integrate .. //depot/projects/uart/compat/ndis/subr_ntoskrnl.c#7 integrate .. //depot/projects/uart/compat/ndis/subr_pe.c#4 integrate .. //depot/projects/uart/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/uart/compat/svr4/svr4_fcntl.c#5 integrate .. //depot/projects/uart/compat/svr4/svr4_ioctl.c#4 integrate .. //depot/projects/uart/compat/svr4/svr4_ipc.c#5 integrate .. //depot/projects/uart/compat/svr4/svr4_misc.c#8 integrate .. //depot/projects/uart/compat/svr4/svr4_siginfo.h#3 integrate .. //depot/projects/uart/compat/svr4/svr4_signal.c#5 integrate .. //depot/projects/uart/compat/svr4/svr4_signal.h#4 integrate .. //depot/projects/uart/compat/svr4/svr4_stat.c#4 integrate .. //depot/projects/uart/compat/svr4/svr4_stream.c#7 integrate .. //depot/projects/uart/compat/svr4/svr4_termios.c#3 integrate .. //depot/projects/uart/compat/svr4/svr4_ttold.c#4 integrate .. //depot/projects/uart/compat/svr4/svr4_util.h#5 integrate .. //depot/projects/uart/conf/Makefile.alpha#5 integrate .. //depot/projects/uart/conf/Makefile.amd64#6 integrate .. //depot/projects/uart/conf/Makefile.arm#6 integrate .. //depot/projects/uart/conf/Makefile.i386#5 integrate .. //depot/projects/uart/conf/Makefile.ia64#5 integrate .. //depot/projects/uart/conf/Makefile.pc98#5 integrate .. //depot/projects/uart/conf/Makefile.powerpc#5 integrate .. //depot/projects/uart/conf/Makefile.sparc64#5 integrate .. //depot/projects/uart/conf/NOTES#27 integrate .. //depot/projects/uart/conf/files#44 integrate .. //depot/projects/uart/conf/files.alpha#12 integrate .. //depot/projects/uart/conf/files.amd64#14 integrate .. //depot/projects/uart/conf/files.arm#5 integrate .. //depot/projects/uart/conf/files.i386#19 integrate .. //depot/projects/uart/conf/files.ia64#14 integrate .. //depot/projects/uart/conf/files.pc98#17 integrate .. //depot/projects/uart/conf/files.powerpc#5 integrate .. //depot/projects/uart/conf/files.sparc64#12 integrate .. //depot/projects/uart/conf/kern.post.mk#10 integrate .. //depot/projects/uart/conf/kern.pre.mk#11 integrate .. //depot/projects/uart/conf/kmod.mk#15 integrate .. //depot/projects/uart/conf/ldscript.arm#2 integrate .. //depot/projects/uart/conf/options#21 integrate .. //depot/projects/uart/conf/options.amd64#6 integrate .. //depot/projects/uart/conf/options.arm#5 integrate .. //depot/projects/uart/conf/options.i386#10 integrate .. //depot/projects/uart/conf/options.pc98#9 integrate .. //depot/projects/uart/conf/systags.sh#3 integrate .. //depot/projects/uart/contrib/dev/acpica/CHANGES.txt#5 integrate .. //depot/projects/uart/contrib/dev/acpica/acapps.h#3 integrate .. //depot/projects/uart/contrib/dev/acpica/acconfig.h#5 integrate .. //depot/projects/uart/contrib/dev/acpica/acdebug.h#5 integrate .. //depot/projects/uart/contrib/dev/acpica/acdisasm.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/acdispat.h#3 integrate .. //depot/projects/uart/contrib/dev/acpica/acefi.h#3 integrate .. //depot/projects/uart/contrib/dev/acpica/acenv.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/acevents.h#5 integrate .. //depot/projects/uart/contrib/dev/acpica/acexcep.h#5 integrate .. //depot/projects/uart/contrib/dev/acpica/acfreebsd.h#6 integrate .. //depot/projects/uart/contrib/dev/acpica/acgcc.h#3 integrate .. //depot/projects/uart/contrib/dev/acpica/acglobal.h#5 integrate .. //depot/projects/uart/contrib/dev/acpica/achware.h#5 integrate .. //depot/projects/uart/contrib/dev/acpica/acinterp.h#5 integrate .. //depot/projects/uart/contrib/dev/acpica/aclocal.h#5 integrate .. //depot/projects/uart/contrib/dev/acpica/acmacros.h#5 integrate .. //depot/projects/uart/contrib/dev/acpica/acnames.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acnamesp.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/acobject.h#5 integrate .. //depot/projects/uart/contrib/dev/acpica/acopcode.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/acoutput.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/acparser.h#3 integrate .. //depot/projects/uart/contrib/dev/acpica/acpi.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/uart/contrib/dev/acpica/acpiosxf.h#5 integrate .. //depot/projects/uart/contrib/dev/acpica/acpixf.h#5 integrate .. //depot/projects/uart/contrib/dev/acpica/acresrc.h#3 integrate .. //depot/projects/uart/contrib/dev/acpica/acstruct.h#3 integrate .. //depot/projects/uart/contrib/dev/acpica/actables.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/actbl.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/actbl1.h#3 integrate .. //depot/projects/uart/contrib/dev/acpica/actbl2.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/actypes.h#5 integrate .. //depot/projects/uart/contrib/dev/acpica/acutils.h#5 integrate .. //depot/projects/uart/contrib/dev/acpica/aecommon.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/aeexec.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/amlcode.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/amlresrc.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/common/adisasm.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/common/getopt.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslanalyze.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslcodegen.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslcompile.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslcompiler.l#4 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslcompiler.y#4 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/asldefine.h#1 branch .. //depot/projects/uart/contrib/dev/acpica/compiler/aslerror.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslfiles.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslfold.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslglobal.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/asllength.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/asllisting.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslload.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslmain.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslmap.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslopcodes.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/asloperands.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslopt.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslresource.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslrestype1.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslrestype2.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/asltransform.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/asltree.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/asltypes.h#4 integrate .. //depot/projects/uart/contrib/dev/acpica/compiler/aslutils.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/dbcmds.c#6 integrate .. //depot/projects/uart/contrib/dev/acpica/dbdisply.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dbexec.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/dbfileio.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dbhistry.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/dbinput.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/dbstats.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dbutils.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/dbxface.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/dmbuffer.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dmnames.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/dmobject.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/dmopcode.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dmresrc.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dmresrcl.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/dmresrcs.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/dmutils.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/dmwalk.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/dsfield.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dsinit.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dsmethod.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/dsmthdat.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/dsobject.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dsopcode.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dsutils.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/dswexec.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/dswload.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/dswscope.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/dswstate.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/evevent.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/evgpe.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/evgpeblk.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/evmisc.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/evregion.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/evrgnini.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/evsci.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/evxface.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/evxfevnt.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/evxfregn.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/exconfig.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/exconvrt.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/excreate.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/exdump.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/exfield.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/exfldio.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/exmisc.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/exmutex.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/exnames.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/exoparg1.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/exoparg2.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/exoparg3.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/exoparg6.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/exprep.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/exregion.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/exresnte.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/exresolv.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/exresop.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/exstore.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/exstoren.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/exstorob.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/exsystem.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/exutils.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/hwacpi.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/hwgpe.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/hwregs.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/hwsleep.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/hwtimer.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/nsaccess.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/nsalloc.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/nsdump.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/nsdumpdv.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/nseval.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/nsinit.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/nsload.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/nsnames.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/nsobject.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/nsparse.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/nssearch.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/nsutils.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/nswalk.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/nsxfeval.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/nsxfname.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/nsxfobj.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/osunixxf.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/psargs.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/psloop.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/psopcode.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/psparse.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/psscope.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/pstree.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/psutils.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/pswalk.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/psxface.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/rsaddr.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/rscalc.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/rscreate.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/rsdump.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/rsinfo.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/rsio.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/rsirq.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/rslist.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/rsmemory.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/rsmisc.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/rsutils.c#3 integrate .. //depot/projects/uart/contrib/dev/acpica/rsxface.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/tbconvrt.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/tbget.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/tbgetall.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/tbinstal.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/tbrsdt.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/tbutils.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/tbxface.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/tbxfroot.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/utalloc.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/utcache.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/utclib.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/utcopy.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/utdebug.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/utdelete.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/uteval.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/utglobal.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/utinit.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/utmath.c#4 integrate .. //depot/projects/uart/contrib/dev/acpica/utmisc.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/utmutex.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/utobject.c#5 integrate .. //depot/projects/uart/contrib/dev/acpica/utstate.c#1 branch .. //depot/projects/uart/contrib/dev/acpica/utxface.c#4 integrate .. //depot/projects/uart/contrib/dev/nve/adapter.h#2 integrate .. //depot/projects/uart/contrib/dev/nve/amd64/nvenetlib.README#1 branch .. //depot/projects/uart/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/uart/contrib/dev/nve/i386/nvenetlib.README#1 branch .. //depot/projects/uart/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/uart/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/projects/uart/contrib/dev/oltr/if_oltr.c#7 integrate .. //depot/projects/uart/contrib/dev/oltr/if_oltr_pci.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/fil.c#6 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_auth.c#5 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_compat.h#5 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_fil.h#5 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_log.c#5 integrate .. //depot/projects/uart/contrib/pf/net/if_pflog.c#5 integrate .. //depot/projects/uart/contrib/pf/net/if_pfsync.c#6 integrate .. //depot/projects/uart/contrib/pf/net/pf.c#8 integrate .. //depot/projects/uart/contrib/pf/net/pf_ioctl.c#6 integrate .. //depot/projects/uart/contrib/pf/net/pf_norm.c#4 integrate .. //depot/projects/uart/ddb/db_access.c#5 integrate .. //depot/projects/uart/ddb/db_command.c#8 integrate .. //depot/projects/uart/ddb/db_output.c#6 integrate .. //depot/projects/uart/ddb/db_watch.c#3 integrate .. //depot/projects/uart/ddb/ddb.h#7 integrate .. //depot/projects/uart/dev/aac/aac.c#15 integrate .. //depot/projects/uart/dev/aac/aac_cam.c#7 integrate .. //depot/projects/uart/dev/aac/aac_debug.c#6 integrate .. //depot/projects/uart/dev/aac/aac_pci.c#12 integrate .. //depot/projects/uart/dev/aac/aac_tables.h#3 integrate .. //depot/projects/uart/dev/aac/aacreg.h#6 integrate .. //depot/projects/uart/dev/aac/aacvar.h#5 integrate .. //depot/projects/uart/dev/acpi_support/acpi_asus.c#6 integrate .. //depot/projects/uart/dev/acpi_support/acpi_fujitsu.c#3 integrate .. //depot/projects/uart/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/uart/dev/acpi_support/acpi_panasonic.c#5 integrate .. //depot/projects/uart/dev/acpi_support/acpi_sony.c#5 integrate .. //depot/projects/uart/dev/acpi_support/acpi_toshiba.c#5 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdDebug.c#4 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdHardware.c#7 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdInterrupt.c#5 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdMemory.c#5 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdSchedule.c#8 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdStream.c#4 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdSynch.c#6 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdTable.c#4 integrate .. //depot/projects/uart/dev/acpica/acpi.c#18 integrate .. //depot/projects/uart/dev/acpica/acpi_acad.c#10 integrate .. //depot/projects/uart/dev/acpica/acpi_battery.c#6 integrate .. //depot/projects/uart/dev/acpica/acpi_button.c#7 integrate .. //depot/projects/uart/dev/acpica/acpi_cmbat.c#10 integrate .. //depot/projects/uart/dev/acpica/acpi_cpu.c#8 integrate .. //depot/projects/uart/dev/acpica/acpi_ec.c#15 integrate .. //depot/projects/uart/dev/acpica/acpi_hpet.c#1 branch .. //depot/projects/uart/dev/acpica/acpi_if.m#6 integrate .. //depot/projects/uart/dev/acpica/acpi_isab.c#6 integrate .. //depot/projects/uart/dev/acpica/acpi_lid.c#5 integrate .. //depot/projects/uart/dev/acpica/acpi_package.c#5 integrate .. //depot/projects/uart/dev/acpica/acpi_pci.c#7 integrate .. //depot/projects/uart/dev/acpica/acpi_pci_link.c#9 integrate .. //depot/projects/uart/dev/acpica/acpi_pcib.c#11 integrate .. //depot/projects/uart/dev/acpica/acpi_pcib_acpi.c#9 integrate .. //depot/projects/uart/dev/acpica/acpi_pcib_pci.c#7 integrate .. //depot/projects/uart/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/uart/dev/acpica/acpi_powerres.c#6 integrate .. //depot/projects/uart/dev/acpica/acpi_quirk.c#3 integrate .. //depot/projects/uart/dev/acpica/acpi_resource.c#10 integrate .. //depot/projects/uart/dev/acpica/acpi_smbat.c#1 branch .. //depot/projects/uart/dev/acpica/acpi_smbus.h#1 branch .. //depot/projects/uart/dev/acpica/acpi_thermal.c#8 integrate .. //depot/projects/uart/dev/acpica/acpi_throttle.c#3 integrate .. //depot/projects/uart/dev/acpica/acpi_timer.c#8 integrate .. //depot/projects/uart/dev/acpica/acpi_video.c#4 integrate .. //depot/projects/uart/dev/acpica/acpiio.h#8 integrate .. //depot/projects/uart/dev/acpica/acpivar.h#11 integrate .. //depot/projects/uart/dev/adlink/adlink.c#8 integrate .. //depot/projects/uart/dev/advansys/adv_pci.c#10 integrate .. //depot/projects/uart/dev/advansys/advlib.c#5 integrate .. //depot/projects/uart/dev/advansys/adw_pci.c#10 integrate .. //depot/projects/uart/dev/advansys/adwcam.c#6 integrate .. //depot/projects/uart/dev/aic/aic_pccard.c#6 integrate .. //depot/projects/uart/dev/aic7xxx/ahd_pci.c#8 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx.c#7 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx_osm.c#6 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx_osm.h#7 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx_pci.c#7 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_osm.c#5 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_osm.h#7 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_pci.c#7 integrate .. //depot/projects/uart/dev/aic7xxx/aicasm/Makefile#5 integrate .. //depot/projects/uart/dev/amr/amr.c#11 integrate .. //depot/projects/uart/dev/amr/amr_cam.c#8 integrate .. //depot/projects/uart/dev/amr/amr_disk.c#8 integrate .. //depot/projects/uart/dev/amr/amr_pci.c#12 integrate .. //depot/projects/uart/dev/amr/amrio.h#3 integrate .. //depot/projects/uart/dev/amr/amrreg.h#3 integrate .. //depot/projects/uart/dev/amr/amrvar.h#8 integrate .. //depot/projects/uart/dev/an/if_an.c#9 integrate .. //depot/projects/uart/dev/an/if_an_pccard.c#7 integrate .. //depot/projects/uart/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/uart/dev/arl/if_arl.c#3 integrate .. //depot/projects/uart/dev/arl/if_arl_isa.c#3 integrate .. //depot/projects/uart/dev/asr/dptsig.h#3 integrate .. //depot/projects/uart/dev/ata/ata-all.c#14 integrate .. //depot/projects/uart/dev/ata/ata-all.h#8 integrate .. //depot/projects/uart/dev/ata/ata-card.c#10 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#12 integrate .. //depot/projects/uart/dev/ata/ata-disk.c#10 integrate .. //depot/projects/uart/dev/ata/ata-dma.c#10 integrate .. //depot/projects/uart/dev/ata/ata-lowlevel.c#18 integrate .. //depot/projects/uart/dev/ata/ata-pci.c#10 integrate .. //depot/projects/uart/dev/ata/ata-pci.h#11 integrate .. //depot/projects/uart/dev/ata/ata-queue.c#11 integrate .. //depot/projects/uart/dev/ata/ata-raid.c#8 integrate .. //depot/projects/uart/dev/ata/ata-raid.h#6 integrate .. //depot/projects/uart/dev/ata/atapi-cam.c#10 integrate .. //depot/projects/uart/dev/ata/atapi-cd.c#15 integrate .. //depot/projects/uart/dev/ata/atapi-fd.c#6 integrate .. //depot/projects/uart/dev/ata/atapi-tape.c#7 integrate .. //depot/projects/uart/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/uart/dev/ath/if_ath.c#18 integrate .. //depot/projects/uart/dev/ath/if_athioctl.h#7 integrate .. //depot/projects/uart/dev/ath/if_athvar.h#13 integrate .. //depot/projects/uart/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/uart/dev/atkbdc/psm.c#2 integrate .. //depot/projects/uart/dev/awi/if_awi_pccard.c#6 integrate .. //depot/projects/uart/dev/bfe/if_bfe.c#8 integrate .. //depot/projects/uart/dev/bge/if_bge.c#19 integrate .. //depot/projects/uart/dev/bge/if_bgereg.h#13 integrate .. //depot/projects/uart/dev/bktr/bktr_card.c#10 integrate .. //depot/projects/uart/dev/bktr/bktr_card.h#4 integrate .. //depot/projects/uart/dev/bktr/bktr_core.c#10 integrate .. //depot/projects/uart/dev/bktr/bktr_tuner.c#9 integrate .. //depot/projects/uart/dev/bktr/bktr_tuner.h#4 integrate .. //depot/projects/uart/dev/cardbus/cardbus.c#9 integrate .. //depot/projects/uart/dev/cardbus/cardbus_cis.c#9 integrate .. //depot/projects/uart/dev/cardbus/cardbusreg.h#4 integrate .. //depot/projects/uart/dev/cardbus/cardbusvar.h#5 integrate .. //depot/projects/uart/dev/ciss/ciss.c#13 integrate .. //depot/projects/uart/dev/cm/if_cm_isa.c#5 integrate .. //depot/projects/uart/dev/cnw/if_cnw.c#6 integrate .. //depot/projects/uart/dev/cp/if_cp.c#5 integrate .. //depot/projects/uart/dev/cs/if_cs.c#7 integrate .. //depot/projects/uart/dev/cs/if_cs_pccard.c#7 integrate .. //depot/projects/uart/dev/ctau/if_ct.c#5 integrate .. //depot/projects/uart/dev/cx/if_cx.c#4 integrate .. //depot/projects/uart/dev/cy/cy.c#2 integrate .. //depot/projects/uart/dev/dc/dcphy.c#1 branch .. //depot/projects/uart/dev/dc/if_dc.c#1 branch .. //depot/projects/uart/dev/dc/if_dcreg.h#1 branch .. //depot/projects/uart/dev/dc/pnphy.c#1 branch .. //depot/projects/uart/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/uart/dev/digi/digi.c#6 integrate .. //depot/projects/uart/dev/drm/ati_pcigart.c#3 integrate .. //depot/projects/uart/dev/drm/drm-preprocess.sh#1 branch .. //depot/projects/uart/dev/drm/drm-subprocess.pl#1 branch .. //depot/projects/uart/dev/drm/drm.h#6 integrate .. //depot/projects/uart/dev/drm/drmP.h#8 integrate .. //depot/projects/uart/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/uart/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/uart/dev/drm/drm_auth.c#2 integrate .. //depot/projects/uart/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/uart/dev/drm/drm_context.c#2 integrate .. //depot/projects/uart/dev/drm/drm_dma.c#2 integrate .. //depot/projects/uart/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/uart/dev/drm/drm_drv.c#2 integrate .. //depot/projects/uart/dev/drm/drm_fops.c#2 integrate .. //depot/projects/uart/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/uart/dev/drm/drm_irq.c#2 integrate .. //depot/projects/uart/dev/drm/drm_linux_list.h#4 integrate .. //depot/projects/uart/dev/drm/drm_lock.c#2 integrate .. //depot/projects/uart/dev/drm/drm_memory.c#2 integrate .. //depot/projects/uart/dev/drm/drm_pci.c#2 integrate .. //depot/projects/uart/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/uart/dev/drm/drm_sarea.h#6 integrate .. //depot/projects/uart/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/uart/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/uart/dev/drm/drm_vm.c#2 integrate .. //depot/projects/uart/dev/drm/i915_dma.c#2 integrate .. //depot/projects/uart/dev/drm/i915_drm.h#2 integrate .. //depot/projects/uart/dev/drm/i915_drv.c#2 integrate .. //depot/projects/uart/dev/drm/i915_drv.h#2 integrate .. //depot/projects/uart/dev/drm/i915_irq.c#2 integrate .. //depot/projects/uart/dev/drm/i915_mem.c#2 integrate .. //depot/projects/uart/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/uart/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/uart/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/uart/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/uart/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/uart/dev/drm/mach64_state.c#2 integrate .. //depot/projects/uart/dev/drm/mga_dma.c#6 integrate .. //depot/projects/uart/dev/drm/mga_drm.h#5 integrate .. //depot/projects/uart/dev/drm/mga_drv.c#6 integrate .. //depot/projects/uart/dev/drm/mga_drv.h#6 integrate .. //depot/projects/uart/dev/drm/mga_irq.c#6 integrate .. //depot/projects/uart/dev/drm/mga_state.c#5 integrate .. //depot/projects/uart/dev/drm/mga_ucode.h#4 integrate .. //depot/projects/uart/dev/drm/mga_warp.c#5 integrate .. //depot/projects/uart/dev/drm/r128_cce.c#7 integrate .. //depot/projects/uart/dev/drm/r128_drm.h#6 integrate .. //depot/projects/uart/dev/drm/r128_drv.c#6 integrate .. //depot/projects/uart/dev/drm/r128_drv.h#6 integrate .. //depot/projects/uart/dev/drm/r128_irq.c#6 integrate .. //depot/projects/uart/dev/drm/r128_state.c#6 integrate .. //depot/projects/uart/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/uart/dev/drm/r300_reg.h#2 integrate .. //depot/projects/uart/dev/drm/radeon_cp.c#8 integrate .. //depot/projects/uart/dev/drm/radeon_drm.h#8 integrate .. //depot/projects/uart/dev/drm/radeon_drv.c#7 integrate .. //depot/projects/uart/dev/drm/radeon_drv.h#8 integrate .. //depot/projects/uart/dev/drm/radeon_irq.c#6 integrate .. //depot/projects/uart/dev/drm/radeon_mem.c#7 integrate .. //depot/projects/uart/dev/drm/radeon_state.c#9 integrate .. //depot/projects/uart/dev/drm/savage_bci.c#2 integrate .. //depot/projects/uart/dev/drm/savage_drm.h#2 integrate .. //depot/projects/uart/dev/drm/savage_drv.c#2 integrate .. //depot/projects/uart/dev/drm/savage_drv.h#2 integrate .. //depot/projects/uart/dev/drm/savage_state.c#2 integrate .. //depot/projects/uart/dev/drm/sis_drm.h#3 integrate .. //depot/projects/uart/dev/drm/sis_drv.c#5 integrate .. //depot/projects/uart/dev/drm/sis_drv.h#4 integrate .. //depot/projects/uart/dev/drm/sis_ds.c#4 integrate .. //depot/projects/uart/dev/drm/sis_ds.h#5 integrate .. //depot/projects/uart/dev/drm/sis_mm.c#5 integrate .. //depot/projects/uart/dev/drm/tdfx_drv.c#6 integrate .. //depot/projects/uart/dev/drm/tdfx_drv.h#2 integrate .. //depot/projects/uart/dev/ed/ax88x90reg.h#1 branch .. //depot/projects/uart/dev/ed/dl100xxreg.h#1 branch .. //depot/projects/uart/dev/ed/if_ed.c#11 integrate .. //depot/projects/uart/dev/ed/if_ed_cbus.c#9 integrate .. //depot/projects/uart/dev/ed/if_ed_isa.c#8 integrate .. //depot/projects/uart/dev/ed/if_ed_novell.c#3 integrate .. //depot/projects/uart/dev/ed/if_ed_pccard.c#12 integrate .. //depot/projects/uart/dev/ed/if_ed_pci.c#9 integrate .. //depot/projects/uart/dev/ed/if_ed_rtl80x9.c#1 branch .. //depot/projects/uart/dev/ed/if_edreg.h#5 integrate .. //depot/projects/uart/dev/ed/if_edvar.h#8 integrate .. //depot/projects/uart/dev/ed/rtl80x9reg.h#1 branch .. //depot/projects/uart/dev/ed/tc5299jreg.h#1 branch .. //depot/projects/uart/dev/em/README#5 integrate .. //depot/projects/uart/dev/em/if_em.c#16 integrate .. //depot/projects/uart/dev/em/if_em.h#14 integrate .. //depot/projects/uart/dev/em/if_em_hw.c#6 integrate .. //depot/projects/uart/dev/em/if_em_hw.h#5 integrate .. //depot/projects/uart/dev/em/if_em_osdep.h#5 integrate .. //depot/projects/uart/dev/en/if_en_pci.c#9 integrate .. //depot/projects/uart/dev/en/midway.c#9 integrate .. //depot/projects/uart/dev/ep/if_ep.c#12 integrate .. //depot/projects/uart/dev/ep/if_ep_pccard.c#10 integrate .. //depot/projects/uart/dev/esp/ncr53c9x.c#5 integrate .. //depot/projects/uart/dev/esp/ncr53c9xvar.h#4 integrate .. //depot/projects/uart/dev/ex/if_ex.c#6 integrate .. //depot/projects/uart/dev/ex/if_ex_pccard.c#6 integrate .. //depot/projects/uart/dev/exca/exca.c#10 integrate .. //depot/projects/uart/dev/fatm/if_fatm.c#13 integrate .. //depot/projects/uart/dev/fb/boot_font.c#5 integrate .. //depot/projects/uart/dev/fb/creator.c#5 integrate .. //depot/projects/uart/dev/fb/fb.c#6 integrate .. //depot/projects/uart/dev/fb/fbreg.h#5 integrate .. //depot/projects/uart/dev/fb/gfb.c#5 integrate .. //depot/projects/uart/dev/fb/machfb.c#3 integrate .. //depot/projects/uart/dev/fb/s3_pci.c#7 integrate .. //depot/projects/uart/dev/fb/tga.c#6 integrate .. //depot/projects/uart/dev/fb/vga.c#6 integrate .. //depot/projects/uart/dev/fdc/fdc_acpi.c#2 integrate .. //depot/projects/uart/dev/fe/if_fe.c#8 integrate .. //depot/projects/uart/dev/fe/if_fe_pccard.c#9 integrate .. //depot/projects/uart/dev/firewire/00README#2 integrate .. //depot/projects/uart/dev/firewire/firewire.c#11 integrate .. //depot/projects/uart/dev/firewire/if_fwe.c#10 integrate .. //depot/projects/uart/dev/firewire/if_fwip.c#4 integrate .. //depot/projects/uart/dev/fxp/if_fxp.c#19 integrate .. //depot/projects/uart/dev/fxp/if_fxpvar.h#8 integrate .. //depot/projects/uart/dev/gem/if_gem.c#7 integrate .. //depot/projects/uart/dev/hatm/if_hatm.c#13 integrate .. //depot/projects/uart/dev/hatm/if_hatm_intr.c#8 integrate .. //depot/projects/uart/dev/hme/if_hme.c#11 integrate .. //depot/projects/uart/dev/hme/if_hmereg.h#3 integrate .. //depot/projects/uart/dev/hme/if_hmevar.h#5 integrate .. //depot/projects/uart/dev/hptmv/access601.h#2 integrate .. //depot/projects/uart/dev/hptmv/amd64-elf.raid.o.uu#1 branch .. //depot/projects/uart/dev/hptmv/array.h#2 integrate .. //depot/projects/uart/dev/hptmv/atapi.h#2 integrate .. //depot/projects/uart/dev/hptmv/command.h#2 integrate .. //depot/projects/uart/dev/hptmv/entry.c#5 integrate .. //depot/projects/uart/dev/hptmv/global.h#4 integrate .. //depot/projects/uart/dev/hptmv/gui_lib.c#2 integrate .. //depot/projects/uart/dev/hptmv/hptintf.h#3 integrate .. //depot/projects/uart/dev/hptmv/hptproc.c#3 integrate .. //depot/projects/uart/dev/hptmv/i386-elf.raid.o.uu#2 integrate .. //depot/projects/uart/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/uart/dev/hptmv/mv.c#3 integrate .. //depot/projects/uart/dev/hptmv/mvOs.h#3 integrate .. //depot/projects/uart/dev/hptmv/mvSata.h#2 integrate .. //depot/projects/uart/dev/hptmv/mvStorageDev.h#2 integrate .. //depot/projects/uart/dev/hptmv/osbsd.h#4 integrate .. //depot/projects/uart/dev/hptmv/raid5n.h#2 integrate .. //depot/projects/uart/dev/hptmv/readme.txt#2 integrate .. //depot/projects/uart/dev/hptmv/vdevice.h#2 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_amd.c#3 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/uart/dev/ic/i8259.h#2 integrate .. //depot/projects/uart/dev/ic/via6522reg.h#1 branch .. //depot/projects/uart/dev/ie/if_ie.c#7 integrate .. //depot/projects/uart/dev/ie/if_ie_isa.c#5 integrate .. //depot/projects/uart/dev/ieee488/pcii.c#2 integrate .. //depot/projects/uart/dev/ieee488/tnt4882.c#1 branch .. //depot/projects/uart/dev/ieee488/upd7210.c#3 integrate .. //depot/projects/uart/dev/ieee488/upd7210.h#3 integrate .. //depot/projects/uart/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/uart/dev/if_ndis/if_ndisvar.h#6 integrate .. //depot/projects/uart/dev/ips/ips.c#7 integrate .. //depot/projects/uart/dev/ips/ips.h#7 integrate .. //depot/projects/uart/dev/ips/ips_commands.c#7 integrate .. //depot/projects/uart/dev/ips/ips_disk.c#6 integrate .. //depot/projects/uart/dev/ips/ips_ioctl.c#6 integrate .. //depot/projects/uart/dev/ips/ips_pci.c#10 integrate .. //depot/projects/uart/dev/ips/ipsreg.h#1 branch .. //depot/projects/uart/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/uart/dev/isp/isp.c#8 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.c#9 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.h#6 integrate .. //depot/projects/uart/dev/isp/isp_ioctl.h#4 integrate .. //depot/projects/uart/dev/isp/ispmbox.h#4 integrate .. //depot/projects/uart/dev/ispfw/ispfw.c#5 integrate .. //depot/projects/uart/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/uart/dev/iwi/if_iwireg.h#3 integrate .. //depot/projects/uart/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/uart/dev/ixgb/README#2 integrate .. //depot/projects/uart/dev/ixgb/if_ixgb.c#6 integrate .. //depot/projects/uart/dev/ixgb/if_ixgb.h#5 integrate .. //depot/projects/uart/dev/joy/joy.c#4 integrate .. //depot/projects/uart/dev/joy/joy_pccard.c#4 integrate .. //depot/projects/uart/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/uart/dev/lge/if_lge.c#11 integrate .. //depot/projects/uart/dev/lge/if_lgereg.h#4 integrate .. //depot/projects/uart/dev/lmc/if_lmc.c#5 branch .. //depot/projects/uart/dev/lmc/if_lmc.h#1 branch .. //depot/projects/uart/dev/lnc/if_lnc.c#6 integrate .. //depot/projects/uart/dev/lnc/if_lnc_cbus.c#7 integrate .. //depot/projects/uart/dev/md/md.c#13 integrate .. //depot/projects/uart/dev/mii/acphy.c#5 integrate .. //depot/projects/uart/dev/mii/amphy.c#5 integrate .. //depot/projects/uart/dev/mii/brgphy.c#11 integrate .. //depot/projects/uart/dev/mii/ciphy.c#3 integrate .. //depot/projects/uart/dev/mii/dcphy.c#7 delete .. //depot/projects/uart/dev/mii/exphy.c#5 integrate .. //depot/projects/uart/dev/mii/lxtphy.c#5 integrate .. //depot/projects/uart/dev/mii/mii_physubr.c#5 integrate .. //depot/projects/uart/dev/mii/miivar.h#2 integrate .. //depot/projects/uart/dev/mii/nsgphy.c#5 integrate .. //depot/projects/uart/dev/mii/nsphy.c#5 integrate .. //depot/projects/uart/dev/mii/pnaphy.c#5 integrate .. //depot/projects/uart/dev/mii/pnphy.c#5 delete .. //depot/projects/uart/dev/mii/qsphy.c#5 integrate .. //depot/projects/uart/dev/mii/rgephy.c#5 integrate .. //depot/projects/uart/dev/mii/rlphy.c#6 integrate .. //depot/projects/uart/dev/mii/tdkphy.c#5 integrate .. //depot/projects/uart/dev/mii/tlphy.c#5 integrate .. //depot/projects/uart/dev/mii/ukphy.c#5 integrate .. //depot/projects/uart/dev/mii/xmphy.c#5 integrate .. //depot/projects/uart/dev/mpt/mpt.c#6 integrate .. //depot/projects/uart/dev/mpt/mpt.h#4 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/uart/dev/mpt/mpt_pci.c#11 integrate .. //depot/projects/uart/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/uart/dev/my/if_my.c#8 integrate .. //depot/projects/uart/dev/ncv/ncr53c500_pccard.c#8 integrate .. //depot/projects/uart/dev/nge/if_nge.c#11 integrate .. //depot/projects/uart/dev/nge/if_ngereg.h#5 integrate .. //depot/projects/uart/dev/nsp/nsp_pccard.c#7 integrate .. //depot/projects/uart/dev/nve/if_nve.c#4 integrate .. //depot/projects/uart/dev/nve/if_nvereg.h#4 integrate .. //depot/projects/uart/dev/ofw/ofw_bus_if.m#3 integrate .. //depot/projects/uart/dev/ofw/ofw_bus_subr.c#1 branch .. //depot/projects/uart/dev/ofw/ofw_bus_subr.h#1 branch .. //depot/projects/uart/dev/ofw/ofw_console.c#7 integrate .. //depot/projects/uart/dev/ofw/ofw_disk.c#6 integrate .. //depot/projects/uart/dev/ofw/openfirm.c#5 integrate .. //depot/projects/uart/dev/owi/if_ieee80211.h#2 delete .. //depot/projects/uart/dev/owi/if_owi.c#6 delete .. //depot/projects/uart/dev/owi/if_owi_pccard.c#6 delete .. //depot/projects/uart/dev/owi/if_wireg.h#3 delete .. //depot/projects/uart/dev/owi/if_wivar.h#5 delete .. //depot/projects/uart/dev/patm/if_patm_attach.c#9 integrate .. //depot/projects/uart/dev/patm/if_patm_rx.c#8 integrate .. //depot/projects/uart/dev/pccard/card_if.m#8 integrate .. //depot/projects/uart/dev/pccard/pccard.c#13 integrate .. //depot/projects/uart/dev/pccard/pccard_cis.c#11 integrate .. //depot/projects/uart/dev/pccard/pccard_cis_quirks.c#7 integrate .. //depot/projects/uart/dev/pccard/pccard_device.c#1 branch .. //depot/projects/uart/dev/pccard/pccarddevs#17 integrate .. //depot/projects/uart/dev/pccard/pccardvar.h#9 integrate .. //depot/projects/uart/dev/pccard/pccardvarp.h#1 branch .. //depot/projects/uart/dev/pccbb/pccbb.c#12 integrate .. //depot/projects/uart/dev/pccbb/pccbb_isa.c#4 integrate .. //depot/projects/uart/dev/pccbb/pccbb_pci.c#7 integrate .. //depot/projects/uart/dev/pccbb/pccbbdevid.h#6 integrate .. //depot/projects/uart/dev/pccbb/pccbbvar.h#6 integrate .. //depot/projects/uart/dev/pci/isa_pci.c#6 integrate .. //depot/projects/uart/dev/pci/pci.c#20 integrate .. //depot/projects/uart/dev/pci/pcireg.h#9 integrate .. //depot/projects/uart/dev/pci/pcivar.h#7 integrate .. //depot/projects/uart/dev/pdq/if_fea.c#5 integrate .. //depot/projects/uart/dev/pdq/if_fpa.c#7 integrate .. //depot/projects/uart/dev/pdq/pdq_freebsd.h#5 integrate .. //depot/projects/uart/dev/pdq/pdq_ifsubr.c#5 integrate .. //depot/projects/uart/dev/ppc/ppc.c#5 integrate .. //depot/projects/uart/dev/puc/puc.c#16 integrate .. //depot/projects/uart/dev/puc/pucdata.c#14 integrate .. //depot/projects/uart/dev/ral/if_ral.c#3 integrate .. //depot/projects/uart/dev/ral/if_ral_pccard.c#3 integrate .. //depot/projects/uart/dev/ral/if_ralreg.h#2 integrate .. //depot/projects/uart/dev/ray/if_ray.c#8 integrate .. //depot/projects/uart/dev/rc/rc.c#5 integrate .. //depot/projects/uart/dev/re/if_re.c#12 integrate .. //depot/projects/uart/dev/rp/rp.c#6 integrate .. //depot/projects/uart/dev/rp/rp_isa.c#5 integrate .. //depot/projects/uart/dev/rp/rp_pci.c#7 integrate .. //depot/projects/uart/dev/rp/rpvar.h#4 integrate .. //depot/projects/uart/dev/sab/sab.c#8 integrate .. //depot/projects/uart/dev/sbni/if_sbni.c#7 integrate .. //depot/projects/uart/dev/sbsh/if_sbsh.c#8 integrate .. //depot/projects/uart/dev/si/si.c#5 integrate .. //depot/projects/uart/dev/si/si_pci.c#6 integrate .. //depot/projects/uart/dev/si/sireg.h#3 integrate .. //depot/projects/uart/dev/sio/sio.c#14 integrate .. //depot/projects/uart/dev/sio/sio_pccard.c#8 integrate .. //depot/projects/uart/dev/sn/if_sn.c#6 integrate .. //depot/projects/uart/dev/sn/if_sn_pccard.c#7 integrate .. //depot/projects/uart/dev/sn/if_snreg.h#4 integrate .. //depot/projects/uart/dev/sn/if_snvar.h#5 integrate .. //depot/projects/uart/dev/snc/dp83932.c#7 integrate .. //depot/projects/uart/dev/snc/dp83932var.h#4 integrate .. //depot/projects/uart/dev/snc/if_snc_pccard.c#7 integrate .. //depot/projects/uart/dev/snp/snp.c#9 integrate .. //depot/projects/uart/dev/sound/driver.c#4 integrate .. //depot/projects/uart/dev/sound/isa/mss.c#8 integrate .. //depot/projects/uart/dev/sound/isa/sb16.c#6 integrate .. //depot/projects/uart/dev/sound/pci/als4000.c#9 integrate .. //depot/projects/uart/dev/sound/pci/atiixp.c#1 branch .. //depot/projects/uart/dev/sound/pci/atiixp.h#1 branch .. //depot/projects/uart/dev/sound/pci/csa.c#9 integrate .. //depot/projects/uart/dev/sound/pci/csapcm.c#8 integrate .. //depot/projects/uart/dev/sound/pci/es137x.c#12 integrate .. //depot/projects/uart/dev/sound/pci/ich.c#14 integrate .. //depot/projects/uart/dev/sound/pci/maestro3.c#8 integrate .. //depot/projects/uart/dev/sound/pci/neomagic.c#7 integrate .. //depot/projects/uart/dev/sound/pci/via8233.c#9 integrate .. //depot/projects/uart/dev/sound/pci/via82c686.c#9 integrate .. //depot/projects/uart/dev/sound/pcm/ac97.c#11 integrate .. //depot/projects/uart/dev/sound/pcm/ac97.h#5 integrate .. //depot/projects/uart/dev/sound/pcm/ac97_patch.c#4 integrate .. //depot/projects/uart/dev/sound/pcm/ac97_patch.h#4 integrate .. //depot/projects/uart/dev/sound/pcm/channel.c#7 integrate .. //depot/projects/uart/dev/sound/pcm/channel.h#5 integrate .. //depot/projects/uart/dev/sound/pcm/dsp.c#9 integrate .. //depot/projects/uart/dev/sound/pcm/fake.c#5 integrate .. //depot/projects/uart/dev/sound/pcm/feeder.c#6 integrate .. //depot/projects/uart/dev/sound/pcm/feeder_fmt.c#6 integrate .. //depot/projects/uart/dev/sound/pcm/feeder_rate.c#4 integrate .. //depot/projects/uart/dev/sound/pcm/feeder_volume.c#1 branch .. //depot/projects/uart/dev/sound/pcm/mixer.c#8 integrate .. //depot/projects/uart/dev/sound/pcm/sndstat.c#6 integrate .. //depot/projects/uart/dev/sound/pcm/sound.c#7 integrate .. //depot/projects/uart/dev/sound/pcm/sound.h#8 integrate .. //depot/projects/uart/dev/sound/pcm/vchan.c#6 integrate .. //depot/projects/uart/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/uart/dev/sound/usb/uaudio.h#4 integrate .. //depot/projects/uart/dev/sound/usb/uaudio_pcm.c#7 integrate .. //depot/projects/uart/dev/speaker/speaker.h#1 branch .. //depot/projects/uart/dev/speaker/spkr.c#1 branch .. //depot/projects/uart/dev/stg/tmc18c30_pccard.c#7 integrate .. //depot/projects/uart/dev/sx/cd1865.h#3 delete .. //depot/projects/uart/dev/sx/sx.c#3 delete .. //depot/projects/uart/dev/sx/sx.h#3 delete .. //depot/projects/uart/dev/sx/sx_pci.c#4 delete .. //depot/projects/uart/dev/sx/sx_util.c#3 delete .. //depot/projects/uart/dev/sx/sx_util.h#3 delete .. //depot/projects/uart/dev/sx/sxvar.h#3 delete .. //depot/projects/uart/dev/sym/sym_hipd.c#10 integrate .. //depot/projects/uart/dev/syscons/scgfbrndr.c#7 integrate .. //depot/projects/uart/dev/syscons/schistory.c#5 integrate .. //depot/projects/uart/dev/syscons/scmouse.c#6 integrate .. //depot/projects/uart/dev/syscons/scterm-dumb.c#5 integrate .. //depot/projects/uart/dev/syscons/scterm-sc.c#5 integrate .. //depot/projects/uart/dev/syscons/scvgarndr.c#6 integrate .. //depot/projects/uart/dev/syscons/scvidctl.c#7 integrate .. //depot/projects/uart/dev/syscons/syscons.c#11 integrate .. //depot/projects/uart/dev/syscons/syscons.h#6 integrate .. //depot/projects/uart/dev/syscons/sysmouse.c#5 integrate .. //depot/projects/uart/dev/tdfx/tdfx_pci.c#7 integrate .. //depot/projects/uart/dev/ti/if_ti.c#1 branch .. //depot/projects/uart/dev/ti/if_tireg.h#1 branch .. //depot/projects/uart/dev/ti/ti_fw.h#1 branch .. //depot/projects/uart/dev/ti/ti_fw2.h#1 branch .. //depot/projects/uart/dev/twa/tw_cl.h#2 integrate .. //depot/projects/uart/dev/twa/tw_cl_externs.h#2 integrate .. //depot/projects/uart/dev/twa/tw_cl_fwif.h#2 integrate .. //depot/projects/uart/dev/twa/tw_cl_fwimg.c#2 integrate .. //depot/projects/uart/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/uart/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/uart/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/uart/dev/twa/tw_cl_ioctl.h#2 integrate .. //depot/projects/uart/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/uart/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/uart/dev/twa/tw_osl.h#2 integrate .. //depot/projects/uart/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/uart/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/uart/dev/twa/tw_osl_includes.h#2 integrate .. //depot/projects/uart/dev/twa/tw_osl_inline.h#1 branch .. //depot/projects/uart/dev/twa/tw_osl_ioctl.h#2 integrate .. //depot/projects/uart/dev/twa/tw_osl_share.h#3 integrate .. //depot/projects/uart/dev/twe/twe_freebsd.c#7 integrate .. //depot/projects/uart/dev/tx/if_tx.c#10 integrate .. //depot/projects/uart/dev/txp/if_txp.c#10 integrate .. //depot/projects/uart/dev/txp/if_txpreg.h#4 integrate .. //depot/projects/uart/dev/uart/uart_bus_ebus.c#11 integrate .. //depot/projects/uart/dev/uart/uart_bus_pccard.c#8 integrate .. //depot/projects/uart/dev/uart/uart_bus_pci.c#10 integrate .. //depot/projects/uart/dev/uart/uart_core.c#40 integrate .. //depot/projects/uart/dev/uart/uart_cpu_alpha.c#13 integrate .. //depot/projects/uart/dev/uart/uart_cpu_amd64.c#10 integrate .. //depot/projects/uart/dev/uart/uart_cpu_i386.c#11 integrate .. //depot/projects/uart/dev/uart/uart_cpu_ia64.c#12 integrate .. //depot/projects/uart/dev/uart/uart_cpu_pc98.c#12 integrate .. //depot/projects/uart/dev/uart/uart_kbd_sun.c#5 integrate .. //depot/projects/uart/dev/uart/uart_subr.c#6 integrate .. //depot/projects/uart/dev/uart/uart_tty.c#23 integrate .. //depot/projects/uart/dev/usb/ehci_pci.c#10 integrate .. //depot/projects/uart/dev/usb/ehcireg.h#5 integrate .. //depot/projects/uart/dev/usb/ehcivar.h#7 integrate .. //depot/projects/uart/dev/usb/if_aue.c#10 integrate .. //depot/projects/uart/dev/usb/if_axe.c#10 integrate .. //depot/projects/uart/dev/usb/if_cdce.c#3 integrate .. //depot/projects/uart/dev/usb/if_cdcereg.h#3 integrate .. //depot/projects/uart/dev/usb/if_cue.c#10 integrate .. //depot/projects/uart/dev/usb/if_kue.c#9 integrate .. //depot/projects/uart/dev/usb/if_rue.c#8 integrate .. //depot/projects/uart/dev/usb/if_udav.c#5 integrate .. //depot/projects/uart/dev/usb/if_udavreg.h#5 integrate .. //depot/projects/uart/dev/usb/if_ural.c#3 integrate .. //depot/projects/uart/dev/usb/if_uralreg.h#2 integrate .. //depot/projects/uart/dev/usb/if_uralvar.h#3 integrate .. //depot/projects/uart/dev/usb/ohci.c#13 integrate .. //depot/projects/uart/dev/usb/ohcivar.h#7 integrate .. //depot/projects/uart/dev/usb/sl811hs.c#2 integrate .. //depot/projects/uart/dev/usb/slhci_pccard.c#2 integrate .. //depot/projects/uart/dev/usb/ubser.c#4 integrate .. //depot/projects/uart/dev/usb/ucom.c#10 integrate .. //depot/projects/uart/dev/usb/ucycom.c#2 integrate .. //depot/projects/uart/dev/usb/ulpt.c#8 integrate .. //depot/projects/uart/dev/usb/umass.c#13 integrate .. //depot/projects/uart/dev/usb/uplcom.c#11 integrate .. //depot/projects/uart/dev/usb/usb_port.h#11 integrate .. //depot/projects/uart/dev/usb/usb_quirks.c#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 15 03:17:50 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98B1216A420; Thu, 15 Dec 2005 03:17:49 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 5B52516A41F for ; Thu, 15 Dec 2005 03:17:49 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A61BB43D62 for ; Thu, 15 Dec 2005 03:17:48 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBF3Hmd5023755 for ; Thu, 15 Dec 2005 03:17:48 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBF3Hm59023752 for perforce@freebsd.org; Thu, 15 Dec 2005 03:17:48 GMT (envelope-from marcel@freebsd.org) Date: Thu, 15 Dec 2005 03:17:48 GMT Message-Id: <200512150317.jBF3Hm59023752@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 88220 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: Thu, 15 Dec 2005 03:17:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=88220 Change 88220 by marcel@marcel_nfs on 2005/12/15 03:17:33 s/UART_IPEND/SER_INT/g Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_z8530.c#24 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_dev_z8530.c#24 (text+ko) ==== @@ -305,7 +305,7 @@ z8530->tpc = z8530_setup(bas, 9600, 8, 1, UART_PARITY_NONE); z8530->tpc &= ~(TPC_DTR|TPC_RTS); } - z8530->txidle = 1; /* Report UART_IPEND_TXIDLE. */ + z8530->txidle = 1; /* Report SER_INT_TXIDLE. */ sc->sc_rxfifosz = 3; sc->sc_txfifosz = 1; @@ -418,14 +418,14 @@ } if (ip & IP_RIA) - ipend |= UART_IPEND_RXREADY; + ipend |= SER_INT_RXREADY; if (ip & IP_TIA) { uart_setreg(bas, REG_CTRL, CR_RSTTXI); uart_barrier(bas); if (z8530->txidle) { - ipend |= UART_IPEND_TXIDLE; - z8530->txidle = 0; /* Mask UART_IPEND_TXIDLE. */ + ipend |= SER_INT_TXIDLE; + z8530->txidle = 0; /* Mask SER_INT_TXIDLE. */ } } @@ -434,18 +434,18 @@ uart_barrier(bas); bes = uart_getmreg(bas, RR_BES); if (bes & BES_BRK) - ipend |= UART_IPEND_BREAK; + ipend |= SER_INT_BREAK; sig = sc->sc_hwsig; SIGCHG(bes & BES_CTS, sig, SER_CTS, SER_DCTS); SIGCHG(bes & BES_DCD, sig, SER_DCD, SER_DDCD); SIGCHG(bes & BES_SYNC, sig, SER_DSR, SER_DDSR); if (sig & UART_SIGMASK_DELTA) - ipend |= UART_IPEND_SIGCHG; + ipend |= SER_INT_SIGCHG; src = uart_getmreg(bas, RR_SRC); if (src & SRC_OVR) { uart_setreg(bas, REG_CTRL, CR_RSTERR); uart_barrier(bas); - ipend |= UART_IPEND_OVERRUN; + ipend |= SER_INT_OVERRUN; } } @@ -586,7 +586,7 @@ uart_setreg(bas, REG_DATA, sc->sc_txbuf[0]); uart_barrier(bas); sc->sc_txbusy = 1; - z8530->txidle = 1; /* Report UART_IPEND_TXIDLE again. */ + z8530->txidle = 1; /* Report SER_INT_TXIDLE again. */ mtx_unlock_spin(&sc->sc_hwmtx); return (0); } From owner-p4-projects@FreeBSD.ORG Thu Dec 15 05:23:33 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB24916A422; Thu, 15 Dec 2005 05:23:32 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 81C3516A41F for ; Thu, 15 Dec 2005 05:23:32 +0000 (GMT) (envelope-from mdodd@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4606B43D81 for ; Thu, 15 Dec 2005 05:23:20 +0000 (GMT) (envelope-from mdodd@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBF5NK6t035926 for ; Thu, 15 Dec 2005 05:23:20 GMT (envelope-from mdodd@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBF5NJWs035923 for perforce@freebsd.org; Thu, 15 Dec 2005 05:23:19 GMT (envelope-from mdodd@freebsd.org) Date: Thu, 15 Dec 2005 05:23:19 GMT Message-Id: <200512150523.jBF5NJWs035923@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mdodd@freebsd.org using -f From: "Matthew N. Dodd" To: Perforce Change Reviews Cc: Subject: PERFORCE change 88223 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: Thu, 15 Dec 2005 05:23:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=88223 Change 88223 by mdodd@mdodd_ibmtp600e on 2005/12/15 05:22:44 Initial import of userland/kernel bignum library. Affected files ... .. //depot/projects/bignum/Makefile#1 add .. //depot/projects/bignum/kmod/Makefile#1 add .. //depot/projects/bignum/kmod/bignum.syms#1 add .. //depot/projects/bignum/lib/Makefile#1 add .. //depot/projects/bignum/man/Makefile#1 add .. //depot/projects/bignum/man/bignum.3#1 add .. //depot/projects/bignum/man/bn_add.3#1 add .. //depot/projects/bignum/man/bn_cmp.3#1 add .. //depot/projects/bignum/man/bn_div.3#1 add .. //depot/projects/bignum/man/bn_expand.3#1 add .. //depot/projects/bignum/man/bn_mul.3#1 add .. //depot/projects/bignum/man/bn_new.3#1 add .. //depot/projects/bignum/man/bn_pow.3#1 add .. //depot/projects/bignum/man/bn_shr.3#1 add .. //depot/projects/bignum/man/bn_sub.3#1 add .. //depot/projects/bignum/man/strtobn.3#1 add .. //depot/projects/bignum/src/bignum.c#1 add .. //depot/projects/bignum/src/bn.h#1 add .. //depot/projects/bignum/src/bn_private.h#1 add .. //depot/projects/bignum/src/strtobn.c#1 add .. //depot/projects/bignum/test/Makefile#1 add .. //depot/projects/bignum/test/bn_parse.y#1 add .. //depot/projects/bignum/test/bn_token.l#1 add .. //depot/projects/bignum/test/test.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 15 05:29:29 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4ABCE16A422; Thu, 15 Dec 2005 05:29:29 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0C59816A41F for ; Thu, 15 Dec 2005 05:29:29 +0000 (GMT) (envelope-from mdodd@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43EF243D58 for ; Thu, 15 Dec 2005 05:29:28 +0000 (GMT) (envelope-from mdodd@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBF5TSWa036152 for ; Thu, 15 Dec 2005 05:29:28 GMT (envelope-from mdodd@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBF5TRvM036149 for perforce@freebsd.org; Thu, 15 Dec 2005 05:29:27 GMT (envelope-from mdodd@freebsd.org) Date: Thu, 15 Dec 2005 05:29:27 GMT Message-Id: <200512150529.jBF5TRvM036149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mdodd@freebsd.org using -f From: "Matthew N. Dodd" To: Perforce Change Reviews Cc: Subject: PERFORCE change 88224 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: Thu, 15 Dec 2005 05:29:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=88224 Change 88224 by mdodd@mdodd_ibmtp600e on 2005/12/15 05:28:52 Checkpoint some potentially questionable changes from my local CVS repo. I believe this fakes up the addition of bc(1) like 'ibase' and 'obase' to the test harness. Affected files ... .. //depot/projects/bignum/src/bignum.c#2 edit .. //depot/projects/bignum/src/bn.h#2 edit .. //depot/projects/bignum/test/bn_parse.y#2 edit .. //depot/projects/bignum/test/bn_token.l#2 edit Differences ... ==== //depot/projects/bignum/src/bignum.c#2 (text+ko) ==== @@ -235,6 +235,28 @@ return (n->neg != 0 ? 1 : 0); } +int +bn_is_odd (bignum_t n) +{ + + if (n->len == 0) + return (0); + if (n->num[0] & 1) + return (1); + return (0); +} + +int +bn_is_even (bignum_t n) +{ + + if (n->len == 0) + return (1); + if ((n->num[0] & 1) == 0) + return (1); + return (0); +} + #if 0 int bn_bin2bn (bignum_t r, const u_char *buf, int len) @@ -279,7 +301,7 @@ goto out; } - error = bn_divide_word(q, r, q, base); + error = bn_udivide_word(q, r, q, base); if (error) goto out; @@ -373,7 +395,7 @@ return (0); s = b % 32; - return ((r->num[i] & (1 << s)) ? 1 : 0); + return ((r->num[i] & (((uint32_t)1) << s)) ? 1 : 0); } /* @@ -856,8 +878,8 @@ if (error) goto out; } - r->num[k] += l; - + r->num[k] += (uint32_t)l; +#if 0 /* Carry things out */ for (;;) { c = (l > r->num[k]); @@ -869,8 +891,10 @@ if (error) goto out; } + l = r->num[k]; r->num[k] += c; } +#endif } } bn_compact(r); @@ -964,7 +988,7 @@ * remainder and the divisor and perform a divide. If the result * is non-zero we shift by the place of the divisor. This number * is added to the quotient and multiplied by the whole divisor - * and subtracted (what?) the result from the remainder. + * and the result is subtracted from the remainder. * If the result above is zero and we are at the lowest digit the * division is over. If we are at any non-lowest digit we divide * the maximum digit value by the divisor and multiply by the @@ -981,7 +1005,7 @@ if (l == 0) { if (i == 0) break; - l = (0xffffffff / D->num[D->wid]) + 1; + l = 0xffffffff / D->num[D->wid]; error = bn_uadd_word(t, t, l); if (error) goto out; @@ -996,15 +1020,17 @@ } shift = (i - D->wid) * 32; - if (shift) + if (shift > 0) { error = bn_shl(t, t, shift); if (error) goto out; + } error = bn_uadd(q, q, t); if (error) goto out; + /* Scale and subtract from the remainder */ error = bn_umul(t, t, D); if (error) goto out; @@ -1146,9 +1172,15 @@ r = bn_new(); if (r == NULL) return (ENOMEM); - error = bn_add_word(r, r, 1); - if (error) - goto out; + if (bn_is_odd(P)) { + error = bn_copy(r, N); + if (error) + goto out; + } else { + error = bn_add_word(r, r, 1); + if (error) + goto out; + } v = bn_dup(N); if (v == NULL) { ==== //depot/projects/bignum/src/bn.h#2 (text+ko) ==== @@ -48,6 +48,8 @@ int bn_is_zero (bignum_t n); void bn_neg (bignum_t n); int bn_is_neg (bignum_t n); +int bn_is_odd (bignum_t n); +int bn_is_even (bignum_t n); bignum_t bn_strtobn (const char * __restrict nptr, char ** __restrict endptr, int base); int bn_bin2bn (bignum_t r, const u_char *, int len); ==== //depot/projects/bignum/test/bn_parse.y#2 (text+ko) ==== @@ -35,6 +35,7 @@ ; line : expr BREAK { + /* bn_print($1); */ memset(buf, 0, BUFLEN); bn_bntoa($1, buf, BUFLEN, 10); if (bn_is_neg($1)) ==== //depot/projects/bignum/test/bn_token.l#2 (text+ko) ==== @@ -7,6 +7,8 @@ #include "bn.h" #include "bn_parse.h" +int ibase=0; + int yylex (void); void yyerror (const char *); #define YY_NO_UNPUT @@ -21,15 +23,22 @@ return BIGNUM; } [0-9]+ { /* dec */ - yylval.bn = bn_strtobn(yytext, NULL, 10); + if (ibase) + yylval.bn = bn_strtobn(yytext, NULL, ibase); + else + yylval.bn = bn_strtobn(yytext, NULL, 10); return BIGNUM; } -0[xX][0-9a-fA-F]+ { /* hex */ +(0[xX])?[0-9a-fA-F]+ { /* hex */ yylval.bn = bn_strtobn(yytext, NULL, 16); return BIGNUM; } [ \t\r] ; +"ibase=16" { ibase=16; } +"ibase=10" { ibase=10; } +"ibase=0" { ibase=0; } +"obase=16" ; "=" { return EQUAL; } "+" { return ADD; } "-" { return SUB; } From owner-p4-projects@FreeBSD.ORG Thu Dec 15 13:37:11 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1A6016A422; Thu, 15 Dec 2005 13:37:10 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 9FAF716A420 for ; Thu, 15 Dec 2005 13:37:10 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2077F43DA5 for ; Thu, 15 Dec 2005 13:36:30 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBFDaOdf069518 for ; Thu, 15 Dec 2005 13:36:24 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBFDaOf6069515 for perforce@freebsd.org; Thu, 15 Dec 2005 13:36:24 GMT (envelope-from soc-bushman@freebsd.org) Date: Thu, 15 Dec 2005 13:36:24 GMT Message-Id: <200512151336.jBFDaOf6069515@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 88232 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: Thu, 15 Dec 2005 13:37:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=88232 Change 88232 by soc-bushman@soc-bushman_stinger on 2005/12/15 13:35:41 added to support getgrouplist in the tests Affected files ... .. //depot/projects/soc2005/nsswitch_cached/tests/nsdispatch_test/unistd.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 15 13:37:40 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B712B16A424; Thu, 15 Dec 2005 13:37:39 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 5302216A424 for ; Thu, 15 Dec 2005 13:37:39 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C02C143D80 for ; Thu, 15 Dec 2005 13:37:28 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBFDbQK5069559 for ; Thu, 15 Dec 2005 13:37:26 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBFDbQdM069556 for perforce@freebsd.org; Thu, 15 Dec 2005 13:37:26 GMT (envelope-from soc-bushman@freebsd.org) Date: Thu, 15 Dec 2005 13:37:26 GMT Message-Id: <200512151337.jBFDbQdM069556@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 88233 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: Thu, 15 Dec 2005 13:37:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=88233 Change 88233 by soc-bushman@soc-bushman_stinger on 2005/12/15 13:36:49 added to implement the getgrouplist support in nsswitch Affected files ... .. //depot/projects/soc2005/nsswitch_cached/tests/nsdispatch_test/getgrouplist.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Dec 16 22:26:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 255EA16A41F; Fri, 16 Dec 2005 22:26:31 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 645AA16A41F for ; Fri, 16 Dec 2005 22:26:31 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40D9E43D45 for ; Fri, 16 Dec 2005 22:26:30 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBGMQN9K009678 for ; Fri, 16 Dec 2005 22:26:23 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBGMQMaW009675 for perforce@freebsd.org; Fri, 16 Dec 2005 22:26:22 GMT (envelope-from jhb@freebsd.org) Date: Fri, 16 Dec 2005 22:26:22 GMT Message-Id: <200512162226.jBGMQMaW009675@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 88287 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, 16 Dec 2005 22:26:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=88287 Change 88287 by jhb@jhb_slimer on 2005/12/16 22:25:54 IFC @88284. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/clock.c#17 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#23 integrate .. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#12 integrate .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#20 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#13 integrate .. //depot/projects/smpng/sys/compat/linux/linux_mib.c#13 integrate .. //depot/projects/smpng/sys/compat/linux/linux_mib.h#8 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#35 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#40 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#60 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#38 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#42 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.h#24 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#65 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#34 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#44 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#59 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#39 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#31 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#35 integrate .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#21 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#48 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#45 integrate .. //depot/projects/smpng/sys/kern/subr_prof.c#28 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#53 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#42 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#52 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#18 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#43 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#65 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#44 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#54 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#46 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#62 integrate .. //depot/projects/smpng/sys/pci/amdpm.c#15 integrate .. //depot/projects/smpng/sys/powerpc/include/frame.h#9 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#25 integrate .. //depot/projects/smpng/sys/sys/resourcevar.h#26 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#28 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#56 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#17 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.40 2005/11/20 01:31:29 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.41 2005/12/14 21:42:12 jhb Exp $"); #include "opt_clock.h" @@ -158,8 +158,8 @@ static u_int32_t last_time; static void handleclock(void* arg); -static void -calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc, u_int32_t *timer); +static void calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc, + u_int32_t *timer); static void set_timer_freq(u_int freq, int intr_freq); void ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#23 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.96 2005/10/14 12:43:43 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.97 2005/12/15 16:30:41 jhb Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#12 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.106 2005/12/08 18:33:29 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.107 2005/12/14 21:47:01 jhb Exp $ */ /* @@ -171,8 +171,7 @@ iretq /* - * Forward hardclock to another CPU. Pushes a clockframe and calls - * forwarded_hardclock(). + * Handler for IPIs sent via the per-cpu IPI bitmap. */ .text SUPERALIGN_TEXT ==== //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.71 2005/11/24 15:28:32 le Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.72 2005/12/16 05:57:18 scottl Exp $"); #include #include @@ -49,7 +49,7 @@ #include #include -#define MAX_BPAGES 512 +#define MAX_BPAGES 8192 struct bounce_zone; ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.12 2005/11/02 21:18:07 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.13 2005/12/15 16:30:41 jhb Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/compat/linux/linux_mib.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.23 2005/01/14 04:44:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.24 2005/12/15 16:30:41 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/compat/linux/linux_mib.h#8 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/sys/compat/linux/linux_mib.h,v 1.8 2003/03/26 18:29:44 jhb Exp $ + * $FreeBSD: src/sys/compat/linux/linux_mib.h,v 1.9 2005/12/15 16:30:41 jhb Exp $ */ #ifndef _LINUX_MIB_H_ ==== //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#35 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.103 2005/11/20 01:29:29 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.104 2005/12/16 17:27:45 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking ==== //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#40 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.85 2005/11/23 17:10:46 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.86 2005/12/16 17:27:45 wpaul Exp $"); #include #include ==== //depot/projects/smpng/sys/dev/ata/ata-chipset.c#60 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.140 2005/12/14 12:13:00 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.141 2005/12/16 08:12:13 sos Exp $"); #include "opt_ata.h" #include @@ -687,18 +687,19 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_ATP850R, 0, ATPOLD, 0x00, ATA_UDMA2, "Acard ATP850" }, - { ATA_ATP860A, 0, 0, 0x00, ATA_UDMA4, "Acard ATP860A" }, - { ATA_ATP860R, 0, 0, 0x00, ATA_UDMA4, "Acard ATP860R" }, - { ATA_ATP865A, 0, 0, 0x00, ATA_UDMA6, "Acard ATP865A" }, - { ATA_ATP865R, 0, 0, 0x00, ATA_UDMA6, "Acard ATP865R" }, + {{ ATA_ATP850R, 0, ATPOLD, 0x00, ATA_UDMA2, "ATP850" }, + { ATA_ATP860A, 0, 0, 0x00, ATA_UDMA4, "ATP860A" }, + { ATA_ATP860R, 0, 0, 0x00, ATA_UDMA4, "ATP860R" }, + { ATA_ATP865A, 0, 0, 0x00, ATA_UDMA6, "ATP865A" }, + { ATA_ATP865R, 0, 0, 0x00, ATA_UDMA6, "ATP865R" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; if (!(idx = ata_match_chip(dev, ids))) return ENXIO; - sprintf(buffer, "%s %s controller", idx->text, ata_mode2str(idx->max_dma)); + sprintf(buffer, "Acard %s %s controller", + idx->text, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); ctlr->chip = idx; ctlr->chipinit = ata_acard_chipinit; @@ -844,21 +845,22 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_ALI_5289, 0x00, 2, ALISATA, ATA_SA150, "AcerLabs M5289" }, - { ATA_ALI_5287, 0x00, 4, ALISATA, ATA_SA150, "AcerLabs M5287" }, - { ATA_ALI_5281, 0x00, 2, ALISATA, ATA_SA150, "AcerLabs M5281" }, - { ATA_ALI_5229, 0xc5, 0, ALINEW, ATA_UDMA6, "AcerLabs M5229" }, - { ATA_ALI_5229, 0xc4, 0, ALINEW, ATA_UDMA5, "AcerLabs M5229" }, - { ATA_ALI_5229, 0xc2, 0, ALINEW, ATA_UDMA4, "AcerLabs M5229" }, - { ATA_ALI_5229, 0x20, 0, ALIOLD, ATA_UDMA2, "AcerLabs M5229" }, - { ATA_ALI_5229, 0x00, 0, ALIOLD, ATA_WDMA2, "AcerLabs M5229" }, + {{ ATA_ALI_5289, 0x00, 2, ALISATA, ATA_SA150, "M5289" }, + { ATA_ALI_5287, 0x00, 4, ALISATA, ATA_SA150, "M5287" }, + { ATA_ALI_5281, 0x00, 2, ALISATA, ATA_SA150, "M5281" }, + { ATA_ALI_5229, 0xc5, 0, ALINEW, ATA_UDMA6, "M5229" }, + { ATA_ALI_5229, 0xc4, 0, ALINEW, ATA_UDMA5, "M5229" }, + { ATA_ALI_5229, 0xc2, 0, ALINEW, ATA_UDMA4, "M5229" }, + { ATA_ALI_5229, 0x20, 0, ALIOLD, ATA_UDMA2, "M5229" }, + { ATA_ALI_5229, 0x00, 0, ALIOLD, ATA_WDMA2, "M5229" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; if (!(idx = ata_match_chip(dev, ids))) return ENXIO; - sprintf(buffer, "%s %s controller", idx->text, ata_mode2str(idx->max_dma)); + sprintf(buffer, "AcerLabs %s %s controller", + idx->text, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); ctlr->chip = idx; ctlr->chipinit = ata_ali_chipinit; @@ -1077,17 +1079,18 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_AMD756, 0x00, AMDNVIDIA, 0x00, ATA_UDMA4, "AMD 756" }, - { ATA_AMD766, 0x00, AMDNVIDIA, AMDCABLE|AMDBUG, ATA_UDMA5, "AMD 766" }, - { ATA_AMD768, 0x00, AMDNVIDIA, AMDCABLE, ATA_UDMA5, "AMD 768" }, - { ATA_AMD8111, 0x00, AMDNVIDIA, AMDCABLE, ATA_UDMA6, "AMD 8111" }, + {{ ATA_AMD756, 0x00, AMDNVIDIA, 0x00, ATA_UDMA4, "756" }, + { ATA_AMD766, 0x00, AMDNVIDIA, AMDCABLE|AMDBUG, ATA_UDMA5, "766" }, + { ATA_AMD768, 0x00, AMDNVIDIA, AMDCABLE, ATA_UDMA5, "768" }, + { ATA_AMD8111, 0x00, AMDNVIDIA, AMDCABLE, ATA_UDMA6, "8111" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; if (!(idx = ata_match_chip(dev, ids))) return ENXIO; - sprintf(buffer, "%s %s controller", idx->text, ata_mode2str(idx->max_dma)); + sprintf(buffer, "AMD %s %s controller", + idx->text, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); ctlr->chip = idx; ctlr->chipinit = ata_amd_chipinit; @@ -1122,19 +1125,20 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_ATI_IXP200, 0x00, 0, 0, ATA_UDMA5, "ATI IXP200" }, - { ATA_ATI_IXP300, 0x00, 0, 0, ATA_UDMA6, "ATI IXP300" }, - { ATA_ATI_IXP400, 0x00, 0, 0, ATA_UDMA6, "ATI IXP400" }, - { ATA_ATI_IXP300_S1, 0x00, SIIMEMIO, 0, ATA_SA150, "ATI IXP300" }, - { ATA_ATI_IXP400_S1, 0x00, SIIMEMIO, 0, ATA_SA150, "ATI IXP400" }, - { ATA_ATI_IXP400_S2, 0x00, SIIMEMIO, 0, ATA_SA150, "ATI IXP400" }, + {{ ATA_ATI_IXP200, 0x00, 0, 0, ATA_UDMA5, "IXP200" }, + { ATA_ATI_IXP300, 0x00, 0, 0, ATA_UDMA6, "IXP300" }, + { ATA_ATI_IXP400, 0x00, 0, 0, ATA_UDMA6, "IXP400" }, + { ATA_ATI_IXP300_S1, 0x00, SIIMEMIO, 0, ATA_SA150, "IXP300" }, + { ATA_ATI_IXP400_S1, 0x00, SIIMEMIO, 0, ATA_SA150, "IXP400" }, + { ATA_ATI_IXP400_S2, 0x00, SIIMEMIO, 0, ATA_SA150, "IXP400" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; if (!(idx = ata_match_chip(dev, ids))) return ENXIO; - sprintf(buffer, "%s %s controller", idx->text, ata_mode2str(idx->max_dma)); + sprintf(buffer, "ATI %s %s controller", + idx->text, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); ctlr->chip = idx; @@ -1365,15 +1369,15 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_HPT374, 0x07, HPT374, 0x00, ATA_UDMA6, "HighPoint HPT374" }, - { ATA_HPT372, 0x02, HPT372, 0x00, ATA_UDMA6, "HighPoint HPT372N" }, - { ATA_HPT372, 0x01, HPT372, 0x00, ATA_UDMA6, "HighPoint HPT372" }, - { ATA_HPT371, 0x01, HPT372, 0x00, ATA_UDMA6, "HighPoint HPT371" }, - { ATA_HPT366, 0x05, HPT372, 0x00, ATA_UDMA6, "HighPoint HPT372" }, - { ATA_HPT366, 0x03, HPT370, 0x00, ATA_UDMA5, "HighPoint HPT370" }, - { ATA_HPT366, 0x02, HPT366, 0x00, ATA_UDMA4, "HighPoint HPT368" }, - { ATA_HPT366, 0x00, HPT366, HPTOLD, ATA_UDMA4, "HighPoint HPT366" }, - { ATA_HPT302, 0x01, HPT372, 0x00, ATA_UDMA6, "HighPoint HPT302" }, + {{ ATA_HPT374, 0x07, HPT374, 0x00, ATA_UDMA6, "HPT374" }, + { ATA_HPT372, 0x02, HPT372, 0x00, ATA_UDMA6, "HPT372N" }, + { ATA_HPT372, 0x01, HPT372, 0x00, ATA_UDMA6, "HPT372" }, + { ATA_HPT371, 0x01, HPT372, 0x00, ATA_UDMA6, "HPT371" }, + { ATA_HPT366, 0x05, HPT372, 0x00, ATA_UDMA6, "HPT372" }, + { ATA_HPT366, 0x03, HPT370, 0x00, ATA_UDMA5, "HPT370" }, + { ATA_HPT366, 0x02, HPT366, 0x00, ATA_UDMA4, "HPT368" }, + { ATA_HPT366, 0x00, HPT366, HPTOLD, ATA_UDMA4, "HPT366" }, + { ATA_HPT302, 0x01, HPT372, 0x00, ATA_UDMA6, "HPT302" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; @@ -1387,7 +1391,8 @@ else if (pci_get_function(dev) == 1) strcat(buffer, " (channel 2+3)"); } - sprintf(buffer, "%s %s controller", buffer, ata_mode2str(idx->max_dma)); + sprintf(buffer, "HighPoint %s %s controller", + buffer, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); ctlr->chip = idx; ctlr->chipinit = ata_highpoint_chipinit; @@ -1546,43 +1551,44 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_I82371FB, 0, 0, 0x00, ATA_WDMA2, "Intel PIIX" }, - { ATA_I82371SB, 0, 0, 0x00, ATA_WDMA2, "Intel PIIX3" }, - { ATA_I82371AB, 0, 0, 0x00, ATA_UDMA2, "Intel PIIX4" }, - { ATA_I82443MX, 0, 0, 0x00, ATA_UDMA2, "Intel PIIX4" }, - { ATA_I82451NX, 0, 0, 0x00, ATA_UDMA2, "Intel PIIX4" }, - { ATA_I82801AB, 0, 0, 0x00, ATA_UDMA2, "Intel ICH0" }, - { ATA_I82801AA, 0, 0, 0x00, ATA_UDMA4, "Intel ICH" }, - { ATA_I82372FB, 0, 0, 0x00, ATA_UDMA4, "Intel ICH" }, - { ATA_I82801BA, 0, 0, 0x00, ATA_UDMA5, "Intel ICH2" }, - { ATA_I82801BA_1, 0, 0, 0x00, ATA_UDMA5, "Intel ICH2" }, - { ATA_I82801CA, 0, 0, 0x00, ATA_UDMA5, "Intel ICH3" }, - { ATA_I82801CA_1, 0, 0, 0x00, ATA_UDMA5, "Intel ICH3" }, - { ATA_I82801DB, 0, 0, 0x00, ATA_UDMA5, "Intel ICH4" }, - { ATA_I82801DB_1, 0, 0, 0x00, ATA_UDMA5, "Intel ICH4" }, - { ATA_I82801EB, 0, 0, 0x00, ATA_UDMA5, "Intel ICH5" }, - { ATA_I82801EB_S1, 0, 0, 0x00, ATA_SA150, "Intel ICH5" }, - { ATA_I82801EB_R1, 0, 0, 0x00, ATA_SA150, "Intel ICH5" }, - { ATA_I6300ESB, 0, 0, 0x00, ATA_UDMA5, "Intel 6300ESB" }, - { ATA_I6300ESB_S1, 0, 0, 0x00, ATA_SA150, "Intel 6300ESB" }, - { ATA_I6300ESB_R1, 0, 0, 0x00, ATA_SA150, "Intel 6300ESB" }, - { ATA_I82801FB, 0, 0, 0x00, ATA_UDMA5, "Intel ICH6" }, - { ATA_I82801FB_S1, 0, AHCI, 0x00, ATA_SA150, "Intel ICH6" }, - { ATA_I82801FB_R1, 0, AHCI, 0x00, ATA_SA150, "Intel ICH6" }, - { ATA_I82801FB_M, 0, AHCI, 0x00, ATA_SA150, "Intel ICH6" }, - { ATA_I82801GB, 0, 0, 0x00, ATA_UDMA5, "Intel ICH7" }, - { ATA_I82801GB_S1, 0, AHCI, 0x00, ATA_SA300, "Intel ICH7" }, - { ATA_I82801GB_R1, 0, AHCI, 0x00, ATA_SA300, "Intel ICH7" }, - { ATA_I82801GB_M, 0, AHCI, 0x00, ATA_SA300, "Intel ICH7" }, - { ATA_I82801GB_AH, 0, AHCI, 0x00, ATA_SA300, "Intel ICH7" }, - { ATA_I31244, 0, 0, 0x00, ATA_SA150, "Intel 31244" }, + {{ ATA_I82371FB, 0, 0, 0x00, ATA_WDMA2, "PIIX" }, + { ATA_I82371SB, 0, 0, 0x00, ATA_WDMA2, "PIIX3" }, + { ATA_I82371AB, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, + { ATA_I82443MX, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, + { ATA_I82451NX, 0, 0, 0x00, ATA_UDMA2, "PIIX4" }, + { ATA_I82801AB, 0, 0, 0x00, ATA_UDMA2, "ICH0" }, + { ATA_I82801AA, 0, 0, 0x00, ATA_UDMA4, "ICH" }, + { ATA_I82372FB, 0, 0, 0x00, ATA_UDMA4, "ICH" }, + { ATA_I82801BA, 0, 0, 0x00, ATA_UDMA5, "ICH2" }, + { ATA_I82801BA_1, 0, 0, 0x00, ATA_UDMA5, "ICH2" }, + { ATA_I82801CA, 0, 0, 0x00, ATA_UDMA5, "ICH3" }, + { ATA_I82801CA_1, 0, 0, 0x00, ATA_UDMA5, "ICH3" }, + { ATA_I82801DB, 0, 0, 0x00, ATA_UDMA5, "ICH4" }, + { ATA_I82801DB_1, 0, 0, 0x00, ATA_UDMA5, "ICH4" }, + { ATA_I82801EB, 0, 0, 0x00, ATA_UDMA5, "ICH5" }, + { ATA_I82801EB_S1, 0, 0, 0x00, ATA_SA150, "ICH5" }, + { ATA_I82801EB_R1, 0, 0, 0x00, ATA_SA150, "ICH5" }, + { ATA_I6300ESB, 0, 0, 0x00, ATA_UDMA5, "6300ESB" }, + { ATA_I6300ESB_S1, 0, 0, 0x00, ATA_SA150, "6300ESB" }, + { ATA_I6300ESB_R1, 0, 0, 0x00, ATA_SA150, "6300ESB" }, + { ATA_I82801FB, 0, 0, 0x00, ATA_UDMA5, "ICH6" }, + { ATA_I82801FB_S1, 0, AHCI, 0x00, ATA_SA150, "ICH6" }, + { ATA_I82801FB_R1, 0, AHCI, 0x00, ATA_SA150, "ICH6" }, + { ATA_I82801FB_M, 0, AHCI, 0x00, ATA_SA150, "ICH6" }, + { ATA_I82801GB, 0, 0, 0x00, ATA_UDMA5, "ICH7" }, + { ATA_I82801GB_S1, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, + { ATA_I82801GB_R1, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, + { ATA_I82801GB_M, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, + { ATA_I82801GB_AH, 0, AHCI, 0x00, ATA_SA300, "ICH7" }, + { ATA_I31244, 0, 0, 0x00, ATA_SA150, "31244" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; if (!(idx = ata_match_chip(dev, ids))) return ENXIO; - sprintf(buffer, "%s %s controller", idx->text, ata_mode2str(idx->max_dma)); + sprintf(buffer, "Intel %s %s controller", + idx->text, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); ctlr->chip = idx; ctlr->chipinit = ata_intel_chipinit; @@ -1977,15 +1983,16 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_IT8212F, 0x00, 0x00, 0x00, ATA_UDMA6, "ITE IT8212F" }, - { ATA_IT8211F, 0x00, 0x00, 0x00, ATA_UDMA6, "ITE IT8211F" }, + {{ ATA_IT8212F, 0x00, 0x00, 0x00, ATA_UDMA6, "IT8212F" }, + { ATA_IT8211F, 0x00, 0x00, 0x00, ATA_UDMA6, "IT8211F" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; if (!(idx = ata_match_chip(dev, ids))) return ENXIO; - sprintf(buffer, "%s %s controller", idx->text, ata_mode2str(idx->max_dma)); + sprintf(buffer, "ITE %s %s controller", + idx->text, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); ctlr->chip = idx; ctlr->chipinit = ata_ite_chipinit; @@ -2171,27 +2178,34 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_NFORCE1, 0, AMDNVIDIA, NVIDIA, ATA_UDMA5, "nVidia nForce" }, - { ATA_NFORCE2, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nVidia nForce2" }, - { ATA_NFORCE2_MCP, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nVidia nForce2 MCP" }, - { ATA_NFORCE2_MCP_S1, 0, 0, 0, ATA_SA150, "nVidia nForce2 MCP" }, - { ATA_NFORCE3, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nVidia nForce3" }, - { ATA_NFORCE3_PRO, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nVidia nForce3 Pro" }, - { ATA_NFORCE3_PRO_S1, 0, 0, 0, ATA_SA150, "nVidia nForce3 Pro" }, - { ATA_NFORCE3_PRO_S2, 0, 0, 0, ATA_SA150, "nVidia nForce3 Pro" }, - { ATA_NFORCE3_MCP, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nVidia nForce3 MCP" }, - { ATA_NFORCE3_MCP_S1, 0, 0, NV4OFF, ATA_SA150, "nVidia nForce3 MCP" }, - { ATA_NFORCE3_MCP_S2, 0, 0, NV4OFF, ATA_SA150, "nVidia nForce3 MCP" }, - { ATA_NFORCE4, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nVidia nForce4" }, - { ATA_NFORCE4_S1, 0, 0, NV4OFF, ATA_SA300, "nVidia nForce4" }, - { ATA_NFORCE4_S2, 0, 0, NV4OFF, ATA_SA300, "nVidia nForce4" }, - { 0, 0, 0, 0, 0, 0}}; - char buffer[64]; + {{ ATA_NFORCE1, 0, AMDNVIDIA, NVIDIA, ATA_UDMA5, "nForce" }, + { ATA_NFORCE2, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce2" }, + { ATA_NFORCE2_PRO, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce2 Pro" }, + { ATA_NFORCE2_PRO_S1, 0, 0, 0, ATA_SA150, "nForce2 Pro" }, + { ATA_NFORCE3, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce3" }, + { ATA_NFORCE3_PRO, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce3 Pro" }, + { ATA_NFORCE3_PRO_S1, 0, 0, 0, ATA_SA150, "nForce3 Pro" }, + { ATA_NFORCE3_PRO_S2, 0, 0, 0, ATA_SA150, "nForce3 Pro" }, + { ATA_NFORCE_MCP04, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP" }, + { ATA_NFORCE_MCP04_S1, 0, 0, NV4OFF, ATA_SA150, "nForce MCP" }, + { ATA_NFORCE_MCP04_S2, 0, 0, NV4OFF, ATA_SA150, "nForce MCP" }, + { ATA_NFORCE_CK804, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce CK804" }, + { ATA_NFORCE_CK804_S1, 0, 0, NV4OFF, ATA_SA300, "nForce CK804" }, + { ATA_NFORCE_CK804_S2, 0, 0, NV4OFF, ATA_SA300, "nForce CK804" }, + { ATA_NFORCE_MCP51, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP51" }, + { ATA_NFORCE_MCP51_S1, 0, 0, NV4OFF, ATA_SA300, "nForce MCP51" }, + { ATA_NFORCE_MCP51_S2, 0, 0, NV4OFF, ATA_SA300, "nForce MCP51" }, + { ATA_NFORCE_MCP55, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP55" }, + { ATA_NFORCE_MCP55_S1, 0, 0, NV4OFF, ATA_SA300, "nForce MCP55" }, + { ATA_NFORCE_MCP55_S2, 0, 0, NV4OFF, ATA_SA300, "nForce MCP55" }, + { 0, 0, 0, 0, 0, 0}} ; + char buffer[64] ; if (!(idx = ata_match_chip(dev, ids))) return ENXIO; - sprintf(buffer, "%s %s controller", idx->text, ata_mode2str(idx->max_dma)); + sprintf(buffer, "nVidia %s %s controller", + idx->text, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); ctlr->chip = idx; ctlr->chipinit = ata_nvidia_chipinit; @@ -2382,40 +2396,40 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_PDC20246, 0, PROLD, 0x00, ATA_UDMA2, "Promise PDC20246" }, - { ATA_PDC20262, 0, PRNEW, 0x00, ATA_UDMA4, "Promise PDC20262" }, - { ATA_PDC20263, 0, PRNEW, 0x00, ATA_UDMA4, "Promise PDC20263" }, - { ATA_PDC20265, 0, PRNEW, 0x00, ATA_UDMA5, "Promise PDC20265" }, - { ATA_PDC20267, 0, PRNEW, 0x00, ATA_UDMA5, "Promise PDC20267" }, - { ATA_PDC20268, 0, PRTX, PRTX4, ATA_UDMA5, "Promise PDC20268" }, - { ATA_PDC20269, 0, PRTX, 0x00, ATA_UDMA6, "Promise PDC20269" }, - { ATA_PDC20270, 0, PRTX, PRTX4, ATA_UDMA5, "Promise PDC20270" }, - { ATA_PDC20271, 0, PRTX, 0x00, ATA_UDMA6, "Promise PDC20271" }, - { ATA_PDC20275, 0, PRTX, 0x00, ATA_UDMA6, "Promise PDC20275" }, - { ATA_PDC20276, 0, PRTX, PRSX6K, ATA_UDMA6, "Promise PDC20276" }, - { ATA_PDC20277, 0, PRTX, 0x00, ATA_UDMA6, "Promise PDC20277" }, - { ATA_PDC20318, 0, PRMIO, PRSATA, ATA_SA150, "Promise PDC20318" }, - { ATA_PDC20319, 0, PRMIO, PRSATA, ATA_SA150, "Promise PDC20319" }, - { ATA_PDC20371, 0, PRMIO, PRCMBO, ATA_SA150, "Promise PDC20371" }, - { ATA_PDC20375, 0, PRMIO, PRCMBO, ATA_SA150, "Promise PDC20375" }, - { ATA_PDC20376, 0, PRMIO, PRCMBO, ATA_SA150, "Promise PDC20376" }, - { ATA_PDC20377, 0, PRMIO, PRCMBO, ATA_SA150, "Promise PDC20377" }, - { ATA_PDC20378, 0, PRMIO, PRCMBO, ATA_SA150, "Promise PDC20378" }, - { ATA_PDC20379, 0, PRMIO, PRCMBO, ATA_SA150, "Promise PDC20379" }, - { ATA_PDC20571, 0, PRMIO, PRCMBO2, ATA_SA150, "Promise PDC20571" }, - { ATA_PDC20575, 0, PRMIO, PRCMBO2, ATA_SA150, "Promise PDC20575" }, - { ATA_PDC20579, 0, PRMIO, PRCMBO2, ATA_SA150, "Promise PDC20579" }, - { ATA_PDC20580, 0, PRMIO, PRCMBO2, ATA_SA150, "Promise PDC20580" }, - { ATA_PDC20617, 0, PRMIO, PRPATA, ATA_UDMA6, "Promise PDC20617" }, - { ATA_PDC20618, 0, PRMIO, PRPATA, ATA_UDMA6, "Promise PDC20618" }, - { ATA_PDC20619, 0, PRMIO, PRPATA, ATA_UDMA6, "Promise PDC20619" }, - { ATA_PDC20620, 0, PRMIO, PRPATA, ATA_UDMA6, "Promise PDC20620" }, - { ATA_PDC20621, 0, PRMIO, PRSX4X, ATA_UDMA5, "Promise PDC20621" }, - { ATA_PDC20622, 0, PRMIO, PRSX4X, ATA_SA150, "Promise PDC20622" }, - { ATA_PDC40518, 0, PRMIO, PRSATA2, ATA_SA150, "Promise PDC40518" }, - { ATA_PDC40519, 0, PRMIO, PRSATA2, ATA_SA150, "Promise PDC40519" }, - { ATA_PDC40718, 0, PRMIO, PRSATA2, ATA_SA300, "Promise PDC40718" }, - { ATA_PDC40719, 0, PRMIO, PRSATA2, ATA_SA300, "Promise PDC40719" }, + {{ ATA_PDC20246, 0, PROLD, 0x00, ATA_UDMA2, "PDC20246" }, + { ATA_PDC20262, 0, PRNEW, 0x00, ATA_UDMA4, "PDC20262" }, + { ATA_PDC20263, 0, PRNEW, 0x00, ATA_UDMA4, "PDC20263" }, + { ATA_PDC20265, 0, PRNEW, 0x00, ATA_UDMA5, "PDC20265" }, + { ATA_PDC20267, 0, PRNEW, 0x00, ATA_UDMA5, "PDC20267" }, + { ATA_PDC20268, 0, PRTX, PRTX4, ATA_UDMA5, "PDC20268" }, + { ATA_PDC20269, 0, PRTX, 0x00, ATA_UDMA6, "PDC20269" }, + { ATA_PDC20270, 0, PRTX, PRTX4, ATA_UDMA5, "PDC20270" }, + { ATA_PDC20271, 0, PRTX, 0x00, ATA_UDMA6, "PDC20271" }, + { ATA_PDC20275, 0, PRTX, 0x00, ATA_UDMA6, "PDC20275" }, + { ATA_PDC20276, 0, PRTX, PRSX6K, ATA_UDMA6, "PDC20276" }, + { ATA_PDC20277, 0, PRTX, 0x00, ATA_UDMA6, "PDC20277" }, + { ATA_PDC20318, 0, PRMIO, PRSATA, ATA_SA150, "PDC20318" }, + { ATA_PDC20319, 0, PRMIO, PRSATA, ATA_SA150, "PDC20319" }, + { ATA_PDC20371, 0, PRMIO, PRCMBO, ATA_SA150, "PDC20371" }, + { ATA_PDC20375, 0, PRMIO, PRCMBO, ATA_SA150, "PDC20375" }, + { ATA_PDC20376, 0, PRMIO, PRCMBO, ATA_SA150, "PDC20376" }, + { ATA_PDC20377, 0, PRMIO, PRCMBO, ATA_SA150, "PDC20377" }, + { ATA_PDC20378, 0, PRMIO, PRCMBO, ATA_SA150, "PDC20378" }, + { ATA_PDC20379, 0, PRMIO, PRCMBO, ATA_SA150, "PDC20379" }, + { ATA_PDC20571, 0, PRMIO, PRCMBO2, ATA_SA150, "PDC20571" }, + { ATA_PDC20575, 0, PRMIO, PRCMBO2, ATA_SA150, "PDC20575" }, + { ATA_PDC20579, 0, PRMIO, PRCMBO2, ATA_SA150, "PDC20579" }, + { ATA_PDC20580, 0, PRMIO, PRCMBO2, ATA_SA150, "PDC20580" }, + { ATA_PDC20617, 0, PRMIO, PRPATA, ATA_UDMA6, "PDC20617" }, + { ATA_PDC20618, 0, PRMIO, PRPATA, ATA_UDMA6, "PDC20618" }, + { ATA_PDC20619, 0, PRMIO, PRPATA, ATA_UDMA6, "PDC20619" }, + { ATA_PDC20620, 0, PRMIO, PRPATA, ATA_UDMA6, "PDC20620" }, + { ATA_PDC20621, 0, PRMIO, PRSX4X, ATA_UDMA5, "PDC20621" }, + { ATA_PDC20622, 0, PRMIO, PRSX4X, ATA_SA150, "PDC20622" }, + { ATA_PDC40518, 0, PRMIO, PRSATA2, ATA_SA150, "PDC40518" }, + { ATA_PDC40519, 0, PRMIO, PRSATA2, ATA_SA150, "PDC40519" }, + { ATA_PDC40718, 0, PRMIO, PRSATA2, ATA_SA300, "PDC40718" }, + { ATA_PDC40719, 0, PRMIO, PRSATA2, ATA_SA300, "PDC40719" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; uintptr_t devid = 0; @@ -2452,7 +2466,8 @@ start = end = 0; } } - sprintf(buffer, "%s %s controller", buffer, ata_mode2str(idx->max_dma)); + sprintf(buffer, "Promise %s %s controller", + buffer, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); ctlr->chip = idx; ctlr->chipinit = ata_promise_chipinit; @@ -3280,18 +3295,19 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_ROSB4, 0x00, SWKS33, 0x00, ATA_UDMA2, "ServerWorks ROSB4" }, - { ATA_CSB5, 0x92, SWKS100, 0x00, ATA_UDMA5, "ServerWorks CSB5" }, - { ATA_CSB5, 0x00, SWKS66, 0x00, ATA_UDMA4, "ServerWorks CSB5" }, - { ATA_CSB6, 0x00, SWKS100, 0x00, ATA_UDMA5, "ServerWorks CSB6" }, - { ATA_CSB6_1, 0x00, SWKS66, 0x00, ATA_UDMA4, "ServerWorks CSB6" }, + {{ ATA_ROSB4, 0x00, SWKS33, 0x00, ATA_UDMA2, "ROSB4" }, + { ATA_CSB5, 0x92, SWKS100, 0x00, ATA_UDMA5, "CSB5" }, + { ATA_CSB5, 0x00, SWKS66, 0x00, ATA_UDMA4, "CSB5" }, + { ATA_CSB6, 0x00, SWKS100, 0x00, ATA_UDMA5, "CSB6" }, + { ATA_CSB6_1, 0x00, SWKS66, 0x00, ATA_UDMA4, "CSB6" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; if (!(idx = ata_match_chip(dev, ids))) return ENXIO; - sprintf(buffer, "%s %s controller", idx->text, ata_mode2str(idx->max_dma)); + sprintf(buffer, "ServerWorks %s %s controller", + idx->text, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); ctlr->chip = idx; ctlr->chipinit = ata_serverworks_chipinit; @@ -3815,31 +3831,31 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_SIS182, 0x00, SISSATA, 0, ATA_SA150, "SiS 182" }, /* south */ - { ATA_SIS181, 0x00, SISSATA, 0, ATA_SA150, "SiS 181" }, /* south */ - { ATA_SIS180, 0x00, SISSATA, 0, ATA_SA150, "SiS 180" }, /* south */ - { ATA_SIS965, 0x00, SIS133NEW, 0, ATA_UDMA6, "SiS 965" }, /* south */ - { ATA_SIS964, 0x00, SIS133NEW, 0, ATA_UDMA6, "SiS 964" }, /* south */ - { ATA_SIS963, 0x00, SIS133NEW, 0, ATA_UDMA6, "SiS 963" }, /* south */ - { ATA_SIS962, 0x00, SIS133NEW, 0, ATA_UDMA6, "SiS 962" }, /* south */ + {{ ATA_SIS182, 0x00, SISSATA, 0, ATA_SA150, "182" }, /* south */ + { ATA_SIS181, 0x00, SISSATA, 0, ATA_SA150, "181" }, /* south */ + { ATA_SIS180, 0x00, SISSATA, 0, ATA_SA150, "180" }, /* south */ + { ATA_SIS965, 0x00, SIS133NEW, 0, ATA_UDMA6, "965" }, /* south */ + { ATA_SIS964, 0x00, SIS133NEW, 0, ATA_UDMA6, "964" }, /* south */ + { ATA_SIS963, 0x00, SIS133NEW, 0, ATA_UDMA6, "963" }, /* south */ + { ATA_SIS962, 0x00, SIS133NEW, 0, ATA_UDMA6, "962" }, /* south */ - { ATA_SIS745, 0x00, SIS100NEW, 0, ATA_UDMA5, "SiS 745" }, /* 1chip */ - { ATA_SIS735, 0x00, SIS100NEW, 0, ATA_UDMA5, "SiS 735" }, /* 1chip */ - { ATA_SIS733, 0x00, SIS100NEW, 0, ATA_UDMA5, "SiS 733" }, /* 1chip */ - { ATA_SIS730, 0x00, SIS100OLD, 0, ATA_UDMA5, "SiS 730" }, /* 1chip */ + { ATA_SIS745, 0x00, SIS100NEW, 0, ATA_UDMA5, "745" }, /* 1chip */ + { ATA_SIS735, 0x00, SIS100NEW, 0, ATA_UDMA5, "735" }, /* 1chip */ + { ATA_SIS733, 0x00, SIS100NEW, 0, ATA_UDMA5, "733" }, /* 1chip */ + { ATA_SIS730, 0x00, SIS100OLD, 0, ATA_UDMA5, "730" }, /* 1chip */ - { ATA_SIS635, 0x00, SIS100NEW, 0, ATA_UDMA5, "SiS 635" }, /* 1chip */ - { ATA_SIS633, 0x00, SIS100NEW, 0, ATA_UDMA5, "SiS 633" }, /* unknown */ - { ATA_SIS630, 0x30, SIS100OLD, 0, ATA_UDMA5, "SiS 630S"}, /* 1chip */ - { ATA_SIS630, 0x00, SIS66, 0, ATA_UDMA4, "SiS 630" }, /* 1chip */ - { ATA_SIS620, 0x00, SIS66, 0, ATA_UDMA4, "SiS 620" }, /* 1chip */ + { ATA_SIS635, 0x00, SIS100NEW, 0, ATA_UDMA5, "635" }, /* 1chip */ + { ATA_SIS633, 0x00, SIS100NEW, 0, ATA_UDMA5, "633" }, /* unknown */ + { ATA_SIS630, 0x30, SIS100OLD, 0, ATA_UDMA5, "630S"}, /* 1chip */ + { ATA_SIS630, 0x00, SIS66, 0, ATA_UDMA4, "630" }, /* 1chip */ + { ATA_SIS620, 0x00, SIS66, 0, ATA_UDMA4, "620" }, /* 1chip */ - { ATA_SIS550, 0x00, SIS66, 0, ATA_UDMA5, "SiS 550" }, - { ATA_SIS540, 0x00, SIS66, 0, ATA_UDMA4, "SiS 540" }, - { ATA_SIS530, 0x00, SIS66, 0, ATA_UDMA4, "SiS 530" }, + { ATA_SIS550, 0x00, SIS66, 0, ATA_UDMA5, "550" }, + { ATA_SIS540, 0x00, SIS66, 0, ATA_UDMA4, "540" }, + { ATA_SIS530, 0x00, SIS66, 0, ATA_UDMA4, "530" }, - { ATA_SIS5513, 0xc2, SIS33, 1, ATA_UDMA2, "SiS 5513" }, - { ATA_SIS5513, 0x00, SIS33, 1, ATA_WDMA2, "SiS 5513" }, + { ATA_SIS5513, 0xc2, SIS33, 1, ATA_UDMA2, "5513" }, + { ATA_SIS5513, 0x00, SIS33, 1, ATA_WDMA2, "5513" }, { 0, 0, 0, 0, 0, 0 }}; char buffer[64]; int found = 0; @@ -3882,7 +3898,8 @@ pci_write_config(dev, 0x4a, reg4a, 1); } if (!found) - sprintf(buffer,"%s %s controller",idx->text,ata_mode2str(idx->max_dma)); + sprintf(buffer,"SiS %s %s controller", + idx->text, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); ctlr->chip = idx; @@ -4054,26 +4071,26 @@ struct ata_pci_controller *ctlr = device_get_softc(dev); struct ata_chip_id *idx; static struct ata_chip_id ids[] = - {{ ATA_VIA82C586, 0x02, VIA33, 0x00, ATA_UDMA2, "VIA 82C586B" }, - { ATA_VIA82C586, 0x00, VIA33, 0x00, ATA_WDMA2, "VIA 82C586" }, - { ATA_VIA82C596, 0x12, VIA66, VIACLK, ATA_UDMA4, "VIA 82C596B" }, - { ATA_VIA82C596, 0x00, VIA33, 0x00, ATA_UDMA2, "VIA 82C596" }, - { ATA_VIA82C686, 0x40, VIA100, VIABUG, ATA_UDMA5, "VIA 82C686B"}, - { ATA_VIA82C686, 0x10, VIA66, VIACLK, ATA_UDMA4, "VIA 82C686A" }, - { ATA_VIA82C686, 0x00, VIA33, 0x00, ATA_UDMA2, "VIA 82C686" }, - { ATA_VIA8231, 0x00, VIA100, VIABUG, ATA_UDMA5, "VIA 8231" }, - { ATA_VIA8233, 0x00, VIA100, 0x00, ATA_UDMA5, "VIA 8233" }, - { ATA_VIA8233C, 0x00, VIA100, 0x00, ATA_UDMA5, "VIA 8233C" }, - { ATA_VIA8233A, 0x00, VIA133, 0x00, ATA_UDMA6, "VIA 8233A" }, - { ATA_VIA8235, 0x00, VIA133, 0x00, ATA_UDMA6, "VIA 8235" }, - { ATA_VIA8237, 0x00, VIA133, 0x00, ATA_UDMA6, "VIA 8237" }, - { ATA_VIA8251, 0x00, VIA133, 0x00, ATA_UDMA6, "VIA 8251" }, + {{ ATA_VIA82C586, 0x02, VIA33, 0x00, ATA_UDMA2, "82C586B" }, + { ATA_VIA82C586, 0x00, VIA33, 0x00, ATA_WDMA2, "82C586" }, + { ATA_VIA82C596, 0x12, VIA66, VIACLK, ATA_UDMA4, "82C596B" }, + { ATA_VIA82C596, 0x00, VIA33, 0x00, ATA_UDMA2, "82C596" }, + { ATA_VIA82C686, 0x40, VIA100, VIABUG, ATA_UDMA5, "82C686B"}, + { ATA_VIA82C686, 0x10, VIA66, VIACLK, ATA_UDMA4, "82C686A" }, + { ATA_VIA82C686, 0x00, VIA33, 0x00, ATA_UDMA2, "82C686" }, + { ATA_VIA8231, 0x00, VIA100, VIABUG, ATA_UDMA5, "8231" }, + { ATA_VIA8233, 0x00, VIA100, 0x00, ATA_UDMA5, "8233" }, + { ATA_VIA8233C, 0x00, VIA100, 0x00, ATA_UDMA5, "8233C" }, + { ATA_VIA8233A, 0x00, VIA133, 0x00, ATA_UDMA6, "8233A" }, + { ATA_VIA8235, 0x00, VIA133, 0x00, ATA_UDMA6, "8235" }, + { ATA_VIA8237, 0x00, VIA133, 0x00, ATA_UDMA6, "8237" }, + { ATA_VIA8251, 0x00, VIA133, 0x00, ATA_UDMA6, "8251" }, { 0, 0, 0, 0, 0, 0 }}; static struct ata_chip_id new_ids[] = - {{ ATA_VIA6410, 0x00, 0, 0x00, ATA_UDMA6, "VIA 6410" }, - { ATA_VIA6420, 0x00, 7, 0x00, ATA_SA150, "VIA 6420" }, - { ATA_VIA6421, 0x00, 6, VIABAR, ATA_SA150, "VIA 6421" }, - { ATA_VIA8251, 0x00, 0, VIAAHCI, ATA_SA150, "VIA 8251" }, + {{ ATA_VIA6410, 0x00, 0, 0x00, ATA_UDMA6, "6410" }, + { ATA_VIA6420, 0x00, 7, 0x00, ATA_SA150, "6420" }, + { ATA_VIA6421, 0x00, 6, VIABAR, ATA_SA150, "6421" }, + { ATA_VIA8251, 0x00, 0, VIAAHCI, ATA_SA150, "8251" }, { 0, 0, 0, 0, 0, 0 }}; char buffer[64]; @@ -4086,7 +4103,8 @@ return ENXIO; } - sprintf(buffer, "%s %s controller", idx->text, ata_mode2str(idx->max_dma)); + sprintf(buffer, "VIA %s %s controller", + idx->text, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); ctlr->chip = idx; ctlr->chipinit = ata_via_chipinit; ==== //depot/projects/smpng/sys/dev/ata/ata-pci.h#38 (text+ko) ==== @@ -25,7 +25,7 @@ * (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/sys/dev/ata/ata-pci.h,v 1.56 2005/12/14 12:13:00 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.57 2005/12/16 08:12:13 sos Exp $ */ /* structure holding chipset config info */ @@ -171,19 +171,24 @@ #define ATA_NVIDIA_ID 0x10de #define ATA_NFORCE1 0x01bc10de #define ATA_NFORCE2 0x006510de -#define ATA_NFORCE2_MCP 0x008510de -#define ATA_NFORCE2_MCP_S1 0x008e10de +#define ATA_NFORCE2_PRO 0x008510de +#define ATA_NFORCE2_PRO_S1 0x008e10de #define ATA_NFORCE3 0x00d510de #define ATA_NFORCE3_PRO 0x00e510de #define ATA_NFORCE3_PRO_S1 0x00e310de #define ATA_NFORCE3_PRO_S2 0x00ee10de -#define ATA_NFORCE3_MCP 0x003510de -#define ATA_NFORCE3_MCP_S1 0x003610de -#define ATA_NFORCE3_MCP_S2 0x003e10de -#define ATA_NFORCE4 0x005310de -#define ATA_NFORCE4_S1 0x005410de -#define ATA_NFORCE4_S2 0x005510de - +#define ATA_NFORCE_MCP04 0x003510de +#define ATA_NFORCE_MCP04_S1 0x003610de +#define ATA_NFORCE_MCP04_S2 0x003e10de +#define ATA_NFORCE_CK804 0x005310de +#define ATA_NFORCE_CK804_S1 0x005410de +#define ATA_NFORCE_CK804_S2 0x005510de +#define ATA_NFORCE_MCP51 0x026510de +#define ATA_NFORCE_MCP51_S1 0x026610de +#define ATA_NFORCE_MCP51_S2 0x026710de +#define ATA_NFORCE_MCP55 0x036e10de +#define ATA_NFORCE_MCP55_S1 0x037e10de +#define ATA_NFORCE_MCP55_S2 0x037f10de #define ATA_PROMISE_ID 0x105a #define ATA_PDC20246 0x4d33105a ==== //depot/projects/smpng/sys/dev/ata/ata-raid.c#42 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.111 2005/12/14 13:07:49 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.113 2005/12/16 06:11:22 scottl Exp $"); #include "opt_ata.h" #include @@ -65,6 +65,7 @@ static int ata_raid_rebuild(int array); static int ata_raid_read_metadata(device_t subdisk); static int ata_raid_write_metadata(struct ar_softc *rdp); +static int ata_raid_wipe_metadata(struct ar_softc *rdp); static int ata_raid_adaptec_read_meta(device_t dev, struct ar_softc **raidp); static int ata_raid_hptv2_read_meta(device_t dev, struct ar_softc **raidp); static int ata_raid_hptv2_write_meta(struct ar_softc *rdp); @@ -81,6 +82,7 @@ static int ata_raid_sis_read_meta(device_t dev, struct ar_softc **raidp); static int ata_raid_sis_write_meta(struct ar_softc *rdp); static int ata_raid_via_read_meta(device_t dev, struct ar_softc **raidp); +static int ata_raid_via_write_meta(struct ar_softc *rdp); static struct ata_request *ata_raid_init_request(struct ar_softc *rdp, struct bio *bio); static int ata_raid_send_request(struct ata_request *request); static int ata_raid_rw(device_t dev, u_int64_t lba, void *data, u_int bcount, int flags); @@ -908,7 +910,7 @@ case 0: /* XXX SOS cover up for bug in our PCI code */ case ATA_PROMISE_ID: ctlr = AR_F_PROMISE_RAID; - rdp->disks[disk].sectors = PR_LBA(rdp->disks[disk].dev); + rdp->disks[disk].sectors = PROMISE_LBA(rdp->disks[disk].dev); break; case ATA_SIS_ID: @@ -938,7 +940,7 @@ "If that is not what you want, use the BIOS to " "create the array\n"); ctlr = AR_F_FREEBSD_RAID; - rdp->disks[disk].sectors = PR_LBA(rdp->disks[disk].dev); + rdp->disks[disk].sectors = PROMISE_LBA(rdp->disks[disk].dev); break; } @@ -1119,7 +1121,7 @@ rdp->disks[disk].flags = 0; } } - ata_raid_write_metadata(rdp); /* XXX SOS wipe metadata instead? */ + ata_raid_wipe_metadata(rdp); ata_raid_arrays[array] = NULL; free(rdp, M_AR); return 0; @@ -1308,6 +1310,9 @@ case AR_F_SIS_RAID: return ata_raid_sis_write_meta(rdp); + + case AR_F_VIA_RAID: + return ata_raid_via_write_meta(rdp); #if 0 case AR_F_HPTV3_RAID: return ata_raid_hptv3_write_meta(rdp); @@ -1330,8 +1335,6 @@ case AR_F_SII_RAID: return ata_raid_sii_write_meta(rdp); - case AR_F_VIA_RAID: - return ata_raid_via_write_meta(rdp); #endif default: printf("ar%d: writing of %s metadata is NOT supported yet\n", @@ -1340,6 +1343,96 @@ return -1; } +static int +ata_raid_wipe_metadata(struct ar_softc *rdp) +{ + int disk, error = 0; + u_int64_t lba; + u_int32_t size; + u_int8_t *meta; + + for (disk = 0; disk < rdp->total_disks; disk++) { + if (rdp->disks[disk].dev) { + switch (rdp->format) { + case AR_F_ADAPTEC_RAID: + lba = ADP_LBA(rdp->disks[disk].dev); + size = sizeof(struct adaptec_raid_conf); + break; + + case AR_F_HPTV2_RAID: + lba = HPTV2_LBA(rdp->disks[disk].dev); + size = sizeof(struct hptv2_raid_conf); + break; + + case AR_F_HPTV3_RAID: + lba = HPTV3_LBA(rdp->disks[disk].dev); + size = sizeof(struct hptv3_raid_conf); + break; + + case AR_F_INTEL_RAID: + lba = INTEL_LBA(rdp->disks[disk].dev); + size = 3 * 512; /* XXX SOS */ + break; + + case AR_F_ITE_RAID: + lba = ITE_LBA(rdp->disks[disk].dev); + size = sizeof(struct ite_raid_conf); + break; + + case AR_F_LSIV2_RAID: + lba = LSIV2_LBA(rdp->disks[disk].dev); + size = sizeof(struct lsiv2_raid_conf); + break; + + case AR_F_LSIV3_RAID: + lba = LSIV3_LBA(rdp->disks[disk].dev); + size = sizeof(struct lsiv3_raid_conf); + break; + + case AR_F_NVIDIA_RAID: + lba = NVIDIA_LBA(rdp->disks[disk].dev); + size = sizeof(struct nvidia_raid_conf); + break; + + case AR_F_FREEBSD_RAID: + case AR_F_PROMISE_RAID: + lba = PROMISE_LBA(rdp->disks[disk].dev); + size = sizeof(struct promise_raid_conf); + break; + + case AR_F_SII_RAID: + lba = SII_LBA(rdp->disks[disk].dev); + size = sizeof(struct sii_raid_conf); + break; + + case AR_F_SIS_RAID: + lba = SIS_LBA(rdp->disks[disk].dev); + size = sizeof(struct sis_raid_conf); + break; + + case AR_F_VIA_RAID: + lba = VIA_LBA(rdp->disks[disk].dev); + size = sizeof(struct via_raid_conf); + break; + + default: + printf("ar%d: wiping of %s metadata is NOT supported yet\n", + rdp->lun, ata_raid_format(rdp)); + return ENXIO; + } + if (!(meta = malloc(size, M_AR, M_NOWAIT | M_ZERO))) + return ENOMEM; + if (ata_raid_rw(rdp->disks[disk].dev, lba, meta, size, + ATA_R_WRITE | ATA_R_DIRECT)) { + device_printf(rdp->disks[disk].dev, "wipe metadata failed\n"); + error = EIO; + } + free(meta, M_AR); + } + } + return error; +} + /* Adaptec HostRAID Metadata */ static int ata_raid_adaptec_read_meta(device_t dev, struct ar_softc **raidp) @@ -2664,7 +2757,7 @@ malloc(sizeof(struct promise_raid_conf), M_AR, M_NOWAIT | M_ZERO))) return ENOMEM; - if (ata_raid_rw(parent, PR_LBA(parent), + if (ata_raid_rw(parent, PROMISE_LBA(parent), meta, sizeof(struct promise_raid_conf), ATA_R_READ)) { if (testing || bootverbose) device_printf(parent, "%s read metadata failed\n", @@ -2973,7 +3066,8 @@ meta->checksum += *ckptr++; if (testing || bootverbose) ata_raid_promise_print_meta(meta); - if (ata_raid_rw(rdp->disks[disk].dev, PR_LBA(rdp->disks[disk].dev), + if (ata_raid_rw(rdp->disks[disk].dev, + PROMISE_LBA(rdp->disks[disk].dev), meta, sizeof(struct promise_raid_conf), ATA_R_WRITE | ATA_R_DIRECT)) { device_printf(rdp->disks[disk].dev, "write metadata failed\n"); @@ -3362,7 +3456,7 @@ goto via_out; } - /* calc the checksum and compare for valid */ + /* calculate checksum and compare for valid */ for (checksum = 0, ptr = (u_int8_t *)meta, count = 0; count < 50; count++) checksum += *ptr++; if (checksum != meta->checksum) { @@ -3395,7 +3489,7 @@ switch (meta->type & VIA_T_MASK) { case VIA_T_RAID0: raid->type = AR_T_RAID0; - raid->width = meta->stripe_layout & VIA_L_MASK; + raid->width = meta->stripe_layout & VIA_L_DISKS; if (!raid->total_sectors || (raid->total_sectors > (raid->width * meta->disk_sectors))) raid->total_sectors = raid->width * meta->disk_sectors; @@ -3409,7 +3503,7 @@ case VIA_T_RAID01: raid->type = AR_T_RAID01; - raid->width = meta->stripe_layout & VIA_L_MASK; + raid->width = meta->stripe_layout & VIA_L_DISKS; if (!raid->total_sectors || (raid->total_sectors > (raid->width * meta->disk_sectors))) raid->total_sectors = raid->width * meta->disk_sectors; @@ -3417,7 +3511,7 @@ case VIA_T_RAID5: raid->type = AR_T_RAID5; - raid->width = meta->stripe_layout & VIA_L_MASK; + raid->width = meta->stripe_layout & VIA_L_DISKS; if (!raid->total_sectors || (raid->total_sectors > ((raid->width - 1)*meta->disk_sectors))) raid->total_sectors = (raid->width - 1) * meta->disk_sectors; @@ -3438,7 +3532,8 @@ raid->magic_0 = meta->disks[0]; raid->format = AR_F_VIA_RAID; raid->generation = 0; - raid->interleave = 0x08 << (meta->stripe_layout >> VIA_L_SHIFT); + raid->interleave = >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 17 00:05:29 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0B4116A422; Sat, 17 Dec 2005 00:05:28 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 8112416A41F for ; Sat, 17 Dec 2005 00:05:28 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48D1743D6A for ; Sat, 17 Dec 2005 00:05:23 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBH05NhO014984 for ; Sat, 17 Dec 2005 00:05:23 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBH05MFc014981 for perforce@freebsd.org; Sat, 17 Dec 2005 00:05:22 GMT (envelope-from imp@freebsd.org) Date: Sat, 17 Dec 2005 00:05:22 GMT Message-Id: <200512170005.jBH05MFc014981@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 88289 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: Sat, 17 Dec 2005 00:05:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=88289 Change 88289 by imp@imp_Speedy on 2005/12/17 00:04:40 hacked version of the initial boot loader for the kb9202 board. this should also work on the 9201, but the 9200 has a eeprom that's too small for this loader. Built with the FreeBSD tools it is about 3/5 the size of the linux one... Affected files ... .. //depot/projects/arm/src/sys/arm/conf/KB920X#7 edit .. //depot/projects/arm/src/sys/boot/arm/kb920x/AT91RM9200.h#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/Makefile#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/README#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/at91rm9200_lowlevel.c#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/at91rm9200_lowlevel.h#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/debug_io.c#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/debug_io.h#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/eeprom.c#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/eeprom.h#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/emac.c#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/emac.h#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/env_vars.c#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/env_vars.h#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/linker.cfg#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/loader_prompt.c#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/loader_prompt.h#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/main.c#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/p_string.c#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/p_string.h#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/tag_list.c#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/tag_list.h#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/xmodem.c#1 add .. //depot/projects/arm/src/sys/boot/arm/kb920x/xmodem.h#1 add .. //depot/projects/arm/src/sys/kern/subr_bus.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#7 (text+ko) ==== @@ -42,6 +42,7 @@ #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device +#options MD_ROOT_SIZE=4096 # 4MB ram disk options ROOTDEVNAME=\"ufs:md0\" #options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server ==== //depot/projects/arm/src/sys/kern/subr_bus.c#4 (text+ko) ==== @@ -2799,9 +2799,8 @@ printed++; retval += printf(format, rle->start); if (rle->count > 1) { - retval += printf("-"); - retval += printf(format, rle->start + - rle->count - 1); + retval += printf(":"); + retval += printf(format, rle->count); } } } From owner-p4-projects@FreeBSD.ORG Sat Dec 17 02:58:55 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D355016A422; Sat, 17 Dec 2005 02:58:54 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 A9E1116A41F for ; Sat, 17 Dec 2005 02:58:54 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54F5F43D53 for ; Sat, 17 Dec 2005 02:58:54 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBH2wsNQ028350 for ; Sat, 17 Dec 2005 02:58:54 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBH2wrDv028347 for perforce@freebsd.org; Sat, 17 Dec 2005 02:58:53 GMT (envelope-from imp@freebsd.org) Date: Sat, 17 Dec 2005 02:58:53 GMT Message-Id: <200512170258.jBH2wrDv028347@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 88293 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: Sat, 17 Dec 2005 02:58:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=88293 Change 88293 by imp@imp_hammer on 2005/12/17 02:58:17 Allow a 8MB kernel, needed for compiling MD into the kernel. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#13 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#13 (text+ko) ==== @@ -96,7 +96,7 @@ #define KERNEL_PT_SYS 0 /* Page table for mapping proc0 zero page */ #define KERNEL_PT_KERN 1 -#define KERNEL_PT_KERN_NUM 4 +#define KERNEL_PT_KERN_NUM 8 #define KERNEL_PT_AFKERNEL KERNEL_PT_KERN + KERNEL_PT_KERN_NUM /* L2 table for mapping after kernel */ #define KERNEL_PT_AFKERNEL_NUM 5 From owner-p4-projects@FreeBSD.ORG Sat Dec 17 03:10:09 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBBCD16A422; Sat, 17 Dec 2005 03:10:08 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 6A3A716A41F for ; Sat, 17 Dec 2005 03:10:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 332B043D49 for ; Sat, 17 Dec 2005 03:10:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBH3A8Wh028834 for ; Sat, 17 Dec 2005 03:10:08 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBH3A8rf028831 for perforce@freebsd.org; Sat, 17 Dec 2005 03:10:08 GMT (envelope-from imp@freebsd.org) Date: Sat, 17 Dec 2005 03:10:08 GMT Message-Id: <200512170310.jBH3A8rf028831@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 88294 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: Sat, 17 Dec 2005 03:10:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=88294 Change 88294 by imp@imp_hammer on 2005/12/17 03:09:29 Should be safe to go back in the water. Affected files ... .. //depot/projects/arm/src/sys/arm/conf/KB920X#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#8 (text+ko) ==== @@ -42,7 +42,7 @@ #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device -#options MD_ROOT_SIZE=4096 # 4MB ram disk +options MD_ROOT_SIZE=4096 # 4MB ram disk options ROOTDEVNAME=\"ufs:md0\" #options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server