From owner-p4-projects@FreeBSD.ORG Sun Oct 22 04:49:21 2006 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 8D44016A40F; Sun, 22 Oct 2006 04:49:21 +0000 (UTC) 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 2117516A403 for ; Sun, 22 Oct 2006 04:49:21 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CCFEB43D45 for ; Sun, 22 Oct 2006 04:49:20 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9M4nKuj082566 for ; Sun, 22 Oct 2006 04:49:20 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9M4nKe9082563 for perforce@freebsd.org; Sun, 22 Oct 2006 04:49:20 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 22 Oct 2006 04:49:20 GMT Message-Id: <200610220449.k9M4nKe9082563@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108255 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, 22 Oct 2006 04:49:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=108255 Change 108255 by mjacob@newisp on 2006/10/22 04:48:28 Remove all of the 'intsok' goop. Since we can no longer know, at the sim level, when its okay to sleep, all mailbox commands have had to be polled commands now for some time anyway, so we might as well garbage collect this stuff. Affected files ... .. //depot/projects/newisp/dev/isp/isp_freebsd.c#15 edit .. //depot/projects/newisp/dev/isp/isp_freebsd.h#10 edit .. //depot/projects/newisp/dev/isp/isp_pci.c#15 edit .. //depot/projects/newisp/dev/isp/isp_sbus.c#7 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_freebsd.c#15 (text+ko) ==== @@ -661,9 +661,6 @@ ispsoftc_t *isp = arg; if (isp->isp_role != ISP_ROLE_NONE) { ISP_ENABLE_INTS(isp); -#if 0 - isp->isp_osinfo.intsok = 1; -#endif } /* Release our hook so that the boot can continue. */ config_intrhook_disestablish(&isp->isp_osinfo.ehook); @@ -2025,7 +2022,6 @@ XS_T *xs = arg; ispsoftc_t *isp = XS_ISP(xs); uint32_t handle; - int iok; /* * We've decided this command is dead. Make sure we're not trying @@ -2033,8 +2029,6 @@ * and seeing whether it's still alive. */ ISP_LOCK(isp); - iok = isp->isp_osinfo.intsok; - isp->isp_osinfo.intsok = 0; handle = isp_find_handle(isp, xs); if (handle) { uint32_t isr; @@ -2091,7 +2085,6 @@ } else { isp_prt(isp, ISP_LOGDEBUG2, "watchdog with no command"); } - isp->isp_osinfo.intsok = iok; ISP_UNLOCK(isp); } @@ -2106,7 +2099,6 @@ int s; s = splcam(); - isp->isp_osinfo.intsok = 1; #else #ifdef ISP_SMPLOCK mtx_lock(&isp->isp_lock); @@ -2342,13 +2334,10 @@ #ifdef ISP_TARGET_MODE case XPT_EN_LUN: /* Enable LUN as a target */ { - int seq, iok, i; + int seq, i; CAMLOCK_2_ISPLOCK(isp); - iok = isp->isp_osinfo.intsok; - isp->isp_osinfo.intsok = 0; seq = isp_en_lun(isp, ccb); if (seq < 0) { - isp->isp_osinfo.intsok = iok; ISPLOCK_2_CAMLOCK(isp); xpt_done(ccb); break; @@ -2361,7 +2350,6 @@ } DELAY(1000); } - isp->isp_osinfo.intsok = iok; ISPLOCK_2_CAMLOCK(isp); break; } ==== //depot/projects/newisp/dev/isp/isp_freebsd.h#10 (text+ko) ==== @@ -151,16 +151,14 @@ struct intr_config_hook ehook; uint16_t loop_down_time; uint16_t loop_down_limit; - uint32_t : 5, + uint32_t : 5, simqfrozen : 3, hysteresis : 8, - : 2, + : 4, disabled : 1, fcbsy : 1, mboxcmd_done : 1, - mboxbsy : 1, - mboxwaiting : 1, - intsok : 1; + mboxbsy : 1; #if __FreeBSD_version >= 500000 struct firmware * fw; struct mtx lock; @@ -222,12 +220,7 @@ #define MEMCPY memcpy #define SNPRINTF snprintf #define USEC_DELAY DELAY -#define USEC_SLEEP(isp, x) \ - if (isp->isp_osinfo.intsok) \ - ISP_UNLOCK(isp); \ - DELAY(x); \ - if (isp->isp_osinfo.intsok) \ - ISP_LOCK(isp) +#define USEC_SLEEP(isp, x) DELAY(x) #define NANOTIME_T struct timespec #define GET_NANOTIME nanotime @@ -254,12 +247,7 @@ #define MBOX_ACQUIRE isp_mbox_acquire #define MBOX_WAIT_COMPLETE isp_mbox_wait_complete -#define MBOX_NOTIFY_COMPLETE(isp) \ - if (isp->isp_osinfo.mboxwaiting) { \ - isp->isp_osinfo.mboxwaiting = 0; \ - wakeup(&isp->isp_mbxworkp); \ - } \ - isp->isp_osinfo.mboxcmd_done = 1 +#define MBOX_NOTIFY_COMPLETE(isp) isp->isp_osinfo.mboxcmd_done = 1 #define MBOX_RELEASE isp_mbox_release #define FC_SCRATCH_ACQUIRE(isp) \ @@ -481,6 +469,7 @@ if (isp->isp_osinfo.mboxbsy) { return (1); } else { + isp->isp_osinfo.mboxcmd_done = 0; isp->isp_osinfo.mboxbsy = 1; return (0); } @@ -490,6 +479,7 @@ isp_mbox_wait_complete(ispsoftc_t *isp, mbreg_t *mbp) { int lim = mbp->timeout; + int j; if (lim == 0) { lim = MBCMD_DEFAULT_TIMEOUT; @@ -497,49 +487,26 @@ if (isp->isp_mbxwrk0) { lim *= isp->isp_mbxwrk0; } - - isp->isp_osinfo.mboxcmd_done = 0; - if (isp->isp_osinfo.intsok) { - lim = (lim * 1000000) / hz; - isp->isp_osinfo.mboxwaiting = 1; -#ifdef ISP_SMPLOCK - (void) msleep(&isp->isp_mbxworkp, - &isp->isp_lock, PRIBIO, "isp_mboxwaiting", lim); -#else - (void) tsleep(&isp->isp_mbxworkp, - PRIBIO, "isp_mboxwaiting", lim); -#endif - isp->isp_osinfo.mboxwaiting = 0; - if (isp->isp_osinfo.mboxcmd_done == 0) { - isp_prt(isp, ISP_LOGWARN, - "Interrupting Mailbox Command (0x%x) Timeout", - isp->isp_lastmbxcmd); - mbp->param[0] = MBOX_TIMEOUT; + for (j = 0; j < lim; j += 100) { + uint32_t isr; + uint16_t sema, mbox; + if (isp->isp_osinfo.mboxcmd_done) { + break; } - } else { - int j; - - for (j = 0; j < lim; j += 100) { - uint32_t isr; - uint16_t sema, mbox; + if (ISP_READ_ISR(isp, &isr, &sema, &mbox)) { + isp_intr(isp, isr, sema, mbox); if (isp->isp_osinfo.mboxcmd_done) { break; } - if (ISP_READ_ISR(isp, &isr, &sema, &mbox)) { - isp_intr(isp, isr, sema, mbox); - if (isp->isp_mboxbsy == 0) { - break; - } - } - USEC_DELAY(100); } - if (isp->isp_osinfo.mboxcmd_done == 0) { - isp_prt(isp, ISP_LOGWARN, - "Polled Mailbox Command (0x%x) Timeout", - isp->isp_lastmbxcmd); - isp->isp_mboxbsy = 0; - mbp->param[0] = MBOX_TIMEOUT; - } + USEC_DELAY(100); + } + if (isp->isp_osinfo.mboxcmd_done == 0) { + isp_prt(isp, ISP_LOGWARN, + "Polled Mailbox Command (0x%x) Timeout", + isp->isp_lastmbxcmd); + isp->isp_mboxbsy = 0; + mbp->param[0] = MBOX_TIMEOUT; } } ==== //depot/projects/newisp/dev/isp/isp_pci.c#15 (text+ko) ==== @@ -1224,10 +1224,7 @@ if (ISP_READ_ISR(isp, &isr, &sema, &mbox) == 0) { isp->isp_intbogus++; } else { - int iok = isp->isp_osinfo.intsok; - isp->isp_osinfo.intsok = 0; isp_intr(isp, isr, sema, mbox); - isp->isp_osinfo.intsok = iok; } ISP_UNLOCK(isp); } ==== //depot/projects/newisp/dev/isp/isp_sbus.c#7 (text+ko) ==== @@ -63,7 +63,6 @@ static void isp_sbus_dmateardown(ispsoftc_t *, XS_T *, uint32_t); -static void isp_sbus_reset0(ispsoftc_t *); static void isp_sbus_reset1(ispsoftc_t *); static void isp_sbus_dumpregs(ispsoftc_t *, const char *); @@ -74,7 +73,7 @@ isp_sbus_mbxdma, isp_sbus_dmasetup, isp_sbus_dmateardown, - isp_sbus_reset0, + NULL, isp_sbus_reset1, isp_sbus_dumpregs, NULL, @@ -396,10 +395,7 @@ if (ISP_READ_ISR(isp, &isr, &sema, &mbox) == 0) { isp->isp_intbogus++; } else { - int iok = isp->isp_osinfo.intsok; - isp->isp_osinfo.intsok = 0; isp_intr(isp, isr, sema, mbox); - isp->isp_osinfo.intsok = iok; } ISP_UNLOCK(isp); } @@ -831,17 +827,9 @@ bus_dmamap_unload(sbs->dmat, *dp); } - -static void -isp_sbus_reset0(ispsoftc_t *isp) -{ - isp->isp_osinfo.intsok = 0; -} - static void isp_sbus_reset1(ispsoftc_t *isp) { -/* isp->isp_osinfo.intsok = 1; */ ISP_ENABLE_INTS(isp); } From owner-p4-projects@FreeBSD.ORG Sun Oct 22 04:55:35 2006 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 7A96616A4C2; Sun, 22 Oct 2006 04:55:35 +0000 (UTC) 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 EDD2C16A49E for ; Sun, 22 Oct 2006 04:55:34 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E2EED43D5F for ; Sun, 22 Oct 2006 04:55:30 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9M4tUZZ083986 for ; Sun, 22 Oct 2006 04:55:30 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9M4tT8G083974 for perforce@freebsd.org; Sun, 22 Oct 2006 04:55:29 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 22 Oct 2006 04:55:29 GMT Message-Id: <200610220455.k9M4tT8G083974@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108256 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, 22 Oct 2006 04:55:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=108256 Change 108256 by mjacob@newisp on 2006/10/22 04:54:58 IFC Affected files ... .. //depot/projects/newisp/amd64/amd64/pmap.c#2 integrate .. //depot/projects/newisp/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/newisp/arm/arm/cpufunc.c#2 integrate .. //depot/projects/newisp/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/newisp/arm/arm/nexus_io.c#2 integrate .. //depot/projects/newisp/arm/arm/trap.c#4 integrate .. //depot/projects/newisp/arm/arm/undefined.c#2 integrate .. //depot/projects/newisp/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/newisp/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/newisp/arm/sa11x0/sa11x0_irqhandler.c#2 integrate .. //depot/projects/newisp/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/newisp/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/newisp/boot/arm/at91/boot0spi/main.c#2 integrate .. //depot/projects/newisp/boot/arm/at91/bootiic/env_vars.c#2 integrate .. //depot/projects/newisp/boot/arm/at91/bootiic/loader_prompt.c#2 integrate .. //depot/projects/newisp/boot/arm/at91/bootspi/Makefile#2 integrate .. //depot/projects/newisp/boot/arm/at91/bootspi/arm_init.S#2 integrate .. //depot/projects/newisp/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/newisp/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/newisp/boot/arm/at91/bootspi/env_vars.c#2 integrate .. //depot/projects/newisp/boot/arm/at91/bootspi/loader_prompt.c#2 integrate .. //depot/projects/newisp/boot/arm/at91/bootspi/main.c#2 integrate .. //depot/projects/newisp/conf/NOTES#9 integrate .. //depot/projects/newisp/crypto/sha2/sha2.c#3 integrate .. //depot/projects/newisp/dev/bce/if_bce.c#6 integrate .. //depot/projects/newisp/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/newisp/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/newisp/i386/i386/pmap.c#2 integrate .. //depot/projects/newisp/ia64/ia64/pmap.c#2 integrate .. //depot/projects/newisp/kern/kern_exec.c#3 integrate .. //depot/projects/newisp/kern/kern_exit.c#3 integrate .. //depot/projects/newisp/kern/kern_sig.c#4 integrate .. //depot/projects/newisp/kern/uipc_syscalls.c#2 integrate .. //depot/projects/newisp/kern/vfs_bio.c#3 integrate .. //depot/projects/newisp/kern/vfs_cluster.c#3 integrate .. //depot/projects/newisp/net/if_ppp.c#2 integrate .. //depot/projects/newisp/vm/device_pager.c#2 integrate .. //depot/projects/newisp/vm/phys_pager.c#2 integrate .. //depot/projects/newisp/vm/vm_contig.c#4 integrate .. //depot/projects/newisp/vm/vm_fault.c#2 integrate .. //depot/projects/newisp/vm/vm_map.c#2 integrate .. //depot/projects/newisp/vm/vm_object.c#2 integrate .. //depot/projects/newisp/vm/vm_page.c#4 integrate .. //depot/projects/newisp/vm/vm_page.h#4 integrate .. //depot/projects/newisp/vm/vm_pageout.c#2 integrate Differences ... ==== //depot/projects/newisp/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.571 2006/08/14 15:39:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.572 2006/10/22 04:18:01 alc Exp $"); /* * Manages physical address maps. @@ -1665,7 +1665,7 @@ vm_page_t m; TAILQ_FOREACH(m, &vpq->pl, pageq) { - if (m->hold_count || m->busy || (m->flags & PG_BUSY)) + if (m->hold_count || m->busy) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; ==== //depot/projects/newisp/amd64/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.15 2004/07/22 22:28:34 imp Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.16 2006/10/21 12:52:46 ru Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -11,7 +11,6 @@ hint.atkbdc.0.port="0x060" hint.atkbd.0.at="atkbdc" hint.atkbd.0.irq="1" -hint.atkbd.0.flags="0x1" hint.psm.0.at="atkbdc" hint.psm.0.irq="12" hint.vga.0.at="isa" ==== //depot/projects/newisp/arm/arm/cpufunc.c#2 (text+ko) ==== @@ -45,11 +45,8 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.11 2006/08/24 23:51:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.12 2006/10/21 04:25:00 kevlo Exp $"); -#include - -#include #include #include #include ==== //depot/projects/newisp/arm/arm/elf_trampoline.c#2 (text+ko) ==== @@ -23,9 +23,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.13 2006/08/24 23:51:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.14 2006/10/21 04:25:00 kevlo Exp $"); #include -#include #include #include #include ==== //depot/projects/newisp/arm/arm/nexus_io.c#2 (text+ko) ==== @@ -37,12 +37,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io.c,v 1.5 2005/01/05 21:58:47 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io.c,v 1.6 2006/10/21 04:25:00 kevlo Exp $"); #include #include #include -#include #include #include #include ==== //depot/projects/newisp/arm/arm/trap.c#4 (text+ko) ==== @@ -82,9 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.30 2006/10/21 00:46:56 cognet Exp $"); - -#include +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.31 2006/10/21 04:25:00 kevlo Exp $"); #include #include ==== //depot/projects/newisp/arm/arm/undefined.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.13 2006/04/09 20:16:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.14 2006/10/21 04:25:00 kevlo Exp $"); #include #include @@ -58,7 +58,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/newisp/arm/sa11x0/sa11x0.c#2 (text+ko) ==== @@ -57,14 +57,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.6 2006/04/20 04:12:02 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.7 2006/10/21 04:25:00 kevlo Exp $"); #include #include #include #include #include -#include #include #include #include ==== //depot/projects/newisp/arm/sa11x0/sa11x0_io.c#2 (text+ko) ==== @@ -41,11 +41,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_io.c,v 1.8 2006/05/23 12:14:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_io.c,v 1.9 2006/10/21 04:25:00 kevlo Exp $"); #include #include #include -#include #include #include ==== //depot/projects/newisp/arm/sa11x0/sa11x0_irqhandler.c#2 (text+ko) ==== @@ -76,14 +76,13 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irqhandler.c,v 1.5 2005/09/25 21:06:50 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irqhandler.c,v 1.6 2006/10/21 04:25:00 kevlo Exp $"); #include #include #include #include #include -#include #include #include #include ==== //depot/projects/newisp/arm/sa11x0/sa11x0_ost.c#2 (text+ko) ==== @@ -38,9 +38,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.4 2005/12/22 22:16:06 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.5 2006/10/21 04:25:00 kevlo Exp $"); -#include #include #include #include ==== //depot/projects/newisp/boot/arm/at91/Makefile.inc#2 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.3 2006/08/10 18:22:56 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.4 2006/10/21 22:51:20 imp Exp $ .if !target(__at91_boot_Makefile.inc__) .PATH: ${.CURDIR}/../../../../libkern ${.CURDIR}/../../../../libkern/arm @@ -44,10 +44,10 @@ MK_TAG_LIST:=no .endif -.if defined(WITHOUT_FPGA) +.if defined(WITH_FPGA) +MK_FPGA:=yes +.else MK_FPGA:=no -.else -MK_FPGA:=yes .endif .endif ==== //depot/projects/newisp/boot/arm/at91/boot0spi/main.c#2 (text) ==== @@ -21,7 +21,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/boot/arm/at91/boot0spi/main.c,v 1.2 2006/08/16 23:18:07 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/boot0spi/main.c,v 1.3 2006/10/21 22:43:07 imp Exp $ */ #include "at91rm9200.h" @@ -40,12 +40,12 @@ char *addr3 = (char *)SDRAM_BASE + (3 << 20); /* Load to base + 2MB */ SPI_InitFlash(); - printf("Waiting for data\r\n"); + printf("Waiting for data\n"); while ((len = xmodem_rx(addr)) == -1) continue; - printf("\r\nDownloaded %u bytes.\r\n", len); - p_memcpy(addr3, addr, (len + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE * FLASH_PAGE_SIZE); - printf("Writing %u bytes to flash at %u\r\n", len, OFFSET); + printf("\nDownloaded %u bytes.\n", len); + memcpy(addr3, addr, (len + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE * FLASH_PAGE_SIZE); + printf("Writing %u bytes to flash at %u\n", len, OFFSET); for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { for (j = 0; j < 10; j++) { off = i + OFFSET; @@ -55,7 +55,7 @@ break; } if (j >= 10) - printf("Bad Readback at %u\r\n", i); + printf("Bad Readback at %u\n", i); } return (1); } ==== //depot/projects/newisp/boot/arm/at91/bootiic/env_vars.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/bootiic/env_vars.c,v 1.1 2006/08/10 19:55:52 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootiic/env_vars.c,v 1.2 2006/10/21 22:43:39 imp Exp $ *****************************************************************************/ #include "env_vars.h" @@ -93,7 +93,7 @@ if (size < 0) { continue; } - p_memcpy(cPtr, boot_commands[i], copySize); + memcpy(cPtr, boot_commands[i], copySize); cPtr += copySize; *cPtr++ = 0; } ==== //depot/projects/newisp/boot/arm/at91/bootiic/loader_prompt.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/bootiic/loader_prompt.c,v 1.2 2006/08/16 23:39:58 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootiic/loader_prompt.c,v 1.3 2006/10/21 22:43:39 imp Exp $ *****************************************************************************/ #include "at91rm9200_lowlevel.h" @@ -93,7 +93,7 @@ int i; for (i = 0; CommandTable[i].command != COMMAND_FINAL_FLAG; ++i) - if (!p_strcmp(CommandTable[i].c_string, cPtr)) + if (!strcmp(CommandTable[i].c_string, cPtr)) return (CommandTable[i].command); return (COMMAND_INVALID); @@ -188,7 +188,7 @@ to = (char *)p_ASCIIToHex(argv[1]); from = (char *)p_ASCIIToHex(argv[2]); size = p_ASCIIToHex(argv[3]); - p_memcpy(to, from, size); + memcpy(to, from, size); } break; } @@ -234,20 +234,20 @@ case COMMAND_HELP: // dump command info - printf("Commands:\r\n" - "\tc\r\n" - "\td\r\n" - "\te\r\n" - "\tip\r\n" - "\tserver_ip\r\n" - "\tm\r\n" - "\ttftp\r\n" - "\ts\r\n" + printf("Commands:\n" + "\tc\n" + "\td\n" + "\te\n" + "\tip\n" + "\tserver_ip\n" + "\tm\n" + "\ttftp\n" + "\ts\n" #ifdef SUPPORT_TAG_LIST - "\tt\r\n" + "\tt\n" #endif - "\tw\r\n" - "\tx\r\n"); + "\tw\n" + "\tx\n"); break; case COMMAND_LOCAL_IP: @@ -315,7 +315,7 @@ break; } - printf("\r\n"); + printf("\n"); } @@ -324,7 +324,7 @@ * void ServicePrompt(char) * This private function process each character checking for valid commands. * This function is only executed if the character is considered valid. - * Each command is terminated with NULL (0) or '\r'. + * Each command is terminated with NULL (0) or ''. * .KB_C_FN_DEFINITION_END */ static void @@ -346,11 +346,11 @@ putchar(p_char); } if (!p_char) { - printf("\r\n"); + printf("\n"); ParseCommand(inputBuffer); p_memset(inputBuffer, 0, MAX_INPUT_SIZE); buffCount = 0; - printf("\r\n>"); + printf("\n>"); } } @@ -379,7 +379,7 @@ inputFunction = getc; } - printf("\r\n>"); + printf("\n>"); while (1) if ((ch = ((*inputFunction)(0))) > 0) ==== //depot/projects/newisp/boot/arm/at91/bootspi/Makefile#2 (text) ==== @@ -1,14 +1,14 @@ -# $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.2 2006/08/16 23:39:58 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.4 2006/10/21 22:51:21 imp Exp $ P=bootspi FILES=${P} -SRCS=arm_init.S main.c loader_prompt.c env_vars.c +SRCS=arm_init.S main.c loader_prompt.c env_vars.c ee.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .include -.if ${MK_FPGA} != "no" +.if ${MK_FPGA} == "yes" CFLAGS += -DTSC_FPGA .endif ==== //depot/projects/newisp/boot/arm/at91/bootspi/arm_init.S#2 (text+ko) ==== @@ -20,7 +20,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/bootspi/arm_init.S,v 1.2 2006/08/17 00:14:32 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootspi/arm_init.S,v 1.3 2006/10/21 22:44:26 imp Exp $ ******************************************************************************/ .equ ARM_MODE_USER, 0x10 @@ -59,7 +59,11 @@ dabtvec: B dabtvec @; Data Abort rsvdvec: +#ifdef BOOT_IIC + .long 12 << 10 @; 12k from iic part +#else .long ((1056 << 17) | (13 << 13) | (12 * 2)) +#endif irqvec: ldr pc, [pc,#-0xF20] @; IRQ : read the AIC fiqvec: @@ -109,7 +113,7 @@ .string "e 0x10000000 " .string " " #else -#if 0 +#if 1 .string "Bootloader for KB9202 Evaluation Board." .string "m 42 53 44 0 0 1 " .string "ip 206 168 13 194 " ==== //depot/projects/newisp/boot/arm/at91/bootspi/env_vars.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/bootspi/env_vars.c,v 1.1 2006/08/16 23:39:58 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootspi/env_vars.c,v 1.2 2006/10/21 22:44:26 imp Exp $ *****************************************************************************/ #include "env_vars.h" @@ -82,7 +82,7 @@ int i; for (i = 0; boot_commands[i][0]; i++) - printf("0x%x : %s[E]\r\n", i, boot_commands[i]); + printf("0x%x : %s[E]\n", i, boot_commands[i]); } @@ -125,6 +125,6 @@ currentOffset = 0; DumpBootCommands(); - printf("Autoboot...\r\n"); + printf("Autoboot...\n"); Bootloader(ReadCharFromEnvironment); } ==== //depot/projects/newisp/boot/arm/at91/bootspi/loader_prompt.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/bootspi/loader_prompt.c,v 1.1 2006/08/16 23:39:58 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootspi/loader_prompt.c,v 1.3 2006/10/21 22:51:21 imp Exp $ *****************************************************************************/ #include "at91rm9200_lowlevel.h" @@ -29,6 +29,7 @@ #include "env_vars.h" #include "lib.h" #include "spi_flash.h" +#include "ee.h" /******************************* GLOBALS *************************************/ @@ -65,6 +66,36 @@ {COMMAND_FINAL_FLAG, 0} }; +#ifdef TSC_FPGA +#include "fpga.h" + +const struct fpga main_fpga = +{ + AT91C_BASE_PIOB, AT91C_PIO_PB0, + AT91C_BASE_PIOC, AT91C_PIO_PC11, + AT91C_BASE_PIOB, AT91C_PIO_PB2, + AT91C_BASE_PIOC, AT91C_PIO_PC12 +}; + +void +fpga_load(void) +{ + int len, off, i, offset; + char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ + + len = FPGA_LEN; + offset = FPGA_OFFSET; + for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { + off = i + offset; + SPI_ReadFlash(off, addr + i, FLASH_PAGE_SIZE); + } + fpga_init(&main_fpga); + fpga_clear(&main_fpga); + fpga_write_bytes(&main_fpga, addr, len); + fpga_done(&main_fpga); +} +#endif + /* * .KB_C_FN_DEFINITION_START * unsigned BuildIP(void) @@ -93,7 +124,7 @@ int i; for (i = 0; CommandTable[i].command != COMMAND_FINAL_FLAG; ++i) - if (!p_strcmp(CommandTable[i].c_string, cPtr)) + if (!strcmp(CommandTable[i].c_string, cPtr)) return (CommandTable[i].command); return (COMMAND_INVALID); @@ -150,7 +181,7 @@ while ((len = xmodem_rx(addr)) == -1) continue; - printf("\r\nDownloaded %u bytes.\r\n", len); + printf("\nDownloaded %u bytes.\n", len); WriteEEPROM(eeaddr, 0, addr, len); } #endif @@ -163,7 +194,7 @@ while ((len = xmodem_rx(addr)) == -1) continue; - printf("\r\nDownloaded %u bytes.\r\n", len); + printf("\nDownloaded %u bytes.\n", len); for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { off = i + offset; SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE); @@ -270,29 +301,38 @@ break; case COMMAND_RESET: - printf("Reset\r\n"); + printf("Reset\n"); reset(); while (1) continue; break; case COMMAND_REPLACE_KERNEL_VIA_XMODEM: - printf("Updating KERNEL image\r\n"); + printf("Updating KERNEL image\n"); UpdateFlash(KERNEL_OFFSET); break; case COMMAND_REPLACE_FPGA_VIA_XMODEM: - printf("Updating FPGA image\r\n"); + printf("Updating FPGA image\n"); UpdateFlash(FPGA_OFFSET); break; case COMMAND_REPLACE_FLASH_VIA_XMODEM: - printf("Updating FLASH image\r\n"); + printf("Updating FLASH image\n"); UpdateFlash(FLASH_OFFSET); break; + case COMMAND_REPLACE_ID_EEPROM: + { + char buf[25]; + printf("Testing Config EEPROM\n"); + EEWrite(0, "This is a test", 15); + EERead(0, buf, 15); + printf("Found '%s'\n", buf); + break; + } default: break; } - printf("\r\n"); + printf("\n"); } @@ -301,7 +341,7 @@ * void ServicePrompt(char) * This private function process each character checking for valid commands. * This function is only executed if the character is considered valid. - * Each command is terminated with NULL (0) or '\r'. + * Each command is terminated with NULL (0) or ''. * .KB_C_FN_DEFINITION_END */ static void @@ -323,11 +363,11 @@ putchar(p_char); } if (!p_char) { - printf("\r\n"); + printf("\n"); ParseCommand(inputBuffer); p_memset(inputBuffer, 0, MAX_INPUT_SIZE); buffCount = 0; - printf("\r\n>"); + printf("\n>"); } } @@ -352,7 +392,7 @@ p_memset((void*)inputBuffer, 0, sizeof(inputBuffer)); buffCount = 0; - printf("\r\n>"); + printf("\n>"); while (1) if ((ch = ((*inputFunction)(0))) > 0) ==== //depot/projects/newisp/boot/arm/at91/bootspi/main.c#2 (text) ==== @@ -31,7 +31,7 @@ * owners. This software is not copyrighted and is intended for reference * only. * - * $FreeBSD: src/sys/boot/arm/at91/bootspi/main.c,v 1.2 2006/08/16 23:39:58 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootspi/main.c,v 1.3 2006/10/21 22:44:26 imp Exp $ */ #include "env_vars.h" @@ -41,12 +41,17 @@ #include "emac.h" #include "lib.h" #include "spi_flash.h" +#include "ee.h" int main(void) { - printf("\r\nBoot\r\n"); + printf("\nBoot\n"); + EEInit(); SPI_InitFlash(); +#ifdef TSC_FPGA + fpga_load(); +#endif EMAC_Init(); LoadBootCommands(); if (getc(1) == -1) { ==== //depot/projects/newisp/conf/NOTES#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1391 2006/10/20 09:52:26 des Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1392 2006/10/21 04:13:20 scottl Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1482,7 +1482,7 @@ device mlx # Mylex DAC960 device amr # AMI MegaRAID device mfi # LSI MegaRAID SAS -options MFI_DEBUG +options MFI_DEBUG # # 3ware ATA RAID ==== //depot/projects/newisp/crypto/sha2/sha2.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/crypto/sha2/sha2.c,v 1.8 2006/08/26 21:48:00 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/crypto/sha2/sha2.c,v 1.9 2006/10/22 02:19:33 kevlo Exp $"); #include #include @@ -750,7 +750,7 @@ void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { sha2_word64 a, b, c, d, e, f, g, h, s0, s1; - sha2_word64 T1, T2 = 0, *W512 = (sha2_word64*)context->buffer; + sha2_word64 T1 = 0, T2 = 0, *W512 = (sha2_word64*)context->buffer; int j; /* Initialize registers with the prev. intermediate value */ ==== //depot/projects/newisp/dev/bce/if_bce.c#6 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.16 2006/10/19 08:01:43 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.17 2006/10/21 07:54:39 scottl Exp $"); /* * The following controllers are supported by this driver: @@ -4549,13 +4549,6 @@ chain_prod = TX_CHAIN_IDX(prod); map = sc->tx_mbuf_map[chain_prod]; - /* - * XXX This should be handled higher up. - */ - if ((USABLE_TX_BD - sc->used_tx_bd - BCE_TX_SLACK_SPACE) <= 0) { - return (ENOBUFS); - } - /* Map the mbuf into our DMA address space. */ error = bus_dmamap_load_mbuf_sg(sc->tx_mbuf_tag, map, m0, segs, &nsegs, BUS_DMA_NOWAIT); @@ -4596,6 +4589,16 @@ return (error); } + /* + * The chip seems to require that at least 16 descriptors be kept + * empty at all times. Make sure we honor that. + * XXX Would it be faster to assume worst case scenario for nsegs + * and do this calculation higher up? + */ + if (nsegs > (USABLE_TX_BD - sc->used_tx_bd - BCE_TX_SLACK_SPACE)) { + bus_dmamap_unload(sc->tx_mbuf_tag, map); + return (ENOBUFS); + } /* prod points to an empty tx_bd at this point. */ prod_bseq = sc->tx_prod_bseq; @@ -4701,7 +4704,7 @@ __FUNCTION__, tx_prod, tx_chain_prod, sc->tx_prod_bseq); /* Keep adding entries while there is space in the ring. */ - while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) { + while (sc->tx_mbuf_ptr[tx_chain_prod] == NULL) { /* Check for any frames to send. */ IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head); ==== //depot/projects/newisp/dev/bce/if_bcereg.h#3 (text) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bce/if_bcereg.h,v 1.7 2006/10/15 23:42:56 scottl Exp $ + * $FreeBSD: src/sys/dev/bce/if_bcereg.h,v 1.8 2006/10/21 20:41:08 scottl Exp $ */ #ifndef _BCE_H_DEFINED @@ -4613,7 +4613,12 @@ #define BCE_BUS_SPACE_MAXADDR 0xFFFFFFFFFF #endif +/* XXX UDP checksum offload seems to cause problems on transmit */ +#ifdef BCE_UDP_CSUM #define BCE_IF_HWASSIST (CSUM_IP | CSUM_TCP | CSUM_UDP) +#else +#define BCE_IF_HWASSIST (CSUM_TCP) +#endif #if __FreeBSD_version < 700000 #define BCE_IF_CAPABILITIES (IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ ==== //depot/projects/newisp/fs/ntfs/ntfs_vnops.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_vnops.c,v 1.57 2006/01/17 17:29:02 alfred Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_vnops.c,v 1.58 2006/10/21 08:17:17 trhodes Exp $ * */ @@ -187,7 +187,7 @@ vap->va_fsid = dev2udev(ip->i_dev); vap->va_fileid = ip->i_number; vap->va_mode = ip->i_mp->ntm_mode; - vap->va_nlink = ip->i_nlink; + vap->va_nlink = (ip->i_nlink || ip->i_flag & IN_LOADED ? ip->i_nlink : 1); vap->va_uid = ip->i_mp->ntm_uid; vap->va_gid = ip->i_mp->ntm_gid; vap->va_rdev = 0; /* XXX UNODEV ? */ ==== //depot/projects/newisp/i386/i386/pmap.c#2 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.575 2006/08/14 15:39:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.576 2006/10/22 04:18:01 alc Exp $"); /* * Manages physical address maps. @@ -1739,7 +1739,7 @@ sched_pin(); TAILQ_FOREACH(m, &vpq->pl, pageq) { - if (m->hold_count || m->busy || (m->flags & PG_BUSY)) + if (m->hold_count || m->busy) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; ==== //depot/projects/newisp/ia64/ia64/pmap.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.178 2006/08/01 19:06:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.179 2006/10/22 04:18:01 alc Exp $"); #include #include @@ -831,7 +831,7 @@ vpq = &vm_page_queues[PQ_INACTIVE]; retry: TAILQ_FOREACH(m, &vpq->pl, pageq) { - if (m->hold_count || m->busy || (m->flags & PG_BUSY)) + if (m->hold_count || m->busy) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; ==== //depot/projects/newisp/kern/kern_exec.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.295 2006/09/01 11:45:39 wsalamon Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.296 2006/10/22 04:28:13 alc Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_ktrace.h" @@ -827,7 +827,7 @@ if ((ma[i] = vm_page_lookup(object, i)) != NULL) { if (ma[i]->valid) break; - if ((ma[i]->flags & PG_BUSY) || ma[i]->busy) + if ((ma[i]->oflags & VPO_BUSY) || ma[i]->busy) break; vm_page_lock_queues(); vm_page_busy(ma[i]); ==== //depot/projects/newisp/kern/kern_exit.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.290 2006/09/13 15:47:53 csjp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.291 2006/10/21 23:59:15 davidxu Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -257,8 +257,6 @@ KASSERT(!timevalisset(&p->p_realtimer.it_value), ("realtime timer is still armed")); } - sigqueue_flush(&p->p_sigqueue); - sigqueue_flush(&td->td_sigqueue); PROC_UNLOCK(p); /* @@ -512,6 +510,14 @@ sx_xunlock(&proctree_lock); /* + * The state PRS_ZOMBIE prevents other proesses from sending + * signal to the process, to avoid memory leak, we free memory + * for signal queue at the time when the state is set. + */ + sigqueue_flush(&p->p_sigqueue); + sigqueue_flush(&td->td_sigqueue); + + /* * We have to wait until after acquiring all locks before * changing p_state. We need to avoid all possible context * switches (including ones from blocking on a mutex) while ==== //depot/projects/newisp/kern/kern_sig.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.333 2006/10/20 16:19:21 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.334 2006/10/22 00:09:41 davidxu Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -276,8 +276,7 @@ SIGDELSET(sq->sq_kill, signo); } - for (ksi = TAILQ_FIRST(&sq->sq_list); ksi != NULL; ksi = next) { - next = TAILQ_NEXT(ksi, ksi_link); + TAILQ_FOREACH_SAFE(ksi, &sq->sq_list, ksi_link, next) { if (ksi->ksi_signo == signo) { if (count == 0) { TAILQ_REMOVE(&sq->sq_list, ksi, ksi_link); @@ -428,8 +427,7 @@ p1 = src->sq_proc; p2 = dst->sq_proc; /* Move siginfo to target list */ - for (ksi = TAILQ_FIRST(&src->sq_list); ksi != NULL; ksi = next) { - next = TAILQ_NEXT(ksi, ksi_link); + TAILQ_FOREACH_SAFE(ksi, &src->sq_list, ksi_link, next) { if (SIGISMEMBER(set, ksi->ksi_signo)) { TAILQ_REMOVE(&src->sq_list, ksi, ksi_link); if (p1 != NULL) @@ -475,8 +473,7 @@ KASSERT(sq->sq_flags & SQ_INIT, ("src sigqueue not inited")); /* Remove siginfo queue */ - for (ksi = TAILQ_FIRST(&sq->sq_list); ksi != NULL; ksi = next) { - next = TAILQ_NEXT(ksi, ksi_link); + TAILQ_FOREACH_SAFE(ksi, &sq->sq_list, ksi_link, next) { if (SIGISMEMBER(*set, ksi->ksi_signo)) { TAILQ_REMOVE(&sq->sq_list, ksi, ksi_link); ksi->ksi_sigq = NULL; ==== //depot/projects/newisp/kern/uipc_syscalls.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.237 2006/08/09 17:43:26 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.238 2006/10/22 04:28:13 alc Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -2100,7 +2100,7 @@ * If not and it is not valid, then free it. */ if (pg->wire_count == 0 && pg->valid == 0 && - pg->busy == 0 && !(pg->flags & PG_BUSY) && + pg->busy == 0 && !(pg->oflags & VPO_BUSY) && pg->hold_count == 0) { vm_page_free(pg); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 22 05:04:44 2006 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 1D6EB16A40F; Sun, 22 Oct 2006 05:04:44 +0000 (UTC) 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 D538716A403 for ; Sun, 22 Oct 2006 05:04:43 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 925E743D4C for ; Sun, 22 Oct 2006 05:04:43 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9M54hTm086649 for ; Sun, 22 Oct 2006 05:04:43 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9M54hmv086646 for perforce@freebsd.org; Sun, 22 Oct 2006 05:04:43 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 22 Oct 2006 05:04:43 GMT Message-Id: <200610220504.k9M54hmv086646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108257 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, 22 Oct 2006 05:04:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=108257 Change 108257 by mjacob@newisp on 2006/10/22 05:04:14 Be generous for timeouts with INIT_FIRMWARE- we might actually have to wait R_A_TOV. Affected files ... .. //depot/projects/newisp/dev/isp/isp.c#22 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp.c#22 (text+ko) ==== @@ -1763,6 +1763,7 @@ mbs.param[6] = DMA_WD3(fcp->isp_scdma); mbs.param[7] = DMA_WD2(fcp->isp_scdma); mbs.logval = MBLOGALL; + mbs.timeout = 30 * 1000000; isp_prt(isp, ISP_LOGDEBUG0, "INIT F/W from %p (%08x%08x)", fcp->isp_scratch, (uint32_t) ((uint64_t)fcp->isp_scdma >> 32), (uint32_t) fcp->isp_scdma); @@ -2020,6 +2021,7 @@ mbs.param[6] = DMA_WD3(fcp->isp_scdma); mbs.param[7] = DMA_WD2(fcp->isp_scdma); mbs.logval = MBLOGALL; + mbs.timeout = 30 * 1000000; isp_prt(isp, ISP_LOGDEBUG0, "INIT F/W from %04x%04x%04x%04x", DMA_WD3(fcp->isp_scdma), DMA_WD2(fcp->isp_scdma), DMA_WD1(fcp->isp_scdma), DMA_WD0(fcp->isp_scdma)); From owner-p4-projects@FreeBSD.ORG Sun Oct 22 14:23:37 2006 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 54C4116A417; Sun, 22 Oct 2006 14:23:37 +0000 (UTC) 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 301CF16A40F for ; Sun, 22 Oct 2006 14:23:37 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E608E43D46 for ; Sun, 22 Oct 2006 14:23:36 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9MENaGs063959 for ; Sun, 22 Oct 2006 14:23:36 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9MENadI063941 for perforce@freebsd.org; Sun, 22 Oct 2006 14:23:36 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 22 Oct 2006 14:23:36 GMT Message-Id: <200610221423.k9MENadI063941@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 108266 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, 22 Oct 2006 14:23:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=108266 Change 108266 by rdivacky@rdivacky_witten on 2006/10/22 14:23:25 Catch up with the recent casuptr -> casuword renaming. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#4 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#4 (text+ko) ==== @@ -493,7 +493,7 @@ for (;;) { ua = ua_old = fuword32(uaddr); ua |= oparg; - if (casuptr((intptr_t *)uaddr, ua_old, ua) == ua_old) + if (casuword32((intptr_t *)uaddr, ua_old, ua) == ua_old) return ua_old; } } @@ -506,7 +506,7 @@ for (;;) { ua = ua_old = fuword32(uaddr); ua &= oparg; - if (casuptr((intptr_t *)uaddr, ua_old, ua) == ua_old) + if (casuword32((intptr_t *)uaddr, ua_old, ua) == ua_old) return ua_old; } } @@ -519,7 +519,7 @@ for (;;) { ua = ua_old = fuword32(uaddr); ua ^= oparg; - if (casuptr((intptr_t *)uaddr, ua_old, ua) == ua_old) + if (casuword32((intptr_t *)uaddr, ua_old, ua) == ua_old) return ua_old; } } From owner-p4-projects@FreeBSD.ORG Sun Oct 22 14:24:43 2006 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 B024F16A417; Sun, 22 Oct 2006 14:24:43 +0000 (UTC) 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 6E0F116A407 for ; Sun, 22 Oct 2006 14:24:43 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 014B743D53 for ; Sun, 22 Oct 2006 14:24:43 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9MEOgAf065586 for ; Sun, 22 Oct 2006 14:24:42 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9MEOceU065470 for perforce@freebsd.org; Sun, 22 Oct 2006 14:24:38 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 22 Oct 2006 14:24:38 GMT Message-Id: <200610221424.k9MEOceU065470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 108267 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, 22 Oct 2006 14:24:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=108267 Change 108267 by rdivacky@rdivacky_witten on 2006/10/22 14:23:58 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/fusu.S#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/nexus_io.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/linuxolator/src/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_sscreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate .. //depot/projects/linuxolator/src/sys/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot0spi/main.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootiic/env_vars.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootiic/loader_prompt.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/arm_init.S#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/env_vars.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/loader_prompt.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/bootspi/main.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/mci_device.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/mci_device.h#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/printf.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/putchar.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/sd-card.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/linuxolator/src/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/linuxolator/src/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#6 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#16 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/linuxolator/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#6 integrate .. //depot/projects/linuxolator/src/sys/conf/files#6 integrate .. //depot/projects/linuxolator/src/sys/conf/files.pc98#2 integrate .. //depot/projects/linuxolator/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/linuxolator/src/sys/crypto/sha2/sha2.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi_debug.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfivar.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mmc/bridge.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/mmc/mmc.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/mmc/mmcbr_if.m#1 branch .. //depot/projects/linuxolator/src/sys/dev/mmc/mmcbrvar.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/mmc/mmcbus_if.m#1 branch .. //depot/projects/linuxolator/src/sys/dev/mmc/mmcreg.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/mmc/mmcsd.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/mmc/mmcvar.h#1 branch .. //depot/projects/linuxolator/src/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/spibus/spibus.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs.h#3 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs_int.h#2 integrate .. //depot/projects/linuxolator/src/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/acpica/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/i386/conf/NOTES#4 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/support.s#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#10 integrate .. //depot/projects/linuxolator/src/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/clock.c#3 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/ia64/support.S#2 integrate .. //depot/projects/linuxolator/src/sys/kern/init_main.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/init_sysent.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_acct.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_acl.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_alq.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_environment.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_exec.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_exit.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_fork.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_jail.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mac.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_prot.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_time.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/link_elf.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_trap.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/sys_socket.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/syscalls.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/syscalls.master#5 integrate .. //depot/projects/linuxolator/src/sys/kern/systrace_args.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_msg.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_sem.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_cluster.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/modules/mem/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/mmc/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/mmcsd/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/uart/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/net/bpf.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/bsd_comp.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_gif.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_ppp.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_stf.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_tun.c#2 integrate .. //depot/projects/linuxolator/src/sys/netatalk/aarp.c#2 integrate .. //depot/projects/linuxolator/src/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/linuxolator/src/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_message.h#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_socket.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/if_ether.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/igmp.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_options.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_output.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/nd6.c#4 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/linuxolator/src/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/linuxolator/src/sys/pci/nfsmb.c#3 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/copyinout.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_inet.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_label.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_pipe.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_process.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_socket.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_system.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_sysv_msg.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_sysv_sem.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_sysv_shm.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/linuxolator/src/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/NOTES#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/support.S#2 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/linuxolator/src/sys/sys/conf.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/elf32.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/elf64.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/mac.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/mac_policy.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/sem.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/syscall.h#5 integrate .. //depot/projects/linuxolator/src/sys/sys/syscall.mk#5 integrate .. //depot/projects/linuxolator/src/sys/sys/sysproto.h#5 integrate .. //depot/projects/linuxolator/src/sys/sys/systm.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/umtx.h#3 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/linuxolator/src/sys/vm/device_pager.c#2 integrate .. //depot/projects/linuxolator/src/sys/vm/phys_pager.c#2 integrate .. //depot/projects/linuxolator/src/sys/vm/swap_pager.c#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_contig.c#3 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_fault.c#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_map.c#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_object.c#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_page.c#3 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_page.h#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_pageout.c#2 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.77 2006/06/01 04:49:29 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.78 2006/10/15 16:52:59 hrs Exp $"); #include #include @@ -520,7 +520,7 @@ __func__, dmat, dmat->flags, ENOMEM); return (ENOMEM); } else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { - printf("bus_dmamem_alloc failed to align memory properly."); + printf("bus_dmamem_alloc failed to align memory properly.\n"); } CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); ==== //depot/projects/linuxolator/src/sys/amd64/amd64/db_trace.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.75 2006/07/12 21:22:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.76 2006/10/20 09:44:20 bde Exp $"); #include #include @@ -91,6 +91,7 @@ { "r15", DB_OFFSET(tf_r15), db_frame }, { "rip", DB_OFFSET(tf_rip), db_frame }, { "rflags", DB_OFFSET(tf_rflags), db_frame }, +#define DB_N_SHOW_REGS 20 /* Don't show registers after here. */ { "dr0", NULL, db_dr0 }, { "dr1", NULL, db_dr1 }, { "dr2", NULL, db_dr2 }, @@ -100,7 +101,7 @@ { "dr6", NULL, db_dr6 }, { "dr7", NULL, db_dr7 }, }; -struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]); +struct db_variable *db_eregs = db_regs + DB_N_SHOW_REGS; #define DB_DRX_FUNC(reg) \ static int \ ==== //depot/projects/linuxolator/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.24 2006/10/13 17:31:57 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.25 2006/10/16 21:40:46 jhb Exp $ */ /* @@ -58,6 +58,7 @@ #ifndef DEV_ATPIC #include +#include #include #include #include ==== //depot/projects/linuxolator/src/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.571 2006/08/14 15:39:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.572 2006/10/22 04:18:01 alc Exp $"); /* * Manages physical address maps. @@ -1665,7 +1665,7 @@ vm_page_t m; TAILQ_FOREACH(m, &vpq->pl, pageq) { - if (m->hold_count || m->busy || (m->flags & PG_BUSY)) + if (m->hold_count || m->busy) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; ==== //depot/projects/linuxolator/src/sys/amd64/amd64/support.S#3 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.120 2006/08/28 02:28:14 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.121 2006/10/17 02:24:45 davidxu Exp $ */ #include "opt_ddb.h" @@ -342,10 +342,10 @@ ret /* - * casuptr. Compare and set user pointer. Returns -1 or the current value. + * casuword. Compare and set user word. Returns -1 or the current value. * dst = %rdi, old = %rsi, new = %rdx */ -ENTRY(casuptr) +ENTRY(casuword) movq PCPU(CURPCB),%rcx movq $fusufault,PCB_ONFAULT(%rcx) ==== //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.15 2004/07/22 22:28:34 imp Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.16 2006/10/21 12:52:46 ru Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -11,7 +11,6 @@ hint.atkbdc.0.port="0x060" hint.atkbd.0.at="atkbdc" hint.atkbd.0.irq="1" -hint.atkbd.0.flags="0x1" hint.psm.0.at="atkbdc" hint.psm.0.irq="12" hint.vga.0.at="isa" ==== //depot/projects/linuxolator/src/sys/amd64/conf/NOTES#3 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.59 2006/09/22 22:11:28 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.62 2006/10/20 09:52:26 des Exp $ # # @@ -103,7 +103,7 @@ # # sio: serial ports (see sio(4)), including support for various -# PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf) +# PC Card devices, such as Modem and NICs # device sio hint.sio.0.at="isa" @@ -202,6 +202,63 @@ # Optional devices: # +# PS/2 mouse +device psm +hint.psm.0.at="atkbdc" +hint.psm.0.irq="12" + +# Options for psm: +options PSM_HOOKRESUME #hook the system resume event, useful + #for some laptops +options PSM_RESETAFTERSUSPEND #reset the device at the resume event + +# The keyboard controller; it controls the keyboard and the PS/2 mouse. +device atkbdc +hint.atkbdc.0.at="isa" +hint.atkbdc.0.port="0x060" + +# The AT keyboard +device atkbd +hint.atkbd.0.at="atkbdc" +hint.atkbd.0.irq="1" + +# Options for atkbd: +options ATKBD_DFLT_KEYMAP # specify the built-in keymap +makeoptions ATKBD_DFLT_KEYMAP=jp.106 + +# `flags' for atkbd: +# 0x01 Force detection of keyboard, else we always assume a keyboard +# 0x02 Don't reset keyboard, useful for some newer ThinkPads +# 0x03 Force detection and avoid reset, might help with certain +# dockingstations +# 0x04 Old-style (XT) keyboard support, useful for older ThinkPads + +# Video card driver for VGA adapters. +device vga +hint.vga.0.at="isa" + +# Options for vga: +# Try the following option if the mouse pointer is not drawn correctly +# or font does not seem to be loaded properly. May cause flicker on +# some systems. +options VGA_ALT_SEQACCESS + +# If you can dispense with some vga driver features, you may want to +# use the following options to save some memory. +#options VGA_NO_FONT_LOADING # don't save/load font +#options VGA_NO_MODE_CHANGE # don't change video modes + +# Older video cards may require this option for proper operation. +options VGA_SLOW_IOACCESS # do byte-wide i/o's to TS and GDC regs + +# The following option probably won't work with the LCD displays. +options VGA_WIDTH90 # support 90 column modes + +# Debugging. +options VGA_DEBUG + +device splash # Splash screen and screen saver support + # 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create # the /dev/3dfx0 device to work with glide implementations. This should get # linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as @@ -257,7 +314,7 @@ # ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 -# HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) +# HP PC Lan+, various PC Card devices # (requires miibus) # ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter # iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters @@ -609,7 +666,3 @@ # Enable NDIS binary driver support options NDISAPI device ndis - - -# The I/O device -device io ==== //depot/projects/linuxolator/src/sys/arm/arm/cpufunc.c#2 (text+ko) ==== @@ -45,11 +45,8 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.11 2006/08/24 23:51:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.12 2006/10/21 04:25:00 kevlo Exp $"); -#include - -#include #include #include #include ==== //depot/projects/linuxolator/src/sys/arm/arm/elf_trampoline.c#2 (text+ko) ==== @@ -23,9 +23,8 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.13 2006/08/24 23:51:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.14 2006/10/21 04:25:00 kevlo Exp $"); #include -#include #include #include #include ==== //depot/projects/linuxolator/src/sys/arm/arm/fusu.S#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include "assym.s" -__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.10 2006/08/30 11:44:37 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.11 2006/10/17 02:24:46 davidxu Exp $"); #ifdef MULTIPROCESSOR .Lcpu_info: @@ -53,7 +53,7 @@ */ ENTRY_NP(casuword32) -ENTRY(casuptr) +ENTRY(casuword) #ifdef MULTIPROCESSOR /* XXX Probably not appropriate for non-Hydra SMPs */ stmfd sp!, {r0, r14} @@ -72,7 +72,7 @@ beq .Lfusupcbfault #endif stmfd sp!, {r4, r5} - adr r4, .Lcasuptrfault + adr r4, .Lcasuwordfault str r4, [r3, #PCB_ONFAULT] ldrt r5, [r0] cmp r5, r1 @@ -85,10 +85,10 @@ RET /* - * Handle faults from casuptr. Clean up and return -1. + * Handle faults from casuword. Clean up and return -1. */ -.Lcasuptrfault: +.Lcasuwordfault: mov r0, #0x00000000 str r0, [r3, #PCB_ONFAULT] mvn r0, #0x00000000 ==== //depot/projects/linuxolator/src/sys/arm/arm/nexus_io.c#2 (text+ko) ==== @@ -37,12 +37,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io.c,v 1.5 2005/01/05 21:58:47 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io.c,v 1.6 2006/10/21 04:25:00 kevlo Exp $"); #include #include #include -#include #include #include #include ==== //depot/projects/linuxolator/src/sys/arm/arm/trap.c#2 (text+ko) ==== @@ -82,9 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.27 2006/07/28 20:22:57 jhb Exp $"); - -#include +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.31 2006/10/21 04:25:00 kevlo Exp $"); #include #include @@ -900,9 +898,9 @@ nap--; } else if (code == SYS___syscall) { - code = *ap++; + code = ap[_QUAD_LOWWORD]; nap -= 2; - ap++; + ap += 2; } if (p->p_sysent->sv_mask) code &= p->p_sysent->sv_mask; @@ -941,21 +939,22 @@ switch (error) { case 0: #ifdef __ARMEB__ - if ((insn & 0x000fffff) && + if ((insn & 0x000fffff) == SYS___syscall && (code != SYS_lseek)) { /* * 64-bit return, 32-bit syscall. Fixup byte order - */ + */ frame->tf_r0 = 0; frame->tf_r1 = td->td_retval[0]; } else { - frame->tf_r0 = td->td_retval[0]; - frame->tf_r1 = td->td_retval[1]; + frame->tf_r0 = td->td_retval[0]; + frame->tf_r1 = td->td_retval[1]; } #else - frame->tf_r0 = td->td_retval[0]; - frame->tf_r1 = td->td_retval[1]; -#endif + frame->tf_r0 = td->td_retval[0]; + frame->tf_r1 = td->td_retval[1]; +#endif + frame->tf_spsr &= ~PSR_C_bit; /* carry bit */ break; ==== //depot/projects/linuxolator/src/sys/arm/arm/undefined.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.13 2006/04/09 20:16:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.14 2006/10/21 04:25:00 kevlo Exp $"); #include #include @@ -58,7 +58,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_spi.c#2 (text) ==== @@ -23,14 +23,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.2 2006/07/14 21:35:59 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.3 2006/10/20 07:10:13 imp Exp $"); #include #include #include #include #include -#include #include #include #include @@ -50,9 +49,9 @@ void *intrhand; /* Interrupt handle */ struct resource *irq_res; /* IRQ resource */ struct resource *mem_res; /* Memory resource */ - struct mtx sc_mtx; /* basically a perimeter lock */ bus_dma_tag_t dmatag; /* bus dma tag for mbufs */ bus_dmamap_t map[4]; /* Maps for the transaction */ + int rxdone; }; static inline uint32_t @@ -67,19 +66,7 @@ bus_write_4(sc->mem_res, off, val); } -#define AT91_SPI_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) -#define AT91_SPI_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) -#define AT91_SPI_LOCK_INIT(_sc) \ - mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->dev), \ - "spi", MTX_DEF) -#define AT91_SPI_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); -#define AT91_SPI_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); -#define AT91_SPI_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); - -static devclass_t at91_spi_devclass; - /* bus entry points */ - static int at91_spi_probe(device_t dev); static int at91_spi_attach(device_t dev); static int at91_spi_detach(device_t dev); @@ -87,6 +74,7 @@ /* helper routines */ static int at91_spi_activate(device_t dev); static void at91_spi_deactivate(device_t dev); +static void at91_spi_intr(void *arg); static int at91_spi_probe(device_t dev) @@ -106,8 +94,6 @@ if (err) goto out; - AT91_SPI_LOCK_INIT(sc); - /* * Allocate DMA tags and maps */ @@ -124,6 +110,7 @@ // reset the SPI WR4(sc, SPI_CR, SPI_CR_SWRST); + WR4(sc, SPI_IDR, 0xffffffff); WR4(sc, SPI_MR, (0xf << 24) | SPI_MR_MSTR | SPI_MR_MODFDIS | (0xE << 16)); @@ -141,8 +128,6 @@ WR4(sc, PDC_RCR, 0); WR4(sc, PDC_TPR, 0); WR4(sc, PDC_TCR, 0); - WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); - WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); RD4(sc, SPI_RDR); RD4(sc, SPI_SR); @@ -164,7 +149,7 @@ at91_spi_activate(device_t dev) { struct at91_spi_softc *sc; - int rid; + int rid, err = ENOMEM; sc = device_get_softc(dev); rid = 0; @@ -175,12 +160,16 @@ rid = 0; sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); - if (sc->mem_res == NULL) + if (sc->irq_res == NULL) + goto errout; + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, + at91_spi_intr, sc, &sc->intrhand); + if (err != 0) goto errout; return (0); errout: at91_spi_deactivate(dev); - return (ENOMEM); + return (err); } static void @@ -216,7 +205,7 @@ at91_spi_transfer(device_t dev, device_t child, struct spi_command *cmd) { struct at91_spi_softc *sc; - int i; + int i, j, rxdone, err, mode[4]; bus_addr_t addr; sc = device_get_softc(dev); @@ -228,49 +217,73 @@ WR4(sc, PDC_TPR, addr); WR4(sc, PDC_TCR, cmd->tx_cmd_sz); bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREWRITE); - i++; - if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->tx_data, - cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) - goto out; - WR4(sc, PDC_TNPR, addr); - WR4(sc, PDC_TNCR, cmd->tx_cmd_sz); - bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREWRITE); - i++; + mode[i++] = BUS_DMASYNC_POSTWRITE; + if (cmd->tx_data_sz > 0) { + if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->tx_data, + cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) + goto out; + WR4(sc, PDC_TNPR, addr); + WR4(sc, PDC_TNCR, cmd->tx_cmd_sz); + bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREWRITE); + mode[i++] = BUS_DMASYNC_POSTWRITE; + } if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->rx_cmd, cmd->tx_cmd_sz, at91_getaddr, &addr, 0) != 0) goto out; WR4(sc, PDC_RPR, addr); WR4(sc, PDC_RCR, cmd->tx_cmd_sz); bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREREAD); - i++; - if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->rx_data, - cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) - goto out; - WR4(sc, PDC_RNPR, addr); - WR4(sc, PDC_RNCR, cmd->tx_data_sz); - bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREREAD); - + mode[i++] = BUS_DMASYNC_POSTREAD; + if (cmd->tx_data_sz > 0) { + if (bus_dmamap_load(sc->dmatag, sc->map[i], cmd->rx_data, + cmd->tx_data_sz, at91_getaddr, &addr, 0) != 0) + goto out; + WR4(sc, PDC_RNPR, addr); + WR4(sc, PDC_RNCR, cmd->tx_data_sz); + bus_dmamap_sync(sc->dmatag, sc->map[i], BUS_DMASYNC_PREREAD); + mode[i++] = BUS_DMASYNC_POSTREAD; + } + WR4(sc, SPI_IER, SPI_SR_ENDRX); WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN | PDC_PTCR_RXTEN); - // wait for completion - // XXX should be done as an ISR of some sort. - while (RD4(sc, SPI_SR) & SPI_SR_ENDRX) - DELAY(700); - - // Sync the buffers after the DMA is done, and unload them. - bus_dmamap_sync(sc->dmatag, sc->map[0], BUS_DMASYNC_POSTWRITE); - bus_dmamap_sync(sc->dmatag, sc->map[1], BUS_DMASYNC_POSTWRITE); - bus_dmamap_sync(sc->dmatag, sc->map[2], BUS_DMASYNC_POSTREAD); - bus_dmamap_sync(sc->dmatag, sc->map[3], BUS_DMASYNC_POSTREAD); - for (i = 0; i < 4; i++) - bus_dmamap_unload(sc->dmatag, sc->map[i]); - return (0); + rxdone = sc->rxdone; + do { + err = msleep(&sc->rxdone, NULL, PCATCH | PZERO, "spi", hz); + } while (rxdone == sc->rxdone && err != EINTR); + WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS | PDC_PTCR_RXTDIS); + if (err == 0) { + for (j = 0; j < i; j++) + bus_dmamap_sync(sc->dmatag, sc->map[j], mode[j]); + } + for (j = 0; j < i; j++) + bus_dmamap_unload(sc->dmatag, sc->map[j]); + return (err); out:; - while (i-- > 0) - bus_dmamap_unload(sc->dmatag, sc->map[i]); + for (j = 0; j < i; j++) + bus_dmamap_unload(sc->dmatag, sc->map[j]); return (EIO); } +static void +at91_spi_intr(void *arg) +{ + struct at91_spi_softc *sc = (struct at91_spi_softc*)arg; + uint32_t sr; + + sr = RD4(sc, SPI_SR) & RD4(sc, SPI_IMR); + if (sr & SPI_SR_ENDRX) { + sc->rxdone++; + WR4(sc, SPI_IDR, SPI_SR_ENDRX); + wakeup(&sc->rxdone); + } + if (sr & ~SPI_SR_ENDRX) { + device_printf(sc->dev, "Unexpected ISR %#x\n", sr); + WR4(sc, SPI_IDR, sr & ~SPI_SR_ENDRX); + } +} + +static devclass_t at91_spi_devclass; + static device_method_t at91_spi_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at91_spi_probe), ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_ssc.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.2 2006/07/14 22:30:44 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.3 2006/10/20 07:08:59 imp Exp $"); #include #include @@ -88,14 +88,16 @@ /* cdev routines */ static d_open_t at91_ssc_open; static d_close_t at91_ssc_close; -static d_ioctl_t at91_ssc_ioctl; +static d_read_t at91_ssc_read; +static d_write_t at91_ssc_write; static struct cdevsw at91_ssc_cdevsw = { .d_version = D_VERSION, .d_open = at91_ssc_open, .d_close = at91_ssc_close, - .d_ioctl = at91_ssc_ioctl + .d_read = at91_ssc_read, + .d_write = at91_ssc_write, }; static int @@ -134,6 +136,19 @@ goto out; } sc->cdev->si_drv1 = sc; + + // Init for TSC needs + WR4(sc, SSC_CR, SSC_CR_SWRST); + WR4(sc, SSC_CMR, 0); // clock divider unused + WR4(sc, SSC_RCMR, + SSC_RCMR_CKS_RK | SSC_RCMR_CKO_NONE | SSC_RCMR_START_FALL_EDGE_RF); + WR4(sc, SSC_RFMR, + 0x1f | SSC_RFMR_MSFBF | SSC_RFMR_FSOS_NONE); + WR4(sc, SSC_TCMR, + SSC_TCMR_CKS_TK | SSC_TCMR_CKO_NONE | SSC_RCMR_START_CONT); + WR4(sc, SSC_TFMR, + 0x1f | SSC_TFMR_DATDEF | SSC_TFMR_MSFBF | SSC_TFMR_FSOS_NEG_PULSE); + out:; if (err) at91_ssc_deactivate(dev); @@ -161,7 +176,7 @@ rid = 0; sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); - if (sc->mem_res == NULL) + if (sc->irq_res == NULL) goto errout; return (0); errout: @@ -241,10 +256,15 @@ } static int -at91_ssc_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, - struct thread *td) +at91_ssc_read(struct cdev *dev, struct uio *uio, int flag) +{ + return EIO; +} + +static int +at91_ssc_write(struct cdev *dev, struct uio *uio, int flag) { - return (ENXIO); + return EIO; } static device_method_t at91_ssc_methods[] = { ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_sscreg.h#2 (text) ==== @@ -22,9 +22,114 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_sscreg.h,v 1.1 2006/03/24 07:42:33 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_sscreg.h,v 1.2 2006/10/20 07:08:15 imp Exp $ */ #ifndef ARM_AT91_AT91_SSCREG_H #define ARM_AT91_AT91_SSCREG_H +/* Registers */ +#define SSC_CR 0x00 /* Control Register */ +#define SSC_CMR 0x04 /* Clock Mode Register */ + /* 0x08 Reserved */ + /* 0x0c Reserved */ +#define SSC_RCMR 0x10 /* Receive Clock Mode Register */ +#define SSC_RFMR 0x14 /* Receive Frame Mode Register */ +#define SSC_TCMR 0x18 /* Transmit Clock Mode Register */ +#define SSC_TFMR 0x1c /* Transmit Frame Mode register */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 22 16:32:24 2006 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 5AF8616A416; Sun, 22 Oct 2006 16:32:24 +0000 (UTC) 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 1514A16A40F for ; Sun, 22 Oct 2006 16:32:24 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A613B43D6A for ; Sun, 22 Oct 2006 16:32:23 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9MGWN98005590 for ; Sun, 22 Oct 2006 16:32:23 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9MGWNjP005587 for perforce@freebsd.org; Sun, 22 Oct 2006 16:32:23 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 22 Oct 2006 16:32:23 GMT Message-Id: <200610221632.k9MGWNjP005587@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 108269 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, 22 Oct 2006 16:32:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=108269 Change 108269 by rdivacky@rdivacky_witten on 2006/10/22 16:31:53 Make it compilable on amd64. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#5 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_futex.c#5 (text+ko) ==== @@ -493,7 +493,7 @@ for (;;) { ua = ua_old = fuword32(uaddr); ua |= oparg; - if (casuword32((intptr_t *)uaddr, ua_old, ua) == ua_old) + if (casuword32((void *)uaddr, ua_old, ua) == ua_old) return ua_old; } } @@ -506,7 +506,7 @@ for (;;) { ua = ua_old = fuword32(uaddr); ua &= oparg; - if (casuword32((intptr_t *)uaddr, ua_old, ua) == ua_old) + if (casuword32((void *)uaddr, ua_old, ua) == ua_old) return ua_old; } } @@ -519,7 +519,7 @@ for (;;) { ua = ua_old = fuword32(uaddr); ua ^= oparg; - if (casuword32((intptr_t *)uaddr, ua_old, ua) == ua_old) + if (casuword32((void *)uaddr, ua_old, ua) == ua_old) return ua_old; } } From owner-p4-projects@FreeBSD.ORG Sun Oct 22 20:11:00 2006 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 B293616A417; Sun, 22 Oct 2006 20:11:00 +0000 (UTC) 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 7182F16A40F for ; Sun, 22 Oct 2006 20:11:00 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F1EC43D60 for ; Sun, 22 Oct 2006 20:10:59 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9MKAweO070549 for ; Sun, 22 Oct 2006 20:10:59 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9MKAwMT070510 for perforce@freebsd.org; Sun, 22 Oct 2006 20:10:58 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 22 Oct 2006 20:10:58 GMT Message-Id: <200610222010.k9MKAwMT070510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 108277 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, 22 Oct 2006 20:11:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=108277 Change 108277 by rdivacky@rdivacky_witten on 2006/10/22 20:10:15 Sync struct sysinfo with recent linux version. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#17 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#17 (text+ko) ==== @@ -114,10 +114,11 @@ l_ulong totalswap; /* Total swap space size */ l_ulong freeswap; /* swap space still available */ l_ushort procs; /* Number of current processes */ + l_ushort pads; l_ulong totalbig; l_ulong freebig; l_uint mem_unit; - char _f[6]; /* Pads structure to 64 bytes */ + char _f[20-2*sizeof(l_long)-sizeof(l_int)]; /* Pads structure */ }; int linux_sysinfo(struct thread *td, struct linux_sysinfo_args *args) From owner-p4-projects@FreeBSD.ORG Mon Oct 23 02:22:52 2006 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 DB73F16A416; Mon, 23 Oct 2006 02:22:51 +0000 (UTC) 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 7AA5316A415 for ; Mon, 23 Oct 2006 02:22:51 +0000 (UTC) (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 84B9043D68 for ; Mon, 23 Oct 2006 02:22:44 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9N2MiHA005968 for ; Mon, 23 Oct 2006 02:22:44 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9N2Mf1T005962 for perforce@freebsd.org; Mon, 23 Oct 2006 02:22:41 GMT (envelope-from marcel@freebsd.org) Date: Mon, 23 Oct 2006 02:22:41 GMT Message-Id: <200610230222.k9N2Mf1T005962@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 108285 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, 23 Oct 2006 02:22:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=108285 Change 108285 by marcel@marcel_nfs on 2006/10/23 02:22:18 IFC @108284 Affected files ... .. //depot/projects/ia64/ObsoleteFiles.inc#9 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kgdb.1#7 integrate .. //depot/projects/ia64/lib/libc/stdio/xprintf.c#3 integrate .. //depot/projects/ia64/lib/libc/sys/read.2#15 integrate .. //depot/projects/ia64/lib/libc/sys/write.2#13 integrate .. //depot/projects/ia64/lib/libvgl/vgl.3#7 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#163 integrate .. //depot/projects/ia64/sbin/devd/devd.conf.5#9 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.8#16 integrate .. //depot/projects/ia64/share/man/man4/if_bridge.4#11 integrate .. //depot/projects/ia64/share/man/man4/sis.4#10 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#76 integrate .. //depot/projects/ia64/share/man/man8/intro.8#8 integrate .. //depot/projects/ia64/share/man/man9/zone.9#13 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#56 integrate .. //depot/projects/ia64/sys/boot/arm/Makefile#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/Makefile.inc#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot0spi/main.c#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootiic/env_vars.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootiic/loader_prompt.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/Makefile#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/arm_init.S#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/env_vars.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/loader_prompt.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/main.c#3 integrate .. //depot/projects/ia64/sys/compat/linux/linux_file.c#27 integrate .. //depot/projects/ia64/sys/compat/linux/linux_getcwd.c#19 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#47 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#29 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_fcntl.c#15 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#38 integrate .. //depot/projects/ia64/sys/conf/files#146 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf.c#20 integrate .. //depot/projects/ia64/sys/crypto/sha2/sha2.c#8 integrate .. //depot/projects/ia64/sys/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/ia64/sys/dev/iwi/if_iwi.c#11 integrate .. //depot/projects/ia64/sys/dev/iwi/if_iwireg.h#8 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_devs.c#22 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#49 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#96 integrate .. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#36 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_misc.c#24 integrate .. //depot/projects/ia64/sys/ia64/ia64/nexus.c#15 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#98 integrate .. //depot/projects/ia64/sys/kern/init_main.c#57 integrate .. //depot/projects/ia64/sys/kern/kern_acct.c#33 integrate .. //depot/projects/ia64/sys/kern/kern_acl.c#23 integrate .. //depot/projects/ia64/sys/kern/kern_alq.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_environment.c#17 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#84 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#73 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#66 integrate .. //depot/projects/ia64/sys/kern/kern_jail.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_ktrace.c#35 integrate .. //depot/projects/ia64/sys/kern/kern_linker.c#41 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#44 integrate .. //depot/projects/ia64/sys/kern/kern_mbuf.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_prot.c#46 integrate .. //depot/projects/ia64/sys/kern/kern_shutdown.c#33 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#94 integrate .. //depot/projects/ia64/sys/kern/kern_sysctl.c#33 integrate .. //depot/projects/ia64/sys/kern/kern_time.c#34 integrate .. //depot/projects/ia64/sys/kern/link_elf.c#29 integrate .. //depot/projects/ia64/sys/kern/link_elf_obj.c#8 integrate .. //depot/projects/ia64/sys/kern/subr_fattime.c#1 branch .. //depot/projects/ia64/sys/kern/subr_trap.c#52 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#56 integrate .. //depot/projects/ia64/sys/kern/sys_socket.c#25 integrate .. //depot/projects/ia64/sys/kern/sysv_msg.c#22 integrate .. //depot/projects/ia64/sys/kern/sysv_sem.c#29 integrate .. //depot/projects/ia64/sys/kern/sysv_shm.c#29 integrate .. //depot/projects/ia64/sys/kern/uipc_mbuf.c#39 integrate .. //depot/projects/ia64/sys/kern/uipc_mbuf2.c#21 integrate .. //depot/projects/ia64/sys/kern/uipc_sem.c#20 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#59 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#63 integrate .. //depot/projects/ia64/sys/kern/uipc_usrreq.c#49 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#86 integrate .. //depot/projects/ia64/sys/kern/vfs_cluster.c#42 integrate .. //depot/projects/ia64/sys/kern/vfs_lookup.c#27 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#52 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#91 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#75 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#56 integrate .. //depot/projects/ia64/sys/net/bpf.c#46 integrate .. //depot/projects/ia64/sys/net/bsd_comp.c#12 integrate .. //depot/projects/ia64/sys/net/if.c#53 integrate .. //depot/projects/ia64/sys/net/if_atmsubr.c#21 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#52 integrate .. //depot/projects/ia64/sys/net/if_fddisubr.c#22 integrate .. //depot/projects/ia64/sys/net/if_fwsubr.c#10 integrate .. //depot/projects/ia64/sys/net/if_gif.c#29 integrate .. //depot/projects/ia64/sys/net/if_iso88025subr.c#21 integrate .. //depot/projects/ia64/sys/net/if_ppp.c#28 integrate .. //depot/projects/ia64/sys/net/if_stf.c#31 integrate .. //depot/projects/ia64/sys/net/if_tun.c#35 integrate .. //depot/projects/ia64/sys/netatalk/aarp.c#17 integrate .. //depot/projects/ia64/sys/netatalk/ddp_input.c#13 integrate .. //depot/projects/ia64/sys/netatalk/ddp_output.c#12 integrate .. //depot/projects/ia64/sys/netinet/if_ether.c#39 integrate .. //depot/projects/ia64/sys/netinet/igmp.c#18 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.c#48 integrate .. //depot/projects/ia64/sys/netinet/ip_divert.c#36 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#60 integrate .. //depot/projects/ia64/sys/netinet/ip_icmp.c#32 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#65 integrate .. //depot/projects/ia64/sys/netinet/ip_mroute.c#39 integrate .. //depot/projects/ia64/sys/netinet/ip_options.c#2 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#57 integrate .. //depot/projects/ia64/sys/netinet/raw_ip.c#49 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#72 integrate .. //depot/projects/ia64/sys/netinet/tcp_output.c#37 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#59 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#44 integrate .. //depot/projects/ia64/sys/netinet/udp_usrreq.c#48 integrate .. //depot/projects/ia64/sys/netinet6/nd6.c#28 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_srvsock.c#24 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_syscalls.c#27 integrate .. //depot/projects/ia64/sys/pci/agp.c#31 integrate .. //depot/projects/ia64/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/ia64/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/ia64/sys/security/mac/mac_label.c#4 integrate .. //depot/projects/ia64/sys/security/mac/mac_net.c#10 integrate .. //depot/projects/ia64/sys/security/mac/mac_pipe.c#5 integrate .. //depot/projects/ia64/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/ia64/sys/security/mac/mac_process.c#9 integrate .. //depot/projects/ia64/sys/security/mac/mac_socket.c#6 integrate .. //depot/projects/ia64/sys/security/mac/mac_system.c#5 integrate .. //depot/projects/ia64/sys/security/mac/mac_sysv_msg.c#4 integrate .. //depot/projects/ia64/sys/security/mac/mac_sysv_sem.c#4 integrate .. //depot/projects/ia64/sys/security/mac/mac_sysv_shm.c#3 integrate .. //depot/projects/ia64/sys/security/mac/mac_vfs.c#10 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#26 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/ia64/sys/sys/clock.h#4 integrate .. //depot/projects/ia64/sys/sys/mac.h#36 integrate .. //depot/projects/ia64/sys/sys/mac_policy.h#33 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#64 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#56 integrate .. //depot/projects/ia64/sys/vm/device_pager.c#23 integrate .. //depot/projects/ia64/sys/vm/phys_pager.c#14 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#61 integrate .. //depot/projects/ia64/sys/vm/vm_contig.c#33 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#57 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#86 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#47 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#90 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#79 integrate .. //depot/projects/ia64/sys/vm/vm_page.h#38 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#62 integrate .. //depot/projects/ia64/usr.bin/quota/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/quota/quota.1#6 integrate .. //depot/projects/ia64/usr.bin/quota/quota.c#10 integrate .. //depot/projects/ia64/usr.bin/tail/forward.c#13 integrate .. //depot/projects/ia64/usr.bin/vmstat/vmstat.8#14 integrate .. //depot/projects/ia64/usr.bin/vmstat/vmstat.c#28 integrate .. //depot/projects/ia64/usr.sbin/config/config.8#13 integrate .. //depot/projects/ia64/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate .. //depot/projects/ia64/usr.sbin/portsnap/portsnap/portsnap.sh#8 integrate Differences ... ==== //depot/projects/ia64/ObsoleteFiles.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.55 2006/10/01 17:48:43 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.56 2006/10/21 14:19:52 ru Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20061018: pccardc removed +OLD_FILES+=usr/sbin/pccardc usr/share/man/man8/pccardc.8.gz # 20060930: demangle.h from contrib/libstdc++/include/ext/ OLD_FILES+=usr/include/c++/3.4/ext/demangle.h # 20060929: mrouted removed ==== //depot/projects/ia64/gnu/usr.bin/gdb/Makefile#3 (text+ko) ==== @@ -1,5 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.11 2006/08/24 21:53:49 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.12 2006/10/21 17:27:36 jmg Exp $ SUBDIR= doc libgdb gdb gdbtui kgdb +.if ${MACHINE_ARCH} == "i386" +SUBDIR+=gdbserver +.endif + .include ==== //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kgdb.1#7 (text+ko) ==== @@ -22,8 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.9 2006/10/11 14:42:43 obrien Exp $ -.Dd March 2, 2005 +.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.10 2006/10/21 17:39:35 ru Exp $ +.\" +.Dd October 11, 2006 .Os .Dt KGDB 1 .Sh NAME ==== //depot/projects/ia64/lib/libc/stdio/xprintf.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.3 2006/04/01 19:06:54 phk Exp $ + * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.4 2006/10/21 11:49:07 kib Exp $ */ #include @@ -261,7 +261,7 @@ static int -__v2printf(FILE *fp, const char *fmt0, unsigned pct, const va_list ap) +__v2printf(FILE *fp, const char *fmt0, unsigned pct, const va_list ap1) { struct printf_info *pi, *pil; const char *fmt; @@ -274,7 +274,9 @@ int ret = 0; int n; struct __printf_io io; + va_list ap; + va_copy(ap, ap1); __printf_init(&io); io.fp = fp; @@ -561,6 +563,7 @@ errx(1, "render[%c] = NULL", *fmt); } __printf_flush(&io); + va_end(ap); return (ret); } ==== //depot/projects/ia64/lib/libc/sys/read.2#15 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)read.2 8.4 (Berkeley) 2/26/94 -.\" $FreeBSD: src/lib/libc/sys/read.2,v 1.33 2006/10/11 13:33:02 maxim Exp $ +.\" $FreeBSD: src/lib/libc/sys/read.2,v 1.34 2006/10/21 18:03:53 ru Exp $ .\" .Dd October 11, 2006 .Dt READ 2 @@ -170,7 +170,7 @@ An I/O error occurred while reading from the file system. .It Bq Er EINTR A read from a slow device -(i.e. one that might block for an arbitrary amount of time) +(i.e.\& one that might block for an arbitrary amount of time) was interrupted by the delivery of a signal before any data arrived. .It Bq Er EINVAL ==== //depot/projects/ia64/lib/libc/sys/write.2#13 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)write.2 8.5 (Berkeley) 4/2/94 -.\" $FreeBSD: src/lib/libc/sys/write.2,v 1.32 2006/04/14 19:34:07 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/write.2,v 1.33 2006/10/21 20:36:50 simon Exp $ .\" .Dd July 7, 2005 .Dt WRITE 2 @@ -85,7 +85,7 @@ For .Fn writev and -.Fn pwritev, +.Fn pwritev , the .Fa iovec structure is defined as: ==== //depot/projects/ia64/lib/libvgl/vgl.3#7 (text+ko) ==== @@ -24,7 +24,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/lib/libvgl/vgl.3,v 1.30 2005/02/13 23:45:48 ru Exp $ +.\" $FreeBSD: src/lib/libvgl/vgl.3,v 1.31 2006/10/21 15:12:36 maxim Exp $ .Dd November 7, 1999 .Dt VGL 3 .Os @@ -398,7 +398,7 @@ .Pp .Dl VGLSetVScreenSize(10000, 10000); .Pp -.Fn VGLPanSreen +.Fn VGLPanScreen change the origin of the displayed screen in the virtual screen. Note that this function must be called when our vty is in the foreground. ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#163 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.980 2006/10/14 13:46:00 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.981 2006/10/21 14:06:34 bmah Exp $ 2000 @@ -1663,7 +1663,7 @@ to v394. &merged; libpcap has been updated from - 0.9.1 to 0.9.4 + 0.9.1 to 0.9.4. &merged; lukemftpd has been updated from a snapshot from NetBSD as of 9 August 2004 to a snapshot from @@ -1683,7 +1683,7 @@ 8.13.4 to 8.13.8. &merged; tcpdump has been updated from - 3.9.1 to 3.9.4 + 3.9.1 to 3.9.4. &merged; The timezone database has been updated from the tzdata2005l release to the ==== //depot/projects/ia64/sbin/devd/devd.conf.5#9 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/devd/devd.conf.5,v 1.9 2006/10/07 21:15:40 jmg Exp $ +.\" $FreeBSD: src/sbin/devd/devd.conf.5,v 1.10 2006/10/21 17:15:11 ru Exp $ .\" .\" The section on comments was taken from named.conf.5, which has the .\" following copyright: @@ -84,7 +84,7 @@ substatements are explained below. .Pp Each statement, except -.Dq options +.Ic options has a priority (an arbitrary number) associated with it, where .Ql 0 is defined as the lowest priority. @@ -102,209 +102,212 @@ substatement "value"; }; .Ed -.Pp .Ss Sub-statements The following sub-statements are supported within the -.Dq options +.Ic options statement. .Bl -tag -width ".Ic directory" -.It Ic directory \*q/some/path\*q; +.It Ic directory Qq Ar /some/path ; Adds the given directory to the list of directories from which .Xr devd 8 will read -configuration files. Any number of -.Dq directory +configuration files. +Any number of +.Ic directory statements can be used. -.It Ic pid-file \*q/var/run/devd.pid\*q; -Specifies pid file. -.It Ic set regexp-name \*q(some|regexp)\*q; +.It Ic pid-file Qq Pa /var/run/devd.pid ; +Specifies PID file. +.It Ic set Ar regexp-name Qq Ar (some|regexp) ; Creates a regular expression and assigns it to the variable -.Va regexp-name . +.Ar regexp-name . The variable is avaiable throughout the rest of the configuration file. All regular expressions have an implicit -.Ql Li ^$ +.Ql ^$ around them. .El .Pp The following sub-statements are supported within the -.Dq attach +.Ic attach and -.Dq detach +.Ic detach statements. .Bl -tag -width ".Ic directory" -.It Ic action \*qcommand\*q; +.It Ic action Qq Ar command ; Command to execute upon a successful match. Example -.Ic /etc/pccard_ether $device-name start -.It Ic class \*qstring\*q; +.Dq Li "/etc/pccard_ether $device-name start" . +.It Ic class Qq Ar string ; This is shorthand for -.Dq match \*qclass\*q . -.It Ic device-name \*qstring\*q; +.Dq Ic match Qo Li class Qc Qq Ar string . +.It Ic device-name Qq string ; This is shorthand for -.Dq match \*qdevice-name\*q . +.Dq Ic match Qo Li device-name Qc Qq Ar string . This matches a device named -.Va string ; +.Ar string , which is allowed to be a regular expression or a variable previously created containing a regular expression. The -.Va device-name +.Dq Li device-name variable -is avaiable for later use with the action-statement. -.It Ic match \*qvariable\*q \*qvalue\*q; +is available for later use with the +.Ic action +statement. +.It Ic match Qo Ar variable Qc Qq Ar value ; Matches the content of -.Va value +.Ar value against -.Va variable , +.Ar variable ; the content of -.Va value +.Ar value may be a regular expression. Not required during -.Dq Li attach +.Ic attach nor -.Dq Li detach +.Ic detach events since the -.Dq Li device-name +.Ic device-name statement takes care of all device matching. For a partial list of variables, see below. -.It Ic media-type \*qstring\*q; +.It Ic media-type Qq Ar string ; This is shorthand for -.Dq match \*qdevice-name\*q . -.It Ic subdevice \*qstring\*q; +.Dq Ic match Qo Li device-name Qc Qq Ar string . +.It Ic subdevice Qq Ar string ; This is shorthand for -.Dq match \*qsubdevice\*q . +.Dq Ic match Qo Li subdevice Qc Qq Ar string . .El .Pp The following sub-statements are supported within the -.Dq nomatch +.Ic nomatch statement. .Bl -tag -width ".Ic directory" -.It Ic action \*qcommand\*q; +.It Ic action Qq Ar command ; Same as above. -.It Ic match \*qvariable\*q \*qvalue\*q; +.It Ic match Qo Ar variable Qc Qq Ar value ; Matches the content of -.Va value +.Ar value against -.Va variable , +.Ar variable ; the content of -.Va value +.Ar value may be a regular expression. For a partial list of variables, see below. .El .Pp The following sub-statements are supported within the -.Dq notify +.Ic notify statement. The .Dq Li notify variable is avaiable inside this statement and contains, a value, depending on which system and subsystem that delivered the event. .Bl -tag -width ".Ic directory" -.It Ic action \*qcommand\*q; -Command to execute upon a successful match. Example -.Ic /etc/rc.d/power_profile $notify -.It Ic match \*qsystem|subsystem|type|notify\*q \*qvalue\*q; +.It Ic action Qq Ar command ; +Command to execute upon a successful match. +Example +.Dq Li "/etc/rc.d/power_profile $notify" . +.It Ic match Qo Ar system | subsystem | type | notify Qc Qq Ar value ; Any number of -.Dq match -statements can exists within a -.Dq notify -statement. -.Va value +.Ic match +statements can exist within a +.Ic notify +statement; +.Ar value can be either a fixed string or a regular expression. Below is a list of avaiable systems, subsystems, and types. .El .Ss Variables that can be used with the match statement A partial list of variables and their possible values that can be used together with the -.Dq match +.Ic match statement. .Pp -.Bl -tag -width "manufacturer" -compact +.Bl -tag -width ".Li manufacturer" -compact .It Ic Variable .Ic Description -.It bus -Device name of parent bus -.It cisproduct -CIS-product -.It cisvendor -CIS-vendor -.It class -Device class -.It device -Device ID -.It device-name -Name of attached/detached device -.It function -Card functions -.It manufacturer -Manufacturer ID (pccard) -.It notify +.It Li bus +Device name of parent bus. +.It Li cisproduct +CIS-product. +.It Li cisvendor +CIS-vendor. +.It Li class +Device class. +.It Li device +Device ID. +.It Li device-name +Name of attached/detached device. +.It Li function +Card functions. +.It Li manufacturer +Manufacturer ID (pccard). +.It Li notify Match the value of the .Dq Li notify variable. -.It product -Product ID (pccard) -.It serial -Serial Number (USB) -.It slot -Card slot -.It subvendor -Sub-vendor ID -.It subdevice -Sub-device ID -.It subsystem -Matches a subsystem of a system, see below -.It system -Matches a system type, see below -.It type -Type of notification, see below -.It vendor -Vendor ID +.It Li product +Product ID (pccard). +.It Li serial +Serial Number (USB). +.It Li slot +Card slot. +.It Li subvendor +Sub-vendor ID. +.It Li subdevice +Sub-device ID. +.It Li subsystem +Matches a subsystem of a system, see below. +.It Li system +Matches a system type, see below. +.It Li type +Type of notification, see below. +.It Li vendor +Vendor ID. .El .Ss Notify matching -A Partial list of systems, subsystems, and types used within the -.Dq notify +A partial list of systems, subsystems, and types used within the +.Ic notify mechanism. .Pp -.Bl -tag -width "IFNET" -compact -.It Ic System -.It ACPI +.Bl -tag -width ".Li IFNET" -compact +.It Sy System +.It Li ACPI Events related to the ACPI subsystem. -.Bl -tag -compact -.It Ic Subsystem -.It ACAD -AC Line state ($notify=0x00 is offline, 0x01 is online). -.It Button +.Bl -tag -width ".Sy Subsystem" -compact +.It Sy Subsystem +.It Li ACAD +AC line state ($notify=0x00 is offline, 0x01 is online). +.It Li Button Button state ($notify=0x00 is power, 0x01 is sleep). -.It CMBAT +.It Li CMBAT Battery events. -.It Lid +.It Li Lid Lid state ($notify=0x00 is closed, 0x01 is open). -.It Thermal +.It Li Thermal Thermal zone events. .El .Pp -.It IFNET +.It Li IFNET Events related to the network subsystem. -.Bl -tag -compact -.It Ic Subsystem -.It [interface] +.Bl -tag -width ".Sy Subsystem" -compact +.It Sy Subsystem +.It Ar interface The .Dq subsystem is the actual name of the network interface on which the event took place. -.Bl -tag -compact -.It Ic Type -.It LINK_UP +.Bl -tag -width ".Li LINK_DOWN" -compact +.It Sy Type +.It Li LINK_UP Carrier status changed to UP. -.It LINK_DOWN +.It Li LINK_DOWN Carrier status changed to DOWN. .El .El .El .Pp A link state change to UP on the interface -.Dq fxp0 +.Dq Li fxp0 would result in the following notify event: .Bd -literal -offset indent system=IFNET, subsystem=fxp0, type=LINK_UP @@ -347,7 +350,7 @@ (slash, slash) and continue to the end of the physical line. They cannot be continued across multiple physical lines; to have one logical comment span multiple lines, each line must use the -.Dq // +.Ql // pair. For example: .Bd -literal -offset indent @@ -355,6 +358,13 @@ // is a new comment, even though it is logically // part of the previous comment. .Ed +.Sh FILES +.Bl -tag -width ".Pa /etc/devd.conf" -compact +.It Pa /etc/devd.conf +The +.Xr devd 8 +configuration file. +.El .Sh EXAMPLES .Bd -literal # @@ -408,12 +418,5 @@ The installed .Pa /etc/devd.conf has many additional examples. -.Sh FILES -.Bl -tag -width ".Pa /etc/devd.conf" -compact -.It Pa /etc/devd.conf -The -.Xr devd 8 -configuration file. -.El .Sh SEE ALSO .Xr devd 8 ==== //depot/projects/ia64/sbin/mdmfs/mdmfs.8#16 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.24 2006/10/01 09:40:55 matteo Exp $ +.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.25 2006/10/21 16:02:42 ru Exp $ .\" -.Dd October 1 , 2006 +.Dd October 1, 2006 .Dt MDMFS 8 .Os .Sh NAME ==== //depot/projects/ia64/share/man/man4/if_bridge.4#11 (text+ko) ==== @@ -33,7 +33,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/man4/if_bridge.4,v 1.23 2006/10/11 18:26:04 thompsa Exp $ +.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.24 2006/10/21 18:04:20 ru Exp $ .\" .Dd October 8, 2006 .Dt IF_BRIDGE 4 @@ -81,7 +81,7 @@ The .Nm interface randomly chooses a link (MAC) address in the range reserved for -locally adminstered addresses when it is created. +locally administered addresses when it is created. The address can be changed by assigning the desired link address using .Xr ifconfig 8 . .Pp ==== //depot/projects/ia64/share/man/man4/sis.4#10 (text+ko) ==== @@ -28,9 +28,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/sis.4,v 1.22 2006/10/13 15:51:53 obrien Exp $ +.\" $FreeBSD: src/share/man/man4/sis.4,v 1.23 2006/10/21 18:04:42 ru Exp $ .\" -.Dd July 16, 2005 +.Dd October 13, 2006 .Dt SIS 4 .Os .Sh NAME ==== //depot/projects/ia64/share/man/man5/rc.conf.5#76 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.310 2006/10/15 15:55:00 ceri Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.311 2006/10/21 18:05:55 ru Exp $ .\" .Dd October 15, 2006 .Dt RC.CONF 5 @@ -1630,7 +1630,7 @@ .Pq Vt bool If set to .Dq Li YES , -run the id mapping daemon for NFS version 4. +run the ID mapping daemon for NFS version 4. .It Va idmapd_flags .Pq Vt str If @@ -3626,7 +3626,7 @@ autobridge_interfaces="bridge0" autobridge_bridge0="tap* dc0 vlan[345]" .Ed -.It mixer_enable +.It Va mixer_enable .Pq Vt bool If set to .Dq Li YES , ==== //depot/projects/ia64/share/man/man8/intro.8#8 (text+ko) ==== @@ -30,27 +30,28 @@ .\" SUCH DAMAGE. .\" .\" @(#)intro.8 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/share/man/man8/intro.8,v 1.11 2003/04/16 12:11:01 ru Exp $ +.\" $FreeBSD: src/share/man/man8/intro.8,v 1.12 2006/10/21 20:35:49 ru Exp $ .\" -.Dd December 11, 1993 +.Dd October 22, 2006 .Dt INTRO 8 .Os .Sh NAME .Nm intro -.Nd "introduction to system maintenance and operation commands" +.Nd "introduction to system maintenance procedures and commands" .Sh DESCRIPTION This section contains information related to system operation and maintenance. -It describes commands used to create new file systems, -.Xr newfs 8 , -verify the integrity of the file systems, -.Xr fsck 8 , -control disk usage, -.Xr edquota 8 , -maintain system backups, -.Xr dump 8 , -and recover files when disks die an untimely death, -.Xr restore 8 . +.Pp +It describes commands used to create new file systems +.Pq Xr newfs 8 , +verify the integrity of the file systems +.Pq Xr fsck 8 , +control disk usage +.Pq Xr edquota 8 , +maintain system backups +.Pq Xr dump 8 , +and recover files when disks die an untimely death +.Pq Xr restore 8 . .\" The .\" .Xr format 8 .\" manual @@ -61,11 +62,6 @@ and .Xr ftpd 8 are also described. -The -.Xr crash 8 -manual page -should be consulted to understand how to interpret system -crash dumps. .Pp All commands set an exit status. Its value may be tested @@ -77,6 +73,21 @@ .Xr sysexits 3 , or set the status to arbitrary values >0 (typically 1), but many such values are not described in the manual. +.Pp +A number of pages in this section describe general system +management topics. +.Pp +For example, the +.Xr boot 8 +manual page describes the system bootstrapping procedures, +and the +.Xr diskless 8 +manual page describes how to boot a system over a network. +The +.Xr crash 8 +manual page +should be consulted to understand how to interpret system +crash dumps. .Sh HISTORY The .Nm ==== //depot/projects/ia64/share/man/man9/zone.9#13 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/zone.9,v 1.27 2006/10/02 07:27:00 kib Exp $ +.\" $FreeBSD: src/share/man/man9/zone.9,v 1.28 2006/10/21 16:08:21 ru Exp $ .\" -.Dd July 21, 2003 +.Dd October 2, 2006 .Dt ZONE 9 .Os .Sh NAME ==== //depot/projects/ia64/sys/amd64/amd64/pmap.c#56 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.571 2006/08/14 15:39:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.572 2006/10/22 04:18:01 alc Exp $"); /* * Manages physical address maps. @@ -1665,7 +1665,7 @@ vm_page_t m; TAILQ_FOREACH(m, &vpq->pl, pageq) { - if (m->hold_count || m->busy || (m->flags & PG_BUSY)) + if (m->hold_count || m->busy) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; ==== //depot/projects/ia64/sys/boot/arm/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/sys/boot/arm/Makefile,v 1.2 2006/08/18 21:37:27 imp Exp $ +# $FreeBSD: src/sys/boot/arm/Makefile,v 1.3 2006/10/23 00:05:28 imp Exp $ -SUBDIR=at91 +SUBDIR= .include ==== //depot/projects/ia64/sys/boot/arm/at91/Makefile.inc#3 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.3 2006/08/10 18:22:56 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.4 2006/10/21 22:51:20 imp Exp $ .if !target(__at91_boot_Makefile.inc__) .PATH: ${.CURDIR}/../../../../libkern ${.CURDIR}/../../../../libkern/arm @@ -44,10 +44,10 @@ MK_TAG_LIST:=no .endif -.if defined(WITHOUT_FPGA) +.if defined(WITH_FPGA) +MK_FPGA:=yes +.else MK_FPGA:=no -.else -MK_FPGA:=yes .endif .endif ==== //depot/projects/ia64/sys/boot/arm/at91/boot0spi/main.c#3 (text) ==== @@ -21,7 +21,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/boot/arm/at91/boot0spi/main.c,v 1.2 2006/08/16 23:18:07 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/boot0spi/main.c,v 1.3 2006/10/21 22:43:07 imp Exp $ */ #include "at91rm9200.h" @@ -40,12 +40,12 @@ char *addr3 = (char *)SDRAM_BASE + (3 << 20); /* Load to base + 2MB */ SPI_InitFlash(); - printf("Waiting for data\r\n"); + printf("Waiting for data\n"); while ((len = xmodem_rx(addr)) == -1) continue; - printf("\r\nDownloaded %u bytes.\r\n", len); - p_memcpy(addr3, addr, (len + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE * FLASH_PAGE_SIZE); - printf("Writing %u bytes to flash at %u\r\n", len, OFFSET); + printf("\nDownloaded %u bytes.\n", len); + memcpy(addr3, addr, (len + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE * FLASH_PAGE_SIZE); + printf("Writing %u bytes to flash at %u\n", len, OFFSET); for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { for (j = 0; j < 10; j++) { off = i + OFFSET; @@ -55,7 +55,7 @@ break; } if (j >= 10) - printf("Bad Readback at %u\r\n", i); + printf("Bad Readback at %u\n", i); } return (1); } ==== //depot/projects/ia64/sys/boot/arm/at91/bootiic/env_vars.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ * only. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 23 03:55:41 2006 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 1962016A416; Mon, 23 Oct 2006 03:55:41 +0000 (UTC) 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 D0E4D16A403 for ; Mon, 23 Oct 2006 03:55:40 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87FFF43D45 for ; Mon, 23 Oct 2006 03:55:40 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9N3teCV023215 for ; Mon, 23 Oct 2006 03:55:40 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9N3teRh023212 for perforce@freebsd.org; Mon, 23 Oct 2006 03:55:40 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 23 Oct 2006 03:55:40 GMT Message-Id: <200610230355.k9N3teRh023212@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108287 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, 23 Oct 2006 03:55:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=108287 Change 108287 by mjacob@newisp on 2006/10/23 03:55:12 mboxbsy is no longer cleared at interrupt time- mboxcmd_done is what is set. Affected files ... .. //depot/projects/newisp/dev/isp/isp_freebsd.h#11 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_freebsd.h#11 (text+ko) ==== @@ -505,8 +505,8 @@ isp_prt(isp, ISP_LOGWARN, "Polled Mailbox Command (0x%x) Timeout", isp->isp_lastmbxcmd); - isp->isp_mboxbsy = 0; mbp->param[0] = MBOX_TIMEOUT; + isp->isp_osinfo.mboxcmd_done = 1; } } From owner-p4-projects@FreeBSD.ORG Mon Oct 23 04:01:56 2006 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 D94A816A492; Mon, 23 Oct 2006 04:01:55 +0000 (UTC) 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 9B85A16A47C for ; Mon, 23 Oct 2006 04:01:55 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A95C143D46 for ; Mon, 23 Oct 2006 04:01:52 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9N41oi1024049 for ; Mon, 23 Oct 2006 04:01:50 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9N41ngF024035 for perforce@freebsd.org; Mon, 23 Oct 2006 04:01:49 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 23 Oct 2006 04:01:49 GMT Message-Id: <200610230401.k9N41ngF024035@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108288 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, 23 Oct 2006 04:01:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=108288 Change 108288 by mjacob@newisp on 2006/10/23 04:01:31 IFC Affected files ... .. //depot/projects/newisp/boot/arm/Makefile#2 integrate .. //depot/projects/newisp/compat/linux/linux_file.c#4 integrate .. //depot/projects/newisp/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/newisp/compat/linux/linux_misc.c#4 integrate .. //depot/projects/newisp/compat/linux/linux_stats.c#3 integrate .. //depot/projects/newisp/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/newisp/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/newisp/conf/files#8 integrate .. //depot/projects/newisp/contrib/pf/net/pf.c#3 integrate .. //depot/projects/newisp/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/newisp/dev/iwi/if_iwireg.h#2 integrate .. //depot/projects/newisp/fs/devfs/devfs_devs.c#4 integrate .. //depot/projects/newisp/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/newisp/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/newisp/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/newisp/ia64/ia64/nexus.c#2 integrate .. //depot/projects/newisp/kern/init_main.c#3 integrate .. //depot/projects/newisp/kern/kern_acct.c#3 integrate .. //depot/projects/newisp/kern/kern_acl.c#2 integrate .. //depot/projects/newisp/kern/kern_alq.c#2 integrate .. //depot/projects/newisp/kern/kern_environment.c#2 integrate .. //depot/projects/newisp/kern/kern_exec.c#4 integrate .. //depot/projects/newisp/kern/kern_exit.c#4 integrate .. //depot/projects/newisp/kern/kern_fork.c#2 integrate .. //depot/projects/newisp/kern/kern_jail.c#3 integrate .. //depot/projects/newisp/kern/kern_ktrace.c#2 integrate .. //depot/projects/newisp/kern/kern_linker.c#2 integrate .. //depot/projects/newisp/kern/kern_mac.c#3 integrate .. //depot/projects/newisp/kern/kern_mbuf.c#3 integrate .. //depot/projects/newisp/kern/kern_prot.c#3 integrate .. //depot/projects/newisp/kern/kern_shutdown.c#2 integrate .. //depot/projects/newisp/kern/kern_sysctl.c#2 integrate .. //depot/projects/newisp/kern/kern_time.c#3 integrate .. //depot/projects/newisp/kern/link_elf.c#2 integrate .. //depot/projects/newisp/kern/link_elf_obj.c#2 integrate .. //depot/projects/newisp/kern/subr_fattime.c#1 branch .. //depot/projects/newisp/kern/subr_trap.c#3 integrate .. //depot/projects/newisp/kern/sys_pipe.c#2 integrate .. //depot/projects/newisp/kern/sys_socket.c#2 integrate .. //depot/projects/newisp/kern/sysv_msg.c#3 integrate .. //depot/projects/newisp/kern/sysv_sem.c#3 integrate .. //depot/projects/newisp/kern/sysv_shm.c#3 integrate .. //depot/projects/newisp/kern/uipc_mbuf.c#3 integrate .. //depot/projects/newisp/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/newisp/kern/uipc_sem.c#2 integrate .. //depot/projects/newisp/kern/uipc_socket.c#5 integrate .. //depot/projects/newisp/kern/uipc_syscalls.c#3 integrate .. //depot/projects/newisp/kern/uipc_usrreq.c#2 integrate .. //depot/projects/newisp/kern/vfs_lookup.c#3 integrate .. //depot/projects/newisp/kern/vfs_mount.c#5 integrate .. //depot/projects/newisp/kern/vfs_subr.c#5 integrate .. //depot/projects/newisp/kern/vfs_syscalls.c#5 integrate .. //depot/projects/newisp/kern/vfs_vnops.c#2 integrate .. //depot/projects/newisp/net/bpf.c#2 integrate .. //depot/projects/newisp/net/bsd_comp.c#2 integrate .. //depot/projects/newisp/net/if.c#3 integrate .. //depot/projects/newisp/net/if_atmsubr.c#2 integrate .. //depot/projects/newisp/net/if_ethersubr.c#2 integrate .. //depot/projects/newisp/net/if_fddisubr.c#2 integrate .. //depot/projects/newisp/net/if_fwsubr.c#2 integrate .. //depot/projects/newisp/net/if_gif.c#2 integrate .. //depot/projects/newisp/net/if_iso88025subr.c#2 integrate .. //depot/projects/newisp/net/if_ppp.c#3 integrate .. //depot/projects/newisp/net/if_stf.c#2 integrate .. //depot/projects/newisp/net/if_tun.c#2 integrate .. //depot/projects/newisp/netatalk/aarp.c#2 integrate .. //depot/projects/newisp/netatalk/ddp_input.c#2 integrate .. //depot/projects/newisp/netatalk/ddp_output.c#2 integrate .. //depot/projects/newisp/netinet/if_ether.c#4 integrate .. //depot/projects/newisp/netinet/igmp.c#2 integrate .. //depot/projects/newisp/netinet/in_pcb.c#3 integrate .. //depot/projects/newisp/netinet/ip_divert.c#2 integrate .. //depot/projects/newisp/netinet/ip_fw2.c#5 integrate .. //depot/projects/newisp/netinet/ip_icmp.c#2 integrate .. //depot/projects/newisp/netinet/ip_input.c#4 integrate .. //depot/projects/newisp/netinet/ip_mroute.c#3 integrate .. //depot/projects/newisp/netinet/ip_options.c#2 integrate .. //depot/projects/newisp/netinet/ip_output.c#6 integrate .. //depot/projects/newisp/netinet/raw_ip.c#3 integrate .. //depot/projects/newisp/netinet/tcp_input.c#6 integrate .. //depot/projects/newisp/netinet/tcp_output.c#5 integrate .. //depot/projects/newisp/netinet/tcp_subr.c#7 integrate .. //depot/projects/newisp/netinet/tcp_syncache.c#3 integrate .. //depot/projects/newisp/netinet/udp_usrreq.c#4 integrate .. //depot/projects/newisp/netinet6/nd6.c#4 integrate .. //depot/projects/newisp/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/newisp/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/newisp/pci/agp.c#3 integrate .. //depot/projects/newisp/security/mac/mac_framework.h#2 integrate .. //depot/projects/newisp/security/mac/mac_inet.c#4 integrate .. //depot/projects/newisp/security/mac/mac_label.c#2 integrate .. //depot/projects/newisp/security/mac/mac_net.c#3 integrate .. //depot/projects/newisp/security/mac/mac_pipe.c#3 integrate .. //depot/projects/newisp/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/newisp/security/mac/mac_process.c#3 integrate .. //depot/projects/newisp/security/mac/mac_socket.c#3 integrate .. //depot/projects/newisp/security/mac/mac_system.c#2 integrate .. //depot/projects/newisp/security/mac/mac_sysv_msg.c#3 integrate .. //depot/projects/newisp/security/mac/mac_sysv_sem.c#3 integrate .. //depot/projects/newisp/security/mac/mac_sysv_shm.c#3 integrate .. //depot/projects/newisp/security/mac/mac_vfs.c#3 integrate .. //depot/projects/newisp/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/newisp/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/newisp/sys/clock.h#3 integrate .. //depot/projects/newisp/sys/mac.h#3 integrate .. //depot/projects/newisp/sys/mac_policy.h#4 integrate .. //depot/projects/newisp/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/newisp/ufs/ufs/ufs_vnops.c#4 integrate .. //depot/projects/newisp/vm/swap_pager.c#2 integrate .. //depot/projects/newisp/vm/vm_mmap.c#2 integrate .. //depot/projects/newisp/vm/vm_object.c#3 integrate .. //depot/projects/newisp/vm/vm_page.c#5 integrate Differences ... ==== //depot/projects/newisp/boot/arm/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/sys/boot/arm/Makefile,v 1.2 2006/08/18 21:37:27 imp Exp $ +# $FreeBSD: src/sys/boot/arm/Makefile,v 1.3 2006/10/23 00:05:28 imp Exp $ -SUBDIR=at91 +SUBDIR= .include ==== //depot/projects/newisp/compat/linux/linux_file.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.98 2006/09/23 19:06:54 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.99 2006/10/22 11:52:11 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include @@ -52,6 +51,8 @@ #include #include +#include + #include #include #include ==== //depot/projects/newisp/compat/linux/linux_getcwd.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.24 2006/03/19 11:10:33 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.25 2006/10/22 11:52:11 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include /* XXX only for DIRBLKSIZ */ @@ -68,6 +67,8 @@ #endif #include +#include + static int linux_getcwd_scandir(struct vnode **, struct vnode **, char **, char *, struct thread *); ==== //depot/projects/newisp/compat/linux/linux_misc.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.188 2006/10/08 17:08:27 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.189 2006/10/22 11:52:11 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -63,6 +62,8 @@ #include #include +#include + #include #include #include ==== //depot/projects/newisp/compat/linux/linux_stats.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.84 2006/08/27 08:56:54 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.85 2006/10/22 11:52:11 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -59,6 +58,8 @@ #include +#include + /* * XXX: This was removed from newstat_copyout(), and almost identical * XXX: code was in stat64_copyout(). findcdev() needs to be replaced ==== //depot/projects/newisp/compat/svr4/svr4_fcntl.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.37 2005/09/28 07:03:02 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.38 2006/10/22 11:52:11 rwatson Exp $"); #include "opt_mac.h" @@ -40,7 +40,6 @@ #include /*#include */ #include -#include #include #include #include @@ -60,6 +59,8 @@ #include #include +#include + static int svr4_to_bsd_flags(int); static u_long svr4_to_bsd_cmd(u_long); static int fd_revoke(struct thread *, int); ==== //depot/projects/newisp/compat/svr4/svr4_misc.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.89 2006/07/21 20:28:56 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.90 2006/10/22 11:52:11 rwatson Exp $"); #include "opt_mac.h" @@ -45,7 +45,6 @@ #include #include #include -#include #include #include /* Must come after sys/malloc.h */ #include @@ -83,6 +82,8 @@ #include #include +#include + #include #include #include ==== //depot/projects/newisp/conf/files#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1152 2006/10/20 06:39:59 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1153 2006/10/22 18:19:08 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1374,6 +1374,7 @@ kern/subr_devstat.c standard kern/subr_disk.c standard kern/subr_eventhandler.c standard +kern/subr_fattime.c standard kern/subr_firmware.c optional firmware kern/subr_hints.c standard kern/subr_kdb.c standard ==== //depot/projects/newisp/contrib/pf/net/pf.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.41 2006/09/12 04:25:11 csjp Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.42 2006/10/22 11:52:11 rwatson Exp $ */ /* $OpenBSD: pf.c,v 1.483 2005/03/15 17:38:43 dhartmei Exp $ */ /* @@ -79,7 +79,6 @@ #include #include #ifdef __FreeBSD__ -#include #include #include #else @@ -132,6 +131,7 @@ #include #include #include +#include extern int ip_optcopy(struct ip *, struct ip *); #endif ==== //depot/projects/newisp/dev/iwi/if_iwi.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.40 2006/10/10 18:02:22 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.41 2006/10/23 00:34:07 mlaier Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -2935,6 +2935,11 @@ IWI_MODE_11G; rs.type = IWI_RATESET_TYPE_NEGOTIATED; rs.nrates = ni->ni_rates.rs_nrates; + if (rs.nrates > IWI_RATESET_SIZE) { + DPRINTF(("Truncating negotiated rate set from %u\n", + rs.nrates)); + rs.nrates = IWI_RATESET_SIZE; + } memcpy(rs.rates, ni->ni_rates.rs_rates, rs.nrates); DPRINTF(("Setting negotiated rates (%u)\n", rs.nrates)); error = iwi_cmd(sc, IWI_CMD_SET_RATES, &rs, sizeof rs); ==== //depot/projects/newisp/dev/iwi/if_iwireg.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/iwi/if_iwireg.h,v 1.12 2006/04/27 21:43:37 mlaier Exp $ */ +/* $FreeBSD: src/sys/dev/iwi/if_iwireg.h,v 1.13 2006/10/23 00:34:07 mlaier Exp $ */ /*- * Copyright (c) 2004, 2005 @@ -338,7 +338,8 @@ #define IWI_RATESET_TYPE_SUPPORTED 1 uint8_t reserved; - uint8_t rates[12]; +#define IWI_RATESET_SIZE 12 + uint8_t rates[IWI_RATESET_SIZE]; } __packed; /* structure for command IWI_CMD_SET_TX_POWER */ ==== //depot/projects/newisp/fs/devfs/devfs_devs.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36 * - * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.48 2006/10/18 11:17:14 kib Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_devs.c,v 1.49 2006/10/22 11:52:12 rwatson Exp $ */ #include "opt_mac.h" @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -49,6 +48,8 @@ #include #include +#include + /* * The one true (but secret) list of active devices in the system. * Locked by dev_lock()/devmtx ==== //depot/projects/newisp/fs/devfs/devfs_vnops.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43 * - * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.138 2006/10/20 08:03:42 kib Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.139 2006/10/22 11:52:12 rwatson Exp $ */ /* @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -71,6 +70,8 @@ #include #include +#include + struct mtx devfs_de_interlock; MTX_SYSINIT(devfs_de_interlock, &devfs_de_interlock, "devfs interlock", MTX_DEF); ==== //depot/projects/newisp/i386/i386/sys_machdep.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.105 2006/09/09 10:20:31 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.106 2006/10/22 11:52:12 rwatson Exp $"); #include "opt_kstack_pages.h" #include "opt_mac.h" @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -57,6 +56,7 @@ #include #include +#include #include /* for kernel_map */ ==== //depot/projects/newisp/i386/ibcs2/ibcs2_misc.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_misc.c,v 1.64 2006/07/11 20:52:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_misc.c,v 1.65 2006/10/22 11:52:12 rwatson Exp $"); /* * IBCS2 compatibility module. @@ -65,7 +65,6 @@ #include #include #include -#include #include #include /* Must come after sys/malloc.h */ #include @@ -90,6 +89,8 @@ #include #include +#include + int ibcs2_ulimit(td, uap) struct thread *td; ==== //depot/projects/newisp/ia64/ia64/nexus.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/nexus.c,v 1.14 2006/04/21 16:12:28 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/nexus.c,v 1.15 2006/10/23 00:38:58 marcel Exp $ */ /* @@ -75,9 +75,6 @@ static int nexus_probe(device_t); static int nexus_attach(device_t); -static int nexus_print_resources(struct resource_list *rl, const char *name, int type, - const char *format); -static int nexus_print_all_resources(device_t dev); static int nexus_print_child(device_t, device_t); static device_t nexus_add_child(device_t bus, int order, const char *name, int unit); @@ -230,58 +227,16 @@ } static int -nexus_print_resources(struct resource_list *rl, const char *name, int type, - const char *format) +nexus_print_child(device_t bus, device_t child) { - struct resource_list_entry *rle; - int printed, retval; - - printed = 0; - retval = 0; - /* Yes, this is kinda cheating */ - STAILQ_FOREACH(rle, rl, link) { - if (rle->type == type) { - if (printed == 0) - retval += printf(" %s ", name); - else if (printed > 0) - retval += printf(","); - printed++; - retval += printf(format, rle->start); - if (rle->count > 1) { - retval += printf("-"); - retval += printf(format, rle->start + - rle->count - 1); - } - } - } - return retval; -} - -static int -nexus_print_all_resources(device_t dev) -{ - struct nexus_device *ndev = DEVTONX(dev); + struct nexus_device *ndev = DEVTONX(child); struct resource_list *rl = &ndev->nx_resources; int retval = 0; - if (STAILQ_FIRST(rl) || ndev->nx_pcibus != -1) - retval += printf(" at"); - - retval += nexus_print_resources(rl, "port", SYS_RES_IOPORT, "%#lx"); - retval += nexus_print_resources(rl, "iomem", SYS_RES_MEMORY, "%#lx"); - retval += nexus_print_resources(rl, "irq", SYS_RES_IRQ, "%ld"); - - return retval; -} - -static int -nexus_print_child(device_t bus, device_t child) -{ - struct nexus_device *ndev = DEVTONX(child); - int retval = 0; - retval += bus_print_child_header(bus, child); - retval += nexus_print_all_resources(child); + retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx"); + retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#lx"); + retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld"); if (ndev->nx_pcibus != -1) retval += printf(" pcibus %d", ndev->nx_pcibus); if (device_get_flags(child)) ==== //depot/projects/newisp/kern/init_main.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.267 2006/09/26 00:15:56 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.268 2006/10/22 11:52:12 rwatson Exp $"); #include "opt_ddb.h" #include "opt_init_path.h" @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include @@ -78,6 +77,7 @@ #include #include +#include #include #include ==== //depot/projects/newisp/kern/kern_acct.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.83 2006/09/17 11:00:36 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.84 2006/10/22 11:52:12 rwatson Exp $"); #include "opt_mac.h" @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include @@ -68,6 +67,8 @@ #include #include +#include + /* * The routines implemented in this file are described in: * Leffler, et al.: The Design and Implementation of the 4.3BSD ==== //depot/projects/newisp/kern/kern_acl.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_acl.c,v 1.48 2006/07/06 23:37:38 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_acl.c,v 1.49 2006/10/22 11:52:12 rwatson Exp $"); #include "opt_mac.h" @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -54,6 +53,8 @@ #include #include +#include + #include uma_zone_t acl_zone; ==== //depot/projects/newisp/kern/kern_alq.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_alq.c,v 1.15 2006/03/28 21:30:22 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_alq.c,v 1.16 2006/10/22 11:52:12 rwatson Exp $"); #include "opt_mac.h" @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -46,6 +45,8 @@ #include #include +#include + /* Async. Logging Queue */ struct alq { int aq_entmax; /* Max entries */ ==== //depot/projects/newisp/kern/kern_environment.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_environment.c,v 1.44 2006/07/09 21:42:58 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_environment.c,v 1.45 2006/10/22 11:52:12 rwatson Exp $"); #include "opt_mac.h" @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include @@ -54,6 +53,8 @@ #include #include +#include + static MALLOC_DEFINE(M_KENV, "kenv", "kernel environment"); #define KENV_SIZE 512 /* Maximum number of environment strings */ ==== //depot/projects/newisp/kern/kern_exec.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.296 2006/10/22 04:28:13 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.298 2006/10/22 21:18:47 alc Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_ktrace.h" @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include @@ -80,6 +79,7 @@ #include #include +#include MALLOC_DEFINE(M_PARGS, "proc-args", "Process arguments"); @@ -829,9 +829,7 @@ break; if ((ma[i]->oflags & VPO_BUSY) || ma[i]->busy) break; - vm_page_lock_queues(); vm_page_busy(ma[i]); - vm_page_unlock_queues(); } else { ma[i] = vm_page_alloc(object, i, VM_ALLOC_NORMAL); @@ -855,8 +853,8 @@ } vm_page_lock_queues(); vm_page_hold(ma[0]); + vm_page_unlock_queues(); vm_page_wakeup(ma[0]); - vm_page_unlock_queues(); VM_OBJECT_UNLOCK(object); imgp->firstpage = sf_buf_alloc(ma[0], 0); ==== //depot/projects/newisp/kern/kern_exit.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.291 2006/10/21 23:59:15 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.292 2006/10/22 11:52:13 rwatson Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -65,7 +65,6 @@ #include #include /* for acct_process() function prototype */ #include -#include #include #include #ifdef KTRACE @@ -73,6 +72,7 @@ #endif #include +#include #include #include ==== //depot/projects/newisp/kern/kern_fork.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.261 2006/08/15 12:10:57 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.262 2006/10/22 11:52:13 rwatson Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -59,7 +59,6 @@ #include #include #include -#include #include #include #include @@ -67,6 +66,7 @@ #include #include +#include #include #include ==== //depot/projects/newisp/kern/kern_jail.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.52 2006/09/17 20:00:35 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.53 2006/10/22 11:52:13 rwatson Exp $"); #include "opt_mac.h" @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -35,6 +34,8 @@ #include #include +#include + MALLOC_DEFINE(M_PRISON, "prison", "Prison structures"); SYSCTL_NODE(_security, OID_AUTO, jail, CTLFLAG_RW, 0, ==== //depot/projects/newisp/kern/kern_ktrace.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.110 2006/07/31 15:31:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.111 2006/10/22 11:52:13 rwatson Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include @@ -57,6 +56,8 @@ #include #include +#include + /* * The ktrace facility allows the tracing of certain key events in user space * processes, such as system calls, signal delivery, context switches, and ==== //depot/projects/newisp/kern/kern_linker.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.142 2006/07/10 19:28:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.143 2006/10/22 11:52:13 rwatson Exp $"); #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -52,6 +51,8 @@ #include #include +#include + #include "linker_if.h" #ifdef HWPMC_HOOKS ==== //depot/projects/newisp/kern/kern_mac.c#3 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin * Copyright (c) 2001-2005 Networks Associates Technology, Inc. - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the @@ -47,7 +47,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.122 2006/09/20 13:33:40 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.123 2006/10/22 11:52:13 rwatson Exp $"); #include "opt_mac.h" @@ -91,6 +91,7 @@ #include #include +#include #include #ifdef MAC ==== //depot/projects/newisp/kern/kern_mbuf.c#3 (text+ko) ==== @@ -26,13 +26,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.26 2006/09/17 13:44:32 andre Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.27 2006/10/22 11:52:13 rwatson Exp $"); #include "opt_mac.h" #include "opt_param.h" #include -#include #include #include #include @@ -43,6 +42,8 @@ #include #include +#include + #include #include #include ==== //depot/projects/newisp/kern/kern_prot.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_prot.c,v 1.204 2006/09/17 20:00:35 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_prot.c,v 1.205 2006/10/22 11:52:13 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -51,7 +51,6 @@ #include #include #include -#include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 23 10:03:33 2006 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 A87DC16A412; Mon, 23 Oct 2006 10:03:33 +0000 (UTC) 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 6BB8E16A40F for ; Mon, 23 Oct 2006 10:03:33 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C34343D55 for ; Mon, 23 Oct 2006 10:03:33 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9NA3XZo004913 for ; Mon, 23 Oct 2006 10:03:33 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9NA3Xlw004909 for perforce@freebsd.org; Mon, 23 Oct 2006 10:03:33 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 23 Oct 2006 10:03:33 GMT Message-Id: <200610231003.k9NA3Xlw004909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 108298 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, 23 Oct 2006 10:03:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=108298 Change 108298 by gonzo@gonzo_hq on 2006/10/23 10:03:31 o Does not provide empty stubs. Fill them with "break" instruction to detect unimplemented functions on early stages instead of spending hours narrowing down bug to these subroutines. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/machdep.c#22 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/machdep.c#22 (text+ko) ==== @@ -196,84 +196,77 @@ int get_mcontext(struct thread *td, mcontext_t *mcp, int clear_ret) { - + __asm __volatile("break"); return (0); } int set_mcontext(struct thread *td, const mcontext_t *mcp) { - + __asm __volatile("break"); return (0); } int fill_regs(struct thread *td, struct reg *regs) { - + __asm __volatile("break"); return (0); } int fill_dbregs(struct thread *td, struct dbreg *dbregs) { - + __asm __volatile("break"); return (0); } int fill_fpregs(struct thread *td, struct fpreg *fpregs) { - return (0); } int set_regs(struct thread *td, struct reg *regs) { - + __asm __volatile("break"); return (0); } int set_dbregs(struct thread *td, struct dbreg *dbregs) { - return (0); } int set_fpregs(struct thread *td, struct fpreg *fpregs) { - return (0); } int ptrace_set_pc(struct thread *td, u_long addr) { - return (0); } int ptrace_clear_single_step(struct thread *td) { - return (0); } int ptrace_single_step(struct thread *td) { - return (0); } void cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t sz) { - } void From owner-p4-projects@FreeBSD.ORG Mon Oct 23 10:06:11 2006 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 5E5EE16A5B1; Mon, 23 Oct 2006 10:06:11 +0000 (UTC) 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 1B1DA16A598 for ; Mon, 23 Oct 2006 10:06:11 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47C2F43D99 for ; Mon, 23 Oct 2006 10:05:36 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9NA5aQR005317 for ; Mon, 23 Oct 2006 10:05:36 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9NA5a7M005309 for perforce@freebsd.org; Mon, 23 Oct 2006 10:05:36 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 23 Oct 2006 10:05:36 GMT Message-Id: <200610231005.k9NA5a7M005309@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 108299 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, 23 Oct 2006 10:06:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=108299 Change 108299 by gonzo@gonzo_hq on 2006/10/23 10:05:12 o Implement functions from "copystr" family. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/copystr.S#4 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/copystr.S#4 (text+ko) ==== @@ -34,14 +34,13 @@ #include /* - * XXXMIPS: Implement these routines - */ -/* * copystr(9) * int copystr(const void *src, void *dst, size_t len, * size_t *done) */ ENTRY(copystr) + .set noreorder + .set noat move v0, zero beqz a2, 2f move t1, zero @@ -62,13 +61,88 @@ sw t1, 0(a3) 4: jr ra nop + .set reorder + .set at END(copystr) - -ENTRY(copyinstr) - break +/* + * int copyinstr(void *uaddr, void *kaddr, size_t maxlen, size_t *lencopied) + * Copy a NIL-terminated string, at most maxlen characters long, from the + * user's address space. Return the number of characters copied (including + * the NIL) in *lencopied. If the string is too long, return ENAMETOOLONG; + * else return 0 or EFAULT. + */ +LEAF(copyinstr) + .set noreorder + .set noat + lw t2, pcpup + lw v1, PC_CURPCB(t2) + la v0, _C_LABEL(copystrerr) + blt a0, zero, _C_LABEL(copystrerr) + sw v0, PCB_ONFAULT(v1) + move t0, a2 + beq a2, zero, 4f +1: + lbu v0, 0(a0) + subu a2, a2, 1 + beq v0, zero, 2f + sb v0, 0(a1) + addu a0, a0, 1 + bne a2, zero, 1b + addu a1, a1, 1 +4: + li v0, ENAMETOOLONG +2: + beq a3, zero, 3f + subu a2, t0, a2 + sw a2, 0(a3) +3: + j ra # v0 is 0 or ENAMETOOLONG + sw zero, PCB_ONFAULT(v1) + .set reorder + .set at END(copyinstr) -ENTRY(copyoutstr) - break +/* + * int copyoutstr(void *uaddr, void *kaddr, size_t maxlen, size_t *lencopied); + * Copy a NIL-terminated string, at most maxlen characters long, into the + * user's address space. Return the number of characters copied (including + * the NIL) in *lencopied. If the string is too long, return ENAMETOOLONG; + * else return 0 or EFAULT. + */ +LEAF(copyoutstr) + .set noreorder + .set noat + lw t2, pcpup + lw v1, PC_CURPCB(t2) + la v0, _C_LABEL(copystrerr) + blt a1, zero, _C_LABEL(copystrerr) + sw v0, PCB_ONFAULT(v1) + move t0, a2 + beq a2, zero, 4f +1: + lbu v0, 0(a0) + subu a2, a2, 1 + beq v0, zero, 2f + sb v0, 0(a1) + addu a0, a0, 1 + bne a2, zero, 1b + addu a1, a1, 1 +4: + li v0, ENAMETOOLONG +2: + beq a3, zero, 3f + subu a2, t0, a2 + sw a2, 0(a3) +3: + j ra # v0 is 0 or ENAMETOOLONG + sw zero, PCB_ONFAULT(v1) + .set reorder + .set at END(copyoutstr) + +LEAF(copystrerr) + sw zero, PCB_ONFAULT(v1) + j ra + li v0, EFAULT # return EFAULT +END(copystrerr) From owner-p4-projects@FreeBSD.ORG Mon Oct 23 10:19:57 2006 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 7CA9F16A4C2; Mon, 23 Oct 2006 10:19:57 +0000 (UTC) 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 3F31B16A492 for ; Mon, 23 Oct 2006 10:19:57 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DFEC43D49 for ; Mon, 23 Oct 2006 10:19:56 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9NAJu2X040799 for ; Mon, 23 Oct 2006 10:19:56 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9NAJu8I040760 for perforce@freebsd.org; Mon, 23 Oct 2006 10:19:56 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 23 Oct 2006 10:19:56 GMT Message-Id: <200610231019.k9NAJu8I040760@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 108302 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, 23 Oct 2006 10:19:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=108302 Change 108302 by gonzo@gonzo_hq on 2006/10/23 10:19:04 o Add TLBInvalid handler o Set exclusive bit in status register to zero, before calling for cpu_intr or trap. By doing that we guarantee that TLBMiss exception will be handled only using 0x000 vector while TLBInvalid exception will be Handled by General Exception vector (0x180) and therefor we can separate their handlers. Also it forces to use eret register to return from trap in all handlers. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/exception.S#13 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/exception.S#13 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#12 $ + * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#13 $ */ /* $NetBSD: mipsX_subr.S,v 1.19 2005/12/11 12:18:09 christos Exp $ */ @@ -168,8 +168,8 @@ ExceptionHandlerTable: .dword GenericException /* Int */ .dword GenericException /* TLBMod */ - .dword TLBMissVector /* TLBL */ - .dword TLBMissVector /* TLBS */ + .dword TLBInvalidVector /* TLBL */ + .dword TLBInvalidVector /* TLBS */ .dword GenericException /* AdEL */ .dword GenericException /* AdES */ .dword GenericException /* IBE */ @@ -259,6 +259,7 @@ and k0, a1, MIPS3_CR_EXC_CODE bnez k0, 1f move a0, k1 + mtc0 zero, MIPS_COP_0_STATUS jal cpu_intr nop @@ -276,7 +277,10 @@ 1: mfc0 a1, MIPS_COP_0_CAUSE mfc0 a2, MIPS_COP_0_BAD_VADDR - + mtc0 zero, MIPS_COP_0_STATUS + COP0_SYNC + nop + nop jal trap nop 2: @@ -313,7 +317,92 @@ 1: .asciiz "Cache Vector" .text +LEAF(TLBInvalidVector) + .set noat + mfc0 k0, MIPS_COP_0_BAD_VADDR # k0=badaddr + bgez k0, GenericException + nop + + /* VPN2 = (VA >> page_shift) / 2 */ + la k1, VM_MIN_KERNEL_ADDRESS + subu k0, k0, k1 + srl k0, PAGE_SHIFT + 1 + + /* + * XXXMIPS: + * offset == VPN2 * sizeof(pt_entry_t) * 2 + * dividing by 2 and multiplying by 2 we're + * getting even page number. MIPS TLB stuff + * works with couples of VP. + */ + sll k0, 2 + 1 + la k1, kptmap + + /* + * Find the page table, and index it. + */ + lw k1, 0(k1) + addu k1, k0 + /* + * EntryHi is already filled up with proper value + */ + tlbp + COP0_SYNC + and k0, k0, 4 # Check odd/even + nop + bne k0, zero, KernTLBIOdd + nop + + mfc0 k0, MIPS_COP_0_TLB_INDEX + nop + bltz k0, tlbnotfound + lw k0, 0(k1) + mtc0 k0, MIPS_COP_0_TLB_LO0 + COP0_SYNC + and k0, PG_V + beq k0, zero, GenericException + lw k0, 4(k1) + mfc0 k1, MIPS_COP_0_TLB_INDEX + nop + mtc0 k0, MIPS_COP_0_TLB_LO1 + nop + tlbwi + COP0_SYNC + nop + nop + eret + +KernTLBIOdd: + mfc0 k0, MIPS_COP_0_TLB_INDEX + nop + bltz k0, tlbnotfound + lw k0, 0(k1) + mtc0 k0, MIPS_COP_0_TLB_LO1 + COP0_SYNC + and k0, PG_V + beq k0, zero, GenericException + lw k0, -4(k1) + mfc0 k1, MIPS_COP_0_TLB_INDEX + nop + mtc0 k0, MIPS_COP_0_TLB_LO0 + nop + tlbwi + COP0_SYNC + nop + nop + eret + +tlbnotfound: + la k0, panic + mtc0 k0, MIPS_COP_0_EXC_PC + la a0, 2f + eret +VEND(TLBInvalidVector) + .data +2: .asciiz "TLBInvalidVector" + .text + /* * XXX kernel only. For now that makes sense. */ @@ -323,7 +412,6 @@ mfc0 k0, MIPS_COP_0_BAD_VADDR # k0=badaddr bltz k0, 5f # k0<0 -> 5f (kernel fault) nop - 6: /* Userland */ lui k1, %hi(segtab_active) @@ -364,7 +452,6 @@ 2: .asciiz "TLBMissVector" .text - LEAF(KVATLBMiss) .set noat /* From owner-p4-projects@FreeBSD.ORG Mon Oct 23 10:25:08 2006 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 3314D16A407; Mon, 23 Oct 2006 10:25:08 +0000 (UTC) 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 D30D816A412 for ; Mon, 23 Oct 2006 10:25:07 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 80AFB43D58 for ; Mon, 23 Oct 2006 10:25:04 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9NAP4UM062636 for ; Mon, 23 Oct 2006 10:25:04 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9NAP47c062609 for perforce@freebsd.org; Mon, 23 Oct 2006 10:25:04 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 23 Oct 2006 10:25:04 GMT Message-Id: <200610231025.k9NAP47c062609@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 108303 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, 23 Oct 2006 10:25:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=108303 Change 108303 by gonzo@gonzo_hq on 2006/10/23 10:24:50 o Implement subyte, suword, suword32, fuword and copyout functions required to execute init(8). Whoa! Now we crash gxemul in __start symbol of init(8). Time to hack crt1.c! Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/support.S#8 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/support.S#8 (text+ko) ==== @@ -30,6 +30,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include "assym.s" /* @@ -128,10 +129,15 @@ * int subyte(void *addr, int byte) */ ENTRY(subyte) - break - li v0, -1 - jr ra - nop + lw t2, pcpup + lw v1, PC_CURPCB(t2) + la v0, _C_LABEL(fswberr) + blt a0, zero, _C_LABEL(fswberr) + sw v0, PCB_ONFAULT(v1) + sb a1, 0(a0) # store byte + sw zero, PCB_ONFAULT(v1) + j ra + move v0, zero END(subyte) /* @@ -161,35 +167,36 @@ * int suword(void *addr, long word) */ ENTRY(suword) - break - li v0, -1 - jr ra - nop + lw t2, pcpup + lw v1, PC_CURPCB(t2) + la v0, _C_LABEL(fswberr) + blt a0, zero, _C_LABEL(fswberr) + sw v0, PCB_ONFAULT(v1) + sw a1, 0(a0) # store word + sw zero, PCB_ONFAULT(v1) + j ra + move v0, zero END(suword) /* * suword32(9) * int suword32(void *addr, int word) + * XXXMIPS: this implementation works only for MIPS32 */ ENTRY(suword32) - break - li v0, -1 - jr ra - nop + lw t2, pcpup + lw v1, PC_CURPCB(t2) + la v0, _C_LABEL(fswberr) + blt a0, zero, _C_LABEL(fswberr) + sw v0, PCB_ONFAULT(v1) + sw a1, 0(a0) # store word + sw zero, PCB_ONFAULT(v1) + j ra + move v0, zero + END(suword32) /* - * suword64(9) - * int suword64(void *addr, long word) - */ -ENTRY(suword64) - break - li v0, -1 - jr ra - nop -END(suword64) - -/* * Stubs for fetch(9) XXX fubyte() Fetches a byte of data from the user-space address base. @@ -243,10 +250,14 @@ * long fuword(const void *addr) */ ENTRY(fuword) - break - li v0, -1 - jr ra - nop + lw t2, pcpup + lw v1, PC_CURPCB(t2) + la v0, _C_LABEL(fswberr) + blt a0, zero, _C_LABEL(fswberr) + sw v0, PCB_ONFAULT(v1) + lw v0, 0(a0) # store byte + j ra + sw zero, PCB_ONFAULT(v1) END(fuword) /* @@ -283,12 +294,39 @@ * copyout(9) * int copyout(const void *kernaddr, void *useraddr, size_t len) */ -ENTRY(copyout) - break - jr ra - nop +NESTED(copyout, CALLFRAME_SIZ, ra) + subu sp, sp, CALLFRAME_SIZ + .mask 0x80000000, -4 + sw ra, CALLFRAME_RA(sp) + blt a1, zero, _C_LABEL(copyerr) + move v0, a0 # swap a0, a1 for call to memcpy + move a0, a1 + move a1, v0 + lw t2, pcpup + lw v1, PC_CURPCB(t2) + la v0, _C_LABEL(copyerr) + jal memcpy + sw v0, PCB_ONFAULT(v1) + + lw t2, pcpup + lw v1, PC_CURPCB(t2) + lw ra, CALLFRAME_RA(sp) + addu sp, sp, CALLFRAME_SIZ + sw zero, PCB_ONFAULT(v1) + j ra + move v0, zero END(copyout) +LEAF(copyerr) + lw t2, pcpup + lw v1, PC_CURPCB(t2) + lw ra, CALLFRAME_RA(sp) + addu sp, sp, CALLFRAME_SIZ + sw zero, PCB_ONFAULT(v1) + j ra + li v0, EFAULT # return EFAULT +END(copyerr) + /* * setjmp(9) * int setjmp(jmp_buf) @@ -335,14 +373,33 @@ nop END(longjmp) +/* + * Error routine for {f,s}uswintr. The fault handler in trap.c + * checks for pcb_onfault set to this fault handler and + * "bails out" before calling the VM fault handler. + * (We can not call VM code from interrupt level.) + */ +LEAF(fswintrberr) + nop + sw a2, PCB_ONFAULT(v1) + j ra + li v0, -1 +END(fswintrberr) + +LEAF(fswberr) +XLEAF(baderr) + sw zero, PCB_ONFAULT(v1) + j ra + li v0, -1 +END(fswberr) + /* * XXXMIPS: */ .data .globl intrcnt .globl eintrcnt - intrcnt: .space 1 eintrcnt: @@ -351,7 +408,6 @@ .globl intrnames .globl eintrnames - intrnames: .space 3 eintrnames: From owner-p4-projects@FreeBSD.ORG Mon Oct 23 12:20:49 2006 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 8DA9A16A51B; Mon, 23 Oct 2006 12:20:49 +0000 (UTC) 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 2D28616A4D4 for ; Mon, 23 Oct 2006 12:20:49 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E921F43D7D for ; Mon, 23 Oct 2006 12:20:30 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9NCKUF5097404 for ; Mon, 23 Oct 2006 12:20:30 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9NCKUDv097400 for perforce@freebsd.org; Mon, 23 Oct 2006 12:20:30 GMT (envelope-from bushman@freebsd.org) Date: Mon, 23 Oct 2006 12:20:30 GMT Message-Id: <200610231220.k9NCKUDv097400@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 108304 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, 23 Oct 2006 12:20:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=108304 Change 108304 by bushman@bushman_nss_ldap_cached on 2006/10/23 12:19:46 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/Makefile.inc1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/amd.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/apmd.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/auth.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/bluetooth/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/bluetooth/hcsecd.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/bluetooth/hosts#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/bluetooth/protocols#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/cached.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/crontab#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/csh.cshrc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/csh.login#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/csh.logout#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/defaults/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/defaults/bluetooth.device.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/defaults/devfs.rules#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/defaults/pccard.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/defaults/periodic.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/defaults/rc.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/devd.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/devfs.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/dhclient.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/disktab#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/etc.amd64/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/etc.arm/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/etc.i386/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/etc.ia64/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/etc.powerpc/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/etc.sparc64/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/fbtab#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/freebsd-update.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/ftpusers#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/gettytab#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/group#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/gss/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/gss/mech#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/gss/qop#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/hosts#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/hosts.allow#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/hosts.equiv#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/hosts.lpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/inetd.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/isdn/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/isdn/answer#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/isdn/holidays.D#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/isdn/isdnd.rates.A#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/isdn/isdnd.rates.D#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/isdn/isdnd.rates.F#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/isdn/isdnd.rates.L#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/isdn/isdnd.rates.UK.BT#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/isdn/isdnd.rc.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/isdn/isdntel.alias.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/isdn/isdntel.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/isdn/record#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/isdn/tell#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/isdn/tell-record#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/isdn/unknown_incoming#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/libalias.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/login.access#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/login.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mac.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mail/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mail/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mail/access.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mail/aliases#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mail/mailer.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mail/mailertable.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mail/virtusertable.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/man.alias#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/master.passwd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/minfree#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/motd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mtree/BIND.chroot.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mtree/BIND.include.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mtree/BSD.include.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mtree/BSD.local.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mtree/BSD.release.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mtree/BSD.root.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mtree/BSD.sendmail.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mtree/BSD.usr.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mtree/BSD.var.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mtree/BSD.x11-4.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mtree/BSD.x11.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mtree/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mtree/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/namedb/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/namedb/PROTO.localhost-v6.rev#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/namedb/PROTO.localhost.rev#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/namedb/make-localhost#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/namedb/named.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/namedb/named.root#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/netconfig#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/netstart#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/network.subr#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/networks#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/newsyslog.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/nls.alias#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/nsmb.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/nsswitch.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/opieaccess#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/convert.pl#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/ftpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/gdm#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/imap#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/kde#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/login#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/other#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/passwd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/pop3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/rsh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/sshd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/su#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/system#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/telnetd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pam.d/xdm#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pccard_ether#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/100.clean-disks#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/110.clean-tmps#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/120.clean-preserve#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/130.clean-msgs#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/140.clean-rwho#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/150.clean-hoststat#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/200.backup-passwd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/210.backup-aliases#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/300.calendar#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/310.accounting#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/330.news#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/400.status-disks#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/405.status-ata-raid#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/406.status-gmirror#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/407.status-graid3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/408.status-gstripe#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/409.status-gconcat#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/420.status-network#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/430.status-rwho#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/440.status-mailq#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/450.status-security#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/460.status-mail-rejects#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/470.status-named#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/500.queuerun#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/999.local#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/daily/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/monthly/200.accounting#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/monthly/999.local#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/monthly/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/100.chksetuid#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/200.chkmounts#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/300.chkuid0#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/400.passwdless#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/410.logincheck#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/500.ipfwdenied#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/510.ipfdenied#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/520.pfdenied#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/550.ipfwlimit#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/610.ipf6denied#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/700.kernelmsg#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/800.loginfail#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/900.tcpwrap#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/security/security.functions#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/weekly/310.locate#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/weekly/320.whatis#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/weekly/330.catman#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/weekly/340.noid#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/weekly/400.status-pkg#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/weekly/999.local#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/periodic/weekly/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pf.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pf.os#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/phones#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/portsnap.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/ppp/ppp.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/printcap#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/profile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/protocols#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.bsdextended#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/DAEMON#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/LOGIN#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/NETWORKING#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/SERVERS#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/abi#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/accounting#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/addswap#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/adjkerntz#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/amd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/apm#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/apmd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/archdep#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/atm1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/atm2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/atm3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/auditd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/auto_linklocal#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/bgfsck#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/bluetooth#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/bootconf.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/bootparams#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/bridge#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/bsnmpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/bthidd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/cached#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ccd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/cleanvar#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/cleartmp#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/cron#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/devd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/devfs#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/dhclient#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/dmesg#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/dumpon#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/early.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/encswap#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/fsck#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ftpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/gbde#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/geli#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/geli2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/hcsecd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/hostapd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/hostname#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/inetd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/initrandom#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ip6addrctl#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ip6fw#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ipfilter#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ipfs#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ipfw#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ipmon#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ipnat#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ipsec#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ipxrouted#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/isdnd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/jail#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/kadmind#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/kerberos#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/kernel#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/keyserv#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/kldxref#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/kpasswdd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ldconfig#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/local#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/localpkg#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/lpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/mdconfig#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/mdconfig2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/mixer#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/motd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/mountcritlocal#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/mountcritremote#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/mountd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/mountlate#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/moused#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/mroute6d#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/mrouted#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/msgs#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/named#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/natd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/netif#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/netoptions#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/network_ipv6#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/newsyslog#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/nfsclient#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/nfsd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/nfslocking#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/nfsserver#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/nisdomain#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/nsswitch#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ntpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ntpdate#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/othermta#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/pf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/pflog#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/pfsync#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/power_profile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/powerd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ppp#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/pppoed#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/pwcheck#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/quota#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/random#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/rarpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/resolv#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/root#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/route6d#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/routed#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/routing#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/rpcbind#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/rtadvd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/rwho#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/savecore#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/sdpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/securelevel#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/sendmail#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/serial#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/sppp#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/sshd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/swap1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/syscons#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/sysctl#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/syslogd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/timed#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/tmp#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ugidfw#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/var#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/virecover#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/watchdogd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/wpa_supplicant#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ypbind#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/yppasswdd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ypserv#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ypset#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ypupdated#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ypxfrd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.firewall#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.firewall6#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.initdiskless#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.resume#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.sendmail#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.shutdown#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.subr#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.suspend#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/remote#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/root/dot.cshrc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/root/dot.k5login#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/root/dot.login#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/root/dot.profile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rpc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/sendmail/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/sendmail/freebsd.mc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/sendmail/freebsd.submit.mc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/sendmail/freefall.mc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/services#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/shells#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/snmpd.config#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/sysctl.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/syslog.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/termcap.small#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/_ctype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/a.out.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/ar.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/arpa/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/arpa/ftp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/arpa/inet.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/arpa/nameser.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/arpa/nameser_compat.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/arpa/telnet.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/arpa/tftp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/assert.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/bitstring.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/complex.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/cpio.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/ctype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/db.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/dirent.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/dlfcn.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/elf-hints.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/elf.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/err.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/fmtmsg.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/fnmatch.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/fstab.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/fts.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/ftw.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/getopt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/glob.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/grp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/gssapi.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/gssapi/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/gssapi/gssapi.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/hesiod.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/histedit.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/ieeefp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/ifaddrs.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/inttypes.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/iso646.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/kenv.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/langinfo.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/libgen.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/limits.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/link.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/locale.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/malloc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/malloc_np.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/memory.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/monetary.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/mpool.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/mqueue.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/ndbm.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/netconfig.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/netdb.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/nl_types.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/nlist.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/nss.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/nsswitch.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/objformat.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/paths.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/printf.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/proc_service.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/protocols/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/protocols/dumprestore.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/protocols/routed.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/protocols/rwhod.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/protocols/talkd.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/protocols/timed.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/pthread.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/pthread_np.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/pwd.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/ranlib.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/readpassphrase.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/regex.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/regexp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/res_update.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/resolv.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/auth.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/auth_des.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/auth_kerb.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/auth_unix.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/clnt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/clnt_soc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/clnt_stat.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/des.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/des_crypt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/nettype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/pmap_clnt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/pmap_prot.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/pmap_rmt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/raw.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/rpc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/rpc_com.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/rpc_msg.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/rpcb_clnt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/rpcb_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/rpcent.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/svc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/svc_auth.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/svc_dg.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/svc_soc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/types.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpc/xdr.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/bootparam_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/crypt.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/key_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/klm_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/mount.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/nfs_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/nis.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/nis_cache.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/nis_callback.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/nis_db.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/nis_object.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/nis_tags.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/nislib.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/nlm_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/pmap_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/rex.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/rnusers.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/rquota.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/rstat.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/rwall.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/sm_inter.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/spray.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/yp.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/yp_prot.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/ypclnt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/yppasswd.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/ypupdate_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/rpcsvc/ypxfrd.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/runetype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/search.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/setjmp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/sgtty.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/signal.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/stab.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/stdbool.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/stddef.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/stdio.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/stdlib.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/string.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/stringlist.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/strings.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/sysexits.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/tar.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/tgmath.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/time.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/timeconv.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/timers.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/ttyent.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/ulimit.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/unistd.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/utime.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/utmp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/uuid.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/varargs.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/vis.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/wchar.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/wctype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/wordexp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/doc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/include/config.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/include/crypto-headers.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/include/krb5-types.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/include/version.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/lib/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/lib/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/lib/libasn1/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/lib/libgssapi/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/lib/libhdb/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/lib/libkadm5clnt/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/lib/libkadm5srv/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/lib/libkafs5/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/lib/libkrb5/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/lib/libroken/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/lib/libsl/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/lib/libvers/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/libexec/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/libexec/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/libexec/hprop/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/libexec/hpropd/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/libexec/ipropd-master/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/libexec/ipropd-slave/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/libexec/kadmind/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/libexec/kdc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/libexec/kpasswdd/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/tools/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/tools/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/tools/asn1_compile/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/tools/make-print-version/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/tools/make-roken/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/usr.bin/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/usr.bin/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/usr.bin/kadmin/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/usr.bin/kdestroy/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/usr.bin/kinit/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/usr.bin/klist/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/usr.bin/kpasswd/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/usr.bin/krb5-config/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/usr.bin/ksu/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/usr.bin/verify_krb5_conf/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/usr.sbin/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/usr.sbin/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/usr.sbin/kstash/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/kerberos5/usr.sbin/ktutil/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/Versions.def#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/SYS.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/_fpmath.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/arith.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/_set_tp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/_setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/fabs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/flt_rounds.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/fpgetmask.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/fpgetprec.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/fpgetround.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/fpgetsticky.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/fpsetmask.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/fpsetprec.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/fpsetround.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/infinity.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/ldexp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/makecontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/modf.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/rfork_thread.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/signalcontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/sigsetjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/net/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/net/htonl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/net/htons.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/net/ntohl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/net/ntohs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/string/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/string/bcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/string/bcopy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/string/bzero.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/string/memcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/string/memcpy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/string/memmove.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/string/memset.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/string/strcat.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/string/strcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/string/strcpy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/amd64_get_fsbase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/amd64_get_gsbase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/amd64_set_fsbase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/amd64_set_gsbase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/brk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/cerror.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/exect.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/getcontext.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/pipe.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/ptrace.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/reboot.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/sbrk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/setlogin.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/sigreturn.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/vfork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/SYS.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/_fpmath.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/arith.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/gen/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/gen/_ctx_start.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/gen/_set_tp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/gen/_setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/gen/alloca.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/gen/divsi3.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/gen/fabs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/gen/infinity.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/gen/makecontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/gen/modf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/gen/setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/gen/signalcontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/gen/sigsetjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/net/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/net/htonl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/net/htons.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/net/ntohl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/net/ntohs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/softfloat/arm-gcc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/softfloat/milieu.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/softfloat/softfloat.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/stdlib/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/string/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/string/bcopy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/string/bzero.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/string/ffs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/string/memcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/string/memcpy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/string/memcpy_arm.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/string/memcpy_xscale.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/string/memmove.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/string/memset.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/string/strcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/string/strlen.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/string/strncmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/sys/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/sys/Ovfork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/sys/brk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/sys/cerror.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/sys/fork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/sys/pipe.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/sys/ptrace.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/sys/sbrk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/sys/shmat.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/sys/sigreturn.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/sys/syscall.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/creat.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/creat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/gethostid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/gethostid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/getwd.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/killpg.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/killpg.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/sethostid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/setpgrp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/setrgid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/setruid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/setruid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/sigcompat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/sigpause.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/sigsetmask.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/sigvec.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_close.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_conv.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_debug.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_delete.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_get.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_open.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_overflow.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_page.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_put.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_search.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_seq.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_split.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_utils.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/btree.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/extern.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/changelog#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/db/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/db/db.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/docs/hash.usenix.ps#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/docs/libtp.usenix.ps#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/extern.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/hash.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/hash.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/hash_bigkey.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/hash_buf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/hash_func.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/hash_log2.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/hash_page.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/ndbm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/page.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/man/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/man/btree.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/man/dbm.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/man/dbopen.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/man/hash.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/man/mpool.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/man/recno.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/mpool/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/mpool/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/mpool/mpool.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/mpool/mpool.libtp#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/extern.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/rec_close.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/rec_delete.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/rec_get.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/rec_open.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/rec_put.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/rec_search.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/rec_seq.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/rec_utils.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/recno.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/btree.tests/main.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/dbtest.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/hash.tests/driver2.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/hash.tests/makedb.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/hash.tests/tcreat3.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/hash.tests/tdel.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/hash.tests/testit#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/hash.tests/thash4.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/hash.tests/tread2.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/hash.tests/tseq.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/hash.tests/tverify.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/run.test#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gdtoa/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gdtoa/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gdtoa/_hdtoa.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gdtoa/_ldtoa.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gdtoa/glue.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gdtoa/machdep_ldisQ.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gdtoa/machdep_ldisd.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gdtoa/machdep_ldisx.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/__xuname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/_pthread_stubs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/_rand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/_spinlock_stub.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/_thread_init.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/alarm.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/alarm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/arc4random.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/arc4random.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/assert.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/basename.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/basename.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/check_utility_compat.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/check_utility_compat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/clock.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/clock.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/closedir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/confstr.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/confstr.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/crypt.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ctermid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ctermid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/daemon.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/daemon.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/devname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/devname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/directory.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/dirname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/dirname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/disklabel.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/dladdr.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/dlfcn.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/dlfunc.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/dlinfo.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/dllockinit.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/dlopen.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/drand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/erand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/err.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/err.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/errlst.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/errno.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/exec.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/exec.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/fmtcheck.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/fmtcheck.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/fmtmsg.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/fmtmsg.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/fnmatch.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/fnmatch.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/fpclassify.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/fpclassify.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/frexp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/frexp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/fstab.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ftok.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ftok.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/fts.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/fts.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ftw.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ftw.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getbootfile.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getbootfile.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getbsize.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getbsize.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getcap.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getcap.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getcontext.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getcwd.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getcwd.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getdiskbyname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getdomainname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getdomainname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getfsent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getgrent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getgrent.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getgrouplist.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getgrouplist.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/gethostname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/gethostname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getloadavg.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getloadavg.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getlogin.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getmntinfo.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getmntinfo.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getnetgrent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getnetgrent.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getobjformat.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getobjformat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getosreldate.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getosreldate.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getpagesize.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getpagesize.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getpass.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getpeereid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getpeereid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getprogname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getprogname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getpwent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getpwent.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getttyent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getttyent.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getusershell.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getusershell.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getvfsbyname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getvfsbyname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/glob.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/glob.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/initgroups.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/initgroups.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/isatty.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/isgreater.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/isinf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/isnan.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/jrand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/lcong48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ldexp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ldexp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/lockf.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/lockf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/lrand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/makecontext.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/modf.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/mrand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/msgctl.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/msgget.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/msgrcv.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/msgsnd.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/nftw.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/nice.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/nice.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/nlist.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/nlist.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/nrand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/opendir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/pause.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/pause.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/pmadvise.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/popen.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/popen.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/posixshm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/pselect.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/pselect.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/psignal.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/psignal.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/pw_scan.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/pw_scan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/pwcache.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/pwcache.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/raise.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/raise.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/rand48.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/rand48.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/readdir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/readpassphrase.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/readpassphrase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/rewinddir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/rfork_thread.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/scandir.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/scandir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/seed48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/seekdir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sem.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sem_destroy.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sem_getvalue.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sem_init.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sem_open.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sem_post.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sem_wait.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/semctl.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/setdomainname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sethostname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/setjmp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/setjmperr.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/setmode.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/setmode.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/setproctitle.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/setproctitle.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/setprogname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/shm_open.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/siginterrupt.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/siginterrupt.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/siglist.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/signal.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/signal.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sigsetops.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sigsetops.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sleep.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sleep.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/srand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/statvfs.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/statvfs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/stringlist.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/stringlist.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/strtofflags.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/strtofflags.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/swapcontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sysconf.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sysconf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sysctl.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sysctl.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sysctlbyname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sysctlnametomib.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/syslog.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/syslog.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/tcgetpgrp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/tcsendbreak.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/tcsetattr.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/tcsetpgrp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/telldir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/telldir.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/termios.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/time.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/time.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/times.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/times.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/timezone.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/timezone.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/tls.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ttyname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ttyname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ttyslot.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/tzset.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ualarm.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ualarm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ucontext.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ulimit.3#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 23 12:26:05 2006 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 65A5016A407; Mon, 23 Oct 2006 12:26:05 +0000 (UTC) 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 361F816A47C for ; Mon, 23 Oct 2006 12:26:05 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C982B43D8F for ; Mon, 23 Oct 2006 12:24:41 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9NCOb8r007439 for ; Mon, 23 Oct 2006 12:24:37 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9NCOaYM007239 for perforce@freebsd.org; Mon, 23 Oct 2006 12:24:36 GMT (envelope-from bushman@freebsd.org) Date: Mon, 23 Oct 2006 12:24:36 GMT Message-Id: <200610231224.k9NCOaYM007239@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 108305 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, 23 Oct 2006 12:26:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=108305 Change 108305 by bushman@bushman_nss_ldap_cached on 2006/10/23 12:23:41 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/Makefile.inc1#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#9 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/disktab#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/Makefile#6 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/amd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/auto_linklocal#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/cleartmp#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/idmapd#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/basename.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/dirname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/msgsnd.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/sys/i386_get_ldt.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/wctype.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/fpu/fpu_emu.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/freopen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/xprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/getenv.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/ffs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/intro.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/read.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/stat.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/write.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.cpu.mk#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/Makefile#5 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/config/config.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mountd/mountd.c#5 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pccard/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pccard/dumpcis/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pccard/dumpcis/dumpcis.8#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pccard/dumpcis/main.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pccard/pccardd/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pccard/pccardd/cardd.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pccard/pccardd/cardd.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pccard/pccardd/file.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pccard/pccardd/pccard.conf.5#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pccard/pccardd/pccardd.8#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pccard/pccardd/pccardd.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pccard/pccardd/server.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pccard/pccardd/util.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/portsnap/portsnap/portsnap.sh#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/syslogd/syslog.conf.5#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/wicontrol/wicontrol.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/wicontrol/wicontrol.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/zic/zdump/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/zic/zic/Makefile#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/Makefile.inc1#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.562 2006/10/09 04:58:44 kmacy Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.563 2006/10/16 22:18:13 jb Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -98,7 +98,7 @@ # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) -TARGET_ARCH= ${TARGET:S/pc98/i386/} +TARGET_ARCH= ${TARGET:S/pc98/i386/:S/sun4v/sparc64/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} TARGET= ${TARGET_ARCH} ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#9 (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.298 2006/10/06 23:22:12 flz Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.300 2006/10/15 15:55:00 ceri Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -242,6 +242,8 @@ nfs_access_cache="60" # Client cache timeout in seconds nfs_server_enable="NO" # This host is an NFS server (or NO). nfs_server_flags="-u -t -n 4" # Flags to nfsd (if enabled). +idmapd_enable="NO" # Run the NFS4 id mapper (YES/NO). +idmapd_flags="" # Additional flags for idmapd. mountd_enable="NO" # Run mountd (or NO). mountd_flags="-r" # Flags to mountd (if NFS server enabled). weak_mountd_authentication="NO" # Allow non-root mount requests to be served. ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/disktab#2 (text+ko) ==== @@ -1,33 +1,7 @@ -# $FreeBSD: src/etc/disktab,v 1.25 2004/06/06 11:46:27 schweikh Exp $ +# $FreeBSD: src/etc/disktab,v 1.26 2006/10/14 16:39:03 ru Exp $ # # Disk geometry and partition layout tables. -# Key: -# dt controller type -# ty type of disk (fixed, removeable, simulated) -# d[0-4] drive-type-dependent parameters -# ns #sectors/track -# nt #tracks/cylinder -# nc #cylinders/disk -# sc #sectors/cylinder, ns*nt default -# su #sectors/unit, sc*nc default -# se sector size, DEV_BSIZE default -# rm rpm, 3600 default -# sf supports bad144-style bad sector forwarding -# sk sector skew per track, default 0 -# cs sector skew per cylinder, default 0 -# hs headswitch time, default 0 -# ts one-cylinder seek time, default 0 -# il sector interleave (n:1), 1 default -# bs boot block size, default BBSIZE -# sb superblock size, default SBSIZE -# o[a-h] partition offsets in sectors -# p[a-h] partition sizes in sectors -# b[a-h] partition block sizes in bytes -# f[a-h] partition fragment sizes in bytes -# t[a-h] partition types (filesystem, swap, etc) -# -# All partition sizes reserve space for bad sector tables. -# (5 cylinders needed for maintenance + replacement sectors) +# See disktab(5) for format of this file. # # ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/Makefile#6 (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.77 2006/10/07 15:45:56 ume Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.78 2006/10/15 14:19:06 ceri Exp $ .include @@ -15,7 +15,7 @@ gbde geli geli2 \ hcsecd \ hostapd hostname \ - inetd initrandom \ + idmapd inetd initrandom \ ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \ ipnat ipsec ipxrouted isdnd \ jail \ ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/amd#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.17 2006/04/11 09:02:06 flz Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.18 2006/10/18 15:56:11 flz Exp $ # # PROVIDE: amd @@ -16,6 +16,7 @@ command="/usr/sbin/${name}" start_precmd="amd_precmd" command_args="&" +extra_commands="reload" amd_precmd() { ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/auto_linklocal#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.1 2006/10/07 15:45:56 ume Exp $ +# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.3 2006/10/22 17:21:03 hrs Exp $ # # PROVIDE: auto_linklocal @@ -10,9 +10,15 @@ . /etc/rc.subr name="auto_linklocal" -rcvar=`set_rcvar ipv6` -start_cmd="${SYSCTL_W} net.inet6.ip6.auto_linklocal=1" +start_cmd="auto_linklocal_start" stop_cmd=":" +auto_linklocal_start() +{ + if ! checkyesno ipv6_enable && ${SYSCTL} net.inet6 > /dev/null 2>&1; then + ${SYSCTL_W} net.inet6.ip6.auto_linklocal=0 + fi +} + load_rc_config $name run_rc_command "$1" ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/cleartmp#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleartmp,v 1.17 2005/12/27 23:22:18 dougb Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.18 2006/10/16 13:01:45 yar Exp $ # # PROVIDE: cleartmp @@ -10,47 +10,48 @@ . /etc/rc.subr name="cleartmp" -rcvar=`set_rcvar clear_tmp` - +# Disguise rcvar for the start method to run irrespective of its setting. +rcvar1=`set_rcvar clear_tmp` start_cmd="${name}_start" +stop_cmd=":" -cleartmp_prestart() +cleartmp_start() { - checkyesno clear_tmp_X || return + # Make /tmp location variable for easier debugging. + local tmp="/tmp" - local x11_socket_dirs="/tmp/.X11-unix /tmp/.ICE-unix /tmp/.font-unix \ - /tmp/.XIM-unix" + # X related directories to create in /tmp. + local x11_socket_dirs="${tmp}/.X11-unix ${tmp}/.XIM-unix \ + ${tmp}/.ICE-unix ${tmp}/.font-unix" - # Remove X lock files, since they will prevent you from restarting X. - rm -f /tmp/.X[0-9]-lock + if checkyesno ${rcvar1}; then + echo "Clearing ${tmp}." - # Create socket directories with correct permissions to avoid - # security problem. - # - rm -fr ${x11_socket_dirs} - mkdir -m 1777 ${x11_socket_dirs} + # This is not needed for mfs, but doesn't hurt anything. + # Things to note: + # + The dot in ${tmp}/. is important. + # + Put -prune before -exec so find never descends + # into a directory that was already passed to rm -rf. + # + "--" in rm arguments isn't strictly necessary, but + # it can prevent foot-shooting in future. + # + /tmp/lost+found is preserved, but its contents are removed. + # + lost+found and quota.* in subdirectories are removed. + find -x ${tmp}/. ! -name . \ + ! \( -name lost+found -type d -user root \) \ + ! \( \( -name quota.user -or -name quota.group \) \ + -type f -user root \) \ + -prune -exec rm -rf -- {} + + elif checkyesno clear_tmp_X; then + # Remove X lock files, since they will prevent you from + # restarting X. Remove other X related directories. + echo "Clearing ${tmp} (X related)." + rm -rf ${tmp}/.X[0-9]-lock ${x11_socket_dirs} + fi + if checkyesno clear_tmp_X; then + # Create X related directories with proper permissions. + mkdir -m 1777 ${x11_socket_dirs} + fi } -cleartmp_start() -{ - echo "Clearing /tmp." - # - # Prune quickly with one rm, then use find to clean up - # /tmp/[lq]* (this is not needed with mfs /tmp, but - # doesn't hurt anything). - # - (cd /tmp && rm -rf [a-km-pr-zA-Z]* && - find -x . ! -name . ! -name lost+found ! -name quota.user \ - ! -name quota.group ! -name .X11-unix ! -name .ICE-unix \ - ! -name .font-unix ! -name .XIM-unix \ - -exec rm -rf -- {} \; -type d -prune) -} - load_rc_config $name - -# The clear_tmp_X variable should be tested even if clear_tmp_enable is NO -case "$1" in -*start) cleartmp_prestart ;; -esac - run_rc_command "$1" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/basename.3#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: basename.3,v 1.12 2000/04/18 03:01:25 aaron Exp $ -.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.7 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.8 2006/10/12 14:31:17 ru Exp $ .\" -.Dd August 17, 1997 +.Dd October 12, 2006 .Dt BASENAME 3 .Os .Sh NAME @@ -58,6 +58,13 @@ is a null pointer or the empty string, a pointer to the string .Qq \&. is returned. +.Sh IMPLEMENTATION NOTES +The +.Fn basename +function +returns a pointer to internal storage space allocated on the first call +that will be overwritten +by subsequent calls. .Sh RETURN VALUES On successful completion, .Fn basename @@ -77,12 +84,6 @@ The path component to be returned was larger than .Dv MAXPATHLEN . .El -.Sh WARNINGS -The -.Fn basename -function -returns a pointer to internal static storage space that will be overwritten -by subsequent calls. .Sh SEE ALSO .Xr basename 1 , .Xr dirname 1 , ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/dirname.3#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: dirname.3,v 1.9 2000/04/18 03:01:25 aaron Exp $ -.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.8 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.9 2006/10/12 14:31:17 ru Exp $ .\" -.Dd August 17, 1997 +.Dd October 12, 2006 .Dt DIRNAME 3 .Os .Sh NAME @@ -58,6 +58,20 @@ returns a pointer to the string .Qq \&. , signifying the current directory. +.Sh IMPLEMENTATION NOTES +The +.Fn dirname +function +returns a pointer to internal storage space allocated on the first call +that will be overwritten +by subsequent calls. +.Pp +Other vendor implementations of +.Fn dirname +may modify the contents of the string passed to +.Fn dirname ; +this should be taken into account when writing code which calls this function +if portability is desired. .Sh RETURN VALUES On successful completion, .Fn dirname @@ -77,19 +91,6 @@ The path component to be returned was larger than .Dv MAXPATHLEN . .El -.Sh WARNINGS -The -.Fn dirname -function -returns a pointer to internal static storage space that will be overwritten -by subsequent calls (each function has its own separate storage). -.Pp -Other vendor implementations of -.Fn dirname -may modify the contents of the string passed to -.Fn dirname ; -this should be taken into account when writing code which calls this function -if portability is desired. .Sh SEE ALSO .Xr basename 1 , .Xr dirname 1 , ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/msgsnd.3#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/msgsnd.3,v 1.20 2005/01/20 09:17:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/msgsnd.3,v 1.21 2006/10/12 11:42:41 ru Exp $ .\" -.Dd November 24, 1997 +.Dd October 12, 2006 .Dt MSGSND 3 .Os .Sh NAME @@ -65,8 +65,13 @@ is an integer greater than 0 that can be used for selecting messages (see .Xr msgrcv 3 ) , .Va mtext -is an array of bytes, with a size up to that of the system limit -.Pf ( Dv MSGMAX ) . +is an array of +.Fa msgsz +bytes. +The argument +.Fa msgsz +can range from 0 to a system-imposed maximum, +.Dv MSGMAX . .Pp If the number of bytes already on the message queue plus .Fa msgsz @@ -144,7 +149,7 @@ The .Fa msgsz argument -is less than 0, or greater than +is greater than .Va msg_qbytes . .Pp The ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/sys/i386_get_ldt.2#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)fork.2 6.5 (Berkeley) 3/10/91 -.\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.2,v 1.21 2004/07/02 19:07:30 ru Exp $ +.\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.2,v 1.23 2006/10/13 20:34:44 ru Exp $ .\" -.Dd September 20, 1993 +.Dd October 14, 2006 .Dt I386_GET_LDT 2 .Os .Sh NAME @@ -52,24 +52,24 @@ The .Fn i386_get_ldt system call -will return the list of i386 descriptors that the process has in its +returns a list of the i386 descriptors in the current process' LDT. The .Fn i386_set_ldt system call -will set a list of i386 descriptors for the current process in its +sets a list of i386 descriptors in the current process' LDT. -Both routines accept a starting selector number -.Fa start_sel , -an array of memory that -will contain the descriptors to be set or returned -.Fa descs , -and the number of entries to set or return -.Fa num_sels . +For both routines, +.Fa start_sel +specifies the index of the selector in the LDT at which to begin and +.Fa descs +points to an array of +.Fa num_sels +descriptors to be set or returned. .Pp -The argument +Each entry in the .Fa descs -can be either segment_descriptor or gate_descriptor and are defined in +array can be either a segment_descriptor or gate_descriptor and are defined in .In i386/segments.h . These structures are defined by the architecture as disjoint bit-fields, so care must be taken in constructing them. @@ -113,9 +113,9 @@ The .Fn i386_set_ldt system call -returns the first selector set. -In the case when a descriptor is allocated by the kernel, its number will -be returned. +returns the first selector set on success. +If the kernel allocated a descriptor in the LDT, +the allocated index is returned. Otherwise, a value of -1 is returned and the global variable .Va errno ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/wctype.3#2 (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/locale/wctype.3,v 1.6 2005/07/21 10:32:17 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wctype.3,v 1.7 2006/10/13 16:11:12 ru Exp $ .\" .Dd March 27, 2004 .Dt WCTYPE 3 @@ -105,7 +105,7 @@ .St -p1003.1-2001 . The .Dq Li ideogram , -.Dq Li phonogram +.Dq Li phonogram , .Dq Li special , and .Dq Li rune ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/fpu/fpu_emu.h#2 (text+ko) ==== @@ -41,7 +41,7 @@ * * @(#)fpu_emu.h 8.1 (Berkeley) 6/11/93 * $NetBSD: fpu_emu.h,v 1.4 2000/08/03 18:32:07 eeh Exp $ - * $FreeBSD: src/lib/libc/sparc64/fpu/fpu_emu.h,v 1.4 2002/03/22 23:41:59 obrien Exp $ + * $FreeBSD: src/lib/libc/sparc64/fpu/fpu_emu.h,v 1.5 2006/10/12 04:38:41 kmacy Exp $ */ /* @@ -157,6 +157,7 @@ struct fpemu { u_long fe_fsr; /* fsr copy (modified during op) */ int fe_cx; /* exceptions */ + int pad; /* align access to following fields */ struct fpn fe_f1; /* operand 1 */ struct fpn fe_f2; /* operand 2, if required */ struct fpn fe_f3; /* available storage for result */ ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/freopen.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)freopen.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.13 2004/05/22 15:19:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.17 2006/10/16 14:31:56 ache Exp $"); #include "namespace.h" #include @@ -67,7 +67,9 @@ int dflags, flags, isopen, oflags, sverrno, wantfd; if ((flags = __sflags(mode, &oflags)) == 0) { + sverrno = errno; (void) fclose(fp); + errno = sverrno; return (NULL); } @@ -102,6 +104,8 @@ errno = EINVAL; return (NULL); } + if (fp->_flags & __SWR) + (void) __sflush(fp); if ((oflags ^ dflags) & O_APPEND) { dflags &= ~O_APPEND; dflags |= oflags & O_APPEND; @@ -114,15 +118,9 @@ } } if (oflags & O_TRUNC) - ftruncate(fp->_file, 0); - if (_fseeko(fp, 0, oflags & O_APPEND ? SEEK_END : SEEK_SET, - 0) < 0 && errno != ESPIPE) { - sverrno = errno; - fclose(fp); - FUNLOCKFILE(fp); - errno = sverrno; - return (NULL); - } + (void) ftruncate(fp->_file, (off_t)0); + if (!(oflags & O_APPEND)) + (void) _sseek(fp, (fpos_t)0, SEEK_SET); f = fp->_file; isopen = 0; wantfd = -1; @@ -192,8 +190,8 @@ if (f < 0) { /* did not get it after all */ fp->_flags = 0; /* set it free */ + FUNLOCKFILE(fp); errno = sverrno; /* restore in case _close clobbered */ - FUNLOCKFILE(fp); return (NULL); } @@ -216,6 +214,16 @@ fp->_write = __swrite; fp->_seek = __sseek; fp->_close = __sclose; + /* + * When opening in append mode, even though we use O_APPEND, + * we need to seek to the end so that ftell() gets the right + * answer. If the user then alters the seek pointer, or + * the file extends, this will fail, but there is not much + * we can do about this. (We could set __SAPP and check in + * fseek and ftell.) + */ + if (oflags & O_APPEND) + (void) _sseek(fp, (fpos_t)0, SEEK_END); FUNLOCKFILE(fp); return (fp); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/xprintf.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.3 2006/04/01 19:06:54 phk Exp $ + * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.4 2006/10/21 11:49:07 kib Exp $ */ #include @@ -261,7 +261,7 @@ static int -__v2printf(FILE *fp, const char *fmt0, unsigned pct, const va_list ap) +__v2printf(FILE *fp, const char *fmt0, unsigned pct, const va_list ap1) { struct printf_info *pi, *pil; const char *fmt; @@ -274,7 +274,9 @@ int ret = 0; int n; struct __printf_io io; + va_list ap; + va_copy(ap, ap1); __printf_init(&io); io.fp = fp; @@ -561,6 +563,7 @@ errx(1, "render[%c] = NULL", *fmt); } __printf_flush(&io); + va_end(ap); return (ret); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/getenv.3#3 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)getenv.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.18 2006/10/07 21:27:21 trhodes Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.19 2006/10/12 08:39:24 trhodes Exp $ .\" -.Dd December 11, 1993 +.Dd October 12, 2006 .Dt GETENV 3 .Os .Sh NAME @@ -75,6 +75,10 @@ .Fn getenv function obtains the current value of the environment variable, .Fa name . +The application should not modify the string pointed +to by the +.Fn getenv +function. .Pp The .Fn setenv ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/ffs.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ffs.3 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/string/ffs.3,v 1.9 2004/06/30 20:09:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/ffs.3,v 1.10 2006/10/12 15:08:41 ru Exp $ .\" -.Dd January 13, 2004 +.Dd October 12, 2006 .Dt FFS 3 .Os .Sh NAME @@ -60,7 +60,9 @@ .Fn ffs and .Fn ffsl -functions find the first bit set in +functions find the first bit set +(beginning with the least significant bit) +in .Fa value and return the index of that bit. .Pp @@ -72,8 +74,7 @@ .Fa value and return the index of that bit. .Pp -Bits are numbered starting from 1, starting at the right-most -(least significant) bit. +Bits are numbered starting at 1 (the least significant bit). A return value of zero from any of these functions means that the argument was zero. .Sh SEE ALSO ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.121 2006/03/13 01:15:00 deischen Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.122 2006/10/12 13:46:33 ru Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -136,6 +136,8 @@ MLINKS+=pathconf.2 fpathconf.2 MLINKS+=read.2 pread.2 read.2 readv.2 read.2 preadv.2 MLINKS+=recv.2 recvfrom.2 recv.2 recvmsg.2 +MLINKS+=select.2 FD_CLR.3 select.2 FD_ISSET.3 select.2 FD_SET.3 \ + select.2 FD_ZERO.3 MLINKS+=send.2 sendmsg.2 send.2 sendto.2 MLINKS+=setpgid.2 setpgrp.2 MLINKS+=setresuid.2 setresgid.2 setresuid.2 getresuid.2 setresuid.2 getresgid.2 ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/intro.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)intro.2 8.5 (Berkeley) 2/27/95 -.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.46 2005/11/19 11:30:55 simon Exp $ +.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.47 2006/10/12 20:50:26 ru Exp $ .\" .Dd February 27, 1995 .Dt INTRO 2 @@ -48,7 +48,7 @@ .\".Pp .\".Sy System call restart .\".Pp -.\" +.\"(more later...) .Sh RETURN VALUES Nearly all of the system calls provide an error number referenced via the external identifier errno. @@ -76,8 +76,8 @@ and sets the variable .Va errno accordingly. - +(This allows interpretation of the failure on receiving +a -1 and to take action accordingly.) Successful calls never set .Va errno ; once set, it remains until another error occurs. @@ -197,8 +197,8 @@ has been reached and a requests for an open cannot be satisfied until at least one has been closed. .It Er 24 EMFILE Em "Too many open files" . - +(As released, the limit on the number of +open files per process is 64.) The .Xr getdtablesize 2 system call will obtain the current limit. ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/read.2#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)read.2 8.4 (Berkeley) 2/26/94 -.\" $FreeBSD: src/lib/libc/sys/read.2,v 1.32 2005/11/17 13:00:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/read.2,v 1.34 2006/10/21 18:03:53 ru Exp $ .\" -.Dd July 29, 2005 +.Dd October 11, 2006 .Dt READ 2 .Os .Sh NAME @@ -169,8 +169,10 @@ .It Bq Er EIO An I/O error occurred while reading from the file system. .It Bq Er EINTR -A read from a slow device was interrupted before -any data arrived by the delivery of a signal. +A read from a slow device +(i.e.\& one that might block for an arbitrary amount of time) +was interrupted by the delivery of a signal +before any data arrived. .It Bq Er EINVAL The pointer associated with .Fa d ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/stat.2#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)stat.2 8.4 (Berkeley) 5/1/95 -.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.45 2006/06/13 12:49:14 maxim Exp $ +.\" $FreeBSD: src/lib/libc/sys/stat.2,v 1.46 2006/10/12 13:35:07 ru Exp $ .\" -.Dd November 15, 2004 +.Dd October 12, 2006 .Dt STAT 2 .Os .Sh NAME @@ -195,7 +195,7 @@ .Fa st_mode has the following bits: .Bd -literal -#define S_IFMT 0170000 /* type of file */ +#define S_IFMT 0170000 /* type of file mask */ #define S_IFIFO 0010000 /* named pipe (fifo) */ #define S_IFCHR 0020000 /* character special */ #define S_IFDIR 0040000 /* directory */ @@ -207,9 +207,18 @@ #define S_ISUID 0004000 /* set user id on execution */ #define S_ISGID 0002000 /* set group id on execution */ #define S_ISVTX 0001000 /* save swapped text even after use */ +#define S_IRWXU 0000700 /* RWX mask for owner */ #define S_IRUSR 0000400 /* read permission, owner */ #define S_IWUSR 0000200 /* write permission, owner */ #define S_IXUSR 0000100 /* execute/search permission, owner */ +#define S_IRWXG 0000070 /* RWX mask for group */ +#define S_IRGRP 0000040 /* read permission, group */ +#define S_IWGRP 0000020 /* write permission, group */ +#define S_IXGRP 0000010 /* execute/search permission, group */ +#define S_IRWXO 0000007 /* RWX mask for other */ +#define S_IROTH 0000004 /* read permission, other */ +#define S_IWOTH 0000002 /* write permission, other */ +#define S_IXOTH 0000001 /* execute/search permission, other */ .Ed .Pp For a list of access modes, see ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/write.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)write.2 8.5 (Berkeley) 4/2/94 -.\" $FreeBSD: src/lib/libc/sys/write.2,v 1.32 2006/04/14 19:34:07 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/write.2,v 1.33 2006/10/21 20:36:50 simon Exp $ .\" .Dd July 7, 2005 .Dt WRITE 2 @@ -85,7 +85,7 @@ For .Fn writev and -.Fn pwritev, +.Fn pwritev , the .Fa iovec structure is defined as: ==== //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.cpu.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.57 2006/08/22 07:51:10 ru Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.58 2006/10/19 22:51:26 cognet Exp $ # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but @@ -162,7 +162,7 @@ . endif .endif -.if ${MACHINE_ARCH} == "arm" && defined(ARM_BIG_ENDIAN) +.if ${MACHINE_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN) CFLAGS += -mbig-endian LDFLAGS += -mbig-endian LD += -EB ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.362 2006/10/05 12:18:15 ru Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.363 2006/10/18 19:56:41 imp Exp $ .include @@ -111,7 +111,7 @@ ntp \ ${_nvram} \ ${_ofwdump} \ - ${_pccard} \ + pccard \ pciconf \ periodic \ pkg_install \ @@ -303,7 +303,6 @@ _mount_smbfs= mount_smbfs _mptable= mptable _ndiscvt= ndiscvt -_pccard= pccard _pnpinfo= pnpinfo .if ${MK_LIBPTHREAD} != "no" _pppctl= pppctl ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/arp/arp.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/usr.sbin/arp/arp.c,v 1.63 2006/09/29 16:07:44 ru Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/arp/arp.c,v 1.64 2006/10/13 12:38:43 glebius Exp $"); /* * arp - display, set, and delete arp table entries @@ -761,9 +761,9 @@ for (ifr = ifc.ifc_req; ifr < ifend; ifr = NEXTIFR(ifr) ) { if (ifr->ifr_addr.sa_family != AF_INET) continue; - /* XXX can't we use *ifr instead of ifreq ? */ strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name)); + ifreq.ifr_addr = ifr->ifr_addr; /* * Check that the interface is up, * and not point-to-point or loopback. ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/config/config.8#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)config.8 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/usr.sbin/config/config.8,v 1.44 2005/08/10 06:36:44 obrien Exp $ +.\" $FreeBSD: src/usr.sbin/config/config.8,v 1.45 2006/10/21 20:09:51 ru Exp $ .\" .Dd December 16, 2004 .Dt CONFIG 8 @@ -40,20 +40,20 @@ .Op Fl d Ar destdir .Ar SYSTEM_NAME .Sh DESCRIPTION -This is the old version of the -.Nm -utility. -It understands the old autoconfiguration scheme -used on the HP300, i386, DECstation, and derivative platforms. -The new version of -.Nm -is used with the -SPARC platform. -Only the version of -.Nm -applicable to the architecture that you are running -will be installed on your machine. -.Pp +.\" This is the old version of the +.\" .Nm +.\" utility. +.\" It understands the old autoconfiguration scheme +.\" used on the HP300, i386, DECstation, and derivative platforms. +.\" The new version of +.\" .Nm +.\" is used with the +.\" SPARC platform. +.\" Only the version of +.\" .Nm +.\" applicable to the architecture that you are running +.\" will be installed on your machine. +.\" .Pp The .Nm utility builds a set of system configuration files from the file ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/freebsd-update/freebsd-update.sh#2 (text+ko) ==== @@ -25,7 +25,7 @@ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -# $FreeBSD: src/usr.sbin/freebsd-update/freebsd-update.sh,v 1.2 2006/09/02 10:47:01 cperciva Exp $ +# $FreeBSD: src/usr.sbin/freebsd-update/freebsd-update.sh,v 1.3 2006/10/21 11:04:34 cperciva Exp $ #### Usage function -- called from command-line handling code. @@ -1926,6 +1926,9 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 23 12:51:34 2006 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 BF3DB16A47B; Mon, 23 Oct 2006 12:51:34 +0000 (UTC) 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 640FE16A417 for ; Mon, 23 Oct 2006 12:51:34 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E73D943D5E for ; Mon, 23 Oct 2006 12:51:15 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9NCpEM8063891 for ; Mon, 23 Oct 2006 12:51:14 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9NCpC92063586 for perforce@freebsd.org; Mon, 23 Oct 2006 12:51:12 GMT (envelope-from bushman@freebsd.org) Date: Mon, 23 Oct 2006 12:51:12 GMT Message-Id: <200610231251.k9NCpC92063586@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 108306 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, 23 Oct 2006 12:51:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=108306 Change 108306 by bushman@bushman_nss_ldap_cached on 2006/10/23 12:50:32 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/Makefile.inc1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/disktab#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/amd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/auto_linklocal#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/cleartmp#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/idmapd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/basename.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/dirname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/msgsnd.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/sys/i386_get_ldt.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/wctype.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/fpu/fpu_emu.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/freopen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/xprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/getenv.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/ffs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/intro.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/read.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/stat.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/write.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/arp/arp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/config/config.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pccard/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pccard/dumpcis/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pccard/dumpcis/dumpcis.8#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pccard/dumpcis/main.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pccard/pccardd/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pccard/pccardd/cardd.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pccard/pccardd/cardd.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pccard/pccardd/file.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pccard/pccardd/pccard.conf.5#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pccard/pccardd/pccardd.8#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pccard/pccardd/pccardd.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pccard/pccardd/server.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/pccard/pccardd/util.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/portsnap/portsnap/portsnap.sh#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/syslogd/syslog.conf.5#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/wicontrol/wicontrol.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/wicontrol/wicontrol.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/zic/zdump/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.sbin/zic/zic/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/Makefile.inc1#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/rc.conf#6 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/disktab#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/libalias.conf#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.local.dist#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/network.subr#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/Makefile#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/amd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/auto_linklocal#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/cleartmp#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/dhclient#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/idmapd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/mixer#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/mrouted#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.subr#5 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/Makefile#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/elf.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/Makefile#5 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/killpg.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/arc4random.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/basename.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/dirname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/err.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getobjformat.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/msgsnd.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/tls.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/sys/i386_get_ldt.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/wctype.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/posix1e/mac_is_present.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/fpu/fpu_emu.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/gen/_set_tp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/freopen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/xprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/a64l.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/getenv.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/posix_memalign.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/strtonum.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/ffs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/abort2.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/aio_return.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/intro.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/lio_listio.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/read.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/stat.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/write.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_compat/compat_group.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_files/files_group.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldap_group.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldap_group.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldap_passwd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldap_serv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldapconf.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldapconf.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldapconn.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldapconn.h#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldapschema.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldapsearch.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldapsearch.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldaptls.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldaputil.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldaputil.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/nss_ldap.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.compat.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.cpu.mk#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.info.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.libnames.mk#5 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.own.mk#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/sys.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/Makefile#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/adduser/adduser.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/arp/arp.4#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/arp/arp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/asf/asf.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/asf/asf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/bluetooth/bthidd/bthidd.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/bluetooth/bthidd/hid.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cached.8#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cached.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cached.conf.5#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/config/config.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/config/configvers.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/config/mkmakefile.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/crunch/crunchgen/crunchgen.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/crunch/examples/really-big.conf#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/devinfo/devinfo.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/devinfo/devinfo.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/gstat/gstat.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/iostat/iostat.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ipfwpcap/ipfwpcap.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/jail/jail.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/jexec/jexec.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/jexec/jexec.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/kbdcontrol/kbdcontrol.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mailwrapper/mailwrapper.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/moused/moused.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/LICENSE#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/Makefile.inc#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/RELEASE#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/VERSION#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/callout.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/cfparse.y#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/common/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/config.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/defs.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/dvmrp.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/icmp.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/igmp.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/igmpv2.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/inet.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/ipip.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/kern.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/main.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/map-mbone.8#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/map-mbone/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/mapper.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/mrinfo.8#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/mrinfo.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/mrinfo/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/mrouted.8#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/mrouted.conf#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/mrouted/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/mtrace.8#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/mtrace.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/mtrace.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/mtrace/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/pathnames.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/prune.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/prune.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/route.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/route.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/rsrr.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/rsrr.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/rsrr_var.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/testrsrr/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/testrsrr/testrsrr.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/vif.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mrouted/vif.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/mtree/mtree.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ndiscvt/ndiscvt.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/newsyslog/newsyslog.conf.5#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ntp/doc/ntp-keygen.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ntp/doc/ntp.conf.5#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ntp/doc/ntpd.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ntp/doc/ntpdc.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/ntp/doc/ntpq.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/nvram/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/nvram/nvram.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pccard/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pccard/dumpcis/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pccard/dumpcis/dumpcis.8#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pccard/dumpcis/main.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pccard/pccardd/Makefile#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pccard/pccardd/cardd.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pccard/pccardd/cardd.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pccard/pccardd/file.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pccard/pccardd/pccard.conf.5#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pccard/pccardd/pccardd.8#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pccard/pccardd/pccardd.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pccard/pccardd/server.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pccard/pccardd/util.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pkg_install/create/main.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pkg_install/info/pkg_info.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pmcstat/pmcstat.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pmcstat/pmcstat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/portsnap/portsnap/portsnap.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/portsnap/portsnap/portsnap.sh#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/pw/pw.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/quot/quot.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sade/sade.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/sysinstall/disks.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/syslogd/syslog.conf.5#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/syslogd/syslogd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/watchdogd/watchdog.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/watchdogd/watchdogd.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/wicontrol/wicontrol.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/wicontrol/wicontrol.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/wpa/hostapd/hostapd.conf.5#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/wpa/ndis_events/ndis_events.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/zic/zdump/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/zic/zic/Makefile#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/Makefile.inc1#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.562 2006/10/09 04:58:44 kmacy Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.563 2006/10/16 22:18:13 jb Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -98,7 +98,7 @@ # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) -TARGET_ARCH= ${TARGET:S/pc98/i386/} +TARGET_ARCH= ${TARGET:S/pc98/i386/:S/sun4v/sparc64/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} TARGET= ${TARGET_ARCH} ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/defaults/rc.conf#2 (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.298 2006/10/06 23:22:12 flz Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.300 2006/10/15 15:55:00 ceri Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -242,6 +242,8 @@ nfs_access_cache="60" # Client cache timeout in seconds nfs_server_enable="NO" # This host is an NFS server (or NO). nfs_server_flags="-u -t -n 4" # Flags to nfsd (if enabled). +idmapd_enable="NO" # Run the NFS4 id mapper (YES/NO). +idmapd_flags="" # Additional flags for idmapd. mountd_enable="NO" # Run mountd (or NO). mountd_flags="-r" # Flags to mountd (if NFS server enabled). weak_mountd_authentication="NO" # Allow non-root mount requests to be served. ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/disktab#2 (text+ko) ==== @@ -1,33 +1,7 @@ -# $FreeBSD: src/etc/disktab,v 1.25 2004/06/06 11:46:27 schweikh Exp $ +# $FreeBSD: src/etc/disktab,v 1.26 2006/10/14 16:39:03 ru Exp $ # # Disk geometry and partition layout tables. -# Key: -# dt controller type -# ty type of disk (fixed, removeable, simulated) -# d[0-4] drive-type-dependent parameters -# ns #sectors/track -# nt #tracks/cylinder -# nc #cylinders/disk -# sc #sectors/cylinder, ns*nt default -# su #sectors/unit, sc*nc default -# se sector size, DEV_BSIZE default -# rm rpm, 3600 default -# sf supports bad144-style bad sector forwarding -# sk sector skew per track, default 0 -# cs sector skew per cylinder, default 0 -# hs headswitch time, default 0 -# ts one-cylinder seek time, default 0 -# il sector interleave (n:1), 1 default -# bs boot block size, default BBSIZE -# sb superblock size, default SBSIZE -# o[a-h] partition offsets in sectors -# p[a-h] partition sizes in sectors -# b[a-h] partition block sizes in bytes -# f[a-h] partition fragment sizes in bytes -# t[a-h] partition types (filesystem, swap, etc) -# -# All partition sizes reserve space for bad sector tables. -# (5 cylinders needed for maintenance + replacement sectors) +# See disktab(5) for format of this file. # # ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/Makefile#2 (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.77 2006/10/07 15:45:56 ume Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.78 2006/10/15 14:19:06 ceri Exp $ .include @@ -15,7 +15,7 @@ gbde geli geli2 \ hcsecd \ hostapd hostname \ - inetd initrandom \ + idmapd inetd initrandom \ ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \ ipnat ipsec ipxrouted isdnd \ jail \ ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/amd#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.17 2006/04/11 09:02:06 flz Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.18 2006/10/18 15:56:11 flz Exp $ # # PROVIDE: amd @@ -16,6 +16,7 @@ command="/usr/sbin/${name}" start_precmd="amd_precmd" command_args="&" +extra_commands="reload" amd_precmd() { ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/auto_linklocal#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.1 2006/10/07 15:45:56 ume Exp $ +# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.3 2006/10/22 17:21:03 hrs Exp $ # # PROVIDE: auto_linklocal @@ -10,9 +10,15 @@ . /etc/rc.subr name="auto_linklocal" -rcvar=`set_rcvar ipv6` -start_cmd="${SYSCTL_W} net.inet6.ip6.auto_linklocal=1" +start_cmd="auto_linklocal_start" stop_cmd=":" +auto_linklocal_start() +{ + if ! checkyesno ipv6_enable && ${SYSCTL} net.inet6 > /dev/null 2>&1; then + ${SYSCTL_W} net.inet6.ip6.auto_linklocal=0 + fi +} + load_rc_config $name run_rc_command "$1" ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/cleartmp#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleartmp,v 1.17 2005/12/27 23:22:18 dougb Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.18 2006/10/16 13:01:45 yar Exp $ # # PROVIDE: cleartmp @@ -10,47 +10,48 @@ . /etc/rc.subr name="cleartmp" -rcvar=`set_rcvar clear_tmp` - +# Disguise rcvar for the start method to run irrespective of its setting. +rcvar1=`set_rcvar clear_tmp` start_cmd="${name}_start" +stop_cmd=":" -cleartmp_prestart() +cleartmp_start() { - checkyesno clear_tmp_X || return + # Make /tmp location variable for easier debugging. + local tmp="/tmp" - local x11_socket_dirs="/tmp/.X11-unix /tmp/.ICE-unix /tmp/.font-unix \ - /tmp/.XIM-unix" + # X related directories to create in /tmp. + local x11_socket_dirs="${tmp}/.X11-unix ${tmp}/.XIM-unix \ + ${tmp}/.ICE-unix ${tmp}/.font-unix" - # Remove X lock files, since they will prevent you from restarting X. - rm -f /tmp/.X[0-9]-lock + if checkyesno ${rcvar1}; then + echo "Clearing ${tmp}." - # Create socket directories with correct permissions to avoid - # security problem. - # - rm -fr ${x11_socket_dirs} - mkdir -m 1777 ${x11_socket_dirs} + # This is not needed for mfs, but doesn't hurt anything. + # Things to note: + # + The dot in ${tmp}/. is important. + # + Put -prune before -exec so find never descends + # into a directory that was already passed to rm -rf. + # + "--" in rm arguments isn't strictly necessary, but + # it can prevent foot-shooting in future. + # + /tmp/lost+found is preserved, but its contents are removed. + # + lost+found and quota.* in subdirectories are removed. + find -x ${tmp}/. ! -name . \ + ! \( -name lost+found -type d -user root \) \ + ! \( \( -name quota.user -or -name quota.group \) \ + -type f -user root \) \ + -prune -exec rm -rf -- {} + + elif checkyesno clear_tmp_X; then + # Remove X lock files, since they will prevent you from + # restarting X. Remove other X related directories. + echo "Clearing ${tmp} (X related)." + rm -rf ${tmp}/.X[0-9]-lock ${x11_socket_dirs} + fi + if checkyesno clear_tmp_X; then + # Create X related directories with proper permissions. + mkdir -m 1777 ${x11_socket_dirs} + fi } -cleartmp_start() -{ - echo "Clearing /tmp." - # - # Prune quickly with one rm, then use find to clean up - # /tmp/[lq]* (this is not needed with mfs /tmp, but - # doesn't hurt anything). - # - (cd /tmp && rm -rf [a-km-pr-zA-Z]* && - find -x . ! -name . ! -name lost+found ! -name quota.user \ - ! -name quota.group ! -name .X11-unix ! -name .ICE-unix \ - ! -name .font-unix ! -name .XIM-unix \ - -exec rm -rf -- {} \; -type d -prune) -} - load_rc_config $name - -# The clear_tmp_X variable should be tested even if clear_tmp_enable is NO -case "$1" in -*start) cleartmp_prestart ;; -esac - run_rc_command "$1" ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/basename.3#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: basename.3,v 1.12 2000/04/18 03:01:25 aaron Exp $ -.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.7 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/basename.3,v 1.8 2006/10/12 14:31:17 ru Exp $ .\" -.Dd August 17, 1997 +.Dd October 12, 2006 .Dt BASENAME 3 .Os .Sh NAME @@ -58,6 +58,13 @@ is a null pointer or the empty string, a pointer to the string .Qq \&. is returned. +.Sh IMPLEMENTATION NOTES +The +.Fn basename +function +returns a pointer to internal storage space allocated on the first call +that will be overwritten +by subsequent calls. .Sh RETURN VALUES On successful completion, .Fn basename @@ -77,12 +84,6 @@ The path component to be returned was larger than .Dv MAXPATHLEN . .El -.Sh WARNINGS -The -.Fn basename -function -returns a pointer to internal static storage space that will be overwritten -by subsequent calls. .Sh SEE ALSO .Xr basename 1 , .Xr dirname 1 , ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/dirname.3#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: dirname.3,v 1.9 2000/04/18 03:01:25 aaron Exp $ -.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.8 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.9 2006/10/12 14:31:17 ru Exp $ .\" -.Dd August 17, 1997 +.Dd October 12, 2006 .Dt DIRNAME 3 .Os .Sh NAME @@ -58,6 +58,20 @@ returns a pointer to the string .Qq \&. , signifying the current directory. +.Sh IMPLEMENTATION NOTES +The +.Fn dirname +function +returns a pointer to internal storage space allocated on the first call +that will be overwritten +by subsequent calls. +.Pp +Other vendor implementations of +.Fn dirname +may modify the contents of the string passed to +.Fn dirname ; +this should be taken into account when writing code which calls this function +if portability is desired. .Sh RETURN VALUES On successful completion, .Fn dirname @@ -77,19 +91,6 @@ The path component to be returned was larger than .Dv MAXPATHLEN . .El -.Sh WARNINGS -The -.Fn dirname -function -returns a pointer to internal static storage space that will be overwritten -by subsequent calls (each function has its own separate storage). -.Pp -Other vendor implementations of -.Fn dirname -may modify the contents of the string passed to -.Fn dirname ; -this should be taken into account when writing code which calls this function -if portability is desired. .Sh SEE ALSO .Xr basename 1 , .Xr dirname 1 , ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/msgsnd.3#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/msgsnd.3,v 1.20 2005/01/20 09:17:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/msgsnd.3,v 1.21 2006/10/12 11:42:41 ru Exp $ .\" -.Dd November 24, 1997 +.Dd October 12, 2006 .Dt MSGSND 3 .Os .Sh NAME @@ -65,8 +65,13 @@ is an integer greater than 0 that can be used for selecting messages (see .Xr msgrcv 3 ) , .Va mtext -is an array of bytes, with a size up to that of the system limit -.Pf ( Dv MSGMAX ) . +is an array of +.Fa msgsz +bytes. +The argument +.Fa msgsz +can range from 0 to a system-imposed maximum, +.Dv MSGMAX . .Pp If the number of bytes already on the message queue plus .Fa msgsz @@ -144,7 +149,7 @@ The .Fa msgsz argument -is less than 0, or greater than +is greater than .Va msg_qbytes . .Pp The ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/sys/i386_get_ldt.2#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)fork.2 6.5 (Berkeley) 3/10/91 -.\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.2,v 1.21 2004/07/02 19:07:30 ru Exp $ +.\" $FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.2,v 1.23 2006/10/13 20:34:44 ru Exp $ .\" -.Dd September 20, 1993 +.Dd October 14, 2006 .Dt I386_GET_LDT 2 .Os .Sh NAME @@ -52,24 +52,24 @@ The .Fn i386_get_ldt system call -will return the list of i386 descriptors that the process has in its +returns a list of the i386 descriptors in the current process' LDT. The .Fn i386_set_ldt system call -will set a list of i386 descriptors for the current process in its +sets a list of i386 descriptors in the current process' LDT. -Both routines accept a starting selector number -.Fa start_sel , -an array of memory that -will contain the descriptors to be set or returned -.Fa descs , -and the number of entries to set or return -.Fa num_sels . +For both routines, +.Fa start_sel +specifies the index of the selector in the LDT at which to begin and +.Fa descs +points to an array of +.Fa num_sels +descriptors to be set or returned. .Pp -The argument +Each entry in the .Fa descs -can be either segment_descriptor or gate_descriptor and are defined in +array can be either a segment_descriptor or gate_descriptor and are defined in .In i386/segments.h . These structures are defined by the architecture as disjoint bit-fields, so care must be taken in constructing them. @@ -113,9 +113,9 @@ The .Fn i386_set_ldt system call -returns the first selector set. -In the case when a descriptor is allocated by the kernel, its number will -be returned. +returns the first selector set on success. +If the kernel allocated a descriptor in the LDT, +the allocated index is returned. Otherwise, a value of -1 is returned and the global variable .Va errno ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/wctype.3#2 (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/locale/wctype.3,v 1.6 2005/07/21 10:32:17 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wctype.3,v 1.7 2006/10/13 16:11:12 ru Exp $ .\" .Dd March 27, 2004 .Dt WCTYPE 3 @@ -105,7 +105,7 @@ .St -p1003.1-2001 . The .Dq Li ideogram , -.Dq Li phonogram +.Dq Li phonogram , .Dq Li special , and .Dq Li rune ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/fpu/fpu_emu.h#2 (text+ko) ==== @@ -41,7 +41,7 @@ * * @(#)fpu_emu.h 8.1 (Berkeley) 6/11/93 * $NetBSD: fpu_emu.h,v 1.4 2000/08/03 18:32:07 eeh Exp $ - * $FreeBSD: src/lib/libc/sparc64/fpu/fpu_emu.h,v 1.4 2002/03/22 23:41:59 obrien Exp $ + * $FreeBSD: src/lib/libc/sparc64/fpu/fpu_emu.h,v 1.5 2006/10/12 04:38:41 kmacy Exp $ */ /* @@ -157,6 +157,7 @@ struct fpemu { u_long fe_fsr; /* fsr copy (modified during op) */ int fe_cx; /* exceptions */ + int pad; /* align access to following fields */ struct fpn fe_f1; /* operand 1 */ struct fpn fe_f2; /* operand 2, if required */ struct fpn fe_f3; /* available storage for result */ ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/freopen.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)freopen.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.13 2004/05/22 15:19:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.17 2006/10/16 14:31:56 ache Exp $"); #include "namespace.h" #include @@ -67,7 +67,9 @@ int dflags, flags, isopen, oflags, sverrno, wantfd; if ((flags = __sflags(mode, &oflags)) == 0) { + sverrno = errno; (void) fclose(fp); + errno = sverrno; return (NULL); } @@ -102,6 +104,8 @@ errno = EINVAL; return (NULL); } + if (fp->_flags & __SWR) + (void) __sflush(fp); if ((oflags ^ dflags) & O_APPEND) { dflags &= ~O_APPEND; dflags |= oflags & O_APPEND; @@ -114,15 +118,9 @@ } } if (oflags & O_TRUNC) - ftruncate(fp->_file, 0); - if (_fseeko(fp, 0, oflags & O_APPEND ? SEEK_END : SEEK_SET, - 0) < 0 && errno != ESPIPE) { - sverrno = errno; - fclose(fp); - FUNLOCKFILE(fp); - errno = sverrno; - return (NULL); - } + (void) ftruncate(fp->_file, (off_t)0); + if (!(oflags & O_APPEND)) + (void) _sseek(fp, (fpos_t)0, SEEK_SET); f = fp->_file; isopen = 0; wantfd = -1; @@ -192,8 +190,8 @@ if (f < 0) { /* did not get it after all */ fp->_flags = 0; /* set it free */ + FUNLOCKFILE(fp); errno = sverrno; /* restore in case _close clobbered */ - FUNLOCKFILE(fp); return (NULL); } @@ -216,6 +214,16 @@ fp->_write = __swrite; fp->_seek = __sseek; fp->_close = __sclose; + /* + * When opening in append mode, even though we use O_APPEND, + * we need to seek to the end so that ftell() gets the right + * answer. If the user then alters the seek pointer, or + * the file extends, this will fail, but there is not much + * we can do about this. (We could set __SAPP and check in + * fseek and ftell.) + */ + if (oflags & O_APPEND) + (void) _sseek(fp, (fpos_t)0, SEEK_END); FUNLOCKFILE(fp); return (fp); } ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/xprintf.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.3 2006/04/01 19:06:54 phk Exp $ + * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.4 2006/10/21 11:49:07 kib Exp $ */ #include @@ -261,7 +261,7 @@ static int -__v2printf(FILE *fp, const char *fmt0, unsigned pct, const va_list ap) +__v2printf(FILE *fp, const char *fmt0, unsigned pct, const va_list ap1) { struct printf_info *pi, *pil; const char *fmt; @@ -274,7 +274,9 @@ int ret = 0; int n; struct __printf_io io; + va_list ap; + va_copy(ap, ap1); __printf_init(&io); io.fp = fp; @@ -561,6 +563,7 @@ errx(1, "render[%c] = NULL", *fmt); } __printf_flush(&io); + va_end(ap); return (ret); } ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/getenv.3#2 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)getenv.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.18 2006/10/07 21:27:21 trhodes Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.19 2006/10/12 08:39:24 trhodes Exp $ .\" -.Dd December 11, 1993 +.Dd October 12, 2006 .Dt GETENV 3 .Os .Sh NAME @@ -75,6 +75,10 @@ .Fn getenv function obtains the current value of the environment variable, .Fa name . +The application should not modify the string pointed +to by the +.Fn getenv +function. .Pp The .Fn setenv ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/ffs.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ffs.3 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/string/ffs.3,v 1.9 2004/06/30 20:09:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/ffs.3,v 1.10 2006/10/12 15:08:41 ru Exp $ .\" -.Dd January 13, 2004 +.Dd October 12, 2006 .Dt FFS 3 .Os .Sh NAME @@ -60,7 +60,9 @@ .Fn ffs and .Fn ffsl -functions find the first bit set in +functions find the first bit set +(beginning with the least significant bit) +in .Fa value and return the index of that bit. .Pp @@ -72,8 +74,7 @@ .Fa value and return the index of that bit. .Pp -Bits are numbered starting from 1, starting at the right-most -(least significant) bit. +Bits are numbered starting at 1 (the least significant bit). A return value of zero from any of these functions means that the argument was zero. .Sh SEE ALSO ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.121 2006/03/13 01:15:00 deischen Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.122 2006/10/12 13:46:33 ru Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -136,6 +136,8 @@ MLINKS+=pathconf.2 fpathconf.2 MLINKS+=read.2 pread.2 read.2 readv.2 read.2 preadv.2 MLINKS+=recv.2 recvfrom.2 recv.2 recvmsg.2 +MLINKS+=select.2 FD_CLR.3 select.2 FD_ISSET.3 select.2 FD_SET.3 \ + select.2 FD_ZERO.3 MLINKS+=send.2 sendmsg.2 send.2 sendto.2 MLINKS+=setpgid.2 setpgrp.2 MLINKS+=setresuid.2 setresgid.2 setresuid.2 getresuid.2 setresuid.2 getresgid.2 ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/intro.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)intro.2 8.5 (Berkeley) 2/27/95 -.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.46 2005/11/19 11:30:55 simon Exp $ +.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.47 2006/10/12 20:50:26 ru Exp $ .\" .Dd February 27, 1995 .Dt INTRO 2 @@ -48,7 +48,7 @@ .\".Pp .\".Sy System call restart .\".Pp -.\" +.\"(more later...) .Sh RETURN VALUES Nearly all of the system calls provide an error number referenced via the external identifier errno. @@ -76,8 +76,8 @@ and sets the variable .Va errno accordingly. - +(This allows interpretation of the failure on receiving +a -1 and to take action accordingly.) Successful calls never set .Va errno ; once set, it remains until another error occurs. @@ -197,8 +197,8 @@ has been reached and a requests for an open cannot be satisfied until at least one has been closed. .It Er 24 EMFILE Em "Too many open files" . - +(As released, the limit on the number of +open files per process is 64.) The .Xr getdtablesize 2 system call will obtain the current limit. ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/read.2#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)read.2 8.4 (Berkeley) 2/26/94 -.\" $FreeBSD: src/lib/libc/sys/read.2,v 1.32 2005/11/17 13:00:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/read.2,v 1.34 2006/10/21 18:03:53 ru Exp $ .\" -.Dd July 29, 2005 +.Dd October 11, 2006 .Dt READ 2 .Os .Sh NAME @@ -169,8 +169,10 @@ .It Bq Er EIO An I/O error occurred while reading from the file system. .It Bq Er EINTR -A read from a slow device was interrupted before -any data arrived by the delivery of a signal. +A read from a slow device +(i.e.\& one that might block for an arbitrary amount of time) +was interrupted by the delivery of a signal +before any data arrived. .It Bq Er EINVAL The pointer associated with .Fa d ==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/stat.2#2 (text+ko) ==== @@ -30,9 +30,9 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 23 17:41:58 2006 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 556DA16A4C8; Mon, 23 Oct 2006 17:41:58 +0000 (UTC) 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 0141E16A4B3 for ; Mon, 23 Oct 2006 17:41:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A576743D5C for ; Mon, 23 Oct 2006 17:41:19 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9NHfJF5091638 for ; Mon, 23 Oct 2006 17:41:19 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9NHfJ9f091602 for perforce@freebsd.org; Mon, 23 Oct 2006 17:41:19 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 23 Oct 2006 17:41:19 GMT Message-Id: <200610231741.k9NHfJ9f091602@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 108314 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, 23 Oct 2006 17:41:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=108314 Change 108314 by hselasky@hselasky_mini_itx on 2006/10/23 17:40:38 Make sure that "qh_self" is printed out correctly on big-endian machines. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhci.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#13 (text+ko) ==== @@ -531,7 +531,7 @@ uhci_dump_qh(uhci_qh_t *sqh) { DPRINTFN(-1,("QH(%p) at 0x%08x: h_next=%08x e_next=%08x\n", sqh, - sqh->qh_self, le32toh(sqh->qh_h_next), + le32toh(sqh->qh_self), le32toh(sqh->qh_h_next), le32toh(sqh->qh_e_next))); return; } From owner-p4-projects@FreeBSD.ORG Mon Oct 23 23:53:09 2006 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 1735916A407; Mon, 23 Oct 2006 23:53:09 +0000 (UTC) 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 CE27F16A415 for ; Mon, 23 Oct 2006 23:53:08 +0000 (UTC) (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 9955C43D5A for ; Mon, 23 Oct 2006 23:53:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9NNr81J059679 for ; Mon, 23 Oct 2006 23:53:08 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9NNr8DS059625 for perforce@freebsd.org; Mon, 23 Oct 2006 23:53:08 GMT (envelope-from imp@freebsd.org) Date: Mon, 23 Oct 2006 23:53:08 GMT Message-Id: <200610232353.k9NNr8DS059625@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 108327 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, 23 Oct 2006 23:53:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=108327 Change 108327 by imp@imp_lighthouse on 2006/10/23 23:52:25 These values are effectively hard-wired for the at91. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/std.at91#3 edit .. //depot/projects/arm/src/sys/arm/at91/std.kb920x#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/std.at91#3 (text) ==== @@ -3,3 +3,8 @@ files "../at91/files.at91" cpu CPU_ARM9 makeoptions CONF_CFLAGS=-mcpu=arm9 +makeoptions KERNPHYSADDR=0x20000000 +makeoptions KERNVIRTADDR=0xc0000000 +options KERNPHYSADDR=0x20000000 +options KERNVIRTADDR=0xc0000000 +options PHYSADDR=0x20000000 ==== //depot/projects/arm/src/sys/arm/at91/std.kb920x#5 (text+ko) ==== @@ -2,9 +2,4 @@ include "../at91/std.at91" files "../at91/files.kb920x" -makeoptions KERNPHYSADDR=0x20000000 -makeoptions KERNVIRTADDR=0xc0000000 -options KERNPHYSADDR=0x20000000 -options KERNVIRTADDR=0xc0000000 -options PHYSADDR=0x20000000 options STARTUP_PAGETABLE_ADDR=0x20800000 From owner-p4-projects@FreeBSD.ORG Tue Oct 24 03:03:42 2006 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 9A95116A4C8; Tue, 24 Oct 2006 03:03:42 +0000 (UTC) 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 5567D16A4A7; Tue, 24 Oct 2006 03:03:42 +0000 (UTC) (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 A90FE43D4C; Tue, 24 Oct 2006 03:03:41 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.13.4/8.13.4) with ESMTP id k9O32FMJ075497; Mon, 23 Oct 2006 21:02:15 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Mon, 23 Oct 2006 21:01:29 -0600 (MDT) Message-Id: <20061023.210129.-135506786.imp@bsdimp.com> To: gonzo@freebsd.org From: "M. Warner Losh" In-Reply-To: <4534ED30.4030500@freebsd.org> References: <200610131444.k9DEi74J035961@repoman.freebsd.org> <20061016.162545.179961016.imp@bsdimp.com> <4534ED30.4030500@freebsd.org> X-Mailer: Mew version 4.2 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]); Mon, 23 Oct 2006 21:02:15 -0600 (MDT) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 107824 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, 24 Oct 2006 03:03:42 -0000 In message: <4534ED30.4030500@freebsd.org> Oleksandr Tymoshenko writes: : M. Warner Losh wrote: : > In message: <200610131444.k9DEi74J035961@repoman.freebsd.org> : > Oleksandr Tymoshenko writes: : > : http://perforce.freebsd.org/chv.cgi?CH=107824 : > : : > : Change 107824 by gonzo@gonzo_hq on 2006/10/13 14:43:46 : > : : > : o Tweak exception handlers to conform new pmap model. Kernel map : > : works fine, userland still in action. : > : > Did this code come from the NetBSD code, or was it just the idea? : > Seems odd that these small changes would require adding a NetBSD : > license... : Code came from NetBSD source tree. Is there any place I can : read license policy? I mean it's clear when to put own copyright, but : there is no info when to put license to file with derived code. That's hard to know. Legally, once you get into the 90-95% range, you most likely have a whole new work (it depends, since once you get to that point, most of the code likely is insignficant or dictated by externalities, which isn't covered). If it is < 50%, then definitely you need something. Between these two ends is a judgement call. Is there any creative part to what you've included? If so, then include the license. Warner From owner-p4-projects@FreeBSD.ORG Tue Oct 24 07:09:09 2006 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 D553516A40F; Tue, 24 Oct 2006 07:09:08 +0000 (UTC) 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 9496F16A403 for ; Tue, 24 Oct 2006 07:09:08 +0000 (UTC) (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 4C9FF43D4C for ; Tue, 24 Oct 2006 07:09:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9O798Sm097718 for ; Tue, 24 Oct 2006 07:09:08 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9O7977w097670 for perforce@freebsd.org; Tue, 24 Oct 2006 07:09:07 GMT (envelope-from imp@freebsd.org) Date: Tue, 24 Oct 2006 07:09:07 GMT Message-Id: <200610240709.k9O7977w097670@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 108332 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, 24 Oct 2006 07:09:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=108332 Change 108332 by imp@imp_lighthouse on 2006/10/24 07:08:52 Do something, even if it is wrong, wrt obio Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91.c#22 edit .. //depot/projects/arm/src/sys/arm/at91/at91var.h#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91.c#22 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -171,7 +172,7 @@ static int at91_probe(device_t dev) { - device_set_desc(dev, "AT91RM9200 device bus"); + device_set_desc(dev, "AT91 device bus"); return (0); } @@ -216,7 +217,7 @@ return; } device_set_ivars(kid, ivar); - resource_list_init(&ivar->resources); + resource_list_init(&ivar->obio.resources); if (irq0 != -1) bus_set_resource(kid, SYS_RES_IRQ, 0, irq0, 1); if (irq1 != 0) @@ -403,28 +404,29 @@ int i; at91_softc = sc; + sc->obio.sc_bt = &at91_bs_tag; sc->sc_st = &at91_bs_tag; sc->sc_sh = AT91RM92_BASE; - sc->dev = dev; + sc->obio.dev = dev; 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"; + sc->obio.sc_irq_rman.rm_type = RMAN_ARRAY; + sc->obio.sc_irq_rman.rm_descr = "AT91RM92 IRQs"; + sc->obio.sc_mem_rman.rm_type = RMAN_ARRAY; + sc->obio.sc_mem_rman.rm_descr = "AT91RM92 Memory"; #if 0 sc->sc_usbmem_rman.rm_type = RMAN_ARRAY; sc->sc_usbmem_rman.rm_descr = "AT91RM92 USB Memory-mapped regs"; #endif - if (rman_init(&sc->sc_irq_rman) != 0 || - rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0) + if (rman_init(&sc->obio.sc_irq_rman) != 0 || + rman_manage_region(&sc->obio.sc_irq_rman, 1, 31) != 0) panic("at91_attach: failed to set up IRQ rman"); - if (rman_init(&sc->sc_mem_rman) != 0 || - rman_manage_region(&sc->sc_mem_rman, 0xdff00000ul, + if (rman_init(&sc->obio.sc_mem_rman) != 0 || + rman_manage_region(&sc->obio.sc_mem_rman, 0xdff00000ul, 0xdffffffful) != 0) panic("at91_attach: failed to set up memory rman"); - if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_OHCI_BASE, + if (rman_manage_region(&sc->obio.sc_mem_rman, AT91RM92_OHCI_BASE, AT91RM92_OHCI_BASE + AT91RM92_OHCI_SIZE - 1) != 0) panic("at91_attach: failed to set up ohci memory"); @@ -463,84 +465,6 @@ return (0); } -static struct resource * -at91_alloc_resource(device_t dev, device_t child, int type, int *rid, - u_long start, u_long end, u_long count, u_int flags) -{ - struct at91_softc *sc = device_get_softc(dev); - struct resource_list_entry *rle; - struct at91_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)); - - 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: -#if 0 - if (start >= 0x00300000 && start <= 0x003fffff) - rle->res = rman_reserve_resource(&sc->sc_usbmem_rman, - start, end, count, flags, child); - else -#endif - rle->res = rman_reserve_resource(&sc->sc_mem_rman, - start, end, count, flags, child); - rman_set_bustag(rle->res, &at91_bs_tag); - rman_set_bushandle(rle->res, start); - break; - } - if (rle->res) { - rle->start = rman_get_start(rle->res); - rle->end = rman_get_end(rle->res); - rle->count = count; - rman_set_rid(rle->res, *rid); - } - return (rle->res); -} - -static struct resource_list * -at91_get_resource_list(device_t dev, device_t child) -{ - struct at91_ivar *ivar; - - ivar = device_get_ivars(child); - return (&(ivar->resources)); -} - -static int -at91_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 = at91_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 at91_setup_intr(device_t dev, device_t child, struct resource *ires, int flags, driver_intr_t *intr, void *arg, @@ -568,48 +492,6 @@ return (BUS_TEARDOWN_INTR(device_get_parent(dev), child, res, cookie)); } -static int -at91_activate_resource(device_t bus, device_t child, int type, int rid, - struct resource *r) -{ -#if 0 - u_long p; - int error; - - if (type == SYS_RES_MEMORY) { - error = bus_space_map(rman_get_bustag(r), - rman_get_bushandle(r), rman_get_size(r), 0, &p); - if (error) - return (error); - rman_set_bushandle(r, p); - } -#endif - return (rman_activate_resource(r)); -} - -static int -at91_print_child(device_t dev, device_t child) -{ - struct at91_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) { @@ -654,16 +536,16 @@ DEVMETHOD(device_attach, at91_attach), DEVMETHOD(device_identify, at91_identify), - DEVMETHOD(bus_alloc_resource, at91_alloc_resource), + DEVMETHOD(bus_alloc_resource, obio_alloc_resource), DEVMETHOD(bus_setup_intr, at91_setup_intr), DEVMETHOD(bus_teardown_intr, at91_teardown_intr), - DEVMETHOD(bus_activate_resource, at91_activate_resource), + DEVMETHOD(bus_activate_resource, obio_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), - DEVMETHOD(bus_get_resource_list,at91_get_resource_list), + DEVMETHOD(bus_get_resource_list,obio_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, at91_release_resource), - DEVMETHOD(bus_print_child, at91_print_child), + DEVMETHOD(bus_release_resource, obio_release_resource), + DEVMETHOD(bus_print_child, obio_print_child), {0, 0}, }; ==== //depot/projects/arm/src/sys/arm/at91/at91var.h#5 (text+ko) ==== @@ -28,18 +28,17 @@ #define _AT91VAR_H_ #include +#include struct at91_softc { - device_t dev; + struct obio_softc obio; bus_space_tag_t sc_st; bus_space_handle_t sc_sh; bus_space_handle_t sc_sys_sh; - struct rman sc_irq_rman; - struct rman sc_mem_rman; }; struct at91_ivar { - struct resource_list resources; + struct obio_ivar obio; }; From owner-p4-projects@FreeBSD.ORG Tue Oct 24 07:10:24 2006 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 A767316A47E; Tue, 24 Oct 2006 07:10:23 +0000 (UTC) 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 81B1716A412 for ; Tue, 24 Oct 2006 07:10:23 +0000 (UTC) (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 25FE143D5D for ; Tue, 24 Oct 2006 07:10:10 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9O7AAH3005039 for ; Tue, 24 Oct 2006 07:10:10 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9O7A9do005004 for perforce@freebsd.org; Tue, 24 Oct 2006 07:10:09 GMT (envelope-from imp@freebsd.org) Date: Tue, 24 Oct 2006 07:10:09 GMT Message-Id: <200610240710.k9O7A9do005004@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 108333 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, 24 Oct 2006 07:10:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=108333 Change 108333 by imp@imp_lighthouse on 2006/10/24 07:09:38 Do something, even if it is wrong, wrt obio. Affected files ... .. //depot/projects/arm/src/sys/conf/files#49 edit .. //depot/projects/arm/src/sys/kern/subr_obio.c#1 add .. //depot/projects/arm/src/sys/sys/obio.h#1 add Differences ... ==== //depot/projects/arm/src/sys/conf/files#49 (text+ko) ==== @@ -1384,6 +1384,7 @@ kern/subr_mchain.c optional libmchain kern/subr_module.c standard kern/subr_msgbuf.c standard +kern/subr_obio.c standard kern/subr_param.c standard kern/subr_pcpu.c standard kern/subr_power.c standard From owner-p4-projects@FreeBSD.ORG Tue Oct 24 07:10:24 2006 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 E763716A51B; Tue, 24 Oct 2006 07:10:23 +0000 (UTC) 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 8667816A415 for ; Tue, 24 Oct 2006 07:10:23 +0000 (UTC) (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 6111D43D5E for ; Tue, 24 Oct 2006 07:10:10 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9O7AACA005075 for ; Tue, 24 Oct 2006 07:10:10 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9O7AAMp005057 for perforce@freebsd.org; Tue, 24 Oct 2006 07:10:10 GMT (envelope-from imp@freebsd.org) Date: Tue, 24 Oct 2006 07:10:10 GMT Message-Id: <200610240710.k9O7AAMp005057@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 108334 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, 24 Oct 2006 07:10:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=108334 Change 108334 by imp@imp_lighthouse on 2006/10/24 07:10:01 Suffle the deckchairs. You need a new config for this titanic. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/hints.at91rm9200#2 delete .. //depot/projects/arm/src/sys/arm/at91/hints.at91sam9261#2 delete .. //depot/projects/arm/src/sys/arm/conf/TSC4370#16 edit .. //depot/projects/arm/src/sys/arm/conf/hints.at91rm9200#1 add .. //depot/projects/arm/src/sys/arm/conf/hints.at91sam9261#1 add Differences ... ==== //depot/projects/arm/src/sys/arm/conf/TSC4370#16 (text+ko) ==== @@ -25,8 +25,7 @@ options AT91_TSC include "../at91/std.kb920x" #To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" #Default places to look for devices. -#hints "KB920X.hints" #Default places to look for devices. +hints "hints.at91rm9200" hints "TSC4370.hints" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols From owner-p4-projects@FreeBSD.ORG Tue Oct 24 16:36:34 2006 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 79A4F16A530; Tue, 24 Oct 2006 16:36:34 +0000 (UTC) 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 3BB9616A4A7 for ; Tue, 24 Oct 2006 16:36:34 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39F3743DFC for ; Tue, 24 Oct 2006 16:34:16 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9OGYAUt017308 for ; Tue, 24 Oct 2006 16:34:10 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9OGYANn017302 for perforce@freebsd.org; Tue, 24 Oct 2006 16:34:10 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 24 Oct 2006 16:34:10 GMT Message-Id: <200610241634.k9OGYANn017302@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 108354 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, 24 Oct 2006 16:36:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=108354 Change 108354 by mjacob@newisp on 2006/10/24 16:33:32 Make fields broad enough to have > 16 seconds worth of (usec defined) timeouts. Affected files ... .. //depot/projects/newisp/dev/isp/isp.c#23 edit .. //depot/projects/newisp/dev/isp/ispreg.h#7 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp.c#23 (text+ko) ==== @@ -3139,6 +3139,7 @@ mbs.param[6] = DMA_WD3(fcp->isp_scdma); mbs.param[7] = DMA_WD2(fcp->isp_scdma); mbs.logval = MBLOGALL; + mbs.timeout = 1000000; isp_mboxcmd(isp, &mbs); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { if (mbs.param[0] == MBOX_INVALID_COMMAND) { @@ -3786,6 +3787,7 @@ mbs.param[6] = DMA_WD3(fcp->isp_scdma); mbs.param[7] = DMA_WD2(fcp->isp_scdma); mbs.logval = MBLOGALL; + mbs.timeout = 1000000; MEMORYBARRIER(isp, SYNC_SFORDEV, 0, SNS_RFT_ID_REQ_SIZE); isp_mboxcmd(isp, &mbs); FC_SCRATCH_RELEASE(isp); ==== //depot/projects/newisp/dev/isp/ispreg.h#7 (text+ko) ==== @@ -467,9 +467,9 @@ uint16_t param[MAILBOX_STORAGE]; uint16_t ibits; uint16_t obits; - uint32_t - timeout : 28, + uint32_t : 28, logval : 4; + uint32_t timeout; } mbreg_t; /* From owner-p4-projects@FreeBSD.ORG Tue Oct 24 22:33:49 2006 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 A10DB16A47C; Tue, 24 Oct 2006 22:33:49 +0000 (UTC) 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 7BEDB16A417 for ; Tue, 24 Oct 2006 22:33:49 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41F6943D45 for ; Tue, 24 Oct 2006 22:33:49 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9OMXnUY096915 for ; Tue, 24 Oct 2006 22:33:49 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9OMXmdE096912 for perforce@freebsd.org; Tue, 24 Oct 2006 22:33:48 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 24 Oct 2006 22:33:48 GMT Message-Id: <200610242233.k9OMXmdE096912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 108362 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, 24 Oct 2006 22:33:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=108362 Change 108362 by gonzo@gonzo_hq on 2006/10/24 22:33:25 o Set argc & argv for __start function. o Get env and environ variables from argc & argv values. Affected files ... .. //depot/projects/mips2/src/lib/csu/mips/crt1.c#2 edit Differences ... ==== //depot/projects/mips2/src/lib/csu/mips/crt1.c#2 (text+ko) ==== @@ -51,6 +51,7 @@ #include "crtbrand.c" #include +typedef void (*fptr)(void); struct Struct_Obj_Entry; struct ps_strings; @@ -72,24 +73,34 @@ char **environ; const char *__progname = ""; -struct ps_strings *__ps_strings; /* The entry function. */ __asm(" .text \n" " .align 8 \n" " .globl _start \n" " _start: \n" -" /* TODO: Get argc, argv, and envp from stack */ \n" +" /* Get argc, argv from stack */ \n" +" \n" +" /* lw a0, -32(sp) */\n" +" /* move a1, sp */\n" +" /* addu a1, 32 + 4 */\n" +" \n" +" lw $4, -32($29) \n" +" move $5, $29 \n" +" addu $5, 36 \n" " /* TODO: Ensure the stack is properly aligned before calling C code. */\n" "\n" " j __start "); /* ARGSUSED */ void -__start(int argc, char **argv, char **env, struct ps_strings *ps_strings, - const struct Struct_Obj_Entry *obj __unused, void (*cleanup)(void)) +__start(int argc, char **argv) { + char **env; const char *s; + /* XXXMIPS: proper set a cleanup procedure */ + fptr cleanup = NULL; + env = argv + argc + 1; environ = env; if (argc > 0 && argv[0] != NULL) { @@ -99,9 +110,6 @@ __progname = s + 1; } - if (ps_strings != (struct ps_strings *)0) - __ps_strings = ps_strings; - if (&_DYNAMIC != NULL) atexit(cleanup); else From owner-p4-projects@FreeBSD.ORG Tue Oct 24 23:30:20 2006 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 194DD16A4EB; Tue, 24 Oct 2006 23:30:20 +0000 (UTC) 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 A3EF616A4DA for ; Tue, 24 Oct 2006 23:30:19 +0000 (UTC) (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 53D0C43D76 for ; Tue, 24 Oct 2006 23:30:05 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9ONU5R7006271 for ; Tue, 24 Oct 2006 23:30:05 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9ONU4GF006262 for perforce@freebsd.org; Tue, 24 Oct 2006 23:30:04 GMT (envelope-from marcel@freebsd.org) Date: Tue, 24 Oct 2006 23:30:04 GMT Message-Id: <200610242330.k9ONU4GF006262@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 108372 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, 24 Oct 2006 23:30:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=108372 Change 108372 by marcel@marcel_cluster on 2006/10/24 23:29:56 i386 build fixes. Affected files ... .. //depot/projects/ia64/sys/boot/efi/include/i386/efibind.h#4 edit .. //depot/projects/ia64/sys/boot/efi/libefi/efinet.c#7 edit .. //depot/projects/ia64/sys/boot/efi/libefi/libefi.c#8 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/include/i386/efibind.h#4 (text+ko) ==== @@ -18,61 +18,9 @@ --*/ -#pragma pack() +#include - -/* - * Basic int types of various widths - */ - -#if (__STDC_VERSION__ < 199901L ) - -/* No ANSI C 1999/2000 stdint.h integer width declarations */ - - #if _MSC_EXTENSIONS - -/* Use Microsoft C compiler integer width declarations */ - - typedef unsigned __int64 uint64_t; - typedef __int64 int64_t; - typedef unsigned __int32 uint32_t; - typedef __int32 int32_t; - typedef unsigned short uint16_t; - typedef short int16_t; - typedef unsigned char uint8_t; - typedef char int8_t; - #else - #ifdef UNIX_LP64 - -/* Use LP64 programming model from C_FLAGS for integer width declarations */ - - typedef unsigned long uint64_t; - typedef long int64_t; - typedef unsigned int uint32_t; - typedef int int32_t; - typedef unsigned short uint16_t; - typedef short int16_t; - typedef unsigned char uint8_t; - typedef char int8_t; - #else - -/* Assume P64 programming model from C_FLAGS for integer width declarations */ - - typedef unsigned long long uint64_t; - typedef long long int64_t; - typedef unsigned int uint32_t; - typedef int int32_t; - typedef unsigned short uint16_t; - typedef short int16_t; - typedef unsigned char uint8_t; - typedef char int8_t; - #endif - #endif -#endif - -/* - * Basic EFI types of various widths - */ +/* Basic EFI types of various widths. */ typedef uint64_t UINT64; typedef int64_t INT64; ==== //depot/projects/ia64/sys/boot/efi/libefi/efinet.c#7 (text+ko) ==== @@ -166,7 +166,7 @@ status = net->Start(net); if (status != EFI_SUCCESS) { printf("net%d: cannot start interface (status=%ld)\n", - nif->nif_unit, status); + nif->nif_unit, (long)status); return; } } @@ -175,7 +175,7 @@ status = net->Initialize(net, 0, 0); if (status != EFI_SUCCESS) { printf("net%d: cannot init. interface (status=%ld)\n", - nif->nif_unit, status); + nif->nif_unit, (long)status); return; } } @@ -187,7 +187,7 @@ status = net->ReceiveFilters(net, mask, 0, FALSE, 0, 0); if (status != EFI_SUCCESS) { printf("net%d: cannot set rx. filters (status=%ld)\n", - nif->nif_unit, status); + nif->nif_unit, (long)status); return; } } ==== //depot/projects/ia64/sys/boot/efi/libefi/libefi.c#8 (text+ko) ==== @@ -98,7 +98,7 @@ if (status != EFI_SUCCESS) BS->Exit(IH, status, 0, NULL); - setheap((void *)heap, (void *)(heap + heapsize)); + setheap((void *)(uintptr_t)heap, (void *)(uintptr_t)(heap + heapsize)); /* Use exit() from here on... */ From owner-p4-projects@FreeBSD.ORG Wed Oct 25 00:09:00 2006 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 AE5EE16A40F; Wed, 25 Oct 2006 00:09:00 +0000 (UTC) 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 5A73B16A403 for ; Wed, 25 Oct 2006 00:09:00 +0000 (UTC) (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 2050043D5A for ; Wed, 25 Oct 2006 00:09:00 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9P090hd013848 for ; Wed, 25 Oct 2006 00:09:00 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9P08uIs013845 for perforce@freebsd.org; Wed, 25 Oct 2006 00:08:56 GMT (envelope-from cognet@freebsd.org) Date: Wed, 25 Oct 2006 00:08:56 GMT Message-Id: <200610250008.k9P08uIs013845@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 108378 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, 25 Oct 2006 00:09:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=108378 Change 108378 by cognet@cognet on 2006/10/25 00:08:10 IFC Affected files ... .. //depot/projects/arm/src/ObsoleteFiles.inc#8 integrate .. //depot/projects/arm/src/bin/cp/cp.1#4 integrate .. //depot/projects/arm/src/etc/pf.os#2 integrate .. //depot/projects/arm/src/etc/rc.d/auto_linklocal#2 integrate .. //depot/projects/arm/src/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/Makefile#4 integrate .. //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/kgdb.1#3 integrate .. //depot/projects/arm/src/lib/libc/resolv/res_send.c#3 integrate .. //depot/projects/arm/src/lib/libc/stdio/xprintf.c#2 integrate .. //depot/projects/arm/src/lib/libc/sys/read.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/write.2#2 integrate .. //depot/projects/arm/src/lib/libthread_db/thread_db.c#2 integrate .. //depot/projects/arm/src/lib/libvgl/vgl.3#2 integrate .. //depot/projects/arm/src/release/Makefile#5 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#15 integrate .. //depot/projects/arm/src/sbin/adjkerntz/adjkerntz.c#2 integrate .. //depot/projects/arm/src/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/arm/src/sbin/devd/devd.conf.5#3 integrate .. //depot/projects/arm/src/sbin/mdmfs/mdmfs.8#3 integrate .. //depot/projects/arm/src/sbin/mount/mount.c#2 integrate .. //depot/projects/arm/src/share/man/man4/if_bridge.4#6 integrate .. //depot/projects/arm/src/share/man/man4/ng_pppoe.4#5 integrate .. //depot/projects/arm/src/share/man/man4/ng_source.4#2 integrate .. //depot/projects/arm/src/share/man/man4/sis.4#3 integrate .. //depot/projects/arm/src/share/man/man4/syscons.4#3 integrate .. //depot/projects/arm/src/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/arm/src/share/man/man7/ports.7#3 integrate .. //depot/projects/arm/src/share/man/man8/intro.8#2 integrate .. //depot/projects/arm/src/share/man/man9/zone.9#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#25 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/arm/src/sys/amd64/conf/NOTES#13 integrate .. //depot/projects/arm/src/sys/arm/arm/cpufunc.c#10 integrate .. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#13 integrate .. //depot/projects/arm/src/sys/arm/arm/nexus_io.c#2 integrate .. //depot/projects/arm/src/sys/arm/arm/trap.c#12 integrate .. //depot/projects/arm/src/sys/arm/arm/undefined.c#9 integrate .. //depot/projects/arm/src/sys/arm/arm/vm_machdep.c#9 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/sa11x0.c#4 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/sa11x0_io.c#5 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/sa11x0_irqhandler.c#6 integrate .. //depot/projects/arm/src/sys/arm/sa11x0/sa11x0_ost.c#3 integrate .. //depot/projects/arm/src/sys/boot/arm/Makefile#3 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#23 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#19 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.c#16 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#19 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#14 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#10 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.c#11 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#24 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#18 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#18 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#18 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#18 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#18 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#19 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_file.c#8 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_getcwd.c#6 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#15 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_stats.c#10 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_misc.c#7 integrate .. //depot/projects/arm/src/sys/conf/NOTES#35 integrate .. //depot/projects/arm/src/sys/conf/files#50 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#18 integrate .. //depot/projects/arm/src/sys/conf/files.i386#20 integrate .. //depot/projects/arm/src/sys/conf/files.ia64#8 integrate .. //depot/projects/arm/src/sys/conf/files.pc98#11 integrate .. //depot/projects/arm/src/sys/conf/files.powerpc#12 integrate .. //depot/projects/arm/src/sys/conf/files.sparc64#7 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/arm/src/sys/crypto/sha2/sha2.c#3 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bce.c#9 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/arm/src/sys/dev/iwi/if_iwi.c#10 integrate .. //depot/projects/arm/src/sys/dev/iwi/if_iwireg.h#6 integrate .. //depot/projects/arm/src/sys/dev/ubsec/ubsec.c#9 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_devs.c#8 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_vnops.c#11 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/denode.h#5 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/direntry.h#3 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_conv.c#6 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_denode.c#6 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/arm/src/sys/fs/ntfs/ntfs_vnops.c#6 integrate .. //depot/projects/arm/src/sys/fs/nwfs/nwfs_subr.c#4 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_subr.c#4 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#20 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#22 integrate .. //depot/projects/arm/src/sys/i386/i386/sys_machdep.c#5 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_misc.c#5 integrate .. //depot/projects/arm/src/sys/ia64/conf/NOTES#7 integrate .. //depot/projects/arm/src/sys/ia64/ia64/nexus.c#5 integrate .. //depot/projects/arm/src/sys/ia64/ia64/pmap.c#10 integrate .. //depot/projects/arm/src/sys/kern/init_main.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_acct.c#10 integrate .. //depot/projects/arm/src/sys/kern/kern_acl.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_alq.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_environment.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#13 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#18 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_jail.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_ktrace.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_linker.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_mac.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_mbuf.c#12 integrate .. //depot/projects/arm/src/sys/kern/kern_prot.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#15 integrate .. //depot/projects/arm/src/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_time.c#10 integrate .. //depot/projects/arm/src/sys/kern/link_elf.c#6 integrate .. //depot/projects/arm/src/sys/kern/link_elf_obj.c#5 integrate .. //depot/projects/arm/src/sys/kern/subr_fattime.c#1 branch .. //depot/projects/arm/src/sys/kern/subr_trap.c#6 integrate .. //depot/projects/arm/src/sys/kern/sys_pipe.c#6 integrate .. //depot/projects/arm/src/sys/kern/sys_socket.c#5 integrate .. //depot/projects/arm/src/sys/kern/sysv_msg.c#4 integrate .. //depot/projects/arm/src/sys/kern/sysv_sem.c#7 integrate .. //depot/projects/arm/src/sys/kern/sysv_shm.c#6 integrate .. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#14 integrate .. //depot/projects/arm/src/sys/kern/uipc_mbuf2.c#3 integrate .. //depot/projects/arm/src/sys/kern/uipc_sem.c#6 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#25 integrate .. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#16 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#19 integrate .. //depot/projects/arm/src/sys/kern/vfs_bio.c#13 integrate .. //depot/projects/arm/src/sys/kern/vfs_cluster.c#6 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#21 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#26 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#20 integrate .. //depot/projects/arm/src/sys/kern/vfs_vnops.c#11 integrate .. //depot/projects/arm/src/sys/net/bpf.c#14 integrate .. //depot/projects/arm/src/sys/net/bsd_comp.c#3 integrate .. //depot/projects/arm/src/sys/net/if.c#15 integrate .. //depot/projects/arm/src/sys/net/if_atmsubr.c#4 integrate .. //depot/projects/arm/src/sys/net/if_ethersubr.c#15 integrate .. //depot/projects/arm/src/sys/net/if_fddisubr.c#4 integrate .. //depot/projects/arm/src/sys/net/if_fwsubr.c#5 integrate .. //depot/projects/arm/src/sys/net/if_gif.c#11 integrate .. //depot/projects/arm/src/sys/net/if_iso88025subr.c#4 integrate .. //depot/projects/arm/src/sys/net/if_ppp.c#7 integrate .. //depot/projects/arm/src/sys/net/if_stf.c#8 integrate .. //depot/projects/arm/src/sys/net/if_tun.c#6 integrate .. //depot/projects/arm/src/sys/netatalk/aarp.c#4 integrate .. //depot/projects/arm/src/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/arm/src/sys/netatalk/ddp_output.c#4 integrate .. //depot/projects/arm/src/sys/netinet/if_ether.c#13 integrate .. //depot/projects/arm/src/sys/netinet/igmp.c#4 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#13 integrate .. //depot/projects/arm/src/sys/netinet/ip_divert.c#7 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#22 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw_pfil.c#6 integrate .. //depot/projects/arm/src/sys/netinet/ip_icmp.c#6 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#14 integrate .. //depot/projects/arm/src/sys/netinet/ip_mroute.c#9 integrate .. //depot/projects/arm/src/sys/netinet/ip_options.c#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_output.c#17 integrate .. //depot/projects/arm/src/sys/netinet/raw_ip.c#9 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#19 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#8 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#14 integrate .. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#13 integrate .. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#14 integrate .. //depot/projects/arm/src/sys/netinet6/nd6.c#9 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_srvsock.c#8 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_syscalls.c#5 integrate .. //depot/projects/arm/src/sys/pc98/conf/NOTES#14 integrate .. //depot/projects/arm/src/sys/pci/agp.c#7 integrate .. //depot/projects/arm/src/sys/powerpc/conf/NOTES#5 integrate .. //depot/projects/arm/src/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/arm/src/sys/security/mac/mac_inet.c#4 integrate .. //depot/projects/arm/src/sys/security/mac/mac_label.c#2 integrate .. //depot/projects/arm/src/sys/security/mac/mac_net.c#4 integrate .. //depot/projects/arm/src/sys/security/mac/mac_pipe.c#3 integrate .. //depot/projects/arm/src/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/arm/src/sys/security/mac/mac_process.c#5 integrate .. //depot/projects/arm/src/sys/security/mac/mac_socket.c#4 integrate .. //depot/projects/arm/src/sys/security/mac/mac_system.c#3 integrate .. //depot/projects/arm/src/sys/security/mac/mac_sysv_msg.c#4 integrate .. //depot/projects/arm/src/sys/security/mac/mac_sysv_sem.c#4 integrate .. //depot/projects/arm/src/sys/security/mac/mac_sysv_shm.c#3 integrate .. //depot/projects/arm/src/sys/security/mac/mac_vfs.c#6 integrate .. //depot/projects/arm/src/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/conf/NOTES#9 integrate .. //depot/projects/arm/src/sys/sun4v/conf/NOTES#3 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/arm/src/sys/sys/clock.h#4 integrate .. //depot/projects/arm/src/sys/sys/mac.h#5 integrate .. //depot/projects/arm/src/sys/sys/mac_policy.h#8 integrate .. //depot/projects/arm/src/sys/sys/queue.h#8 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#17 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_vnops.c#10 integrate .. //depot/projects/arm/src/sys/vm/device_pager.c#4 integrate .. //depot/projects/arm/src/sys/vm/phys_pager.c#2 integrate .. //depot/projects/arm/src/sys/vm/swap_pager.c#8 integrate .. //depot/projects/arm/src/sys/vm/vm_contig.c#10 integrate .. //depot/projects/arm/src/sys/vm/vm_fault.c#14 integrate .. //depot/projects/arm/src/sys/vm/vm_glue.c#5 integrate .. //depot/projects/arm/src/sys/vm/vm_kern.c#2 integrate .. //depot/projects/arm/src/sys/vm/vm_map.c#11 integrate .. //depot/projects/arm/src/sys/vm/vm_mmap.c#6 integrate .. //depot/projects/arm/src/sys/vm/vm_object.c#15 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#21 integrate .. //depot/projects/arm/src/sys/vm/vm_page.h#9 integrate .. //depot/projects/arm/src/sys/vm/vm_pageout.c#8 integrate .. //depot/projects/arm/src/usr.bin/quota/Makefile#2 integrate .. //depot/projects/arm/src/usr.bin/quota/quota.1#2 integrate .. //depot/projects/arm/src/usr.bin/quota/quota.c#2 integrate .. //depot/projects/arm/src/usr.bin/su/su.c#4 integrate .. //depot/projects/arm/src/usr.bin/tail/forward.c#2 integrate .. //depot/projects/arm/src/usr.bin/vmstat/vmstat.8#3 integrate .. //depot/projects/arm/src/usr.bin/vmstat/vmstat.c#2 integrate .. //depot/projects/arm/src/usr.sbin/config/config.5#3 integrate .. //depot/projects/arm/src/usr.sbin/config/config.8#3 integrate .. //depot/projects/arm/src/usr.sbin/config/config.h#5 integrate .. //depot/projects/arm/src/usr.sbin/config/config.y#7 integrate .. //depot/projects/arm/src/usr.sbin/config/main.c#6 integrate .. //depot/projects/arm/src/usr.sbin/config/mkmakefile.c#8 integrate .. //depot/projects/arm/src/usr.sbin/freebsd-update/freebsd-update.sh#3 integrate .. //depot/projects/arm/src/usr.sbin/portsnap/portsnap/portsnap.sh#2 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/dist.c#2 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/install.c#3 integrate .. //depot/projects/arm/src/usr.sbin/sysinstall/sysinstall.h#2 integrate Differences ... ==== //depot/projects/arm/src/ObsoleteFiles.inc#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.55 2006/10/01 17:48:43 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.56 2006/10/21 14:19:52 ru Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20061018: pccardc removed +OLD_FILES+=usr/sbin/pccardc usr/share/man/man8/pccardc.8.gz # 20060930: demangle.h from contrib/libstdc++/include/ext/ OLD_FILES+=usr/include/c++/3.4/ext/demangle.h # 20060929: mrouted removed ==== //depot/projects/arm/src/bin/cp/cp.1#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.36 2006/10/07 22:14:43 trhodes Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.37 2006/10/24 18:42:42 trhodes Exp $ .\" -.Dd October 7, 2006 +.Dd October 24, 2006 .Dt CP 1 .Os .Sh NAME @@ -251,38 +251,28 @@ utility had a .Fl r option. -This implementation supports that option, however, its use is strongly -discouraged as its behavior is very implementation dependent. -In this version of +This implementation supports that option, however, its behavior +is different from historical +.Fx +behavior. +Use +of this option +is strongly discouraged as the behavior is +implementation-dependent. +In this implementation of .Nm , .Fl r -is just a synonym for -.Fl RL . -The -.Fl R -option gives the correct behavior while -.Fl L -preserves the sometimes-useful historical behavior of following symbolic links. -The +works alike +.Fl RL +thus all files, including special files, are copied +in a manner similar to normal files. +Data within these special files +will not be copied, only the file itself. +Historical implemenations +of .Fl r -option is deprecated in -.Tn POSIX - and its behavior is likely to be different -in future versions of -.Nm -and its behavior is likely to be different -in future versions of -.Fx . -Previous versions of -.Nm -in -.Fx , -the -.Fl r -behavior was to not correctly copy special files, symbolic links -or fifos. -Symbolic links were followed, and the contents of special -files and fifos were copied to regular files. +differ as they could copy the internal contents of special +files while recreating a hierarchy. .Pp The .Fl v ==== //depot/projects/arm/src/etc/pf.os#2 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/etc/pf.os,v 1.3 2004/09/14 00:30:14 mlaier Exp $ -# $OpenBSD: pf.os,v 1.17 2004/04/28 01:01:27 deraadt Exp $ +# $FreeBSD: src/etc/pf.os,v 1.4 2006/10/23 05:09:44 delphij Exp $ +# $OpenBSD: pf.os,v 1.21 2006/07/28 21:51:12 david Exp $ # passive OS fingerprinting # ------------------------- # @@ -223,9 +223,10 @@ S4:64:1:60:M1360,S,T,N,W0: Linux:google::Linux (Google crawlbot) S2:64:1:60:M*,S,T,N,W0: Linux:2.4::Linux 2.4 (big boy) -S3:64:1:60:M*,S,T,N,W0: Linux:2.4:18-21:Linux 2.4.18 and newer -S4:64:1:60:M*,S,T,N,W0: Linux:2.4::Linux 2.4/2.6 -S4:64:1:60:M*,S,T,N,W0: Linux:2.6::Linux 2.4/2.6 +S3:64:1:60:M*,S,T,N,W0: Linux:2.4:.18-21:Linux 2.4.18 and newer +S4:64:1:60:M*,S,T,N,W0: Linux:2.4::Linux 2.4/2.6 <= 2.6.7 +S4:64:1:60:M*,S,T,N,W0: Linux:2.6:.1-7:Linux 2.4/2.6 <= 2.6.7 +S4:64:1:60:M*,S,T,N,W7: Linux:2.6:8:Linux 2.6.8 and newer (?) S3:64:1:60:M*,S,T,N,W1: Linux:2.5::Linux 2.5 (sometimes 2.4) S4:64:1:60:M*,S,T,N,W1: Linux:2.5-2.6::Linux 2.5/2.6 @@ -260,27 +261,28 @@ # ----------------- FreeBSD ----------------- -16384:64:1:44:M*: FreeBSD:2.0-2.2::FreeBSD 2.0-4.1 -16384:64:1:44:M*: FreeBSD:3.0-3.5::FreeBSD 2.0-4.1 -16384:64:1:44:M*: FreeBSD:4.0-4.1::FreeBSD 2.0-4.1 +16384:64:1:44:M*: FreeBSD:2.0-2.2::FreeBSD 2.0-4.2 +16384:64:1:44:M*: FreeBSD:3.0-3.5::FreeBSD 2.0-4.2 +16384:64:1:44:M*: FreeBSD:4.0-4.2::FreeBSD 2.0-4.2 16384:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.4::FreeBSD 4.4 1024:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.4::FreeBSD 4.4 57344:64:1:44:M*: FreeBSD:4.6-4.8:noRFC1323:FreeBSD 4.6-4.8 (no RFC1323) -57344:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.6-4.8::FreeBSD 4.6-4.8 +57344:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.6-4.9::FreeBSD 4.6-4.9 -32768:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.8-4.9::FreeBSD 4.8-5.1 (or MacOS X) +32768:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.8-4.11::FreeBSD 4.8-5.1 (or MacOS X) 32768:64:1:60:M*,N,W0,N,N,T: FreeBSD:5.0-5.1::FreeBSD 4.8-5.1 (or MacOS X) -65535:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.8-4.9::FreeBSD 4.8-5.1 (or MacOS X) -65535:64:1:60:M*,N,W0,N,N,T: FreeBSD:5.0-5.1::FreeBSD 4.8-5.1 (or MacOS X) -65535:64:1:60:M*,N,W1,N,N,T: FreeBSD:4.7-4.9::FreeBSD 4.7-5.1 -65535:64:1:60:M*,N,W1,N,N,T: FreeBSD:5.0-5.1::FreeBSD 4.7-5.1 +65535:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.8-4.11::FreeBSD 4.8-5.2 (or MacOS X) +65535:64:1:60:M*,N,W0,N,N,T: FreeBSD:5.0-5.2::FreeBSD 4.8-5.2 (or MacOS X) +65535:64:1:60:M*,N,W1,N,N,T: FreeBSD:4.7-4.11::FreeBSD 4.7-5.2 +65535:64:1:60:M*,N,W1,N,N,T: FreeBSD:5.0-5.2::FreeBSD 4.7-5.2 # XXX need quirks support -# 65535:64:1:60:M*,N,W0,N,N,T:Z:FreeBSD:5.1-current (1) -# 65535:64:1:60:M*,N,W1,N,N,T:Z:FreeBSD:5.1-current (2) -# 65535:64:1:60:M*,N,W2,N,N,T:Z:FreeBSD:5.1-current (3) +# 65535:64:1:60:M*,N,W0,N,N,T:Z:FreeBSD:5.1-5.4::5.1-current (1) +# 65535:64:1:60:M*,N,W1,N,N,T:Z:FreeBSD:5.1-5.4::5.1-current (2) +# 65535:64:1:60:M*,N,W2,N,N,T:Z:FreeBSD:5.1-5.4::5.1-current (3) +# 65535:64:1:44:M*:Z:FreeBSD:5.2::FreeBSD 5.2 (no RFC1323) # 16384:64:1:60:M*,N,N,N,N,N,N,T:FreeBSD:4.4:noTS:FreeBSD 4.4 (w/o timestamps) @@ -297,12 +299,12 @@ # ----------------- OpenBSD ----------------- 16384:64:0:60:M*,N,W0,N,N,T: OpenBSD:2.6::NetBSD 1.3 (or OpenBSD 2.6) -16384:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.5::OpenBSD 3.0-3.5 -16384:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.5:no-df:OpenBSD 3.0-3.5 (scrub no-df) -57344:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-3.5::OpenBSD 3.3-3.5 -57344:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-3.5:no-df:OpenBSD 3.3-3.5 (scrub no-df) +16384:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-4.0::OpenBSD 3.0-4.0 +16384:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-4.0:no-df:OpenBSD 3.0-4.0 (scrub no-df) +57344:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-4.0::OpenBSD 3.3-4.0 +57344:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-4.0:no-df:OpenBSD 3.3-4.0 (scrub no-df) -65535:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.5:opera:OpenBSD 3.0-3.5 (Opera) +65535:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-4.0:opera:OpenBSD 3.0-4.0 (Opera) # ----------------- Solaris ----------------- @@ -317,7 +319,8 @@ 4096:64:0:44:M1460: SunOS:4.1::SunOS 4.1.x -S34:64:1:52:M*,N,W0,N,N,S: Solaris:10::Solaris 10 (beta) +S34:64:1:52:M*,N,W0,N,N,S: Solaris:10:beta:Solaris 10 (beta) +32850:64:1:64:M*,N,N,T,N,W1,N,N,S: Solaris:10::Solaris 10 1203 # ----------------- IRIX -------------------- @@ -329,6 +332,9 @@ 61440:64:0:48:M*,N,N,S: IRIX:6.5:12-21:IRIX 6.5.12 - 6.5.21 49152:64:0:48:M*,N,N,S: IRIX:6.5:15-21:IRIX 6.5.15 - 6.5.21 +49152:60:0:64:M*,N,W2,N,N,T,N,N,S: IRIX:6.5:IP27:IRIX 6.5 IP27 + + # ----------------- Tru64 ------------------- 32768:64:1:48:M*,N,W0: Tru64:4.0::Tru64 4.0 (or OS/2 Warp 4) @@ -428,6 +434,11 @@ 16384:128:1:52:M536,N,W0,N,N,S: Windows:2000:ZoneAlarm:Windows 2000 w/ZoneAlarm? 2048:255:0:40:.: Windows:.NET::Windows .NET Enterprise Server +44620:64:0:48:M*,N,N,S: Windows:ME::Windows ME no SP (?) +S6:255:1:48:M536,N,N,S: Windows:95:winsock2:Windows 95 winsock 2 +32768:32:1:52:M1460,N,W0,N,N,S: Windows:2003:AS:Windows 2003 AS + + # No need to be more specific, it passes: # *:128:1:48:M*,N,N,S:U:-Windows:XP/2000 while downloading (leak!) XXX quirk # there is an equiv similar generic sig w/o the quirk @@ -442,7 +453,6 @@ # Whoa. Hardcore WSS. 0:64:0:48:M*,W0,N: HP-UX:B.11.00:A:HP-UX B.11.00 A (RFC1323) - # ----------------- RiscOS ------------------ # We don't yet support the ?12 TCP option @@ -453,6 +463,7 @@ # 4096:64:1:56:M1460,N,N,T:T: RISC OS:3.70:freenet:RISC OS 3.70 freenet 2.00 + # ----------------- BSD/OS ------------------ # Once again, power of two WSS is also shared by MacOS X with DF set @@ -466,6 +477,7 @@ # ---------------- NeXTSTEP ----------------- +S4:64:0:44:M1024: NeXTSTEP:3.3::NeXTSTEP 3.3 S8:64:0:44:M512: NeXTSTEP:3.3::NeXTSTEP 3.3 # ------------------ BeOS ------------------- @@ -501,15 +513,18 @@ # ----------------- SCO ------------------ S3:64:1:60:M1460,N,W0,N,N,T: SCO:UnixWare:7.1:SCO UnixWare 7.1 +S17:64:1:60:M1380,N,W0,N,N,T: SCO:UnixWare:7.1:SCO UnixWare 7.1.3 MP3 S23:64:1:44:M1380: SCO:OpenServer:5.0:SCO OpenServer 5.0 # ------------------- DOS ------------------- 2048:255:0:44:M536: DOS:WATTCP:1.05:DOS Arachne via WATTCP/1.05 +T2:255:0:44:M984: DOS:WATTCP:1.05Arachne:Arachne via WATTCP/1.05 (eepro) # ------------------ OS/2 ------------------- S56:64:0:44:M512: OS/2:4::OS/2 4 +28672:64:0:44:M1460: OS/2:4::OS/2 Warp 4.0 # ----------------- TOPS-20 ----------------- @@ -517,6 +532,10 @@ # XXX QUIRK 0:64:0:44:M1460:A:TOPS-20:version 7 0:64:0:44:M1460: TOPS-20:7::TOPS-20 version 7 +# ----------------- FreeMiNT ---------------- + +S44:255:0:44:M536: FreeMiNT:1:16A:FreeMiNT 1 patch 16A (Atari) + # ------------------ AMIGA ------------------ # XXX TCP option 12 @@ -539,7 +558,6 @@ S12:64:1:44:M1460: @Checkpoint:::Checkpoint (unknown 1) S12:64:1:48:N,N,S,M1460: @Checkpoint:::Checkpoint (unknown 2) 4096:32:0:44:M1460: ExtremeWare:4.x::ExtremeWare 4.x -60352:64:0:52:M1460,N,W2,N,N,S: Clavister:7::Clavister firewall 7.x # XXX TCP option 12 # S32:64:0:68:M512,N,W0,N,N,T,N,N,?12:.:Nokia:IPSO w/Checkpoint NG FP3 @@ -549,6 +567,9 @@ 8192:64:1:44:M1460: Eagle:::Eagle Secure Gateway +S52:128:1:48:M1260,N,N,N,N: LinkSys:WRV54G::LinkSys WRV54G VPN router + + # ------- Switches and other stuff ---------- @@ -581,6 +602,10 @@ 16384:255:0:40:.: Proxyblocker:::Proxyblocker (what's this?) +65535:255:0:48:M*,N,N,S: Redline:::Redline T|X 2200 + +32696:128:0:40:M1460: Spirent:Avalanche::Spirent Web Avalanche HTTP benchmarking engine + # ----------- Embedded systems -------------- S9:255:0:44:M536: PalmOS:Tungsten:C:PalmOS Tungsten C @@ -589,10 +614,15 @@ S4:255:0:44:M536: PalmOS:3:5:PalmOS 3.5 2948:255:0:44:M536: PalmOS:3:5:PalmOS 3.5.3 (Handera) S29:255:0:44:M536: PalmOS:5::PalmOS 5.0 +16384:255:0:44:M1398: PalmOS:5.2:Clie:PalmOS 5.2 (Clie) +S14:255:0:44:M1350: PalmOS:5.2:Treo:PalmOS 5.2.1 (Treo) S23:64:1:64:N,W1,N,N,T,N,N,S,M1460: SymbianOS:7::SymbianOS 7 -8192:255:0:44:M1460: SymbianOS:6048::SymbianOS 6048 (on Nokia 7650?) -8192:255:0:44:M536: SymbianOS:::SymbianOS (on Nokia 9210?) + +8192:255:0:44:M1460: SymbianOS:6048::Symbian OS 6048 (Nokia 7650?) +8192:255:0:44:M536: SymbianOS:9210::Symbian OS (Nokia 9210?) +S22:64:1:56:M1460,T,S: SymbianOS:P800::Symbian OS ? (SE P800?) +S36:64:1:56:M1360,T,S: SymbianOS:6600::Symbian OS 60xx (Nokia 6600?) # Perhaps S4? @@ -608,8 +638,8 @@ S12:64:0:44:M1452: AXIS:5600:v5.64:AXIS Printer Server 5600 v5.64 +3100:32:1:44:M1460: Windows:CE:2.0:Windows CE 2.0 - #################### # Fancy signatures # #################### @@ -619,11 +649,23 @@ 3072:64:0:40:.: *NMAP:syn scan:3:NMAP syn scan (3) 4096:64:0:40:.: *NMAP:syn scan:4:NMAP syn scan (4) +# Requires quirks support +# 1024:64:0:40:.:A:*NMAP:TCP sweep probe (1) +# 2048:64:0:40:.:A:*NMAP:TCP sweep probe (2) +# 3072:64:0:40:.:A:*NMAP:TCP sweep probe (3) +# 4096:64:0:40:.:A:*NMAP:TCP sweep probe (4) + 1024:64:0:60:W10,N,M265,T: *NMAP:OS:1:NMAP OS detection probe (1) 2048:64:0:60:W10,N,M265,T: *NMAP:OS:2:NMAP OS detection probe (2) 3072:64:0:60:W10,N,M265,T: *NMAP:OS:3:NMAP OS detection probe (3) 4096:64:0:60:W10,N,M265,T: *NMAP:OS:4:NMAP OS detection probe (4) +32767:64:0:40:.: *NAST:::NASTsyn scan + +# Requires quirks support +# 12345:255:0:40:.:A:-p0f:sendsyn utility + + ##################################### # Generic signatures - just in case # ##################################### @@ -633,6 +675,8 @@ *:128:1:52:M*,N,W0,N,N,S: @Windows:XP:RFC1323:Windows XP/2000 (RFC1323 no tstamp) *:128:1:52:M*,N,W0,N,N,S: @Windows:2000:RFC1323:Windows XP/2000 (RFC1323 no tstamp) +*:128:1:52:M*,N,W*,N,N,S: @Windows:XP:RFC1323:Windows XP/2000 (RFC1323 no tstamp) +*:128:1:52:M*,N,W*,N,N,S: @Windows:2000:RFC1323:Windows XP/2000 (RFC1323 no tstamp) *:128:1:64:M*,N,W0,N,N,T0,N,N,S: @Windows:XP:RFC1323:Windows XP/2000 (RFC1323) *:128:1:64:M*,N,W0,N,N,T0,N,N,S: @Windows:2000:RFC1323:Windows XP/2000 (RFC1323) *:128:1:64:M*,N,W*,N,N,T0,N,N,S: @Windows:XP:RFC1323:Windows XP (RFC1323, w+) ==== //depot/projects/arm/src/etc/rc.d/auto_linklocal#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.2 2006/10/13 12:41:35 ume Exp $ +# $FreeBSD: src/etc/rc.d/auto_linklocal,v 1.3 2006/10/22 17:21:03 hrs Exp $ # # PROVIDE: auto_linklocal @@ -15,7 +15,7 @@ auto_linklocal_start() { - if ! checkyesno ipv6_enable; then + if ! checkyesno ipv6_enable && ${SYSCTL} net.inet6 > /dev/null 2>&1; then ${SYSCTL_W} net.inet6.ip6.auto_linklocal=0 fi } ==== //depot/projects/arm/src/games/fortune/datfiles/fortunes#6 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.227 2006/10/07 08:29:20 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.229 2006/10/23 13:25:17 phk Exp $ % ======================================================================= @@ -30223,6 +30223,9 @@ municipality. -- Local ordinance, Euclid Ohio % +It so happens that everything that is stupid is not unconstitutional. + -- Supreme Court Justice Antonio Scalia +% It takes a smart husband to have the last word and not use it. % It takes a special kind of courage to face what we all have to face. @@ -52261,6 +52264,9 @@ Those who can, do; those who can't, write. Those who can't write work for the Bell Labs Record. % +Those who can make you believe absurdities, can make you commit atrocities. + -- Voltaire +% Those who cannot remember the past are condemned to repeat it. -- George Santayana % ==== //depot/projects/arm/src/gnu/usr.bin/gdb/Makefile#4 (text+ko) ==== @@ -1,5 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.11 2006/08/24 21:53:49 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.12 2006/10/21 17:27:36 jmg Exp $ SUBDIR= doc libgdb gdb gdbtui kgdb +.if ${MACHINE_ARCH} == "i386" +SUBDIR+=gdbserver +.endif + .include ==== //depot/projects/arm/src/gnu/usr.bin/gdb/kgdb/kgdb.1#3 (text+ko) ==== @@ -22,8 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.9 2006/10/11 14:42:43 obrien Exp $ -.Dd March 2, 2005 +.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.10 2006/10/21 17:39:35 ru Exp $ +.\" +.Dd October 11, 2006 .Os .Dt KGDB 1 .Sh NAME ==== //depot/projects/arm/src/lib/libc/resolv/res_send.c#3 (text) ==== @@ -70,10 +70,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.7 2005/08/15 02:04:41 marka Exp $"; +static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.8 2006/03/08 04:13:31 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.3 2006/08/04 12:26:07 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.4 2006/10/24 14:41:43 ume Exp $"); /* * Send query to name server and wait for reply. @@ -145,7 +145,7 @@ int kq, #endif const u_char *, int, - u_char *, int, int *, int, + u_char *, int, int *, int, int, int *, int *); static void Aerror(const res_state, FILE *, const char *, int, const struct sockaddr *, int); @@ -490,7 +490,7 @@ kq, #endif buf, buflen, ans, anssiz, &terrno, - ns, &v_circuit, &gotsomewhere); + ns, try, &v_circuit, &gotsomewhere); if (n < 0) goto fail; if (n == 0) @@ -812,8 +812,9 @@ #ifdef USE_KQUEUE int kq, #endif - const u_char *buf, int buflen, u_char *ans, int anssiz, - int *terrno, int ns, int *v_circuit, int *gotsomewhere) + const u_char *buf, int buflen, u_char *ans, + int anssiz, int *terrno, int ns, int try, int *v_circuit, + int *gotsomewhere) { const HEADER *hp = (const HEADER *) buf; HEADER *anhp = (HEADER *) ans; @@ -914,7 +915,7 @@ /* * Wait for reply. */ - seconds = (statp->retrans << ns); + seconds = (statp->retrans << try); if (ns > 0) seconds /= statp->nscount; if (seconds <= 0) ==== //depot/projects/arm/src/lib/libc/stdio/xprintf.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.3 2006/04/01 19:06:54 phk Exp $ + * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.5 2006/10/23 07:25:25 kib Exp $ */ #include @@ -261,7 +261,7 @@ static int -__v2printf(FILE *fp, const char *fmt0, unsigned pct, const va_list ap) +__v2printf(FILE *fp, const char *fmt0, unsigned pct, va_list ap) { struct printf_info *pi, *pil; const char *fmt; ==== //depot/projects/arm/src/lib/libc/sys/read.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)read.2 8.4 (Berkeley) 2/26/94 -.\" $FreeBSD: src/lib/libc/sys/read.2,v 1.33 2006/10/11 13:33:02 maxim Exp $ +.\" $FreeBSD: src/lib/libc/sys/read.2,v 1.34 2006/10/21 18:03:53 ru Exp $ .\" .Dd October 11, 2006 .Dt READ 2 @@ -170,7 +170,7 @@ An I/O error occurred while reading from the file system. .It Bq Er EINTR A read from a slow device -(i.e. one that might block for an arbitrary amount of time) +(i.e.\& one that might block for an arbitrary amount of time) was interrupted by the delivery of a signal before any data arrived. .It Bq Er EINVAL ==== //depot/projects/arm/src/lib/libc/sys/write.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)write.2 8.5 (Berkeley) 4/2/94 -.\" $FreeBSD: src/lib/libc/sys/write.2,v 1.32 2006/04/14 19:34:07 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/write.2,v 1.33 2006/10/21 20:36:50 simon Exp $ .\" .Dd July 7, 2005 .Dt WRITE 2 @@ -85,7 +85,7 @@ For .Fn writev and -.Fn pwritev, +.Fn pwritev , the .Fa iovec structure is defined as: ==== //depot/projects/arm/src/lib/libthread_db/thread_db.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libthread_db/thread_db.c,v 1.3 2005/05/31 09:43:03 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libthread_db/thread_db.c,v 1.4 2006/10/20 14:15:42 davidxu Exp $"); #include #include @@ -41,14 +41,12 @@ static TAILQ_HEAD(, td_thragent) proclist = TAILQ_HEAD_INITIALIZER(proclist); -extern struct ta_ops libc_r_db_ops; extern struct ta_ops libpthread_db_ops; extern struct ta_ops libthr_db_ops; static struct ta_ops *ops[] = { &libpthread_db_ops, &libthr_db_ops, - &libc_r_db_ops }; td_err_e ==== //depot/projects/arm/src/lib/libvgl/vgl.3#2 (text+ko) ==== @@ -24,7 +24,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/lib/libvgl/vgl.3,v 1.30 2005/02/13 23:45:48 ru Exp $ +.\" $FreeBSD: src/lib/libvgl/vgl.3,v 1.31 2006/10/21 15:12:36 maxim Exp $ .Dd November 7, 1999 .Dt VGL 3 .Os @@ -398,7 +398,7 @@ .Pp .Dl VGLSetVScreenSize(10000, 10000); .Pp -.Fn VGLPanSreen +.Fn VGLPanScreen change the origin of the displayed screen in the virtual screen. Note that this function must be called when our vty is in the foreground. ==== //depot/projects/arm/src/release/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.914 2006/09/11 13:15:09 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.916 2006/10/24 21:00:49 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -943,9 +943,6 @@ # Break the link to device.hints so we can modify it @rm -f ${CD_LIVEFS}/boot/device.hints @cp ${RD}/trees/base/boot/device.hints ${CD_LIVEFS}/boot/device.hints -.if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64" - @echo 'hint.atkbd.0.flags="0x1"' >> ${CD_LIVEFS}/boot/device.hints -.endif .endif @echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf touch ${.TARGET} @@ -1252,9 +1249,6 @@ ${BOOTDIR}/loader.rc ${IMAGEDIR}/boot .if exists(${HINTSFILE}) @cp ${HINTSFILE} ${IMAGEDIR}/boot/device.hints -.if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64" - @echo 'hint.atkbd.0.flags="0x1"' >> ${IMAGEDIR}/boot/device.hints -.endif @gzip -9n ${IMAGEDIR}/boot/device.hints .endif @gzip -9n ${IMAGEDIR}/boot/*.4th ${IMAGEDIR}/boot/loader.help \ @@ -1275,9 +1269,11 @@ .if defined(SPLIT_MFSROOT) @echo 'mfsroot_after="read -p \"Insert boot floppy and press Enter\""' >> ${IMAGEDIR}/boot/loader.conf .endif -.if ${TARGET_ARCH} == "i386" && ${AUTO_KEYBOARD_DETECT} +.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" +.if ${AUTO_KEYBOARD_DETECT} @echo "-P" >> ${IMAGEDIR}/boot.config .endif +.endif @rm -f ${IMAGEFILE} @cp ${KERNFILE} ${MFSROOTFILE} ${IMAGEDIR} sh -e ${DOFS_SH} ${IMAGEFILE} ${RD} ${MNT} ${FLPSIZE} ${IMAGEDIR} \ ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#15 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.980 2006/10/14 13:46:00 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.981 2006/10/21 14:06:34 bmah Exp $ 2000 @@ -1663,7 +1663,7 @@ to v394. &merged; libpcap has been updated from - 0.9.1 to 0.9.4 + 0.9.1 to 0.9.4. &merged; lukemftpd has been updated from a snapshot from NetBSD as of 9 August 2004 to a snapshot from @@ -1683,7 +1683,7 @@ 8.13.4 to 8.13.8. &merged; tcpdump has been updated from - 3.9.1 to 3.9.4 + 3.9.1 to 3.9.4. &merged; The timezone database has been updated from the tzdata2005l release to the ==== //depot/projects/arm/src/sbin/adjkerntz/adjkerntz.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/adjkerntz/adjkerntz.c,v 1.31 2006/05/13 11:58:58 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/adjkerntz/adjkerntz.c,v 1.32 2006/10/23 10:48:19 ru Exp $"); /* * Andrey A. Chernov Dec 20 1993 @@ -126,7 +126,13 @@ (void) signal(SIGHUP, SIG_IGN); - if (init && daemon(0, 1)) { + if (init && daemon(0, +#ifdef DEBUG + 1 +#else + 0 +#endif + )) { syslog(LOG_ERR, "daemon: %m"); return 1; } ==== //depot/projects/arm/src/sbin/bsdlabel/bsdlabel.c#2 (text+ko) ==== @@ -53,7 +53,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.111 2005/08/14 22:46:50 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.112 2006/10/20 13:10:27 maxim Exp $"); #include #include @@ -148,7 +148,7 @@ int ch, error = 0; char const *name = 0; - while ((ch = getopt(argc, argv, "ABb:efm:nRrs:w")) != -1) + while ((ch = getopt(argc, argv, "ABb:efm:nRrw")) != -1) switch (ch) { case 'A': allfields = 1; ==== //depot/projects/arm/src/sbin/devd/devd.conf.5#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/devd/devd.conf.5,v 1.9 2006/10/07 21:15:40 jmg Exp $ +.\" $FreeBSD: src/sbin/devd/devd.conf.5,v 1.11 2006/10/24 20:20:41 ru Exp $ .\" .\" The section on comments was taken from named.conf.5, which has the .\" following copyright: @@ -41,7 +41,7 @@ .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS .\" SOFTWARE. .\" -.Dd October 7, 2006 +.Dd October 25, 2006 .Dt DEVD.CONF 5 .Os .Sh NAME @@ -84,7 +84,7 @@ substatements are explained below. .Pp Each statement, except -.Dq options +.Ic options has a priority (an arbitrary number) associated with it, where .Ql 0 is defined as the lowest priority. @@ -102,209 +102,223 @@ substatement "value"; }; .Ed -.Pp .Ss Sub-statements The following sub-statements are supported within the -.Dq options +.Ic options statement. .Bl -tag -width ".Ic directory" -.It Ic directory \*q/some/path\*q; +.It Ic directory Qq Ar /some/path ; Adds the given directory to the list of directories from which .Xr devd 8 will read -configuration files. Any number of -.Dq directory >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 25 05:39:21 2006 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 D6C0116A416; Wed, 25 Oct 2006 05:39:20 +0000 (UTC) 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 9B84816A415 for ; Wed, 25 Oct 2006 05:39:20 +0000 (UTC) (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 B489043D7E for ; Wed, 25 Oct 2006 05:39:17 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9P5dHsp086053 for ; Wed, 25 Oct 2006 05:39:17 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9P5dHIT086050 for perforce@freebsd.org; Wed, 25 Oct 2006 05:39:17 GMT (envelope-from imp@freebsd.org) Date: Wed, 25 Oct 2006 05:39:17 GMT Message-Id: <200610250539.k9P5dHIT086050@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 108384 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, 25 Oct 2006 05:39:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=108384 Change 108384 by imp@imp_lighthouse on 2006/10/25 05:38:50 Ooops. Use right constants for this register. In this case, it matters not at all Submitted by: Patrick Schweiger Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#11 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#11 (text+ko) ==== @@ -145,7 +145,7 @@ WR4(sc, SSC_RFMR, 0x1f | SSC_RFMR_MSFBF | SSC_RFMR_FSOS_NONE); WR4(sc, SSC_TCMR, - SSC_TCMR_CKS_TK | SSC_TCMR_CKO_NONE | SSC_RCMR_START_CONT); + SSC_TCMR_CKS_TK | SSC_TCMR_CKO_NONE | SSC_TCMR_START_CONT); WR4(sc, SSC_TFMR, 0x1f | SSC_TFMR_DATDEF | SSC_TFMR_MSFBF | SSC_TFMR_FSOS_NEG_PULSE); From owner-p4-projects@FreeBSD.ORG Wed Oct 25 06:48:05 2006 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 BAEE016A417; Wed, 25 Oct 2006 06:48:05 +0000 (UTC) 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 8E83116A415 for ; Wed, 25 Oct 2006 06:48:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4FD5A43D53 for ; Wed, 25 Oct 2006 06:48:05 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9P6m5jW097930 for ; Wed, 25 Oct 2006 06:48:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9P6lqnj097925 for perforce@freebsd.org; Wed, 25 Oct 2006 06:47:52 GMT (envelope-from jb@freebsd.org) Date: Wed, 25 Oct 2006 06:47:52 GMT Message-Id: <200610250647.k9P6lqnj097925@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 108389 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, 25 Oct 2006 06:48:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=108389 Change 108389 by jb@jb_freebsd7 on 2006/10/25 06:47:48 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/rc-scripting/Makefile#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/rc-scripting/article.sgml#1 branch .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kernelbuild/Makefile#2 delete .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#5 integrate .. //depot/projects/dtrace/doc/ru_RU.KOI8-R/books/porters-handbook/book.sgml#4 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/keramida.key#3 integrate .. //depot/projects/dtrace/doc/share/sgml/freebsd.ent#8 integrate .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#15 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/mailing-lists.ent#4 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/faq/Makefile#3 integrate .. //depot/projects/dtrace/ports/MOVED#26 integrate .. //depot/projects/dtrace/ports/UPDATING#19 integrate .. //depot/projects/dtrace/src/Makefile#10 integrate .. //depot/projects/dtrace/src/Makefile.inc1#22 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#13 integrate .. //depot/projects/dtrace/src/bin/cp/cp.1#5 integrate .. //depot/projects/dtrace/src/bin/ls/print.c#4 integrate .. //depot/projects/dtrace/src/bin/rm/rm.c#5 integrate .. //depot/projects/dtrace/src/etc/pf.os#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/amd#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/auto_linklocal#4 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#14 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/Makefile#6 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kgdb.1#5 integrate .. //depot/projects/dtrace/src/lib/libc/resolv/res_send.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/xprintf.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/sys/read.2#5 integrate .. //depot/projects/dtrace/src/lib/libc/sys/write.2#5 integrate .. //depot/projects/dtrace/src/lib/libnetgraph/msg.c#4 integrate .. //depot/projects/dtrace/src/lib/libnetgraph/sock.c#4 integrate .. //depot/projects/dtrace/src/lib/libthread_db/thread_db.c#4 integrate .. //depot/projects/dtrace/src/lib/libvgl/vgl.3#4 integrate .. //depot/projects/dtrace/src/release/Makefile#8 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#22 integrate .. //depot/projects/dtrace/src/release/scripts/package-split.py#5 integrate .. //depot/projects/dtrace/src/sbin/adjkerntz/adjkerntz.c#5 integrate .. //depot/projects/dtrace/src/sbin/bsdlabel/bsdlabel.c#4 integrate .. //depot/projects/dtrace/src/sbin/devd/devd.conf.5#4 integrate .. //depot/projects/dtrace/src/sbin/mdmfs/mdmfs.8#5 integrate .. //depot/projects/dtrace/src/sbin/mount/mount.c#7 integrate .. //depot/projects/dtrace/src/share/examples/etc/README.examples#6 integrate .. //depot/projects/dtrace/src/share/man/man4/gre.4#4 integrate .. //depot/projects/dtrace/src/share/man/man4/if_bridge.4#11 integrate .. //depot/projects/dtrace/src/share/man/man4/ng_pppoe.4#6 integrate .. //depot/projects/dtrace/src/share/man/man4/ng_source.4#4 integrate .. //depot/projects/dtrace/src/share/man/man4/sis.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/syscons.4#5 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#16 integrate .. //depot/projects/dtrace/src/share/man/man7/ports.7#6 integrate .. //depot/projects/dtrace/src/share/man/man8/intro.8#4 integrate .. //depot/projects/dtrace/src/share/man/man9/hash.9#4 integrate .. //depot/projects/dtrace/src/share/man/man9/zone.9#5 integrate .. //depot/projects/dtrace/src/share/misc/iso3166#4 integrate .. //depot/projects/dtrace/src/share/misc/usb_hid_usages#4 integrate .. //depot/projects/dtrace/src/share/mk/bsd.cpu.mk#7 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/db_trace.c#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#16 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC.hints#4 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/dtrace/src/sys/arm/arm/cpufunc.c#6 integrate .. //depot/projects/dtrace/src/sys/arm/arm/elf_trampoline.c#7 integrate .. //depot/projects/dtrace/src/sys/arm/arm/nexus_io.c#4 integrate .. //depot/projects/dtrace/src/sys/arm/arm/trap.c#7 integrate .. //depot/projects/dtrace/src/sys/arm/arm/undefined.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/arm/vm_machdep.c#7 integrate .. //depot/projects/dtrace/src/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/dtrace/src/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/dtrace/src/sys/arm/at91/at91_spi.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/at91/at91_ssc.c#4 integrate .. //depot/projects/dtrace/src/sys/arm/at91/at91_sscreg.h#3 integrate .. //depot/projects/dtrace/src/sys/arm/at91/at91_twi.c#6 integrate .. //depot/projects/dtrace/src/sys/arm/at91/if_ate.c#7 integrate .. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#13 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/sa11x0.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/sa11x0_io.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/sa11x0_irqhandler.c#4 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/sa11x0_ost.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/arm/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/Makefile.inc#4 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/boot0spi/main.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/bootiic/env_vars.c#3 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/bootiic/loader_prompt.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/bootspi/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/bootspi/arm_init.S#3 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/bootspi/env_vars.c#3 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/bootspi/loader_prompt.c#3 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/bootspi/main.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/Makefile#5 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/at91rm9200.h#4 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#3 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/emac.c#5 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/emac.h#5 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/emac_init.c#3 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/lib.h#4 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#3 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/mci_device.c#3 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/mci_device.h#3 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/p_string.c#4 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/printf.c#3 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/putchar.c#3 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/sd-card.c#3 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/spi_flash.c#3 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#11 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#11 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#11 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#11 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#12 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_file.c#7 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_stats.c#7 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_fcntl.c#4 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_misc.c#6 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#22 integrate .. //depot/projects/dtrace/src/sys/conf/files#34 integrate .. //depot/projects/dtrace/src/sys/conf/files.amd64#12 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#16 integrate .. //depot/projects/dtrace/src/sys/conf/files.ia64#6 integrate .. //depot/projects/dtrace/src/sys/conf/files.pc98#10 integrate .. //depot/projects/dtrace/src/sys/conf/files.powerpc#8 integrate .. //depot/projects/dtrace/src/sys/conf/files.sparc64#4 integrate .. //depot/projects/dtrace/src/sys/conf/kmod.mk#8 integrate .. //depot/projects/dtrace/src/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/dtrace/src/sys/crypto/sha2/sha2.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/awi/if_awi_pccard.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bce.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/bce/if_bcereg.h#8 integrate .. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#14 integrate .. //depot/projects/dtrace/src/sys/dev/iwi/if_iwi.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/iwi/if_iwireg.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/mmc/bridge.h#1 branch .. //depot/projects/dtrace/src/sys/dev/mmc/mmc.c#1 branch .. //depot/projects/dtrace/src/sys/dev/mmc/mmcbr_if.m#1 branch .. //depot/projects/dtrace/src/sys/dev/mmc/mmcbrvar.h#1 branch .. //depot/projects/dtrace/src/sys/dev/mmc/mmcbus_if.m#1 branch .. //depot/projects/dtrace/src/sys/dev/mmc/mmcreg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/mmc/mmcsd.c#1 branch .. //depot/projects/dtrace/src/sys/dev/mmc/mmcvar.h#1 branch .. //depot/projects/dtrace/src/sys/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/nfe/if_nfereg.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/pci/pci.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/ray/if_ray.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/spibus/spibus.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/ubsec/ubsec.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ehci.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_udav.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_ural.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ohci.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uhci.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usb.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdi.h#5 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs.h#6 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_devs.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_int.h#4 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/denode.h#5 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/direntry.h#4 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_conv.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_denode.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_vnops.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_subr.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_subr.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/acpica/Makefile#5 integrate .. //depot/projects/dtrace/src/sys/i386/conf/NOTES#10 integrate .. //depot/projects/dtrace/src/sys/i386/i386/db_trace.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#12 integrate .. //depot/projects/dtrace/src/sys/i386/i386/sys_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/ibcs2/ibcs2_misc.c#6 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/ia64/conf/NOTES#5 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/clock.c#6 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/nexus.c#5 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/init_main.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/kern_acct.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_acl.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_alq.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_conf.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_environment.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exec.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exit.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_fork.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/kern_intr.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/kern_jail.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_ktrace.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_linker.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mac.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mbuf.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_prot.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_sig.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/kern_time.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/link_elf.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/link_elf_obj.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/subr_fattime.c#1 branch .. //depot/projects/dtrace/src/sys/kern/subr_trap.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/sys_pipe.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/sys_socket.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/sysv_msg.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/sysv_sem.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/sysv_shm.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_mbuf2.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_sem.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_usrreq.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_cluster.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/dtrace/src/sys/modules/mmc/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/mmcsd/Makefile#1 branch .. //depot/projects/dtrace/src/sys/net/bpf.c#10 integrate .. //depot/projects/dtrace/src/sys/net/bsd_comp.c#4 integrate .. //depot/projects/dtrace/src/sys/net/if.c#7 integrate .. //depot/projects/dtrace/src/sys/net/if_atmsubr.c#4 integrate .. //depot/projects/dtrace/src/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/dtrace/src/sys/net/if_fddisubr.c#4 integrate .. //depot/projects/dtrace/src/sys/net/if_fwsubr.c#4 integrate .. //depot/projects/dtrace/src/sys/net/if_gif.c#8 integrate .. //depot/projects/dtrace/src/sys/net/if_iso88025subr.c#4 integrate .. //depot/projects/dtrace/src/sys/net/if_ppp.c#5 integrate .. //depot/projects/dtrace/src/sys/net/if_stf.c#7 integrate .. //depot/projects/dtrace/src/sys/net/if_tun.c#6 integrate .. //depot/projects/dtrace/src/sys/netatalk/aarp.c#4 integrate .. //depot/projects/dtrace/src/sys/netatalk/ddp_input.c#4 integrate .. //depot/projects/dtrace/src/sys/netatalk/ddp_output.c#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_message.h#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_socket.c#6 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_socket.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet/if_ether.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/igmp.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_divert.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw_pfil.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_input.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_mroute.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_options.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_output.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/udp_usrreq.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6.c#7 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs.h#5 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsock.c#5 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_syscalls.c#5 integrate .. //depot/projects/dtrace/src/sys/pc98/conf/NOTES#7 integrate .. //depot/projects/dtrace/src/sys/pci/agp.c#7 integrate .. //depot/projects/dtrace/src/sys/pci/nfsmb.c#7 integrate .. //depot/projects/dtrace/src/sys/powerpc/conf/NOTES#6 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/copyinout.c#6 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_inet.c#5 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_label.c#4 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_net.c#5 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_pipe.c#5 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_posix_sem.c#5 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_process.c#5 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_socket.c#5 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_system.c#4 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_sysv_msg.c#5 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_sysv_sem.c#5 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_sysv_shm.c#5 integrate .. //depot/projects/dtrace/src/sys/security/mac/mac_vfs.c#6 integrate .. //depot/projects/dtrace/src/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/dtrace/src/sys/sparc64/conf/NOTES#6 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/NOTES#7 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#16 integrate .. //depot/projects/dtrace/src/sys/sys/clock.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/conf.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/elf32.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/elf64.h#8 integrate .. //depot/projects/dtrace/src/sys/sys/mac.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/mac_policy.h#7 integrate .. //depot/projects/dtrace/src/sys/sys/queue.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/sem.h#4 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#11 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_vnops.c#7 integrate .. //depot/projects/dtrace/src/sys/vm/device_pager.c#5 integrate .. //depot/projects/dtrace/src/sys/vm/phys_pager.c#4 integrate .. //depot/projects/dtrace/src/sys/vm/swap_pager.c#9 integrate .. //depot/projects/dtrace/src/sys/vm/vm_contig.c#7 integrate .. //depot/projects/dtrace/src/sys/vm/vm_fault.c#8 integrate .. //depot/projects/dtrace/src/sys/vm/vm_glue.c#6 integrate .. //depot/projects/dtrace/src/sys/vm/vm_kern.c#4 integrate .. //depot/projects/dtrace/src/sys/vm/vm_map.c#9 integrate .. //depot/projects/dtrace/src/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/dtrace/src/sys/vm/vm_object.c#10 integrate .. //depot/projects/dtrace/src/sys/vm/vm_page.c#16 integrate .. //depot/projects/dtrace/src/sys/vm/vm_page.h#7 integrate .. //depot/projects/dtrace/src/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik#4 integrate .. //depot/projects/dtrace/src/usr.bin/jot/jot.1#4 integrate .. //depot/projects/dtrace/src/usr.bin/lam/lam.1#4 integrate .. //depot/projects/dtrace/src/usr.bin/quota/Makefile#4 integrate .. //depot/projects/dtrace/src/usr.bin/quota/quota.1#4 integrate .. //depot/projects/dtrace/src/usr.bin/quota/quota.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/rs/rs.1#4 integrate .. //depot/projects/dtrace/src/usr.bin/su/su.c#5 integrate .. //depot/projects/dtrace/src/usr.bin/tail/forward.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/vmstat/vmstat.8#5 integrate .. //depot/projects/dtrace/src/usr.bin/vmstat/vmstat.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/Makefile#13 integrate .. //depot/projects/dtrace/src/usr.sbin/config/config.5#4 integrate .. //depot/projects/dtrace/src/usr.sbin/config/config.8#4 integrate .. //depot/projects/dtrace/src/usr.sbin/config/config.h#4 integrate .. //depot/projects/dtrace/src/usr.sbin/config/config.y#5 integrate .. //depot/projects/dtrace/src/usr.sbin/config/main.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/config/mkmakefile.c#9 integrate .. //depot/projects/dtrace/src/usr.sbin/freebsd-update/freebsd-update.sh#3 integrate .. //depot/projects/dtrace/src/usr.sbin/mountd/mountd.c#8 integrate .. //depot/projects/dtrace/src/usr.sbin/pccard/Makefile#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pccard/dumpcis/Makefile#1 branch .. //depot/projects/dtrace/src/usr.sbin/pccard/dumpcis/dumpcis.8#1 branch .. //depot/projects/dtrace/src/usr.sbin/pccard/dumpcis/main.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/pccard/pccardd/Makefile#4 delete .. //depot/projects/dtrace/src/usr.sbin/pccard/pccardd/cardd.c#4 delete .. //depot/projects/dtrace/src/usr.sbin/pccard/pccardd/cardd.h#4 delete .. //depot/projects/dtrace/src/usr.sbin/pccard/pccardd/file.c#4 delete .. //depot/projects/dtrace/src/usr.sbin/pccard/pccardd/pccard.conf.5#4 delete .. //depot/projects/dtrace/src/usr.sbin/pccard/pccardd/pccardd.8#4 delete .. //depot/projects/dtrace/src/usr.sbin/pccard/pccardd/pccardd.c#4 delete .. //depot/projects/dtrace/src/usr.sbin/pccard/pccardd/server.c#4 delete .. //depot/projects/dtrace/src/usr.sbin/pccard/pccardd/util.c#4 delete .. //depot/projects/dtrace/src/usr.sbin/portsnap/portsnap/portsnap.sh#6 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/dist.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/install.c#6 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/sysinstall.h#6 integrate .. //depot/projects/dtrace/src/usr.sbin/zic/zdump/Makefile#4 integrate .. //depot/projects/dtrace/src/usr.sbin/zic/zic/Makefile#4 integrate .. //depot/projects/dtrace/www/de/Makefile#4 integrate .. //depot/projects/dtrace/www/de/about.sgml#4 integrate .. //depot/projects/dtrace/www/de/applications.sgml#4 integrate .. //depot/projects/dtrace/www/de/availability.sgml#4 integrate .. //depot/projects/dtrace/www/de/community.sgml#4 integrate .. //depot/projects/dtrace/www/de/community/irc.sgml#4 integrate .. //depot/projects/dtrace/www/de/community/mailinglists.sgml#4 integrate .. //depot/projects/dtrace/www/de/community/newsgroups.sgml#4 integrate .. //depot/projects/dtrace/www/de/community/webresources.sgml#5 integrate .. //depot/projects/dtrace/www/de/doc/Makefile#4 integrate .. //depot/projects/dtrace/www/de/docs.sgml#4 integrate .. //depot/projects/dtrace/www/de/docs/books.sgml#7 integrate .. //depot/projects/dtrace/www/de/docs/man.sgml#5 integrate .. //depot/projects/dtrace/www/de/docs/webresources.sgml#5 integrate .. //depot/projects/dtrace/www/de/features.sgml#4 integrate .. //depot/projects/dtrace/www/de/index.xsl#10 integrate .. //depot/projects/dtrace/www/de/internet.sgml#4 integrate .. //depot/projects/dtrace/www/de/mailto.sgml#4 integrate .. //depot/projects/dtrace/www/de/news/2002/Makefile#4 integrate .. //depot/projects/dtrace/www/de/news/Makefile#4 integrate .. //depot/projects/dtrace/www/de/news/news.sgml#4 integrate .. //depot/projects/dtrace/www/de/platforms/alpha.sgml#5 integrate .. //depot/projects/dtrace/www/de/platforms/amd64.sgml#5 integrate .. //depot/projects/dtrace/www/de/platforms/arm.sgml#5 integrate .. //depot/projects/dtrace/www/de/platforms/i386.sgml#5 integrate .. //depot/projects/dtrace/www/de/platforms/ia64.sgml#4 integrate .. //depot/projects/dtrace/www/de/platforms/ia64/Makefile#4 integrate .. //depot/projects/dtrace/www/de/platforms/ia64/index.xsl#5 integrate .. //depot/projects/dtrace/www/de/platforms/ia64/machines.sgml#4 integrate .. //depot/projects/dtrace/www/de/platforms/ia64/refs.sgml#5 integrate .. //depot/projects/dtrace/www/de/platforms/ia64/todo.xsl#5 integrate .. //depot/projects/dtrace/www/de/platforms/index.sgml#4 integrate .. //depot/projects/dtrace/www/de/platforms/mips.sgml#4 integrate .. //depot/projects/dtrace/www/de/platforms/pc98.sgml#5 integrate .. //depot/projects/dtrace/www/de/platforms/ppc.sgml#4 integrate .. //depot/projects/dtrace/www/de/platforms/sparc.sgml#4 integrate .. //depot/projects/dtrace/www/de/platforms/x86-64.sgml#4 integrate .. //depot/projects/dtrace/www/de/projects/Makefile#4 integrate .. //depot/projects/dtrace/www/de/projects/newbies.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.11R/announce.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.11R/hardware.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.11R/installation.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.11R/relnotes.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.6.2R/announce.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.6.2R/hardware.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.6.2R/relnotes.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.7R/announce.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.7R/hardware.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.7R/installation.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.7R/relnotes.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.8R/announce.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.8R/hardware.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.8R/installation.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.8R/relnotes.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.9R/announce.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.9R/hardware.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.9R/installation.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/4.9R/relnotes.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/5.0R/announce.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/5.0R/hardware.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/5.0R/installation.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/5.0R/relnotes.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/5.1R/announce.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/5.1R/hardware.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/5.1R/installation.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/5.1R/relnotes.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/5.2R/hardware.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/5.2R/installation.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/5.2R/relnotes.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/5.3R/announce.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/5.3R/hardware.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/5.3R/installation.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/5.3R/relnotes.sgml#4 integrate .. //depot/projects/dtrace/www/de/releases/index.sgml#6 integrate .. //depot/projects/dtrace/www/de/releases/snapshots.sgml#4 integrate .. //depot/projects/dtrace/www/de/relnotes.sgml#4 integrate .. //depot/projects/dtrace/www/de/security/Makefile#4 integrate .. //depot/projects/dtrace/www/de/security/charter.sgml#4 integrate .. //depot/projects/dtrace/www/de/security/mkindex.xsl#4 integrate .. //depot/projects/dtrace/www/de/security/security.sgml#7 integrate .. //depot/projects/dtrace/www/de/send-pr.sgml#4 integrate .. //depot/projects/dtrace/www/de/share/sgml/catalog#3 integrate .. //depot/projects/dtrace/www/de/share/sgml/catalog.xml#3 integrate .. //depot/projects/dtrace/www/de/share/sgml/header.l10n.ent#3 integrate .. //depot/projects/dtrace/www/de/share/sgml/l10n.ent#3 integrate .. //depot/projects/dtrace/www/de/share/sgml/libcommon.xsl#3 integrate .. //depot/projects/dtrace/www/de/share/sgml/navibar.l10n.ent#3 integrate .. //depot/projects/dtrace/www/de/share/sgml/news.xml#3 integrate .. //depot/projects/dtrace/www/de/share/sgml/press.xml#3 integrate .. //depot/projects/dtrace/www/de/support.sgml#4 integrate .. //depot/projects/dtrace/www/de/support/bugreports.sgml#4 integrate .. //depot/projects/dtrace/www/de/support/webresources.sgml#5 integrate .. //depot/projects/dtrace/www/de/where.sgml#6 integrate .. //depot/projects/dtrace/www/en/docproj/translations.sgml#6 integrate .. //depot/projects/dtrace/www/en/donations/donors.sgml#16 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#14 integrate .. //depot/projects/dtrace/www/en/gifs/Makefile#5 integrate .. //depot/projects/dtrace/www/en/gifs/freebsdro.png#1 branch .. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#7 integrate .. //depot/projects/dtrace/www/en/gnome/docs/faq216.sgml#2 integrate .. //depot/projects/dtrace/www/en/gnome/docs/porting.sgml#6 integrate .. //depot/projects/dtrace/www/en/gnome/gnome_prefix.sh#3 integrate .. //depot/projects/dtrace/www/en/gnome/news.xml#12 integrate .. //depot/projects/dtrace/www/en/news/news.sgml#4 integrate .. //depot/projects/dtrace/www/en/news/status/Makefile#6 integrate .. //depot/projects/dtrace/www/en/news/status/report-june-2006-oct-2006.xml#1 branch .. //depot/projects/dtrace/www/en/news/status/status.sgml#6 integrate .. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#12 integrate .. //depot/projects/dtrace/www/en/portmgr/policies_committing.sgml#4 integrate .. //depot/projects/dtrace/www/en/projects/ideas/index.sgml#17 integrate .. //depot/projects/dtrace/www/en/projects/projects.sgml#9 integrate .. //depot/projects/dtrace/www/en/projects/summerofcode-2005.sgml#6 integrate .. //depot/projects/dtrace/www/en/projects/summerofcode-2006.sgml#5 integrate .. //depot/projects/dtrace/www/en/projects/summerofcode.sgml#13 integrate .. //depot/projects/dtrace/www/en/publish.sgml#6 integrate .. //depot/projects/dtrace/www/en/releases/6.2R/schedule.sgml#8 integrate .. //depot/projects/dtrace/www/en/releases/6.2R/todo.sgml#3 integrate .. //depot/projects/dtrace/www/share/sgml/commercial.consult.xml#4 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#7 integrate .. //depot/projects/dtrace/www/share/sgml/press.xml#7 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.52 2006/05/16 13:58:43 keramida Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.53 2006/10/23 15:07:00 yar Exp $ SUBDIR = SUBDIR+= 5-roadmap @@ -39,6 +39,7 @@ SUBDIR+= pr-guidelines SUBDIR+= problem-reports SUBDIR+= pxe +SUBDIR+= rc-scripting SUBDIR+= relaydelay SUBDIR+= releng SUBDIR+= releng-packages ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#3 (text+ko) ==== @@ -20,7 +20,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/version-guide/article.sgml,v 1.9 2005/11/09 01:20:12 linimon Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/version-guide/article.sgml,v 1.10 2006/10/23 07:08:58 keramida Exp $ &tm-attrib.freebsd; @@ -65,24 +65,24 @@ The goal of a major release is to introduce a set of new - features. Where necessary, it may be necessary to break - compatibility with previous major releases in order to advance - the state of &os;, or, occasionally, to drop features that - it is no longer feasible to support. + features. Inevitably, as new features are added to &os;, or as + older features are no longer useful or are dropped, it is + sometimes necessary to break compatibility with previous major + releases. The goal of a minor release is primarily to fix bugs and - improve performance and stability. Keeping compatibility + improve performance and stability. Keeping both source-level and binary compatibility from one minor release to another is a priority. On occasion, new features may be added to a minor release when it is believed that these other goals will not be compromised. - However, keep in mind that a release version + However, keep in mind that a release version is merely a snapshot of the source tree at a particular point in - time which is given a particular name (or tag). + time which is given a particular name (or tag). (For instance, the tag that Release Engineering assigned for the 5.4 release was RELENG_5_4_0_RELEASE.) Development always continues on what is known as the HEAD @@ -138,9 +138,9 @@ programs to be installed (termed the Ports Collection). Applications may be installed either from source, if its licensing terms allow such - redistribution (these are termed ports), - or as compiled binaries if allowed (these are termed - packages). + redistribution (these are called ports), + or as compiled binaries if allowed (these are called + packages). @@ -303,13 +303,27 @@ resources but primarily due to the amount of volunteer effort that is available. - Interested readers should also see the current - Release - Engineering Schedule and - Security - Branch Schedule. Both documents also go into much - greater depth about the background and rationale behind - these decisions. + Interested readers should also see: + + + + + + The Release Engineering Schedule + + + + + + + The Security Branch Schedule + + + + + These documents go into much greater depth about the background and + rationale behind the decisions regarding the supported branches and the + lifetime of each branch. @@ -350,7 +364,7 @@ - If you have a short-term need, need the highest degree of + If you have a short-term need, would benefit from the highest degree of stability currently available, and are not able to devote many resources to upgrading, then you will probably want to install the latest STABLE minor release and remain ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#3 (text+ko) ==== @@ -5,10 +5,17 @@ %articles.ent; + + + +Frisbee"> +Ghost"> +Nessus"> + ]>
- Creating a Software Testing Environment Using FreeBSD + Creating a Software Testing Environment Using &os; @@ -21,12 +28,14 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml,v 1.4 2006/02/14 14:56:48 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml,v 1.5 2006/10/24 18:09:18 keramida Exp $ &tm-attrib.freebsd; &tm-attrib.cvsup; &tm-attrib.intel; + &tm-attrib.microsoft; + &tm-attrib.symantec; &tm-attrib.xfree86; &tm-attrib.general; @@ -42,20 +51,20 @@ Overview From late 2003 until early 2005, I was a tester in an - all-Windows environment. Although unlikely on the face of it, - FreeBSD became a valuable test tool platform in that context. - FreeBSD contains useful and powerful applications for any tester + all-&windows; environment. Although unlikely on the face of it, + &os; became a valuable test tool platform in that context. + &os; contains useful and powerful applications for any tester in any environment. - Unlike Linux, FreeBSD is a single monolithic project rather + Unlike Linux, &os; is a single monolithic project, rather than a collection of disparate parts assembled into a - distribution. And the most attractive part of FreeBSD for a - software tester is the FreeBSD ports collection—a very large, - managed set of software applications with a single simple and + distribution. And the most attractive part of &os; for a + software tester is the &os.ports;—a very large, + managed set of software applications with a single, simple, and uniform installation procedure. This paper describes several software test tools from the - FreeBSD ports collection that I used to test software and + &os.ports; that I used to test software and systems in an all-Windows environment. @@ -66,13 +75,13 @@ Software testing environments are radically more complex than software development environments. Interconnected systems to test, network entities, databases, and filesystems present - challenges to testers that developers can for the most part mock + challenges to testers that developers can, for the most part, mock out and essentially ignore. Software testers need more tools, and more complex tools, than do software developers. On the other hand, software development tools are much more - highly evolved than software testing tools. There is no Eclipse - or IntelliJ or even Visual Studio aimed at testing. Testers + highly evolved than software testing tools. There is no Eclipse, + or IntelliJ, or even Visual Studio aimed at testing. Testers struggle and scratch to find tools appropriate to their test environments and appropriate to their Systems Under Test (SUTs). @@ -84,36 +93,36 @@ - The FreeBSD Solution + The &os; Solution Introduction - The set of tools available with the FreeBSD Operating - System is amazing. The FreeBSD ports collection + The set of tools available with the &os; Operating + System is amazing. The &os; &ports; contains more than thirteen thousand separate applications, all of which have a standard installation procedure and conform to a set of guidelines that make them reliable without the need to manage dependencies, appropriate versions, and all of the other problems that affect even the most well-managed Linux distribution or the various versions of Microsoft - Windows. The monolithic nature of FreeBSD and the FreeBSD - ports collection removes much of the trouble of integrating + Windows. The monolithic nature of &os; and the &os.ports; + removes much of the trouble of integrating tools with the test environment, regardless of the OS under - which the SUT runs. FreeBSD is a highly evolved server + which the SUT runs. &os; is a highly evolved server environment, and contains so many reliable applications, that - every tester should consider adding a FreeBSD machine (or + every tester should consider adding a &os; machine (or several) to their test environment. Of course, all of the applications available in the - FreeBSD ports collection will not be appropriate for any single + &os.ports; will not be appropriate for any single test environment. Some of the obvious choices for software and systems testing are the six hundred or so system utilities, the more than one thousand network tools, and the fifty-odd benchmarking tools. Whether your test environment is Windows, - UNIX, Linux, Mac OS, FreeBSD itself, or some combination of - any of them, FreeBSD and the FreeBSD ports collection is a + UNIX, Linux, Mac OS, &os; itself, or some combination of + any of them, &os; and the &os.ports; is a great place to look first. @@ -121,50 +130,49 @@ How To Use The Ports System - Installing an application from the FreeBSD ports - collection is a simple matter of: + Installing an application from the &os.ports; is a simple matter of: &prompt.root; cd /usr/ports/foo &prompt.root; make install and the system does the rest. It reports build status and test status, and installs all the relevant documentation as - well. This aspect of FreeBSD is very attractive to a tester, + well. This aspect of &os; is very attractive to a tester, who typically is pressed for time! - FreeBSD For Testing + &os; For Testing The test environment should be more stable than the SUT. - Once the tester decides to use the tools available on FreeBSD, - FreeBSD's long record of reliability makes it an easy choice + Once the tester decides to use the tools available on &os;, + &os;'s long record of reliability makes it an easy choice for a test tools platform. - My own introduction to FreeBSD occurred when I was hired + My own introduction to &os; occurred when I was hired by a major vendor of large-scale network security video services to be their network-testing person in an all-Windows environment. My first assignment was to replace the obsolete, buggy, disk imaging system. I chose to do that with an Open Source disk imaging system called Frisbee - which was implemented originally on FreeBSD. I built the + url="http://www.cs.utah.edu/flux/papers/frisbee-usenix03-base.html">&frisbee; + which was implemented originally on &os;. I built the system—a feature-for-feature replacement for an expensive proprietary system—but we never actually used it in our production system. - In the meantime, I had discovered the FreeBSD ports - collection and started to use some of those tools for testing; - and I had discovered the power of disk imaging with Frisbee, + In the meantime, I had discovered the &os.ports; + and started to use some of those tools for testing; + and I had discovered the power of disk imaging with &frisbee;, especially for smoke testing and installation testing; and - FreeBSD became a permanent part of my test lab. The test lab - I built, and the FreeBSD systems I created still exist, and + &os; became a permanent part of my test lab. The test lab + I built, and the &os; systems I created still exist, and still provide value to the testers there. - FreeBSD For Collaboration: Twiki + &os; For Collaboration: Twiki A wiki is a simple set of web pages to allow many users to share information and collaborate on any sort of documents. @@ -199,8 +207,8 @@ itself handled version control for such updates. As with all of the examples in this paper, installing - Twiki on FreeBSD is fairly simple. It takes just a few - minutes on a FreeBSD system. However, if you want to use Twiki + Twiki on &os; is fairly simple. It takes just a few + minutes on a &os; system. However, if you want to use Twiki on a Microsoft Windows platform, I strongly suggest you read the Twiki documentation extremely carefully. I know someone who installed Twiki on Windows, and it took him several days. @@ -208,27 +216,27 @@ also deep knowledge of Cygwin and Perl. Furthermore, at one point in the project I had to migrate - my wiki from a machine running FreeBSD 4.8 to one running - FreeBSD 5.3. The migration consisted merely of installing - Twiki on FreeBSD 5.3; using tar on the FreeBSD 4.8 + my wiki from a machine running &os; 4.8 to one running + &os; 5.3. The migration consisted merely of installing + Twiki on &os; 5.3; using tar on the &os; 4.8 machine to gather all of the Twiki data files specific to my - testing; FTPing the gathered files to the new FreeBSD 5.3 + testing; FTPing the gathered files to the new &os; 5.3 machine; and untarring the file. The complete set of Twiki documents migrated with no issues or problems at all. That is - the power of a unified system like FreeBSD. + the power of a unified system like &os;. - FreeBSD For Disk Imaging: Frisbee + &os; For Disk Imaging: Frisbee A disk imaging system is a mechanism for saving and restoring all of the data on a physical disk. The most popular commercial system for doing this is probably the - product Ghost from Symantec. + product &ghost;™ from Symantec. - The Frisbee enterprise disk imaging system mentioned above + The &frisbee; enterprise disk imaging system mentioned above had a lot of features I never implemented in the test lab. - Using Frisbee and an Open Source tool called PXELINUX, I was + Using &frisbee; and an Open Source tool called PXELINUX, I was able to: @@ -239,37 +247,37 @@ Make a set of restore CDs for the client - In the test lab, I only needed to boot from the Frisbee - CD, make an image, or lay down an image on the client machine. - Both Frisbee and proprietary imaging systems allow the user to + In the test lab, I only needed to boot from the &frisbee; CD, + make an image, or lay down an image on the client machine. + Both &frisbee; and proprietary imaging systems allow the user to image individual drives on the client, but I never had a need to do this. Installation testing was a large part of my duties at the - company where I used FreeBSD. To do this testing, I would - typically use Frisbee to make an image of a machine containing + company where I used &os;. To do this testing, I would + typically use &frisbee; to make an image of a machine containing only a Windows OS, install the SUT, and run a smoke test. The smoke test typically left the test machine in a very bad state. But instead of having to painstakingly clean up the mess left by the failed installation, I simply re-imaged the machine in question with the bare OS image and started over. A typical re-image containing only the Windows OS and a few - test tools took less than three minutes. Using Frisbee, we + test tools took less than three minutes. Using &frisbee;, we could run smoke tests on about six builds per day; before - Frisbee, we could run smoke tests on about three builds per + &frisbee;, we could run smoke tests on about three builds per week. - Of course, Ghost or other proprietary tools also image + Of course, &ghost; or other proprietary tools also image machines quickly under these circumstances: once you buy the tool, license the software, install it on an appropriate - server, and configure it properly. I prefer Frisbee to Ghost - because: Frisbee is marginally faster; Frisbee is very easy to - install on FreeBSD; and Frisbee is very efficient. Adding a - couple of small Perl scripts to the normal Frisbee + server, and configure it properly. I prefer &frisbee; to &ghost; + because: &frisbee; is marginally faster; &frisbee; is very easy to + install on &os;; and &frisbee; is very efficient. Adding a + couple of small Perl scripts to the normal &frisbee; distribution gave me an imaging environment tailored for the test lab. - I also used Frisbee to preserve the state of a machine + I also used &frisbee; to preserve the state of a machine after I had uncovered particularly complex defects. That is, if it took a large effort (many steps and/or a long duration of time) to demonstrate a defect, I could make an image of the @@ -279,64 +287,64 @@ - FreeBSD Security Testing: Nessus + &os; Security Testing: &nessus; Whenever you have more than one entity on a network, and whenever you expose a server to the wider Internet, security of the machine itself is always a concern. Nessus is an Open Source + url="http://www.nessus.org">&nessus; is an Open Source remote vulnerability scanner for security and penetration testing that consistently is rated among the top products of its type throughout the security industry. - Nessus probes a remote machine over the network for + &nessus; probes a remote machine over the network for security vulnerabilities. It does a port scan, finds which ports are open, and investigates the software that has those ports open for a huge number of security risks, for all major OSs. It generates detailed reports in a number of formats that anyone can understand. The number of security probes - available in the default installation of Nessus is very large, + available in the default installation of &nessus; is very large, but sophisticated security and penetration testers take - advantage of NASL, the Nessus Attack Scripting Language, to - craft their own attacks using Nessus' available features. + advantage of NASL, the &nessus; Attack Scripting Language, to + craft their own attacks using &nessus;' available features. - Of interest is that, while Nessus is a free download for - UNIX-like systems (and is available in the ports collection of - FreeBSD), it is available on Windows only as a commercial - product from a company called Tenable. The Tenable product is - NeWT, Nessus on Windows Technology. + Of interest is that, while &nessus; is a free download for + UNIX-like systems (and is available in the &ports; of + &os;), it is available on Windows only as a commercial + product from a company called Tenable. The Tenable product is + NeWT, Nessus on Windows Technology. - FreeBSD Network Tools + &os; Network Tools - FreeBSD is most widely used as a robust server platform. + &os; is most widely used as a robust server platform. It follows, then, that tools related to network analysis and - performance will be highly evolved on FreeBSD. Here is a + performance will be highly evolved on &os;. Here is a brief description of network diagnostic tools that I found invaluable in testing in a networked environment. From the name, one would assume that ntop emulates the functions of - the UNIX top command, but for the network + the UNIX &man.top.1; command, but for the network rather than for the local machine. Perhaps the first version - did; currently, ntop is capable of providing detailed + did; currently, ntop is capable of providing detailed information about a huge number of hosts and their status and activities on the network. For testing, two features I found very powerful: at a high - level, ntop shows the amount of network + level, ntop shows the amount of network traffic on the entire network segment minute-by-minute, hour-by-hour, and day-by-day in a graphical format. Also, - ntop shows information about recent connections between + ntop shows information about recent connections between individual hosts on the network. It is easy to see traffic trends on the network as they - are occurring; also, if something anomalous appears, ntop + are occurring; also, if something anomalous appears, ntop records detailed information about network connections between hosts, including the ports over which the connection happened. This was critically important when analyzing software - issues. If ntop showed a period of time for which traffic was + issues. If ntop showed a period of time for which traffic was particularly high, I would find out which host was generating the traffic. I would examine the software running on that host, over that port. Often it was a new build with a @@ -345,22 +353,22 @@ Ettercap is a tool for ARP poisoning which can also decipher passwords on the fly and corrupt IP traffic by means of a Man In The Middle - (MITM) attack. However, I used ettercap as a performance tool. - In my test labs, all of my FreeBSD machines ran on discarded + (MITM) attack. However, I used Ettercap as a performance tool. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 25 06:51:10 2006 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 64CA116A412; Wed, 25 Oct 2006 06:51:10 +0000 (UTC) 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 176E816A407 for ; Wed, 25 Oct 2006 06:51:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D91BF43D5D for ; Wed, 25 Oct 2006 06:51:09 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9P6p9r2098146 for ; Wed, 25 Oct 2006 06:51:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9P6p9IT098139 for perforce@freebsd.org; Wed, 25 Oct 2006 06:51:09 GMT (envelope-from jb@freebsd.org) Date: Wed, 25 Oct 2006 06:51:09 GMT Message-Id: <200610250651.k9P6p9IT098139@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 108390 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, 25 Oct 2006 06:51:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=108390 Change 108390 by jb@jb_freebsd7 on 2006/10/25 06:51:03 IFlibbsdelf Affected files ... .. //depot/projects/dtrace/src/lib/libelf/elf_types.m4#3 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_getphdr.3#2 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf.c#4 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf.h#9 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#9 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf_fsize.m4#4 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf_msize.m4#3 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf_phdr.c#2 integrate Differences ... ==== //depot/projects/dtrace/src/lib/libelf/elf_types.m4#3 (text+ko) ==== @@ -35,6 +35,7 @@ `DYN, Dyn', `EHDR, Ehdr', `HALF, Half', + `LWORD, Lword', `MOVE, Move', `MOVEP, MoveP', `NOTE, Note', @@ -62,7 +63,7 @@ * in the sequence used in the file representation of `NAME'. * * Each member list element comprises a pair containing a field name - * and a basic type. Basic types include IDENT, HALF, WORD, + * and a basic type. Basic types include IDENT, HALF, WORD, LWORD, * ADDR{32,64}, OFF{32,64}, SWORD, XWORD, SXWORD. * * The last element of a member list is the null element: `_,_'. @@ -70,6 +71,16 @@ define(`DEFINE_STRUCT',`define(`$1_DEF',shift($@))dnl') +DEFINE_STRUCT(`Elf32_Cap', + ``c_tag, WORD', + `c_un.c_val, WORD', + `_,_'') + +DEFINE_STRUCT(`Elf64_Cap', + ``c_tag, XWORD', + `c_un.c_val, XWORD', + `_,_'') + DEFINE_STRUCT(`Elf32_Dyn', ``d_tag, SWORD', `d_un.d_ptr, WORD', @@ -114,6 +125,22 @@ `e_shstrndx, HALF', `_,_'') +DEFINE_STRUCT(`Elf32_Move', + ``m_value, LWORD', + `m_info, WORD', + `m_poffset, WORD', + `m_repeat, HALF', + `m_stride, HALF', + `_,_'') + +DEFINE_STRUCT(`Elf64_Move', + ``m_value, LWORD', + `m_info, XWORD', + `m_poffset, XWORD', + `m_repeat, HALF', + `m_stride, HALF', + `_,_'') + DEFINE_STRUCT(`Elf32_Phdr', ``p_type, WORD', `p_offset, OFF', @@ -202,6 +229,16 @@ `st_size, XWORD', `_,_'') +DEFINE_STRUCT(`Elf32_Syminfo', + ``si_boundto, HALF', + `si_flags, HALF', + `_,_'') + +DEFINE_STRUCT(`Elf64_Syminfo', + ``si_boundto, HALF', + `si_flags, HALF', + `_,_'') + DEFINE_STRUCT(`Elf32_Verdaux', ``vda_name, WORD', `vda_next, WORD', ==== //depot/projects/dtrace/src/lib/libelf/gelf_getphdr.3#2 (text+ko) ==== @@ -41,7 +41,7 @@ .Fn elf64_getphdr "Elf *elf" .In gelf.h .Ft "GElf_Phdr *" -.Fn gelf_getehdr "Elf *elf" "int index" "GElf_Phdr *dst" +.Fn gelf_getphdr "Elf *elf" "int index" "GElf_Phdr *dst" .Sh DESCRIPTION These functions retrieve and translate ELF program header information from an ELF descriptor, if this information exists. @@ -104,12 +104,24 @@ Index .Ar index was out of range. +.It Bq Er ELF_E_CLASS +The class of ELF descriptor +.Ar elf +did not match the expected class of the function being called. .It Bq Er ELF_E_HEADER ELF descriptor .Ar elf did not possess an executable header. +.It Bq Er ELF_E_HEADER +ELF descriptor +.Ar elf +had a corrupt executable header. .It Bq Er ELF_E_RESOURCE An out of memory condition was detected. +.It Bq Er ELF_VERSION +ELF descriptor +.Ar elf +was of an unsupported version. .El .Sh SEE ALSO .Xr elf 3 , ==== //depot/projects/dtrace/src/lib/libelf/libelf.c#4 (text+ko) ==== @@ -71,13 +71,13 @@ static struct memalign memalign[ELF_T_NUM] = { [ELF_T_ADDR] = ALIGNMENT(Addr), [ELF_T_BYTE] = { .ma32 = 1, .ma64 = 1 }, - [ELF_T_CAP] = UNSUPPORTED(), + [ELF_T_CAP] = ALIGNMENT(Cap), [ELF_T_DYN] = ALIGNMENT(Dyn), [ELF_T_EHDR] = ALIGNMENT(Ehdr), [ELF_T_HALF] = ALIGNMENT(Half), - [ELF_T_MOVE] = UNSUPPORTED(), + [ELF_T_MOVE] = ALIGNMENT(Move), [ELF_T_MOVEP] = UNSUPPORTED(), - [ELF_T_NOTE] = UNSUPPORTED(), + [ELF_T_NOTE] = ALIGNMENT(Nhdr), [ELF_T_OFF] = ALIGNMENT(Off), [ELF_T_PHDR] = ALIGNMENT(Phdr), [ELF_T_REL] = ALIGNMENT(Rel), @@ -85,7 +85,7 @@ [ELF_T_SHDR] = ALIGNMENT(Shdr), [ELF_T_SWORD] = ALIGNMENT(Sword), [ELF_T_SXWORD] = ALIGN64(Sxword), - [ELF_T_SYMINFO] = UNSUPPORTED(), + [ELF_T_SYMINFO] = ALIGNMENT(Syminfo), [ELF_T_SYM] = ALIGNMENT(Sym), #if __FreeBSD_version >= 700009 [ELF_T_VDEF] = ALIGNMENT(Verdef), ==== //depot/projects/dtrace/src/lib/libelf/libelf.h#9 (text+ko) ==== @@ -58,6 +58,7 @@ ELF_T_DYN, ELF_T_EHDR, ELF_T_HALF, + ELF_T_LWORD, ELF_T_MOVE, ELF_T_MOVEP, ELF_T_NOTE, ==== //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#9 (text+ko) ==== @@ -74,9 +74,10 @@ (X) = _t; \ } while (0) #define SWAP_ADDR64(X) SWAP_WORD64(X) +#define SWAP_LWORD(X) SWAP_WORD64(X) #define SWAP_OFF64(X) SWAP_WORD64(X) +#define SWAP_SXWORD(X) SWAP_WORD64(X) #define SWAP_XWORD(X) SWAP_WORD64(X) -#define SWAP_SXWORD(X) SWAP_WORD64(X) /* * Write out various integral values. The destination pointer could @@ -124,6 +125,7 @@ (P) = _p + 8; \ } while (0) #define WRITE_ADDR64(P,X) WRITE_WORD64(P,X) +#define WRITE_LWORD(P,X) WRITE_WORD64(P,X) #define WRITE_OFF64(P,X) WRITE_WORD64(P,X) #define WRITE_SXWORD(P,X) WRITE_WORD64(P,X) #define WRITE_XWORD(P,X) WRITE_WORD64(P,X) @@ -186,6 +188,7 @@ (X) = _t; \ } while (0) #define READ_ADDR64(P,X) READ_WORD64(P,X) +#define READ_LWORD(P,X) READ_WORD64(P,X) #define READ_OFF64(P,X) READ_WORD64(P,X) #define READ_SXWORD(P,X) READ_WORD64(P,X) #define READ_XWORD(P,X) READ_WORD64(P,X) @@ -227,11 +230,8 @@ `define(IGNORE_$1`'32, 1) define(IGNORE_$1`'64, 1)') -IGNORE(CAP) -IGNORE(MOVE) IGNORE(MOVEP) IGNORE(NOTE) -IGNORE(SYMINFO) ifelse(eval(OSRELDATE < 700009),1, `IGNORE(VDEF) @@ -250,6 +250,7 @@ define(`BASE_BYTE', 1) define(`BASE_HALF', 1) define(`BASE_WORD', 1) +define(`BASE_LWORD', 1) define(`BASE_SWORD', 1) define(`BASE_XWORD', 1) define(`BASE_SXWORD', 1) ==== //depot/projects/dtrace/src/lib/libelf/libelf_fsize.m4#4 (text+ko) ==== @@ -47,11 +47,8 @@ define(`IDENT_SIZE', `EI_NIDENT') /* Currently unimplemented types */ -define(`CAP_SIZE', 0) -define(`MOVE_SIZE', 0) define(`MOVEP_SIZE', 0) define(`NOTE_SIZE', 0) -define(`SYMINFO_SIZE', 0) /* Overrides for 32 bit types that do not exist */ define(`XWORD_SIZE32', 0) ==== //depot/projects/dtrace/src/lib/libelf/libelf_msize.m4#3 (text+ko) ==== @@ -52,11 +52,8 @@ /* * Unimplemented types. */ -define(CAP_SIZE, 0) -define(MOVE_SIZE, 0) define(MOVEP_SIZE, 0) define(NOTE_SIZE, 0) -define(SYMINFO_SIZE, 0) define(SXWORD_SIZE32, 0) define(XWORD_SIZE32, 0) ==== //depot/projects/dtrace/src/lib/libelf/libelf_phdr.c#2 (text+ko) ==== @@ -82,7 +82,7 @@ assert(fsz > 0); - if ((uint64_t) e->e_rawsize <= (phoff + fsz)) { + if ((uint64_t) e->e_rawsize < (phoff + fsz)) { LIBELF_SET_ERROR(HEADER, 0); return (NULL); } From owner-p4-projects@FreeBSD.ORG Wed Oct 25 07:55:30 2006 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 DC1D916A47C; Wed, 25 Oct 2006 07:55:29 +0000 (UTC) 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 9CA9D16A417 for ; Wed, 25 Oct 2006 07:55:29 +0000 (UTC) (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 37E7A43D64 for ; Wed, 25 Oct 2006 07:55:29 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9P7tTjR009783 for ; Wed, 25 Oct 2006 07:55:29 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9P7tScW009780 for perforce@freebsd.org; Wed, 25 Oct 2006 07:55:28 GMT (envelope-from imp@freebsd.org) Date: Wed, 25 Oct 2006 07:55:28 GMT Message-Id: <200610250755.k9P7tScW009780@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 108392 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, 25 Oct 2006 07:55:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=108392 Change 108392 by imp@imp_lighthouse on 2006/10/25 07:54:28 Merge in preliminary write support. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#12 edit .. //depot/projects/arm/src/sys/arm/at91/at91_sscreg.h#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#12 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.3 2006/10/20 07:08:59 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.2 2006/07/14 22:30:44 imp Exp $"); #include #include @@ -34,9 +34,13 @@ #include #include #include +#include #include #include +#include + +#define MAX_BUF 1024 struct at91_ssc_softc { @@ -48,6 +52,11 @@ struct cdev *cdev; int flags; #define OPENED 1 + bus_dma_tag_t tag; /* bus dma tag */ + bus_dmamap_t tx_map; + int txdone; + uint8_t rx_buf[MAX_BUF]; + bus_dmamap_t rx_map; }; static inline uint32_t @@ -129,6 +138,22 @@ AT91_SSC_LOCK_DESTROY(sc); goto out; } + + /* + * Allocate DMA tags and maps + */ + err = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, + BUS_SPACE_MAXADDR, NULL, NULL, 2048, 1, 2048, BUS_DMA_ALLOCNOW, + NULL, NULL, &sc->tag); + if (err != 0) + goto out; + err = bus_dmamap_create(sc->tag, 0, &sc->tx_map); + if (err != 0) + goto out; + err = bus_dmamap_create(sc->tag, 0, &sc->rx_map); + if (err != 0) + goto out; + sc->cdev = make_dev(&at91_ssc_cdevsw, device_get_unit(dev), UID_ROOT, GID_WHEEL, 0600, "ssc%d", device_get_unit(dev)); if (sc->cdev == NULL) { @@ -149,7 +174,7 @@ WR4(sc, SSC_TFMR, 0x1f | SSC_TFMR_DATDEF | SSC_TFMR_MSFBF | SSC_TFMR_FSOS_NEG_PULSE); -out:; +out: if (err) at91_ssc_deactivate(dev); return (err); @@ -209,16 +234,19 @@ at91_ssc_intr(void *xsc) { struct at91_ssc_softc *sc = xsc; -#if 0 uint32_t status; /* Reading the status also clears the interrupt */ status = RD4(sc, SSC_SR); if (status == 0) return; + if (status & SSC_SR_ENDTX) { + WR4(sc, SSC_IDR, SSC_SR_ENDTX); + sc->txdone++; + wakeup(&sc->txdone); + } AT91_SSC_LOCK(sc); AT91_SSC_UNLOCK(sc); -#endif wakeup(sc); return; } @@ -232,9 +260,6 @@ AT91_SSC_LOCK(sc); if (!(sc->flags & OPENED)) { sc->flags |= OPENED; -#if 0 - // Enable interrupts -#endif } AT91_SSC_UNLOCK(sc); return (0); @@ -248,13 +273,23 @@ sc = CDEV2SOFTC(dev); AT91_SSC_LOCK(sc); sc->flags &= ~OPENED; -#if 0 - // Disable interrupts -#endif AT91_SSC_UNLOCK(sc); return (0); } +static void +at91_ssc_loadwrite(void *arg, bus_dma_segment_t *segs, int nsegs, + bus_size_t size, int error) +{ + struct at91_ssc_softc *sc; + + sc = arg; + if (error != 0) + return; + WR4(sc, PDC_TPR, segs[0].ds_addr); + WR4(sc, PDC_TCR, size); +} + static int at91_ssc_read(struct cdev *dev, struct uio *uio, int flag) { @@ -264,7 +299,29 @@ static int at91_ssc_write(struct cdev *dev, struct uio *uio, int flag) { - return EIO; + struct at91_ssc_softc *sc; + int err, txdone; + + sc = CDEV2SOFTC(dev); + // must write a multiple of 4 bytes + if ((uio->uio_resid & 0x3) != 0 || uio->uio_resid > MAX_BUF) + return (EINVAL); + WR4(sc, SSC_CR, SSC_CR_TXDIS); + WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS); + err = bus_dmamap_load_uio(sc->tag, sc->tx_map, uio, at91_ssc_loadwrite, + sc, 0); + if (err != 0) + return (err); + WR4(sc, SSC_IER, SSC_SR_ENDTX); + WR4(sc, SSC_CR, SSC_CR_TXEN); + WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); + txdone = sc->txdone; + do { + err = msleep(&sc->txdone, NULL, PCATCH | PZERO, "sscwr", hz); + } while (txdone == sc->txdone && err != EINTR); + if (err == 0) + uio->uio_resid = 0; + return err; } static device_method_t at91_ssc_methods[] = { ==== //depot/projects/arm/src/sys/arm/at91/at91_sscreg.h#7 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_sscreg.h,v 1.2 2006/10/20 07:08:15 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_sscreg.h,v 1.1 2006/03/24 07:42:33 imp Exp $ */ #ifndef ARM_AT91_AT91_SSCREG_H #define ARM_AT91_AT91_SSCREG_H @@ -132,4 +132,18 @@ #define SSC_TFMR_DATDEF (1u << 5) /* DATDEF: Data Default Value */ #define SSC_TFMR_DATLEN (0x1fu << 0) /* DATLEN: Data Length */ +/* SSC_SR */ +#define SSC_SR_TXRDY (1u << 0) +#define SSC_SR_TXEMPTY (1u << 1) +#define SSC_SR_ENDTX (1u << 2) +#define SSC_SR_TXBUFE (1u << 3) +#define SSC_SR_RXRDY (1u << 4) +#define SSC_SR_OVRUN (1u << 5) +#define SSC_SR_ENDRX (1u << 6) +#define SSC_SR_RXBUFF (1u << 7) +#define SSC_SR_TXSYN (1u << 10) +#define SSC_SR_RSSYN (1u << 11) +#define SSC_SR_TXEN (1u << 16) +#define SSC_SR_RXEN (1u << 17) + #endif /* ARM_AT91_AT91_SSCREG_H */ From owner-p4-projects@FreeBSD.ORG Wed Oct 25 08:07:48 2006 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 9630D16A417; Wed, 25 Oct 2006 08:07:48 +0000 (UTC) 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 5895216A415 for ; Wed, 25 Oct 2006 08:07:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 203B343D55 for ; Wed, 25 Oct 2006 08:07:48 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9P87mRr012666 for ; Wed, 25 Oct 2006 08:07:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9P87jqa012663 for perforce@freebsd.org; Wed, 25 Oct 2006 08:07:45 GMT (envelope-from jb@freebsd.org) Date: Wed, 25 Oct 2006 08:07:45 GMT Message-Id: <200610250807.k9P87jqa012663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 108395 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, 25 Oct 2006 08:07:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=108395 Change 108395 by jb@jb_freebsd7 on 2006/10/25 08:07:02 IFopensolaris Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/src/Getopt.java#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/src/JDTrace.java#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/src/jdtrace.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/Makefile.pkg#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/SUNWdtrt/prototype_com#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/bitarch.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.c#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh.out#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.copyin2.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.execname.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.pid.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.violentdeath.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.zonename.d#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/sched/tst.stackdepth.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/struct/tst.StructInside.d#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.openret.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.andpid.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.badguess.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose2.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.entryreturn.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.fork.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.guess32.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.guess64.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.header.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkpriv.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.linkunpriv.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiple.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.nodtrace.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.onlyenabled.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reeval.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.static2.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.user.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/ustack/tst.depth.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/ustack/tst.spin.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/vars/tst.ucaller.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/i386/pid/tst.retlist.ksh#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pcontrol.h#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Pexecname.c#4 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libproc/common/Psymtab.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#6 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#10 integrate Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#2 (text+ko) ==== @@ -23,9 +23,9 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "@(#)Makefile 1.1 06/08/28 SMI" +#ident "@(#)Makefile 1.2 06/09/26 SMI" include $(SRC)/Makefile.master -SUBDIRS = scripts baddof badioctl chkargs +SUBDIRS = scripts baddof badioctl chkargs jdtrace include ../Makefile.subdirs ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#2 (text+ko) ==== @@ -24,7 +24,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "@(#)dtest.pl 1.2 06/09/19 SMI" +# ident "@(#)dtest.pl 1.3 06/09/26 SMI" require 5.6.1; @@ -32,9 +32,11 @@ use File::Basename; use Getopt::Std; use Cwd; +use Cwd 'abs_path'; $PNAME = $0; $PNAME =~ s:.*/::; +$OPTSTR = 'abd:ghi:lqsux:'; $USAGE = "Usage: $PNAME [-abghlqsu] [-d dir] [-i isa] " . "[-x opt[=arg]] [file | dir ...]\n"; ($MACH = `uname -p`) =~ s/\W*\n//; @@ -45,6 +47,7 @@ $ksh_path = '/usr/bin/ksh'; @files = (); +%exceptions = (); $errs = 0; $bypassed = 0; @@ -80,6 +83,8 @@ print "\t -q set quiet mode (only report errors and summary)\n"; print "\t -s save results files even for tests that pass\n"; print "\t -x pass corresponding -x argument to dtrace(1M)\n"; + print "\n\tUse \"-i java\" to run tests using the "; + print "Java DTrace API.\n"; exit(2); } @@ -159,7 +164,48 @@ print LOG $msg if ($opt_l); } -die $USAGE unless (getopts('abd:ghi:lqsux:')); +# Trim leading and trailing whitespace +sub trim { + my($s) = @_; + + $s =~ s/^\s*//; + $s =~ s/\s*$//; + return $s; +} + +# Loads exception set of skipped tests +sub load_exceptions { + my($listfile) = @_; + my($line) = ""; + + exit(123) unless open(STDIN, "<$listfile"); + while () { + chomp; + $line = $_; + # line is non-empty and not a comment + if ((length($line) > 0) && ($line =~ /^\s*[^\s#]/ )) { + $exceptions{trim($line)} = 1; + } + } + return 0; +} + +# Return 1 if file name found in exception set, 0 otherwise +sub is_exception { + my($file) = @_; + my($i) = -1; + + # hash absolute pathname after $dt_tst/ + $file = abs_path($file); + $i = index($file, $dt_tst); + if ($i == 0) { + $file = substr($file, length($dt_tst) + 1); + return $exceptions{$file}; + } + return 0; +} + +die $USAGE unless (getopts($OPTSTR)); usage() if ($opt_h); foreach $arg (@ARGV) { @@ -172,8 +218,10 @@ } } -$defdir = -d '/opt/SUNWdtrt/tst' ? '/opt/SUNWdtrt/tst' : '.'; -$bindir = -d '/opt/SUNWdtrt/bin' ? '/opt/SUNWdtrt/bin' : '.'; +$dt_tst = '/opt/SUNWdtrt/tst'; +$dt_bin = '/opt/SUNWdtrt/bin'; +$defdir = -d $dt_tst ? $dt_tst : '.'; +$bindir = -d $dt_bin ? $dt_bin : '.'; find(\&wanted, "$defdir/common") if (scalar(@ARGV) == 0); find(\&wanted, "$defdir/$MACH") if (scalar(@ARGV) == 0); @@ -190,9 +238,16 @@ } if ($opt_i) { - $dtrace_path = "/usr/sbin/$opt_i/dtrace"; - die "$PNAME: dtrace(1M) for ISA $opt_i not found\n" - unless (-x "$dtrace_path"); + if ($opt_i eq "java") { + $dtrace_path = $bindir . "/jdtrace"; + die "$PNAME: jdtrace not found\n" + unless (-x "$dtrace_path"); + load_exceptions($bindir . "/exception.lst"); + } else { + $dtrace_path = "/usr/sbin/$opt_i/dtrace"; + die "$PNAME: dtrace(1M) for ISA $opt_i not found\n" + unless (-x "$dtrace_path"); + } } if ($opt_x) { @@ -372,6 +427,13 @@ next; } + if ($opt_i eq "java") { + if (is_exception("$dir/$name")) { + $bypassed++; + next; + } + } + if (!$isksh && -x $exe) { if (($exe_pid = fork()) == -1) { errmsg("ERROR: failed to fork to run $exe: $!\n"); @@ -410,7 +472,7 @@ if ($isksh) { exit(123) unless open(STDIN, "<$name"); - exec($ksh_path); + exec("$ksh_path /dev/stdin $dtrace_path"); } elsif (-x $name) { warn "ERROR: $name is executable\n"; exit(1); ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/Makefile.pkg#2 (text+ko) ==== @@ -23,11 +23,10 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "@(#)Makefile.pkg 1.1 06/08/28 SMI" +#ident "@(#)Makefile.pkg 1.2 06/09/26 SMI" include $(SRC)/Makefile.master -PKGARCHIVE = $(CODEMGR_WS)/pkgarchive/$(MACH) PACKAGE :sh= basename `pwd` ROOTOPTPKG = $(ROOT)/opt/$(PACKAGE) PSTAMP :sh= echo "`echo \$LOGNAME`:`date +%Y-%m-%d`:`basename \$CODEMGR_WS`" ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/pkg/SUNWdtrt/prototype_com#2 (text+ko) ==== @@ -23,7 +23,7 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "@(#)prototype_com 1.3 06/09/19 SMI" +# ident "@(#)prototype_com 1.6 06/10/13 SMI" # i pkginfo i copyright @@ -174,6 +174,10 @@ f none opt/SUNWdtrt/tst/common/aggs/tst.quantzero.d 0444 root bin f none opt/SUNWdtrt/tst/common/aggs/tst.quantzero.d.out 0444 root bin f none opt/SUNWdtrt/tst/common/aggs/tst.signature.d 0444 root bin +f none opt/SUNWdtrt/tst/common/aggs/tst.signedkeys.d 0444 root bin +f none opt/SUNWdtrt/tst/common/aggs/tst.signedkeys.d.out 0444 root bin +f none opt/SUNWdtrt/tst/common/aggs/tst.signedkeyspos.d 0444 root bin +f none opt/SUNWdtrt/tst/common/aggs/tst.signedkeyspos.d.out 0444 root bin f none opt/SUNWdtrt/tst/common/aggs/tst.subr.d 0444 root bin f none opt/SUNWdtrt/tst/common/aggs/tst.sum.d 0444 root bin f none opt/SUNWdtrt/tst/common/aggs/tst.sum.d.out 0444 root bin @@ -183,6 +187,8 @@ f none opt/SUNWdtrt/tst/common/aggs/tst.trunc0.d.out 0444 root bin f none opt/SUNWdtrt/tst/common/aggs/tst.truncquant.d 0444 root bin f none opt/SUNWdtrt/tst/common/aggs/tst.truncquant.d.out 0444 root bin +f none opt/SUNWdtrt/tst/common/aggs/tst.valsortkeypos.d 0444 root bin +f none opt/SUNWdtrt/tst/common/aggs/tst.valsortkeypos.d.out 0444 root bin d none opt/SUNWdtrt/tst/common/arithmetic 0755 root bin f none opt/SUNWdtrt/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d 0444 root bin f none opt/SUNWdtrt/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d 0444 root bin @@ -487,6 +493,7 @@ f none opt/SUNWdtrt/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d 0444 root bin f none opt/SUNWdtrt/tst/common/funcs/err.D_VAR_UNDEF.badvar.d 0444 root bin f none opt/SUNWdtrt/tst/common/funcs/err.badalloca.d 0444 root bin +f none opt/SUNWdtrt/tst/common/funcs/err.badalloca2.d 0444 root bin f none opt/SUNWdtrt/tst/common/funcs/err.badbcopy.d 0444 root bin f none opt/SUNWdtrt/tst/common/funcs/err.badbcopy1.d 0444 root bin f none opt/SUNWdtrt/tst/common/funcs/err.badbcopy2.d 0444 root bin @@ -531,6 +538,7 @@ f none opt/SUNWdtrt/tst/common/funcs/tst.strstr.d.out 0444 root bin f none opt/SUNWdtrt/tst/common/funcs/tst.strtok.d 0444 root bin f none opt/SUNWdtrt/tst/common/funcs/tst.strtok.d.out 0444 root bin +f none opt/SUNWdtrt/tst/common/funcs/tst.strtok_null.d 0444 root bin f none opt/SUNWdtrt/tst/common/funcs/tst.substr.d 0444 root bin f none opt/SUNWdtrt/tst/common/funcs/tst.substr.d.out 0444 root bin f none opt/SUNWdtrt/tst/common/funcs/tst.system.d 0444 root bin @@ -651,6 +659,8 @@ f none opt/SUNWdtrt/tst/common/pid/tst.emptystack.exe 0555 root bin f none opt/SUNWdtrt/tst/common/pid/tst.float.d 0444 root bin f none opt/SUNWdtrt/tst/common/pid/tst.float.exe 0555 root bin +f none opt/SUNWdtrt/tst/common/pid/tst.fork.d 0444 root bin +f none opt/SUNWdtrt/tst/common/pid/tst.fork.exe 0555 root bin f none opt/SUNWdtrt/tst/common/pid/tst.gcc.d 0444 root bin f none opt/SUNWdtrt/tst/common/pid/tst.gcc.exe 0555 root bin f none opt/SUNWdtrt/tst/common/pid/tst.manypids.ksh 0444 root bin @@ -830,6 +840,10 @@ f none opt/SUNWdtrt/tst/common/printf/tst.widths1.d 0444 root bin f none opt/SUNWdtrt/tst/common/printf/tst.wp.d 0444 root bin f none opt/SUNWdtrt/tst/common/printf/tst.wp.d.out 0444 root bin +d none opt/SUNWdtrt/tst/common/privs 0755 root bin +f none opt/SUNWdtrt/tst/common/privs/tst.func_access.ksh 0444 root bin +f none opt/SUNWdtrt/tst/common/privs/tst.op_access.ksh 0444 root bin +f none opt/SUNWdtrt/tst/common/privs/tst.unpriv_funcs.ksh 0444 root bin d none opt/SUNWdtrt/tst/common/probes 0755 root bin f none opt/SUNWdtrt/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d 0444 root bin f none opt/SUNWdtrt/tst/common/probes/err.D_PDESC_ZERO.probestar.d 0444 root bin @@ -898,6 +912,9 @@ f none opt/SUNWdtrt/tst/common/profile-n/tst.profileusec.d.out 0444 root bin f none opt/SUNWdtrt/tst/common/profile-n/tst.sym.ksh 0444 root bin f none opt/SUNWdtrt/tst/common/profile-n/tst.ufunc.ksh 0444 root bin +f none opt/SUNWdtrt/tst/common/profile-n/tst.ufuncsort.ksh 0444 root bin +f none opt/SUNWdtrt/tst/common/profile-n/tst.ufuncsort.exe 0555 root bin +f none opt/SUNWdtrt/tst/common/profile-n/tst.ufuncsort.ksh.out 0444 root bin f none opt/SUNWdtrt/tst/common/profile-n/tst.umod.ksh 0444 root bin f none opt/SUNWdtrt/tst/common/profile-n/tst.usym.ksh 0444 root bin d none opt/SUNWdtrt/tst/common/providers 0755 root bin @@ -947,8 +964,10 @@ f none opt/SUNWdtrt/tst/common/safety/tst.caller.d 0444 root bin f none opt/SUNWdtrt/tst/common/safety/tst.cleanpath.d 0444 root bin f none opt/SUNWdtrt/tst/common/safety/tst.copyin.d 0444 root bin +f none opt/SUNWdtrt/tst/common/safety/tst.copyin2.d 0444 root bin f none opt/SUNWdtrt/tst/common/safety/tst.ddi_pathname.d 0444 root bin f none opt/SUNWdtrt/tst/common/safety/tst.dirname.d 0444 root bin +f none opt/SUNWdtrt/tst/common/safety/tst.execname.d 0444 root bin f none opt/SUNWdtrt/tst/common/safety/tst.hton.d 0444 root bin f none opt/SUNWdtrt/tst/common/safety/tst.errno.d 0444 root bin f none opt/SUNWdtrt/tst/common/safety/tst.gid.d 0444 root bin @@ -956,6 +975,7 @@ f none opt/SUNWdtrt/tst/common/safety/tst.msgdsize.d 0444 root bin f none opt/SUNWdtrt/tst/common/safety/tst.msgsize.d 0444 root bin f none opt/SUNWdtrt/tst/common/safety/tst.null.d 0444 root bin +f none opt/SUNWdtrt/tst/common/safety/tst.pid.d 0444 root bin f none opt/SUNWdtrt/tst/common/safety/tst.ppid.d 0444 root bin f none opt/SUNWdtrt/tst/common/safety/tst.progenyof.d 0444 root bin f none opt/SUNWdtrt/tst/common/safety/tst.random.d 0444 root bin @@ -975,6 +995,7 @@ f none opt/SUNWdtrt/tst/common/safety/tst.ustackdepth.d 0444 root bin f none opt/SUNWdtrt/tst/common/safety/tst.vahole.d 0444 root bin f none opt/SUNWdtrt/tst/common/safety/tst.violentdeath.ksh 0444 root bin +f none opt/SUNWdtrt/tst/common/safety/tst.zonename.d 0444 root bin d none opt/SUNWdtrt/tst/common/scalars 0755 root bin f none opt/SUNWdtrt/tst/common/scalars/err.D_ARR_LOCAL.thisarray.d 0444 root bin f none opt/SUNWdtrt/tst/common/scalars/err.D_DECL_CLASS.selfthis.d 0444 root bin @@ -1333,3 +1354,37 @@ f none opt/SUNWdtrt/tst/common/vars/tst.walltimestamp.d 0444 root bin d none opt/SUNWdtrt/tst/common/version 0755 root bin f none opt/SUNWdtrt/tst/common/version/tst.1.0.d 0444 root bin + +# Java DTrace API +d none opt/SUNWdtrt/lib 0755 root bin +d none opt/SUNWdtrt/lib/java 0755 root bin +f none opt/SUNWdtrt/lib/java/jdtrace.jar 0644 root bin +f none opt/SUNWdtrt/bin/jdtrace 0555 root bin +f none opt/SUNWdtrt/bin/exception.lst 0444 root bin +d none opt/SUNWdtrt/tst/common/java_api 0755 root bin +f none opt/SUNWdtrt/tst/common/java_api/test.jar 0644 root bin +f none opt/SUNWdtrt/tst/common/java_api/bitarch.exe 0555 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.ProbeDescription.ksh 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.ProbeDescription.ksh.out 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.Bean.ksh 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.Bean.ksh.out 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.StopLock.ksh 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.StopLock.ksh.out 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.FunctionLookup.ksh 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.FunctionLookup.exe 0555 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.FunctionLookup.ksh.out 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.Close.ksh 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.Close.ksh.out 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.Abort.ksh 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.Abort.ksh.out 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.MultiAggPrinta.ksh 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.MultiAggPrinta.ksh.out 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.printa.d 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.printa.d.out 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.ProbeData.ksh 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.ProbeData.exe 0555 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.ProbeData.ksh.out 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.StateMachine.ksh 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.StateMachine.ksh.out 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.Enable.ksh 0444 root bin +f none opt/SUNWdtrt/tst/common/java_api/tst.Enable.ksh.out 0444 root bin ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#2 (text+ko) ==== @@ -23,8 +23,9 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "@(#)Makefile 1.1 06/08/28 SMI" +#ident "@(#)Makefile 1.2 06/09/26 SMI" +include $(SRC)/Makefile.master include ../Makefile.com fasttrap/tst.fasttrap.exe := LIBS += -ldtrace @@ -51,3 +52,6 @@ usdt/argmap.o: usdt/argmap.d usdt/tst.argmap.o /usr/sbin/dtrace -G -32 -o usdt/argmap.o -s usdt/argmap.d \ usdt/tst.argmap.o + +SUBDIRS = java_api +include ../../Makefile.subdirs ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#2 (text+ko) ==== @@ -23,11 +23,11 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "@(#)tst.cputime.ksh 1.1 06/08/28 SMI" +#ident "@(#)tst.cputime.ksh 1.2 06/09/26 SMI" script() { - dtrace -s /dev/stdin -x bufpolicy=$1 $1 <' + exit 2 +fi + +dtrace=$1 + for policy in "fill ring switch"; do script $policy ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#2 (text+ko) ==== @@ -25,7 +25,7 @@ # Use is subject to license terms. # -#ident "@(#)tst.AddSearchPath.d.ksh 1.1 06/08/28 SMI" +#ident "@(#)tst.AddSearchPath.d.ksh 1.2 06/09/26 SMI" ## # @@ -61,10 +61,15 @@ EOF } +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + tempfile=/tmp/test.h echo "#define VALUE 1520" > $tempfile -dtrace=/usr/sbin/dtrace +dtrace=$1 script status=$? ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#2 (text+ko) ==== @@ -26,7 +26,7 @@ # Use is subject to license terms. # -#ident "@(#)tst.BufsizeGiga.d.ksh 1.1 06/08/28 SMI" +#ident "@(#)tst.BufsizeGiga.d.ksh 1.2 06/09/26 SMI" # # ASSERTION: @@ -47,7 +47,12 @@ EOF } -dtrace=/usr/sbin/dtrace +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 script status=$? ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#2 (text+ko) ==== @@ -25,7 +25,7 @@ # Use is subject to license terms. # -#ident "@(#)tst.BufsizeKilo.d.ksh 1.1 06/08/28 SMI" +#ident "@(#)tst.BufsizeKilo.d.ksh 1.2 06/09/26 SMI" ## # @@ -47,7 +47,12 @@ EOF } -dtrace=/usr/sbin/dtrace +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 script status=$? ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#2 (text+ko) ==== @@ -25,7 +25,7 @@ # Use is subject to license terms. # -#ident "@(#)tst.BufsizeMega.d.ksh 1.1 06/08/28 SMI" +#ident "@(#)tst.BufsizeMega.d.ksh 1.2 06/09/26 SMI" ## # @@ -47,7 +47,12 @@ EOF } -dtrace=/usr/sbin/dtrace +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 script status=$? ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#2 (text+ko) ==== @@ -25,7 +25,7 @@ # Use is subject to license terms. # -#ident "@(#)tst.BufsizeTera.d.ksh 1.1 06/08/28 SMI" +#ident "@(#)tst.BufsizeTera.d.ksh 1.2 06/09/26 SMI" ## # @@ -47,7 +47,12 @@ EOF } -dtrace=/usr/sbin/dtrace +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 script status=$? ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#2 (text+ko) ==== @@ -25,7 +25,7 @@ # Use is subject to license terms. # -#ident "@(#)tst.DataModel32.d.ksh 1.1 06/08/28 SMI" +#ident "@(#)tst.DataModel32.d.ksh 1.2 06/09/26 SMI" ## # @@ -56,7 +56,12 @@ EOF } -dtrace=/usr/sbin/dtrace +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 script status=$? ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#2 (text+ko) ==== @@ -26,7 +26,7 @@ # Use is subject to license terms. # -#ident "@(#)tst.DataModel64.d.ksh 1.1 06/08/28 SMI" +#ident "@(#)tst.DataModel64.d.ksh 1.2 06/09/26 SMI" ## # @@ -57,7 +57,12 @@ EOF } -dtrace=/usr/sbin/dtrace +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 script status=$? ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#2 (text+ko) ==== @@ -25,7 +25,7 @@ # Use is subject to license terms. # -#ident "@(#)tst.DefineNameWithCPP.d.ksh 1.1 06/08/28 SMI" +#ident "@(#)tst.DefineNameWithCPP.d.ksh 1.2 06/09/26 SMI" ## # @@ -51,7 +51,12 @@ EOF } -dtrace=/usr/sbin/dtrace +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 script status=$? ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#2 (text+ko) ==== @@ -25,7 +25,7 @@ # Use is subject to license terms. # -#ident "@(#)tst.DestructWithFunction.d.ksh 1.1 06/08/28 SMI" +#ident "@(#)tst.DestructWithFunction.d.ksh 1.2 06/09/26 SMI" ## # @@ -39,7 +39,12 @@ -dtrace=/usr/sbin/dtrace +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 $dtrace -qwf read'{chill(15); printf("Done chilling"); exit(0);}' status=$? ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#2 (text+ko) ==== @@ -25,7 +25,7 @@ # Use is subject to license terms. # -#ident "@(#)tst.DestructWithID.d.ksh 1.1 06/08/28 SMI" +#ident "@(#)tst.DestructWithID.d.ksh 1.2 06/09/26 SMI" ## # @@ -37,7 +37,12 @@ # ## -dtrace=/usr/sbin/dtrace +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 $dtrace -qwi 1'{chill(15); printf("Done chilling"); exit(0);}' status=$? ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#2 (text+ko) ==== @@ -25,7 +25,7 @@ # Use is subject to license terms. # -#ident "@(#)tst.DestructWithModule.d.ksh 1.1 06/08/28 SMI" +#ident "@(#)tst.DestructWithModule.d.ksh 1.2 06/09/26 SMI" ## # @@ -37,7 +37,12 @@ # ## -dtrace=/usr/sbin/dtrace +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 $dtrace -qwm unix'{chill(15); printf("Done chilling"); exit(0);}' status=$? ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#2 (text+ko) ==== @@ -25,7 +25,7 @@ # Use is subject to license terms. # -#ident "@(#)tst.DestructWithName.d.ksh 1.1 06/08/28 SMI" +#ident "@(#)tst.DestructWithName.d.ksh 1.2 06/09/26 SMI" ## # @@ -37,7 +37,12 @@ # ## -dtrace=/usr/sbin/dtrace +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 $dtrace -qwn BEGIN'{chill(15); printf("Done chilling"); exit(0);}' status=$? ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#2 (text+ko) ==== @@ -25,7 +25,7 @@ # Use is subject to license terms. # -#ident "@(#)tst.DestructWithProvider.d.ksh 1.1 06/08/28 SMI" +#ident "@(#)tst.DestructWithProvider.d.ksh 1.2 06/09/26 SMI" ## # @@ -37,7 +37,12 @@ # ## -dtrace=/usr/sbin/dtrace +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 $dtrace -qwP syscall'{chill(15); printf("Done chilling"); exit(0);}' status=$? ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#2 (text+ko) ==== @@ -25,7 +25,7 @@ # Use is subject to license terms. # -#ident "@(#)tst.DestructWithoutW.d.ksh 1.1 06/08/28 SMI" +#ident "@(#)tst.DestructWithoutW.d.ksh 1.2 06/09/26 SMI" ## # @@ -37,7 +37,12 @@ # ## -dtrace=/usr/sbin/dtrace +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 $dtrace -qP syscall'{chill(15); printf("Done chilling"); exit(0);}' status=$? ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#2 (text+ko) ==== @@ -25,7 +25,7 @@ # Use is subject to license terms. # -#ident "@(#)tst.ELFGenerationOut.d.ksh 1.1 06/08/28 SMI" +#ident "@(#)tst.ELFGenerationOut.d.ksh 1.2 06/09/26 SMI" ## # @@ -50,7 +50,12 @@ EOF >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 25 18:21:15 2006 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 C26FB16A4D2; Wed, 25 Oct 2006 18:21:15 +0000 (UTC) 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 93DAC16A47E for ; Wed, 25 Oct 2006 18:21:15 +0000 (UTC) (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 5D76C43DB1 for ; Wed, 25 Oct 2006 18:20:41 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PIKfeI045808 for ; Wed, 25 Oct 2006 18:20:41 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PIKfWq045805 for perforce@freebsd.org; Wed, 25 Oct 2006 18:20:41 GMT (envelope-from marcel@freebsd.org) Date: Wed, 25 Oct 2006 18:20:41 GMT Message-Id: <200610251820.k9PIKfWq045805@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 108404 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, 25 Oct 2006 18:21:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=108404 Change 108404 by marcel@marcel_cluster on 2006/10/25 18:20:15 Sync with the EFI 1.10.14.62 sample implementation. Affected files ... .. //depot/projects/ia64/sys/boot/efi/include/efi.h#5 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/include/efi.h#5 (text+ko) ==== @@ -1,7 +1,14 @@ /* $FreeBSD: src/sys/boot/efi/include/efi.h,v 1.3 2002/05/19 03:17:20 marcel Exp $ */ /*++ -Copyright (c) 1998 Intel Corporation +Copyright (c) 1999 - 2002 Intel Corporation. All rights reserved +This software and associated documentation (if any) is furnished +under a license and may only be used or copied in accordance +with the terms of the license. Except as permitted by such +license, no part of this software or documentation may be +reproduced, stored in a retrieval system, or transmitted in any +form or by any means without the express written consent of +Intel Corporation. Module Name: @@ -17,19 +24,20 @@ --*/ -/* - * Build flags on input - * EFI32 - * EFI_DEBUG - Enable debugging code - * EFI_NT_EMULATOR - Building for running under NT - */ +// +// Build flags on input +// EFI32 +// EFI_DEBUG - Enable debugging code +// EFI_NT_EMULATOR - Building for running under NT +// + #ifndef _EFI_INCLUDE_ #define _EFI_INCLUDE_ #define EFI_FIRMWARE_VENDOR L"INTEL" -#define EFI_FIRMWARE_MAJOR_REVISION 12 -#define EFI_FIRMWARE_MINOR_REVISION 33 +#define EFI_FIRMWARE_MAJOR_REVISION 14 +#define EFI_FIRMWARE_MINOR_REVISION 62 #define EFI_FIRMWARE_REVISION ((EFI_FIRMWARE_MAJOR_REVISION <<16) | (EFI_FIRMWARE_MINOR_REVISION)) #include "efibind.h" @@ -43,7 +51,12 @@ #include "efinet.h" #include "efiapi.h" #include "efifs.h" -#include "efifpswa.h" #include "efierr.h" +#define EFI_STRINGIZE(a) #a +#define EFI_PROTOCOL_DEFINITION(a) EFI_STRINGIZE(Protocol/a/a.h) + +#define EFI_GUID_DEFINITION(a) EFI_STRINGIZE(Guid/a/a##.h) +#define EFI_GUID_STRING(guidpointer, shortstring, longstring) + #endif From owner-p4-projects@FreeBSD.ORG Wed Oct 25 18:22:55 2006 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 D38EF16A49E; Wed, 25 Oct 2006 18:22:54 +0000 (UTC) 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 954A116A415 for ; Wed, 25 Oct 2006 18:22:54 +0000 (UTC) (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 020AB43D82 for ; Wed, 25 Oct 2006 18:22:44 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PIMigk046776 for ; Wed, 25 Oct 2006 18:22:44 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PIMiC9046771 for perforce@freebsd.org; Wed, 25 Oct 2006 18:22:44 GMT (envelope-from marcel@freebsd.org) Date: Wed, 25 Oct 2006 18:22:44 GMT Message-Id: <200610251822.k9PIMiC9046771@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 108405 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, 25 Oct 2006 18:22:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=108405 Change 108405 by marcel@marcel_cluster on 2006/10/25 18:21:46 Sync with the EFI 1.10.14.62 sample implementation. Affected files ... .. //depot/projects/ia64/sys/boot/efi/include/efi_nii.h#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/include/efi_nii.h#3 (text+ko) ==== @@ -3,7 +3,14 @@ #define _EFI_NII_H /*++ -Copyright (c) 2000 Intel Corporation +Copyright (c) 1999 - 2002 Intel Corporation. All rights reserved +This software and associated documentation (if any) is furnished +under a license and may only be used or copied in accordance +with the terms of the license. Except as permitted by such +license, no part of this software or documentation may be +reproduced, stored in a retrieval system, or transmitted in any +form or by any means without the express written consent of +Intel Corporation. Module name: efi_nii.h @@ -20,8 +27,11 @@ #define EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL \ { 0xE18541CD, 0xF755, 0x4f73, 0x92, 0x8D, 0x64, 0x3C, 0x8A, 0x79, 0xB2, 0x29 } +#define EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_31 \ + { 0x1ACED566, 0x76ED, 0x4218, 0xBC, 0x81, 0x76, 0x7F, 0x1F, 0x97, 0x7A, 0x89 } #define EFI_NETWORK_INTERFACE_IDENTIFIER_INTERFACE_REVISION 0x00010000 +#define EFI_NETWORK_INTERFACE_IDENTIFIER_INTERFACE_REVISION_31 0x00010001 typedef enum { EfiNetworkInterfaceUndi = 1 @@ -29,54 +39,48 @@ typedef struct { - /* Revision of the network interface identifier protocol interface. */ UINT64 Revision; + // Revision of the network interface identifier protocol interface. - /* - * Address of the first byte of the identifying structure for this - * network interface. This is set to zero if there is no structure. - * For PXE/UNDI this is the first byte of the !PXE structure. - */ UINT64 ID; + // Address of the first byte of the identifying structure for this + // network interface. This is set to zero if there is no structure. + // + // For PXE/UNDI this is the first byte of the !PXE structure. - /* - * Address of the UNrelocated driver/ROM image. This is set - * to zero if there is no driver/ROM image. - * For 16-bit UNDI, this is the first byte of the option ROM in - * upper memory. - * For 32/64-bit S/W UNDI, this is the first byte of the EFI ROM - * image. - * For H/W UNDI, this is set to zero. - */ UINT64 ImageAddr; + // Address of the UNrelocated driver/ROM image. This is set + // to zero if there is no driver/ROM image. + // + // For 16-bit UNDI, this is the first byte of the option ROM in + // upper memory. + // + // For 32/64-bit S/W UNDI, this is the first byte of the EFI ROM + // image. + // + // For H/W UNDI, this is set to zero. - /* - * Size of the UNrelocated driver/ROM image of this network interface. - * This is set to zero if there is no driver/ROM image. - */ UINT32 ImageSize; + // Size of the UNrelocated driver/ROM image of this network interface. + // This is set to zero if there is no driver/ROM image. - /* - * 4 char ASCII string to go in class identifier (option 60) in DHCP - * and Boot Server discover packets. - * For EfiNetworkInterfaceUndi this field is "UNDI". - * For EfiNetworkInterfaceSnp this field is "SNPN". - */ CHAR8 StringId[4]; + // 4 char ASCII string to go in class identifier (option 60) in DHCP + // and Boot Server discover packets. + // For EfiNetworkInterfaceUndi this field is "UNDI". + // For EfiNetworkInterfaceSnp this field is "SNPN". - /* - * Information to be placed into the PXE DHCP and Discover packets. - * This is the network interface type and version number that will - * be placed into DHCP option 94 (client network interface identifier). - */ UINT8 Type; UINT8 MajorVer; UINT8 MinorVer; - + // Information to be placed into the PXE DHCP and Discover packets. + // This is the network interface type and version number that will + // be placed into DHCP option 94 (client network interface identifier). BOOLEAN Ipv6Supported; - UINT8 IfNum; /* interface number to be used with pxeid structure */ + UINT8 IfNum; // interface number to be used with pxeid structure } EFI_NETWORK_INTERFACE_IDENTIFIER_INTERFACE; extern EFI_GUID NetworkInterfaceIdentifierProtocol; +extern EFI_GUID NetworkInterfaceIdentifierProtocol_31; -#endif /* _EFI_NII_H */ +#endif // _EFI_NII_H From owner-p4-projects@FreeBSD.ORG Wed Oct 25 18:52:24 2006 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 130A016A412; Wed, 25 Oct 2006 18:52:24 +0000 (UTC) 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 C470916A40F for ; Wed, 25 Oct 2006 18:52:23 +0000 (UTC) (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 90EF243D49 for ; Wed, 25 Oct 2006 18:52:23 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PIqNVM051233 for ; Wed, 25 Oct 2006 18:52:23 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PIqM4P051220 for perforce@freebsd.org; Wed, 25 Oct 2006 18:52:22 GMT (envelope-from marcel@freebsd.org) Date: Wed, 25 Oct 2006 18:52:22 GMT Message-Id: <200610251852.k9PIqM4P051220@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 108406 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, 25 Oct 2006 18:52:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=108406 Change 108406 by marcel@marcel_cluster on 2006/10/25 18:51:57 Sync with the EFI 1.10.14.62 sample implementation. Affected files ... .. //depot/projects/ia64/sys/boot/efi/include/efiapi.h#10 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/include/efiapi.h#10 (text+ko) ==== @@ -4,7 +4,14 @@ /*++ -Copyright (c) 1998 Intel Corporation +Copyright (c) 1999 - 2002 Intel Corporation. All rights reserved +This software and associated documentation (if any) is furnished +under a license and may only be used or copied in accordance +with the terms of the license. Except as permitted by such +license, no part of this software or documentation may be +reproduced, stored in a retrieval system, or transmitted in any +form or by any means without the express written consent of +Intel Corporation. Module Name: @@ -21,22 +28,22 @@ --*/ -/* - * EFI Specification Revision - */ +// +// EFI Specification Revision +// #define EFI_SPECIFICATION_MAJOR_REVISION 1 -#define EFI_SPECIFICATION_MINOR_REVISION 02 +#define EFI_SPECIFICATION_MINOR_REVISION 10 -/* - * Declare forward referenced data structures - */ +// +// Declare forward referenced data structures +// INTERFACE_DECL(_EFI_SYSTEM_TABLE); -/* - * EFI Memory - */ +// +// EFI Memory +// typedef EFI_STATUS @@ -92,8 +99,8 @@ #define EFI_OPTIONAL_PTR 0x00000001 -#define EFI_INTERNAL_FNC 0x00000002 /* Pointer to internal runtime fnc */ -#define EFI_INTERNAL_PTR 0x00000004 /* Pointer to internal runtime data */ +#define EFI_INTERNAL_FNC 0x00000002 // Pointer to internal runtime fnc +#define EFI_INTERNAL_PTR 0x00000004 // Pointer to internal runtime data typedef @@ -104,9 +111,9 @@ ); -/* - * EFI Events - */ +// +// EFI Events +// @@ -181,9 +188,9 @@ IN EFI_EVENT Event ); -/* - * Task priority level - */ +// +// Task priority level +// #define TPL_APPLICATION 4 #define TPL_CALLBACK 8 @@ -203,19 +210,19 @@ ); -/* - * EFI platform variables - */ +// +// EFI platform varibles +// #define EFI_GLOBAL_VARIABLE \ { 0x8BE4DF61, 0x93CA, 0x11d2, 0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C } -/* Variable attributes */ +// Variable attributes #define EFI_VARIABLE_NON_VOLATILE 0x00000001 #define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002 #define EFI_VARIABLE_RUNTIME_ACCESS 0x00000004 -/* Variable size limitation */ +// Variable size limitation #define EFI_MAXIMUM_VARIABLE_SIZE 1024 typedef @@ -248,14 +255,14 @@ ); -/* - * EFI Time - */ +// +// EFI Time +// typedef struct { - UINT32 Resolution; /* 1e-6 parts per million */ - UINT32 Accuracy; /* hertz */ - BOOLEAN SetsToZero; /* Set clears sub-second time */ + UINT32 Resolution; // 1e-6 parts per million + UINT32 Accuracy; // hertz + BOOLEAN SetsToZero; // Set clears sub-second time } EFI_TIME_CAPABILITIES; @@ -288,12 +295,12 @@ ); -/* - * Image functions - */ +// +// Image functions +// -/* PE32+ Subsystem type for EFI images */ +// PE32+ Subsystem type for EFI images #if !defined(IMAGE_SUBSYSTEM_EFI_APPLICATION) #define IMAGE_SUBSYSTEM_EFI_APPLICATION 10 @@ -301,7 +308,7 @@ #define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER 12 #endif -/* PE32+ Machine type for EFI images */ +// PE32+ Machine type for EFI images #if !defined(EFI_IMAGE_MACHINE_IA32) #define EFI_IMAGE_MACHINE_IA32 0x014c @@ -311,7 +318,11 @@ #define EFI_IMAGE_MACHINE_IA64 0x0200 #endif -/* Image Entry prototype */ +#if !defined(EFI_IMAGE_MACHINE_EBC) +#define EFI_IMAGE_MACHINE_EBC 0x0EBC +#endif + +// Image Entry prototype typedef EFI_STATUS @@ -355,32 +366,32 @@ ); -/* Image handle */ +// Image handle #define LOADED_IMAGE_PROTOCOL \ { 0x5B1B31A1, 0x9562, 0x11d2, 0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B } -#define EFI_IMAGE_INFORMATION_REVISION 0x1000 +#define EFI_LOADED_IMAGE_INFORMATION_REVISION 0x1000 typedef struct { UINT32 Revision; EFI_HANDLE ParentHandle; struct _EFI_SYSTEM_TABLE *SystemTable; - /* Source location of image */ + // Source location of image EFI_HANDLE DeviceHandle; EFI_DEVICE_PATH *FilePath; VOID *Reserved; - /* Images load options */ + // Images load options UINT32 LoadOptionsSize; VOID *LoadOptions; - /* Location of where image was loaded */ + // Location of where image was loaded VOID *ImageBase; UINT64 ImageSize; EFI_MEMORY_TYPE ImageCodeType; EFI_MEMORY_TYPE ImageDataType; - /* If the driver image supports a dynamic unload request */ + // If the driver image supports a dynamic unload request EFI_IMAGE_UNLOAD Unload; } EFI_LOADED_IMAGE; @@ -393,9 +404,9 @@ IN UINTN MapKey ); -/* - * Misc - */ +// +// Misc +// typedef @@ -416,11 +427,12 @@ typedef enum { EfiResetCold, - EfiResetWarm + EfiResetWarm, + EfiResetShutdown } EFI_RESET_TYPE; typedef -EFI_STATUS +VOID (EFIAPI *EFI_RESET_SYSTEM) ( IN EFI_RESET_TYPE ResetType, IN EFI_STATUS ResetStatus, @@ -440,13 +452,12 @@ OUT UINT32 *HighCount ); -/* - * Protocol handler functions - */ +// +// Protocol handler functions +// typedef enum { - EFI_NATIVE_INTERFACE, - EFI_PCODE_INTERFACE + EFI_NATIVE_INTERFACE } EFI_INTERFACE_TYPE; typedef @@ -525,179 +536,355 @@ typedef EFI_STATUS (EFIAPI *EFI_RESERVED_SERVICE) ( - VOID ); -/* - * Standard EFI table header - */ +typedef +EFI_STATUS +(EFIAPI *EFI_CONNECT_CONTROLLER) ( + IN EFI_HANDLE ControllerHandle, + IN EFI_HANDLE *DriverImageHandle OPTIONAL, + IN EFI_DEVICE_PATH *RemainingDevicePath OPTIONAL, + IN BOOLEAN Recursive + ); + +typedef +EFI_STATUS +(EFIAPI *EFI_DISCONNECT_CONTROLLER)( + IN EFI_HANDLE ControllerHandle, + IN EFI_HANDLE DriverImageHandle, OPTIONAL + IN EFI_HANDLE ChildHandle OPTIONAL + ); + +#define EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL 0x00000001 +#define EFI_OPEN_PROTOCOL_GET_PROTOCOL 0x00000002 +#define EFI_OPEN_PROTOCOL_TEST_PROTOCOL 0x00000004 +#define EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER 0x00000008 +#define EFI_OPEN_PROTOCOL_BY_DRIVER 0x00000010 +#define EFI_OPEN_PROTOCOL_EXCLUSIVE 0x00000020 + +typedef +EFI_STATUS +(EFIAPI *EFI_OPEN_PROTOCOL) ( + IN EFI_HANDLE Handle, + IN EFI_GUID *Protocol, + OUT VOID **Interface, + IN EFI_HANDLE ImageHandle, + IN EFI_HANDLE ControllerHandle, OPTIONAL + IN UINT32 Attributes + ); + +typedef +EFI_STATUS +(EFIAPI *EFI_CLOSE_PROTOCOL) ( + IN EFI_HANDLE Handle, + IN EFI_GUID *Protocol, + IN EFI_HANDLE ImageHandle, + IN EFI_HANDLE DeviceHandle + ); + +typedef struct { + EFI_HANDLE AgentHandle; + EFI_HANDLE ControllerHandle; + UINT32 Attributes; + UINT32 OpenCount; +} EFI_OPEN_PROTOCOL_INFORMATION_ENTRY; + +typedef +EFI_STATUS +(EFIAPI *EFI_OPEN_PROTOCOL_INFORMATION) ( + IN EFI_HANDLE UserHandle, + IN EFI_GUID *Protocol, + IN EFI_OPEN_PROTOCOL_INFORMATION_ENTRY **EntryBuffer, + OUT UINTN *EntryCount + ); + +typedef +EFI_STATUS +(EFIAPI *EFI_PROTOCOLS_PER_HANDLE) ( + IN EFI_HANDLE UserHandle, + OUT EFI_GUID ***ProtocolBuffer, + OUT UINTN *ProtocolBufferCount + ); + +typedef +EFI_STATUS +(EFIAPI *EFI_LOCATE_HANDLE_BUFFER) ( + IN EFI_LOCATE_SEARCH_TYPE SearchType, + IN EFI_GUID *Protocol OPTIONAL, + IN VOID *SearchKey OPTIONAL, + IN OUT UINTN *NumberHandles, + OUT EFI_HANDLE **Buffer + ); + +typedef +EFI_STATUS +(EFIAPI *EFI_LOCATE_PROTOCOL) ( + EFI_GUID *Protocol, + VOID *Registration, OPTIONAL + VOID **Interface + ); + +typedef +EFI_STATUS +(EFIAPI *EFI_INSTALL_MULTIPLE_PROTOCOL_INTERFACES) ( + IN OUT EFI_HANDLE *Handle, + ... + ); + +typedef +EFI_STATUS +(EFIAPI *EFI_UNINSTALL_MULTIPLE_PROTOCOL_INTERFACES) ( + IN EFI_HANDLE Handle, + ... + ); + +typedef +EFI_STATUS +(EFIAPI *EFI_CALCULATE_CRC32) ( + IN VOID *Data, + IN UINTN DataSize, + OUT UINT32 *Crc32 + ); + +typedef +VOID +(EFIAPI *EFI_COPY_MEM) ( + IN VOID *Destination, + IN VOID *Source, + IN UINTN Length + ); + +typedef +VOID +(EFIAPI *EFI_SET_MEM) ( + IN VOID *Buffer, + IN UINTN Size, + IN UINT8 Value + ); + +// +// Standard EFI table header +// typedef struct _EFI_TABLE_HEARDER { - UINT64 Signature; - UINT32 Revision; - UINT32 HeaderSize; - UINT32 CRC32; - UINT32 Reserved; + UINT64 Signature; + UINT32 Revision; + UINT32 HeaderSize; + UINT32 CRC32; + UINT32 Reserved; } EFI_TABLE_HEADER; -/* - * EFI Runtime Serivces Table - */ +// +// EFI Runtime Serivces Table +// #define EFI_RUNTIME_SERVICES_SIGNATURE 0x56524553544e5552 -#define EFI_RUNTIME_SERVICES_REVISION (EFI_SPECIFICATION_MAJOR_REVISION<<16) | (EFI_SPECIFICATION_MINOR_REVISION) +#define EFI_RUNTIME_SERVICES_REVISION ((EFI_SPECIFICATION_MAJOR_REVISION<<16) | (EFI_SPECIFICATION_MINOR_REVISION)) typedef struct { - EFI_TABLE_HEADER Hdr; + EFI_TABLE_HEADER Hdr; - /* Time services */ + // + // Time services + // - EFI_GET_TIME GetTime; - EFI_SET_TIME SetTime; - EFI_GET_WAKEUP_TIME GetWakeupTime; - EFI_SET_WAKEUP_TIME SetWakeupTime; + EFI_GET_TIME GetTime; + EFI_SET_TIME SetTime; + EFI_GET_WAKEUP_TIME GetWakeupTime; + EFI_SET_WAKEUP_TIME SetWakeupTime; - /* Virtual memory services */ + // + // Virtual memory services + // - EFI_SET_VIRTUAL_ADDRESS_MAP SetVirtualAddressMap; - EFI_CONVERT_POINTER ConvertPointer; + EFI_SET_VIRTUAL_ADDRESS_MAP SetVirtualAddressMap; + EFI_CONVERT_POINTER ConvertPointer; - /* Variable serviers */ + // + // Variable serviers + // - EFI_GET_VARIABLE GetVariable; - EFI_GET_NEXT_VARIABLE_NAME GetNextVariableName; - EFI_SET_VARIABLE SetVariable; + EFI_GET_VARIABLE GetVariable; + EFI_GET_NEXT_VARIABLE_NAME GetNextVariableName; + EFI_SET_VARIABLE SetVariable; - /* Misc */ + // + // Misc + // - EFI_GET_NEXT_HIGH_MONO_COUNT GetNextHighMonotonicCount; - EFI_RESET_SYSTEM ResetSystem; + EFI_GET_NEXT_HIGH_MONO_COUNT GetNextHighMonotonicCount; + EFI_RESET_SYSTEM ResetSystem; } EFI_RUNTIME_SERVICES; -/* - * EFI Boot Services Table - */ +// +// EFI Boot Services Table +// #define EFI_BOOT_SERVICES_SIGNATURE 0x56524553544f4f42 -#define EFI_BOOT_SERVICES_REVISION (EFI_SPECIFICATION_MAJOR_REVISION<<16) | (EFI_SPECIFICATION_MINOR_REVISION) +#define EFI_BOOT_SERVICES_REVISION ((EFI_SPECIFICATION_MAJOR_REVISION<<16) | (EFI_SPECIFICATION_MINOR_REVISION)) + +typedef struct { + + EFI_TABLE_HEADER Hdr; + + // + // Task priority functions + // + + EFI_RAISE_TPL RaiseTPL; + EFI_RESTORE_TPL RestoreTPL; + + // + // Memory functions + // + + EFI_ALLOCATE_PAGES AllocatePages; + EFI_FREE_PAGES FreePages; + EFI_GET_MEMORY_MAP GetMemoryMap; + EFI_ALLOCATE_POOL AllocatePool; + EFI_FREE_POOL FreePool; -typedef struct _EFI_BOOT_SERVICES { + // + // Event & timer functions + // - EFI_TABLE_HEADER Hdr; + EFI_CREATE_EVENT CreateEvent; + EFI_SET_TIMER SetTimer; + EFI_WAIT_FOR_EVENT WaitForEvent; + EFI_SIGNAL_EVENT SignalEvent; + EFI_CLOSE_EVENT CloseEvent; + EFI_CHECK_EVENT CheckEvent; - /* Task priority functions */ + // + // Protocol handler functions + // - EFI_RAISE_TPL RaiseTPL; - EFI_RESTORE_TPL RestoreTPL; + EFI_INSTALL_PROTOCOL_INTERFACE InstallProtocolInterface; + EFI_REINSTALL_PROTOCOL_INTERFACE ReinstallProtocolInterface; + EFI_UNINSTALL_PROTOCOL_INTERFACE UninstallProtocolInterface; + EFI_HANDLE_PROTOCOL HandleProtocol; + VOID *Reserved; + EFI_REGISTER_PROTOCOL_NOTIFY RegisterProtocolNotify; + EFI_LOCATE_HANDLE LocateHandle; + EFI_LOCATE_DEVICE_PATH LocateDevicePath; + EFI_INSTALL_CONFIGURATION_TABLE InstallConfigurationTable; - /* Memory functions */ + // + // Image functions + // - EFI_ALLOCATE_PAGES AllocatePages; - EFI_FREE_PAGES FreePages; - EFI_GET_MEMORY_MAP GetMemoryMap; - EFI_ALLOCATE_POOL AllocatePool; - EFI_FREE_POOL FreePool; + EFI_IMAGE_LOAD LoadImage; + EFI_IMAGE_START StartImage; + EFI_EXIT Exit; + EFI_IMAGE_UNLOAD UnloadImage; + EFI_EXIT_BOOT_SERVICES ExitBootServices; - /* Event & timer functions */ + // + // Misc functions + // - EFI_CREATE_EVENT CreateEvent; - EFI_SET_TIMER SetTimer; - EFI_WAIT_FOR_EVENT WaitForEvent; - EFI_SIGNAL_EVENT SignalEvent; - EFI_CLOSE_EVENT CloseEvent; - EFI_CHECK_EVENT CheckEvent; + EFI_GET_NEXT_MONOTONIC_COUNT GetNextMonotonicCount; + EFI_STALL Stall; + EFI_SET_WATCHDOG_TIMER SetWatchdogTimer; - /* Protocol handler functions */ + // + // DriverSupport Services + // + EFI_CONNECT_CONTROLLER ConnectController; + EFI_DISCONNECT_CONTROLLER DisconnectController; - EFI_INSTALL_PROTOCOL_INTERFACE InstallProtocolInterface; - EFI_REINSTALL_PROTOCOL_INTERFACE ReinstallProtocolInterface; - EFI_UNINSTALL_PROTOCOL_INTERFACE UninstallProtocolInterface; - EFI_HANDLE_PROTOCOL HandleProtocol; - EFI_HANDLE_PROTOCOL PCHandleProtocol; - EFI_REGISTER_PROTOCOL_NOTIFY RegisterProtocolNotify; - EFI_LOCATE_HANDLE LocateHandle; - EFI_LOCATE_DEVICE_PATH LocateDevicePath; - EFI_INSTALL_CONFIGURATION_TABLE InstallConfigurationTable; + // + // Open and Close Protocol Services + // + EFI_OPEN_PROTOCOL OpenProtocol; + EFI_CLOSE_PROTOCOL CloseProtocol; + EFI_OPEN_PROTOCOL_INFORMATION OpenProtocolInformation; - /* Image functions */ + // + // Library Services to reduce size of drivers + // + EFI_PROTOCOLS_PER_HANDLE ProtocolsPerHandle; + EFI_LOCATE_HANDLE_BUFFER LocateHandleBuffer; + EFI_LOCATE_PROTOCOL LocateProtocol; - EFI_IMAGE_LOAD LoadImage; - EFI_IMAGE_START StartImage; - EFI_EXIT Exit; - EFI_IMAGE_UNLOAD UnloadImage; - EFI_EXIT_BOOT_SERVICES ExitBootServices; + EFI_INSTALL_MULTIPLE_PROTOCOL_INTERFACES InstallMultipleProtocolInterfaces; + EFI_UNINSTALL_MULTIPLE_PROTOCOL_INTERFACES UninstallMultipleProtocolInterfaces; - /* Misc functions */ + // + // CRC32 services + // + EFI_CALCULATE_CRC32 CalculateCrc32; - EFI_GET_NEXT_MONOTONIC_COUNT GetNextMonotonicCount; - EFI_STALL Stall; - EFI_SET_WATCHDOG_TIMER SetWatchdogTimer; + // + // Memory Utility Services + // + EFI_COPY_MEM CopyMem; + EFI_SET_MEM SetMem; } EFI_BOOT_SERVICES; -/* - * EFI Configuration Table and GUID definitions - */ +// +// EFI Configuration Table and GUID definitions +// #define MPS_TABLE_GUID \ - { 0xeb9d2d2f, 0x2d88, 0x11d3, { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } } + { 0xeb9d2d2f, 0x2d88, 0x11d3, 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } #define ACPI_TABLE_GUID \ - { 0xeb9d2d30, 0x2d88, 0x11d3, { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } } + { 0xeb9d2d30, 0x2d88, 0x11d3, 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } #define ACPI_20_TABLE_GUID \ - { 0x8868e871, 0xe4f1, 0x11d3, { 0xbc, 0x22, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } } + { 0x8868e871, 0xe4f1, 0x11d3, 0xbc, 0x22, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } #define SMBIOS_TABLE_GUID \ - { 0xeb9d2d31, 0x2d88, 0x11d3, { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } } + { 0xeb9d2d31, 0x2d88, 0x11d3, 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } #define SAL_SYSTEM_TABLE_GUID \ - { 0xeb9d2d32, 0x2d88, 0x11d3, { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } } + { 0xeb9d2d32, 0x2d88, 0x11d3, 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } -/* DIG64 Headless Console & Debug Port Table. */ -#define HCDP_TABLE_GUID \ - {0xf951938d,0x620b,0x42ef,{0x82,0x79,0xa8,0x4b,0x79,0x61,0x78,0x98}} typedef struct _EFI_CONFIGURATION_TABLE { - EFI_GUID VendorGuid; - VOID *VendorTable; + EFI_GUID VendorGuid; + VOID *VendorTable; } EFI_CONFIGURATION_TABLE; -/* - * EFI System Table - */ +// +// EFI System Table +// #define EFI_SYSTEM_TABLE_SIGNATURE 0x5453595320494249 -#define EFI_SYSTEM_TABLE_REVISION (EFI_SPECIFICATION_MAJOR_REVISION<<16) | (EFI_SPECIFICATION_MINOR_REVISION) +#define EFI_SYSTEM_TABLE_REVISION ((EFI_SPECIFICATION_MAJOR_REVISION<<16) | (EFI_SPECIFICATION_MINOR_REVISION)) +#define EFI_1_10_SYSTEM_TABLE_REVISION ((1<<16) | 10) +#define EFI_1_02_SYSTEM_TABLE_REVISION ((1<<16) | 02) typedef struct _EFI_SYSTEM_TABLE { - EFI_TABLE_HEADER Hdr; + EFI_TABLE_HEADER Hdr; - CHAR16 *FirmwareVendor; - UINT32 FirmwareRevision; + CHAR16 *FirmwareVendor; + UINT32 FirmwareRevision; - EFI_HANDLE ConsoleInHandle; - SIMPLE_INPUT_INTERFACE *ConIn; + EFI_HANDLE ConsoleInHandle; + SIMPLE_INPUT_INTERFACE *ConIn; - EFI_HANDLE ConsoleOutHandle; - SIMPLE_TEXT_OUTPUT_INTERFACE *ConOut; + EFI_HANDLE ConsoleOutHandle; + SIMPLE_TEXT_OUTPUT_INTERFACE *ConOut; - EFI_HANDLE StandardErrorHandle; - SIMPLE_TEXT_OUTPUT_INTERFACE *StdErr; + EFI_HANDLE StandardErrorHandle; + SIMPLE_TEXT_OUTPUT_INTERFACE *StdErr; - EFI_RUNTIME_SERVICES *RuntimeServices; - EFI_BOOT_SERVICES *BootServices; + EFI_RUNTIME_SERVICES *RuntimeServices; + EFI_BOOT_SERVICES *BootServices; - UINTN NumberOfTableEntries; - EFI_CONFIGURATION_TABLE *ConfigurationTable; + UINTN NumberOfTableEntries; + EFI_CONFIGURATION_TABLE *ConfigurationTable; } EFI_SYSTEM_TABLE; From owner-p4-projects@FreeBSD.ORG Wed Oct 25 18:53:26 2006 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 6207D16A415; Wed, 25 Oct 2006 18:53:26 +0000 (UTC) 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 F2A3216A407 for ; Wed, 25 Oct 2006 18:53:25 +0000 (UTC) (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 C171043D46 for ; Wed, 25 Oct 2006 18:53:25 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PIrPQv051423 for ; Wed, 25 Oct 2006 18:53:25 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PIrPBa051418 for perforce@freebsd.org; Wed, 25 Oct 2006 18:53:25 GMT (envelope-from marcel@freebsd.org) Date: Wed, 25 Oct 2006 18:53:25 GMT Message-Id: <200610251853.k9PIrPBa051418@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 108407 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, 25 Oct 2006 18:53:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=108407 Change 108407 by marcel@marcel_cluster on 2006/10/25 18:53:13 Sync with the EFI 1.10.14.62 sample implementation. Affected files ... .. //depot/projects/ia64/sys/boot/efi/include/eficon.h#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/include/eficon.h#3 (text+ko) ==== @@ -4,7 +4,14 @@ /*++ -Copyright (c) 1998 Intel Corporation +Copyright (c) 1999 - 2002 Intel Corporation. All rights reserved +This software and associated documentation (if any) is furnished +under a license and may only be used or copied in accordance +with the terms of the license. Except as permitted by such +license, no part of this software or documentation may be +reproduced, stored in a retrieval system, or transmitted in any +form or by any means without the express written consent of +Intel Corporation. Module Name: @@ -20,9 +27,9 @@ --*/ -/* - * Text output protocol - */ +// +// Text output protocol +// #define SIMPLE_TEXT_OUTPUT_PROTOCOL \ { 0x387477c2, 0x69c7, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } @@ -126,7 +133,7 @@ typedef struct { INT32 MaxMode; - /* current settings */ + // current settings INT32 Mode; INT32 Attribute; INT32 CursorColumn; @@ -148,13 +155,13 @@ EFI_TEXT_SET_CURSOR_POSITION SetCursorPosition; EFI_TEXT_ENABLE_CURSOR EnableCursor; - /* Current mode */ + // Current mode SIMPLE_TEXT_OUTPUT_MODE *Mode; } SIMPLE_TEXT_OUTPUT_INTERFACE; -/* - * Define's for required EFI Unicode Box Draw character - */ +// +// Define's for required EFI Unicode Box Draw character +// #define BOXDRAW_HORIZONTAL 0x2500 #define BOXDRAW_VERTICAL 0x2502 @@ -206,29 +213,31 @@ #define BOXDRAW_VERTICAL_DOUBLE_HORIZONTAL 0x256b #define BOXDRAW_DOUBLE_VERTICAL_HORIZONTAL 0x256c -/* - * EFI Required Block Elements Code Chart - */ +// +// EFI Required Block Elements Code Chart +// + #define BLOCKELEMENT_FULL_BLOCK 0x2588 #define BLOCKELEMENT_LIGHT_SHADE 0x2591 +// +// EFI Required Geometric Shapes Code Chart +// -/* - * EFI Required Geometric Shapes Code Chart - */ #define GEOMETRICSHAPE_UP_TRIANGLE 0x25b2 #define GEOMETRICSHAPE_RIGHT_TRIANGLE 0x25ba #define GEOMETRICSHAPE_DOWN_TRIANGLE 0x25bc #define GEOMETRICSHAPE_LEFT_TRIANGLE 0x25c4 -/* - * EFI Required Arrow shapes - */ +// +// EFI Required Arrow shapes +// + #define ARROW_UP 0x2191 #define ARROW_DOWN 0x2193 -/* - * Text input protocol - */ +// +// Text input protocol +// #define SIMPLE_TEXT_INPUT_PROTOCOL \ { 0x387477c1, 0x69c7, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b } @@ -240,9 +249,9 @@ CHAR16 UnicodeChar; } EFI_INPUT_KEY; -/* - * Baseline unicode control chars - */ +// +// Baseline unicode control chars +// #define CHAR_NULL 0x0000 #define CHAR_BACKSPACE 0x0008 @@ -250,9 +259,10 @@ #define CHAR_LINEFEED 0x000A #define CHAR_CARRIAGE_RETURN 0x000D -/* - * Scan codes for base line keys - */ +// +// Scan codes for base line keys +// + #define SCAN_NULL 0x0000 #define SCAN_UP 0x0001 #define SCAN_DOWN 0x0002 From owner-p4-projects@FreeBSD.ORG Wed Oct 25 18:56:32 2006 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 6F88816A416; Wed, 25 Oct 2006 18:56:32 +0000 (UTC) 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 164FF16A407 for ; Wed, 25 Oct 2006 18:56:32 +0000 (UTC) (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 AED3E43D45 for ; Wed, 25 Oct 2006 18:56:31 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PIuVWC051953 for ; Wed, 25 Oct 2006 18:56:31 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PIuUQ2051950 for perforce@freebsd.org; Wed, 25 Oct 2006 18:56:30 GMT (envelope-from marcel@freebsd.org) Date: Wed, 25 Oct 2006 18:56:30 GMT Message-Id: <200610251856.k9PIuUQ2051950@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 108408 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, 25 Oct 2006 18:56:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=108408 Change 108408 by marcel@marcel_cluster on 2006/10/25 18:55:35 Sync with the EFI 1.10.14.62 sample implementation. Affected files ... .. //depot/projects/ia64/sys/boot/efi/include/efidebug.h#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/include/efidebug.h#3 (text+ko) ==== @@ -4,7 +4,14 @@ /*++ -Copyright (c) 1998 Intel Corporation +Copyright (c) 1999 - 2002 Intel Corporation. All rights reserved +This software and associated documentation (if any) is furnished +under a license and may only be used or copied in accordance +with the terms of the license. Except as permitted by such +license, no part of this software or documentation may be +reproduced, stored in a retrieval system, or transmitted in any +form or by any means without the express written consent of +Intel Corporation. Module Name: @@ -44,32 +51,38 @@ #endif -#define D_INIT 0x00000001 /* Initialization style messages */ -#define D_WARN 0x00000002 /* Warnings */ -#define D_LOAD 0x00000004 /* Load events */ -#define D_FS 0x00000008 /* EFI File system */ -#define D_POOL 0x00000010 /* Alloc & Free's */ -#define D_PAGE 0x00000020 /* Alloc & Free's */ -#define D_INFO 0x00000040 /* Verbose */ -#define D_VAR 0x00000100 /* Variable */ -#define D_PARSE 0x00000200 /* Command parsing */ -#define D_BM 0x00000400 /* Boot manager */ -#define D_BLKIO 0x00001000 /* BlkIo Driver */ -#define D_BLKIO_ULTRA 0x00002000 /* BlkIo Driver */ -#define D_NET 0x00004000 /* SNI Driver */ -#define D_NET_ULTRA 0x00008000 /* SNI Driver */ -#define D_TXTIN 0x00010000 /* Simple Input Driver */ -#define D_TXTOUT 0x00020000 /* Simple Text Output Driver */ -#define D_ERROR_ATA 0x00040000 /* ATA error messages */ -#define D_ERROR 0x80000000 /* Error */ +#define D_INIT 0x00000001 // Initialization style messages +#define D_WARN 0x00000002 // Warnings +#define D_LOAD 0x00000004 // Load events +#define D_FS 0x00000008 // EFI File system +#define D_POOL 0x00000010 // Alloc & Free's +#define D_PAGE 0x00000020 // Alloc & Free's +#define D_INFO 0x00000040 // Verbose +#define D_VARIABLE 0x00000100 // Variable +#define D_VAR 0x00000100 // Variable +#define D_BM 0x00000400 // Boot Manager +#define D_BLKIO 0x00001000 // BlkIo Driver +#define D_BLKIO_ULTRA 0x00002000 // BlkIo Driver +#define D_NET 0x00004000 // SNI Driver +#define D_NET_ULTRA 0x00008000 // SNI Driver +#define D_UNDI 0x00010000 // UNDI Driver +#define D_LOADFILE 0x00020000 // UNDI Driver +#define D_EVENT 0x00080000 // Event messages + +#define D_ERROR 0x80000000 // Error -#define D_RESERVED 0x7fffC880 /* Bits not reserved above */ +#define D_RESERVED 0x7ff40A80 // Bits not reserved above -/* - * Current Debug level of the system, value of EFIDebug - */ +// +// Current Debug level of the system, value of EFIDebug +// +//#define EFI_DBUG_MASK (D_ERROR | D_WARN | D_LOAD | D_BLKIO | D_INIT) #define EFI_DBUG_MASK (D_ERROR) +// +// +// + #if EFI_DEBUG #define ASSERT(a) if(!(a)) DBGASSERT(a) @@ -84,9 +97,9 @@ #endif -/* - * Prototypes - */ +// +// Prototypes +// INTN DbgAssert ( From owner-p4-projects@FreeBSD.ORG Wed Oct 25 19:07:47 2006 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 EB6CF16A415; Wed, 25 Oct 2006 19:07:46 +0000 (UTC) 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 C6A7116A407 for ; Wed, 25 Oct 2006 19:07:46 +0000 (UTC) (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 92FCE43D46 for ; Wed, 25 Oct 2006 19:07:46 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PJ7kmB054798 for ; Wed, 25 Oct 2006 19:07:46 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PJ7k1u054795 for perforce@freebsd.org; Wed, 25 Oct 2006 19:07:46 GMT (envelope-from marcel@freebsd.org) Date: Wed, 25 Oct 2006 19:07:46 GMT Message-Id: <200610251907.k9PJ7k1u054795@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 108409 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, 25 Oct 2006 19:07:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=108409 Change 108409 by marcel@marcel_cluster on 2006/10/25 19:07:11 Sync with the EFI 1.10.14.62 sample implementation. Affected files ... .. //depot/projects/ia64/sys/boot/efi/include/efidef.h#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/include/efidef.h#3 (text+ko) ==== @@ -4,7 +4,14 @@ /*++ -Copyright (c) 1998 Intel Corporation +Copyright (c) 1999 - 2002 Intel Corporation. All rights reserved +This software and associated documentation (if any) is furnished +under a license and may only be used or copied in accordance +with the terms of the license. Except as permitted by such +license, no part of this software or documentation may be +reproduced, stored in a retrieval system, or transmitted in any +form or by any means without the express written consent of +Intel Corporation. Module Name: @@ -41,14 +48,14 @@ typedef VOID *EFI_EVENT; -/* - * Prototype argument decoration for EFI parameters to indicate - * their direction - * - * IN - argument is passed into the function - * OUT - argument (pointer) is returned from the function - * OPTIONAL - argument is optional - */ +// +// Prototype argument decoration for EFI parameters to indicate +// their direction +// +// IN - argument is passed into the function +// OUT - argument (pointer) is returned from the function +// OPTIONAL - argument is optional +// #ifndef IN #define IN @@ -57,9 +64,9 @@ #endif -/* - * A GUID - */ +// +// A GUID +// typedef struct { UINT32 Data1; @@ -69,36 +76,36 @@ } EFI_GUID; -/* - * Time - */ +// +// Time +// typedef struct { - UINT16 Year; /* 1998 - 20XX */ - UINT8 Month; /* 1 - 12 */ - UINT8 Day; /* 1 - 31 */ - UINT8 Hour; /* 0 - 23 */ - UINT8 Minute; /* 0 - 59 */ - UINT8 Second; /* 0 - 59 */ - UINT8 Pad1; - UINT32 Nanosecond; /* 0 - 999,999,999 */ - INT16 TimeZone; /* -1440 to 1440 or 2047 */ - UINT8 Daylight; - UINT8 Pad2; + UINT16 Year; // 1998 - 20XX + UINT8 Month; // 1 - 12 + UINT8 Day; // 1 - 31 + UINT8 Hour; // 0 - 23 + UINT8 Minute; // 0 - 59 + UINT8 Second; // 0 - 59 + UINT8 Pad1; + UINT32 Nanosecond; // 0 - 999,999,999 + INT16 TimeZone; // -1440 to 1440 or 2047 + UINT8 Daylight; + UINT8 Pad2; } EFI_TIME; -/* Bit definitions for EFI_TIME.Daylight */ +// Bit definitions for EFI_TIME.Daylight #define EFI_TIME_ADJUST_DAYLIGHT 0x01 #define EFI_TIME_IN_DAYLIGHT 0x02 -/* Value definition for EFI_TIME.TimeZone */ +// Value definition for EFI_TIME.TimeZone #define EFI_UNSPECIFIED_TIMEZONE 0x07FF -/* - * Networking - */ +// +// Networking +// typedef struct { UINT8 Addr[4]; @@ -112,9 +119,9 @@ UINT8 Addr[32]; } EFI_MAC_ADDRESS; -/* - * Memory - */ +// +// Memory +// typedef UINT64 EFI_PHYSICAL_ADDRESS; typedef UINT64 EFI_VIRTUAL_ADDRESS; @@ -126,13 +133,12 @@ MaxAllocateType } EFI_ALLOCATE_TYPE; -/* - * Preseve the attr on any range supplied. - * ConventialMemory must have WB,SR,SW when supplied. - * When allocating from ConventialMemory always make it WB,SR,SW - * When returning to ConventialMemory always make it WB,SR,SW - * When getting the memory map, or on RT for runtime types - */ +//Preseve the attr on any range supplied. +//ConventialMemory must have WB,SR,SW when supplied. +//When allocating from ConventialMemory always make it WB,SR,SW +//When returning to ConventialMemory always make it WB,SR,SW +//When getting the memory map, or on RT for runtime types + typedef enum { EfiReservedMemoryType, @@ -152,42 +158,46 @@ EfiMaxMemoryType } EFI_MEMORY_TYPE; -/* possible caching types for the memory range */ +// possible caching types for the memory range #define EFI_MEMORY_UC 0x0000000000000001 #define EFI_MEMORY_WC 0x0000000000000002 #define EFI_MEMORY_WT 0x0000000000000004 #define EFI_MEMORY_WB 0x0000000000000008 #define EFI_MEMORY_UCE 0x0000000000000010 -/* physical memory protection on range */ +// physical memory protection on range #define EFI_MEMORY_WP 0x0000000000001000 #define EFI_MEMORY_RP 0x0000000000002000 #define EFI_MEMORY_XP 0x0000000000004000 -/* range requires a runtime mapping */ +// range requires a runtime mapping #define EFI_MEMORY_RUNTIME 0x8000000000000000 #define EFI_MEMORY_DESCRIPTOR_VERSION 1 typedef struct { - UINT32 Type; /* 32 bit padding */ - EFI_PHYSICAL_ADDRESS PhysicalStart; - EFI_VIRTUAL_ADDRESS VirtualStart; - UINT64 NumberOfPages; - UINT64 Attribute; + UINT32 Type; // Field size is 32 bits followed by 32 bit pad + EFI_PHYSICAL_ADDRESS PhysicalStart; // Field size is 64 bits + EFI_VIRTUAL_ADDRESS VirtualStart; // Field size is 64 bits + UINT64 NumberOfPages; // Field size is 64 bits + UINT64 Attribute; // Field size is 64 bits } EFI_MEMORY_DESCRIPTOR; -/* - * International Language - */ +// +// International Language +// typedef UINT8 ISO_639_2; #define ISO_639_2_ENTRY_SIZE 3 +// +// +// + #define EFI_PAGE_SIZE 4096 #define EFI_PAGE_MASK 0xFFF #define EFI_PAGE_SHIFT 12 #define EFI_SIZE_TO_PAGES(a) \ - ( ((a) >> EFI_PAGE_SHIFT) + ((a) & EFI_PAGE_MASK ? 1 : 0) ) + ( ((a) >> EFI_PAGE_SHIFT) + (((a) & EFI_PAGE_MASK) ? 1 : 0) ) #endif From owner-p4-projects@FreeBSD.ORG Wed Oct 25 19:10:51 2006 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 551C416A4E5; Wed, 25 Oct 2006 19:10:51 +0000 (UTC) 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 237A216A4DE for ; Wed, 25 Oct 2006 19:10:51 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E494B43D49 for ; Wed, 25 Oct 2006 19:10:50 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PJAogi055052 for ; Wed, 25 Oct 2006 19:10:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PJAoPr055049 for perforce@freebsd.org; Wed, 25 Oct 2006 19:10:50 GMT (envelope-from millert@freebsd.org) Date: Wed, 25 Oct 2006 19:10:50 GMT Message-Id: <200610251910.k9PJAoPr055049@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 108410 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, 25 Oct 2006 19:10:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=108410 Change 108410 by millert@millert_macbook on 2006/10/25 19:10:13 Call mac_proc_check_debug() for ptrace() and task_for_pid(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/mach_process.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vm/vm_unix.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#15 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/mach_process.c#2 (text+ko) ==== @@ -417,5 +417,13 @@ *errp = EBUSY; return (0); } + +#ifdef MAC + my_err = mac_proc_check_debug(creds, traced_procp); + if (my_err) { + *errp = my_err; + return (0); + } +#endif return(1); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vm/vm_unix.c#3 (text+ko) ==== @@ -405,6 +405,11 @@ ) && (p->p_stat != SZOMB) ) { +#ifdef MAC + error = mac_proc_check_debug(kauth_cred_get(), p); + if (error) + goto noperm; +#endif if (p->task != TASK_NULL) { task_reference(p->task); sright = (void *)convert_task_to_port(p->task); @@ -419,6 +424,7 @@ error = KERN_SUCCESS; goto tfpout; } +noperm: task_deallocate(t1); tret = MACH_PORT_NULL; (void) copyout((char *) &tret, task_addr, sizeof(mach_port_name_t)); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#15 (text+ko) ==== @@ -3513,8 +3513,7 @@ Determine whether the subject identified by the credential can debug the passed process. This call may be made in a number of situations, - including use of the ptrace(2) and ktrace(2) APIs, as well as for some - types of procfs operations. + including use of the ptrace(2), ktrace(2) and task_for_pid(2) APIs. @return Return 0 if access is granted, otherwise an appropriate value for errno should be returned. Suggested failure: EACCES for label mismatch, From owner-p4-projects@FreeBSD.ORG Wed Oct 25 19:10:52 2006 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 E7A8816A415; Wed, 25 Oct 2006 19:10:51 +0000 (UTC) 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 C59CE16A407 for ; Wed, 25 Oct 2006 19:10:51 +0000 (UTC) (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 5EFD043D49 for ; Wed, 25 Oct 2006 19:10:51 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PJAp5M055059 for ; Wed, 25 Oct 2006 19:10:51 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PJAoeh055055 for perforce@freebsd.org; Wed, 25 Oct 2006 19:10:50 GMT (envelope-from marcel@freebsd.org) Date: Wed, 25 Oct 2006 19:10:50 GMT Message-Id: <200610251910.k9PJAoeh055055@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 108411 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, 25 Oct 2006 19:10:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=108411 Change 108411 by marcel@marcel_cluster on 2006/10/25 19:10:13 Sync with the EFI 1.10.14.62 sample implementation. Affected files ... .. //depot/projects/ia64/sys/boot/efi/include/efidevp.h#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/include/efidevp.h#3 (text+ko) ==== @@ -4,7 +4,14 @@ /*++ -Copyright (c) 1998 Intel Corporation +Copyright (c) 1999 - 2002 Intel Corporation. All rights reserved +This software and associated documentation (if any) is furnished +under a license and may only be used or copied in accordance +with the terms of the license. Except as permitted by such +license, no part of this software or documentation may be +reproduced, stored in a retrieval system, or transmitted in any +form or by any means without the express written consent of +Intel Corporation. Module Name: @@ -20,9 +27,9 @@ --*/ -/* - * Device Path structures - Section C - */ +// +// Device Path structures - Section C +// typedef struct _EFI_DEVICE_PATH { UINT8 Type; @@ -33,7 +40,9 @@ #define EFI_DP_TYPE_MASK 0x7F #define EFI_DP_TYPE_UNPACKED 0x80 +//#define END_DEVICE_PATH_TYPE 0xff #define END_DEVICE_PATH_TYPE 0x7f +//#define END_DEVICE_PATH_TYPE_UNPACKED 0x7f #define END_ENTIRE_DEVICE_PATH_SUBTYPE 0xff #define END_INSTANCE_DEVICE_PATH_SUBTYPE 0x01 @@ -47,6 +56,7 @@ #define DevicePathSubType(a) ( (a)->SubType ) #define DevicePathNodeLength(a) ( ((a)->Length[0]) | ((a)->Length[1] << 8) ) #define NextDevicePathNode(a) ( (EFI_DEVICE_PATH *) ( ((UINT8 *) (a)) + DevicePathNodeLength(a))) +//#define IsDevicePathEndType(a) ( DevicePathType(a) == END_DEVICE_PATH_TYPE_UNPACKED ) #define IsDevicePathEndType(a) ( DevicePathType(a) == END_DEVICE_PATH_TYPE ) #define IsDevicePathEndSubType(a) ( (a)->SubType == END_ENTIRE_DEVICE_PATH_SUBTYPE ) #define IsDevicePathEnd(a) ( IsDevicePathEndType(a) && IsDevicePathEndSubType(a) ) @@ -82,7 +92,7 @@ #define HW_PCCARD_DP 0x02 typedef struct _PCCARD_DEVICE_PATH { EFI_DEVICE_PATH Header; - UINT8 SocketNumber; + UINT8 FunctionNumber; } PCCARD_DEVICE_PATH; #define HW_MEMMAP_DP 0x03 @@ -125,16 +135,25 @@ UINT32 UID; } ACPI_HID_DEVICE_PATH; -/* - * EISA ID Macro - * EISA ID Definition 32-bits - * bits[15:0] - three character compressed ASCII EISA ID. - * bits[31:16] - binary number - * Compressed ASCII is 5 bits per character 0b00001 = 'A' 0b11010 = 'Z' - */ +#define ACPI_EXTENDED_DP 0x02 +typedef struct _ACPI_EXTENDED_HID_DEVICE_PATH { + EFI_DEVICE_PATH Header; + UINT32 HID; + UINT32 UID; + UINT32 CID; +} ACPI_EXTENDED_HID_DEVICE_PATH; + +// +// EISA ID Macro +// EISA ID Definition 32-bits +// bits[15:0] - three character compressed ASCII EISA ID. +// bits[31:16] - binary number +// Compressed ASCII is 5 bits per character 0b00001 = 'A' 0b11010 = 'Z' +// #define PNP_EISA_ID_CONST 0x41d0 #define EISA_ID(_Name, _Num) ((UINT32) ((_Name) | (_Num) << 16)) #define EISA_PNP_ID(_PNPId) (EISA_ID(PNP_EISA_ID_CONST, (_PNPId))) +#define EFI_PNP_ID(_PNPId) (EISA_ID(PNP_EISA_ID_CONST, (_PNPId))) #define PNP_EISA_ID_MASK 0xffff #define EISA_ID_TO_NUM(_Id) ((_Id) >> 16) @@ -175,9 +194,9 @@ #define MSG_USB_DP 0x05 typedef struct _USB_DEVICE_PATH { - EFI_DEVICE_PATH Header; - UINT8 Port; - UINT8 Endpoint; + EFI_DEVICE_PATH Header; + UINT8 ParentPortNumber; + UINT8 InterfaceNumber; } USB_DEVICE_PATH; #define MSG_USB_CLASS_DP 0x0F @@ -186,7 +205,7 @@ UINT16 VendorId; UINT16 ProductId; UINT8 DeviceClass; - UINT8 DeviceSubclass; + UINT8 DeviceSubClass; UINT8 DeviceProtocol; } USB_CLASS_DEVICE_PATH; @@ -227,13 +246,20 @@ #define MSG_INFINIBAND_DP 0x09 typedef struct _INFINIBAND_DEVICE_PATH { - EFI_DEVICE_PATH Header; - UINT32 Reserved; - UINT64 NodeGuid; - UINT64 IocGuid; - UINT64 DeviceId; + EFI_DEVICE_PATH Header; + UINT32 ResourceFlags; + UINT8 PortGid[16]; + UINT64 ServiceId; + UINT64 TargetPortId; + UINT64 DeviceId; } INFINIBAND_DEVICE_PATH; +#define INFINIBAND_RESOURCE_FLAG_IOC_SERVICE 0x01 +#define INFINIBAND_RESOURCE_FLAG_EXTENDED_BOOT_ENVIRONMENT 0x02 +#define INFINIBAND_RESOURCE_FLAG_CONSOLE_PROTOCOL 0x04 +#define INFINIBAND_RESOURCE_FLAG_STORAGE_PROTOCOL 0x08 +#define INFINIBAND_RESOURCE_FLAG_NETWORK_PROTOCOL 0x10 + #define MSG_UART_DP 0x0e typedef struct _UART_DEVICE_PATH { EFI_DEVICE_PATH Header; @@ -253,6 +279,11 @@ #define DEVICE_PATH_MESSAGING_VT_100 \ { 0xdfa66065, 0xb419, 0x11d3, 0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d } +#define DEVICE_PATH_MESSAGING_VT_100_PLUS \ + { 0x7baec70b, 0x57e0, 0x4c76, 0x8e, 0x87, 0x2f, 0x9e, 0x28, 0x08, 0x83, 0x43 } + +#define DEVICE_PATH_MESSAGING_VT_UTF8 \ + { 0xad15a0d6, 0x8bec, 0x4acf, 0xa0, 0x73, 0xd0, 0x1d, 0xe7, 0x7e, 0x2d, 0x88 } #define MEDIA_DEVICE_PATH 0x04 @@ -362,6 +393,7 @@ UNKNOWN_DEVICE_VENDOR_DEVICE_PATH *UnknownVendor; CONTROLLER_DEVICE_PATH *Controller; ACPI_HID_DEVICE_PATH *Acpi; + ACPI_EXTENDED_HID_DEVICE_PATH *ExtendedAcpi; ATAPI_DEVICE_PATH *Atapi; SCSI_DEVICE_PATH *Scsi; From owner-p4-projects@FreeBSD.ORG Wed Oct 25 19:14:57 2006 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 51B0216A524; Wed, 25 Oct 2006 19:14:57 +0000 (UTC) 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 2C8CA16A412 for ; Wed, 25 Oct 2006 19:14:57 +0000 (UTC) (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 E407B43D49 for ; Wed, 25 Oct 2006 19:14:56 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PJEuIS056389 for ; Wed, 25 Oct 2006 19:14:56 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PJEucR056386 for perforce@freebsd.org; Wed, 25 Oct 2006 19:14:56 GMT (envelope-from marcel@freebsd.org) Date: Wed, 25 Oct 2006 19:14:56 GMT Message-Id: <200610251914.k9PJEucR056386@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 108412 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, 25 Oct 2006 19:14:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=108412 Change 108412 by marcel@marcel_cluster on 2006/10/25 19:14:02 Sync with the EFI 1.10.14.62 sample implementation. Affected files ... .. //depot/projects/ia64/sys/boot/efi/include/efierr.h#2 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/include/efierr.h#2 (text+ko) ==== @@ -4,7 +4,14 @@ /*++ -Copyright (c) 1998 Intel Corporation +Copyright (c) 1999 - 2002 Intel Corporation. All rights reserved +This software and associated documentation (if any) is furnished +under a license and may only be used or copied in accordance +with the terms of the license. Except as permitted by such +license, no part of this software or documentation may be +reproduced, stored in a retrieval system, or transmitted in any +form or by any means without the express written consent of +Intel Corporation. Module Name: @@ -52,7 +59,7 @@ #define EFI_TFTP_ERROR EFIERR(23) #define EFI_PROTOCOL_ERROR EFIERR(24) -#define EFI_WARN_UNKOWN_GLYPH EFIWARN(1) +#define EFI_WARN_UNKNOWN_GLYPH EFIWARN(1) #define EFI_WARN_DELETE_FAILURE EFIWARN(2) #define EFI_WARN_WRITE_FAILURE EFIWARN(3) #define EFI_WARN_BUFFER_TOO_SMALL EFIWARN(4) From owner-p4-projects@FreeBSD.ORG Wed Oct 25 19:18:01 2006 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 A8C7816A47E; Wed, 25 Oct 2006 19:18:01 +0000 (UTC) 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 8489D16A47B for ; Wed, 25 Oct 2006 19:18:01 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51FFD43D46 for ; Wed, 25 Oct 2006 19:18:01 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PJI1sS056510 for ; Wed, 25 Oct 2006 19:18:01 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PJI1LS056505 for perforce@freebsd.org; Wed, 25 Oct 2006 19:18:01 GMT (envelope-from millert@freebsd.org) Date: Wed, 25 Oct 2006 19:18:01 GMT Message-Id: <200610251918.k9PJI1LS056505@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 108413 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, 25 Oct 2006 19:18:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=108413 Change 108413 by millert@millert_macbook on 2006/10/25 19:17:23 When building policy in /etc/sedarwin/refpolicy, use the pre-generated .flask files. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Makefile#4 (text+ko) ==== @@ -78,7 +78,7 @@ SEMOD_EXP ?= $(BINDIR)/semodule_expand LOADPOLICY ?= $(SBINDIR)/load_policy SETFILES ?= $(BINDIR)/setfiles -MIG ?= $(BINDIR)/mig +MIG_DEFS ?= bootstrap.flask notify_ipc.flask mtest.flask endif XMLLINT ?= $(BINDIR)/xmllint @@ -628,7 +628,11 @@ $(mig_msgids): $(MIG_DEFS) echo > $@ +ifeq ($(SEDARWIN_BUILD),1) for i in $(MIG_DEFS); do $(MIG) -user /dev/null -server /dev/null -header /dev/null -sheader /dev/null -flasksc `basename $$i .defs`.flask $$i; cat `basename $$i .defs`.flask >> $@; done +else + cat $(MIG_DEFS) >> $@ +endif $(mig_avs): $(mig_msgids) cat $< | awk '{sub("^_*", "", $$1); print $$1, $$2}' > $@ From owner-p4-projects@FreeBSD.ORG Wed Oct 25 19:19:03 2006 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 A051E16A415; Wed, 25 Oct 2006 19:19:03 +0000 (UTC) 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 79EBE16A40F for ; Wed, 25 Oct 2006 19:19:03 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4583543D46 for ; Wed, 25 Oct 2006 19:19:03 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PJJ31o056570 for ; Wed, 25 Oct 2006 19:19:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PJJ2JW056567 for perforce@freebsd.org; Wed, 25 Oct 2006 19:19:02 GMT (envelope-from millert@freebsd.org) Date: Wed, 25 Oct 2006 19:19:02 GMT Message-Id: <200610251919.k9PJJ2JW056567@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 108414 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, 25 Oct 2006 19:19:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=108414 Change 108414 by millert@millert_macbook on 2006/10/25 19:18:23 Replace the migscs load lock with an rwlock around access to msgid2class. Now that we actually free up the old contents on reload we need to make sure there are no use-after-free issues. Fix some signedness mismatches with the mig class data. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/init.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mach_av.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/services.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/init.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ policy_rwlock = lck_rw_alloc_init(ss_lck_grp, ss_lck_attr); load_sem = lck_mtx_alloc_init(ss_lck_grp, ss_lck_attr); - migscs_load_lock = lck_mtx_alloc_init(ss_lck_grp, ss_lck_attr); + migscs_rwlock = lck_rw_alloc_init(ss_lck_grp, ss_lck_attr); lck_attr_free(ss_lck_attr); lck_grp_attr_free(ss_lck_grp_attr); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mach_av.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,15 +46,15 @@ struct msgid_classinfo { - int nmsgids; - int *msgids; - int nclasses; - int classes[0]; /* actually larger */ + u32 nmsgids; + u32 *msgids; + u32 nclasses; + u32 classes[0]; /* actually larger */ }; static struct hashtab *msgid2class; -lck_mtx_t *migscs_load_lock; +lck_rw_t *migscs_rwlock; static int msgid_destroy(void *key, void *datum, void *arg) @@ -76,16 +76,16 @@ { struct msgid_classinfo *cinfo; struct hashtab *ht, *oht; - int error, entries, i, msgid, nclasses, size; - int *p, *ep; + u32 entries, i, msgid, nclasses, size, *p, *ep; + int error; ht = hashtab_create(msgid_hash, msgid_cmp, 31337); if (ht == NULL) return (-1); error = 0; - p = (int *)tdata; - ep = (int *)((char *)tdata + tsize); + p = (u32 *)tdata; + ep = (u32 *)((char *)tdata + tsize); for (entries = 0; p < ep; entries++) { if (p + 3 > ep) goto bad; @@ -101,7 +101,7 @@ * so we can free things up with a map operation later. */ cinfo = sebsd_malloc(sizeof(*cinfo) + - (nclasses + size) * sizeof(int), M_SEBSD, M_WAITOK); + (nclasses + size) * sizeof(u32), M_SEBSD, M_WAITOK); cinfo->nclasses = nclasses; for (i = 0; i < nclasses; i++) cinfo->classes[i] = *p++; @@ -116,17 +116,16 @@ } } - printf("security class to subsystem table: %d classes\n", entries); + printf("security: class to subsystem table: %d classes\n", entries); /* * Swap the old message id to class mapping with the new one * and free the old. */ - /* XXX - need rwlock for msgid2class */ - lck_mtx_lock(migscs_load_lock); + lck_rw_lock_exclusive(migscs_rwlock); oht = msgid2class; msgid2class = ht; - lck_mtx_unlock(migscs_load_lock); + lck_rw_unlock_exclusive(migscs_rwlock); if (oht != NULL) { hashtab_map(oht, msgid_destroy, NULL); hashtab_destroy(oht); @@ -158,28 +157,38 @@ sebsd_ipc_check_method1(int subj, int obj, int msgid) { struct msgid_classinfo *mcl; - u32 perms; - int cl; + u16 tclass; + u32 perms, cl; + int msgid_norm; /* * Return allowed for messages in an unknown subsystem. * Instead, we probably should make a check against a * new permission to be added to mach_port for this purpose. */ - /* XXX - need rwlock for msgid2class */ + lck_rw_lock_shared(migscs_rwlock); mcl = hashtab_search(msgid2class, &msgid); - if (mcl == NULL) - return 0; + if (mcl == NULL) { + lck_rw_unlock_shared(migscs_rwlock); + return (0); + } - cl = (msgid - mcl->msgids[0]) / (8 * sizeof(u32)); + /* + * Normalize msgid relative to base id and find class index and value. + */ + msgid_norm = msgid - mcl->msgids[0]; + cl = msgid_norm / (8 * sizeof(u32)); if (cl >= mcl->nclasses) { /* bad message */ + lck_rw_unlock_shared(migscs_rwlock); if (selinux_enforcing) return (EACCES); else return (0); } + tclass = (u16)mcl->classes[cl]; + lck_rw_unlock_shared(migscs_rwlock); - perms = (u32)1 << (msgid - mcl->msgids[0] - (cl * 8 * sizeof(u32))); - return avc_has_perm(subj, obj, mcl->classes[cl], perms, NULL); + perms = (u32)1 << (msgid_norm - (cl * 8 * sizeof(u32))); + return avc_has_perm(subj, obj, tclass, perms, NULL); } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/services.h#2 (text+ko) ==== @@ -21,8 +21,8 @@ * Security server locks, as allocated by security_init(). */ extern lck_rw_t *policy_rwlock; +extern lck_rw_t *migscs_rwlock; extern lck_mtx_t *load_sem; -extern lck_mtx_t *migscs_load_lock; extern const char *security_class_to_string(u16 tclass); From owner-p4-projects@FreeBSD.ORG Wed Oct 25 19:20:05 2006 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 C1F5316A417; Wed, 25 Oct 2006 19:20:05 +0000 (UTC) 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 96DDF16A407 for ; Wed, 25 Oct 2006 19:20:05 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 484C243D46 for ; Wed, 25 Oct 2006 19:20:05 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PJK5fQ056611 for ; Wed, 25 Oct 2006 19:20:05 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PJK4J8056608 for perforce@freebsd.org; Wed, 25 Oct 2006 19:20:04 GMT (envelope-from millert@freebsd.org) Date: Wed, 25 Oct 2006 19:20:04 GMT Message-Id: <200610251920.k9PJK4J8056608@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 108415 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, 25 Oct 2006 19:20:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=108415 Change 108415 by millert@millert_macbook on 2006/10/25 19:19:39 Add modification clause Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/mach_process.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vm/vm_unix.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/mach_process.c#3 (text+ko) ==== @@ -59,6 +59,12 @@ * * from: @(#)sys_process.c 8.1 (Berkeley) 6/10/93 */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ #include #include ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vm/vm_unix.c#4 (text+ko) ==== @@ -25,11 +25,13 @@ * All rights reserved. The CMU software License Agreement specifies * the terms and conditions for use and redistribution. */ - /* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. */ - #include #include From owner-p4-projects@FreeBSD.ORG Wed Oct 25 19:25:15 2006 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 8949C16A4D1; Wed, 25 Oct 2006 19:25:15 +0000 (UTC) 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 4C2A616A4C2 for ; Wed, 25 Oct 2006 19:25:15 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 531B543D64 for ; Wed, 25 Oct 2006 19:25:12 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PJPCO8058060 for ; Wed, 25 Oct 2006 19:25:12 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PJPBbB058057 for perforce@freebsd.org; Wed, 25 Oct 2006 19:25:11 GMT (envelope-from millert@freebsd.org) Date: Wed, 25 Oct 2006 19:25:11 GMT Message-Id: <200610251925.k9PJPBbB058057@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 108416 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, 25 Oct 2006 19:25:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=108416 Change 108416 by millert@millert_macbook on 2006/10/25 19:24:34 Change ikm_sender from struct ipc_labelh * to task_t. This allows us to report the correct sender in the avc audit logs for MiG-based permissions. To do this, we now pass a struct proc * to mpo_port_check_method. This change may be reverted in the future but is very useful for debugging. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_kmsg.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_kmsg.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_mqueue.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/mach_msg.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_mach_internal.h#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#16 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_port.c#7 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#25 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.h#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mach_av.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_kmsg.c#3 (text+ko) ==== @@ -294,9 +294,10 @@ ipc_port_t port; #ifdef MAC - if (kmsg->ikm_sender != NULL){ - labelh_release (kmsg->ikm_sender); - kmsg->ikm_sender = NULL; + if (kmsg->ikm_sender != NULL) { + labelh_release(kmsg->ikm_sender->label); + task_deallocate(kmsg->ikm_sender); + kmsg->ikm_sender = NULL; } #endif @@ -663,8 +664,9 @@ #ifdef MAC if (kmsg->ikm_sender != NULL) { - labelh_release (kmsg->ikm_sender); - kmsg->ikm_sender = NULL; + labelh_release(kmsg->ikm_sender->label); + task_deallocate(kmsg->ikm_sender); + kmsg->ikm_sender = NULL; } #endif } @@ -769,13 +771,13 @@ #endif #ifdef MAC - task_t cur = current_thread()->task; - if (cur) - { - labelh_reference (cur->label); - kmsg->ikm_sender = cur->label; - } - else + /* XXX - why do we zero sender labels here instead of in mach_msg()? */ + task_t cur = current_task(); + if (cur) { + task_reference(cur); + labelh_reference(cur->label); + kmsg->ikm_sender = cur; + } else trailer->msgh_labels.sender = 0; #else trailer->msgh_labels.sender = 0; @@ -869,7 +871,7 @@ trailer->msgh_labels.sender = 0; #ifdef MAC - kmsg->ikm_sender = (ipc_labelh_t)NULL; + kmsg->ikm_sender = NULL; #endif *kmsgp = kmsg; return MACH_MSG_SUCCESS; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_kmsg.h#2 (text+ko) ==== @@ -94,7 +94,7 @@ struct ipc_kmsg *ikm_prev; ipc_port_t ikm_prealloc; /* port we were preallocated from */ mach_msg_size_t ikm_size; - struct ipc_labelh *ikm_sender; + task_t ikm_sender; mach_msg_header_t *ikm_header; }; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_mqueue.c#3 (text+ko) ==== @@ -716,7 +716,7 @@ #ifdef MAC if (self->ith_kmsg != NULL && self->ith_kmsg->ikm_sender != NULL) { - lh = self->ith_kmsg->ikm_sender; + lh = self->ith_kmsg->ikm_sender->label; task = current_task(); tasklabel_lock(task); ip_lock(lh->lh_port); @@ -745,7 +745,7 @@ #ifdef MAC if (self->ith_kmsg != NULL && self->ith_kmsg->ikm_sender != NULL) { - lh = self->ith_kmsg->ikm_sender; + lh = self->ith_kmsg->ikm_sender->label; task = current_task(); tasklabel_lock(task); ip_lock(lh->lh_port); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/mach_msg.c#5 (text+ko) ==== @@ -314,7 +314,8 @@ #ifdef MAC if (kmsg->ikm_sender != NULL && IP_VALID(kmsg->ikm_header->msgh_remote_port) && - mac_port_check_method(&kmsg->ikm_sender->lh_label, + mac_port_check_method(kmsg->ikm_sender, + &kmsg->ikm_sender->maclabel, &((ipc_port_t)kmsg->ikm_header->msgh_remote_port)->ip_label, kmsg->ikm_header->msgh_id) == 0) trailer->msgh_ad = 1; @@ -331,7 +332,7 @@ if (option & MACH_RCV_TRAILER_ELEMENTS (MACH_RCV_TRAILER_LABELS)) { #ifdef MAC if (kmsg->ikm_sender != NULL) { - ipc_labelh_t lh = kmsg->ikm_sender; + ipc_labelh_t lh = kmsg->ikm_sender->label; kern_return_t kr; ip_lock(lh->lh_port); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_mach_internal.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ void mac_task_label_update_internal(struct label *pl, struct task *t); int mac_port_label_compute(struct label *subj, struct label *obj, const char *serv, struct label *out); -int mac_port_check_method(struct label *task, struct label *port, int msgid); +int mac_port_check_method(task_t task, struct label *sub, struct label *obj, int msgid); #ifdef MAC void mac_policy_init(void); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#16 (text+ko) ==== @@ -2867,6 +2867,7 @@ /** @brief Compute access control check for a Mach message-based service + @param proc Sender's process structure (may be NULL) @param task Sender's task label @param port Destination port label @param msgid Message id @@ -2884,6 +2885,7 @@ */ typedef int mpo_port_check_method_t( + struct proc *proc, struct label *task, struct label *port, int msgid ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_port.c#7 (text+ko) ==== @@ -244,11 +244,11 @@ } int -mac_port_check_method(struct label *task, struct label *port, int msgid) +mac_port_check_method(task_t task, struct label *sub, struct label *obj, int msgid) { int error; - MAC_CHECK(port_check_method, task, port, msgid); + MAC_CHECK(port_check_method, get_bsdtask_info(task), sub, obj, msgid); return (error); } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#3 (text+ko) ==== @@ -653,7 +653,7 @@ u16 tclass, u32 requested, struct av_decision *avd, int result, struct avc_audit_data *a) { - struct proc *tsk = current_proc(); + struct proc *tsk; u32 denied, audited; struct audit_buffer *ab; @@ -679,10 +679,10 @@ audit_log_format(ab, "avc: %s ", denied ? "denied" : "granted"); avc_dump_av(ab, tclass,audited); audit_log_format(ab, " for "); -#ifdef __linux__ if (a && a->tsk) tsk = a->tsk; -#endif + else + tsk = current_proc(); /* XXX, should be set by caller */ if (tsk && tsk->p_pid) { audit_log_format(ab, " pid=%d comm=", tsk->p_pid); audit_log_untrustedstring(ab, tsk->p_comm); @@ -799,6 +799,9 @@ a->u.net.netif); #endif /* __linux__ */ break; + case AVC_AUDIT_DATA_MIG: + audit_log_format(ab, " msgid=%d", a->u.ipc_id); + break; } } audit_log_format(ab, " "); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ struct avc_entry; -struct task_struct; +struct proc; struct xsocket; /* Auxiliary data to use in generating the audit record. */ @@ -44,9 +44,8 @@ #define AVC_AUDIT_DATA_NET 2 #define AVC_AUDIT_DATA_CAP 3 #define AVC_AUDIT_DATA_IPC 4 -#ifdef __linux__ - struct task_struct *tsk; -#endif +#define AVC_AUDIT_DATA_MIG 5 + struct proc *tsk; union { struct { struct vnode *vp; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#25 (text+ko) ==== @@ -1481,14 +1481,15 @@ } static int -sebsd_port_check_method(struct label *subj, struct label *obj, int msgid) +sebsd_port_check_method(struct proc *p, struct label *subj, struct label *obj, + int msgid) { struct task_security_struct *tsec, *psec; psec = SLOT(obj); tsec = SLOT(subj); - return (sebsd_ipc_check_method1(tsec->sid,psec->sid, msgid)); + return (sebsd_ipc_check_method1(p, tsec->sid, psec->sid, msgid)); } static int ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.h#5 (text+ko) ==== @@ -57,6 +57,6 @@ extern int sebsd_syscall(struct proc *p, int call, user_addr_t args); extern int cred_has_system(struct ucred *cred, u_int32_t perm); extern int cred_has_security(struct ucred *cred, u_int32_t perm); -extern int sebsd_ipc_check_method1(int subj, int obj, int msgid); +extern int sebsd_ipc_check_method1(struct proc *p, int subj, int obj, int msgid); #endif /* _SYS_SECURITY_SEBSD_H */ ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mach_av.c#6 (text+ko) ==== @@ -154,13 +154,18 @@ int -sebsd_ipc_check_method1(int subj, int obj, int msgid) +sebsd_ipc_check_method1(struct proc *p, int subj, int obj, int msgid) { struct msgid_classinfo *mcl; u16 tclass; u32 perms, cl; int msgid_norm; + struct avc_audit_data ad; + AVC_AUDIT_DATA_INIT(&ad, MIG); + ad.u.ipc_id = msgid; + ad.tsk = p; + /* * Return allowed for messages in an unknown subsystem. * Instead, we probably should make a check against a @@ -190,5 +195,5 @@ lck_rw_unlock_shared(migscs_rwlock); perms = (u32)1 << (msgid_norm - (cl * 8 * sizeof(u32))); - return avc_has_perm(subj, obj, tclass, perms, NULL); + return avc_has_perm(subj, obj, tclass, perms, &ad); } From owner-p4-projects@FreeBSD.ORG Wed Oct 25 19:26:20 2006 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 E47FF16A47E; Wed, 25 Oct 2006 19:26:19 +0000 (UTC) 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 C0D5116A40F for ; Wed, 25 Oct 2006 19:26:19 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DB7C43D6D for ; Wed, 25 Oct 2006 19:26:14 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PJQDTh058125 for ; Wed, 25 Oct 2006 19:26:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PJQDbm058122 for perforce@freebsd.org; Wed, 25 Oct 2006 19:26:13 GMT (envelope-from millert@freebsd.org) Date: Wed, 25 Oct 2006 19:26:13 GMT Message-Id: <200610251926.k9PJQDbm058122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 108417 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, 25 Oct 2006 19:26:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=108417 Change 108417 by millert@millert_macbook on 2006/10/25 19:25:43 Add modification clause. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/fdesc/fdesc_vnops.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/fdesc/fdesc_vnops.c#4 (text+ko) ==== @@ -58,6 +58,12 @@ * @(#)fdesc_vnops.c 8.17 (Berkeley) 5/22/95 * */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * support for mandatory and extensible security protections. This notice + * is included in support of clause 2.2 (b) of the Apple Public License, + * Version 2.0. + */ /* * /dev/fd Filesystem From owner-p4-projects@FreeBSD.ORG Wed Oct 25 19:27:31 2006 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 89D5B16A47B; Wed, 25 Oct 2006 19:27:31 +0000 (UTC) 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 4B2FE16A407 for ; Wed, 25 Oct 2006 19:27:31 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E45143D45 for ; Wed, 25 Oct 2006 19:27:19 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PJRFhJ058362 for ; Wed, 25 Oct 2006 19:27:15 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PJRFDG058359 for perforce@freebsd.org; Wed, 25 Oct 2006 19:27:15 GMT (envelope-from millert@freebsd.org) Date: Wed, 25 Oct 2006 19:27:15 GMT Message-Id: <200610251927.k9PJRFDG058359@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 108418 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, 25 Oct 2006 19:27:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=108418 Change 108418 by millert@millert_macbook on 2006/10/25 19:26:51 The first first parameter of mac_devfs_label_associate_directory() is always NULL. Likewise, the first two parameters of mac_devfs_label_associate_device() are always NULL. This is an artifact of the port of the devfs support from FreeBSD which has a more featureful devfs implementation. There's no good reason to pass pointers into the framework (and then the entry points) that are always NULL so they have been removed. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/devfs/devfs_tree.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#9 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#17 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#13 edit .. //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#15 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#26 edit .. //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#13 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/devfs/devfs_tree.c#5 (text+ko) ==== @@ -178,7 +178,7 @@ = (struct devfsmount *)devfs_hidden_mount->mnt_data; #endif /* HIDDEN_MOUNTPOINT */ #ifdef MAC - mac_devfs_label_associate_directory(NULL, "/", strlen("/"), + mac_devfs_label_associate_directory("/", strlen("/"), dev_root->de_dnp, "/"); #endif devfs_ready = 1; @@ -308,7 +308,7 @@ break; dnp = dirent_p->de_dnp; #ifdef MAC - mac_devfs_label_associate_directory(NULL, + mac_devfs_label_associate_directory( dirnode->dn_typeinfo.Dir.myname->de_name, strlen(dirnode->dn_typeinfo.Dir.myname->de_name), dnp, fullpath); @@ -1225,8 +1225,7 @@ new_dev->de_dnp->dn_uid = uid; new_dev->de_dnp->dn_mode |= perms; #ifdef MAC - mac_devfs_label_associate_device(NULL, NULL, dev, new_dev->de_dnp, - buff); + mac_devfs_label_associate_device(dev, new_dev->de_dnp, buff); #endif devfs_propogate(dnp->dn_typeinfo.Dir.myname, new_dev); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#9 (text+ko) ==== @@ -150,10 +150,10 @@ void mac_vnode_label_associate_singlelabel(struct mount *mp, struct vnode *vp); void mac_vnode_label_associate_file(struct ucred *cred, struct fileglob *fg, struct vnode *vp); -void mac_devfs_label_associate_device(struct ucred *cr, struct mount *mp, - dev_t dev, struct devnode *de, const char *fullpath); -void mac_devfs_label_associate_directory(struct mount *mp, char *dirname, - int dirnamelen, struct devnode *de, const char *fullpath); +void mac_devfs_label_associate_device(dev_t dev, struct devnode *de, + const char *fullpath); +void mac_devfs_label_associate_directory(char *dirname, int dirnamelen, + struct devnode *de, const char *fullpath); int mac_vnode_notify_create(struct ucred *cred, struct mount *mp, struct vnode *dvp, struct vnode *vp, struct componentname *cnp); void mac_mount_label_associate(struct ucred *cred, struct mount *mp); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#17 (text+ko) ==== @@ -1496,23 +1496,16 @@ /** @brief Create a new devfs device - @param cred Process credential, if created on behalf of a user process - @param mp Devfs mount point (currently unused in Darwin) @param dev Major and minor numbers of special file @param de "inode" of new device file @param label Destination label @param fullpath Path relative to mount (e.g. /dev) of new device file This entry point labels a new devfs device. The label will likely be based - on the path to the device, or the major and minor numbers. If the device was - created on behalf of a user process (for example, /dev/pts/1), then - 'cred' contains the credentials of that process. - Otherwise, 'cred' is null. The policy should store an appropriate - label into 'label'. + on the path to the device, or the major and minor numbers. + The policy should store an appropriate label into 'label'. */ typedef void mpo_devfs_label_associate_device_t( - struct ucred *cred, - struct mount *mp, dev_t dev, struct devnode *de, struct label *label, @@ -1521,7 +1514,6 @@ /** @brief Create a new devfs directory - @param mp Not used in Darwin @param dirname Name of new directory @param dirnamelen Length of 'dirname' @param de "inode" of new directory @@ -1533,7 +1525,6 @@ label into 'label'. The devfs root directory is labelled in this way. */ typedef void mpo_devfs_label_associate_directory_t( - struct mount *mp, char *dirname, int dirnamelen, struct devnode *de, ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#13 (text+ko) ==== @@ -1090,20 +1090,19 @@ } void -mac_devfs_label_associate_device(struct ucred *cr, struct mount *mp, dev_t dev, - struct devnode *de, const char *fullpath) +mac_devfs_label_associate_device(dev_t dev, struct devnode *de, + const char *fullpath) { - MAC_PERFORM(devfs_label_associate_device, cr, mp, dev, de, de->dn_label, - fullpath); + MAC_PERFORM(devfs_label_associate_device, dev, de, de->dn_label, fullpath); } void -mac_devfs_label_associate_directory(struct mount *mp, char *dirname, int dirnamelen, +mac_devfs_label_associate_directory(char *dirname, int dirnamelen, struct devnode *de, const char *fullpath) { - MAC_PERFORM(devfs_label_associate_directory, mp, dirname, dirnamelen, de, + MAC_PERFORM(devfs_label_associate_directory, dirname, dirnamelen, de, de->dn_label, fullpath); } ==== //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#15 (text+ko) ==== @@ -1032,8 +1032,8 @@ * a lot like file system objects. */ static void -mac_mls_devfs_label_associate_device(struct ucred *cr, struct mount *mp, - dev_t dev, struct devnode *de, struct label *label, const char *fullpath) +mac_mls_devfs_label_associate_device(dev_t dev, struct devnode *de, + struct label *label, const char *fullpath) { struct mac_mls *mac_mls; int mls_type; @@ -1057,9 +1057,8 @@ } static void -mac_mls_devfs_label_associate_directory(struct mount *mp, char *dirname, - int dirnamelen, struct devnode *de, struct label *label, - const char *fullpath) +mac_mls_devfs_label_associate_directory(char *dirname, int dirnamelen, + struct devnode *de, struct label *label, const char *fullpath) { struct mac_mls *mac_mls; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#26 (text+ko) ==== @@ -1062,13 +1062,9 @@ ipcsec->sclass = SECCLASS_SHM; } -/* - * NOTE: on Darwin mp will always be NULLL for sebsd_devfs_label_associate_device - */ static void -sebsd_devfs_label_associate_device(struct ucred *cr, struct mount *mp, dev_t dev, - struct devnode *devfs_dirent, struct label *label, - const char *fullpath) +sebsd_devfs_label_associate_device(dev_t dev, struct devnode *devfs_dirent, + struct label *label, const char *fullpath) { char *path; int rc; @@ -1090,21 +1086,6 @@ if (rc == 0) dirent->sid = newsid; - /* If there was a creating process (currently only for /dev/pty*), - try a type_transition rule. */ - if (cr != NULL) { - struct task_security_struct *task = SLOT(cr->cr_label); - - /* - * XXX: uses the type specified by genfs instead of the - * parent directory like it should! - */ - int error = security_transition_sid(task->sid, dirent->sid, - dirent->sclass, &newsid); - if (error == 0) - dirent->sid = newsid; - } - /* TBD: debugging */ if (sebsd_verbose > 1) { printf("%s(%s): rc=%d, sclass=%d, computedsid=%d, dirent=%d\n", @@ -1113,13 +1094,9 @@ sebsd_free(path, M_SEBSD); } -/* - * NOTE: on Darwin mp will always be NULLL for sebsd_devfs_label_associate_directory - */ static void -sebsd_devfs_label_associate_directory(struct mount *mp, char *dirname, - int dirnamelen, struct devnode *de, struct label *label, - const char *fullpath) +sebsd_devfs_label_associate_directory(char *dirname, int dirnamelen, + struct devnode *de, struct label *label, const char *fullpath) { char *path; int rc; ==== //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#13 (text+ko) ==== @@ -1182,29 +1182,19 @@ USE_LABEL(fglabel, FILETYPE); } -/* The ucred and mount parameters can be NULL for this fcn */ static void -mac_test_devfs_label_associate_device(struct ucred *cr, struct mount *mp, - dev_t dev, struct devnode *de, struct label *label, - const char *fullpath) +mac_test_devfs_label_associate_device(dev_t dev, struct devnode *de, + struct label *label, const char *fullpath) { CHECKNULL(de); INIT_LABEL(label, DEVNODETYPE); - if (cr != NULL) - SANITY_CHECK(cr->cr_label, CREDTYPE); } static void -mac_test_devfs_label_associate_directory(struct mount *mp, char *dirname, - int dirnamelen, struct devnode *de, - struct label *label, const char *fullpath) +mac_test_devfs_label_associate_directory(char *dirname, int dirnamelen, + struct devnode *de, struct label *label, const char *fullpath) { - /* - * MP should be NULL for devfs - * CHECKNULL(mp); - */ - CHECKNULL(de); INIT_LABEL(label, DEVNODETYPE); From owner-p4-projects@FreeBSD.ORG Wed Oct 25 19:28:18 2006 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 4406416A415; Wed, 25 Oct 2006 19:28:18 +0000 (UTC) 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 0AA7216A4AB for ; Wed, 25 Oct 2006 19:28:18 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC40043D58 for ; Wed, 25 Oct 2006 19:28:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PJSHmu058409 for ; Wed, 25 Oct 2006 19:28:17 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PJSHdl058404 for perforce@freebsd.org; Wed, 25 Oct 2006 19:28:17 GMT (envelope-from millert@freebsd.org) Date: Wed, 25 Oct 2006 19:28:17 GMT Message-Id: <200610251928.k9PJSHdl058404@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 108419 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, 25 Oct 2006 19:28:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=108419 Change 108419 by millert@millert_macbook on 2006/10/25 19:27:24 Need to remove kernel cache too when updating policy data. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Rules.monolithic#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Rules.monolithic#5 (text+ko) ==== @@ -61,7 +61,7 @@ else install: $(loadpath) $(migscs_loadpath) $(fcpath) $(ncpath) $(appfiles) ./update_plist --policy=$(loadpath) --migscs=$(migscs_loadpath) /System/Library/Extensions/mac_sedarwin.kext/Contents/Info.plist - rm -f /System/Library/Extensions.kextcache /System/Library/Extensions.mkext + rm -f /System/Library/Extensions.kextcache /System/Library/Extensions.mkext /System/Library/Caches/com.apple.kernelcaches/* endif load: $(tmpdir)/load From owner-p4-projects@FreeBSD.ORG Wed Oct 25 19:51:19 2006 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 DBBE116A417; Wed, 25 Oct 2006 19:51:18 +0000 (UTC) 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 B232B16A407 for ; Wed, 25 Oct 2006 19:51:18 +0000 (UTC) (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 80C3143E1D for ; Wed, 25 Oct 2006 19:50:46 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PJokHH061663 for ; Wed, 25 Oct 2006 19:50:46 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PJokxK061658 for perforce@freebsd.org; Wed, 25 Oct 2006 19:50:46 GMT (envelope-from marcel@freebsd.org) Date: Wed, 25 Oct 2006 19:50:46 GMT Message-Id: <200610251950.k9PJokxK061658@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 108420 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, 25 Oct 2006 19:51:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=108420 Change 108420 by marcel@marcel_cluster on 2006/10/25 19:50:32 Sync with the EFI 1.10.14.62 sample implementation. Affected files ... .. //depot/projects/ia64/sys/boot/efi/include/efifs.h#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/include/efifs.h#3 (text+ko) ==== @@ -4,7 +4,14 @@ /*++ -Copyright (c) 1998 Intel Corporation +Copyright (c) 1999 - 2002 Intel Corporation. All rights reserved +This software and associated documentation (if any) is furnished +under a license and may only be used or copied in accordance +with the terms of the license. Except as permitted by such +license, no part of this software or documentation may be +reproduced, stored in a retrieval system, or transmitted in any +form or by any means without the express written consent of +Intel Corporation. Module Name: @@ -21,9 +28,9 @@ --*/ -/* - * EFI Partition header (normaly starts in LBA 1) - */ +// +// EFI Partition header (normaly starts in LBA 1) +// #define EFI_PARTITION_SIGNATURE 0x5053595320494249 #define EFI_PARTITION_REVISION 0x00010001 @@ -43,9 +50,9 @@ } EFI_PARTITION_HEADER; -/* - * File header - */ +// +// File header +// #define EFI_FILE_HEADER_SIGNATURE 0x454c494620494249 #define EFI_FILE_HEADER_REVISION 0x00010000 @@ -65,10 +72,10 @@ } EFI_FILE_HEADER; -/* - * Return the file's first LBAL which is in the same - * logical block as the file header - */ +// +// Return the file's first LBAL which is in the same +// logical block as the file header +// #define EFI_FILE_LBAL(a) ((EFI_LBAL *) (((CHAR8 *) (a)) + (a)->LBALOffset)) @@ -77,10 +84,10 @@ #define EFI_FILE_CLASS_NORMAL 3 -/* - * Logical Block Address List - the fundemental block - * description structure - */ +// +// Logical Block Address List - the fundemental block +// description structure +// #define EFI_LBAL_SIGNATURE 0x4c41424c20494249 #define EFI_LBAL_REVISION 0x00010000 @@ -94,22 +101,22 @@ UINT32 ArrayCount; } EFI_LBAL; -/* Array size */ +// Array size #define EFI_LBAL_ARRAY_SIZE(lbal,offs,blks) \ (((blks) - (offs) - (lbal)->Hdr.HeaderSize) / sizeof(EFI_RL)) -/* - * Logical Block run-length - */ +// +// Logical Block run-length +// typedef struct { EFI_LBA Start; UINT64 Length; } EFI_RL; -/* - * Return the run-length structure from an LBAL header - */ +// +// Return the run-length structure from an LBAL header +// #define EFI_LBAL_RL(a) ((EFI_RL*) (((CHAR8 *) (a)) + (a)->Hdr.HeaderSize)) From owner-p4-projects@FreeBSD.ORG Wed Oct 25 19:52:32 2006 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 36ECB16A4C2; Wed, 25 Oct 2006 19:52:32 +0000 (UTC) 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 D6C5A16A40F for ; Wed, 25 Oct 2006 19:52:31 +0000 (UTC) (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 6457943E62 for ; Wed, 25 Oct 2006 19:51:48 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PJpmS1062430 for ; Wed, 25 Oct 2006 19:51:48 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PJplNM062426 for perforce@freebsd.org; Wed, 25 Oct 2006 19:51:47 GMT (envelope-from marcel@freebsd.org) Date: Wed, 25 Oct 2006 19:51:47 GMT Message-Id: <200610251951.k9PJplNM062426@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 108421 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, 25 Oct 2006 19:52:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=108421 Change 108421 by marcel@marcel_cluster on 2006/10/25 19:51:45 Sync with the EFI 1.10.14.62 sample implementation. Affected files ... .. //depot/projects/ia64/sys/boot/efi/include/efinet.h#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/include/efinet.h#3 (text+ko) ==== @@ -4,7 +4,14 @@ /*++ -Copyright (c) 1999 Intel Corporation +Copyright (c) 1999 - 2002 Intel Corporation. All rights reserved +This software and associated documentation (if any) is furnished +under a license and may only be used or copied in accordance +with the terms of the license. Except as permitted by such +license, no part of this software or documentation may be +reproduced, stored in a retrieval system, or transmitted in any +form or by any means without the express written consent of +Intel Corporation. Module Name: efinet.h @@ -16,55 +23,78 @@ --*/ +/////////////////////////////////////////////////////////////////////////////// +// +// Simple Network Protocol +// + #define EFI_SIMPLE_NETWORK_PROTOCOL \ { 0xA19832B9, 0xAC25, 0x11D3, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D } + INTERFACE_DECL(_EFI_SIMPLE_NETWORK); +/////////////////////////////////////////////////////////////////////////////// +// + typedef struct { - /* - * Total number of frames received. Includes frames with errors and - * dropped frames. - */ + // + // Total number of frames received. Includes frames with errors and + // dropped frames. + // UINT64 RxTotalFrames; - /* Number of valid frames received and copied into receive buffers. */ + // + // Number of valid frames received and copied into receive buffers. + // UINT64 RxGoodFrames; - /* - * Number of frames below the minimum length for the media. - * This would be <64 for ethernet. - */ + // + // Number of frames below the minimum length for the media. + // This would be <64 for ethernet. + // UINT64 RxUndersizeFrames; - /* - * Number of frames longer than the maxminum length for the - * media. This would be >1500 for ethernet. - */ + // + // Number of frames longer than the maxminum length for the + // media. This would be >1500 for ethernet. + // UINT64 RxOversizeFrames; - /* Valid frames that were dropped because receive buffers were full. */ + // + // Valid frames that were dropped because receive buffers were full. + // UINT64 RxDroppedFrames; - /* Number of valid unicast frames received and not dropped. */ + // + // Number of valid unicast frames received and not dropped. + // UINT64 RxUnicastFrames; - /* Number of valid broadcast frames received and not dropped. */ + // + // Number of valid broadcast frames received and not dropped. + // UINT64 RxBroadcastFrames; - /* Number of valid mutlicast frames received and not dropped. */ + // + // Number of valid mutlicast frames received and not dropped. + // UINT64 RxMulticastFrames; - /* Number of frames w/ CRC or alignment errors. */ + // + // Number of frames w/ CRC or alignment errors. + // UINT64 RxCrcErrorFrames; - /* - * Total number of bytes received. Includes frames with errors - * and dropped frames. - */ + // + // Total number of bytes received. Includes frames with errors + // and dropped frames. + // UINT64 RxTotalBytes; - /* Transmit statistics. */ + // + // Transmit statistics. + // UINT64 TxTotalFrames; UINT64 TxGoodFrames; UINT64 TxUndersizeFrames; @@ -76,14 +106,21 @@ UINT64 TxCrcErrorFrames; UINT64 TxTotalBytes; - /* Number of collisions detection on this subnet. */ + // + // Number of collisions detection on this subnet. + // UINT64 Collisions; - /* Number of frames destined for unsupported protocol. */ + // + // Number of frames destined for unsupported protocol. + // UINT64 UnsupportedProtocol; } EFI_NETWORK_STATISTICS; +/////////////////////////////////////////////////////////////////////////////// +// + typedef enum { EfiSimpleNetworkStopped, EfiSimpleNetworkStarted, @@ -91,17 +128,25 @@ EfiSimpleNetworkMaxState } EFI_SIMPLE_NETWORK_STATE; +/////////////////////////////////////////////////////////////////////////////// +// + #define EFI_SIMPLE_NETWORK_RECEIVE_UNICAST 0x01 #define EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST 0x02 #define EFI_SIMPLE_NETWORK_RECEIVE_BROADCAST 0x04 #define EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS 0x08 #define EFI_SIMPLE_NETWORK_RECEIVE_PROMISCUOUS_MULTICAST 0x10 +/////////////////////////////////////////////////////////////////////////////// +// + #define EFI_SIMPLE_NETWORK_RECEIVE_INTERRUPT 0x01 #define EFI_SIMPLE_NETWORK_TRANSMIT_INTERRUPT 0x02 #define EFI_SIMPLE_NETWORK_COMMAND_INTERRUPT 0x04 #define EFI_SIMPLE_NETWORK_SOFTWARE_INTERRUPT 0x08 +/////////////////////////////////////////////////////////////////////////////// +// #define MAX_MCAST_FILTER_CNT 16 typedef struct { UINT32 State; @@ -125,18 +170,27 @@ BOOLEAN MediaPresent; } EFI_SIMPLE_NETWORK_MODE; +/////////////////////////////////////////////////////////////////////////////// +// + typedef EFI_STATUS (EFIAPI *EFI_SIMPLE_NETWORK_START) ( IN struct _EFI_SIMPLE_NETWORK *This ); +/////////////////////////////////////////////////////////////////////////////// +// + typedef EFI_STATUS (EFIAPI *EFI_SIMPLE_NETWORK_STOP) ( IN struct _EFI_SIMPLE_NETWORK *This ); +/////////////////////////////////////////////////////////////////////////////// +// + typedef EFI_STATUS (EFIAPI *EFI_SIMPLE_NETWORK_INITIALIZE) ( @@ -145,6 +199,9 @@ IN UINTN ExtraTxBufferSize OPTIONAL ); +/////////////////////////////////////////////////////////////////////////////// +// + typedef EFI_STATUS (EFIAPI *EFI_SIMPLE_NETWORK_RESET) ( @@ -152,12 +209,18 @@ IN BOOLEAN ExtendedVerification ); +/////////////////////////////////////////////////////////////////////////////// +// + typedef EFI_STATUS (EFIAPI *EFI_SIMPLE_NETWORK_SHUTDOWN) ( IN struct _EFI_SIMPLE_NETWORK *This ); +/////////////////////////////////////////////////////////////////////////////// +// + typedef EFI_STATUS (EFIAPI *EFI_SIMPLE_NETWORK_RECEIVE_FILTERS) ( @@ -169,6 +232,9 @@ IN EFI_MAC_ADDRESS *MCastFilter OPTIONAL ); +/////////////////////////////////////////////////////////////////////////////// +// + typedef EFI_STATUS (EFIAPI *EFI_SIMPLE_NETWORK_STATION_ADDRESS) ( @@ -177,6 +243,9 @@ IN EFI_MAC_ADDRESS *New OPTIONAL ); +/////////////////////////////////////////////////////////////////////////////// +// + typedef EFI_STATUS (EFIAPI *EFI_SIMPLE_NETWORK_STATISTICS) ( @@ -186,6 +255,9 @@ OUT EFI_NETWORK_STATISTICS *StatisticsTable OPTIONAL ); +/////////////////////////////////////////////////////////////////////////////// +// + typedef EFI_STATUS (EFIAPI *EFI_SIMPLE_NETWORK_MCAST_IP_TO_MAC) ( @@ -195,6 +267,9 @@ OUT EFI_MAC_ADDRESS *MAC ); +/////////////////////////////////////////////////////////////////////////////// +// + typedef EFI_STATUS (EFIAPI *EFI_SIMPLE_NETWORK_NVDATA) ( @@ -205,6 +280,9 @@ IN OUT VOID *Buffer ); +/////////////////////////////////////////////////////////////////////////////// +// + typedef EFI_STATUS (EFIAPI *EFI_SIMPLE_NETWORK_GET_STATUS) ( @@ -213,6 +291,9 @@ OUT VOID **TxBuf OPTIONAL ); +/////////////////////////////////////////////////////////////////////////////// +// + typedef EFI_STATUS (EFIAPI *EFI_SIMPLE_NETWORK_TRANSMIT) ( @@ -225,6 +306,9 @@ IN UINT16 *Protocol OPTIONAL ); +/////////////////////////////////////////////////////////////////////////////// +// + typedef EFI_STATUS (EFIAPI *EFI_SIMPLE_NETWORK_RECEIVE) ( @@ -237,6 +321,9 @@ OUT UINT16 *Protocol OPTIONAL ); +/////////////////////////////////////////////////////////////////////////////// +// + #define EFI_SIMPLE_NETWORK_INTERFACE_REVISION 0x00010000 typedef struct _EFI_SIMPLE_NETWORK { From owner-p4-projects@FreeBSD.ORG Wed Oct 25 19:53:54 2006 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 2B61916A47B; Wed, 25 Oct 2006 19:53:54 +0000 (UTC) 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 03BCC16A415 for ; Wed, 25 Oct 2006 19:53:54 +0000 (UTC) (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 8664843D60 for ; Wed, 25 Oct 2006 19:53:51 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PJrpj3062931 for ; Wed, 25 Oct 2006 19:53:51 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PJrpM5062928 for perforce@freebsd.org; Wed, 25 Oct 2006 19:53:51 GMT (envelope-from marcel@freebsd.org) Date: Wed, 25 Oct 2006 19:53:51 GMT Message-Id: <200610251953.k9PJrpM5062928@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 108422 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, 25 Oct 2006 19:53:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=108422 Change 108422 by marcel@marcel_cluster on 2006/10/25 19:53:08 Sync with the EFI 1.10.14.62 sample implementation. Affected files ... .. //depot/projects/ia64/sys/boot/efi/include/efipart.h#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/include/efipart.h#3 (text+ko) ==== @@ -4,7 +4,14 @@ /*++ -Copyright (c) 1998 Intel Corporation +Copyright (c) 1999 - 2002 Intel Corporation. All rights reserved +This software and associated documentation (if any) is furnished +under a license and may only be used or copied in accordance +with the terms of the license. Except as permitted by such +license, no part of this software or documentation may be +reproduced, stored in a retrieval system, or transmitted in any +form or by any means without the express written consent of +Intel Corporation. Module Name: @@ -20,6 +27,10 @@ --*/ +// +// +// + #define EFI_PARTITION 0xef #define MBR_SIZE 512 @@ -42,7 +53,7 @@ #define MBR_SIGNATURE 0xaa55 #define MIN_MBR_DEVICE_SIZE 0x80000 -#define MBR_ERRATA_PAD 0x40000 /* 128 MB */ +#define MBR_ERRATA_PAD 0x40000 // 128 MB #define MAX_MBR_PARTITIONS 4 typedef struct { From owner-p4-projects@FreeBSD.ORG Wed Oct 25 20:41:35 2006 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 7DE6E16A538; Wed, 25 Oct 2006 20:41:35 +0000 (UTC) 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 4080716A52B for ; Wed, 25 Oct 2006 20:41:35 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4813043E3A for ; Wed, 25 Oct 2006 20:39:52 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PKdnLM070342 for ; Wed, 25 Oct 2006 20:39:49 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PKdn6N070339 for perforce@freebsd.org; Wed, 25 Oct 2006 20:39:49 GMT (envelope-from millert@freebsd.org) Date: Wed, 25 Oct 2006 20:39:49 GMT Message-Id: <200610252039.k9PKdn6N070339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 108424 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, 25 Oct 2006 20:41:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=108424 Change 108424 by millert@millert_macbook on 2006/10/25 20:39:01 Update to checkpolicy-1.32 from the NSA web site. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/ChangeLog#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/VERSION#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/module_compiler.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/module_compiler.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/policy_parse.y#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/ChangeLog#4 (text+ko) ==== @@ -1,3 +1,10 @@ +1.32 2006-10-17 + * Updated version for release. + +1.30.12 2006-09-28 + * Merged user and range_transition support for modules from + Darrel Goeddel + 1.30.11 2006-09-05 * merged range_transition enhancements and user module format changes from Darrel Goeddel ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/Makefile#3 (text+ko) ==== @@ -11,6 +11,8 @@ all: $(PROG) +GENERATED=lex.yy.c y.tab.c y.tab.h + $(PROG): $(OBJS) $(CC) $(CFLAGS) -o $@ $^ $(LDADD) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/VERSION#4 (text+ko) ==== @@ -1,1 +1,1 @@ -1.30.11 +1.32 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/module_compiler.c#4 (text+ko) ==== @@ -937,6 +937,122 @@ } } +int require_sens(int pass) +{ + char *id = queue_remove(id_queue); + level_datum_t *level = NULL; + int retval; + if (pass == 2) { + free(id); + return 0; + } + if (!id) { + yyerror("no sensitivity name"); + return -1; + } + level = malloc(sizeof(level_datum_t)); + if (!level) { + free(id); + yyerror("Out of memory!"); + return -1; + } + level_datum_init(level); + level->level = malloc(sizeof(mls_level_t)); + if (!level->level) { + free(id); + level_datum_destroy(level); + free(level); + yyerror("Out of memory!"); + return -1; + } + mls_level_init(level->level); + retval = require_symbol(SYM_LEVELS, id, (hashtab_datum_t *) level, + &level->level->sens, &level->level->sens); + if (retval != 0) { + free(id); + mls_level_destroy(level->level); + free(level->level); + level_datum_destroy(level); + free(level); + } + switch (retval) { + case -3:{ + yyerror("Out of memory!"); + return -1; + } + case -2:{ + yyerror("duplicate declaration of sensitivity"); + return -1; + } + case -1:{ + yyerror("could not require sensitivity here"); + return -1; + } + case 0:{ + return 0; + } + case 1:{ + return 0; /* sensitivity already required */ + } + default:{ + assert(0); /* should never get here */ + } + } +} + +int require_cat(int pass) +{ + char *id = queue_remove(id_queue); + cat_datum_t *cat = NULL; + int retval; + if (pass == 2) { + free(id); + return 0; + } + if (!id) { + yyerror("no category name"); + return -1; + } + cat = malloc(sizeof(cat_datum_t)); + if (!cat) { + free(id); + yyerror("Out of memory!"); + return -1; + } + cat_datum_init(cat); + + retval = require_symbol(SYM_CATS, id, (hashtab_datum_t *) cat, + &cat->s.value, &cat->s.value); + if (retval != 0) { + free(id); + cat_datum_destroy(cat); + free(cat); + } + switch (retval) { + case -3:{ + yyerror("Out of memory!"); + return -1; + } + case -2:{ + yyerror("duplicate declaration of category"); + return -1; + } + case -1:{ + yyerror("could not require category here"); + return -1; + } + case 0:{ + return 0; + } + case 1:{ + return 0; /* category already required */ + } + default:{ + assert(0); /* should never get here */ + } + } +} + static int is_scope_in_stack(scope_datum_t * scope, scope_stack_t * stack) { int i; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/module_compiler.h#4 (text+ko) ==== @@ -56,6 +56,8 @@ int require_attribute(int pass); int require_user(int pass); int require_bool(int pass); +int require_sens(int pass); +int require_cat(int pass); /* Check if an identifier is within the scope of the current * declaration or any of its parents. Return 1 if it is, 0 if not. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/policy_parse.y#4 (text+ko) ==== @@ -834,10 +834,8 @@ | ATTRIBUTE { $$ = require_attribute; } | USER { $$ = require_user; } | BOOL { $$ = require_bool; } -/* MLS-enabled modules are not implemented at this time. | SENSITIVITY { $$ = require_sens; } | CATEGORY { $$ = require_cat; } -*/ ; require_id_list : identifier { if ($0 (pass)) return -1; } @@ -1301,7 +1299,7 @@ yyerror("out of memory"); goto bad; } - memset(level, 0, sizeof(mls_level_t)); + mls_level_init(level); level->sens = 0; /* actual value set in define_dominance */ ebitmap_init(&level->cat); /* actual value set in define_level */ @@ -1310,7 +1308,7 @@ yyerror("out of memory"); goto bad; } - memset(datum, 0, sizeof(level_datum_t)); + level_datum_init(datum); datum->isalias = FALSE; datum->level = level; @@ -1347,7 +1345,7 @@ yyerror("out of memory"); goto bad_alias; } - memset(aliasdatum, 0, sizeof(level_datum_t)); + level_datum_init(aliasdatum); aliasdatum->isalias = TRUE; aliasdatum->level = level; @@ -1384,15 +1382,19 @@ free(id); if (level) free(level); - if (datum) + if (datum) { + level_datum_destroy(datum); free(datum); + } return -1; bad_alias: if (id) free(id); - if (aliasdatum) + if (aliasdatum) { + level_datum_destroy(aliasdatum); free(aliasdatum); + } return -1; } @@ -1480,7 +1482,7 @@ yyerror("out of memory"); goto bad; } - memset(datum, 0, sizeof(cat_datum_t)); + cat_datum_init(datum); datum->isalias = FALSE; ret = declare_symbol(SYM_CATS, id, datum, &value, &value); @@ -1517,7 +1519,7 @@ yyerror("out of memory"); goto bad_alias; } - memset(aliasdatum, 0, sizeof(cat_datum_t)); + cat_datum_init(aliasdatum); aliasdatum->isalias = TRUE; aliasdatum->s.value = datum->s.value; @@ -1554,15 +1556,19 @@ bad: if (id) free(id); - if (datum) + if (datum) { + cat_datum_destroy(datum); free(datum); + } return -1; bad_alias: if (id) free(id); - if (aliasdatum) + if (aliasdatum) { + cat_datum_destroy(aliasdatum); free(aliasdatum); + } return -1; } @@ -3682,11 +3688,6 @@ level_datum_t *levdatum; int l; - if (policydbp->policy_type == POLICY_MOD && mlspol) { - yyerror("Users cannot be declared in MLS modules"); - return -1; - } - if (pass == 1) { while ((id = queue_remove(id_queue))) free(id); From owner-p4-projects@FreeBSD.ORG Wed Oct 25 20:41:36 2006 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 41AAC16A5A1; Wed, 25 Oct 2006 20:41:36 +0000 (UTC) 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 051EA16A597 for ; Wed, 25 Oct 2006 20:41:36 +0000 (UTC) (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 6BD3843E46 for ; Wed, 25 Oct 2006 20:39:52 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PKdomf070348 for ; Wed, 25 Oct 2006 20:39:50 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PKdopQ070345 for perforce@freebsd.org; Wed, 25 Oct 2006 20:39:50 GMT (envelope-from cognet@freebsd.org) Date: Wed, 25 Oct 2006 20:39:50 GMT Message-Id: <200610252039.k9PKdopQ070345@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 108425 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, 25 Oct 2006 20:41:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=108425 Change 108425 by cognet@cognet on 2006/10/25 20:39:14 MFsam_avila: implement bus_teardown_intr Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#11 edit .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#10 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425.c#11 (text+ko) ==== @@ -67,12 +67,19 @@ uint32_t size; uint32_t vbase; } hwvtrans[] = { - { IXP425_IO_HWBASE, IXP425_IO_SIZE, IXP425_IO_VBASE }, - { IXP425_EXP_HWBASE, IXP425_EXP_SIZE, IXP425_EXP_VBASE }, - { IXP425_PCI_HWBASE, IXP425_PCI_SIZE, IXP425_PCI_VBASE }, - { IXP425_PCI_MEM_HWBASE, IXP425_PCI_MEM_SIZE, IXP425_PCI_MEM_VBASE }, - /*{ IXP425_PCI_IO_HWBASE, IXP425_PCI_IO_SIZE, IXP425_PCI_IO_VBASE },*/ - { IXP425_MCU_HWBASE, IXP425_MCU_SIZE, IXP425_MCU_VBASE }, + { IXP425_IO_HWBASE, IXP425_IO_SIZE, IXP425_IO_VBASE }, + { IXP425_EXP_HWBASE, IXP425_EXP_SIZE, IXP425_EXP_VBASE }, + { IXP425_PCI_HWBASE, IXP425_PCI_SIZE, IXP425_PCI_VBASE }, + { IXP425_PCI_MEM_HWBASE,IXP425_PCI_MEM_SIZE, IXP425_PCI_MEM_VBASE }, +#if 0 + { IXP425_PCI_IO_HWBASE, IXP425_PCI_IO_SIZE, IXP425_PCI_IO_VBASE }, +#endif + { IXP425_MCU_HWBASE, IXP425_MCU_SIZE, IXP425_MCU_VBASE }, + { IXP425_QMGR_HWBASE, IXP425_QMGR_SIZE, IXP425_QMGR_VBASE }, + { IXP425_NPE_A_HWBASE, IXP425_NPE_A_SIZE, IXP425_NPE_A_VBASE }, + { IXP425_NPE_B_HWBASE, IXP425_NPE_B_SIZE, IXP425_NPE_B_VBASE }, + { IXP425_MAC_A_HWBASE, IXP425_MAC_A_SIZE, IXP425_MAC_A_VBASE }, + { IXP425_MAC_B_HWBASE, IXP425_MAC_B_SIZE, IXP425_MAC_B_VBASE }, }; static int @@ -230,10 +237,18 @@ device_add_child(dev, "ixpclk", 0); device_add_child(dev, "ixpiic", 0); device_add_child(dev, "uart", 0); + /* XXX these are optional, what if they are not configured? */ + device_add_child(dev, "ixpqmgr", 0); + device_add_child(dev, "npe", 0); /* NPE-A */ + device_add_child(dev, "npe", 1); /* NPE-B */ if (bus_space_map(sc->sc_iot, IXP425_GPIO_HWBASE, IXP425_GPIO_SIZE, 0, &sc->sc_gpio_ioh)) panic("ixp425_attach: unable to map GPIO registers"); + if (bus_space_map(sc->sc_iot, IXP425_EXP_HWBASE, IXP425_EXP_SIZE, + 0, &sc->sc_exp_ioh)) + panic("ixp425_attach: unable to map Expansion Bus registers"); + bus_generic_probe(dev); bus_generic_attach(dev); @@ -248,19 +263,25 @@ struct rman *rmanp; struct resource *rv; uint32_t vbase; + int isuart = (start == 0 && end == ~0); /* XXX how to do this right? */ rv = NULL; switch (type) { case SYS_RES_IRQ: rmanp = &sc->sc_irq_rman; + if (isuart) { + if (device_get_unit(dev) == 0) + start = IXP425_INT_UART0; + else + start = IXP425_INT_UART1; + end = start; + } break; case SYS_RES_MEMORY: rmanp = &sc->sc_mem_rman; - /* Naughty hack to get the UART memory-mapped register. */ - /* I'm not sure of how to do it cleanly. */ - if (start == 0 && end == ~0) { + if (isuart) { if (device_get_unit(dev) == 0) start = IXP425_UART0_HWBASE; else @@ -279,11 +300,8 @@ if (rv != NULL) { rman_set_rid(rv, *rid); if (type == SYS_RES_MEMORY) { - if (start == IXP425_UART0_HWBASE || start == - IXP425_UART1_HWBASE) - rman_set_bustag(rv, &ixp425_a4x_bs_tag); - else - rman_set_bustag(rv, sc->sc_iot); + rman_set_bustag(rv, + isuart ? &ixp425_a4x_bs_tag : sc->sc_iot); rman_set_bushandle(rv, vbase); } } @@ -317,6 +335,8 @@ void *cookie) { + intr_enabled &= ~ 1 << rman_get_start(res); + ixp425_set_intrmask(); return (BUS_TEARDOWN_INTR(device_get_parent(dev), child, res, cookie)); } ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#10 (text+ko) ==== @@ -101,8 +101,8 @@ PCI_CRP_AD_CBE, ((reg & ~3) | COMMAND_CRP_WRITE)); PCI_CSR_WRITE_4(sc, PCI_CRP_AD_WDATA, data); - printf("DID IT %x %x\n", reg, data); } + static int ixppcib_attach(device_t dev) { @@ -251,8 +251,7 @@ void *cookie) { - device_printf(dev, "%s called teardown_intr\n", device_get_nameunit(child)); - return (ENXIO); + return (BUS_TEARDOWN_INTR(device_get_parent(dev), child, vec, cookie)); } static struct resource * From owner-p4-projects@FreeBSD.ORG Wed Oct 25 20:42:56 2006 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 166A116A4A0; Wed, 25 Oct 2006 20:42:56 +0000 (UTC) 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 E0ADA16A403 for ; Wed, 25 Oct 2006 20:42:55 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0885143D8E for ; Wed, 25 Oct 2006 20:42:55 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PKgsjA071421 for ; Wed, 25 Oct 2006 20:42:54 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PKgsAo071417 for perforce@freebsd.org; Wed, 25 Oct 2006 20:42:54 GMT (envelope-from millert@freebsd.org) Date: Wed, 25 Oct 2006 20:42:54 GMT Message-Id: <200610252042.k9PKgsAo071417@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 108426 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, 25 Oct 2006 20:42:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=108426 Change 108426 by millert@millert_macbook on 2006/10/25 20:42:34 Update to libselinux-1.32 from the NSA web site. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/ChangeLog#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/VERSION#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/av_permissions.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/avc.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setrans_client.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/ChangeLog#4 (text+ko) ==== @@ -1,3 +1,18 @@ +1.32 2006-10-17 + * Updated version for release. + +1.30.30 2006-10-05 + * Merged patch from Darrel Goeddel to always use untranslated + contexts in the userspace AVC. + +1.30.29 2006-09-29 + * Merged av_permissions.h update from Steve Grubb, + adding setsockcreate and polmatch definitions. + +1.30.28 2006-09-13 + * Merged patch from Steve Smalley to fix SIGPIPE in setrans_client + * Merged c++ class identifier fix from Joe Nall. + 1.30.27 2006-08-24 * Merged patch to not log avc stats upon a reset from Steve Grubb. * Applied patch to revert compat_net setting upon policy load. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/Makefile#3 (text+ko) ==== @@ -21,4 +21,4 @@ $(MAKE) -C src $@ $(MAKE) -C utils clean -test:+test: ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/VERSION#4 (text+ko) ==== @@ -1,1 +1,1 @@ -1.30.27 +1.32 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/av_permissions.h#3 (text+ko) ==== @@ -468,6 +468,7 @@ #define PROCESS__EXECSTACK 0x04000000UL #define PROCESS__EXECHEAP 0x08000000UL #define PROCESS__SETKEYCREATE 0x10000000UL +#define PROCESS__SETSOCKCREATE 0x20000000UL #define IPC__CREATE 0x00000001UL #define IPC__DESTROY 0x00000002UL @@ -910,6 +911,7 @@ #define ASSOCIATION__SENDTO 0x00000001UL #define ASSOCIATION__RECVFROM 0x00000002UL #define ASSOCIATION__SETCONTEXT 0x00000004UL +#define ASSOCIATION__POLMATCH 0x00000008UL #define NETLINK_KOBJECT_UEVENT_SOCKET__IOCTL 0x00000001UL #define NETLINK_KOBJECT_UEVENT_SOCKET__READ 0x00000002UL ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/avc.h#3 (text+ko) ==== @@ -38,6 +38,7 @@ * available to make the copy, or %EINVAL if the input SID is invalid. */ int avc_sid_to_context(security_id_t sid, security_context_t * ctx); + int avc_sid_to_context_raw(security_id_t sid, security_context_t * ctx); /** * avc_context_to_sid - get SID for context. @@ -51,6 +52,7 @@ * returning %0 on success or -%1 on error with @errno set. */ int avc_context_to_sid(security_context_t ctx, security_id_t * sid); + int avc_context_to_sid_raw(security_context_t ctx, security_id_t * sid); /** * sidget - increment SID reference counter. @@ -120,7 +122,7 @@ void (*func_log) (const char *fmt, ...); /* store a string representation of auditdata (corresponding to the given security class) into msgbuf. */ - void (*func_audit) (void *auditdata, security_class_t class, + void (*func_audit) (void *auditdata, security_class_t cls, char *msgbuf, size_t msgbufsize); }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc.c#5 (text+ko) ==== @@ -205,7 +205,7 @@ & (AVC_CACHE_SLOTS - 1); } -int avc_context_to_sid(security_context_t ctx, security_id_t * sid) +int avc_context_to_sid_raw(security_context_t ctx, security_id_t * sid) { int rc; avc_get_lock(avc_lock); @@ -216,7 +216,22 @@ return rc; } -int avc_sid_to_context(security_id_t sid, security_context_t * ctx) +int avc_context_to_sid(security_context_t ctx, security_id_t * sid) +{ + int ret; + security_context_t rctx; + + if (selinux_trans_to_raw_context(ctx, &rctx)) + return -1; + + ret = avc_context_to_sid_raw(rctx, sid); + + freecon(rctx); + + return ret; +} + +int avc_sid_to_context_raw(security_id_t sid, security_context_t * ctx) { int rc; *ctx = NULL; @@ -232,6 +247,21 @@ return rc; } +int avc_sid_to_context(security_id_t sid, security_context_t * ctx) +{ + int ret; + security_context_t rctx; + + ret = avc_sid_to_context_raw(sid, &rctx); + + if (ret == 0) { + ret = selinux_raw_to_trans_context(rctx, ctx); + freecon(rctx); + } + + return ret; +} + int sidget(security_id_t sid) { int rc; @@ -943,8 +973,9 @@ rc = -1; goto out; } - rc = security_compute_av(ssid->ctx, tsid->ctx, tclass, - requested, &entry.avd); + rc = security_compute_av_raw(ssid->ctx, tsid->ctx, + tclass, requested, + &entry.avd); if (rc) goto out; rc = avc_insert(ssid, tsid, tclass, &entry, aeref); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setrans_client.c#2 (text+ko) ==== @@ -59,11 +59,12 @@ static int send_request(int fd, uint32_t function, const char *data1, const char *data2) { - struct iovec req_hdr[3]; + struct msghdr msgh; + struct iovec iov[5]; uint32_t data1_size; uint32_t data2_size; - struct iovec req_data[2]; - ssize_t count; + ssize_t count, expected; + unsigned int i; if (fd < 0) return -1; @@ -76,28 +77,28 @@ data1_size = strlen(data1) + 1; data2_size = strlen(data2) + 1; - req_hdr[0].iov_base = &function; - req_hdr[0].iov_len = sizeof(function); - req_hdr[1].iov_base = &data1_size; - req_hdr[1].iov_len = sizeof(data1_size); - req_hdr[2].iov_base = &data2_size; - req_hdr[2].iov_len = sizeof(data2_size); + iov[0].iov_base = &function; + iov[0].iov_len = sizeof(function); + iov[1].iov_base = &data1_size; + iov[1].iov_len = sizeof(data1_size); + iov[2].iov_base = &data2_size; + iov[2].iov_len = sizeof(data2_size); + iov[3].iov_base = (char *)data1; + iov[3].iov_len = data1_size; + iov[4].iov_base = (char *)data2; + iov[4].iov_len = data2_size; + memset(&msgh, 0, sizeof(msgh)); + msgh.msg_iov = iov; + msgh.msg_iovlen = sizeof(iov) / sizeof(iov[0]); - while (((count = writev(fd, req_hdr, 3)) < 0) && (errno == EINTR)) ; - if (count != (sizeof(function) + sizeof(data1_size) + - sizeof(data2_size))) { - return -1; - } + expected = 0; + for (i = 0; i < sizeof(iov) / sizeof(iov[0]); i++) + expected += iov[i].iov_len; - req_data[0].iov_base = (char *)data1; - req_data[0].iov_len = data1_size; - req_data[1].iov_base = (char *)data2; - req_data[1].iov_len = data2_size; - - while (((count = writev(fd, req_data, 2)) < 0) && (errno == EINTR)) ; - if (count < 0 || (uint32_t) count != (data1_size + data2_size)) { + while (((count = sendmsg(fd, &msgh, 0)) < 0) + && (errno == EINTR)) ; + if (count < 0 || count != expected) return -1; - } return 0; } From owner-p4-projects@FreeBSD.ORG Wed Oct 25 20:46:45 2006 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 01ABA16A4E1; Wed, 25 Oct 2006 20:46:45 +0000 (UTC) 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 8EC5916A4A0 for ; Wed, 25 Oct 2006 20:46:44 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 05A8743D93 for ; Wed, 25 Oct 2006 20:46:01 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PKk06g071896 for ; Wed, 25 Oct 2006 20:46:00 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PKk0xT071891 for perforce@freebsd.org; Wed, 25 Oct 2006 20:46:00 GMT (envelope-from millert@freebsd.org) Date: Wed, 25 Oct 2006 20:46:00 GMT Message-Id: <200610252046.k9PKk0xT071891@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 108427 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, 25 Oct 2006 20:46:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=108427 Change 108427 by millert@millert_macbook on 2006/10/25 20:45:14 Update to libsemanage-1.8 from the NSA web site. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/ChangeLog#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/VERSION#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/conf-parse.y#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/conf-scan.l#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/direct_api.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/private.h#3 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanage_store.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/ChangeLog#4 (text+ko) ==== @@ -1,3 +1,19 @@ +1.8 2006-10-17 + * Updated version for release. + +1.6.17 2006-09-29 + * Merged patch to skip reload if no active store exists and + the store path doesn't match the active store path from Dan Walsh. + * Merged patch to not destroy sepol handle on error path of + connect from James Athey. + * Merged patch to add genhomedircon path to semanage.conf from + James Athey. + +1.6.16 2006-08-14 + * Make most copy errors fatal, but allow exceptions for + file_contexts.local, seusers, and netfilter_contexts if + the source file does not exist in the store. + 1.6.15 2006-08-11 * Merged separate local file contexts patch from Chris PeBenito. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/VERSION#4 (text+ko) ==== @@ -1,1 +1,1 @@ -1.6.15 +1.8 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/conf-parse.y#3 (text+ko) ==== @@ -1,6 +1,7 @@ -/* Author: Jason Tang +/* Authors: Jason Tang + * James Athey * - * Copyright (C) 2004-2005 Tresys Technology, LLC + * Copyright (C) 2004-2006 Tresys Technology, LLC * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -55,7 +56,7 @@ } %token MODULE_STORE VERSION EXPAND_CHECK FILE_MODE -%token LOAD_POLICY_START SETFILES_START +%token LOAD_POLICY_START SETFILES_START GENHOMEDIRCON_START %token VERIFY_MOD_START VERIFY_LINKED_START VERIFY_KERNEL_START BLOCK_END %token PROG_PATH PROG_ARGS %token ARG @@ -136,6 +137,14 @@ YYABORT; } } + | GENHOMEDIRCON_START { + semanage_conf_external_prog_destroy(current_conf->genhomedircon); + current_conf->genhomedircon = NULL; + if (new_external_prog(¤t_conf->genhomedircon) == -1) { + parse_errors++; + YYABORT; + } + } ; verify_block: verify_start external_opts BLOCK_END { ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/conf-scan.l#3 (text+ko) ==== @@ -1,6 +1,7 @@ -/* Author: Jason Tang +/* Authors: Jason Tang + * James Athey * - * Copyright (C) 2004-2005 Tresys Technology, LLC + * Copyright (C) 2004-2006 Tresys Technology, LLC * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -43,6 +44,7 @@ file-mode return FILE_MODE; "[load_policy]" return LOAD_POLICY_START; "[setfiles]" return SETFILES_START; +"[genhomedircon]" return GENHOMEDIRCON_START; "[verify module]" return VERIFY_MOD_START; "[verify linked]" return VERIFY_LINKED_START; "[verify kernel]" return VERIFY_KERNEL_START; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/direct_api.c#3 (text+ko) ==== @@ -217,7 +217,6 @@ err: ERR(sh, "could not establish direct connection"); - sepol_handle_destroy(sh->sepolh); return STATUS_ERR; } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanage_store.c#4 (text+ko) ==== @@ -1056,37 +1056,38 @@ snprintf(store_hd, PATH_MAX, "%s%s", storepath, running_hd); if (semanage_copy_file(active_hd, store_hd, sh->conf->file_mode) == -1) { - INFO(sh, "Non-fatal error: Could not copy %s to %s.", - active_hd, store_hd); - /* Non-fatal; fall through */ + ERR(sh, "Could not copy %s to %s.", active_hd, store_hd); + goto cleanup; } snprintf(store_fc, PATH_MAX, "%s%s", storepath, running_fc); if (semanage_copy_file(active_fc, store_fc, sh->conf->file_mode) == -1) { - INFO(sh, "Non-fatal error: Could not copy %s to %s.", - active_fc, store_fc); - /* Non-fatal; fall through */ + ERR(sh, "Could not copy %s to %s.", active_fc, store_fc); + goto cleanup; } snprintf(store_fc_loc, PATH_MAX, "%s%s", storepath, running_fc_loc); - if (semanage_copy_file(active_fc_loc, store_fc_loc, sh->conf->file_mode) == -1) { - INFO(sh, "Non-fatal error: Could not copy %s to %s.", - active_fc_loc, store_fc_loc); - /* Non-fatal; fall through */ + if (semanage_copy_file(active_fc_loc, store_fc_loc, sh->conf->file_mode) + == -1 && errno != ENOENT) { + ERR(sh, "Could not copy %s to %s.", active_fc_loc, + store_fc_loc); + goto cleanup; } snprintf(store_seusers, PATH_MAX, "%s%s", storepath, running_seusers); if (semanage_copy_file - (active_seusers, store_seusers, sh->conf->file_mode) == -1) { - INFO(sh, "Non-fatal error: Could not copy %s to %s.", - active_seusers, store_seusers); - /* Non-fatal; fall through */ + (active_seusers, store_seusers, sh->conf->file_mode) == -1 + && errno != ENOENT) { + ERR(sh, "Could not copy %s to %s.", active_seusers, + store_seusers); + goto cleanup; } snprintf(store_nc, PATH_MAX, "%s%s", storepath, running_nc); - if (semanage_copy_file(active_nc, store_nc, sh->conf->file_mode) == -1) { - INFO(sh, "Non-fatal error: Could not copy %s to %s.", active_nc, store_nc); - /* Non-fatal; fall through */ + if (semanage_copy_file(active_nc, store_nc, sh->conf->file_mode) == -1 + && errno != ENOENT) { + ERR(sh, "Could not copy %s to %s.", active_nc, store_nc); + goto cleanup; } if (!sh->do_reload) @@ -1108,7 +1109,9 @@ /* They are not the same store */ goto skip_reload; } - } + } else if (errno == ENOENT && + strcmp(really_active_store, storepath) != 0) + goto skip_reload; if (semanage_reload_policy(sh)) { goto cleanup; From owner-p4-projects@FreeBSD.ORG Wed Oct 25 20:47:25 2006 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 76EEB16A4E5; Wed, 25 Oct 2006 20:47:25 +0000 (UTC) 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 3CB7A16A417 for ; Wed, 25 Oct 2006 20:47:25 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F37E043D98 for ; Wed, 25 Oct 2006 20:47:02 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PKl20n072817 for ; Wed, 25 Oct 2006 20:47:02 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PKl2H6072548 for perforce@freebsd.org; Wed, 25 Oct 2006 20:47:02 GMT (envelope-from millert@freebsd.org) Date: Wed, 25 Oct 2006 20:47:02 GMT Message-Id: <200610252047.k9PKl2H6072548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 108428 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, 25 Oct 2006 20:47:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=108428 Change 108428 by millert@millert_macbook on 2006/10/25 20:46:23 Update to libsepol-1.14 from the NSA web site. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/ChangeLog#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/VERSION#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/policydb.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/expand.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/link.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/policydb.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/ChangeLog#4 (text+ko) ==== @@ -1,3 +1,13 @@ +1.14 2006-10-17 + * Updated version for release. + +1.12.28 2006-09-28 + * Build libsepol's static object files with -fpic + +1.12.27 2006-09-28 + * Merged mls user and range_transition support in modules + from Darrel Goeddel + 1.12.26 2006-09-05 * Merged range transition enhancements and user format changes Darrel Goeddel ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/VERSION#4 (text+ko) ==== @@ -1,1 +1,1 @@ -1.12.26 +1.14 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/policydb.h#4 (text+ko) ==== @@ -532,6 +532,10 @@ extern void type_datum_destroy(type_datum_t * x); extern void user_datum_init(user_datum_t * x); extern void user_datum_destroy(user_datum_t * x); +extern void level_datum_init(level_datum_t * x); +extern void level_datum_destroy(level_datum_t * x); +extern void cat_datum_init(cat_datum_t * x); +extern void cat_datum_destroy(cat_datum_t * x); extern int check_assertions(sepol_handle_t * handle, policydb_t * p, avrule_t * avrules); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/expand.c#4 (text+ko) ==== @@ -823,13 +823,17 @@ if (state->verbose) INFO(state->handle, "copying sensitivity level %s", id); - if ((new_level = - (level_datum_t *) calloc(1, sizeof(*new_level))) == NULL - || (new_level->level = - (mls_level_t *) calloc(1, sizeof(mls_level_t))) == NULL - || (new_id = strdup(id)) == NULL) { + new_level = (level_datum_t *) malloc(sizeof(level_datum_t)); + if (!new_level) + goto out_of_mem; + level_datum_init(new_level); + new_level->level = (mls_level_t *) malloc(sizeof(mls_level_t)); + if (!new_level->level) + goto out_of_mem; + mls_level_init(new_level->level); + new_id = strdup(id); + if (!new_id) goto out_of_mem; - } if (mls_level_cpy(new_level->level, level->level)) { goto out_of_mem; @@ -847,9 +851,10 @@ out_of_mem: ERR(state->handle, "Out of memory!"); if (new_level != NULL && new_level->level != NULL) { - ebitmap_destroy(&new_level->level->cat); + mls_level_destroy(new_level->level); free(new_level->level); } + level_datum_destroy(new_level); free(new_level); free(new_id); return -1; @@ -870,10 +875,13 @@ if (state->verbose) INFO(state->handle, "copying category attribute %s", id); - if ((new_cat = (cat_datum_t *) calloc(1, sizeof(*new_cat))) == NULL || - (new_id = strdup(id)) == NULL) { + new_cat = (cat_datum_t *) malloc(sizeof(cat_datum_t)); + if (!new_cat) + goto out_of_mem; + cat_datum_init(new_cat); + new_id = strdup(id); + if (!new_id) goto out_of_mem; - } new_cat->s.value = cat->s.value; new_cat->isalias = cat->isalias; @@ -887,6 +895,7 @@ out_of_mem: ERR(state->handle, "Out of memory!"); + cat_datum_destroy(new_cat); free(new_cat); free(new_id); return -1; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/link.c#4 (text+ko) ==== @@ -468,25 +468,8 @@ char *id = key, *new_id = NULL; user_datum_t *user, *base_user, *new_user = NULL; link_state_t *state = (link_state_t *) data; - scope_datum_t *scope; user = (user_datum_t *) datum; - if (state->base->mls) { - scope = - hashtab_search(state->cur->policy->p_users_scope.table, id); - if (!scope) { - ERR(state->handle, - "No scope information for user %s in module %s\n", - id, state->cur_mod_name); - return -1; - } - if (scope->scope == SCOPE_DECL) { - ERR(state->handle, - "Users cannot be declared in MLS modules"); - return -1; - } - /* required users fall through */ - } base_user = hashtab_search(state->base->p_users.table, id); if (base_user == NULL) { @@ -502,9 +485,8 @@ goto cleanup; } user_datum_init(new_user); - /* new_users's roles field will be copied during - fix_user_callback(). the MLS fields are currently - unimplemented */ + /* new_users's roles and MLS fields will be copied during + user_fix_callback(). */ new_user->s.value = state->base->p_users.nprim + 1; @@ -592,10 +574,72 @@ return -1; } +static int sens_copy_callback(hashtab_key_t key, hashtab_datum_t datum, + void *data) +{ + char *id = key; + level_datum_t *level, *base_level; + link_state_t *state = (link_state_t *) data; + scope_datum_t *scope; + + level = (level_datum_t *) datum; + + base_level = hashtab_search(state->base->p_levels.table, id); + if (!base_level) { + scope = + hashtab_search(state->cur->policy->p_sens_scope.table, id); + if (!scope) + return -SEPOL_LINK_ERROR; + if (scope->scope == SCOPE_DECL) { + /* disallow declarations in modules */ + ERR(state->handle, + "%s: Modules may not declare new sensitivities.", + state->cur_mod_name); + return -SEPOL_LINK_NOTSUP; + } + } + + state->cur->map[SYM_LEVELS][level->level->sens - 1] = + base_level->level->sens; + + return 0; +} + +static int cat_copy_callback(hashtab_key_t key, hashtab_datum_t datum, + void *data) +{ + char *id = key; + cat_datum_t *cat, *base_cat; + link_state_t *state = (link_state_t *) data; + scope_datum_t *scope; + + cat = (cat_datum_t *) datum; + + base_cat = hashtab_search(state->base->p_cats.table, id); + if (!base_cat) { + scope = + hashtab_search(state->cur->policy->p_cat_scope.table, id); + if (!scope) + return -SEPOL_LINK_ERROR; + if (scope->scope == SCOPE_DECL) { + /* disallow declarations in modules */ + ERR(state->handle, + "%s: Modules may not declare new categories.", + state->cur_mod_name); + return -SEPOL_LINK_NOTSUP; + } + } + + state->cur->map[SYM_CATS][cat->s.value - 1] = base_cat->s.value; + + return 0; +} + static int (*copy_callback_f[SYM_NUM]) (hashtab_key_t key, hashtab_datum_t datum, void *datap) = { NULL, class_copy_callback, role_copy_callback, type_copy_callback, - user_copy_callback, bool_copy_callback, NULL, NULL}; + user_copy_callback, bool_copy_callback, sens_copy_callback, + cat_copy_callback}; /* The aliases have to be copied after the types and attributes to be * certain that the base symbol table will have the type that the @@ -783,6 +827,43 @@ return -1; } +static int mls_level_convert(mls_semantic_level_t * src, + mls_semantic_level_t * dst, policy_module_t * mod) +{ + mls_semantic_cat_t *src_cat, *new_cat; + + assert(mod->map[SYM_LEVELS][src->sens - 1]); + dst->sens = mod->map[SYM_LEVELS][src->sens - 1]; + + for (src_cat = src->cat; src_cat; src_cat = src_cat->next) { + new_cat = + (mls_semantic_cat_t *) malloc(sizeof(mls_semantic_cat_t)); + if (!new_cat) + return -1; + mls_semantic_cat_init(new_cat); + + new_cat->next = dst->cat; + dst->cat = new_cat; + + assert(mod->map[SYM_CATS][src_cat->low - 1]); + dst->cat->low = mod->map[SYM_CATS][src_cat->low - 1]; + assert(mod->map[SYM_CATS][src_cat->high - 1]); + dst->cat->high = mod->map[SYM_CATS][src_cat->high - 1]; + } + + return 0; +} + +static int mls_range_convert(mls_semantic_range_t * src, + mls_semantic_range_t * dst, policy_module_t * mod) +{ + if (mls_level_convert(&src->level[0], &dst->level[0], mod)) + return -1; + if (mls_level_convert(&src->level[1], &dst->level[1], mod)) + return -1; + return 0; +} + static int role_fix_callback(hashtab_key_t key, hashtab_datum_t datum, void *data) { @@ -893,13 +974,16 @@ user_datum_t *user, *new_user = NULL; link_state_t *state = (link_state_t *) data; policy_module_t *mod = state->cur; + symtab_t *usertab; user = (user_datum_t *) datum; if (state->dest_decl == NULL) - return 0; + usertab = &state->base->p_users; + else + usertab = &state->dest_decl->p_users; - new_user = hashtab_search(state->dest_decl->p_users.table, id); + new_user = hashtab_search(usertab->table, id); assert(new_user != NULL); if (state->verbose) { @@ -910,6 +994,12 @@ goto cleanup; } + if (mls_range_convert(&user->range, &new_user->range, mod)) + goto cleanup; + + if (mls_level_convert(&user->dfltlevel, &new_user->dfltlevel, mod)) + goto cleanup; + return 0; cleanup: @@ -1096,6 +1186,55 @@ return -1; } +static int copy_range_trans_list(range_trans_rule_t * rules, + range_trans_rule_t ** dst, + policy_module_t * mod, link_state_t * state) +{ + range_trans_rule_t *rule, *new_rule = NULL; + unsigned int i; + ebitmap_node_t *cnode; + + for (rule = rules; rule; rule = rule->next) { + new_rule = + (range_trans_rule_t *) malloc(sizeof(range_trans_rule_t)); + if (!new_rule) + goto cleanup; + + range_trans_rule_init(new_rule); + + new_rule->next = *dst; + *dst = new_rule; + + if (type_set_convert(&rule->stypes, &new_rule->stypes, + mod, state)) + goto cleanup; + + if (type_set_convert(&rule->ttypes, &new_rule->ttypes, + mod, state)) + goto cleanup; + + ebitmap_for_each_bit(&rule->tclasses, cnode, i) { + if (ebitmap_node_get_bit(cnode, i)) { + assert(mod->map[SYM_CLASSES][i]); + if (ebitmap_set_bit + (&new_rule->tclasses, + mod->map[SYM_CLASSES][i] - 1, 1)) { + goto cleanup; + } + } + } + + if (mls_range_convert(&rule->trange, &new_rule->trange, mod)) + goto cleanup; + } + return 0; + + cleanup: + ERR(state->handle, "Out of memory!"); + range_trans_rule_list_destroy(new_rule); + return -1; +} + static int copy_cond_list(cond_node_t * list, cond_node_t ** dst, policy_module_t * module, link_state_t * state) { @@ -1278,6 +1417,10 @@ return -1; } + if (copy_range_trans_list(src_decl->range_tr_rules, + &dest_decl->range_tr_rules, module, state)) + return -1; + /* finally copy any identifiers local to this declaration */ ret = copy_identifiers(state, src_decl->symtab, dest_decl); if (ret < 0) { ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/policydb.c#4 (text+ko) ==== @@ -252,6 +252,29 @@ } } +void level_datum_init(level_datum_t * x) +{ + memset(x, 0, sizeof(level_datum_t)); +} + +void level_datum_destroy(level_datum_t * x __attribute__ ((unused))) +{ + /* the mls_level_t referenced by the level_datum is managed + * separately for now, so there is nothing to destroy */ + return; +} + +void cat_datum_init(cat_datum_t * x) +{ + memset(x, 0, sizeof(cat_datum_t)); +} + +void cat_datum_destroy(cat_datum_t * x __attribute__ ((unused))) +{ + /* it's currently a simple struct - really nothing to destroy */ + return; +} + void class_perm_node_init(class_perm_node_t * x) { memset(x, 0, sizeof(class_perm_node_t)); @@ -502,7 +525,11 @@ return -1; } - if (p->policy_type != POLICY_KERN) { + /* we do not expand user's MLS info in kernel policies because the + * semantic representation is not present and we do not expand user's + * MLS info in module policies because all of the necessary mls + * information is not present */ + if (p->policy_type != POLICY_KERN && p->policy_type != POLICY_MOD) { mls_range_destroy(&user->exp_range); if (mls_semantic_range_expand(&user->range, &user->exp_range, p, NULL)) { @@ -907,9 +934,10 @@ if (key) free(key); levdatum = (level_datum_t *) datum; - ebitmap_destroy(&levdatum->level->cat); + mls_level_destroy(levdatum->level); free(levdatum->level); - free(datum); + level_datum_destroy(levdatum); + free(levdatum); return 0; } @@ -918,6 +946,7 @@ { if (key) free(key); + cat_datum_destroy((cat_datum_t *) datum); free(datum); return 0; } @@ -2199,7 +2228,7 @@ { uint32_t *buf; - memset(lp, 0, sizeof(mls_level_t)); + mls_level_init(lp); buf = next_entry(fp, sizeof(uint32_t)); if (!buf) { @@ -2305,9 +2334,10 @@ level_datum_t *levdatum; uint32_t *buf, len; - levdatum = calloc(1, sizeof(level_datum_t)); + levdatum = malloc(sizeof(level_datum_t)); if (!levdatum) return -1; + level_datum_init(levdatum); buf = next_entry(fp, (sizeof(uint32_t) * 2)); if (!buf) @@ -2347,9 +2377,10 @@ cat_datum_t *catdatum; uint32_t *buf, len; - catdatum = calloc(1, sizeof(cat_datum_t)); + catdatum = malloc(sizeof(cat_datum_t)); if (!catdatum) return -1; + cat_datum_init(catdatum); buf = next_entry(fp, (sizeof(uint32_t) * 3)); if (!buf) From owner-p4-projects@FreeBSD.ORG Wed Oct 25 20:49:29 2006 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 13BAD16A4D8; Wed, 25 Oct 2006 20:49:29 +0000 (UTC) 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 AA38A16A4B3 for ; Wed, 25 Oct 2006 20:49:28 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1F9743DF5 for ; Wed, 25 Oct 2006 20:49:06 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9PKn6BK080117 for ; Wed, 25 Oct 2006 20:49:06 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PKn65m080114 for perforce@freebsd.org; Wed, 25 Oct 2006 20:49:06 GMT (envelope-from millert@freebsd.org) Date: Wed, 25 Oct 2006 20:49:06 GMT Message-Id: <200610252049.k9PKn65m080114@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 108429 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, 25 Oct 2006 20:49:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=108429 Change 108429 by millert@millert_macbook on 2006/10/25 20:49:01 Update to policycoreutils-1.32 from the NSA web site. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/ChangeLog#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/VERSION#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/audit2allow#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/avc.py#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/newrole.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/bn_IN.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ca.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/de.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/el.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hr.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hu.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ms.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ru.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sk.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sr%40Latn.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sv.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/zh_TW.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecon/restorecon.8#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecon/restorecon.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/restorecond.init#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/scripts/chcat#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/scripts/fixfiles#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/scripts/fixfiles.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/scripts/genhomedircon#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/secon/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semanage/semanage#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semanage/semanage.8#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semanage/seobject.py#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_deps/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_expand/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_link/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_link/semodule_link.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_package/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_package/semodule_package.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setsebool/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/ChangeLog#4 (text+ko) ==== @@ -1,3 +1,21 @@ +1.32 2006-10-17 + * Updated version for release. + +1.30.31 2006-10-17 + * Merged audit2allow -l fix from Yuichi Nakamura. + * Merged restorecon -i and -o - support from Karl MacMillan. + * Merged semanage/seobject fix from Dan Walsh. + * Merged fixfiles -R and verify changes from Dan Walsh. + +1.30.30 2006-09-29 + * Merged newrole auditing of failures due to user actions from + Michael Thompson. + +1.30.29 2006-09-13 + * Man page corrections from Dan Walsh + * Change all python invocations to /usr/bin/python -E + * Add missing getopt flags to genhomedircon + 1.30.28 2006-09-01 * Merged fix for restorecon // handling from Erich Schubert. * Merged translations update and fixfiles fix from Dan Walsh. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/VERSION#4 (text+ko) ==== @@ -1,1 +1,1 @@ -1.30.28 +1.32 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/audit2allow#3 (text+ko) ==== @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python -E # Copyright (C) 2005 Red Hat # see file 'COPYING' for use and warranty information # ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/avc.py#2 (text+ko) ==== @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python -E # Copyright (C) 2006 Red Hat # see file 'COPYING' for use and warranty information # @@ -357,6 +357,15 @@ break else: dict.append(i) + + if not found: + regexp = "audit\(\d+\.\d+:\d+\): policy loaded" + m = re.match(regexp, line) + if m !=None: + found =1 + dict.append("load_policy") + dict.append("granted") + if found: self.translate(dict) found = 0 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/Makefile#2 (text+ko) ==== @@ -27,7 +27,7 @@ LDLIBS += -laudit endif ifeq (${LOG_AUDIT_PRIV},y) - override CFLAGS += -DLOG_AUDIT_PRIV -D_GNU_SOURCE + override CFLAGS += -DLOG_AUDIT_PRIV LDLIBS += -lcap MODE := 4555 else ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/newrole.c#4 (text+ko) ==== @@ -399,6 +399,53 @@ } #endif +#ifdef LOG_AUDIT_PRIV +/* Send audit message */ +static +int send_audit_message(int success, security_context_t old_context, + security_context_t new_context, const char *ttyn) +{ + char *msg = NULL; + int rc; + int audit_fd = audit_open(); + + if (audit_fd < 0) { + fprintf(stderr, _("Error connecting to audit system.\n")); + return -1; + } + if (asprintf(&msg, "newrole: old-context=%s new-context=%s", + old_context ? old_context : "?", + new_context ? new_context : "?") < 0) { + fprintf(stderr, _("Error allocating memory.\n")); + rc = -1; + goto out; + } + rc = audit_log_user_message(audit_fd, AUDIT_USER_ROLE_CHANGE, + msg, NULL, NULL, ttyn, success); + if (rc <= 0) { + fprintf(stderr, _("Error sending audit message.\n")); + rc = -1; + goto out; + } + rc = 0; + out: + free(msg); + close(audit_fd); + return rc; +} +#else +static inline + int send_audit_message(int success __attribute__ ((unused)), + security_context_t old_context + __attribute__ ((unused)), + security_context_t new_context + __attribute__ ((unused)), const char *ttyn + __attribute__ ((unused))) +{ + return 0; +} +#endif + /************************************************************************ * * All code used for both PAM and shadow passwd goes in this section. @@ -541,6 +588,7 @@ if (role_s && !type_s) { if (get_default_type(role_s, &type_s)) { fprintf(stderr, _("Couldn't get default type.\n")); + send_audit_message(0, old_context, new_context, ttyn); exit(-1); } #ifdef CANTSPELLGDB @@ -724,6 +772,7 @@ if (security_check_context(new_context) < 0) { fprintf(stderr, _("%s is not a valid context\n"), new_context); + send_audit_message(0, old_context, new_context, ttyn); exit(-1); } @@ -885,32 +934,8 @@ } free(labeltext); -#ifdef LOG_AUDIT_PRIV - /* Send audit message */ - { - char *msg; - int rc; - int audit_fd = audit_open(); - if (audit_fd < 0) { - fprintf(stderr, - _("Error connecting to audit system.\n")); - exit(-1); - } - if (asprintf(&msg, "newrole: old-context=%s new-context=%s", - old_context, new_context) < 0) { - fprintf(stderr, _("Error allocating memory.\n")); - exit(-1); - } - rc = audit_log_user_message(audit_fd, AUDIT_USER_ROLE_CHANGE, - msg, NULL, NULL, ttyn, 1); - if (rc <= 0) { - fprintf(stderr, _("Error sending audit message.\n")); - exit(-1); - } - free(msg); - close(audit_fd); - } -#endif + if (send_audit_message(1, old_context, new_context, ttyn)) + exit(-1); freecon(old_context); mac_execve(pw->pw_shell, argv + optind - 1, environ, label); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/bn_IN.po#3 (text+ko) ==== @@ -1,3 +1,4 @@ +# translation of bn_IN.po to Bengali India # translation of bn_IN.po to Bangla (INDIA) # translation of bn_IN.po to Bangla (INDIA) # translation of bn_IN.po to Bangla (INDIA) @@ -36,14 +37,14 @@ "Project-Id-Version: bn_IN\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-06-29 15:53-0400\n" -"PO-Revision-Date: 2006-05-09 18:04+0530\n" +"PO-Revision-Date: 2006-09-20 16:53+0530\n" "Last-Translator: Runa Bhattacharjee \n" -"Language-Team: Bangla (INDIA) \n" +"Language-Team: Bengali India\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n\n" #: ../load_policy/load_policy.c:22 #, c-format @@ -182,7 +183,7 @@ #: ../newrole/newrole.c:657 #, c-format msgid "failed to set new role %s\n" -msgstr "new role %s স্থাপন করতে ব্যর্থ\n" +msgstr "নতুন ভূমিকা %s স্থাপন করতে ব্যর্থ\n" #: ../newrole/newrole.c:671 #, c-format @@ -202,7 +203,7 @@ #: ../newrole/newrole.c:708 #, c-format msgid "failed to convert new context to string\n" -msgstr "new context'কে string হিসাবে রূপান্তর করা যায়নি\n" +msgstr "নতুন context'কে string হিসাবে রূপান্তর করা যায়নি\n" #: ../newrole/newrole.c:717 #, c-format @@ -449,7 +450,7 @@ #: ../semanage/seobject.py:177 #, python-format msgid "%s already defined in translations" -msgstr "অনুবাদের মধ্যে %s বর্তমান ব্যাখ্যা করা হয়েছে" +msgstr "অনুবাদের মধ্যে %s বর্তমানে ব্যাখ্যা করা হয়েছে" #: ../semanage/seobject.py:189 #, python-format @@ -918,8 +919,7 @@ #: ../semanage/seobject.py:1131 #, python-format msgid "File context for %s is defined in policy, cannot be deleted" -msgstr "" -"%s'র ফাইল context নিয়মনীতির মধ্যে নির্ধারিত হওয়ার ফলে তা অপসারণ করা সম্ভব নয়" +msgstr "%s'র ফাইল context নিয়মনীতির মধ্যে নির্ধারিত হওয়ার ফলে তা অপসারণ করা সম্ভব নয়" #: ../semanage/seobject.py:1139 ../semanage/seobject.py:1143 #, python-format @@ -1004,4 +1004,5 @@ #: ../audit2allow/audit2allow:203 #, c-format msgid "Options Error: %s " -msgstr "বিকল্প সংক্রান্ত ত্রুটি: %s " +msgstr "বিকল্প সংক্রান্ত ত্রুটি: %s" + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ca.po#3 (text+ko) ==== @@ -4,6 +4,7 @@ # package. # # Josep Puigdemont Casamajó , 2006. +# Xavier Conde Rueda , 2006 # # This file is translated according to the glossary and style guide of # Softcatalà. If you plan to modify this file, please read first the page @@ -22,8 +23,8 @@ "Project-Id-Version: policycoreutils\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-06-29 15:53-0400\n" -"PO-Revision-Date: 2006-05-13 10:34+0200\n" -"Last-Translator: Josep Puigdemont Casamajó \n" +"PO-Revision-Date: 2006-08-28 10:34+0200\n" +"Last-Translator: Xavier Conde Rueda \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,12 +38,12 @@ #: ../load_policy/load_policy.c:66 #, c-format msgid "%s: Can't load policy: %s\n" -msgstr "%s: No es pot carregar la política: %s\n" +msgstr "%s: no es pot carregar la política: %s\n" #: ../newrole/newrole.c:97 #, c-format msgid "Out of memory!\n" -msgstr "No hi ha prou memòria!\n" +msgstr "No hi ha prou memòria\n" #: ../newrole/newrole.c:199 ../run_init/run_init.c:126 #, c-format @@ -61,7 +62,9 @@ #: ../newrole/newrole.c:281 ../run_init/run_init.c:189 #, c-format msgid "Cannot find your entry in the shadow passwd file.\n" -msgstr "No s'ha pogut trobar la vostra entrada en el fitxer passwd ocult.\n" +msgstr "" +"No s'ha pogut trobar la vostra entrada en el fitxer de contrasenyes " +"ocultes.\n" #: ../newrole/newrole.c:287 ../run_init/run_init.c:195 #, c-format @@ -71,87 +74,91 @@ #: ../newrole/newrole.c:354 #, c-format msgid "Error initing capabilities, aborting.\n" -msgstr "" +msgstr "S'ha produït un error en iniciar les capacitats, s'està anul·lant.\n" #: ../newrole/newrole.c:368 #, c-format msgid "Error dropping capabilities, aborting\n" -msgstr "" +msgstr "S'ha produït un error en eliminar les capacitats, s'està anul·lant.\n" #: ../newrole/newrole.c:375 #, c-format msgid "Error changing uid, aborting.\n" -msgstr "" +msgstr "S'ha produït un error en canviar l'UID, s'està anul·lant.\n" #: ../newrole/newrole.c:382 #, c-format msgid "Error resetting KEEPCAPS, aborting\n" msgstr "" +"S'ha produït un error en tornar a establir el valor de KEEPCAPS, s'està " +"anul·lant.\n" #: ../newrole/newrole.c:390 #, c-format msgid "Error dropping SETUID capability, aborting\n" msgstr "" +"S'ha produït un error en eliminar la capacitat per a SETUID, s'està " +"anul·lant.\n" #: ../newrole/newrole.c:463 #, c-format msgid "Sorry, newrole may be used only on a SELinux kernel.\n" -msgstr "" +msgstr "El newrole només es pot fer servir amb un nucli amb SELinux.\n" #: ../newrole/newrole.c:468 #, c-format msgid "Could not determine enforcing mode.\n" -msgstr "" +msgstr "No s'ha pogut determinar el mode de reforç.\n" #: ../newrole/newrole.c:488 #, c-format msgid "Error: multiple roles specified\n" -msgstr "" +msgstr "S'ha produït un error: s'han especificat múltiples rols\n" #: ../newrole/newrole.c:498 #, c-format msgid "Error: multiple types specified\n" -msgstr "" +msgstr "S'ha produït un error: s'han especificat múltiples tipus\n" #: ../newrole/newrole.c:508 #, c-format msgid "Sorry, -l may be used with SELinux MLS support.\n" -msgstr "" +msgstr "El «-l» s'ha de fer servir amb suport MLS de SELinux.\n" #: ../newrole/newrole.c:515 #, c-format msgid "Error: multiple levels specified\n" -msgstr "" +msgstr "S'ha produït un error: s'han especificat múltiples nivells\n" #: ../newrole/newrole.c:537 #, c-format msgid "Couldn't get default type.\n" -msgstr "" +msgstr "No s'ha pogut obtenir el tipus predeterminat.\n" #: ../newrole/newrole.c:559 #, c-format msgid "failed to get old_context.\n" -msgstr "" +msgstr "no s'ha pogut obtenir l'old_context.\n" #: ../newrole/newrole.c:572 #, c-format msgid "failed to get new context.\n" -msgstr "" +msgstr "no s'ha pogut obtenir el nou context.\n" #: ../newrole/newrole.c:596 #, c-format msgid "cannot find your entry in the passwd file.\n" -msgstr "" +msgstr "no s'ha trobat la vostra entrada en el fitxer de contrasenyes.\n" #: ../newrole/newrole.c:606 #, c-format msgid "Error! Shell is not valid.\n" -msgstr "" +msgstr "L'intèrpret d'ordres no és vàlid.\n" #: ../newrole/newrole.c:614 #, c-format msgid "Error! Could not retrieve tty information.\n" -msgstr "" +msgstr "No s'ha pogut obtenir informació de la tty.\n" #: ../newrole/newrole.c:618 #, c-format @@ -161,32 +168,32 @@ #: ../newrole/newrole.c:632 #, c-format msgid "newrole: incorrect password for %s\n" -msgstr "" +msgstr "newrole: la contrasenya per a %s no és correcta\n" #: ../newrole/newrole.c:657 #, c-format msgid "failed to set new role %s\n" -msgstr "" +msgstr "no s'ha pogut establir un nou rol %s\n" #: ../newrole/newrole.c:671 #, c-format msgid "failed to set new type %s\n" -msgstr "" +msgstr "no s'ha pogut establir el nou tipus %s\n" #: ../newrole/newrole.c:688 #, c-format msgid "failed to build new range with level %s\n" -msgstr "" +msgstr "no s'ha pogut muntar el nou rang amb nivell %s\n" #: ../newrole/newrole.c:693 #, c-format msgid "failed to set new range %s\n" -msgstr "" +msgstr "no s'ha pogut establir el nou rang %s\n" #: ../newrole/newrole.c:708 #, c-format msgid "failed to convert new context to string\n" -msgstr "" +msgstr "no s'ha pogut convertir el nou context en cadena de text\n" #: ../newrole/newrole.c:717 #, c-format @@ -196,32 +203,36 @@ #: ../newrole/newrole.c:730 #, c-format msgid "Error! Could not open %s.\n" -msgstr "Error. No s'ha pogut obrir %s.\n" +msgstr "S'ha produït un error: no s'ha pogut obrir %s.\n" #: ../newrole/newrole.c:738 #, c-format msgid "%s! Could not get current context for %s, not relabeling tty.\n" msgstr "" +"%s. No s'ha pogut obtenir el context actual per a %s, no es reetiquetarà el " +"tty.\n" #: ../newrole/newrole.c:757 #, c-format msgid "%s! Could not get new context for %s, not relabeling tty.\n" msgstr "" +"%s. No s'ha pogut obtenir el nou context per a %s, no es reetiquetarà el " +"tty.\n" #: ../newrole/newrole.c:771 #, c-format msgid "%s! Could not set new context for %s\n" -msgstr "" +msgstr "%s. No s'ha pogut establir el nou context per a %s\n" #: ../newrole/newrole.c:784 #, c-format msgid "newrole: failure forking: %s" -msgstr "" +msgstr "newrole: no s'ha pogut crear un fill: %s" #: ../newrole/newrole.c:789 #, c-format msgid "Warning! Could not restore context for %s\n" -msgstr "" +msgstr "Avís: no es pot restaurar el context per a %s\n" #: ../newrole/newrole.c:810 #, c-format @@ -231,31 +242,31 @@ #: ../newrole/newrole.c:834 #, c-format msgid "Could not close descriptors.\n" -msgstr "" +msgstr "No s'ha pogut tancar els descriptors.\n" #: ../newrole/newrole.c:869 ../run_init/run_init.c:397 #, c-format msgid "Could not set exec context to %s.\n" -msgstr "" +msgstr "No s'ha pogut establir el context d'execució a %s.\n" #: ../newrole/newrole.c:881 #, c-format msgid "Error connecting to audit system.\n" -msgstr "" +msgstr "S'ha produït un error en connectar al sistema audit.\n" #: ../newrole/newrole.c:886 #, c-format msgid "Error allocating memory.\n" -msgstr "" +msgstr "S'ha produït un error en assignar memòria.\n" #: ../newrole/newrole.c:892 #, c-format msgid "Error sending audit message.\n" -msgstr "" +msgstr "S'ha produït un error en enviar el missatge d'audit.\n" #: ../newrole/newrole.c:903 msgid "failed to exec shell\n" -msgstr "" +msgstr "no s'ha pogut executar l'intèrpret d'ordres\n" #: ../run_init/run_init.c:67 msgid "" @@ -263,11 +274,14 @@ " where: