From owner-p4-projects@FreeBSD.ORG Sun May 2 05:36:55 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 4D05B1065673; Sun, 2 May 2010 05:36:55 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id ED5B0106566C
for ; Sun, 2 May 2010 05:36:54 +0000 (UTC)
(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
by mx1.freebsd.org (Postfix) with ESMTP id D3B858FC0C
for ; Sun, 2 May 2010 05:36:54 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o425asRG050283
for ; Sun, 2 May 2010 05:36:54 GMT
(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o425asLw050281
for perforce@freebsd.org; Sun, 2 May 2010 05:36:54 GMT
(envelope-from mav@freebsd.org)
Date: Sun, 2 May 2010 05:36:54 GMT
Message-Id: <201005020536.o425asLw050281@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
mav@freebsd.org using -f
From: Alexander Motin
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 177583 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 02 May 2010 05:36:55 -0000
http://p4web.freebsd.org/@@177583?ac=10
Change 177583 by mav@mav_mavtest on 2010/05/02 05:36:16
Add SATA capabilities reporting support in mvs.
Tune power management a bit.
Affected files ...
.. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#22 edit
.. //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#12 edit
Differences ...
==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.c#22 (text+ko) ====
@@ -121,6 +121,11 @@
ch->user[i].bytecount = (ch->quirks & MVS_Q_GENIIE) ? 8192 : 2048;
ch->user[i].tags = MVS_MAX_SLOTS;
ch->curr[i] = ch->user[i];
+ if (ch->pm_level) {
+ ch->user[i].caps = CTS_SATA_CAPS_H_PMREQ |
+ CTS_SATA_CAPS_H_APST |
+ CTS_SATA_CAPS_D_PMREQ | CTS_SATA_CAPS_D_APST;
+ }
}
rid = ch->unit;
if (!(ch->r_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
@@ -615,6 +620,7 @@
{
struct mvs_channel *ch = device_get_softc(dev);
uint32_t work;
+ int timeout = 0;
work = ATA_INL(ch->r_mem, SATA_SS);
if (work & SATA_SS_IPM_ACTIVE)
@@ -624,6 +630,11 @@
work &= ~SATA_SC_SPM_MASK;
work |= SATA_SC_SPM_ACTIVE;
ATA_OUTL(ch->r_mem, SATA_SC, work);
+ /* Wait for transition to happen. */
+ while ((ATA_INL(ch->r_mem, SATA_SS) & SATA_SS_IPM_ACTIVE) == 0 &&
+ timeout++ < 100) {
+ DELAY(100);
+ }
}
static void
@@ -1484,9 +1495,10 @@
if (slot->state < MVS_SLOT_RUNNING)
return;
device_printf(dev, "Timeout on slot %d\n", slot->slot);
- device_printf(dev, "iec %08x serr %08x edma_s %08x "
+ device_printf(dev, "iec %08x sstat %08x serr %08x edma_s %08x "
"dma_c %08x dma_s %08x rs %08x status %02x\n",
- ATA_INL(ch->r_mem, EDMA_IEC), ATA_INL(ch->r_mem, SATA_SE),
+ ATA_INL(ch->r_mem, EDMA_IEC),
+ ATA_INL(ch->r_mem, SATA_SS), ATA_INL(ch->r_mem, SATA_SE),
ATA_INL(ch->r_mem, EDMA_S), ATA_INL(ch->r_mem, DMA_C),
ATA_INL(ch->r_mem, DMA_S), ch->rslots,
ATA_INB(ch->r_mem, ATA_ALTSTAT));
@@ -1653,7 +1665,8 @@
et != MVS_ERR_TIMEOUT)
mvs_rearm_timeout(dev);
/* Start PM timer. */
- if (ch->numrslots == 0 && ch->pm_level > 3) {
+ if (ch->numrslots == 0 && ch->pm_level > 3 &&
+ (ch->curr[ch->pm_present ? 15 : 0].caps & CTS_SATA_CAPS_D_PMREQ)) {
callout_schedule(&ch->pm_timer,
(ch->pm_level == 4) ? hz / 1000 : hz / 8);
}
@@ -2037,6 +2050,8 @@
ch->pm_present = cts->xport_specific.sata.pm_present;
if (cts->xport_specific.sata.valid & CTS_SATA_VALID_ATAPI)
d->atapi = cts->xport_specific.sata.atapi;
+ if (cts->xport_specific.sata.valid & CTS_SATA_VALID_CAPS)
+ d->caps = cts->xport_specific.sata.caps;
ccb->ccb_h.status = CAM_REQ_CMP;
break;
}
@@ -2069,9 +2084,17 @@
cts->xport_specific.sata.valid |=
CTS_SATA_VALID_REVISION;
}
+ cts->xport_specific.sata.caps = d->caps & CTS_SATA_CAPS_D;
+// if (ch->pm_level)
+// cts->xport_specific.sata.caps |= CTS_SATA_CAPS_H_PMREQ;
+ cts->xport_specific.sata.caps &=
+ ch->user[ccb->ccb_h.target_id].caps;
+ cts->xport_specific.sata.valid |= CTS_SATA_VALID_CAPS;
} else {
cts->xport_specific.sata.revision = d->revision;
cts->xport_specific.sata.valid |= CTS_SATA_VALID_REVISION;
+ cts->xport_specific.sata.caps = d->caps;
+ cts->xport_specific.sata.valid |= CTS_SATA_VALID_CAPS;
}
cts->xport_specific.sata.mode = d->mode;
cts->xport_specific.sata.valid |= CTS_SATA_VALID_MODE;
==== //depot/projects/scottl-camlock/src/sys/dev/mvs/mvs.h#12 (text+ko) ====
@@ -507,6 +507,7 @@
u_int bytecount;
u_int atapi;
u_int tags;
+ u_int caps;
};
enum mvs_edma_mode {
From owner-p4-projects@FreeBSD.ORG Sun May 2 10:22:41 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 307B4106566C; Sun, 2 May 2010 10:22:41 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id E8E44106566B
for ; Sun, 2 May 2010 10:22:40 +0000 (UTC)
(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
by mx1.freebsd.org (Postfix) with ESMTP id D5CF28FC18
for ; Sun, 2 May 2010 10:22:40 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o42AMep9088408
for ; Sun, 2 May 2010 10:22:40 GMT
(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o42AMerf088406
for perforce@freebsd.org; Sun, 2 May 2010 10:22:40 GMT
(envelope-from mav@freebsd.org)
Date: Sun, 2 May 2010 10:22:40 GMT
Message-Id: <201005021022.o42AMerf088406@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
mav@freebsd.org using -f
From: Alexander Motin
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 177589 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 02 May 2010 10:22:41 -0000
http://p4web.freebsd.org/@@177589?ac=10
Change 177589 by mav@mav_mavtest on 2010/05/02 10:22:03
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/lib/libpmc/libpmc.c#10 integrate
.. //depot/projects/scottl-camlock/src/lib/libufs/cgroup.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#156 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#57 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options#42 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_mod.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_resource.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_mbuf.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/AR71XX#6 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#31 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/pathchk/pathchk.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/pathchk/pathchk.c#2 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/lib/libpmc/libpmc.c#10 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.26 2010/04/02 13:23:49 fabient Exp $");
+__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.27 2010/05/01 21:59:06 rstone Exp $");
#include
#include
@@ -737,9 +737,16 @@
case PMC_EV_IAP_EVENT_40H: /* Core */
case PMC_EV_IAP_EVENT_41H: /* Core */
case PMC_EV_IAP_EVENT_42H: /* Core, Core2, Atom */
- case PMC_EV_IAP_EVENT_77H: /* Core */
if (cachestate == 0)
cachestate = (0xF << 8);
+ break;
+ case PMC_EV_IAP_EVENT_77H: /* Atom */
+ /* IAP_EVENT_77H only accepts a cachestate qualifier on the
+ * Atom processor
+ */
+ if(cpu_info.pm_cputype == PMC_CPU_INTEL_ATOM && cachestate == 0)
+ cachestate = (0xF << 8);
+ break;
default:
break;
}
==== //depot/projects/scottl-camlock/src/lib/libufs/cgroup.c#4 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/lib/libufs/cgroup.c,v 1.6 2010/04/24 07:05:35 jeff Exp $");
+__FBSDID("$FreeBSD: src/lib/libufs/cgroup.c,v 1.7 2010/05/01 18:56:45 emaste Exp $");
#include
#include
@@ -145,7 +145,7 @@
fs = &disk->d_fs;
cgp = &disk->d_cg;
inosused = cg_inosused(cgp);
- for (ino = 0; ino < fs->fs_ipg / NBBY; ino++)
+ for (ino = 0; ino < fs->fs_ipg; ino++)
if (isclr(inosused, ino))
goto gotit;
return (0);
==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#27 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.341 2010/04/13 10:12:58 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.342 2010/05/01 13:15:35 kib Exp $");
/*
* AMD64 Trap and System call handling
@@ -172,52 +172,6 @@
extern char *syscallnames[];
-/* #define DEBUG 1 */
-#ifdef DEBUG
-static void
-report_seg_fault(const char *segn, struct trapframe *frame)
-{
- struct proc_ldt *pldt;
- struct trapframe *pf;
-
- pldt = curproc->p_md.md_ldt;
- printf("%d: %s load fault %lx %p %d\n",
- curproc->p_pid, segn, frame->tf_err,
- pldt != NULL ? pldt->ldt_base : NULL,
- pldt != NULL ? pldt->ldt_refcnt : 0);
- kdb_backtrace();
- pf = (struct trapframe *)frame->tf_rsp;
- printf("rdi %lx\n", pf->tf_rdi);
- printf("rsi %lx\n", pf->tf_rsi);
- printf("rdx %lx\n", pf->tf_rdx);
- printf("rcx %lx\n", pf->tf_rcx);
- printf("r8 %lx\n", pf->tf_r8);
- printf("r9 %lx\n", pf->tf_r9);
- printf("rax %lx\n", pf->tf_rax);
- printf("rbx %lx\n", pf->tf_rbx);
- printf("rbp %lx\n", pf->tf_rbp);
- printf("r10 %lx\n", pf->tf_r10);
- printf("r11 %lx\n", pf->tf_r11);
- printf("r12 %lx\n", pf->tf_r12);
- printf("r13 %lx\n", pf->tf_r13);
- printf("r14 %lx\n", pf->tf_r14);
- printf("r15 %lx\n", pf->tf_r15);
- printf("fs %x\n", pf->tf_fs);
- printf("gs %x\n", pf->tf_gs);
- printf("es %x\n", pf->tf_es);
- printf("ds %x\n", pf->tf_ds);
- printf("tno %x\n", pf->tf_trapno);
- printf("adr %lx\n", pf->tf_addr);
- printf("flg %x\n", pf->tf_flags);
- printf("err %lx\n", pf->tf_err);
- printf("rip %lx\n", pf->tf_rip);
- printf("cs %lx\n", pf->tf_cs);
- printf("rfl %lx\n", pf->tf_rflags);
- printf("rsp %lx\n", pf->tf_rsp);
- printf("ss %lx\n", pf->tf_ss);
-}
-#endif
-
/*
* Exception, fault, and trap interface to the FreeBSD kernel.
* This common code is called from assembly language IDT gate entry
@@ -314,9 +268,7 @@
*/
printf("kernel trap %d with interrupts disabled\n",
type);
-#ifdef DEBUG
- report_seg_fault("hlt", frame);
-#endif
+
/*
* We shouldn't enable interrupts while holding a
* spin lock or servicing an NMI.
@@ -535,33 +487,21 @@
goto out;
}
if (frame->tf_rip == (long)ld_ds) {
-#ifdef DEBUG
- report_seg_fault("ds", frame);
-#endif
frame->tf_rip = (long)ds_load_fault;
frame->tf_ds = _udatasel;
goto out;
}
if (frame->tf_rip == (long)ld_es) {
-#ifdef DEBUG
- report_seg_fault("es", frame);
-#endif
frame->tf_rip = (long)es_load_fault;
frame->tf_es = _udatasel;
goto out;
}
if (frame->tf_rip == (long)ld_fs) {
-#ifdef DEBUG
- report_seg_fault("fs", frame);
-#endif
frame->tf_rip = (long)fs_load_fault;
frame->tf_fs = _ufssel;
goto out;
}
if (frame->tf_rip == (long)ld_gs) {
-#ifdef DEBUG
- report_seg_fault("gs", frame);
-#endif
frame->tf_rip = (long)gs_load_fault;
frame->tf_gs = _ugssel;
goto out;
@@ -667,30 +607,6 @@
ksi.ksi_addr = (void *)addr;
trapsignal(td, &ksi);
-#ifdef DEBUG
-{
- register_t rg,rgk, rf;
-
- if (type <= MAX_TRAP_MSG) {
- uprintf("fatal process exception: %s",
- trap_msg[type]);
- if ((type == T_PAGEFLT) || (type == T_PROTFLT))
- uprintf(", fault VA = 0x%lx", frame->tf_addr);
- uprintf("\n");
- }
- rf = rdmsr(0xc0000100);
- rg = rdmsr(0xc0000101);
- rgk = rdmsr(0xc0000102);
- uprintf("pid %d TRAP %d rip %lx err %lx addr %lx cs %lx ss %lx ds %x "
- "es %x fs %x fsbase %lx %lx gs %x gsbase %lx %lx %lx\n",
- curproc->p_pid, type, frame->tf_rip, frame->tf_err,
- frame->tf_addr,
- frame->tf_cs, frame->tf_ss, frame->tf_ds, frame->tf_es,
- frame->tf_fs, td->td_pcb->pcb_fsbase, rf,
- frame->tf_gs, td->td_pcb->pcb_gsbase, rg, rgk);
-}
-#endif
-
user:
userret(td, frame);
mtx_assert(&Giant, MA_NOTOWNED);
==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#156 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.247 2010/04/30 08:57:03 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.248 2010/05/02 04:16:39 mav Exp $");
#include
#include
@@ -4874,6 +4874,8 @@
if ((dev->flags & CAM_DEV_TAG_AFTER_COUNT) != 0
&& (--dev->tag_delay_count == 0))
xpt_start_tags(ccb_h->path);
+ if (!device_is_send_queued(dev))
+ xpt_schedule_dev_sendq(ccb_h->path->bus, dev);
}
if (ccb_h->status & CAM_RELEASE_SIMQ) {
==== //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 (text+ko) ====
@@ -38,15 +38,22 @@
int zfs_txg_timeout = 30; /* max seconds worth of delta per txg */
extern int zfs_txg_synctime;
+extern uint64_t zfs_write_limit_override;
SYSCTL_DECL(_vfs_zfs);
-SYSCTL_NODE(_vfs_zfs, OID_AUTO, txg, CTLFLAG_RW, 0, "ZFS TXG");
+SYSCTL_NODE(_vfs_zfs, OID_AUTO, txg, CTLFLAG_RW, 0,
+ "ZFS transaction groups (TXG)");
TUNABLE_INT("vfs.zfs.txg.timeout", &zfs_txg_timeout);
SYSCTL_INT(_vfs_zfs_txg, OID_AUTO, timeout, CTLFLAG_RDTUN, &zfs_txg_timeout, 0,
"Maximum seconds worth of delta per txg");
TUNABLE_INT("vfs.zfs.txg.synctime", &zfs_txg_synctime);
SYSCTL_INT(_vfs_zfs_txg, OID_AUTO, synctime, CTLFLAG_RDTUN, &zfs_txg_synctime,
0, "Target seconds to sync a txg");
+TUNABLE_QUAD("vfs.zfs.txg.write_limit_override", &zfs_write_limit_override);
+SYSCTL_QUAD(_vfs_zfs_txg, OID_AUTO, write_limit_override, CTLFLAG_RW,
+ &zfs_write_limit_override, 0,
+ "Override maximum size of a txg to this size in bytes, "
+ "value of 0 means don't override");
/*
* Prepare the txg subsystem.
==== //depot/projects/scottl-camlock/src/sys/conf/NOTES#57 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1581 2010/04/14 20:45:33 yongari Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1582 2010/05/01 16:36:14 imp Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -2093,6 +2093,15 @@
#device ath_rf5413
#device ath_ar5416 # AR5416 chips
options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
+# All of the AR5212 parts have a problem when paired with the AR71xx
+# CPUS. These parts have a bug that triggers a fatal bus error on the AR71xx
+# only. Details of the exact nature of the bug are sketchy, but some can be
+# found at https://forum.openwrt.org/viewtopic.php?pid=70060 on pages 4, 5 and
+# 6. This option enables this workaround. There is a performance penalty
+# for this work around, but without it things don't work at all. The DMA
+# from the card usually bursts 128 bytes, but on the affected CPUs, only
+# 4 are safe.
+options AH_RXCFG_SDMAMW_4BYTES
#device ath_ar9160 # AR9160 chips
#device ath_ar9280 # AR9280 chips
#device ath_ar9285 # AR9285 chips
==== //depot/projects/scottl-camlock/src/sys/conf/options#42 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.701 2010/03/24 20:02:40 rrs Exp $
+# $FreeBSD: src/sys/conf/options,v 1.702 2010/05/01 16:36:14 imp Exp $
#
# On the handling of kernel options
#
@@ -771,6 +771,7 @@
AH_NEED_DESC_SWAP opt_ah.h
AH_USE_INIPDGAIN opt_ah.h
AH_MAXCHAN opt_ah.h
+AH_RXCFG_SDMAMW_4BYTES opt_ah.h
# options for the Broadcom BCM43xx driver (bwi)
BWI_DEBUG opt_bwi.h
==== //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#2 (text+ko) ====
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c,v 1.9 2009/02/24 01:07:06 sam Exp $
+ * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c,v 1.10 2010/05/01 16:36:14 imp Exp $
*/
#include "opt_ah.h"
@@ -283,6 +283,14 @@
regWrites = ath_hal_ini_write(ah, &ahp->ah_ini_modes, modesIndex, 0);
regWrites = write_common(ah, &ahp->ah_ini_common, bChannelChange,
regWrites);
+#ifdef AH_RXCFG_SDMAMW_4BYTES
+ /*
+ * Nala doesn't work with 128 byte bursts on pb42(hydra) (ar71xx),
+ * use 4 instead. Enabling it on all platforms would hurt performance,
+ * so we only enable it on the ones that are affected by it.
+ */
+ OS_REG_WRITE(ah, AR_RXCFG, 0);
+#endif
ahp->ah_rfHal->writeRegs(ah, modesIndex, freqIndex, regWrites);
OS_MARK(ah, AH_MARK_RESET_LINE, __LINE__);
==== //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_mod.c#16 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_mod.c,v 1.49 2010/03/31 20:00:44 fabient Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_mod.c,v 1.50 2010/05/01 22:04:58 rstone Exp $");
#include
#include
@@ -2675,16 +2675,16 @@
PMCDBG(PMC,OPS,1, "po=%p in global list", po);
}
po->po_sscount++;
- }
- /*
- * Log mapping information for all existing processes in the
- * system. Subsequent mappings are logged as they happen;
- * see pmc_process_mmap().
- */
- if (po->po_logprocmaps == 0) {
- pmc_log_all_process_mappings(po);
- po->po_logprocmaps = 1;
+ /*
+ * Log mapping information for all existing processes in the
+ * system. Subsequent mappings are logged as they happen;
+ * see pmc_process_mmap().
+ */
+ if (po->po_logprocmaps == 0) {
+ pmc_log_all_process_mappings(po);
+ po->po_logprocmaps = 1;
+ }
}
/*
==== //depot/projects/scottl-camlock/src/sys/kern/kern_resource.c#18 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.195 2010/03/03 21:46:51 rrs Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.196 2010/05/01 14:46:17 kib Exp $");
#include "opt_compat.h"
@@ -76,6 +76,7 @@
struct timeval *up, struct timeval *sp);
static int donice(struct thread *td, struct proc *chgp, int n);
static struct uidinfo *uilookup(uid_t uid);
+static void ruxagg_tlock(struct proc *p, struct thread *td);
/*
* Resource controls and accounting.
@@ -629,9 +630,7 @@
return;
PROC_SLOCK(p);
FOREACH_THREAD_IN_PROC(p, td) {
- thread_lock(td);
- ruxagg(&p->p_rux, td);
- thread_unlock(td);
+ ruxagg_tlock(p, td);
}
PROC_SUNLOCK(p);
if (p->p_rux.rux_runtime > p->p_cpulimit * cpu_tickrate()) {
@@ -842,9 +841,7 @@
FOREACH_THREAD_IN_PROC(p, td) {
if (td->td_incruntime == 0)
continue;
- thread_lock(td);
- ruxagg(&p->p_rux, td);
- thread_unlock(td);
+ ruxagg_tlock(p, td);
}
calcru1(p, &p->p_rux, up, sp);
}
@@ -945,10 +942,7 @@
}
int
-kern_getrusage(td, who, rup)
- struct thread *td;
- int who;
- struct rusage *rup;
+kern_getrusage(struct thread *td, int who, struct rusage *rup)
{
struct proc *p;
int error;
@@ -1022,6 +1016,15 @@
td->td_sticks = 0;
}
+static void
+ruxagg_tlock(struct proc *p, struct thread *td)
+{
+
+ thread_lock(td);
+ ruxagg(&p->p_rux, td);
+ thread_unlock(td);
+}
+
/*
* Update the rusage_ext structure and fetch a valid aggregate rusage
* for proc p if storage for one is supplied.
@@ -1036,9 +1039,7 @@
*ru = p->p_ru;
if (p->p_numthreads > 0) {
FOREACH_THREAD_IN_PROC(p, td) {
- thread_lock(td);
- ruxagg(&p->p_rux, td);
- thread_unlock(td);
+ ruxagg_tlock(p, td);
rucollect(ru, &td->td_ru);
}
}
==== //depot/projects/scottl-camlock/src/sys/kern/uipc_mbuf.c#18 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.185 2009/06/22 22:20:38 andre Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.186 2010/05/01 18:34:50 zec Exp $");
#include "opt_param.h"
#include "opt_mbuf_stress_test.h"
@@ -948,9 +948,8 @@
len = 0;
}
}
- m = mp;
if (mp->m_flags & M_PKTHDR)
- m->m_pkthdr.len -= (req_len - len);
+ mp->m_pkthdr.len -= (req_len - len);
} else {
/*
* Trim from tail. Scan the mbuf chain,
==== //depot/projects/scottl-camlock/src/sys/mips/conf/AR71XX#6 (text+ko) ====
@@ -1,7 +1,7 @@
#
# AR71XX -- Kernel configuration file for FreeBSD/mips for Atheros 71xx systems
#
-# $FreeBSD: src/sys/mips/conf/AR71XX,v 1.5 2010/03/29 22:03:55 imp Exp $
+# $FreeBSD: src/sys/mips/conf/AR71XX,v 1.7 2010/05/01 16:39:46 imp Exp $
#
ident AR71XX
@@ -29,11 +29,11 @@
# options NFS_LEGACYRPC
# Debugging for use in -current
-# options DEADLKRES
-# options INVARIANTS
-# options INVARIANT_SUPPORT
-# options WITNESS
-# options WITNESS_SKIPSPIN
+options DEADLKRES
+options INVARIANTS
+options INVARIANT_SUPPORT
+options WITNESS
+options WITNESS_SKIPSPIN
options FFS #Berkeley Fast Filesystem
options SOFTUPDATES #Enable FFS soft updates support
options UFS_ACL #Support for access control lists
@@ -62,6 +62,7 @@
options ATH_DEBUG
device ath_hal
option AH_SUPPORT_AR5416
+option AH_RXCFG_SDMAMW_4BYTES # See NOTES for details of this WAR
device ath_rate_sample
device mii
==== //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#31 (text+ko) ====
@@ -63,7 +63,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.428 2010/04/18 22:32:07 jmallett Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.429 2010/05/02 01:25:03 alc Exp $");
#include
#include
@@ -1412,7 +1412,11 @@
}
result = vm_map_insert(map, object, offset, start, start +
length, prot, max, cow);
- } while (result == KERN_NO_SPACE && find_space == VMFS_ALIGNED_SPACE);
+ } while (result == KERN_NO_SPACE && (find_space == VMFS_ALIGNED_SPACE
+#ifdef VMFS_TLB_ALIGNED_SPACE
+ || find_space == VMFS_TLB_ALIGNED_SPACE
+#endif
+ ));
vm_map_unlock(map);
return (result);
}
==== //depot/projects/scottl-camlock/src/usr.bin/pathchk/pathchk.1#2 (text+ko) ====
@@ -25,9 +25,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/usr.bin/pathchk/pathchk.1,v 1.5 2005/01/18 13:43:52 ru Exp $
+.\" $FreeBSD: src/usr.bin/pathchk/pathchk.1,v 1.7 2010/05/01 22:10:45 jilles Exp $
.\"
-.Dd May 21, 2002
+.Dd May 1, 2010
.Dt PATHCHK 1
.Os
.Sh NAME
@@ -35,7 +35,7 @@
.Nd check pathnames
.Sh SYNOPSIS
.Nm
-.Op Fl p
+.Op Fl pP
.Ar pathname ...
.Sh DESCRIPTION
The
@@ -95,6 +95,16 @@
.Pq Ql \&-
character.
.El
+.It Fl P
+In addition to the default or
+.Fl p
+checks, write a diagnostic for each argument that:
+.Bl -bullet
+.It
+Is empty.
+.It
+Contains a component that starts with a hyphen.
+.El
.El
.Sh EXIT STATUS
.Ex -std
@@ -104,7 +114,7 @@
.Tn POSIX
systems:
.Pp
-.Dl "find . -print | xargs pathchk -p"
+.Dl "find . -exec pathchk -p -- {} +"
.Sh SEE ALSO
.Xr getconf 1 ,
.Xr pathconf 2 ,
==== //depot/projects/scottl-camlock/src/usr.bin/pathchk/pathchk.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/usr.bin/pathchk/pathchk.c,v 1.5 2005/05/21 09:55:07 ru Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/pathchk/pathchk.c,v 1.6 2010/05/01 22:00:28 jilles Exp $");
#include
#include
@@ -51,6 +51,7 @@
static void usage(void);
static int pflag; /* Perform portability checks */
+static int Pflag; /* Check for empty paths, leading '-' */
int
main(int argc, char *argv[])
@@ -58,11 +59,14 @@
int ch, rval;
const char *arg;
- while ((ch = getopt(argc, argv, "p")) > 0) {
+ while ((ch = getopt(argc, argv, "pP")) > 0) {
switch (ch) {
case 'p':
pflag = 1;
break;
+ case 'P':
+ Pflag = 1;
+ break;
default:
usage();
/*NOTREACHED*/
@@ -102,6 +106,15 @@
p = pathd;
+ if (Pflag && *p == '\0') {
+ warnx("%s: empty pathname", path);
+ goto bad;
+ }
+ if ((Pflag || pflag) && (*p == '-' || strstr(p, "/-") != NULL)) {
+ warnx("%s: contains a component starting with '-'", path);
+ goto bad;
+ }
+
if (!pflag) {
errno = 0;
namemax = pathconf(*p == '/' ? "/" : ".", _PC_NAME_MAX);
@@ -182,9 +195,6 @@
"0123456789._-";
long s;
- if (*path == '-')
- return (*path);
-
s = strspn(path, charset);
if (path[s] != '\0')
return (path[s]);
From owner-p4-projects@FreeBSD.ORG Sun May 2 19:39:02 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6AC691065673; Sun, 2 May 2010 19:39:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 2EF9B106564A
for ; Sun, 2 May 2010 19:39:02 +0000 (UTC)
(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
by mx1.freebsd.org (Postfix) with ESMTP id 1BDF98FC15
for ; Sun, 2 May 2010 19:39:02 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o42Jd27u063423
for ; Sun, 2 May 2010 19:39:02 GMT
(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o42Jd1GD063421
for perforce@freebsd.org; Sun, 2 May 2010 19:39:01 GMT
(envelope-from mav@freebsd.org)
Date: Sun, 2 May 2010 19:39:01 GMT
Message-Id: <201005021939.o42Jd1GD063421@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
mav@freebsd.org using -f
From: Alexander Motin
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 177615 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 02 May 2010 19:39:02 -0000
http://p4web.freebsd.org/@@177615?ac=10
Change 177615 by mav@mav_mavbook on 2010/05/02 19:38:39
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.8#13 integrate
.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#41 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#26 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/files.mv#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#36 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#89 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#42 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#58 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#75 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#24 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#112 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#40 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/quicc/quicc_bfe.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#48 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_ns8250.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vnops.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#36 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/cavium/uart_dev_oct16550.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#51 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/interrupt.S#6 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#34 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_object.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#28 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.8#13 (text+ko) ====
@@ -25,9 +25,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.49 2010/01/20 13:31:12 mav Exp $
+.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.50 2010/05/02 11:36:27 mav Exp $
.\"
-.Dd January 20, 2010
+.Dd May 2, 2010
.Dt CAMCONTROL 8
.Os
.Sh NAME
@@ -123,6 +123,8 @@
.Op generic args
.Aq Fl a Ar cmd Op args
.Aq Fl c Ar cmd Op args
+.Op Fl d
+.Op Fl f
.Op Fl i Ar len Ar fmt
.Bk -words
.Op Fl o Ar len Ar fmt Op args
@@ -530,6 +532,10 @@
.It Fl c Ar cmd Op args
This specifies the SCSI CDB.
SCSI CDBs may be 6, 10, 12 or 16 bytes.
+.It Fl d
+Specifies DMA protocol to be used for ATA command.
+.It Fl f
+Specifies FPDMA (NCQ) protocol to be used for ATA command.
.It Fl i Ar len Ar fmt
This specifies the amount of data to read, and how it should be displayed.
If the format is
==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#41 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.74 2010/02/22 10:45:40 mav Exp $");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.76 2010/05/02 12:07:47 mav Exp $");
#include
#include
@@ -4369,7 +4369,7 @@
" [-P pagectl][-e | -b][-d]\n"
" camcontrol cmd [dev_id][generic args]\n"
" <-a cmd [args] | -c cmd [args]>\n"
-" [-i len fmt|-o len fmt [args]] [-r fmt]\n"
+" [-d] [-f] [-i len fmt|-o len fmt [args]] [-r fmt]\n"
" camcontrol debug [-I][-P][-T][-S][-X][-c]\n"
" \n"
" camcontrol tags [dev_id][generic args] [-N tags] [-q] [-v]\n"
==== //depot/projects/scottl-camlock/src/share/man/man4/Makefile#26 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.477 2010/04/14 21:27:48 yongari Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.478 2010/05/02 19:28:30 mav Exp $
MAN= aac.4 \
acpi.4 \
==== //depot/projects/scottl-camlock/src/sys/arm/mv/files.mv#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/arm/mv/files.mv,v 1.6 2009/06/24 15:41:18 raj Exp $
+# $FreeBSD: src/sys/arm/mv/files.mv,v 1.7 2010/05/02 19:28:30 mav Exp $
#
# The Marvell CPU cores
# - Compliant with V5TE architecture
==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#36 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_pmp.c,v 1.7 2010/02/02 18:03:21 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_pmp.c,v 1.8 2010/05/02 12:07:47 mav Exp $");
#include
==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#89 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.29 2010/04/30 07:56:21 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.30 2010/05/02 12:07:47 mav Exp $");
#include
#include
==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#42 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.44 2010/02/02 11:09:28 mav Exp $
+ * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.45 2010/05/02 12:07:47 mav Exp $
*/
#ifndef _CAM_CAM_CCB_H
==== //depot/projects/scottl-camlock/src/sys/conf/NOTES#58 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1582 2010/05/01 16:36:14 imp Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1583 2010/05/02 19:28:30 mav Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
==== //depot/projects/scottl-camlock/src/sys/conf/files#75 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1514 2010/04/28 22:25:27 jkim Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1515 2010/05/02 19:28:30 mav Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
==== //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#24 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/sys/conf/kmod.mk,v 1.232 2010/04/22 09:24:01 netchild Exp $
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.233 2010/05/02 19:28:30 mav Exp $
#
# The include file handles building and installing loadable
# kernel modules.
==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#112 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.33 2010/04/30 08:02:12 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.35 2010/05/02 14:46:05 mav Exp $");
#include
#include
@@ -340,6 +340,7 @@
rman_fini(&ctlr->sc_iomem);
return (error);
}
+ pci_enable_busmaster(dev);
/* Reset controller */
if ((error = ahci_ctlr_reset(dev)) != 0) {
bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, ctlr->r_mem);
==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#40 (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/sys/dev/ahci/ahci.h,v 1.11 2010/02/14 12:30:35 mav Exp $
+ * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.12 2010/05/02 12:07:47 mav Exp $
*/
/* ATA register defines */
==== //depot/projects/scottl-camlock/src/sys/dev/quicc/quicc_bfe.h#2 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/quicc/quicc_bfe.h,v 1.1 2008/03/03 18:20:16 raj Exp $
+ * $FreeBSD: src/sys/dev/quicc/quicc_bfe.h,v 1.2 2010/05/02 19:05:57 marius Exp $
*/
#ifndef _DEV_QUICC_BFE_H_
@@ -50,7 +50,6 @@
u_int sc_clock;
int sc_fastintr:1;
- int sc_leaving:1;
int sc_polled:1;
};
==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#48 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.25 2010/04/30 08:22:47 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.26 2010/05/02 12:07:47 mav Exp $");
#include
#include
==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#18 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/siis/siis.h,v 1.9 2010/02/02 11:09:28 mav Exp $
+ * $FreeBSD: src/sys/dev/siis/siis.h,v 1.10 2010/05/02 12:07:47 mav Exp $
*/
/* ATA register defines */
==== //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_ns8250.c#13 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.30 2009/04/08 00:14:06 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.31 2010/05/02 19:07:19 marius Exp $");
#include
#include
@@ -604,7 +604,7 @@
if (ipend == 0)
ns8250_clrint(bas);
uart_unlock(sc->sc_hwmtx);
- return ((sc->sc_leaving) ? 0 : ipend);
+ return (ipend);
}
static int
==== //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vnops.c#10 (text+ko) ====
@@ -34,7 +34,7 @@
* tmpfs vnode interface.
*/
#include
-__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vnops.c,v 1.34 2009/10/11 07:03:56 delphij Exp $");
+__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vnops.c,v 1.35 2010/05/02 17:33:46 alc Exp $");
#include
#include
@@ -516,8 +516,16 @@
lookupvpg:
if (((m = vm_page_lookup(vobj, idx)) != NULL) &&
vm_page_is_valid(m, offset, tlen)) {
- if (vm_page_sleep_if_busy(m, FALSE, "tmfsmr"))
+ if ((m->oflags & VPO_BUSY) != 0) {
+ /*
+ * Reference the page before unlocking and sleeping so
+ * that the page daemon is less likely to reclaim it.
+ */
+ vm_page_lock_queues();
+ vm_page_flag_set(m, PG_REFERENCED);
+ vm_page_sleep(m, "tmfsmr");
goto lookupvpg;
+ }
vm_page_busy(m);
VM_OBJECT_UNLOCK(vobj);
error = uiomove_fromphys(&m, offset, tlen, uio);
@@ -526,8 +534,16 @@
VM_OBJECT_UNLOCK(vobj);
return (error);
} else if (m != NULL && uio->uio_segflg == UIO_NOCOPY) {
- if (vm_page_sleep_if_busy(m, FALSE, "tmfsmr"))
+ if ((m->oflags & VPO_BUSY) != 0) {
+ /*
+ * Reference the page before unlocking and sleeping so
+ * that the page daemon is less likely to reclaim it.
+ */
+ vm_page_lock_queues();
+ vm_page_flag_set(m, PG_REFERENCED);
+ vm_page_sleep(m, "tmfsmr");
goto lookupvpg;
+ }
vm_page_busy(m);
VM_OBJECT_UNLOCK(vobj);
sched_pin();
@@ -627,8 +643,16 @@
lookupvpg:
if (((vpg = vm_page_lookup(vobj, idx)) != NULL) &&
vm_page_is_valid(vpg, offset, tlen)) {
- if (vm_page_sleep_if_busy(vpg, FALSE, "tmfsmw"))
+ if ((vpg->oflags & VPO_BUSY) != 0) {
+ /*
+ * Reference the page before unlocking and sleeping so
+ * that the page daemon is less likely to reclaim it.
+ */
+ vm_page_lock_queues();
+ vm_page_flag_set(vpg, PG_REFERENCED);
+ vm_page_sleep(vpg, "tmfsmw");
goto lookupvpg;
+ }
vm_page_busy(vpg);
vm_page_lock_queues();
vm_page_undirty(vpg);
==== //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#36 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.293 2010/03/19 10:46:54 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.294 2010/05/02 19:25:22 kib Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -2108,6 +2108,7 @@
mbstat.sf_iocnt++;
}
if (error) {
+ vm_page_lock(pg);
vm_page_lock_queues();
vm_page_unwire(pg, 0);
/*
@@ -2121,6 +2122,7 @@
vm_page_free(pg);
}
vm_page_unlock_queues();
+ vm_page_unlock(pg);
VM_OBJECT_UNLOCK(obj);
if (error == EAGAIN)
error = 0; /* not a real error */
==== //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#25 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.571 2010/04/30 00:46:43 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.573 2010/05/02 19:10:27 alc Exp $");
#include
#include
@@ -1563,7 +1563,6 @@
vm_page_t m;
VM_OBJECT_LOCK(bp->b_bufobj->bo_object);
- vm_page_lock_queues();
for (i = 0; i < bp->b_npages; i++) {
m = bp->b_pages[i];
bp->b_pages[i] = NULL;
@@ -1571,16 +1570,16 @@
* In order to keep page LRU ordering consistent, put
* everything on the inactive queue.
*/
+ vm_page_lock(m);
+ vm_page_lock_queues();
vm_page_unwire(m, 0);
/*
* We don't mess with busy pages, it is
* the responsibility of the process that
* busied the pages to deal with them.
*/
- if ((m->oflags & VPO_BUSY) || (m->busy != 0))
- continue;
-
- if (m->wire_count == 0) {
+ if ((m->oflags & VPO_BUSY) == 0 && m->busy == 0 &&
+ m->wire_count == 0) {
/*
* Might as well free the page if we can and it has
* no valid data. We also free the page if the
@@ -1595,8 +1594,9 @@
vm_page_try_to_cache(m);
}
}
+ vm_page_unlock_queues();
+ vm_page_unlock(m);
}
- vm_page_unlock_queues();
VM_OBJECT_UNLOCK(bp->b_bufobj->bo_object);
pmap_qremove(trunc_page((vm_offset_t) bp->b_data), bp->b_npages);
@@ -3024,8 +3024,17 @@
* vm_fault->getpages->cluster_read->allocbuf
*
*/
- if (vm_page_sleep_if_busy(m, FALSE, "pgtblk"))
+ if ((m->oflags & VPO_BUSY) != 0) {
+ /*
+ * Reference the page before unlocking
+ * and sleeping so that the page daemon
+ * is less likely to reclaim it.
+ */
+ vm_page_lock_queues();
+ vm_page_flag_set(m, PG_REFERENCED);
+ vm_page_sleep(m, "pgtblk");
continue;
+ }
/*
* We have a good page.
==== //depot/projects/scottl-camlock/src/sys/mips/cavium/uart_dev_oct16550.c#2 (text+ko) ====
@@ -55,7 +55,7 @@
#include
-__FBSDID("$FreeBSD: src/sys/mips/cavium/uart_dev_oct16550.c,v 1.2 2010/01/11 04:29:26 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/mips/cavium/uart_dev_oct16550.c,v 1.3 2010/05/02 19:07:19 marius Exp $");
#include
#include
@@ -644,12 +644,9 @@
if (ipend) octeon_led_run_wheel(&where1, 6 + device_get_unit(sc->sc_dev));
#endif
- return ((sc->sc_leaving) ? 0 : ipend);
+ return (ipend);
}
-
-
-
static int
oct16550_bus_param (struct uart_softc *sc, int baudrate, int databits,
int stopbits, int parity)
==== //depot/projects/scottl-camlock/src/sys/modules/Makefile#51 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.650 2010/04/14 20:45:33 yongari Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.651 2010/05/02 19:28:30 mav Exp $
.include
==== //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/interrupt.S#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/interrupt.S,v 1.11 2009/12/23 20:23:04 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/interrupt.S,v 1.12 2010/05/02 12:08:15 marius Exp $");
#include
#include
@@ -83,8 +83,11 @@
* The 2nd word points to code to execute and the 3rd is an argument
* to pass. Jump to it.
*/
- brnz,a,pt %g3, 1f
- nop
+ brnz,pt %g3, 1f
+ /*
+ * NB: Zeus CPUs set some undocumented bits in the first data word.
+ */
+ and %g3, IV_MAX - 1, %g3
jmpl %g4, %g0
nop
/* NOTREACHED */
==== //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#23 (text+ko) ====
@@ -60,7 +60,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.76 2010/04/30 21:20:14 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.77 2010/05/02 16:44:06 alc Exp $");
#include
#include
@@ -96,33 +96,33 @@
vm_page_t m_tmp;
struct vnode *vp;
struct mount *mp;
- int vfslocked, dirty;
+ int vfslocked;
- vm_page_lock(m);
- vm_page_lock_queues();
+ mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+ vm_page_lock_assert(m, MA_OWNED);
object = m->object;
if (!VM_OBJECT_TRYLOCK(object) &&
!vm_pageout_fallback_object_lock(m, next)) {
+ vm_page_unlock(m);
VM_OBJECT_UNLOCK(object);
- vm_page_unlock_queues();
- vm_page_unlock(m);
return (EAGAIN);
}
if (vm_page_sleep_if_busy(m, TRUE, "vpctw0")) {
VM_OBJECT_UNLOCK(object);
+ vm_page_lock_queues();
return (EBUSY);
}
vm_page_test_dirty(m);
if (m->dirty == 0 && m->hold_count == 0)
pmap_remove_all(m);
- if ((dirty = m->dirty) != 0) {
- vm_page_unlock_queues();
+ if (m->dirty != 0) {
vm_page_unlock(m);
if ((object->flags & OBJ_DEAD) != 0) {
VM_OBJECT_UNLOCK(object);
return (EAGAIN);
}
if (object->type == OBJT_VNODE) {
+ vm_page_unlock_queues();
vp = object->handle;
vm_object_reference_locked(object);
VM_OBJECT_UNLOCK(object);
@@ -136,19 +136,20 @@
VFS_UNLOCK_GIANT(vfslocked);
vm_object_deallocate(object);
vn_finished_write(mp);
+ vm_page_lock_queues();
return (0);
} else if (object->type == OBJT_SWAP ||
object->type == OBJT_DEFAULT) {
+ vm_page_unlock_queues();
m_tmp = m;
vm_pageout_flush(&m_tmp, 1, VM_PAGER_PUT_SYNC);
VM_OBJECT_UNLOCK(object);
+ vm_page_lock_queues();
return (0);
}
- } else if (m->hold_count == 0)
- vm_page_cache(m);
-
- if (dirty == 0) {
- vm_page_unlock_queues();
+ } else {
+ if (m->hold_count == 0)
+ vm_page_cache(m);
vm_page_unlock(m);
}
VM_OBJECT_UNLOCK(object);
@@ -167,11 +168,12 @@
if ((m->flags & PG_MARKER) != 0)
continue;
+ if (!vm_page_trylock(m))
+ continue;
KASSERT(VM_PAGE_INQUEUE2(m, queue),
("vm_contig_launder: page %p's queue is not %d", m, queue));
- vm_page_unlock_queues();
error = vm_contig_launder_page(m, &next);
- vm_page_lock_queues();
+ vm_page_lock_assert(m, MA_NOTOWNED);
if (error == 0)
return (TRUE);
if (error == EBUSY)
==== //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#34 (text+ko) ====
@@ -72,7 +72,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.269 2010/04/30 16:20:14 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.270 2010/05/02 17:33:46 alc Exp $");
#include "opt_vm.h"
@@ -338,6 +338,12 @@
* to pmap it.
*/
if ((fs.m->oflags & VPO_BUSY) || fs.m->busy) {
+ /*
+ * Reference the page before unlocking and
+ * sleeping so that the page daemon is less
+ * likely to reclaim it.
+ */
+ vm_page_flag_set(fs.m, PG_REFERENCED);
vm_page_unlock_queues();
vm_page_unlock(fs.m);
VM_OBJECT_UNLOCK(fs.object);
==== //depot/projects/scottl-camlock/src/sys/vm/vm_object.c#25 (text+ko) ====
@@ -63,7 +63,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.416 2010/04/30 22:31:37 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.417 2010/05/02 18:09:33 alc Exp $");
#include "opt_vm.h"
@@ -1454,7 +1454,6 @@
* not be changed by this operation.
*/
if ((m->oflags & VPO_BUSY) || m->busy) {
- vm_page_unlock_queues();
VM_OBJECT_UNLOCK(new_object);
m->oflags |= VPO_WANTED;
msleep(m, VM_OBJECT_MTX(orig_object), PVM, "spltwt", 0);
==== //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#28 (text+ko) ====
@@ -98,7 +98,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.386 2010/04/30 02:46:49 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.387 2010/05/02 17:33:46 alc Exp $");
#include "opt_vm.h"
@@ -599,7 +599,7 @@
/*
* vm_page_sleep:
*
- * Sleep and release the page queues lock.
+ * Sleep and release the page and page queues locks.
*
* The object containing the given page must be locked.
*/
@@ -608,13 +608,10 @@
{
VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
- if (!mtx_owned(vm_page_lockptr(m)))
- vm_page_lock(m);
- if (!mtx_owned(&vm_page_queue_mtx))
- vm_page_lock_queues();
- vm_page_flag_set(m, PG_REFERENCED);
- vm_page_unlock_queues();
- vm_page_unlock(m);
+ if (mtx_owned(&vm_page_queue_mtx))
+ vm_page_unlock_queues();
+ if (mtx_owned(vm_page_lockptr(m)))
+ vm_page_unlock(m);
/*
* It's possible that while we sleep, the page will get
@@ -1896,7 +1893,17 @@
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
retrylookup:
if ((m = vm_page_lookup(object, pindex)) != NULL) {
- if (vm_page_sleep_if_busy(m, TRUE, "pgrbwt")) {
+ if ((m->oflags & VPO_BUSY) != 0 || m->busy != 0) {
+ if ((allocflags & VM_ALLOC_RETRY) != 0) {
+ /*
+ * Reference the page before unlocking and
+ * sleeping so that the page daemon is less
+ * likely to reclaim it.
+ */
+ vm_page_lock_queues();
+ vm_page_flag_set(m, PG_REFERENCED);
+ }
+ vm_page_sleep(m, "pgrbwt");
if ((allocflags & VM_ALLOC_RETRY) == 0)
return (NULL);
goto retrylookup;
From owner-p4-projects@FreeBSD.ORG Sun May 2 22:23:55 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 3E2751065673; Sun, 2 May 2010 22:23:55 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 02B4A1065672
for ; Sun, 2 May 2010 22:23:55 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
by mx1.freebsd.org (Postfix) with ESMTP id E37BF8FC0C
for ; Sun, 2 May 2010 22:23:54 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o42MNslt089248
for ; Sun, 2 May 2010 22:23:54 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o42MNsqw089246
for perforce@freebsd.org; Sun, 2 May 2010 22:23:54 GMT
(envelope-from pgj@FreeBSD.org)
Date: Sun, 2 May 2010 22:23:54 GMT
Message-Id: <201005022223.o42MNsqw089246@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 177624 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 02 May 2010 22:23:55 -0000
http://p4web.freebsd.org/@@177624?ac=10
Change 177624 by pgj@Binturong on 2010/05/02 22:23:09
IFC
Affected files ...
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#42 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#40 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/romain.key#1 branch
.. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#101 integrate
.. //depot/projects/docproj_hu/www/share/sgml/events.xml#27 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#96 integrate
.. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/gdb/gdbserver/fbsd-powerpc-low.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/gdb/gdbserver/fbsd-ppc-low.c#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/gdb/gdbserver/reg-amd64.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/gdb/gdbserver/reg-powerpc.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/gdb/gdbserver/reg-ppc.c#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/gdb/gdbserver/reg-x86-64.c#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpkg/Makefile#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpkg/deps.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpkg/exec.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpkg/file.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpkg/global.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpkg/match.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpkg/msg.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpkg/pen.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpkg/pkg.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpkg/pkgwrap.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpkg/plist.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpkg/str.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpkg/url.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpkg/version.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sbin/fsck_ffs/suj.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sbin/geom/class/sched/Makefile#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sbin/geom/class/sched/geom_sched.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sbin/geom/class/sched/gsched.8#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/mvs.4#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/sge.4#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/aslrestype1i.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/aslrestype2d.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/aslrestype2e.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/aslrestype2q.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/aslrestype2w.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/events/evgpeinit.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/events/evgpeutil.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/io/iodev.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mvs/mvs.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mvs/mvs.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mvs/mvs_if.m#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mvs/mvs_pci.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mvs/mvs_soc.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sge/if_sge.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sge/if_sgereg.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/sched/README#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/sched/g_sched.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/sched/g_sched.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/sched/gs_rr.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/sched/gs_scheduler.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/sched/subr_disk.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/cavium/dev/rgmii/octeon_fau.c#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/cavium/octeon_mp.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/archtype.h#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/defs.h#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/psl.h#3 delete
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/queue.h#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/rm7000.h#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/segments.h#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/copystr.S#3 delete
.. //depot/projects/soc2009/pgj_libstat/src/sys/modules/geom/geom_sched/Makefile#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/modules/geom/geom_sched/Makefile.inc#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/modules/geom/geom_sched/gs_sched/Makefile#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/modules/geom/geom_sched/gsched_rr/Makefile#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/modules/mvs/Makefile#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/modules/sge/Makefile#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/include/mcntl.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/zeus.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/expansion/plus-minus3.0#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/expansion/trim3.0#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/parameters/pwd1.0#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/regression/bin/sh/parameters/pwd2.0#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/regression/lib/libc/gen/test-fnmatch.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/README.txt#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/fail.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/fail.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/random.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/random.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/slowfloat-32.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/slowfloat-64.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/slowfloat.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/slowfloat.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/sparc64/Makefile#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/sparc64/fpu_emul.S#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/sparc64/fpu_reg.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/sparc64/fpu_util.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/sparc64/libc_private.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/sparc64/milieu.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/sparc64/namespace.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/sparc64/softfloat.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/sparc64/sparc64.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/sparc64/systflags.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/sparc64/systfloat.S#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/sparc64/systfloat.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/sparc64/systmodes.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/sparc64/un-namespace.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/systemBugs.txt#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/systflags.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/systfloat.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/systmodes.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/testCases.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/testCases.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/testFunction.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/testFunction.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/testLoops.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/testLoops.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/testfloat-history.txt#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/testfloat-source.txt#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/testfloat.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/testfloat.txt#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/testsoftfloat.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/writeHex.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/tools/test/testfloat/writeHex.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/pkg_install/lib/Makefile#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/pkg_install/lib/deps.c#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/pkg_install/lib/exec.c#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/pkg_install/lib/file.c#3 delete
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/pkg_install/lib/global.c#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/pkg_install/lib/lib.h#5 delete
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/pkg_install/lib/match.c#3 delete
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/pkg_install/lib/msg.c#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/pkg_install/lib/pen.c#4 delete
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/pkg_install/lib/pkgwrap.c#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/pkg_install/lib/plist.c#4 delete
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/pkg_install/lib/str.c#2 delete
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/pkg_install/lib/url.c#4 delete
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/pkg_install/lib/version.c#2 delete
Differences ...
==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#42 (text+ko) ====
@@ -1,7 +1,7 @@
@@ -1391,6 +1391,11 @@
&pgpkey.tota;
+
+ &a.romain;
+ &pgpkey.romain;
+
+
&a.sylvio;
&pgpkey.sylvio;
==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#40 (text+ko) ====
@@ -1,5 +1,5 @@
-
+
@@ -261,6 +261,7 @@
+
==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#101 (text+ko) ====
@@ -5,13 +5,13 @@
- $FreeBSD: www/hu/share/sgml/news.xml,v 1.47 2010/04/21 20:09:58 pgj Exp $
+ $FreeBSD: www/hu/share/sgml/news.xml,v 1.48 2010/04/25 21:19:44 pgj Exp $
@@ -22,6 +22,31 @@
4
+ 22
+
+
+ Negyedéves helyzetjelentés: 2010
+ január — március
+
+ Mostantól elérhetõ
+ a 2010 januártól márciusig tartó
+ idõszakról szóló, 46
+ bejegyzést tartalmazó negyedéves
+ helyzetjelentés.
+
+
+
+
+ 20
+
+
+ Új tag: Randi
+ Harper (src)
+
+
+
+
19
@@ -319,7 +344,7 @@
tartó idõszakot összefoglaló, 38
bejegyzést tartalmazó negyedéves
helyzetjelentés immáron elérhetõ.
+ href="&enbase;/news/status/report-2009-10-2009-12.html">elérhetõ.
==== //depot/projects/docproj_hu/www/share/sgml/events.xml#27 (text+ko) ====
@@ -10,7 +10,7 @@
- $FreeBSD: www/share/sgml/events.xml,v 1.82 2010/02/20 11:22:05 brueffer Exp $
+ $FreeBSD: www/share/sgml/events.xml,v 1.83 2010/04/28 11:37:13 danger Exp $
@@ -111,6 +111,31 @@
track, tutorials, and FreeBSD developer summit.
+
+ meetBSD 2010
+ http://www.meetBSD.org/
+
+ 2010
+ 7
+ 2
+
+
+ 2010
+ 7
+ 3
+
+
+ Poland
+ Krakow
+ Jagiellonian University
+
+ meetBSD is an annual event gathering users and developers of
+ the BSD operating systems family, mostly &os;, NetBSD and OpenBSD.
+ After the special California edition for the 10th FreeBSD anniversary,
+ meetBSD Wintercamp in Livigno, this year we are back to Krakow,
+ Poland.
+
+
11th Libre Software Meeting
http://2010.rmll.info/
==== //depot/projects/docproj_hu/www/share/sgml/news.xml#96 (text+ko) ====
@@ -25,7 +25,7 @@
- $FreeBSD: www/share/sgml/news.xml,v 1.315 2010/04/24 23:29:19 danger Exp $
+ $FreeBSD: www/share/sgml/news.xml,v 1.316 2010/04/30 07:15:32 mm Exp $
@@ -36,6 +36,16 @@
4
+ 29
+
+
+ Enhanced commit privileges: Martin Matuška
+ (src, ports)
+
+
+
+
22
From owner-p4-projects@FreeBSD.ORG Sun May 2 23:02:39 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 482661065673; Sun, 2 May 2010 23:02:39 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 0B5B1106564A
for ; Sun, 2 May 2010 23:02:39 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
by mx1.freebsd.org (Postfix) with ESMTP id EBA288FC19
for ; Sun, 2 May 2010 23:02:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o42N2cfV092097
for ; Sun, 2 May 2010 23:02:38 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o42N2a96092091
for perforce@freebsd.org; Sun, 2 May 2010 23:02:36 GMT
(envelope-from pgj@FreeBSD.org)
Date: Sun, 2 May 2010 23:02:36 GMT
Message-Id: <201005022302.o42N2a96092091@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 177628 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 02 May 2010 23:02:39 -0000
http://p4web.freebsd.org/@@177628?ac=10
Change 177628 by pgj@Binturong on 2010/05/02 23:02:04
IFC
Affected files ...
.. //depot/projects/soc2009/pgj_libstat/src/Makefile.inc1#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/ObsoleteFiles.inc#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/UPDATING#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/ln/ln.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/ln/symlink.7#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/ps/ps.1#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/pwait/pwait.1#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/sh/arith.y#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/sh/arith_lex.l#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/sh/cd.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/sh/cd.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/sh/expand.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/sh/main.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/sh/mksyntax.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/sh/parser.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/binutils/bfd/config.bfd#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/com_err/compile_et.1#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/netcat/nc.1#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/netcat/netcat.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/telnet/telnet/commands.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/telnet/telnet/externs.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/telnet/telnet/network.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/telnet/telnet/sys_bsd.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/telnet/telnet/telnet.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/telnet/telnet/terminal.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/top/utils.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/africa#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/asia#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/contrib/tzdata/southamerica#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ChangeLog#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/README#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth-options.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/auth2-pubkey.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/channels.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/clientloop.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/config.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/config.h.in#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/defines.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/key.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/key.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/loginrec.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/logintest.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/openbsd-compat/bsd-arc4random.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/servconf.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/session.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-keygen.1#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-keygen.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh-pkcs11-helper.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh.1#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh_config#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/ssh_config.5#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshd_config#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/sshd_config.5#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/crypto/openssh/version.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/defaults/rc.conf#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/devd.conf#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/devd/uath.conf#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/mtree/BSD.include.dist#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/mtree/BSD.usr.dist#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/Makefile#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/named#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/routing#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.firewall#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.subr#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/gdb/Makefile#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/gdb/gdbserver/Makefile#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/include/stdlib.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/Makefile#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/check_utility_compat.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/confstr.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/dladdr.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/dlinfo.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/dllockinit.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/dlopen.3#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/fmtcheck.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/fnmatch.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/frexp.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/ftok.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/getcwd.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/getutxent.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/setproctitle.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/stringlist.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/sysconf.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/sysctl.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/locale/isalnum.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/locale/isalpha.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/posix1e/mac_prepare.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/softfloat/softfloat-specialize#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdlib/hcreate.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdlib/ptsname.3#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdlib/realpath.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/stdlib/realpath.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/sys/sigaction.2#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/sys/unlink.2#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libcam/cam.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libcam/cam_cdbparse.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libcompat/4.1/cftime.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libcompat/4.4/cuserid.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libedit/editline.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libedit/editrc.5#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_begin.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_cntl.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_end.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_errmsg.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_fill.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_flagdata.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_getarhdr.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_getarsym.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_getbase.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_getdata.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_getident.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_getphnum.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_getscn.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_getshnum.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_getshstrndx.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_hash.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_kind.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_memory.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_next.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_rand.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_rawfile.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_strptr.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_update.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/elf_version.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_checksum.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_fsize.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_getcap.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_getclass.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_getdyn.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_getehdr.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_getmove.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_getphdr.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_getrel.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_getrela.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_getshdr.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_getsym.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_getsyminfo.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_getsymshndx.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_newehdr.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_newphdr.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_update_ehdr.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libelf/gelf_xlatetof.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_accept_sec_context.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_acquire_cred.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_add_cred.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_add_oid_set_member.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_canonicalize_name.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_compare_name.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_context_time.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_create_empty_oid_set.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_delete_sec_context.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_display_name.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_display_status.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_duplicate_name.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_export_name.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_export_sec_context.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_get_mic.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_import_name.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_import_sec_context.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_indicate_mechs.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_init_sec_context.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_inquire_context.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_inquire_cred.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_inquire_cred_by_mech.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_inquire_mechs_for_name.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_inquire_names_for_mech.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_process_context_token.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_release_buffer.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_release_cred.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_release_name.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_release_oid_set.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_test_oid_set_member.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_unwrap.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_verify_mic.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_wrap.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libgssapi/gss_wrap_size_limit.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libkvm/kvm.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libmemstat/libmemstat.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/libpmc.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.atom.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.core.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.core2.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.corei7.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.corei7uc.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.iaf.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.k7.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.k8.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.p4.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.p5.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.p6.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.tsc.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.ucf.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.westmere.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc.westmereuc.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_allocate.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_attach.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_capabilities.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_configure_logfile.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_disable.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_event_names_of_class.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_get_driver_stats.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_get_msr.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_init.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_name_of_capability.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_read.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_set.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_start.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmclog.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libthr/libthr.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libufs/Makefile#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libufs/cgroup.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libufs/inode.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libufs/libufs.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libufs/sblock.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libufs/type.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libugidfw/bsde_get_rule.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libugidfw/bsde_get_rule_count.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libugidfw/bsde_parse_rule.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libugidfw/bsde_rule_to_string.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libugidfw/libugidfw.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libulog/ulog_login.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libulog/utempter_add_record.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/_secure_path.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/auth.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/hexdump.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/kinfo_getfile.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/kinfo_getvmmap.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/kld.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/login_auth.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/login_cap.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/login_class.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/login_ok.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/login_times.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/login_tty.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/property.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/pty.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/realhostname.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/realhostname_sa.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/trimdomain.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libutil/uucplock.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/ChangeLog#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/README#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/Symbol.map#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/crc32.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/deflate.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/deflate.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/gzguts.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/gzlib.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/inffast.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/inffast.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/inftrees.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/inftrees.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/minigzip.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/trees.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/trees.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/zconf.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/zlib.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/zlib.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/zutil.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libz/zutil.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/release/powerpc/boot_crunch.conf#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/camcontrol/camcontrol.8#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/camcontrol/camcontrol.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/devd/devd.conf.5#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/dumpfs/dumpfs.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/fsck_ffs/Makefile#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/fsck_ffs/fsck.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/fsck_ffs/gjournal.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/fsck_ffs/main.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/fsck_ffs/pass5.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/fsdb/fsdb.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/fsdb/fsdbutil.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/geom/class/Makefile#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/geom/class/part/geom_part.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/geom/class/part/gpart.8#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/geom/misc/subr.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastctl/Makefile#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/Makefile#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/hast.conf.5#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/hast.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/hast_proto.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/hastd.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/metadata.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/parse.y#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/pjdlog.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/primary.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/proto.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/proto.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/proto_common.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/proto_tcp4.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/secondary.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/hastd/token.l#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/ifconfig/ifconfig.8#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/ifconfig/ifconfig.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/ifconfig/ifieee80211.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/ipfw/dummynet.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/ipfw/ipfw2.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/ipfw/ipfw2.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/ipfw/main.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/iscontrol/iscsi.conf.5#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/mca/mca.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/ping6/ping6.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/ping6/ping6.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/spppcontrol/spppcontrol.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/tunefs/Makefile#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/tunefs/tunefs.8#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/tunefs/tunefs.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/examples/Makefile#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man1/builtin.1#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man3/sysexits.3#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man3/tgmath.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/Makefile#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/altq.4#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/audit.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/auditpipe.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/bwn.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/coda.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/gbde.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/geom.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/geom_fox.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/geom_linux_lvm.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/geom_uzip.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ipw.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/iscsi_initiator.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/iwi.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/iwn.4#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/kbdmux.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ktr.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/lp.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/mac.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/mac_biba.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/mac_bsdextended.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/mac_ifoff.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/mac_lomac.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/mac_mls.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/mac_none.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/mac_partition.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/mac_seeotheruids.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/mac_stub.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/mac_test.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/miibus.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/msk.4#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/netintro.4#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ng_netflow.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/orm.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ral.4#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/rp.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/rum.4#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/run.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/sched_4bsd.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/sched_ule.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/si.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/tap.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/uhso.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/upgt.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ural.4#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/vkbd.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/vlan.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/wpi.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/ar.5#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/rc.conf.5#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man7/clocks.7#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man7/maclabel.7#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man8/picobsd.8#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man8/rescue.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/CTASSERT.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/DELAY.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/KASSERT.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VFS.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VFS_CHECKEXP.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VFS_FHTOVP.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VFS_MOUNT.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VFS_QUOTACTL.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VFS_ROOT.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VFS_STATFS.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VFS_SYNC.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VFS_UNMOUNT.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VFS_VGET.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_ACCESS.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_ACLCHECK.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_ADVLOCK.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_ATTRIB.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_BWRITE.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_CREATE.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_FSYNC.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_GETACL.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_GETEXTATTR.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_GETPAGES.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_GETVOBJECT.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_INACTIVE.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_IOCTL.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_LINK.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_LISTEXTATTR.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_LOCK.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_LOOKUP.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_OPENCLOSE.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_PATHCONF.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_PRINT.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_RDWR.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_READDIR.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_READLINK.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_REALLOCBLKS.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_REMOVE.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_RENAME.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_REVOKE.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_SETACL.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_SETEXTATTR.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_STRATEGY.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_VPTOCNP.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/VOP_VPTOFH.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/accept_filter.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/accf_data.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/accf_dns.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/accf_http.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/acl.9#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/alq.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/atomic.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/cr_cansee.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/cr_seeothergids.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/cr_seeotheruids.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/devfs_set_cdevpriv.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/devtoname.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/extattr.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/firmware.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/hexdump.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/ieee80211.9#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/ieee80211_node.9#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/ifnet.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/make_dev.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/namei.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/p_candebug.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/p_cansee.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/pfind.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/pgfind.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/prison_check.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/random.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/rijndael.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/rtalloc.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/rtentry.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/sleep.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/spl.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/uio.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/usbdi.9#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/vaccess.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/vaccess_acl_nfs4.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/vaccess_acl_posix1e.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/vcount.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/vget.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/vm_map_entry_resize_free.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/vnode.9#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/vput.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/vref.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/vrefcnt.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man9/vrele.9#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/misc/committers-ports.dot#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/misc/committers-src.dot#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/mk/bsd.cpu.mk#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/mk/bsd.libnames.mk#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/bpf_jit_machdep.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/bpf_jit_machdep.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/exception.S#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/io.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/local_apic.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/machdep.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/pmap.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/trap.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/conf/GENERIC#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/ia32/ia32_signal.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/iodev.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/pmap.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/proc.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/include/vmparam.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/arm/pmap.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/DB-78XXX#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/DB-88F5XXX#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/DB-88F6XXX#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/HL200#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/KB920X#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/LN2410SBC#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/conf/SHEEVAPLUG#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/include/pmap.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/include/proc.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/mv/files.mv#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/boot/forth/loader.conf#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/boot/sparc64/loader/main.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_da.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_pmp.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_xpt.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_ccb.h#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_xpt.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/scsi/scsi_cd.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/compat/freebsd32/freebsd32.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/compat/freebsd32/freebsd32_misc.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/compat/freebsd32/freebsd32_util.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/compat/linprocfs/linprocfs.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/compat/x86bios/x86bios.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/conf/NOTES#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files.mips#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files.sparc64#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files.sun4v#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/conf/kern.pre.mk#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/conf/kmod.mk#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/conf/options#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/changes.txt#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/common/adisasm.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/aslcompile.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/asldefine.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/aslfiles.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/aslglobal.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/asllisting.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/aslmain.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/aslpredef.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/aslresource.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/compiler/asltypes.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/debugger/dbcmds.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/debugger/dbdisply.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/events/evgpe.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/events/evgpeblk.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/executer/exconfig.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/executer/exoparg1.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/executer/exsystem.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/include/acevents.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/include/acglobal.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/include/acinterp.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/include/aclocal.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/include/acpiosxf.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/include/acpixf.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/include/actypes.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/include/amlresrc.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/osunixxf.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/tables/tbfind.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/tables/tbinstal.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/tables/tbutils.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/tables/tbxface.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/utilities/utcopy.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/utilities/utglobal.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/dev/acpica/utilities/uttrack.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ddb/db_sym.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aac/aac.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aac/aac_cam.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aac/aac_debug.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aac/aac_disk.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aac/aac_pci.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aac/aac_tables.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aac/aacreg.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aac/aacvar.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/acpica/Osd/OsdHardware.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/age/if_age.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ahci/ahci.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ahci/ahci.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/alc/if_alc.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ale/if_ale.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-all.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-queue.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-acerlabs.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/atkbdc/atkbdc.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/atkbdc/atkbdc_ebus.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/atkbdc/atkbdc_isa.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/atkbdc/atkbdcreg.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bce/if_bce.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bce/if_bcereg.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bge/if_bge.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwn/if_bwn.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ciss/ciss.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/ati_pcigart.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/drmP.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/drm_bufs.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/drm_context.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/drm_drv.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/drm_hashtab.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/drm_memory.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/drm_mm.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/drm_scatter.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/drm_sman.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/drm_sysctl.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/drm_vm.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/i915_dma.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/mach64_dma.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/mga_dma.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/mga_warp.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/r128_cce.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/r128_state.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/r600_blit.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/r600_cp.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/radeon_cp.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/radeon_cs.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/radeon_state.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/savage_bci.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/via_dma.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/via_dmablit.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/via_map.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/via_mm.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/via_video.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/e1000/if_em.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/e1000/if_igb.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/e1000/if_lem.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/esp/esp_sbus.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fxp/if_fxp.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/hwpmc/hwpmc_core.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/hwpmc/pmc_events.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/io/iodev.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ipw/if_ipw.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ipw/if_ipwvar.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/iwn/if_iwn.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ixgbe/ixgbe.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mii/brgphy.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mii/e1000phy.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mii/miidevs#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mii/truephy.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mpt/mpt.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mpt/mpt.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mpt/mpt_cam.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mpt/mpt_pci.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/msk/if_msk.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/msk/if_mskreg.h#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mxge/if_mxge.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mxge/if_mxge_var.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/nfe/if_nfe.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/quicc/quicc_bfe.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/siis/siis.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/siis/siis.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sis/if_sis.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sound/pcm/buffer.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sound/usb/uaudio.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sym/sym_hipd.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/uart/uart_dev_ns8250.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/ehci.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/uhci.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/controller/uss820dci.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/input/atp.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/input/uhid.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/input/ukbd.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/input/ums.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/misc/udbp.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_aue.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_axe.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_cdce.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_cue.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_kue.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_rue.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/if_udav.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/u3g.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/ubsa.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/ubser.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uchcom.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uftdi.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/ulpt.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/umodem.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/umoscom.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uplcom.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/usb_serial.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uslcom.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uvisor.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/uvscom.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/storage/umass.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/storage/urio.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/storage/ustorage_fs.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_compat_linux.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_debug.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_dev.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_device.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_device.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_freebsd.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_generic.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_hub.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_request.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_transfer.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_transfer.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usbdevs#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_rum.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_run.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_ural.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_zyd.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/devfs/devfs_devs.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/devfs/devfs_int.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfs_commonkrpc.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfs_commonport.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfs_var.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfsclstate.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfs/nfsport.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clbio.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clnfsiod.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clnode.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clport.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clrpcops.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clstate.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clvfsops.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsclient/nfs_clvnops.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/nfsserver/nfs_nfsdstate.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/eli/g_eli.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/geom_io.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/geom_subr.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/part/g_part.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/part/g_part_apm.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/part/g_part_bsd.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/part/g_part_gpt.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/part/g_part_if.m#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/part/g_part_mbr.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/part/g_part_pc98.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/geom/part/g_part_vtoc8.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/conf/GENERIC#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/conf/XBOX#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/bpf_jit_machdep.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/bpf_jit_machdep.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/io.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/local_apic.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/machdep.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/pmap.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/trap.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/include/iodev.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/include/pmap.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/include/proc.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/xen/pmap.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/conf/GENERIC#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/iodev_machdep.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/mca.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/mp_machdep.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/pmap.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/iodev.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/mca.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/pal.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/pmap.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/proc.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/imgact_elf.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/init_main.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_alq.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_clock.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_descrip.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_exec.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_gzio.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_ktr.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_ntptime.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_proc.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_resource.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_shutdown.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_sig.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_bus.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_taskqueue.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_witness.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/sys_pipe.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/sys_process.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/uipc_cow.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/uipc_mbuf.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/uipc_syscalls.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_bio.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_cache.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_subr.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_syscalls.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/cavium/asm_octeon.S#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/cavium/dev/rgmii/octeon_fau.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/cavium/files.octeon1#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/cavium/octeon_machdep.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/cavium/octeon_pcmap_regs.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/cavium/uart_dev_oct16550.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/conf/AR71XX#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/conf/SENTRY5#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/conf/SWARM#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/conf/XLR#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/_inttypes.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/_limits.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/asm.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/cpu.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/cpufunc.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/cpuregs.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/db_machdep.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/param.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/pcb.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/pmap.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/proc.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/profile.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/pte.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/regnum.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/sf_buf.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/trap.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/include/vmparam.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/malta/gt_pci.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/autoconf.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/exception.S#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/fp.S#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/genassym.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/locore.S#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/machdep.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/mem.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/mp_machdep.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/mpboot.S#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/nexus.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/pmap.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/psraccess.S#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/support.S#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/swtch.S#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/tick.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/tlb.S#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/trap.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/uio_machdep.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/mips/vm_machdep.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/rmi/clock.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/sibyte/sb_machdep.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/modules/Makefile#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/modules/acpi/acpi/Makefile#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/modules/cyclic/Makefile#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/modules/geom/Makefile#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/modules/uart/Makefile#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/modules/usb/usb/Makefile#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/bpf.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/bpf_zerocopy.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/bpfdesc.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/flowtable.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/if.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_clone.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_gif.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_gif.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_llatbl.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/route.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/rtsock.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/vnet.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/vnet.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_amrr.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_freebsd.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_ht.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_node.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_rssadapt.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_scan_sta.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211_var.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_pipe.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/icmp6.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/if_ether.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/igmp.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/in.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/in_gif.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/in_proto.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/in_rmx.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_dummynet.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_icmp.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_icmp.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_input.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ip_var.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ipfw/dn_sched.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ipfw/dn_sched_rr.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ipfw/dn_sched_wf2q.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ipfw/ip_dn_private.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ipfw/ip_dummynet.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ipfw/ip_fw_pfil.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ipfw/ip_fw_private.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/raw_ip.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_asconf.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_indata.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctp_output.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/sctputil.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_hostcache.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_input.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_output.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_reass.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_sack.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_subr.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_timewait.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_var.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/udp_usrreq.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/udp_var.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/frag6.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/icmp6.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/in6.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/in6_gif.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/in6_ifattach.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/in6_proto.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/in6_rmx.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/in6_src.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/in6_var.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_input.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_mroute.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_var.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/nd6.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/nd6.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/nd6_nbr.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/nd6_rtr.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/raw_ip6.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/scope6.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ah_var.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/esp_var.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ipcomp_var.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ipip_var.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ipsec.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ipsec.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ipsec6.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/key.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_esp.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/pc98/cbus/clock.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/pc98/conf/GENERIC#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/pc98/pc98/machdep.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/mmu_oea.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/mmu_oea64.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/booke/pmap.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/conf/GENERIC#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/conf/MPC85XX#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/include/pmap.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/include/proc.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powerpc/mmu_if.m#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powerpc/pmap_dispatch.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/conf/GENERIC#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/include/asi.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/include/cache.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/include/lsu.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/include/ofw_machdep.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/include/pmap.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/include/proc.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/isa/isa.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/cache.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/cheetah.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/identcpu.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/interrupt.S#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/locore.S#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/machdep.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/mp_locore.S#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/mp_machdep.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/nexus.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/ofw_machdep.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/pmap.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sparc64/sparc64/tick.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sun4v/conf/GENERIC#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sun4v/include/ofw_machdep.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sun4v/include/pmap.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sun4v/include/proc.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sun4v/sun4v/pmap.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/_task.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/alq.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/buf.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/dtrace_bsd.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/mount.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/param.h#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/taskqueue.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/thr.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/user.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/ffs_alloc.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/ffs_balloc.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/ffs_extern.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/ffs_inode.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/ffs_softdep.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/ffs_subr.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/ffs_vfsops.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/ffs_vnops.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/fs.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ffs/softdep.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ufs/dinode.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ufs/inode.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ufs/ufs_dirhash.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ufs/ufs_extern.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ufs/ufs_lookup.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ufs/ufs_vnops.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ufs/ufs/ufsmount.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/device_pager.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/pmap.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/sg_pager.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/swap_pager.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/uma_core.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_contig.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_extern.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_fault.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_glue.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_kern.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_map.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_map.h#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_mmap.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_object.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_page.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_page.h#4 integrate
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sun May 2 23:08:45 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 85C4D1065675; Sun, 2 May 2010 23:08:45 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 4AB6A1065670
for ; Sun, 2 May 2010 23:08:45 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
by mx1.freebsd.org (Postfix) with ESMTP id 3915A8FC0C
for ; Sun, 2 May 2010 23:08:45 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o42N8jbS093519
for ; Sun, 2 May 2010 23:08:45 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o42N8j0X093517
for perforce@freebsd.org; Sun, 2 May 2010 23:08:45 GMT
(envelope-from pgj@FreeBSD.org)
Date: Sun, 2 May 2010 23:08:45 GMT
Message-Id: <201005022308.o42N8j0X093517@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 177629 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 02 May 2010 23:08:45 -0000
http://p4web.freebsd.org/@@177629?ac=10
Change 177629 by pgj@Binturong on 2010/05/02 23:07:55
IFC
Affected files ...
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mpt/mpt_cam.c#5 integrate
Differences ...
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/mpt/mpt_cam.c#5 (text+ko) ====
@@ -94,7 +94,7 @@
* OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.72 2010/04/27 18:06:54 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.73 2010/05/02 22:48:27 mjacob Exp $");
#include
#include
@@ -2575,6 +2575,10 @@
CAMLOCK_2_MPTLOCK(mpt);
break;
}
+ case MPI_EVENT_IR_RESYNC_UPDATE:
+ mpt_prt(mpt, "IR resync update %d completed\n",
+ (data0 >> 16) & 0xff);
+ break;
case MPI_EVENT_EVENT_CHANGE:
case MPI_EVENT_INTEGRATED_RAID:
case MPI_EVENT_SAS_DEVICE_STATUS_CHANGE:
From owner-p4-projects@FreeBSD.ORG Sun May 2 23:15:54 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id B539F1065670; Sun, 2 May 2010 23:15:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 784D5106566B
for ; Sun, 2 May 2010 23:15:54 +0000 (UTC)
(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
by mx1.freebsd.org (Postfix) with ESMTP id 64F0F8FC13
for ; Sun, 2 May 2010 23:15:54 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o42NFscV094057
for ; Sun, 2 May 2010 23:15:54 GMT
(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o42NFqGC094055
for perforce@freebsd.org; Sun, 2 May 2010 23:15:52 GMT
(envelope-from zec@fer.hr)
Date: Sun, 2 May 2010 23:15:52 GMT
Message-Id: <201005022315.o42NFqGC094055@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
zec@fer.hr using -f
From: Marko Zec
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 177631 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 02 May 2010 23:15:55 -0000
http://p4web.freebsd.org/@@177631?ac=10
Change 177631 by zec@zec_tpx32 on 2010/05/02 23:14:55
IFC @ 177626
Affected files ...
.. //depot/projects/vimage/src/share/man/man1/builtin.1#2 integrate
.. //depot/projects/vimage/src/share/man/man4/Makefile#20 integrate
.. //depot/projects/vimage/src/share/man/man4/bwn.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/msk.4#5 integrate
.. //depot/projects/vimage/src/share/man/man4/mvs.4#1 branch
.. //depot/projects/vimage/src/share/man/man4/sge.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/vlan.4#6 integrate
.. //depot/projects/vimage/src/share/man/man5/rc.conf.5#14 integrate
.. //depot/projects/vimage/src/share/man/man9/alq.9#2 integrate
.. //depot/projects/vimage/src/share/man/man9/ieee80211.9#5 integrate
.. //depot/projects/vimage/src/share/man/man9/ieee80211_node.9#5 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/io.c#3 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#38 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#20 integrate
.. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#39 integrate
.. //depot/projects/vimage/src/sys/amd64/include/iodev.h#4 integrate
.. //depot/projects/vimage/src/sys/amd64/include/pmap.h#12 integrate
.. //depot/projects/vimage/src/sys/amd64/include/proc.h#4 integrate
.. //depot/projects/vimage/src/sys/amd64/include/vmparam.h#10 integrate
.. //depot/projects/vimage/src/sys/arm/arm/pmap.c#26 integrate
.. //depot/projects/vimage/src/sys/arm/include/pmap.h#12 integrate
.. //depot/projects/vimage/src/sys/arm/include/proc.h#3 integrate
.. //depot/projects/vimage/src/sys/arm/mv/files.mv#7 integrate
.. //depot/projects/vimage/src/sys/boot/sparc64/loader/main.c#13 integrate
.. //depot/projects/vimage/src/sys/cam/ata/ata_da.c#5 integrate
.. //depot/projects/vimage/src/sys/cam/ata/ata_pmp.c#2 integrate
.. //depot/projects/vimage/src/sys/cam/ata/ata_xpt.c#5 integrate
.. //depot/projects/vimage/src/sys/cam/cam_ccb.h#8 integrate
.. //depot/projects/vimage/src/sys/cam/cam_xpt.c#25 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#4 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#10 integrate
.. //depot/projects/vimage/src/sys/compat/x86bios/x86bios.c#3 integrate
.. //depot/projects/vimage/src/sys/conf/NOTES#66 integrate
.. //depot/projects/vimage/src/sys/conf/files#83 integrate
.. //depot/projects/vimage/src/sys/conf/files.sparc64#21 integrate
.. //depot/projects/vimage/src/sys/conf/files.sun4v#12 integrate
.. //depot/projects/vimage/src/sys/conf/kmod.mk#15 integrate
.. //depot/projects/vimage/src/sys/conf/options#61 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/acpica_prep.sh#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/changes.txt#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/adisasm.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcompile.c#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#7 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asldefine.h#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslfiles.c#6 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslglobal.h#7 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asllisting.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslmain.c#7 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslpredef.c#2 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslresource.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslrestype1i.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslrestype2d.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslrestype2e.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslrestype2q.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslrestype2w.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asltypes.h#7 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/debugger/dbcmds.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/debugger/dbdisply.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evgpe.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evgpeblk.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evgpeinit.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evgpeutil.c#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exconfig.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exoparg1.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exsystem.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acevents.h#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acglobal.h#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acinterp.h#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/aclocal.h#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acpiosxf.h#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acpixf.h#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/actypes.h#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/amlresrc.h#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/osunixxf.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/tables/tbfind.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/tables/tbinstal.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/tables/tbutils.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/tables/tbxface.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/utcopy.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/utglobal.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/uttrack.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_auth.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/Osd/OsdHardware.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/ahci/ahci.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/ahci/ahci.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/ale/if_ale.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-all.c#19 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-queue.c#14 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/atkbdc/atkbdc.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/atkbdc/atkbdc_ebus.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/atkbdc/atkbdc_isa.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/atkbdc/atkbdcreg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#28 integrate
.. //depot/projects/vimage/src/sys/dev/bce/if_bcereg.h#19 integrate
.. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#27 integrate
.. //depot/projects/vimage/src/sys/dev/bwn/if_bwn.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ciss/ciss.c#20 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drmP.h#15 integrate
.. //depot/projects/vimage/src/sys/dev/drm/via_dmablit.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/via_video.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/if_em.c#21 integrate
.. //depot/projects/vimage/src/sys/dev/esp/esp_sbus.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_mod.c#17 integrate
.. //depot/projects/vimage/src/sys/dev/io/iodev.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/io/iodev.h#1 branch
.. //depot/projects/vimage/src/sys/dev/mii/brgphy.c#16 integrate
.. //depot/projects/vimage/src/sys/dev/mii/e1000phy.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/mii/miidevs#24 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt.h#13 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.c#18 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt_pci.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#25 integrate
.. //depot/projects/vimage/src/sys/dev/msk/if_mskreg.h#14 integrate
.. //depot/projects/vimage/src/sys/dev/mvs/mvs.c#1 branch
.. //depot/projects/vimage/src/sys/dev/mvs/mvs.h#1 branch
.. //depot/projects/vimage/src/sys/dev/mvs/mvs_if.m#1 branch
.. //depot/projects/vimage/src/sys/dev/mvs/mvs_pci.c#1 branch
.. //depot/projects/vimage/src/sys/dev/mvs/mvs_soc.c#1 branch
.. //depot/projects/vimage/src/sys/dev/quicc/quicc_bfe.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/sge/if_sge.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/sge/if_sgereg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/siis/siis.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/siis/siis.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/buffer.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/sym/sym_hipd.c#13 integrate
.. //depot/projects/vimage/src/sys/dev/uart/uart_dev_ns8250.c#7 integrate
.. //depot/projects/vimage/src/sys/fs/nfs/nfs_commonkrpc.c#5 integrate
.. //depot/projects/vimage/src/sys/fs/nfs/nfs_commonport.c#7 integrate
.. //depot/projects/vimage/src/sys/fs/nfs/nfs_var.h#8 integrate
.. //depot/projects/vimage/src/sys/fs/nfs/nfsport.h#10 integrate
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clnode.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clrpcops.c#7 integrate
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clstate.c#10 integrate
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clvfsops.c#8 integrate
.. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clvnops.c#12 integrate
.. //depot/projects/vimage/src/sys/fs/nfsserver/nfs_nfsdstate.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#22 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part.c#23 integrate
.. //depot/projects/vimage/src/sys/i386/i386/io.c#3 integrate
.. //depot/projects/vimage/src/sys/i386/i386/pmap.c#36 integrate
.. //depot/projects/vimage/src/sys/i386/include/iodev.h#4 integrate
.. //depot/projects/vimage/src/sys/i386/include/pmap.h#16 integrate
.. //depot/projects/vimage/src/sys/i386/include/proc.h#5 integrate
.. //depot/projects/vimage/src/sys/i386/xen/pmap.c#15 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/iodev_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/pmap.c#18 integrate
.. //depot/projects/vimage/src/sys/ia64/include/iodev.h#2 integrate
.. //depot/projects/vimage/src/sys/ia64/include/pmap.h#4 integrate
.. //depot/projects/vimage/src/sys/ia64/include/proc.h#3 integrate
.. //depot/projects/vimage/src/sys/kern/imgact_elf.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/kern_alq.c#12 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exec.c#29 integrate
.. //depot/projects/vimage/src/sys/kern/kern_gzio.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_ntptime.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/kern_proc.c#32 integrate
.. //depot/projects/vimage/src/sys/kern/kern_resource.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/kern_sig.c#25 integrate
.. //depot/projects/vimage/src/sys/kern/subr_taskqueue.c#11 integrate
.. //depot/projects/vimage/src/sys/kern/subr_witness.c#29 integrate
.. //depot/projects/vimage/src/sys/kern/sys_pipe.c#16 integrate
.. //depot/projects/vimage/src/sys/kern/sys_process.c#16 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_cow.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_mbuf.c#14 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#35 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_bio.c#29 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_subr.c#37 integrate
.. //depot/projects/vimage/src/sys/mips/cavium/uart_dev_oct16550.c#2 integrate
.. //depot/projects/vimage/src/sys/mips/conf/AR71XX#3 integrate
.. //depot/projects/vimage/src/sys/mips/conf/SWARM#3 integrate
.. //depot/projects/vimage/src/sys/mips/include/pmap.h#9 integrate
.. //depot/projects/vimage/src/sys/mips/include/proc.h#4 integrate
.. //depot/projects/vimage/src/sys/mips/include/vmparam.h#3 integrate
.. //depot/projects/vimage/src/sys/mips/mips/exception.S#5 integrate
.. //depot/projects/vimage/src/sys/mips/mips/pmap.c#19 integrate
.. //depot/projects/vimage/src/sys/mips/sibyte/sb_machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#59 integrate
.. //depot/projects/vimage/src/sys/modules/acpi/acpi/Makefile#11 integrate
.. //depot/projects/vimage/src/sys/modules/mvs/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb/usb/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/net/bpf.c#47 integrate
.. //depot/projects/vimage/src/sys/net/bpf_zerocopy.c#5 integrate
.. //depot/projects/vimage/src/sys/net/bpfdesc.h#7 integrate
.. //depot/projects/vimage/src/sys/net/flowtable.c#12 integrate
.. //depot/projects/vimage/src/sys/net/if.c#97 integrate
.. //depot/projects/vimage/src/sys/net/if_gif.c#37 integrate
.. //depot/projects/vimage/src/sys/net/if_gif.h#17 integrate
.. //depot/projects/vimage/src/sys/net/route.c#60 integrate
.. //depot/projects/vimage/src/sys/net/rtsock.c#47 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_amrr.c#6 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.h#14 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#29 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_rssadapt.c#3 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#36 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_pipe.c#13 integrate
.. //depot/projects/vimage/src/sys/netinet/icmp6.h#8 integrate
.. //depot/projects/vimage/src/sys/netinet/if_ether.c#53 integrate
.. //depot/projects/vimage/src/sys/netinet/igmp.c#47 integrate
.. //depot/projects/vimage/src/sys/netinet/in.c#46 integrate
.. //depot/projects/vimage/src/sys/netinet/in_gif.c#25 integrate
.. //depot/projects/vimage/src/sys/netinet/in_proto.c#25 integrate
.. //depot/projects/vimage/src/sys/netinet/in_rmx.c#41 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#33 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_icmp.h#4 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_input.c#68 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_var.h#25 integrate
.. //depot/projects/vimage/src/sys/netinet/raw_ip.c#56 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#41 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_output.c#45 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#45 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_input.c#62 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_output.c#36 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_reass.c#19 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_sack.c#23 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#92 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#59 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#39 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_var.h#42 integrate
.. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#62 integrate
.. //depot/projects/vimage/src/sys/netinet/udp_var.h#18 integrate
.. //depot/projects/vimage/src/sys/netinet6/frag6.c#32 integrate
.. //depot/projects/vimage/src/sys/netinet6/icmp6.c#53 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6.c#49 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#23 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#49 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#49 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#41 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_src.c#43 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_var.h#15 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#65 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#31 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_var.h#26 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6.c#62 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6.h#21 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#41 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#43 integrate
.. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#46 integrate
.. //depot/projects/vimage/src/sys/netinet6/scope6.c#30 integrate
.. //depot/projects/vimage/src/sys/netipsec/ah_var.h#4 integrate
.. //depot/projects/vimage/src/sys/netipsec/esp_var.h#4 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipcomp_var.h#5 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipip_var.h#5 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec.c#54 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec.h#19 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec6.h#10 integrate
.. //depot/projects/vimage/src/sys/netipsec/key.c#52 integrate
.. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#30 integrate
.. //depot/projects/vimage/src/sys/pc98/pc98/machdep.c#17 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea.c#12 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea64.c#7 integrate
.. //depot/projects/vimage/src/sys/powerpc/booke/pmap.c#17 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/pmap.h#10 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/proc.h#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/mmu_if.m#7 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/pmap_dispatch.c#12 integrate
.. //depot/projects/vimage/src/sys/sparc64/include/asi.h#5 integrate
.. //depot/projects/vimage/src/sys/sparc64/include/cache.h#6 integrate
.. //depot/projects/vimage/src/sys/sparc64/include/mcntl.h#1 branch
.. //depot/projects/vimage/src/sys/sparc64/include/ofw_machdep.h#3 integrate
.. //depot/projects/vimage/src/sys/sparc64/include/pmap.h#4 integrate
.. //depot/projects/vimage/src/sys/sparc64/include/proc.h#2 integrate
.. //depot/projects/vimage/src/sys/sparc64/isa/isa.c#7 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/cache.c#5 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/cheetah.c#8 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/identcpu.c#5 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/interrupt.S#4 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/locore.S#7 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/machdep.c#21 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/mp_locore.S#7 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/mp_machdep.c#14 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/nexus.c#7 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/ofw_machdep.c#6 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/pmap.c#18 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/tick.c#7 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/zeus.c#1 branch
.. //depot/projects/vimage/src/sys/sun4v/include/ofw_machdep.h#3 integrate
.. //depot/projects/vimage/src/sys/sun4v/include/pmap.h#4 integrate
.. //depot/projects/vimage/src/sys/sun4v/include/proc.h#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/pmap.c#14 integrate
.. //depot/projects/vimage/src/sys/sys/_task.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/alq.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/buf.h#9 integrate
.. //depot/projects/vimage/src/sys/sys/mount.h#26 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#65 integrate
.. //depot/projects/vimage/src/sys/sys/taskqueue.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/user.h#15 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_alloc.c#12 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_balloc.c#6 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_extern.h#6 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_inode.c#10 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_snapshot.c#17 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_softdep.c#18 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_subr.c#2 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#27 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#18 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/fs.h#4 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/softdep.h#2 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/dinode.h#3 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/inode.h#6 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_dirhash.c#13 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_extern.h#4 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_lookup.c#17 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vnops.c#21 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufsmount.h#4 integrate
.. //depot/projects/vimage/src/sys/vm/device_pager.c#12 integrate
.. //depot/projects/vimage/src/sys/vm/pmap.h#9 integrate
.. //depot/projects/vimage/src/sys/vm/sg_pager.c#3 integrate
.. //depot/projects/vimage/src/sys/vm/swap_pager.c#24 integrate
.. //depot/projects/vimage/src/sys/vm/uma_core.c#13 integrate
.. //depot/projects/vimage/src/sys/vm/vm_contig.c#15 integrate
.. //depot/projects/vimage/src/sys/vm/vm_fault.c#23 integrate
.. //depot/projects/vimage/src/sys/vm/vm_glue.c#16 integrate
.. //depot/projects/vimage/src/sys/vm/vm_kern.c#15 integrate
.. //depot/projects/vimage/src/sys/vm/vm_map.c#25 integrate
.. //depot/projects/vimage/src/sys/vm/vm_mmap.c#25 integrate
.. //depot/projects/vimage/src/sys/vm/vm_object.c#29 integrate
.. //depot/projects/vimage/src/sys/vm/vm_page.c#28 integrate
.. //depot/projects/vimage/src/sys/vm/vm_page.h#14 integrate
.. //depot/projects/vimage/src/sys/vm/vm_pageout.c#23 integrate
.. //depot/projects/vimage/src/sys/vm/vm_param.h#4 integrate
.. //depot/projects/vimage/src/sys/vm/vnode_pager.c#20 integrate
Differences ...
==== //depot/projects/vimage/src/share/man/man1/builtin.1#2 (text+ko) ====
@@ -24,9 +24,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man1/builtin.1,v 1.28 2006/12/26 22:25:58 ru Exp $
+.\" $FreeBSD: src/share/man/man1/builtin.1,v 1.31 2010/04/25 17:38:53 jilles Exp $
.\"
-.Dd October 14, 2006
+.Dd April 25, 2010
.Dt BUILTIN 1
.Os
.Sh NAME
@@ -36,6 +36,7 @@
.Nm \&. ,
.Nm \&: ,
.Nm @ ,
+.Nm \&[ ,
.Nm { ,
.Nm } ,
.Nm alias ,
@@ -195,11 +196,12 @@
.It Xo
.Em "Command External" Ta Xr csh 1 Ta Xr sh 1
.Xc
-.It Ic ! Ta \&No Ta \&No Ta Yes
+.It Ic \&! Ta \&No Ta \&No Ta Yes
.It Ic % Ta \&No Ta Yes Ta \&No
-.It Ic . Ta \&No Ta \&No Ta Yes
-.It Ic : Ta \&No Ta Yes Ta Yes
+.It Ic \&. Ta \&No Ta \&No Ta Yes
+.It Ic \&: Ta \&No Ta Yes Ta Yes
.It Ic @ Ta \&No Ta Yes Ta Yes
+.It Ic \&[ Ta Yes Ta \&No Ta Yes
.It Ic { Ta \&No Ta \&No Ta Yes
.It Ic } Ta \&No Ta \&No Ta Yes
.It Ic alias Ta No** Ta Yes Ta Yes
@@ -243,7 +245,7 @@
.It Ic getopts Ta No** Ta \&No Ta Yes
.It Ic glob Ta \&No Ta Yes Ta \&No
.It Ic goto Ta \&No Ta Yes Ta \&No
-.It Ic hash Ta \&No Ta \&No Ta Yes
+.It Ic hash Ta No** Ta \&No Ta Yes
.It Ic hashstat Ta \&No Ta Yes Ta \&No
.It Ic history Ta \&No Ta Yes Ta \&No
.It Ic hup Ta \&No Ta Yes Ta \&No
@@ -288,8 +290,8 @@
.It Ic times Ta \&No Ta \&No Ta Yes
.It Ic trap Ta \&No Ta \&No Ta Yes
.It Ic true Ta Yes Ta \&No Ta Yes
-.It Ic type Ta \&No Ta \&No Ta Yes
-.It Ic ulimit Ta \&No Ta \&No Ta Yes
+.It Ic type Ta No** Ta \&No Ta Yes
+.It Ic ulimit Ta No** Ta \&No Ta Yes
.It Ic umask Ta No** Ta Yes Ta Yes
.It Ic unalias Ta No** Ta Yes Ta Yes
.It Ic uncomplete Ta \&No Ta Yes Ta \&No
==== //depot/projects/vimage/src/share/man/man4/Makefile#20 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.477 2010/04/14 21:27:48 yongari Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.478 2010/05/02 19:28:30 mav Exp $
MAN= aac.4 \
acpi.4 \
@@ -220,6 +220,7 @@
msk.4 \
mtio.4 \
multicast.4 \
+ mvs.4 \
mwl.4 \
mwlfw.4 \
mxge.4 \
==== //depot/projects/vimage/src/share/man/man4/bwn.4#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/share/man/man4/bwn.4,v 1.2 2010/02/26 00:37:49 weongyo Exp $
+.\" $FreeBSD: src/share/man/man4/bwn.4,v 1.3 2010/04/29 18:32:14 delphij Exp $
.\"
.Dd February 25, 2010
.Dt BWN 4
@@ -123,7 +123,7 @@
The
.Nm
driver first appeared in
-.Fx 8.0 .
+.Fx 8.1 .
.Sh AUTHORS
.An -nosplit
The
==== //depot/projects/vimage/src/share/man/man4/msk.4#5 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/msk.4,v 1.13 2010/03/01 23:56:51 yongari Exp $
+.\" $FreeBSD: src/share/man/man4/msk.4,v 1.14 2010/04/30 19:05:01 yongari Exp $
.\"
-.Dd March 1, 2010
+.Dd April 30, 2010
.Dt MSK 4
.Os
.Sh NAME
@@ -208,6 +208,8 @@
.It
Marvell Yukon 88E8058 Gigabit Ethernet
.It
+Marvell Yukon 88E8059 Gigabit Ethernet
+.It
Marvell Yukon 88E8070 Gigabit Ethernet
.It
Marvell Yukon 88E8071 Gigabit Ethernet
==== //depot/projects/vimage/src/share/man/man4/sge.4#2 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/sge.4,v 1.1 2010/04/14 21:27:48 yongari Exp $
+.\" $FreeBSD: src/share/man/man4/sge.4,v 1.2 2010/04/29 18:21:27 yongari Exp $
.\"
-.Dd April 14, 2010
+.Dd April 29, 2010
.Dt SGE 4
.Os
.Sh NAME
@@ -53,11 +53,11 @@
.Pp
All LOMs supported by the
.Nm
-driver have TCP/UDP/IP checksum offload for transmit and receive.
+driver have TCP/UDP/IP checksum offload for transmit and receive,
+hardware VLAN tag stripping/insertion features.
Due to lack of documentation more offloading features like TCP
-segmentation offload (TSO), hardware VLAN tag stripping/insertion
-features, Wake On Lan (WOL), Jumbo frame and an interrupt moderation
-mechanism are not supported yet.
+segmentation offload (TSO), Wake On Lan (WOL), Jumbo frame and an
+interrupt moderation mechanism are not supported yet.
.Pp
The
.Nm
==== //depot/projects/vimage/src/share/man/man4/vlan.4#6 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.54 2010/04/14 21:27:48 yongari Exp $
+.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.55 2010/04/29 18:21:27 yongari Exp $
.\"
.Dd April 14, 2010
.Dt VLAN 4
@@ -134,6 +134,7 @@
.Xr msk 4 ,
.Xr nge 4 ,
.Xr re 4 ,
+.Xr sge 4 ,
.Xr stge 4 ,
.Xr ti 4 ,
.Xr txp 4 ,
@@ -172,7 +173,6 @@
.Xr nve 4 ,
.Xr rl 4 ,
.Xr sf 4 ,
-.Xr sge 4 ,
.Xr sis 4 ,
.Xr sk 4 ,
.Xr ste 4 ,
==== //depot/projects/vimage/src/share/man/man5/rc.conf.5#14 (text+ko) ====
@@ -22,9 +22,9 @@
.\" 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.376 2010/04/17 18:48:18 dougb Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.377 2010/04/26 15:31:58 ume Exp $
.\"
-.Dd April 14, 2010
+.Dd April 27, 2010
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -1370,7 +1370,7 @@
If not set to
.Dq Li NO ,
this is the default output interface for scoped addresses.
-Now this works only for IPv6 link local multicast addresses.
+This works only with ipv6_gateway_enable="NO".
.It Va ip6addrctl_enable
.Pq Vt bool
If set to
==== //depot/projects/vimage/src/share/man/man9/alq.9#2 (text+ko) ====
@@ -1,7 +1,13 @@
.\"
.\" Copyright (c) 2003 Hiten Pandya
+.\" Copyright (c) 2009-2010 The FreeBSD Foundation
.\" All rights reserved.
.\"
+.\" Portions of this software were developed at the Centre for Advanced
+.\" Internet Architectures, Swinburne University of Technology, Melbourne,
+.\" Australia by Lawrence Stewart under sponsorship from the FreeBSD
+.\" Foundation.
+.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
@@ -23,23 +29,36 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/alq.9,v 1.6 2005/04/16 12:12:27 rwatson Exp $
+.\" $FreeBSD: src/share/man/man9/alq.9,v 1.7 2010/04/26 13:48:22 lstewart Exp $
.\"
-.Dd May 16, 2003
+.Dd April 26, 2010
.Dt ALQ 9
.Os
.Sh NAME
.Nm alq ,
+.Nm alq_open_flags ,
.Nm alq_open ,
+.Nm alq_writen ,
.Nm alq_write ,
.Nm alq_flush ,
.Nm alq_close ,
+.Nm alq_getn ,
.Nm alq_get ,
+.Nm alq_post_flags ,
.Nm alq_post
.Nd Asynchronous Logging Queues
.Sh SYNOPSIS
.In sys/alq.h
.Ft int
+.Fo alq_open_flags
+.Fa "struct alq **app"
+.Fa "const char *file"
+.Fa "struct ucred *cred"
+.Fa "int cmode"
+.Fa "int size"
+.Fa "int flags"
+.Fc
+.Ft int
.Fo alq_open
.Fa "struct alq **app"
.Fa "const char *file"
@@ -49,19 +68,25 @@
.Fa "int count"
.Fc
.Ft int
-.Fn alq_write "struct alq *alq" "void *data" "int waitok"
+.Fn alq_writen "struct alq *alq" "void *data" "int len" "int flags"
+.Ft int
+.Fn alq_write "struct alq *alq" "void *data" "int flags"
.Ft void
.Fn alq_flush "struct alq *alq"
.Ft void
.Fn alq_close "struct alq *alq"
.Ft struct ale *
-.Fn alq_get "struct alq *alq" "int waitok"
+.Fn alq_getn "struct alq *alq" "int len" "int flags"
+.Ft struct ale *
+.Fn alq_get "struct alq *alq" "int flags"
+.Ft void
+.Fn alq_post_flags "struct alq *alq" "struct ale *ale" "int flags"
.Ft void
.Fn alq_post "struct alq *alq" "struct ale *ale"
.Sh DESCRIPTION
The
.Nm
-facility provides an asynchronous fixed length recording
+facility provides an asynchronous fixed or variable length recording
mechanism, known as Asynchronous Logging Queues.
It can record to any
.Xr vnode 9 ,
@@ -81,26 +106,37 @@
which has the following members:
.Bd -literal -offset indent
struct ale {
- struct ale *ae_next; /* Next Entry */
- char *ae_data; /* Entry buffer */
- int ae_flags; /* Entry flags */
+ intptr_t ae_bytesused; /* # bytes written to ALE. */
+ char *ae_data; /* Write ptr. */
+ int ae_pad; /* Unused, compat. */
};
.Ed
.Pp
-The
-.Va ae_flags
-field is for internal use, clients of the
+An
+.Nm
+can be created in either fixed or variable length mode.
+A variable length
+.Nm
+accommodates writes of varying length using
+.Fn alq_writen
+and
+.Fn alq_getn .
+A fixed length
.Nm
-interface should not modify this field.
-Behaviour is undefined if this field is modified.
+accommodates a fixed number of writes using
+.Fn alq_write
+and
+.Fn alq_get ,
+each of fixed size (set at queue creation time).
+Fixed length mode is deprecated in favour of variable length mode.
.Sh FUNCTIONS
The
-.Fn alq_open
-function creates a new logging queue.
+.Fn alq_open_flags
+function creates a new variable length asynchronous logging queue.
The
.Fa file
-argument is the name of the file to open for logging; if the file does not
-yet exist,
+argument is the name of the file to open for logging.
+If the file does not yet exist,
.Fn alq_open
will attempt to create it.
The
@@ -112,33 +148,99 @@
Consumers of this API may wish to pass
.Dv ALQ_DEFAULT_CMODE ,
a default creation mode suitable for most applications.
-The argument
+The
.Fa cred
-specifies the credentials to use when opening and performing I/O on the file.
-The size of each entry in the queue is determined by
-.Fa size .
+argument specifies the credentials to use when opening and performing I/O on the file.
The
+.Fa size
+argument sets the size (in bytes) of the underlying queue.
+The ALQ_ORDERED flag may be passed in via
+.Fa flags
+to indicate that the ordering of writer threads waiting for a busy
+.Nm
+to free up resources should be preserved.
+.Pp
+The deprecated
+.Fn alq_open
+function is implemented as a wrapper around
+.Fn alq_open_flags
+to provide backwards compatibility to consumers that have not been updated to
+utilise the newer
+.Fn alq_open_flags
+function.
+It passes all arguments through to
+.Fn alq_open_flags
+untouched except for
+.Fa size
+and
+.Fa count ,
+and sets
+.Fa flags
+to 0.
+To create a variable length mode
+.Nm ,
+the
+.Fa size
+argument should be set to the size (in bytes) of the underlying queue and the
.Fa count
-argument determines the number of items to be stored in the
-asynchronous queue over an approximate period of a disk
-write operation.
+argument should be set to 0.
+To create a fixed length mode
+.Nm ,
+the
+.Fa size
+argument should be set to the size (in bytes) of each write and the
+.Fa count
+argument should be set to the number of
+.Fa size
+byte chunks to reserve capacity for.
.Pp
The
-.Fn alq_write
+.Fn alq_writen
function writes
+.Fa len
+bytes from
.Fa data
-to the designated queue,
+to the designated variable length mode queue
.Fa alq .
-In the event that
+If
+.Fn alq_writen
+could not write the entry immediately and
+.Dv ALQ_WAITOK
+is set in
+.Fa flags ,
+the function will be allowed to
+.Xr msleep_spin 9
+with the
+.Dq Li alqwnord
+or
+.Dq Li alqwnres
+wait message.
+A write will automatically schedule the queue
+.Fa alq
+to be flushed to disk.
+This behaviour can be controlled by passing ALQ_NOACTIVATE via
+.Fa flags
+to indicate that the write should not schedule
+.Fa alq
+to be flushed to disk.
+.Pp
+The deprecated
.Fn alq_write
-could not write the entry immediately, and
-.Dv ALQ_WAITOK
-is passed to
-.Fa waitok ,
-then
+function is implemented as a wrapper around
+.Fn alq_writen
+to provide backwards compatibility to consumers that have not been updated to
+utilise variable length mode queues.
+The function will write
+.Fa size
+bytes of data (where
+.Fa size
+was specified at queue creation time) from the
+.Fa data
+buffer to the
+.Fa alq .
+Note that it is an error to call
.Fn alq_write
-will be allowed to
-.Xr tsleep 9 .
+on a variable length mode queue.
.Pp
The
.Fn alq_flush
@@ -146,61 +248,136 @@
.Fa alq
to the log medium that was passed to
.Fn alq_open .
+If
+.Fa alq
+has data to flush and is not already in the process of being flushed, the
+function will block doing IO.
+Otherwise, the function will return immediately.
.Pp
The
.Fn alq_close
-function will close the asynchronous logging queue,
-.Fa alq ,
+function will close the asynchronous logging queue
+.Fa alq
and flush all pending write requests to the log medium.
It will free all resources that were previously allocated.
.Pp
The
-.Fn alq_get
-function returns the next available asynchronous logging entry
-from the queue,
-.Fa alq .
-This function leaves the queue in a locked state, until a subsequent
+.Fn alq_getn
+function returns an asynchronous log entry from
+.Fa alq ,
+initialised to point at a buffer capable of receiving
+.Fa len
+bytes of data.
+This function leaves
+.Fa alq
+in a locked state, until a subsequent
.Fn alq_post
+or
+.Fn alq_post_flags
call is made.
-In the event that
-.Fn alq_get
-could not retrieve an entry immediately, it will
-.Xr tsleep 9
+If
+.Fn alq_getn
+could not obtain
+.Fa len
+bytes of buffer immediately and
+.Dv ALQ_WAITOK
+is set in
+.Fa flags ,
+the function will be allowed to
+.Xr msleep_spin 9
with the
-.Dq Li alqget
+.Dq Li alqgnord
+or
+.Dq Li alqgnres
wait message.
+The caller can choose to write less than
+.Fa len
+bytes of data to the returned asynchronous log entry by setting the entry's
+ae_bytesused field to the number of bytes actually written.
+This must be done prior to calling
+.Fn alq_post .
+.Pp
+The deprecated
+.Fn alq_get
+function is implemented as a wrapper around
+.Fn alq_getn
+to provide backwards compatibility to consumers that have not been updated to
+utilise variable length mode queues.
+The asynchronous log entry returned will be initialised to point at a buffer
+capable of receiving
+.Fa size
+bytes of data (where
+.Fa size
+was specified at queue creation time).
+Note that it is an error to call
+.Fn alq_get
+on a variable length mode queue.
.Pp
The
-.Fn alq_post
-function schedules the asynchronous logging entry,
-.Fa ale ,
-which is retrieved using the
-.Fn alq_get
-function,
-for writing to the asynchronous logging queue,
+.Fn alq_post_flags
+function schedules the asynchronous log entry
+.Fa ale
+(obtained from
+.Fn alq_getn
+or
+.Fn alq_get )
+for writing to
.Fa alq .
-This function leaves the queue,
-.Fa alq ,
+The ALQ_NOACTIVATE flag may be passed in via
+.Fa flags
+to indicate that the queue should not be immediately scheduled to be flushed to
+disk.
+This function leaves
+.Fa alq
in an unlocked state.
+.Pp
+The
+.Fn alq_post
+function is implemented as a wrapper around
+.Fn alq_post_flags
+to provide backwards compatibility to consumers that have not been updated to
+utilise the newer
+.Fn alq_post_flags
+function.
+It simply passes all arguments through to
+.Fn alq_post_flags
+untouched, and sets
+.Fa flags
+to 0.
.Sh IMPLEMENTATION NOTES
The
+.Fn alq_writen
+and
.Fn alq_write
-function is a wrapper around the
+functions both perform a
+.Xr bcopy 3
+from the supplied
+.Fa data
+buffer into the underlying
+.Nm
+buffer.
+Performance critical code paths may wish to consider using
+.Fn alq_getn
+(variable length queues) or
+.Fn alq_get
+(fixed length queues) to avoid the extra memory copy. Note that a queue
+remains locked between calls to
+.Fn alq_getn
+or
.Fn alq_get
and
.Fn alq_post
-functions; by using these functions separately, a call
-to
-.Fn bcopy
-can be avoided for performance critical code paths.
+or
+.Fn alq_post_flags ,
+so this method of writing to a queue is unsuitable for situations where the
+time between calls may be substantial.
.Sh LOCKING
-Each asynchronous queue is protected by a spin mutex.
+Each asynchronous logging queue is protected by a spin mutex.
.Pp
Functions
-.Fn alq_flush ,
+.Fn alq_flush
+and
.Fn alq_open
-and
-.Fn alq_post
may attempt to acquire an internal sleep mutex, and should
consequently not be used in contexts where sleeping is
not allowed.
@@ -214,32 +391,36 @@
or else it returns 0.
.Pp
The
+.Fn alq_writen
+and
.Fn alq_write
-function returns
+functions return
.Er EWOULDBLOCK
if
.Dv ALQ_NOWAIT
-was provided as a value to
-.Fa waitok
-and either the queue is full, or when the system is shutting down.
+was set in
+.Fa flags
+and either the queue is full or the system is shutting down.
.Pp
The
+.Fn alq_getn
+and
.Fn alq_get
-function returns
-.Dv NULL ,
+functions return
+.Dv NULL
if
.Dv ALQ_NOWAIT
-was provided as a value to
-.Fa waitok
-and either the queue is full, or when the system is shutting down.
+was set in
+.Fa flags
+and either the queue is full or the system is shutting down.
.Pp
NOTE: invalid arguments to non-void functions will result in
undefined behaviour.
.Sh SEE ALSO
+.Xr kproc 9 ,
+.Xr ktr 9 ,
+.Xr msleep_spin 9 ,
.Xr syslog 3 ,
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sun May 2 23:19:59 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id F0DB9106566C; Sun, 2 May 2010 23:19:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id B425D106564A
for ; Sun, 2 May 2010 23:19:58 +0000 (UTC)
(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
by mx1.freebsd.org (Postfix) with ESMTP id A1B4D8FC08
for ; Sun, 2 May 2010 23:19:58 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o42NJwjP094293
for ; Sun, 2 May 2010 23:19:58 GMT
(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o42NJwbk094291
for perforce@freebsd.org; Sun, 2 May 2010 23:19:58 GMT
(envelope-from zec@fer.hr)
Date: Sun, 2 May 2010 23:19:58 GMT
Message-Id: <201005022319.o42NJwbk094291@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
zec@fer.hr using -f
From: Marko Zec
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 177632 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 02 May 2010 23:19:59 -0000
http://p4web.freebsd.org/@@177632?ac=10
Change 177632 by zec@zec_tpx32 on 2010/05/02 23:19:17
Prune random (mostly IMUNES related) changes from this branch.
vimage == head now.
Affected files ...
.. //depot/projects/vimage/src/sys/i386/conf/.cvsignore#4 edit
.. //depot/projects/vimage/src/sys/kern/vfs_export.c#26 edit
.. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#34 edit
.. //depot/projects/vimage/src/sys/net/if.c#98 edit
.. //depot/projects/vimage/src/sys/net/if_vlan.c#27 edit
.. //depot/projects/vimage/src/sys/net/vnet.c#9 edit
.. //depot/projects/vimage/src/sys/net/vnet.h#36 edit
.. //depot/projects/vimage/src/sys/netgraph/ng_bridge.c#12 edit
.. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#37 edit
.. //depot/projects/vimage/src/sys/netgraph/ng_hub.c#4 edit
.. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#34 edit
Differences ...
==== //depot/projects/vimage/src/sys/i386/conf/.cvsignore#4 (text+ko) ====
@@ -1,0 +1,1 @@
+[A-Za-z0-9]*
==== //depot/projects/vimage/src/sys/kern/vfs_export.c#26 (text+ko) ====
@@ -54,7 +54,6 @@
#include
#include
-#include
static MALLOC_DEFINE(M_NETADDR, "export_host", "Export host address structure");
@@ -143,7 +142,6 @@
}
#endif
- CURVNET_SET(TD_TO_VNET(curthread)); /* XXX MARKO */
i = sizeof(struct netcred) + argp->ex_addrlen + argp->ex_masklen;
np = (struct netcred *) malloc(i, M_NETADDR, M_WAITOK | M_ZERO);
saddr = (struct sockaddr *) (np + 1);
@@ -216,10 +214,8 @@
np->netc_numsecflavors = argp->ex_numsecflavors;
bcopy(argp->ex_secflavors, np->netc_secflavors,
sizeof(np->netc_secflavors));
- CURVNET_RESTORE();
return (0);
out:
- CURVNET_RESTORE();
free(np, M_NETADDR);
return (error);
}
==== //depot/projects/vimage/src/sys/kern/vfs_lookup.c#34 (text+ko) ====
@@ -59,8 +59,6 @@
#include
#endif
-#include
-
#include
#include
@@ -74,19 +72,6 @@
"unsigned long");
SDT_PROBE_DEFINE2(vfs, namei, lookup, return, "int", "struct vnode *");
-#ifdef VIMAGE
-#define IMUNES_SYMLINK_HACK
-#endif
-
-#ifdef IMUNES_SYMLINK_HACK
-static VNET_DEFINE(int, morphing_symlinks);
-#define V_morphing_symlinks VNET(morphing_symlinks)
-
-SYSCTL_VNET_INT(_vfs, OID_AUTO, morphing_symlinks, CTLFLAG_RW,
- &VNET_NAME(morphing_symlinks), 0,
- "Resolve @ to vimage name in symlinks");
-#endif
-
/*
* Allocation zone for namei
*/
@@ -353,44 +338,6 @@
error = ENOENT;
break;
}
-#ifdef IMUNES_SYMLINK_HACK
- /*
- * If the symbolic link includes a special character '@',
- * and V_morphing_symlinks is set, substitute the first
- * occurence of '@' with full path to jail / vimage name.
- * If the full path includes subhierarchies, s/./\// when
- * expanding '@' to jail / vimage name.
- *
- * XXX revisit buffer length checking.
- */
- CURVNET_SET_QUIET(TD_TO_VNET(curthread));
- if (V_morphing_symlinks) {
- char *sp = strchr(cp, '@');
-
- if (sp) {
- char *vname = td->td_ucred->cr_prison->pr_name;
- int vnamelen = strlen(vname);
- int i;
-
- if (vnamelen >= auio.uio_resid) {
- if (ndp->ni_pathlen > 1)
- uma_zfree(namei_zone, cp);
- error = ENAMETOOLONG;
- CURVNET_RESTORE();
- break;
- }
- bcopy(sp + 1, sp + vnamelen,
- linklen - (sp - cp));
- bcopy(td->td_ucred->cr_prison->pr_name,
- sp, vnamelen);
- linklen += (vnamelen - 1);
- for (i = 0; i < vnamelen; i++)
- if (sp[i] == '.')
- sp[i] = '/';
- }
- }
- CURVNET_RESTORE();
-#endif
if (linklen + ndp->ni_pathlen >= MAXPATHLEN) {
if (ndp->ni_pathlen > 1)
uma_zfree(namei_zone, cp);
==== //depot/projects/vimage/src/sys/net/if.c#98 (text+ko) ====
@@ -800,14 +800,6 @@
struct ifnet *iter;
int found = 0;
- /*
- * Detach from any vlan, bridge or lagg ifnets linked to us.
- * A small though unlikely window for a race from here to ifp
- * unlinking from ifnet list is possible, hence we repeat the
- * procedure once again further bellow. XXX.
- */
- EVENTHANDLER_INVOKE(ifnet_departure_event, ifp);
-
IFNET_WLOCK();
TAILQ_FOREACH(iter, &V_ifnet, if_link)
if (iter == ifp) {
==== //depot/projects/vimage/src/sys/net/if_vlan.c#27 (text+ko) ====
@@ -1429,12 +1429,6 @@
error = copyin(ifr->ifr_data, &vlr, sizeof(vlr));
if (error)
break;
-#ifdef VIMAGE
- if (ifp->if_home_vnet != ifp->if_vnet) {
- error = EPERM;
- break;
- }
-#endif
if (vlr.vlr_parent[0] == '\0') {
vlan_unconfig(ifp);
break;
@@ -1462,12 +1456,6 @@
case SIOCGETVLAN:
bzero(&vlr, sizeof(vlr));
-#ifdef VIMAGE
- if (ifp->if_home_vnet != ifp->if_vnet) {
- error = EPERM;
- break;
- }
-#endif
VLAN_LOCK();
if (TRUNK(ifv) != NULL) {
strlcpy(vlr.vlr_parent, PARENT(ifv)->if_xname,
==== //depot/projects/vimage/src/sys/net/vnet.c#9 (text+ko) ====
@@ -473,15 +473,6 @@
}
int
-vnet_sysctl_handle_long(SYSCTL_HANDLER_ARGS)
-{
-
- if (arg1 != NULL)
- arg1 = (void *)(curvnet->vnet_data_base + (uintptr_t)arg1);
- return (sysctl_handle_long(oidp, arg1, arg2, req));
-}
-
-int
vnet_sysctl_handle_opaque(SYSCTL_HANDLER_ARGS)
{
@@ -508,15 +499,6 @@
return (sysctl_handle_int(oidp, arg1, arg2, req));
}
-int
-vnet_sysctl_handle_ulong(SYSCTL_HANDLER_ARGS)
-{
-
- if (arg1 != NULL)
- arg1 = (void *)(curvnet->vnet_data_base + (uintptr_t)arg1);
- return (sysctl_handle_long(oidp, arg1, arg2, req));
-}
-
/*
* Support for special SYSINIT handlers registered via VNET_SYSINIT()
* and VNET_SYSUNINIT().
==== //depot/projects/vimage/src/sys/net/vnet.h#36 (text+ko) ====
@@ -236,8 +236,6 @@
int vnet_sysctl_handle_opaque(SYSCTL_HANDLER_ARGS);
int vnet_sysctl_handle_string(SYSCTL_HANDLER_ARGS);
int vnet_sysctl_handle_uint(SYSCTL_HANDLER_ARGS);
-int vnet_sysctl_handle_long(SYSCTL_HANDLER_ARGS);
-int vnet_sysctl_handle_ulong(SYSCTL_HANDLER_ARGS);
#define SYSCTL_VNET_INT(parent, nbr, name, access, ptr, val, descr) \
SYSCTL_OID(parent, nbr, name, \
@@ -260,14 +258,6 @@
SYSCTL_OID(parent, nbr, name, \
CTLTYPE_UINT|CTLFLAG_MPSAFE|CTLFLAG_VNET|(access), \
ptr, val, vnet_sysctl_handle_uint, "IU", descr)
-#define SYSCTL_VNET_LONG(parent, nbr, name, access, ptr, val, descr) \
- SYSCTL_OID(parent, nbr, name, \
- CTLTYPE_LONG|CTLFLAG_MPSAFE|CTLFLAG_VNET|(access), \
- ptr, val, vnet_sysctl_handle_long, "L", descr)
-#define SYSCTL_VNET_ULONG(parent, nbr, name, access, ptr, val, descr) \
- SYSCTL_OID(parent, nbr, name, \
- CTLTYPE_ULONG|CTLFLAG_MPSAFE|CTLFLAG_VNET|(access), \
- ptr, val, vnet_sysctl_handle_ulong, "LU", descr)
#define VNET_SYSCTL_ARG(req, arg1) do { \
if (arg1 != NULL) \
arg1 = (void *)(TD_TO_VNET((req)->td)->vnet_data_base + \
==== //depot/projects/vimage/src/sys/netgraph/ng_bridge.c#12 (text+ko) ====
@@ -106,7 +106,6 @@
u_int numBuckets; /* num buckets in table */
u_int hashMask; /* numBuckets - 1 */
int numLinks; /* num connected links */
- int persistent; /* can exist w/o any hooks */
struct callout timer; /* one second periodic timer */
};
typedef struct ng_bridge_private *priv_p;
@@ -347,13 +346,13 @@
ng_bridge_newhook(node_p node, hook_p hook, const char *name)
{
const priv_p priv = NG_NODE_PRIVATE(node);
- int linkNum = -1;
/* Check for a link hook */
if (strncmp(name, NG_BRIDGE_HOOK_LINK_PREFIX,
strlen(NG_BRIDGE_HOOK_LINK_PREFIX)) == 0) {
const char *cp;
char *eptr;
+ u_long linkNum;
cp = name + strlen(NG_BRIDGE_HOOK_LINK_PREFIX);
if (!isdigit(*cp) || (cp[0] == '0' && cp[1] != '\0'))
@@ -361,12 +360,6 @@
linkNum = strtoul(cp, &eptr, 10);
if (*eptr != '\0' || linkNum >= NG_BRIDGE_MAX_LINKS)
return (EINVAL);
- } else if (strcmp(name, "anchor") == 0) {
- linkNum = 0;
- priv->persistent = 1;
- }
-
- if (linkNum >= 0 ) {
if (priv->links[linkNum] != NULL)
return (EISCONN);
priv->links[linkNum] = malloc(sizeof(*priv->links[linkNum]),
@@ -374,7 +367,7 @@
if (priv->links[linkNum] == NULL)
return (ENOMEM);
priv->links[linkNum]->hook = hook;
- NG_HOOK_SET_PRIVATE(hook, (void *)(intptr_t)linkNum);
+ NG_HOOK_SET_PRIVATE(hook, (void *)linkNum);
priv->numLinks++;
return (0);
}
@@ -807,8 +800,7 @@
/* If no more hooks, go away */
if ((NG_NODE_NUMHOOKS(NG_HOOK_NODE(hook)) == 0)
- && (NG_NODE_IS_VALID(NG_HOOK_NODE(hook)))
- && !priv->persistent) {
+ && (NG_NODE_IS_VALID(NG_HOOK_NODE(hook)))) {
ng_rmnode_self(NG_HOOK_NODE(hook));
}
return (0);
==== //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#37 (text+ko) ====
@@ -79,20 +79,9 @@
int unit; /* Interface unit number */
node_p node; /* Our netgraph node */
hook_p ether; /* Hook for ethernet stream */
- LIST_ENTRY(ng_eiface_private) le; /* All eiface nodes in a vnet */
};
typedef struct ng_eiface_private *priv_p;
-#ifdef VIMAGE
-/* Per-vnet list of eiface nodes */
-static VNET_DEFINE(LIST_HEAD(, ng_eiface_private), ng_eiface_list);
-#define V_ng_eiface_list VNET(ng_eiface_list)
-
-static struct sx ng_eiface_list_sxlock;
-#define NG_EIFACE_LIST_WLOCK() sx_xlock(&ng_eiface_list_sxlock);
-#define NG_EIFACE_LIST_WUNLOCK() sx_xunlock(&ng_eiface_list_sxlock);
-#endif
-
/* Interface methods */
static void ng_eiface_init(void *xsc);
static void ng_eiface_start(struct ifnet *ifp);
@@ -373,11 +362,6 @@
/* Link together node and private info */
NG_NODE_SET_PRIVATE(node, priv);
priv->node = node;
-#ifdef VIMAGE
- NG_EIFACE_LIST_WLOCK();
- LIST_INSERT_HEAD(&V_ng_eiface_list, priv, le);
- NG_EIFACE_LIST_WUNLOCK();
-#endif
/* Initialize interface structure */
if_initname(ifp, NG_EIFACE_EIFACE_NAME, priv->unit);
@@ -576,11 +560,6 @@
ether_ifdetach(ifp);
if_free(ifp);
CURVNET_RESTORE();
-#ifdef VIMAGE
- NG_EIFACE_LIST_WLOCK();
- LIST_REMOVE(priv, le);
- NG_EIFACE_LIST_WUNLOCK();
-#endif
free_unr(V_ng_eiface_unit, priv->unit);
free(priv, M_NETGRAPH);
NG_NODE_SET_PRIVATE(node, NULL);
@@ -610,15 +589,7 @@
switch (event) {
case MOD_LOAD:
-#ifdef VIMAGE
- sx_init_flags(&ng_eiface_list_sxlock, "ng_eiface_sxlock",
- SX_RECURSE);
-#endif
- break;
case MOD_UNLOAD:
-#ifdef VIMAGE
- sx_destroy(&ng_eiface_list_sxlock);
-#endif
break;
default:
error = EOPNOTSUPP;
@@ -631,9 +602,6 @@
vnet_ng_eiface_init(const void *unused)
{
-#ifdef VIMAGE
- LIST_INIT(&V_ng_eiface_list);
-#endif
V_ng_eiface_unit = new_unrhdr(0, 0xffff, NULL);
}
VNET_SYSINIT(vnet_ng_eiface_init, SI_SUB_PSEUDO, SI_ORDER_ANY,
@@ -642,18 +610,8 @@
static void
vnet_ng_eiface_uninit(const void *unused)
{
-#ifdef VIMAGE
- priv_p node_p, nnode_p;
- NG_EIFACE_LIST_WLOCK();
- LIST_FOREACH_SAFE(node_p, &V_ng_eiface_list, le, nnode_p) {
- if (node_p->node->nd_type == &typestruct)
- ng_rmnode_self(node_p->node);
- }
- NG_EIFACE_LIST_WUNLOCK();
-#endif
-
delete_unrhdr(V_ng_eiface_unit);
}
-VNET_SYSUNINIT(vnet_ng_eiface_uninit, SI_SUB_PSEUDO, SI_ORDER_FIRST,
+VNET_SYSUNINIT(vnet_ng_eiface_uninit, SI_SUB_PSEUDO, SI_ORDER_ANY,
vnet_ng_eiface_uninit, NULL);
==== //depot/projects/vimage/src/sys/netgraph/ng_hub.c#4 (text+ko) ====
@@ -37,7 +37,6 @@
#include
static ng_constructor_t ng_hub_constructor;
-static ng_newhook_t ng_hub_newhook;
static ng_rcvdata_t ng_hub_rcvdata;
static ng_disconnect_t ng_hub_disconnect;
@@ -45,7 +44,6 @@
.version = NG_ABI_VERSION,
.name = NG_HUB_NODE_TYPE,
.constructor = ng_hub_constructor,
- .newhook = ng_hub_newhook,
.rcvdata = ng_hub_rcvdata,
.disconnect = ng_hub_disconnect,
};
@@ -59,14 +57,6 @@
return (0);
}
-static int
-ng_hub_newhook(node_p node, hook_p hook, const char *name)
-{
- if (strcmp(name, "anchor") == 0)
- node->nd_private = (void *) 1;
- return (0);
-}
-
static int
ng_hub_rcvdata(hook_p hook, item_p item)
{
@@ -104,7 +94,7 @@
{
if (NG_NODE_NUMHOOKS(NG_HOOK_NODE(hook)) == 0 &&
- NG_NODE_IS_VALID(NG_HOOK_NODE(hook)) && !hook->hk_node->nd_private)
+ NG_NODE_IS_VALID(NG_HOOK_NODE(hook)))
ng_rmnode_self(NG_HOOK_NODE(hook));
return (0);
}
==== //depot/projects/vimage/src/sys/netgraph/ng_iface.c#34 (text+ko) ====
@@ -857,17 +857,6 @@
static void
vnet_ng_iface_uninit(const void *unused)
{
-#ifdef VIMAGE_NOTYET
- node_p node;
-
- do {
- LIST_FOREACH(node, &V_ng_nodelist, nd_nodes)
- if (node->nd_type == &typestruct)
- break;
- if (node != NULL)
- ng_rmnode_self(node);
- } while (node != NULL);
-#endif
delete_unrhdr(V_ng_iface_unit);
}
From owner-p4-projects@FreeBSD.ORG Sun May 2 23:22:01 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 2B27E1065674; Sun, 2 May 2010 23:22:01 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id E1F7E1065672
for ; Sun, 2 May 2010 23:22:00 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
by mx1.freebsd.org (Postfix) with ESMTP id CF9718FC0C
for ; Sun, 2 May 2010 23:22:00 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o42NM0v4094504
for ; Sun, 2 May 2010 23:22:00 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o42NM0nZ094502
for perforce@freebsd.org; Sun, 2 May 2010 23:22:00 GMT
(envelope-from pgj@FreeBSD.org)
Date: Sun, 2 May 2010 23:22:00 GMT
Message-Id: <201005022322.o42NM0nZ094502@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 177633 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 02 May 2010 23:22:01 -0000
http://p4web.freebsd.org/@@177633?ac=10
Change 177633 by pgj@Binturong on 2010/05/02 23:21:03
Fix up a header file
Affected files ...
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/rpc/xdr.h#3 edit
Differences ...
==== //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/rpc/xdr.h#3 (text+ko) ====
@@ -1,112 +1,70 @@
/*
- * CDDL HEADER START
+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+ * unrestricted use provided that this legend is included on all tape
+ * media and as a part of the software program in whole or part. Users
+ * may copy or modify Sun RPC without charge, but are not authorized
+ * to license or distribute it to anyone else except as part of a product or
+ * program developed by the user.
*
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
*
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
+ * Sun RPC is provided with no support and without any obligation on the
+ * part of Sun Microsystems, Inc. to assist in its use, correction,
+ * modification or enhancement.
*
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
+ * OR ANY PART THEREOF.
*
- * CDDL HEADER END
+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ * or profits or other special, indirect and consequential damages, even if
+ * Sun has been advised of the possibility of such damages.
*
- * $FreeBSD: src/sys/cddl/compat/opensolaris/rpc/xdr.h,v 1.4 2008/04/22 07:42:59 jb Exp $
+ * Sun Microsystems, Inc.
+ * 2550 Garcia Avenue
+ * Mountain View, California 94043
*/
-/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */
-/* All Rights Reserved */
-
-/*
- * Portions of this source code were derived from Berkeley 4.3 BSD
- * under license from the Regents of the University of California.
- */
-
#ifndef _OPENSOLARIS_RPC_XDR_H_
#define _OPENSOLARIS_RPC_XDR_H_
#include_next
#ifndef _KERNEL
-#include_next
-/*
- * Strangely, my glibc version (2.3.6) doesn't have xdr_control(), so
- * we have to hack it in here (source taken from OpenSolaris).
- * By the way, it is assumed the xdrmem implementation is used.
- */
-
-#undef xdr_control
-#define xdr_control(a,b,c) xdrmem_control(a,b,c)
+#include
/*
- * These are the request arguments to XDR_CONTROL.
+ * Taken from sys/xdr/xdr_mem.c.
*
- * XDR_PEEK - returns the contents of the next XDR unit on the XDR stream.
- * XDR_SKIPBYTES - skips the next N bytes in the XDR stream.
- * XDR_RDMAGET - for xdr implementation over RDMA, gets private flags from
- * the XDR stream being moved over RDMA
- * XDR_RDMANOCHUNK - for xdr implementaion over RDMA, sets private flags in
- * the XDR stream moving over RDMA.
+ * FreeBSD's userland XDR doesn't implement control method (only the kernel),
+ * but OpenSolaris nvpair still depend on it, so we have to implement it here.
*/
-#define XDR_PEEK 2
-#define XDR_SKIPBYTES 3
-#define XDR_RDMAGET 4
-#define XDR_RDMASET 5
-
-/* FIXME: probably doesn't work */
static __inline bool_t
xdrmem_control(XDR *xdrs, int request, void *info)
{
xdr_bytesrec *xptr;
- int32_t *int32p;
- int len;
switch (request) {
-
case XDR_GET_BYTES_AVAIL:
xptr = (xdr_bytesrec *)info;
xptr->xc_is_last_record = TRUE;
xptr->xc_num_avail = xdrs->x_handy;
return (TRUE);
-
- case XDR_PEEK:
- /*
- * Return the next 4 byte unit in the XDR stream.
- */
- if (xdrs->x_handy < sizeof (int32_t))
- return (FALSE);
- int32p = (int32_t *)info;
- *int32p = (int32_t)ntohl((uint32_t)
- (*((int32_t *)(xdrs->x_private))));
- return (TRUE);
-
- case XDR_SKIPBYTES:
- /*
- * Skip the next N bytes in the XDR stream.
- */
- int32p = (int32_t *)info;
- len = RNDUP((int)(*int32p));
- if ((xdrs->x_handy -= len) < 0)
- return (FALSE);
- xdrs->x_private += len;
- return (TRUE);
-
+ default:
+ assert(!"unexpected request");
}
return (FALSE);
}
+
+#undef XDR_CONTROL
+#define XDR_CONTROL(xdrs, req, op) \
+ (((xdrs)->x_ops->x_control == NULL) ? \
+ xdrmem_control((xdrs), (req), (op)) : \
+ (*(xdrs)->x_ops->x_control)(xdrs, req, op))
+
#endif /* !_KERNEL */
#endif /* !_OPENSOLARIS_RPC_XDR_H_ */
From owner-p4-projects@FreeBSD.ORG Mon May 3 14:25:05 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id C488B1065670; Mon, 3 May 2010 14:25:05 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 70E48106564A
for ; Mon, 3 May 2010 14:25:05 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
by mx1.freebsd.org (Postfix) with ESMTP id 5F9BD8FC12
for ; Mon, 3 May 2010 14:25:05 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o43EP5xi022679
for ; Mon, 3 May 2010 14:25:05 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o43EP5ZF022677
for perforce@freebsd.org; Mon, 3 May 2010 14:25:05 GMT
(envelope-from pgj@FreeBSD.org)
Date: Mon, 3 May 2010 14:25:05 GMT
Message-Id: <201005031425.o43EP5ZF022677@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 177651 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Mon, 03 May 2010 14:25:06 -0000
http://p4web.freebsd.org/@@177651?ac=10
Change 177651 by pgj@csupor on 2010/05/03 14:24:30
Fix build problems.
Affected files ...
.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_mbuf.c#4 edit
.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_route.c#7 edit
Differences ...
==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_mbuf.c#4 (text+ko) ====
@@ -69,7 +69,8 @@
struct mbstat_data mbsd;
struct mbstat mbstat;
- int error, result, i, len, bucket;
+ int error, result, i, bucket;
+ size_t len;
const char *sfstats_mib = "kern.ipc.sfbstats";
const char *mbstats_mib = "kern.ipc.mbstats";
==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_route.c#7 (text+ko) ====
@@ -42,10 +42,13 @@
#include
#include
#include
+#include
#include "netstat.h"
#include "netstat_internal.h"
+#define PTR2INT(i,p) bcopy(&(p), &(i), MIN(sizeof(p), sizeof(i)))
+
/* nlist(3) indices and symbols */
enum nlRT {
nlRT_rt_tables = 0,
@@ -224,7 +227,7 @@
if (flags & NETSTAT_ROUTE_ALL) {
rtp = _netstat_rt_allocate(list);
rtp->rt_family = domain;
- rtp->rt_node.rnt_address = (int)rn;
+ PTR2INT(rtp->rt_node.rnt_address, rn);
rtp->rt_node.rnt_flags |= NETSTAT_RTN_ROOT;
extract_node(rnode, &rtp->rt_node, cnt);
}
@@ -245,7 +248,7 @@
}
rtp = _netstat_rt_allocate(list);
- rtp->rt_node.rnt_address = (int)rn;
+ PTR2INT(rtp->rt_node.rnt_address, rn);
rtp->rt_node.rnt_mask =
extract_address(rnode->rn_mask, NULL, 0);
extract_rtentry_data(&rtentry, rtp);
@@ -257,7 +260,7 @@
if (flags & NETSTAT_ROUTE_ALL) {
rtp = _netstat_rt_allocate(list);
rtp->rt_family = domain;
- rtp->rt_node.rnt_address = (int)rn;
+ PTR2INT(rtp->rt_node.rnt_address, rn);
extract_node(rnode, &rtp->rt_node, cnt);
}
rn = rnode->rn_right;
@@ -528,10 +531,10 @@
int i;
rnp->rnt_bit = rn->rn_bit;
- rnp->rnt_left = (int)rn->rn_left;
- rnp->rnt_right = (int)rn->rn_right;
- rnp->rnt_key = (int)rn->rn_key;
- rnp->rnt_dupedkey = (int)rn->rn_dupedkey;
+ PTR2INT(rnp->rnt_left, rn->rn_left);
+ PTR2INT(rnp->rnt_right, rn->rn_right);
+ PTR2INT(rnp->rnt_key, rn->rn_key);
+ PTR2INT(rnp->rnt_dupedkey, rn->rn_dupedkey);
if (rn->rn_dupedkey != 0)
rnp->rnt_flags |= NETSTAT_RTN_DUPEDKEY;
rnp->rnt_mkcnt = mkcnt;
From owner-p4-projects@FreeBSD.ORG Mon May 3 17:26:08 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 60B4C1065674; Mon, 3 May 2010 17:26:08 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 2538A1065670
for ; Mon, 3 May 2010 17:26:08 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
by mx1.freebsd.org (Postfix) with ESMTP id 124708FC13
for ; Mon, 3 May 2010 17:26:08 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o43HQ8lB049493
for ; Mon, 3 May 2010 17:26:08 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o43HQ7Le049491
for perforce@freebsd.org; Mon, 3 May 2010 17:26:07 GMT
(envelope-from pgj@FreeBSD.org)
Date: Mon, 3 May 2010 17:26:07 GMT
Message-Id: <201005031726.o43HQ7Le049491@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 177661 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Mon, 03 May 2010 17:26:08 -0000
http://p4web.freebsd.org/@@177661?ac=10
Change 177661 by pgj@csupor on 2010/05/03 17:25:30
IFC
Affected files ...
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpam/modules/pam_krb5/pam_krb5.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/exception.S#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/at91/if_ate.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/compat/linux/linux_ioctl.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ae/if_ae.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/agp/agp.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/agp/agp_i810.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_an.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/if_ath.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/if_bwi.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwn/if_bwn.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ce/if_ce.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cm/smc90cx6.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cp/if_cp.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cs/if_cs.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ctau/if_ct.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cx/if_cx.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/cxgb_main.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/via_dmablit.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ed/if_ed.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ep/if_ep.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ex/if_ex.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fe/if_fe.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ie/if_ie.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/iicbus/if_ic.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ipw/if_ipw.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/iwi/if_iwi.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/iwn/if_iwn.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/le/lance.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/malo/if_malo.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mwl/if_mwl.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/my/if_my.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/nxge/if_nxge.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pdq/pdq_ifsubr.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ppbus/if_plip.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ral/rt2560.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ral/rt2661.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sbni/if_sbni.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sge/if_sge.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/smc/if_smc.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sn/if_sn.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/snc/dp83932.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ti/if_ti.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/uhso.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/net/usb_ethernet.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_rum.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_run.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_uath.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_upgt.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_ural.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_urtw.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_zyd.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/vx/if_vx.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/wi/if_wi.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/wl/if_wl.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/wpi/if_wpi.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/xe/if_xe.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/uipc_cow.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/uipc_syscalls.c#8 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_bio.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/adm5120/if_admsw.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/mips/atheros/if_arge.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/bpf_zerocopy.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/if.c#7 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_ef.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_gif.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_gre.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_stf.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_base.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_eiface.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_fec.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_iface.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_tty.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/pci/if_rl.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_contig.c#6 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_kern.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_page.c#6 integrate
Differences ...
==== //depot/projects/soc2009/pgj_libstat/src/lib/libpam/modules/pam_krb5/pam_krb5.8#2 (text+ko) ====
@@ -1,7 +1,7 @@
.\"
.\" $Id: pam_krb5.5,v 1.5 2000/01/05 00:59:56 fcusack Exp $
-.\" $FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.8,v 1.6 2001/11/24 23:41:32 dd Exp $
-.Dd January 15, 1999
+.\" $FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.8,v 1.8 2010/05/03 09:49:42 delphij Exp $
+.Dd May 3, 2010
.Dt PAM_KRB5 8
.Os
.Sh NAME
@@ -108,6 +108,10 @@
.Ql %p ,
to designate the current process ID; can be used in
.Ar name .
+.It Cm no_user_check
+Do not verify if a user exists on the local system. This option implies the
+.Cm no_ccache
+option because there is no secure local uid/gid for the cache file.
.El
.Ss Kerberos 5 Account Management Module
The Kerberos 5 account management component
==== //depot/projects/soc2009/pgj_libstat/src/lib/libpam/modules/pam_krb5/pam_krb5.c#2 (text+ko) ====
@@ -48,7 +48,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.c,v 1.24 2007/12/21 12:00:15 des Exp $");
+__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.c,v 1.26 2010/05/03 07:39:51 mm Exp $");
#include
#include
@@ -89,6 +89,7 @@
#define PAM_OPT_DEBUG "debug"
#define PAM_OPT_FORWARDABLE "forwardable"
#define PAM_OPT_NO_CCACHE "no_ccache"
+#define PAM_OPT_NO_USER_CHECK "no_user_check"
#define PAM_OPT_REUSE_CCACHE "reuse_ccache"
/*
@@ -194,34 +195,39 @@
PAM_LOG("Got password");
- /* Verify the local user exists (AFTER getting the password) */
- if (strchr(user, '@')) {
- /* get a local account name for this principal */
- krbret = krb5_aname_to_localname(pam_context, princ,
- sizeof(luser), luser);
- if (krbret != 0) {
- PAM_VERBOSE_ERROR("Kerberos 5 error");
- PAM_LOG("Error krb5_aname_to_localname(): %s",
- krb5_get_err_text(pam_context, krbret));
+ if (openpam_get_option(pamh, PAM_OPT_NO_USER_CHECK))
+ PAM_LOG("Skipping local user check");
+ else {
+
+ /* Verify the local user exists (AFTER getting the password) */
+ if (strchr(user, '@')) {
+ /* get a local account name for this principal */
+ krbret = krb5_aname_to_localname(pam_context, princ,
+ sizeof(luser), luser);
+ if (krbret != 0) {
+ PAM_VERBOSE_ERROR("Kerberos 5 error");
+ PAM_LOG("Error krb5_aname_to_localname(): %s",
+ krb5_get_err_text(pam_context, krbret));
+ retval = PAM_USER_UNKNOWN;
+ goto cleanup2;
+ }
+
+ retval = pam_set_item(pamh, PAM_USER, luser);
+ if (retval != PAM_SUCCESS)
+ goto cleanup2;
+
+ PAM_LOG("PAM_USER Redone");
+ }
+
+ pwd = getpwnam(user);
+ if (pwd == NULL) {
retval = PAM_USER_UNKNOWN;
goto cleanup2;
}
- retval = pam_set_item(pamh, PAM_USER, luser);
- if (retval != PAM_SUCCESS)
- goto cleanup2;
-
- PAM_LOG("PAM_USER Redone");
+ PAM_LOG("Done getpwnam()");
}
- pwd = getpwnam(user);
- if (pwd == NULL) {
- retval = PAM_USER_UNKNOWN;
- goto cleanup2;
- }
-
- PAM_LOG("Done getpwnam()");
-
/* Get a TGT */
memset(&creds, 0, sizeof(krb5_creds));
krbret = krb5_get_init_creds_password(pam_context, &creds, princ,
@@ -366,7 +372,8 @@
return (PAM_SERVICE_ERR);
/* If a persistent cache isn't desired, stop now. */
- if (openpam_get_option(pamh, PAM_OPT_NO_CCACHE))
+ if (openpam_get_option(pamh, PAM_OPT_NO_CCACHE) ||
+ openpam_get_option(pamh, PAM_OPT_NO_USER_CHECK))
return (PAM_SUCCESS);
PAM_LOG("Establishing credentials");
==== //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/exception.S#5 (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/amd64/amd64/exception.S,v 1.144 2010/04/14 20:04:55 kib Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.145 2010/05/03 14:30:49 kib Exp $
*/
#include "opt_atpic.h"
@@ -50,14 +50,14 @@
.bss
.globl dtrace_invop_jump_addr
.align 8
- .type dtrace_invop_jump_addr, @object
- .size dtrace_invop_jump_addr, 8
+ .type dtrace_invop_jump_addr,@object
+ .size dtrace_invop_jump_addr,8
dtrace_invop_jump_addr:
.zero 8
.globl dtrace_invop_calltrap_addr
.align 8
- .type dtrace_invop_calltrap_addr, @object
- .size dtrace_invop_calltrap_addr, 8
+ .type dtrace_invop_calltrap_addr,@object
+ .size dtrace_invop_calltrap_addr,8
dtrace_invop_calltrap_addr:
.zero 8
#endif
@@ -157,7 +157,6 @@
* kernel from userland. Reenable interrupts if they were enabled
* before the trap. This approximates SDT_SYS386TGT on the i386 port.
*/
-
SUPERALIGN_TEXT
.globl alltraps
.type alltraps,@function
@@ -211,16 +210,16 @@
* Set our jump address for the jump back in the event that
* the breakpoint wasn't caused by DTrace at all.
*/
- movq $calltrap, dtrace_invop_calltrap_addr(%rip)
+ movq $calltrap,dtrace_invop_calltrap_addr(%rip)
/* Jump to the code hooked in by DTrace. */
- movq dtrace_invop_jump_addr, %rax
+ movq dtrace_invop_jump_addr,%rax
jmpq *dtrace_invop_jump_addr
#endif
.globl calltrap
.type calltrap,@function
calltrap:
- movq %rsp, %rdi
+ movq %rsp,%rdi
call trap
MEXITCOUNT
jmp doreti /* Handle any pending ASTs */
@@ -274,9 +273,11 @@
testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
jz 1f /* already running with kernel GS.base */
swapgs
-1: movq %rsp, %rdi
+1:
+ movq %rsp,%rdi
call dblfault_handler
-2: hlt
+2:
+ hlt
jmp 2b
IDTVEC(page)
@@ -369,7 +370,7 @@
movq %r15,TF_R15(%rsp) /* C preserved */
movl $TF_HASSEGS,TF_FLAGS(%rsp)
FAKE_MCOUNT(TF_RIP(%rsp))
- movq %rsp, %rdi
+ movq %rsp,%rdi
call syscall
movq PCPU(CURPCB),%rax
andq $~PCB_FULLCTX,PCB_FLAGS(%rax)
@@ -456,7 +457,7 @@
/* Note: this label is also used by ddb and gdb: */
nmi_calltrap:
FAKE_MCOUNT(TF_RIP(%rsp))
- movq %rsp, %rdi
+ movq %rsp,%rdi
call trap
MEXITCOUNT
#ifdef HWPMC_HOOKS
@@ -555,9 +556,9 @@
iretq
ENTRY(fork_trampoline)
- movq %r12, %rdi /* function */
- movq %rbx, %rsi /* arg1 */
- movq %rsp, %rdx /* trapframe pointer */
+ movq %r12,%rdi /* function */
+ movq %rbx,%rsi /* arg1 */
+ movq %rsp,%rdx /* trapframe pointer */
call fork_exit
MEXITCOUNT
jmp doreti /* Handle any ASTs */
@@ -628,7 +629,7 @@
testl $TDF_ASTPENDING | TDF_NEEDRESCHED,TD_FLAGS(%rax)
je doreti_exit
sti
- movq %rsp, %rdi /* pass a pointer to the trapframe */
+ movq %rsp,%rdi /* pass a pointer to the trapframe */
call ast
jmp doreti_ast
@@ -648,8 +649,8 @@
* Do not reload segment registers for kernel.
* Since we do not reload segments registers with sane
* values on kernel entry, descriptors referenced by
- * segments registers may be not valid. This is fatal
- * for the usermode, but is innocent for the kernel.
+ * segments registers might be not valid. This is fatal
+ * for user mode, but is not a problem for the kernel.
*/
testb $SEL_RPL_MASK,TF_CS(%rsp)
jz ld_regs
@@ -662,14 +663,16 @@
/* Restore %fs and fsbase */
movw TF_FS(%rsp),%ax
.globl ld_fs
-ld_fs: movw %ax,%fs
+ld_fs:
+ movw %ax,%fs
cmpw $KUF32SEL,%ax
jne 1f
movl $MSR_FSBASE,%ecx
movl PCB_FSBASE(%r8),%eax
movl PCB_FSBASE+4(%r8),%edx
.globl ld_fsbase
-ld_fsbase: wrmsr
+ld_fsbase:
+ wrmsr
1:
/* Restore %gs and gsbase */
movw TF_GS(%rsp),%si
@@ -678,7 +681,8 @@
movl $MSR_GSBASE,%ecx
rdmsr
.globl ld_gs
-ld_gs: movw %si,%gs
+ld_gs:
+ movw %si,%gs
wrmsr
popfq
cmpw $KUG32SEL,%si
@@ -687,12 +691,17 @@
movl PCB_GSBASE(%r8),%eax
movl PCB_GSBASE+4(%r8),%edx
.globl ld_gsbase
-ld_gsbase: wrmsr
-1: .globl ld_es
-ld_es: movw TF_ES(%rsp),%es
+ld_gsbase:
+ wrmsr
+1:
+ .globl ld_es
+ld_es:
+ movw TF_ES(%rsp),%es
.globl ld_ds
-ld_ds: movw TF_DS(%rsp),%ds
-ld_regs:movq TF_RDI(%rsp),%rdi
+ld_ds:
+ movw TF_DS(%rsp),%ds
+ld_regs:
+ movq TF_RDI(%rsp),%rdi
movq TF_RSI(%rsp),%rsi
movq TF_RDX(%rsp),%rdx
movq TF_RCX(%rsp),%rcx
@@ -711,7 +720,8 @@
jz 1f /* keep running with kernel GS.base */
cli
swapgs
-1: addq $TF_RIP,%rsp /* skip over tf_err, tf_trapno */
+1:
+ addq $TF_RIP,%rsp /* skip over tf_err, tf_trapno */
.globl doreti_iret
doreti_iret:
iretq
@@ -738,7 +748,8 @@
testl $PSL_I,TF_RFLAGS(%rsp)
jz 1f
sti
-1: movw %fs,TF_FS(%rsp)
+1:
+ movw %fs,TF_FS(%rsp)
movw %gs,TF_GS(%rsp)
movw %es,TF_ES(%rsp)
movw %ds,TF_DS(%rsp)
@@ -768,7 +779,7 @@
.globl ds_load_fault
ds_load_fault:
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movq %rsp, %rdi
+ movq %rsp,%rdi
call trap
movw $KUDSEL,TF_DS(%rsp)
jmp doreti
@@ -777,7 +788,7 @@
.globl es_load_fault
es_load_fault:
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movq %rsp, %rdi
+ movq %rsp,%rdi
call trap
movw $KUDSEL,TF_ES(%rsp)
jmp doreti
@@ -786,7 +797,7 @@
.globl fs_load_fault
fs_load_fault:
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movq %rsp, %rdi
+ movq %rsp,%rdi
call trap
movw $KUF32SEL,TF_FS(%rsp)
jmp doreti
@@ -796,7 +807,7 @@
gs_load_fault:
popfq
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movq %rsp, %rdi
+ movq %rsp,%rdi
call trap
movw $KUG32SEL,TF_GS(%rsp)
jmp doreti
@@ -805,7 +816,7 @@
.globl fsbase_load_fault
fsbase_load_fault:
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movq %rsp, %rdi
+ movq %rsp,%rdi
call trap
movq PCPU(CURTHREAD),%r8
movq TD_PCB(%r8),%r8
@@ -816,7 +827,7 @@
.globl gsbase_load_fault
gsbase_load_fault:
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movq %rsp, %rdi
+ movq %rsp,%rdi
call trap
movq PCPU(CURTHREAD),%r8
movq TD_PCB(%r8),%r8
==== //depot/projects/soc2009/pgj_libstat/src/sys/arm/at91/if_ate.c#6 (text) ====
@@ -30,7 +30,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.44 2010/02/28 18:06:54 ticso Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.45 2010/05/03 07:32:50 sobomax Exp $");
#include
#include
@@ -272,8 +272,8 @@
ifp->if_ioctl = ateioctl;
ifp->if_init = ateinit;
ifp->if_baudrate = 10000000;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
ifp->if_linkmib = &sc->mibdata;
ifp->if_linkmiblen = sizeof(sc->mibdata);
==== //depot/projects/soc2009/pgj_libstat/src/sys/arm/xscale/ixp425/if_npe.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.20 2009/06/26 11:45:06 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.21 2010/05/03 07:32:50 sobomax Exp $");
/*
* Intel XScale NPE Ethernet driver.
@@ -360,7 +360,7 @@
ifp->if_ioctl = npeioctl;
ifp->if_init = npeinit;
IFQ_SET_MAXLEN(&ifp->if_snd, sc->txdma.nbuf - 1);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
ifp->if_linkmib = &sc->mibdata;
ifp->if_linkmiblen = sizeof(sc->mibdata);
==== //depot/projects/soc2009/pgj_libstat/src/sys/compat/linux/linux_ioctl.c#5 (text+ko) ====
@@ -29,7 +29,7 @@
#include "opt_compat.h"
#include
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.163 2010/03/26 08:42:11 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.164 2010/05/03 14:19:58 netchild Exp $");
#include
#include
@@ -2628,6 +2628,7 @@
return (0);
}
+#ifdef COMPAT_LINUX_V4L_CLIPLIST
static int
linux_to_bsd_v4l_clip(struct l_video_clip *lvc, struct video_clip *vc)
{
@@ -2638,6 +2639,7 @@
vc->next = PTRIN(lvc->next); /* possible pointer size conversion */
return (0);
}
+#endif
static int
linux_to_bsd_v4l_window(struct l_video_window *lvw, struct video_window *vw)
@@ -2698,6 +2700,7 @@
return (0);
}
+#ifdef COMPAT_LINUX_V4L_CLIPLIST
static int
linux_v4l_clip_copy(void *lvc, struct video_clip **ppvc)
{
@@ -2772,15 +2775,18 @@
* example of cliplist use.
*/
plvc = PTRIN(lvw->clips);
+ vw->clips = NULL;
ppvc = &(vw->clips);
while (clipcount-- > 0) {
- if (plvc == 0)
+ if (plvc == 0) {
error = EFAULT;
- if (!error)
+ break;
+ } else {
error = linux_v4l_clip_copy(plvc, ppvc);
- if (error) {
- linux_v4l_cliplist_free(vw);
- break;
+ if (error) {
+ linux_v4l_cliplist_free(vw);
+ break;
+ }
}
ppvc = &((*ppvc)->next);
plvc = PTRIN(((struct l_video_clip *) plvc)->next);
@@ -2795,6 +2801,7 @@
}
return (error);
}
+#endif
static int
linux_ioctl_v4l(struct thread *td, struct linux_ioctl_args *args)
@@ -2818,6 +2825,12 @@
case LINUX_VIDIOCGTUNER:
if ((error = fget(td, args->fd, &fp)) != 0)
return (error);
+ error = copyin((void *) args->arg, &l_vtun, sizeof(l_vtun));
+ if (error) {
+ fdrop(fp, td);
+ return (error);
+ }
+ linux_to_bsd_v4l_tuner(&l_vtun, &vtun);
error = fo_ioctl(fp, VIDIOCGTUNER, &vtun, td->td_ucred, td);
if (!error) {
bsd_to_linux_v4l_tuner(&vtun, &l_vtun);
@@ -2836,7 +2849,7 @@
return (error);
}
linux_to_bsd_v4l_tuner(&l_vtun, &vtun);
- error = fo_ioctl(fp, VIDIOCSMICROCODE, &vtun, td->td_ucred, td);
+ error = fo_ioctl(fp, VIDIOCSTUNER, &vtun, td->td_ucred, td);
fdrop(fp, td);
return (error);
@@ -2865,14 +2878,18 @@
return (error);
}
linux_to_bsd_v4l_window(&l_vwin, &vwin);
+#ifdef COMPAT_LINUX_V4L_CLIPLIST
error = linux_v4l_cliplist_copy(&l_vwin, &vwin);
if (error) {
fdrop(fp, td);
return (error);
}
+#endif
error = fo_ioctl(fp, VIDIOCSWIN, &vwin, td->td_ucred, td);
fdrop(fp, td);
+#ifdef COMPAT_LINUX_V4L_CLIPLIST
linux_v4l_cliplist_free(&vwin);
+#endif
return (error);
case LINUX_VIDIOCGFBUF:
@@ -2924,7 +2941,7 @@
return (error);
}
linux_to_bsd_v4l_code(&l_vcode, &vcode);
- error = fo_ioctl(fp, VIDIOCSTUNER, &vcode, td->td_ucred, td);
+ error = fo_ioctl(fp, VIDIOCSMICROCODE, &vcode, td->td_ucred, td);
fdrop(fp, td);
return (error);
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/ae/if_ae.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/ae/if_ae.c,v 1.9 2010/01/10 14:48:42 gavin Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ae/if_ae.c,v 1.10 2010/05/03 07:32:50 sobomax Exp $");
#include
#include
@@ -378,7 +378,7 @@
ifp->if_init = ae_init;
ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING;
ifp->if_hwassist = 0;
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen);
IFQ_SET_READY(&ifp->if_snd);
if (pci_find_extcap(dev, PCIY_PMG, &pmc) == 0) {
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/agp/agp.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.67 2010/01/07 21:01:37 mbr Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/agp/agp.c,v 1.68 2010/05/03 16:55:50 alc Exp $");
#include "opt_agp.h"
#include "opt_bus.h"
@@ -623,9 +623,11 @@
m = vm_page_lookup(mem->am_obj, OFF_TO_IDX(k));
if (k >= i)
vm_page_wakeup(m);
+ vm_page_lock(m);
vm_page_lock_queues();
vm_page_unwire(m, 0);
vm_page_unlock_queues();
+ vm_page_unlock(m);
}
VM_OBJECT_UNLOCK(mem->am_obj);
@@ -657,9 +659,11 @@
VM_OBJECT_LOCK(mem->am_obj);
for (i = 0; i < mem->am_size; i += PAGE_SIZE) {
m = vm_page_lookup(mem->am_obj, atop(i));
+ vm_page_lock(m);
vm_page_lock_queues();
vm_page_unwire(m, 0);
vm_page_unlock_queues();
+ vm_page_unlock(m);
}
VM_OBJECT_UNLOCK(mem->am_obj);
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/agp/agp_i810.c#4 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.56 2010/03/12 21:34:23 rnoland Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/agp/agp_i810.c,v 1.57 2010/05/03 16:55:50 alc Exp $");
#include "opt_bus.h"
@@ -1010,10 +1010,12 @@
VM_OBJECT_LOCK(mem->am_obj);
m = vm_page_lookup(mem->am_obj, 0);
- VM_OBJECT_UNLOCK(mem->am_obj);
+ vm_page_lock(m);
vm_page_lock_queues();
vm_page_unwire(m, 0);
vm_page_unlock_queues();
+ vm_page_unlock(m);
+ VM_OBJECT_UNLOCK(mem->am_obj);
} else {
contigfree(sc->argb_cursor, mem->am_size, M_AGP);
sc->argb_cursor = NULL;
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_an.c#4 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.95 2009/11/24 16:57:35 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.96 2010/05/03 07:32:50 sobomax Exp $");
/*
* The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form.
@@ -767,8 +767,8 @@
ifp->if_start = an_start;
ifp->if_init = an_init;
ifp->if_baudrate = 10000000;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
bzero(sc->an_config.an_nodename, sizeof(sc->an_config.an_nodename));
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/if_ath.c#6 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.272 2010/04/10 13:54:00 bschmidt Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.273 2010/05/03 07:32:50 sobomax Exp $");
/*
* Driver for the Atheros Wireless LAN controller.
@@ -562,8 +562,8 @@
ifp->if_start = ath_start;
ifp->if_ioctl = ath_ioctl;
ifp->if_init = ath_init;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
ic->ic_ifp = ifp;
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwi/if_bwi.c#5 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/bwi/if_bwi.c,v 1.11 2010/04/07 17:49:47 rpaulo Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bwi/if_bwi.c,v 1.12 2010/05/03 07:32:50 sobomax Exp $");
#include "opt_inet.h"
#include "opt_bwi.h"
@@ -461,8 +461,8 @@
ifp->if_init = bwi_init;
ifp->if_ioctl = bwi_ioctl;
ifp->if_start = bwi_start;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
callout_init_mtx(&sc->sc_watchdog_timer, &sc->sc_mtx, 0);
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/bwn/if_bwn.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/bwn/if_bwn.c,v 1.16 2010/04/24 23:32:24 weongyo Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bwn/if_bwn.c,v 1.17 2010/05/03 07:32:50 sobomax Exp $");
/*
* The Broadcom Wireless LAN controller driver.
@@ -1193,8 +1193,8 @@
ifp->if_init = bwn_init;
ifp->if_ioctl = bwn_ioctl;
ifp->if_start = bwn_start;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+ ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
IFQ_SET_READY(&ifp->if_snd);
return (0);
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/ce/if_ce.c#4 (text+ko) ====
@@ -16,7 +16,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/ce/if_ce.c,v 1.16 2009/11/17 16:43:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ce/if_ce.c,v 1.17 2010/05/03 07:32:50 sobomax Exp $");
#include
@@ -701,9 +701,9 @@
#endif
continue;
}
- d->queue.ifq_maxlen = IFQ_MAXLEN;
- d->hi_queue.ifq_maxlen = IFQ_MAXLEN;
- d->rqueue.ifq_maxlen = IFQ_MAXLEN;
+ d->queue.ifq_maxlen = ifqmaxlen;
+ d->hi_queue.ifq_maxlen = ifqmaxlen;
+ d->rqueue.ifq_maxlen = ifqmaxlen;
#if __FreeBSD_version >= 500000
mtx_init (&d->queue.ifq_mtx, "ce_queue", NULL, MTX_DEF);
mtx_init (&d->hi_queue.ifq_mtx, "ce_queue_hi", NULL, MTX_DEF);
@@ -732,7 +732,7 @@
d->ifp->if_ioctl = ce_sioctl;
d->ifp->if_start = ce_ifstart;
d->ifp->if_init = ce_initialize;
- d->rqueue.ifq_maxlen = IFQ_MAXLEN;
+ d->rqueue.ifq_maxlen = ifqmaxlen;
#if __FreeBSD_version >= 500000
mtx_init (&d->rqueue.ifq_mtx, "ce_rqueue", NULL, MTX_DEF);
#endif
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/cm/smc90cx6.c#4 (text+ko) ====
@@ -1,7 +1,7 @@
/* $NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */
#include
-__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.22 2010/03/01 16:52:11 joel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.23 2010/05/03 07:32:50 sobomax Exp $");
/*-
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -189,7 +189,7 @@
ifp->if_ioctl = cm_ioctl;
ifp->if_init = cm_init;
/* XXX IFQ_SET_READY(&ifp->if_snd); */
- ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
+ ifp->if_snd.ifq_maxlen = ifqmaxlen;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX;
arc_ifattach(ifp, linkaddress);
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/cp/if_cp.c#4 (text+ko) ====
@@ -22,7 +22,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.39 2009/11/17 16:43:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.40 2010/05/03 07:32:50 sobomax Exp $");
#include
#include
@@ -505,8 +505,8 @@
NG_NODE_UNREF (d->node);
continue;
}
- d->queue.ifq_maxlen = IFQ_MAXLEN;
- d->hi_queue.ifq_maxlen = IFQ_MAXLEN;
+ d->queue.ifq_maxlen = ifqmaxlen;
+ d->hi_queue.ifq_maxlen = ifqmaxlen;
mtx_init (&d->queue.ifq_mtx, "cp_queue", NULL, MTX_DEF);
mtx_init (&d->hi_queue.ifq_mtx, "cp_queue_hi", NULL, MTX_DEF);
#else /*NETGRAPH*/
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/cs/if_cs.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.57 2010/01/18 17:52:57 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.58 2010/05/03 07:32:50 sobomax Exp $");
/*
*
@@ -500,7 +500,7 @@
ifp->if_start=cs_start;
ifp->if_ioctl=cs_ioctl;
ifp->if_init=cs_init;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
+ IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
ifp->if_flags=(IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/ctau/if_ct.c#4 (text+ko) ====
@@ -22,7 +22,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.40 2009/11/17 16:43:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.41 2010/05/03 07:32:50 sobomax Exp $");
#include
#include
@@ -722,8 +722,8 @@
ct_bus_dma_mem_free (&d->dmamem);
continue;
}
- d->queue.ifq_maxlen = IFQ_MAXLEN;
- d->hi_queue.ifq_maxlen = IFQ_MAXLEN;
+ d->queue.ifq_maxlen = ifqmaxlen;
+ d->hi_queue.ifq_maxlen = ifqmaxlen;
mtx_init (&d->queue.ifq_mtx, "ct_queue", NULL, MTX_DEF);
mtx_init (&d->hi_queue.ifq_mtx, "ct_queue_hi", NULL, MTX_DEF);
#else /*NETGRAPH*/
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/cx/if_cx.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.62 2009/11/17 16:43:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.63 2010/05/03 07:32:50 sobomax Exp $");
#include
@@ -831,8 +831,8 @@
cx_bus_dma_mem_free (&d->dmamem);
continue;
}
- d->lo_queue.ifq_maxlen = IFQ_MAXLEN;
- d->hi_queue.ifq_maxlen = IFQ_MAXLEN;
+ d->lo_queue.ifq_maxlen = ifqmaxlen;
+ d->hi_queue.ifq_maxlen = ifqmaxlen;
mtx_init (&d->lo_queue.ifq_mtx, "cx_queue_lo", NULL, MTX_DEF);
mtx_init (&d->hi_queue.ifq_mtx, "cx_queue_hi", NULL, MTX_DEF);
#else /*NETGRAPH*/
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/cxgb_main.c#7 (text+ko) ====
@@ -28,7 +28,7 @@
***************************************************************************/
#include
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.106 2010/04/02 17:50:52 np Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.107 2010/05/03 07:32:50 sobomax Exp $");
#include
#include
@@ -1012,7 +1012,7 @@
ifp->if_ioctl = cxgb_ioctl;
ifp->if_start = cxgb_start;
- ifp->if_snd.ifq_drv_maxlen = cxgb_snd_queue_len;
+ ifp->if_snd.ifq_drv_maxlen = max(cxgb_snd_queue_len, ifqmaxlen);
IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen);
IFQ_SET_READY(&ifp->if_snd);
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/via_dmablit.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/drm/via_dmablit.c,v 1.2 2010/04/30 00:46:43 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/drm/via_dmablit.c,v 1.3 2010/05/03 16:55:50 alc Exp $");
/*
* Unmaps the DMA mappings.
@@ -178,9 +178,11 @@
case dr_via_pages_locked:
for (i=0; i < vsg->num_pages; ++i) {
if ( NULL != (page = vsg->pages[i])) {
+ vm_page_lock(page);
vm_page_lock_queues();
vm_page_unwire(page, 0);
vm_page_unlock_queues();
+ vm_page_unlock(page);
}
}
case dr_via_pages_alloc:
==== //depot/projects/soc2009/pgj_libstat/src/sys/dev/ed/if_ed.c#5 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include
-__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.283 2009/11/17 14:23:09 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.284 2010/05/03 07:32:50 sobomax Exp $");
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -283,8 +283,8 @@
ifp->if_start = ed_start;
ifp->if_ioctl = ed_ioctl;
ifp->if_init = ed_init;
- IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
- ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon May 3 21:03:49 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id CAA9D1065670; Mon, 3 May 2010 21:03:49 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 8EE98106564A
for ; Mon, 3 May 2010 21:03:49 +0000 (UTC)
(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
by mx1.freebsd.org (Postfix) with ESMTP id 7B6708FC14
for ; Mon, 3 May 2010 21:03:49 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o43L3nDT081082
for ; Mon, 3 May 2010 21:03:49 GMT
(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o43L3nah081080
for perforce@freebsd.org; Mon, 3 May 2010 21:03:49 GMT
(envelope-from anchie@FreeBSD.org)
Date: Mon, 3 May 2010 21:03:49 GMT
Message-Id: <201005032103.o43L3nah081080@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
anchie@FreeBSD.org using -f
From: Ana Kukec
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 177677 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Mon, 03 May 2010 21:03:50 -0000
http://p4web.freebsd.org/@@177677?ac=10
Change 177677 by anchie@anchie_malimis on 2010/05/03 21:03:44
Getting rid of the global variable V_send_so from files other then
send.[ch].
Affected files ...
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#39 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#29 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#16 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#10 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#43 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#21 edit
Differences ...
==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#39 (text+ko) ====
@@ -424,7 +424,7 @@
int icmp6len = m->m_pkthdr.len - *offp;
int code, sum, noff;
char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN];
- int ip6len;
+ int ip6len, error = -1;
ifp = m->m_pkthdr.rcvif;
@@ -780,24 +780,37 @@
/* give up local */
/* Send incoming SeND-protected/ND packet to user space. */
- if (send_sendso_input_hook != NULL && V_send_so != NULL) {
- IP6_EXTHDR_CHECK(m, off, icmp6len, IPPROTO_DONE);
- printf("send_sendso_input_hook\n");
- send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
- } else {
+ if (send_sendso_input_hook != NULL) {
+ IP6_EXTHDR_CHECK(m, off,
+ icmp6len, IPPROTO_DONE);
+ error = send_sendso_input_hook(m,
+ SND_IN, ip6len);
+ /* -1 == no app on SEND socket */
+ if (!error)
+ return (IPPROTO_DONE);
+ }
+ if ((send_sendso_input_hook != NULL
+ && error == -1) ||
+ send_sendso_input_hook == NULL) {
/* give up local */
nd6_rs_input(m, off, icmp6len);
}
m = NULL;
goto freeit;
}
- if (send_sendso_input_hook != NULL && V_send_so != NULL) {
- IP6_EXTHDR_CHECK(m, off, icmp6len, IPPROTO_DONE);
- printf("send_sendso_input_hook\n");
- send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
- return (IPPROTO_DONE);
- } else
+ if (send_sendso_input_hook != NULL) {
+ IP6_EXTHDR_CHECK(m, off,
+ icmp6len, IPPROTO_DONE);
+ error = send_sendso_input_hook(n,
+ SND_IN, ip6len);
+ /* -1 == no app on SEND socket */
+ if (!error)
+ return (IPPROTO_DONE);
+ }
+ if ((send_sendso_input_hook != NULL && error == -1)
+ || (send_sendso_input_hook == NULL)) {
nd6_rs_input(n, off, icmp6len);
+ }
/* m stays. */
break;
@@ -810,20 +823,30 @@
if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
/* Send incoming SeND-protected/ND packet to user space. */
- if (send_sendso_input_hook != NULL && V_send_so != NULL) {
-
- send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
- return (IPPROTO_DONE);
- } else
+ if (send_sendso_input_hook != NULL) {
+ error = send_sendso_input_hook(m,
+ SND_IN, ip6len);
+ if (!error)
+ return (IPPROTO_DONE);
+ }
+ if ((send_sendso_input_hook != NULL
+ && error == -1) ||
+ send_sendso_input_hook == NULL) {
nd6_ra_input(m, off, icmp6len);
+ }
m = NULL;
goto freeit;
}
- if (send_sendso_input_hook != NULL && V_send_so != NULL) {
- send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
- return (IPPROTO_DONE);
- } else
+ if (send_sendso_input_hook != NULL) {
+ error = send_sendso_input_hook(n,
+ SND_IN, ip6len);
+ if (!error)
+ return (IPPROTO_DONE);
+ }
+ if ((send_sendso_input_hook != NULL && error == -1)
+ || (send_sendso_input_hook == NULL)) {
nd6_ra_input(n, off, icmp6len);
+ }
/* m stays. */
break;
@@ -834,23 +857,27 @@
if (icmp6len < sizeof(struct nd_neighbor_solicit))
goto badlen;
if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
- if (send_sendso_input_hook != NULL && V_send_so != NULL) {
- /* Send incoming SeND/ND packet to user space. */
- printf("%s: send_sendso_input_hook m=%p\n", __func__, m);
- send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
- } else {
+ if (send_sendso_input_hook != NULL) {
+ error = send_sendso_input_hook(m,
+ SND_IN, ip6len);
+ }
+ if ((send_sendso_input_hook != NULL
+ && error == -1) ||
+ send_sendso_input_hook == NULL) {
/* give up local */
nd6_ns_input(m, off, icmp6len);
}
m = NULL;
goto freeit;
}
- if (send_sendso_input_hook != NULL && V_send_so != NULL) {
- /* Send incoming SeND/ND packet to user space. */
- printf("%s: send_sendso_input_hook n=%p\n", __func__, n);
- send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
- } else
+ if (send_sendso_input_hook != NULL) {
+ error = send_sendso_input_hook(n,
+ SND_IN, ip6len);
+ }
+ if ((send_sendso_input_hook != NULL && error == -1)
+ || (send_sendso_input_hook == NULL)) {
nd6_ns_input(n, off, icmp6len);
+ }
/* m stays. */
break;
@@ -863,20 +890,29 @@
if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
/* Send incoming SeND-protected/ND packet to user space. */
- if (send_sendso_input_hook != NULL && V_send_so != NULL) {
- send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
- return (IPPROTO_DONE);
- } else {
+ if (send_sendso_input_hook != NULL) {
+ error = send_sendso_input_hook(m,
+ SND_IN, ip6len);
+ if (!error)
+ return (IPPROTO_DONE);
+ }
+ if ((send_sendso_input_hook != NULL
+ && error == -1) ||
+ send_sendso_input_hook == NULL) {
/* give up local */
nd6_na_input(m, off, icmp6len);
}
m = NULL;
goto freeit;
}
- if (send_sendso_input_hook != NULL)
- send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
- else
+ if (send_sendso_input_hook != NULL) {
+ error = send_sendso_input_hook(n,
+ SND_IN, ip6len);
+ }
+ if ((send_sendso_input_hook != NULL && error == -1)
+ || (send_sendso_input_hook == NULL)) {
nd6_na_input(n, off, icmp6len);
+ }
/* m stays. */
break;
@@ -887,23 +923,35 @@
if (icmp6len < sizeof(struct nd_redirect))
goto badlen;
if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
-
- /* Send incoming SeND-protected/ND packet to user space. */
- if (send_sendso_input_hook != NULL && V_send_so != NULL) {
- send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
- return (IPPROTO_DONE);
- } else {
+ if (send_sendso_input_hook != NULL) {
+ error = send_sendso_input_hook(m,
+ SND_IN, ip6len);
+ if (!error)
+ return (IPPROTO_DONE);
+ else
+ goto freeit;
+ }
+ if ((send_sendso_input_hook != NULL
+ && error == -1) ||
+ send_sendso_input_hook == NULL) {
/* give up local */
icmp6_redirect_input(m, off);
}
m = NULL;
goto freeit;
}
- if (send_sendso_input_hook != NULL && V_send_so != NULL) {
- send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
- return (IPPROTO_DONE);
- } else
+ if (send_sendso_input_hook != NULL) {
+ error = send_sendso_input_hook(n,
+ SND_IN, ip6len);
+ if (!error)
+ return (IPPROTO_DONE);
+ else
+ goto freeit;
+ }
+ if ((send_sendso_input_hook != NULL && error == -1)
+ || (send_sendso_input_hook == NULL)) {
icmp6_redirect_input(n, off);
+ }
/* m stays. */
break;
@@ -2805,7 +2853,7 @@
nd_rd->nd_rd_cksum = in6_cksum(m, IPPROTO_ICMPV6,
sizeof(*ip6), ntohs(ip6->ip6_plen));
- if (send_sendso_input_hook != NULL && V_send_so != NULL) {
+ if (send_sendso_input_hook != NULL) {
mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short),
M_NOWAIT);
if (mtag == NULL)
==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#29 (text+ko) ====
@@ -113,7 +113,7 @@
static struct sockaddr_in6 all1_sa;
-int (*send_sendso_input_hook)(struct socket *, struct mbuf *, int, int);
+int (*send_sendso_input_hook)(struct mbuf *, int, int);
static int nd6_is_new_addr_neighbor __P((struct sockaddr_in6 *,
struct ifnet *));
@@ -1803,9 +1803,10 @@
struct m_tag *mtag;
struct llentry *ln = lle;
struct ip6_hdr *ip6;
- int error = 0;
+ int error = -1;
int flags = 0;
- int ip6len, skip = 0;
+ int ip6len;
+ int skip;
unsigned short *nd_type;
ip6 = mtod(m, struct ip6_hdr *);
@@ -1985,15 +1986,19 @@
mac_netinet6_nd6_send(ifp, m);
#endif
+ skip = 0;
/* send outgoing NS/NA/REDIRECT packet to sendd. */
- if (send_sendso_input_hook != NULL && V_send_so != NULL) {
+ if (send_sendso_input_hook != NULL) {
mtag = m_tag_find(m, PACKET_TAG_ND_OUTGOING, NULL);
if (mtag != NULL) {
skip = 1;
nd_type = (unsigned short *)(mtag + 1);
/* Use the SEND socket */
- return (send_sendso_input_hook(V_send_so,
- m, SND_OUT, ip6len);
+ error = send_sendso_input_hook(m, SND_OUT,
+ ip6len);
+ /* -1 == no app on SEND socket */
+ if (error == 0 && error != -1)
+ return (error);
}
}
==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#16 (text+ko) ====
@@ -569,9 +569,9 @@
nd_ns->nd_ns_cksum =
in6_cksum(m, IPPROTO_ICMPV6, sizeof(*ip6), icmp6len);
- if (send_sendso_input_hook != NULL && V_send_so != NULL) {
- mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short),
- M_NOWAIT);
+ if (send_sendso_input_hook != NULL) {
+ mtag = m_tag_get(PACKET_TAG_ND_OUTGOING,
+ sizeof(unsigned short), M_NOWAIT);
if (mtag == NULL)
goto bad;
*(unsigned short *)(mtag + 1) = nd_ns->nd_ns_type;
@@ -896,7 +896,7 @@
* the 2nd argument as the 1st one.
*/
- if (send_sendso_input_hook != NULL && V_send_so != NULL) {
+ if (send_sendso_input_hook != NULL) {
mtag = m_tag_get(PACKET_TAG_ND_OUTGOING,
sizeof(unsigned short), M_NOWAIT);
if (mtag == NULL)
@@ -1091,8 +1091,9 @@
nd_na->nd_na_cksum =
in6_cksum(m, IPPROTO_ICMPV6, sizeof(struct ip6_hdr), icmp6len);
- if (send_sendso_input_hook != NULL && V_send_so != NULL) {
- mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short),
+ if (send_sendso_input_hook != NULL) {
+ mtag = m_tag_get(PACKET_TAG_ND_OUTGOING,
+ sizeof(unsigned short),
M_NOWAIT);
if (mtag == NULL)
goto bad;
==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#10 (text+ko) ====
@@ -535,8 +535,7 @@
* Send RA/RS messages to user land for protection, before sending
* them to rtadvd/rtsol.
*/
- if (send_sendso_input_hook != NULL &&
- V_send_so != NULL &&
+ if ((send_sendso_input_hook != NULL) &&
so->so_proto->pr_protocol == IPPROTO_ICMPV6) {
switch (type) {
case ND_ROUTER_ADVERT:
==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#43 (text+ko) ====
@@ -195,12 +195,15 @@
* Send a message to the SEND daemon on the SEND socket.
*/
static int
-send_sendso_input(struct socket *s, struct mbuf *m, int direction, int msglen)
+send_sendso_input(struct mbuf *m, int direction, int msglen)
{
u_int len;
struct ip6_hdr *ip6;
struct snd_hdr *snd_hdr = NULL;
+ if (V_send_so == NULL)
+ goto freeit;
+
/*
* Make sure to clear any possible internally embedded scope before
* passing the packet to userspace for SeND cryptographic signature
@@ -225,15 +228,14 @@
* protected (outgoing) or validated (incoming) according to rfc3971.
*/
- if (s) {
- SOCKBUF_LOCK(&s->so_rcv);
- sbappendrecord_locked(&s->so_rcv, m);
- sorwakeup_locked(s);
- return (0);
- }
+ SOCKBUF_LOCK(&s->so_rcv);
+ sbappendrecord_locked(&s->so_rcv, m);
+ sorwakeup_locked(s);
+ return (0);
+freeit:
m_freem(m);
- return -1;
+ return (-1);
}
static void
==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#21 (text+ko) ====
@@ -34,4 +34,4 @@
int ifidx;
};
-extern int (*send_sendso_input_hook)(struct socket *, struct mbuf *, int, int);
+extern int (*send_sendso_input_hook)(struct mbuf *, int, int);
From owner-p4-projects@FreeBSD.ORG Mon May 3 21:52:39 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 679391065673; Mon, 3 May 2010 21:52:39 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 2C442106564A
for ; Mon, 3 May 2010 21:52:39 +0000 (UTC)
(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
by mx1.freebsd.org (Postfix) with ESMTP id 19F7F8FC0C
for ; Mon, 3 May 2010 21:52:39 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o43LqcZA084924
for ; Mon, 3 May 2010 21:52:38 GMT
(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o43LqcBN084922
for perforce@freebsd.org; Mon, 3 May 2010 21:52:38 GMT
(envelope-from csjp@freebsd.org)
Date: Mon, 3 May 2010 21:52:38 GMT
Message-Id: <201005032152.o43LqcBN084922@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
csjp@freebsd.org using -f
From: "Christian S.J. Peron"
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 177682 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Mon, 03 May 2010 21:52:39 -0000
http://p4web.freebsd.org/@@177682?ac=10
Change 177682 by csjp@hvm02 on 2010/05/03 21:52:09
In addition to logging the audit records, drop a message in syslog
This only applies to the "bsm" logging format.
Affected files ...
.. //depot/projects/trustedbsd/bsmtrace/log.c#3 edit
Differences ...
==== //depot/projects/trustedbsd/bsmtrace/log.c#3 (text+ko) ====
@@ -123,6 +123,9 @@
* are dealing with a dynamic sequence, and the records are attached to
* each individual state.
*/
+ syslog(LOG_AUTH | LOG_NOTICE,
+ "%u.%u sequence match evidence file: %s", br->br_sec, br->br_usec,
+ path);
if ((bs->bs_seq_flags & BSM_SEQUENCE_PARENT) != 0) {
if (write(fd, br->br_raw, br->br_raw_len) < 0)
bsmtrace_error(1, "write failed");
From owner-p4-projects@FreeBSD.ORG Mon May 3 22:18:38 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 1E6C81065672; Mon, 3 May 2010 22:18:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id D6F6E106566C
for ; Mon, 3 May 2010 22:18:37 +0000 (UTC)
(envelope-from zec@icir.org)
Received: from munja.zvne.fer.hr (munja.zvne.fer.hr [161.53.66.248])
by mx1.freebsd.org (Postfix) with ESMTP id 3BA7C8FC0A
for ; Mon, 3 May 2010 22:18:36 +0000 (UTC)
Received: from sluga.fer.hr ([161.53.66.244]) by munja.zvne.fer.hr with
Microsoft SMTPSVC(6.0.3790.4675); Tue, 4 May 2010 00:06:29 +0200
Received: from localhost ([161.53.19.8]) by sluga.fer.hr over TLS secured
channel with Microsoft SMTPSVC(6.0.3790.4675);
Tue, 4 May 2010 00:06:28 +0200
From: Marko Zec
To: Ana Kukec
Date: Tue, 4 May 2010 00:06:10 +0200
User-Agent: KMail/1.9.10
References: <201005032103.o43L3nah081080@repoman.freebsd.org>
In-Reply-To: <201005032103.o43L3nah081080@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <201005040006.11204.zec@icir.org>
X-OriginalArrivalTime: 03 May 2010 22:06:29.0708 (UTC)
FILETIME=[E1FD28C0:01CAEB0C]
Cc: Perforce Change Reviews
Subject: Re: PERFORCE change 177677 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, 03 May 2010 22:18:38 -0000
On Monday 03 May 2010 23:03:49 Ana Kukec wrote:
> http://p4web.freebsd.org/@@177677?ac=10
>
> Change 177677 by anchie@anchie_malimis on 2010/05/03 21:03:44
>
> Getting rid of the global variable V_send_so from files other then
> send.[ch].
Just wondering - isn't this change actually increasing the possibility for a
race between packet datapath and send.ko kldloading / kldunloading? I.e. had
we kept the V_send_so variable global, we could (at least with more
confidence) avoid calling into send hooks when they are in an intermitent
state purely by checking whether V_send_so is NULL. Now we can't tell
whether another thread is just in the process of kldunloading the send module
while we are calling into one of the send hooks in our thread.
Also, if I'm not mistaking, even if send_sendso_input() returns an error, it
will have the mbuf consumed / freed, so any further attempts to do anything
with the mbuf will crash the system. Do we really want to do m_freem(m) at
the bottom of send_sendso_input()?
Marko
> Affected files ...
>
> .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#39 edit
> .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#29 edit
> .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#16 edit
> .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#10 edit
> .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#43 edit
> .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#21 edit
>
> Differences ...
>
> ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#39
> (text+ko) ====
>
> @@ -424,7 +424,7 @@
> int icmp6len = m->m_pkthdr.len - *offp;
> int code, sum, noff;
> char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN];
> - int ip6len;
> + int ip6len, error = -1;
>
> ifp = m->m_pkthdr.rcvif;
>
> @@ -780,24 +780,37 @@
> /* give up local */
>
> /* Send incoming SeND-protected/ND packet to user space. */
> - if (send_sendso_input_hook != NULL && V_send_so != NULL) {
> - IP6_EXTHDR_CHECK(m, off, icmp6len, IPPROTO_DONE);
> - printf("send_sendso_input_hook\n");
> - send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
> - } else {
> + if (send_sendso_input_hook != NULL) {
> + IP6_EXTHDR_CHECK(m, off,
> + icmp6len, IPPROTO_DONE);
> + error = send_sendso_input_hook(m,
> + SND_IN, ip6len);
> + /* -1 == no app on SEND socket */
> + if (!error)
> + return (IPPROTO_DONE);
> + }
> + if ((send_sendso_input_hook != NULL
> + && error == -1) ||
> + send_sendso_input_hook == NULL) {
> /* give up local */
> nd6_rs_input(m, off, icmp6len);
> }
> m = NULL;
> goto freeit;
> }
> - if (send_sendso_input_hook != NULL && V_send_so != NULL) {
> - IP6_EXTHDR_CHECK(m, off, icmp6len, IPPROTO_DONE);
> - printf("send_sendso_input_hook\n");
> - send_sendso_input_hook(V_send_so, n, SND_IN,
> ip6len); - return (IPPROTO_DONE);
> - } else
> + if (send_sendso_input_hook != NULL) {
> + IP6_EXTHDR_CHECK(m, off,
> + icmp6len, IPPROTO_DONE);
> + error = send_sendso_input_hook(n,
> + SND_IN, ip6len);
> + /* -1 == no app on SEND socket */
> + if (!error)
> + return (IPPROTO_DONE);
> + }
> + if ((send_sendso_input_hook != NULL && error == -1)
> + || (send_sendso_input_hook == NULL)) {
> nd6_rs_input(n, off, icmp6len);
> + }
> /* m stays. */
> break;
>
> @@ -810,20 +823,30 @@
> if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
>
> /* Send incoming SeND-protected/ND packet to user space. */
> - if (send_sendso_input_hook != NULL && V_send_so != NULL) {
> -
> - send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
> - return (IPPROTO_DONE);
> - } else
> + if (send_sendso_input_hook != NULL) {
> + error = send_sendso_input_hook(m,
> + SND_IN, ip6len);
> + if (!error)
> + return (IPPROTO_DONE);
> + }
> + if ((send_sendso_input_hook != NULL
> + && error == -1) ||
> + send_sendso_input_hook == NULL) {
> nd6_ra_input(m, off, icmp6len);
> + }
> m = NULL;
> goto freeit;
> }
> - if (send_sendso_input_hook != NULL && V_send_so != NULL) {
> - send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
> - return (IPPROTO_DONE);
> - } else
> + if (send_sendso_input_hook != NULL) {
> + error = send_sendso_input_hook(n,
> + SND_IN, ip6len);
> + if (!error)
> + return (IPPROTO_DONE);
> + }
> + if ((send_sendso_input_hook != NULL && error == -1)
> + || (send_sendso_input_hook == NULL)) {
> nd6_ra_input(n, off, icmp6len);
> + }
> /* m stays. */
> break;
>
> @@ -834,23 +857,27 @@
> if (icmp6len < sizeof(struct nd_neighbor_solicit))
> goto badlen;
> if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
> - if (send_sendso_input_hook != NULL && V_send_so != NULL) {
> - /* Send incoming SeND/ND packet to user space. */
> - printf("%s: send_sendso_input_hook m=%p\n", __func__, m);
> - send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
> - } else {
> + if (send_sendso_input_hook != NULL) {
> + error = send_sendso_input_hook(m,
> + SND_IN, ip6len);
> + }
> + if ((send_sendso_input_hook != NULL
> + && error == -1) ||
> + send_sendso_input_hook == NULL) {
> /* give up local */
> nd6_ns_input(m, off, icmp6len);
> }
> m = NULL;
> goto freeit;
> }
> - if (send_sendso_input_hook != NULL && V_send_so != NULL) {
> - /* Send incoming SeND/ND packet to user space. */
> - printf("%s: send_sendso_input_hook n=%p\n", __func__, n);
> - send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
> - } else
> + if (send_sendso_input_hook != NULL) {
> + error = send_sendso_input_hook(n,
> + SND_IN, ip6len);
> + }
> + if ((send_sendso_input_hook != NULL && error == -1)
> + || (send_sendso_input_hook == NULL)) {
> nd6_ns_input(n, off, icmp6len);
> + }
> /* m stays. */
> break;
>
> @@ -863,20 +890,29 @@
> if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
>
> /* Send incoming SeND-protected/ND packet to user space. */
> - if (send_sendso_input_hook != NULL && V_send_so != NULL) {
> - send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
> - return (IPPROTO_DONE);
> - } else {
> + if (send_sendso_input_hook != NULL) {
> + error = send_sendso_input_hook(m,
> + SND_IN, ip6len);
> + if (!error)
> + return (IPPROTO_DONE);
> + }
> + if ((send_sendso_input_hook != NULL
> + && error == -1) ||
> + send_sendso_input_hook == NULL) {
> /* give up local */
> nd6_na_input(m, off, icmp6len);
> }
> m = NULL;
> goto freeit;
> }
> - if (send_sendso_input_hook != NULL)
> - send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
> - else
> + if (send_sendso_input_hook != NULL) {
> + error = send_sendso_input_hook(n,
> + SND_IN, ip6len);
> + }
> + if ((send_sendso_input_hook != NULL && error == -1)
> + || (send_sendso_input_hook == NULL)) {
> nd6_na_input(n, off, icmp6len);
> + }
> /* m stays. */
> break;
>
> @@ -887,23 +923,35 @@
> if (icmp6len < sizeof(struct nd_redirect))
> goto badlen;
> if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
> -
> - /* Send incoming SeND-protected/ND packet to user space. */
> - if (send_sendso_input_hook != NULL && V_send_so != NULL) {
> - send_sendso_input_hook(V_send_so, m, SND_IN, ip6len);
> - return (IPPROTO_DONE);
> - } else {
> + if (send_sendso_input_hook != NULL) {
> + error = send_sendso_input_hook(m,
> + SND_IN, ip6len);
> + if (!error)
> + return (IPPROTO_DONE);
> + else
> + goto freeit;
> + }
> + if ((send_sendso_input_hook != NULL
> + && error == -1) ||
> + send_sendso_input_hook == NULL) {
> /* give up local */
> icmp6_redirect_input(m, off);
> }
> m = NULL;
> goto freeit;
> }
> - if (send_sendso_input_hook != NULL && V_send_so != NULL) {
> - send_sendso_input_hook(V_send_so, n, SND_IN, ip6len);
> - return (IPPROTO_DONE);
> - } else
> + if (send_sendso_input_hook != NULL) {
> + error = send_sendso_input_hook(n,
> + SND_IN, ip6len);
> + if (!error)
> + return (IPPROTO_DONE);
> + else
> + goto freeit;
> + }
> + if ((send_sendso_input_hook != NULL && error == -1)
> + || (send_sendso_input_hook == NULL)) {
> icmp6_redirect_input(n, off);
> + }
> /* m stays. */
> break;
>
> @@ -2805,7 +2853,7 @@
> nd_rd->nd_rd_cksum = in6_cksum(m, IPPROTO_ICMPV6,
> sizeof(*ip6), ntohs(ip6->ip6_plen));
>
> - if (send_sendso_input_hook != NULL && V_send_so != NULL) {
> + if (send_sendso_input_hook != NULL) {
> mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short),
> M_NOWAIT);
> if (mtag == NULL)
>
> ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#29
> (text+ko) ====
>
> @@ -113,7 +113,7 @@
>
> static struct sockaddr_in6 all1_sa;
>
> -int (*send_sendso_input_hook)(struct socket *, struct mbuf *, int, int);
> +int (*send_sendso_input_hook)(struct mbuf *, int, int);
>
> static int nd6_is_new_addr_neighbor __P((struct sockaddr_in6 *,
> struct ifnet *));
> @@ -1803,9 +1803,10 @@
> struct m_tag *mtag;
> struct llentry *ln = lle;
> struct ip6_hdr *ip6;
> - int error = 0;
> + int error = -1;
> int flags = 0;
> - int ip6len, skip = 0;
> + int ip6len;
> + int skip;
> unsigned short *nd_type;
>
> ip6 = mtod(m, struct ip6_hdr *);
> @@ -1985,15 +1986,19 @@
> mac_netinet6_nd6_send(ifp, m);
> #endif
>
> + skip = 0;
> /* send outgoing NS/NA/REDIRECT packet to sendd. */
> - if (send_sendso_input_hook != NULL && V_send_so != NULL) {
> + if (send_sendso_input_hook != NULL) {
> mtag = m_tag_find(m, PACKET_TAG_ND_OUTGOING, NULL);
> if (mtag != NULL) {
> skip = 1;
> nd_type = (unsigned short *)(mtag + 1);
> /* Use the SEND socket */
> - return (send_sendso_input_hook(V_send_so,
> - m, SND_OUT, ip6len);
> + error = send_sendso_input_hook(m, SND_OUT,
> + ip6len);
> + /* -1 == no app on SEND socket */
> + if (error == 0 && error != -1)
> + return (error);
> }
> }
>
>
> ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#16
> (text+ko) ====
>
> @@ -569,9 +569,9 @@
> nd_ns->nd_ns_cksum =
> in6_cksum(m, IPPROTO_ICMPV6, sizeof(*ip6), icmp6len);
>
> - if (send_sendso_input_hook != NULL && V_send_so != NULL) {
> - mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short),
> - M_NOWAIT);
> + if (send_sendso_input_hook != NULL) {
> + mtag = m_tag_get(PACKET_TAG_ND_OUTGOING,
> + sizeof(unsigned short), M_NOWAIT);
> if (mtag == NULL)
> goto bad;
> *(unsigned short *)(mtag + 1) = nd_ns->nd_ns_type;
> @@ -896,7 +896,7 @@
> * the 2nd argument as the 1st one.
> */
>
> - if (send_sendso_input_hook != NULL && V_send_so != NULL) {
> + if (send_sendso_input_hook != NULL) {
> mtag = m_tag_get(PACKET_TAG_ND_OUTGOING,
> sizeof(unsigned short), M_NOWAIT);
> if (mtag == NULL)
> @@ -1091,8 +1091,9 @@
> nd_na->nd_na_cksum =
> in6_cksum(m, IPPROTO_ICMPV6, sizeof(struct ip6_hdr), icmp6len);
>
> - if (send_sendso_input_hook != NULL && V_send_so != NULL) {
> - mtag = m_tag_get(PACKET_TAG_ND_OUTGOING, sizeof(unsigned short),
> + if (send_sendso_input_hook != NULL) {
> + mtag = m_tag_get(PACKET_TAG_ND_OUTGOING,
> + sizeof(unsigned short),
> M_NOWAIT);
> if (mtag == NULL)
> goto bad;
>
> ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#10
> (text+ko) ====
>
> @@ -535,8 +535,7 @@
> * Send RA/RS messages to user land for protection, before sending
> * them to rtadvd/rtsol.
> */
> - if (send_sendso_input_hook != NULL &&
> - V_send_so != NULL &&
> + if ((send_sendso_input_hook != NULL) &&
> so->so_proto->pr_protocol == IPPROTO_ICMPV6) {
> switch (type) {
> case ND_ROUTER_ADVERT:
>
> ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#43
> (text+ko) ====
>
> @@ -195,12 +195,15 @@
> * Send a message to the SEND daemon on the SEND socket.
> */
> static int
> -send_sendso_input(struct socket *s, struct mbuf *m, int direction, int
> msglen) +send_sendso_input(struct mbuf *m, int direction, int msglen)
> {
> u_int len;
> struct ip6_hdr *ip6;
> struct snd_hdr *snd_hdr = NULL;
>
> + if (V_send_so == NULL)
> + goto freeit;
> +
> /*
> * Make sure to clear any possible internally embedded scope before
> * passing the packet to userspace for SeND cryptographic signature
> @@ -225,15 +228,14 @@
> * protected (outgoing) or validated (incoming) according to rfc3971.
> */
>
> - if (s) {
> - SOCKBUF_LOCK(&s->so_rcv);
> - sbappendrecord_locked(&s->so_rcv, m);
> - sorwakeup_locked(s);
> - return (0);
> - }
> + SOCKBUF_LOCK(&s->so_rcv);
> + sbappendrecord_locked(&s->so_rcv, m);
> + sorwakeup_locked(s);
> + return (0);
>
> +freeit:
> m_freem(m);
> - return -1;
> + return (-1);
> }
>
> static void
>
> ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#21
> (text+ko) ====
>
> @@ -34,4 +34,4 @@
> int ifidx;
> };
>
> -extern int (*send_sendso_input_hook)(struct socket *, struct mbuf *,
> int, int); +extern int (*send_sendso_input_hook)(struct mbuf *, int,
> int);
From owner-p4-projects@FreeBSD.ORG Mon May 3 22:28:38 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id CB574106568C; Mon, 3 May 2010 22:28:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 8A3501065689
for ; Mon, 3 May 2010 22:28:38 +0000 (UTC)
(envelope-from gibbs@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
by mx1.freebsd.org (Postfix) with ESMTP id 75FE78FC0A
for ; Mon, 3 May 2010 22:28:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o43MScad088589
for ; Mon, 3 May 2010 22:28:38 GMT
(envelope-from gibbs@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o43MSECu088537
for perforce@freebsd.org; Mon, 3 May 2010 22:28:14 GMT
(envelope-from gibbs@freebsd.org)
Date: Mon, 3 May 2010 22:28:14 GMT
Message-Id: <201005032228.o43MSECu088537@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gibbs@freebsd.org using -f
From: "Justin T. Gibbs"
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 177684 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Mon, 03 May 2010 22:28:39 -0000
http://p4web.freebsd.org/@@177684?ac=10
Change 177684 by gibbs@gibbs-zfs on 2010/05/03 22:27:20
Rebase off of pjd's latest work.
Affected files ...
.. //depot/projects/zfs/COPYRIGHT#2 integrate
.. //depot/projects/zfs/MAINTAINERS#2 integrate
.. //depot/projects/zfs/Makefile#2 integrate
.. //depot/projects/zfs/Makefile.inc1#2 integrate
.. //depot/projects/zfs/ObsoleteFiles.inc#3 integrate
.. //depot/projects/zfs/UPDATING#3 integrate
.. //depot/projects/zfs/bin/cp/cp.1#2 integrate
.. //depot/projects/zfs/bin/cp/cp.c#2 integrate
.. //depot/projects/zfs/bin/cp/utils.c#2 integrate
.. //depot/projects/zfs/bin/csh/config.h#2 integrate
.. //depot/projects/zfs/bin/csh/config_p.h#2 integrate
.. //depot/projects/zfs/bin/date/Makefile#2 integrate
.. //depot/projects/zfs/bin/date/date.1#2 integrate
.. //depot/projects/zfs/bin/date/date.c#2 integrate
.. //depot/projects/zfs/bin/ed/Makefile#2 integrate
.. //depot/projects/zfs/bin/ed/main.c#2 integrate
.. //depot/projects/zfs/bin/kenv/kenv.c#2 integrate
.. //depot/projects/zfs/bin/kill/kill.c#2 integrate
.. //depot/projects/zfs/bin/ln/ln.c#2 integrate
.. //depot/projects/zfs/bin/ls/cmp.c#2 integrate
.. //depot/projects/zfs/bin/ls/ls.c#2 integrate
.. //depot/projects/zfs/bin/ls/ls.h#2 integrate
.. //depot/projects/zfs/bin/ls/print.c#2 integrate
.. //depot/projects/zfs/bin/pax/Makefile#2 integrate
.. //depot/projects/zfs/bin/pax/cpio.1#2 delete
.. //depot/projects/zfs/bin/pax/cpio.h#2 integrate
.. //depot/projects/zfs/bin/pax/ftree.c#2 integrate
.. //depot/projects/zfs/bin/pax/gen_subs.c#2 integrate
.. //depot/projects/zfs/bin/pax/getoldopt.c#2 integrate
.. //depot/projects/zfs/bin/pax/sel_subs.c#2 integrate
.. //depot/projects/zfs/bin/pax/tar.1#2 delete
.. //depot/projects/zfs/bin/pax/tar.h#2 integrate
.. //depot/projects/zfs/bin/pkill/Makefile#2 integrate
.. //depot/projects/zfs/bin/pkill/pkill.1#2 integrate
.. //depot/projects/zfs/bin/pkill/pkill.c#2 integrate
.. //depot/projects/zfs/bin/ps/extern.h#2 integrate
.. //depot/projects/zfs/bin/ps/keyword.c#3 integrate
.. //depot/projects/zfs/bin/ps/print.c#2 integrate
.. //depot/projects/zfs/bin/ps/ps.1#2 integrate
.. //depot/projects/zfs/bin/ps/ps.c#2 integrate
.. //depot/projects/zfs/bin/pwait/pwait.1#2 integrate
.. //depot/projects/zfs/bin/rcp/rcp.c#2 integrate
.. //depot/projects/zfs/bin/rmail/Makefile#2 integrate
.. //depot/projects/zfs/bin/setfacl/file.c#2 integrate
.. //depot/projects/zfs/bin/setfacl/mask.c#2 integrate
.. //depot/projects/zfs/bin/setfacl/merge.c#2 integrate
.. //depot/projects/zfs/bin/setfacl/remove.c#2 integrate
.. //depot/projects/zfs/bin/setfacl/setfacl.1#2 integrate
.. //depot/projects/zfs/bin/setfacl/setfacl.c#2 integrate
.. //depot/projects/zfs/bin/setfacl/setfacl.h#2 integrate
.. //depot/projects/zfs/bin/setfacl/util.c#2 integrate
.. //depot/projects/zfs/bin/sh/alias.c#2 integrate
.. //depot/projects/zfs/bin/sh/alias.h#2 integrate
.. //depot/projects/zfs/bin/sh/arith.h#2 integrate
.. //depot/projects/zfs/bin/sh/arith.y#2 integrate
.. //depot/projects/zfs/bin/sh/cd.c#3 integrate
.. //depot/projects/zfs/bin/sh/cd.h#2 integrate
.. //depot/projects/zfs/bin/sh/error.c#3 integrate
.. //depot/projects/zfs/bin/sh/error.h#3 integrate
.. //depot/projects/zfs/bin/sh/eval.c#3 integrate
.. //depot/projects/zfs/bin/sh/eval.h#2 integrate
.. //depot/projects/zfs/bin/sh/exec.c#2 integrate
.. //depot/projects/zfs/bin/sh/exec.h#2 integrate
.. //depot/projects/zfs/bin/sh/expand.c#2 integrate
.. //depot/projects/zfs/bin/sh/expand.h#2 integrate
.. //depot/projects/zfs/bin/sh/histedit.c#3 integrate
.. //depot/projects/zfs/bin/sh/input.c#3 integrate
.. //depot/projects/zfs/bin/sh/input.h#3 integrate
.. //depot/projects/zfs/bin/sh/jobs.c#3 integrate
.. //depot/projects/zfs/bin/sh/mail.c#2 integrate
.. //depot/projects/zfs/bin/sh/main.c#3 integrate
.. //depot/projects/zfs/bin/sh/main.h#2 integrate
.. //depot/projects/zfs/bin/sh/memalloc.c#2 integrate
.. //depot/projects/zfs/bin/sh/memalloc.h#2 integrate
.. //depot/projects/zfs/bin/sh/miscbltin.c#2 integrate
.. //depot/projects/zfs/bin/sh/mkbuiltins#2 integrate
.. //depot/projects/zfs/bin/sh/mkinit.c#2 integrate
.. //depot/projects/zfs/bin/sh/mksyntax.c#2 integrate
.. //depot/projects/zfs/bin/sh/myhistedit.h#2 integrate
.. //depot/projects/zfs/bin/sh/mystring.c#2 integrate
.. //depot/projects/zfs/bin/sh/options.c#2 integrate
.. //depot/projects/zfs/bin/sh/options.h#2 integrate
.. //depot/projects/zfs/bin/sh/output.c#3 integrate
.. //depot/projects/zfs/bin/sh/output.h#3 integrate
.. //depot/projects/zfs/bin/sh/parser.c#3 integrate
.. //depot/projects/zfs/bin/sh/parser.h#2 integrate
.. //depot/projects/zfs/bin/sh/sh.1#2 integrate
.. //depot/projects/zfs/bin/sh/show.c#2 integrate
.. //depot/projects/zfs/bin/sh/show.h#2 integrate
.. //depot/projects/zfs/bin/sh/trap.h#2 integrate
.. //depot/projects/zfs/bin/sh/var.c#3 integrate
.. //depot/projects/zfs/bin/sh/var.h#2 integrate
.. //depot/projects/zfs/bin/test/test.c#2 integrate
.. //depot/projects/zfs/cddl/Makefile.inc#2 integrate
.. //depot/projects/zfs/cddl/compat/opensolaris/include/fcntl.h#2 integrate
.. //depot/projects/zfs/cddl/compat/opensolaris/include/mnttab.h#2 integrate
.. //depot/projects/zfs/cddl/compat/opensolaris/include/priv.h#2 integrate
.. //depot/projects/zfs/cddl/compat/opensolaris/include/sha2.h#1 branch
.. //depot/projects/zfs/cddl/compat/opensolaris/include/solaris.h#2 integrate
.. //depot/projects/zfs/cddl/compat/opensolaris/include/thread_pool.h#1 branch
.. //depot/projects/zfs/cddl/compat/opensolaris/misc/fsshare.c#2 integrate
.. //depot/projects/zfs/cddl/compat/opensolaris/misc/mnttab.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zinject/translate.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zinject/zinject.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zinject/zinject.h#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zlook/zlook.c#1 branch
.. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/head/synch.h#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate
.. //depot/projects/zfs/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate
.. //depot/projects/zfs/cddl/lib/drti/Makefile#2 integrate
.. //depot/projects/zfs/cddl/lib/libavl/Makefile#2 integrate
.. //depot/projects/zfs/cddl/lib/libctf/Makefile#2 integrate
.. //depot/projects/zfs/cddl/lib/libdtrace/Makefile#2 integrate
.. //depot/projects/zfs/cddl/lib/libnvpair/Makefile#2 integrate
.. //depot/projects/zfs/cddl/lib/libumem/Makefile#2 integrate
.. //depot/projects/zfs/cddl/lib/libuutil/Makefile#2 integrate
.. //depot/projects/zfs/cddl/lib/libzfs/Makefile#2 integrate
.. //depot/projects/zfs/cddl/lib/libzpool/Makefile#2 integrate
.. //depot/projects/zfs/cddl/sbin/Makefile#2 integrate
.. //depot/projects/zfs/cddl/sbin/zfs/Makefile#2 integrate
.. //depot/projects/zfs/cddl/sbin/zpool/Makefile#2 integrate
.. //depot/projects/zfs/cddl/usr.bin/Makefile#2 integrate
.. //depot/projects/zfs/cddl/usr.bin/ctfconvert/Makefile#2 integrate
.. //depot/projects/zfs/cddl/usr.bin/ctfdump/Makefile#2 integrate
.. //depot/projects/zfs/cddl/usr.bin/ctfmerge/Makefile#2 integrate
.. //depot/projects/zfs/cddl/usr.bin/sgsmsg/Makefile#2 integrate
.. //depot/projects/zfs/cddl/usr.bin/zinject/Makefile#2 integrate
.. //depot/projects/zfs/cddl/usr.bin/zlook/Makefile#1 branch
.. //depot/projects/zfs/cddl/usr.bin/ztest/Makefile#3 integrate
.. //depot/projects/zfs/cddl/usr.sbin/dtrace/Makefile#2 integrate
.. //depot/projects/zfs/cddl/usr.sbin/lockstat/Makefile#2 integrate
.. //depot/projects/zfs/cddl/usr.sbin/zdb/Makefile#2 integrate
.. //depot/projects/zfs/contrib/bc/AUTHORS#2 delete
.. //depot/projects/zfs/contrib/bc/ChangeLog#2 delete
.. //depot/projects/zfs/contrib/bc/Examples/ckbook.b#2 delete
.. //depot/projects/zfs/contrib/bc/Examples/pi.b#2 delete
.. //depot/projects/zfs/contrib/bc/Examples/primes.b#2 delete
.. //depot/projects/zfs/contrib/bc/Examples/twins.b#2 delete
.. //depot/projects/zfs/contrib/bc/FAQ#2 delete
.. //depot/projects/zfs/contrib/bc/FREEBSD-upgrade#2 delete
.. //depot/projects/zfs/contrib/bc/INSTALL#2 delete
.. //depot/projects/zfs/contrib/bc/Makefile.am#2 delete
.. //depot/projects/zfs/contrib/bc/Makefile.in#2 delete
.. //depot/projects/zfs/contrib/bc/NEWS#2 delete
.. //depot/projects/zfs/contrib/bc/README#2 delete
.. //depot/projects/zfs/contrib/bc/Test/BUG.bc#2 delete
.. //depot/projects/zfs/contrib/bc/Test/array.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/arrayp.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/aryprm.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/atan.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/checklib.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/div.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/exp.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/fact.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/jn.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/ln.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/mul.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/raise.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/signum#2 delete
.. //depot/projects/zfs/contrib/bc/Test/sine.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/sqrt.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/sqrt1.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/sqrt2.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/testfn.b#2 delete
.. //depot/projects/zfs/contrib/bc/Test/timetest#2 delete
.. //depot/projects/zfs/contrib/bc/acconfig.h#2 delete
.. //depot/projects/zfs/contrib/bc/aclocal.m4#2 delete
.. //depot/projects/zfs/contrib/bc/bc/Makefile.am#2 delete
.. //depot/projects/zfs/contrib/bc/bc/Makefile.in#2 delete
.. //depot/projects/zfs/contrib/bc/bc/bc.y#2 delete
.. //depot/projects/zfs/contrib/bc/bc/bcdefs.h#2 delete
.. //depot/projects/zfs/contrib/bc/bc/const.h#2 delete
.. //depot/projects/zfs/contrib/bc/bc/execute.c#2 delete
.. //depot/projects/zfs/contrib/bc/bc/fix-libmath_h#2 delete
.. //depot/projects/zfs/contrib/bc/bc/global.c#2 delete
.. //depot/projects/zfs/contrib/bc/bc/global.h#2 delete
.. //depot/projects/zfs/contrib/bc/bc/libmath.b#2 delete
.. //depot/projects/zfs/contrib/bc/bc/libmath.h#2 delete
.. //depot/projects/zfs/contrib/bc/bc/load.c#2 delete
.. //depot/projects/zfs/contrib/bc/bc/main.c#2 delete
.. //depot/projects/zfs/contrib/bc/bc/proto.h#2 delete
.. //depot/projects/zfs/contrib/bc/bc/sbc.y#2 delete
.. //depot/projects/zfs/contrib/bc/bc/scan.l#2 delete
.. //depot/projects/zfs/contrib/bc/bc/storage.c#2 delete
.. //depot/projects/zfs/contrib/bc/bc/util.c#2 delete
.. //depot/projects/zfs/contrib/bc/config.h.in#2 delete
.. //depot/projects/zfs/contrib/bc/configure#2 delete
.. //depot/projects/zfs/contrib/bc/configure.in#2 delete
.. //depot/projects/zfs/contrib/bc/dc/Makefile.am#2 delete
.. //depot/projects/zfs/contrib/bc/dc/Makefile.in#2 delete
.. //depot/projects/zfs/contrib/bc/dc/array.c#2 delete
.. //depot/projects/zfs/contrib/bc/dc/dc-proto.h#2 delete
.. //depot/projects/zfs/contrib/bc/dc/dc-regdef.h#2 delete
.. //depot/projects/zfs/contrib/bc/dc/dc.c#2 delete
.. //depot/projects/zfs/contrib/bc/dc/dc.h#2 delete
.. //depot/projects/zfs/contrib/bc/dc/eval.c#2 delete
.. //depot/projects/zfs/contrib/bc/dc/misc.c#2 delete
.. //depot/projects/zfs/contrib/bc/dc/numeric.c#2 delete
.. //depot/projects/zfs/contrib/bc/dc/stack.c#2 delete
.. //depot/projects/zfs/contrib/bc/dc/string.c#2 delete
.. //depot/projects/zfs/contrib/bc/doc/Makefile.am#2 delete
.. //depot/projects/zfs/contrib/bc/doc/Makefile.in#2 delete
.. //depot/projects/zfs/contrib/bc/doc/bc.1#2 delete
.. //depot/projects/zfs/contrib/bc/doc/bc.texi#2 delete
.. //depot/projects/zfs/contrib/bc/doc/dc.1#2 delete
.. //depot/projects/zfs/contrib/bc/doc/dc.texi#2 delete
.. //depot/projects/zfs/contrib/bc/h/number.h#2 delete
.. //depot/projects/zfs/contrib/bc/install-sh#2 delete
.. //depot/projects/zfs/contrib/bc/lib/Makefile.am#2 delete
.. //depot/projects/zfs/contrib/bc/lib/Makefile.in#2 delete
.. //depot/projects/zfs/contrib/bc/lib/number.c#2 delete
.. //depot/projects/zfs/contrib/bc/lib/testmul.c#2 delete
.. //depot/projects/zfs/contrib/bc/lib/vfprintf.c#2 delete
.. //depot/projects/zfs/contrib/bc/missing#2 delete
.. //depot/projects/zfs/contrib/bc/mkinstalldirs#2 delete
.. //depot/projects/zfs/contrib/bc/stamp-h.in#2 delete
.. //depot/projects/zfs/contrib/bind9/CHANGES#3 integrate
.. //depot/projects/zfs/contrib/bind9/COPYRIGHT#2 integrate
.. //depot/projects/zfs/contrib/bind9/FAQ#2 integrate
.. //depot/projects/zfs/contrib/bind9/FAQ.xml#2 integrate
.. //depot/projects/zfs/contrib/bind9/NSEC3-NOTES#2 integrate
.. //depot/projects/zfs/contrib/bind9/README#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/check/named-checkconf.8#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/check/named-checkconf.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/check/named-checkzone.8#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/check/named-checkzone.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/check/named-checkzone.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dig/dig.1#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dig/dig.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dig/dighost.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dig/host.1#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dig/host.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dig/host.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dig/nslookup.1#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dig/nslookup.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dig/nslookup.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/named/control.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/named/include/named/server.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/named/lwresd.8#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/named/lwresd.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/named/named.8#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/named/named.conf.5#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/named/named.conf.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/named/named.docbook#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/named/named.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/named/query.c#3 integrate
.. //depot/projects/zfs/contrib/bind9/bin/named/server.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/named/statschannel.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/named/update.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/nsupdate/nsupdate.1#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/rndc/rndc.8#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/bin/rndc/rndc.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/config.h.in#2 integrate
.. //depot/projects/zfs/contrib/bind9/configure.in#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/man.dig.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/man.host.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/man.named.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/man.nsupdate.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/arm/man.rndc.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/doc/misc/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/api#3 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/db.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/dispatch.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/dnssec.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/dst_api.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/dst_internal.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/dst_parse.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/include/dns/db.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/include/dns/name.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/include/dns/nsec3.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/include/dns/result.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/include/dns/types.h#3 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/journal.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/masterdump.c#3 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/message.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/ncache.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/nsec3.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/rbt.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/rbtdb.c#3 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/rcode.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/rdatalist.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/rdataset.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/rdataslab.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/resolver.c#3 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/result.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/sdb.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/sdlz.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/spnego.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/validator.c#3 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/view.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/dns/zone.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/api#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/base32.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/base64.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/heap.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/httpd.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/include/isc/portset.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/include/isc/sha2.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/include/isc/util.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/inet_ntop.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/random.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/sha2.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isc/unix/socket.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isccc/api#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isccfg/aclconf.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isccfg/api#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/api#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/context.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/getipnode.c#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate
.. //depot/projects/zfs/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate
.. //depot/projects/zfs/contrib/bind9/version#3 integrate
.. //depot/projects/zfs/contrib/binutils/bfd/config.bfd#2 integrate
.. //depot/projects/zfs/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 integrate
.. //depot/projects/zfs/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate
.. //depot/projects/zfs/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#2 integrate
.. //depot/projects/zfs/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate
.. //depot/projects/zfs/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate
.. //depot/projects/zfs/contrib/bsnmp/snmp_mibII/mibII_begemot.c#2 integrate
.. //depot/projects/zfs/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate
.. //depot/projects/zfs/contrib/bsnmp/snmpd/config.c#2 integrate
.. //depot/projects/zfs/contrib/bsnmp/snmpd/snmpmod.3#2 integrate
.. //depot/projects/zfs/contrib/com_err/compile_et.1#2 integrate
.. //depot/projects/zfs/contrib/cpio/ABOUT-NLS#2 delete
.. //depot/projects/zfs/contrib/cpio/AUTHORS#2 delete
.. //depot/projects/zfs/contrib/cpio/COPYING#2 delete
.. //depot/projects/zfs/contrib/cpio/ChangeLog#2 delete
.. //depot/projects/zfs/contrib/cpio/FREEBSD-upgrade#2 delete
.. //depot/projects/zfs/contrib/cpio/INSTALL#2 delete
.. //depot/projects/zfs/contrib/cpio/NEWS#2 delete
.. //depot/projects/zfs/contrib/cpio/README#2 delete
.. //depot/projects/zfs/contrib/cpio/THANKS#2 delete
.. //depot/projects/zfs/contrib/cpio/TODO#2 delete
.. //depot/projects/zfs/contrib/cpio/doc/cpio.1#2 delete
.. //depot/projects/zfs/contrib/cpio/doc/cpio.texi#2 delete
.. //depot/projects/zfs/contrib/cpio/doc/version.texi#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/alloca_.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/argp-ba.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/argp-eexst.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/argp-fmtstream.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/argp-fmtstream.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/argp-fs-xinl.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/argp-help.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/argp-namefrob.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/argp-parse.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/argp-pin.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/argp-pv.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/argp-pvh.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/argp-xinl.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/argp.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/basename.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/dirname.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/dirname.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/error.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/error.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/exitfail.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/exitfail.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/fatal.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/full-write.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/full-write.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/getopt.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/getopt1.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/getopt_.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/getopt_int.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/gettext.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/hash.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/hash.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/intprops.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/inttostr.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/inttostr.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/mempcpy.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/paxerror.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/paxexit.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/paxlib.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/paxnames.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/quote.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/quote.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/quotearg.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/quotearg.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/rmt-command.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/rmt.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/rtapelib.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/safe-read.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/safe-read.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/safe-write.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/safe-write.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/savedir.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/savedir.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/strchrnul.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/stripslash.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/strndup.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/strnlen.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/system-ioctl.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/system.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/umaxtostr.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/unlocked-io.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/utimens.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/utimens.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/xalloc-die.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/xalloc.h#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/xmalloc.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/xstrndup.c#2 delete
.. //depot/projects/zfs/contrib/cpio/lib/xstrndup.h#2 delete
.. //depot/projects/zfs/contrib/cpio/src/copyin.c#2 delete
.. //depot/projects/zfs/contrib/cpio/src/copyout.c#2 delete
.. //depot/projects/zfs/contrib/cpio/src/copypass.c#2 delete
.. //depot/projects/zfs/contrib/cpio/src/cpio.h#2 delete
.. //depot/projects/zfs/contrib/cpio/src/cpiohdr.h#2 delete
.. //depot/projects/zfs/contrib/cpio/src/defer.c#2 delete
.. //depot/projects/zfs/contrib/cpio/src/defer.h#2 delete
.. //depot/projects/zfs/contrib/cpio/src/dstring.c#2 delete
.. //depot/projects/zfs/contrib/cpio/src/dstring.h#2 delete
.. //depot/projects/zfs/contrib/cpio/src/extern.h#2 delete
.. //depot/projects/zfs/contrib/cpio/src/filemode.c#2 delete
.. //depot/projects/zfs/contrib/cpio/src/filetypes.h#2 delete
.. //depot/projects/zfs/contrib/cpio/src/global.c#2 delete
.. //depot/projects/zfs/contrib/cpio/src/idcache.c#2 delete
.. //depot/projects/zfs/contrib/cpio/src/main.c#2 delete
.. //depot/projects/zfs/contrib/cpio/src/makepath.c#2 delete
.. //depot/projects/zfs/contrib/cpio/src/safe-stat.h#2 delete
.. //depot/projects/zfs/contrib/cpio/src/tar.c#2 delete
.. //depot/projects/zfs/contrib/cpio/src/tar.h#2 delete
.. //depot/projects/zfs/contrib/cpio/src/tarhdr.h#2 delete
.. //depot/projects/zfs/contrib/cpio/src/userspec.c#2 delete
.. //depot/projects/zfs/contrib/cpio/src/util.c#2 delete
.. //depot/projects/zfs/contrib/csup/GNUmakefile#2 delete
.. //depot/projects/zfs/contrib/csup/Makefile#2 delete
.. //depot/projects/zfs/contrib/csup/README#2 delete
.. //depot/projects/zfs/contrib/csup/TODO#2 delete
.. //depot/projects/zfs/contrib/csup/attrstack.c#2 delete
.. //depot/projects/zfs/contrib/csup/attrstack.h#2 delete
.. //depot/projects/zfs/contrib/csup/config.c#2 delete
.. //depot/projects/zfs/contrib/csup/config.h#2 delete
.. //depot/projects/zfs/contrib/csup/csup.1#2 delete
.. //depot/projects/zfs/contrib/csup/detailer.c#2 delete
.. //depot/projects/zfs/contrib/csup/detailer.h#2 delete
.. //depot/projects/zfs/contrib/csup/diff.c#2 delete
.. //depot/projects/zfs/contrib/csup/diff.h#2 delete
.. //depot/projects/zfs/contrib/csup/fattr.c#2 delete
.. //depot/projects/zfs/contrib/csup/fattr.h#2 delete
.. //depot/projects/zfs/contrib/csup/fattr_bsd.h#2 delete
.. //depot/projects/zfs/contrib/csup/fattr_posix.h#2 delete
.. //depot/projects/zfs/contrib/csup/fixups.c#2 delete
.. //depot/projects/zfs/contrib/csup/fixups.h#2 delete
.. //depot/projects/zfs/contrib/csup/fnmatch.c#2 delete
.. //depot/projects/zfs/contrib/csup/fnmatch.h#2 delete
.. //depot/projects/zfs/contrib/csup/globtree.c#2 delete
.. //depot/projects/zfs/contrib/csup/globtree.h#2 delete
.. //depot/projects/zfs/contrib/csup/idcache.c#2 delete
.. //depot/projects/zfs/contrib/csup/idcache.h#2 delete
.. //depot/projects/zfs/contrib/csup/keyword.c#2 delete
.. //depot/projects/zfs/contrib/csup/keyword.h#2 delete
.. //depot/projects/zfs/contrib/csup/lex.rcs.c#2 delete
.. //depot/projects/zfs/contrib/csup/lister.c#2 delete
.. //depot/projects/zfs/contrib/csup/lister.h#2 delete
.. //depot/projects/zfs/contrib/csup/main.c#2 delete
.. //depot/projects/zfs/contrib/csup/main.h#2 delete
.. //depot/projects/zfs/contrib/csup/misc.c#2 delete
.. //depot/projects/zfs/contrib/csup/misc.h#2 delete
.. //depot/projects/zfs/contrib/csup/mux.c#2 delete
.. //depot/projects/zfs/contrib/csup/mux.h#2 delete
.. //depot/projects/zfs/contrib/csup/parse.y#2 delete
.. //depot/projects/zfs/contrib/csup/pathcomp.c#2 delete
.. //depot/projects/zfs/contrib/csup/pathcomp.h#2 delete
.. //depot/projects/zfs/contrib/csup/proto.c#2 delete
.. //depot/projects/zfs/contrib/csup/proto.h#2 delete
.. //depot/projects/zfs/contrib/csup/queue.h#2 delete
.. //depot/projects/zfs/contrib/csup/rcsfile.c#2 delete
.. //depot/projects/zfs/contrib/csup/rcsfile.h#2 delete
.. //depot/projects/zfs/contrib/csup/rcsparse.c#2 delete
.. //depot/projects/zfs/contrib/csup/rcsparse.h#2 delete
.. //depot/projects/zfs/contrib/csup/rcstokenizer.h#2 delete
.. //depot/projects/zfs/contrib/csup/rcstokenizer.l#2 delete
.. //depot/projects/zfs/contrib/csup/rsyncfile.c#2 delete
.. //depot/projects/zfs/contrib/csup/rsyncfile.h#2 delete
.. //depot/projects/zfs/contrib/csup/status.c#2 delete
.. //depot/projects/zfs/contrib/csup/status.h#2 delete
.. //depot/projects/zfs/contrib/csup/stream.c#2 delete
.. //depot/projects/zfs/contrib/csup/stream.h#2 delete
.. //depot/projects/zfs/contrib/csup/threads.c#2 delete
.. //depot/projects/zfs/contrib/csup/threads.h#2 delete
.. //depot/projects/zfs/contrib/csup/token.h#2 delete
.. //depot/projects/zfs/contrib/csup/token.l#2 delete
.. //depot/projects/zfs/contrib/csup/updater.c#2 delete
.. //depot/projects/zfs/contrib/csup/updater.h#2 delete
.. //depot/projects/zfs/contrib/dtc/Documentation/dtc-paper.bib#1 branch
.. //depot/projects/zfs/contrib/dtc/Documentation/dtc-paper.tex#1 branch
.. //depot/projects/zfs/contrib/dtc/Documentation/dts-format.txt#1 branch
.. //depot/projects/zfs/contrib/dtc/Documentation/manual.txt#1 branch
.. //depot/projects/zfs/contrib/dtc/GPL#1 branch
.. //depot/projects/zfs/contrib/dtc/Makefile#1 branch
.. //depot/projects/zfs/contrib/dtc/Makefile.convert-dtsv0#1 branch
.. //depot/projects/zfs/contrib/dtc/Makefile.ftdump#1 branch
.. //depot/projects/zfs/contrib/dtc/README.license#1 branch
.. //depot/projects/zfs/contrib/dtc/TODO#1 branch
.. //depot/projects/zfs/contrib/dtc/checks.c#1 branch
.. //depot/projects/zfs/contrib/dtc/convert-dtsv0-lexer.l#1 branch
.. //depot/projects/zfs/contrib/dtc/data.c#1 branch
.. //depot/projects/zfs/contrib/dtc/dtc-lexer.l#1 branch
.. //depot/projects/zfs/contrib/dtc/dtc-parser.y#1 branch
.. //depot/projects/zfs/contrib/dtc/dtc.c#1 branch
.. //depot/projects/zfs/contrib/dtc/dtc.h#1 branch
.. //depot/projects/zfs/contrib/dtc/flattree.c#1 branch
.. //depot/projects/zfs/contrib/dtc/fstree.c#1 branch
.. //depot/projects/zfs/contrib/dtc/ftdump.c#1 branch
.. //depot/projects/zfs/contrib/dtc/libfdt/Makefile.libfdt#1 branch
.. //depot/projects/zfs/contrib/dtc/libfdt/TODO#1 branch
.. //depot/projects/zfs/contrib/dtc/libfdt/fdt.c#1 branch
.. //depot/projects/zfs/contrib/dtc/libfdt/fdt.h#1 branch
.. //depot/projects/zfs/contrib/dtc/libfdt/fdt_ro.c#1 branch
.. //depot/projects/zfs/contrib/dtc/libfdt/fdt_rw.c#1 branch
.. //depot/projects/zfs/contrib/dtc/libfdt/fdt_strerror.c#1 branch
.. //depot/projects/zfs/contrib/dtc/libfdt/fdt_sw.c#1 branch
.. //depot/projects/zfs/contrib/dtc/libfdt/fdt_wip.c#1 branch
.. //depot/projects/zfs/contrib/dtc/libfdt/libfdt.h#1 branch
.. //depot/projects/zfs/contrib/dtc/libfdt/libfdt_env.h#1 branch
.. //depot/projects/zfs/contrib/dtc/libfdt/libfdt_internal.h#1 branch
.. //depot/projects/zfs/contrib/dtc/libfdt/version.lds#1 branch
.. //depot/projects/zfs/contrib/dtc/livetree.c#1 branch
.. //depot/projects/zfs/contrib/dtc/scripts/setlocalversion#1 branch
.. //depot/projects/zfs/contrib/dtc/srcpos.c#1 branch
.. //depot/projects/zfs/contrib/dtc/srcpos.h#1 branch
.. //depot/projects/zfs/contrib/dtc/treesource.c#1 branch
.. //depot/projects/zfs/contrib/dtc/util.c#1 branch
.. //depot/projects/zfs/contrib/dtc/util.h#1 branch
.. //depot/projects/zfs/contrib/expat/lib/xmlparse.c#2 integrate
.. //depot/projects/zfs/contrib/expat/lib/xmltok_impl.c#2 integrate
.. //depot/projects/zfs/contrib/file/magic2mime#2 delete
.. //depot/projects/zfs/contrib/gcc/config/mips/freebsd.h#2 integrate
.. //depot/projects/zfs/contrib/gdb/gdb/config/mips/nm-fbsd.h#1 branch
.. //depot/projects/zfs/contrib/gdb/gdb/config/mips/tm-fbsd.h#1 branch
.. //depot/projects/zfs/contrib/gdb/gdb/mips-tdep.h#2 integrate
.. //depot/projects/zfs/contrib/gdb/gdb/mipsfbsd-nat.c#1 branch
.. //depot/projects/zfs/contrib/gdb/gdb/mipsfbsd-tdep.c#1 branch
.. //depot/projects/zfs/contrib/gdb/gdb/mipsfbsd-tdep.h#1 branch
.. //depot/projects/zfs/contrib/groff/font/devutf8/R.proto#2 integrate
.. //depot/projects/zfs/contrib/groff/tmac/an-old.tmac#2 integrate
.. //depot/projects/zfs/contrib/groff/tmac/doc-common#2 integrate
.. //depot/projects/zfs/contrib/groff/tmac/doc-old.tmac#2 integrate
.. //depot/projects/zfs/contrib/groff/tmac/doc-syms#2 integrate
.. //depot/projects/zfs/contrib/groff/tmac/doc.tmac#2 integrate
.. //depot/projects/zfs/contrib/groff/tmac/groff_mdoc.man#2 integrate
.. //depot/projects/zfs/contrib/ipfilter/ipsend/sbpf.c#2 integrate
.. //depot/projects/zfs/contrib/libpcap/inet.c#2 integrate
.. //depot/projects/zfs/contrib/netcat/FREEBSD-upgrade#2 integrate
.. //depot/projects/zfs/contrib/netcat/FREEBSD-vendor#2 integrate
.. //depot/projects/zfs/contrib/netcat/nc.1#2 integrate
.. //depot/projects/zfs/contrib/netcat/netcat.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/COPYRIGHT#2 integrate
.. //depot/projects/zfs/contrib/ntp/ChangeLog#2 integrate
.. //depot/projects/zfs/contrib/ntp/CommitLog#2 integrate
.. //depot/projects/zfs/contrib/ntp/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/NEWS#2 integrate
.. //depot/projects/zfs/contrib/ntp/README#2 integrate
.. //depot/projects/zfs/contrib/ntp/README.bk#2 integrate
.. //depot/projects/zfs/contrib/ntp/README.patches#2 integrate
.. //depot/projects/zfs/contrib/ntp/WHERE-TO-START#2 integrate
.. //depot/projects/zfs/contrib/ntp/aclocal.m4#2 integrate
.. //depot/projects/zfs/contrib/ntp/adjtimed/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/arlib/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/arlib/aclocal.m4#2 integrate
.. //depot/projects/zfs/contrib/ntp/arlib/configure#2 integrate
.. //depot/projects/zfs/contrib/ntp/build#2 integrate
.. //depot/projects/zfs/contrib/ntp/clockstuff/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/config.h.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/configure#2 integrate
.. //depot/projects/zfs/contrib/ntp/configure.ac#2 integrate
.. //depot/projects/zfs/contrib/ntp/flock-build#2 integrate
.. //depot/projects/zfs/contrib/ntp/html/build/hints/solaris.xtra.4095849#1 branch
.. //depot/projects/zfs/contrib/ntp/html/copyright.html#2 integrate
.. //depot/projects/zfs/contrib/ntp/html/drivers/driver40.html#2 integrate
.. //depot/projects/zfs/contrib/ntp/include/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/include/copyright.def#2 integrate
.. //depot/projects/zfs/contrib/ntp/include/isc/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/include/ntp_debug.h#2 integrate
.. //depot/projects/zfs/contrib/ntp/include/version.def#2 integrate
.. //depot/projects/zfs/contrib/ntp/kernel/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/kernel/sys/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/libntp/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/libopts/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/libparse/Makefile.am#2 integrate
.. //depot/projects/zfs/contrib/ntp/libparse/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/libparse/clk_rawdcf.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/cmd_args.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/ntp_crypto.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/ntp_intres.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/ntp_io.c#3 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/ntp_request.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/ntp_timer.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/ntpd-opts.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/ntpd-opts.h#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/ntpd-opts.texi#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/ntpd.1#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/ntpd.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/ntpdsim-opts.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/ntpdsim-opts.h#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/ntpdsim-opts.texi#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/ntpdsim.1#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/refclock_dumbclock.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/refclock_hopfser.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/refclock_jjy.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/refclock_nmea.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpd/refclock_palisade.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpdate/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpdc/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpdc/ntpdc-opts.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpdc/ntpdc-opts.h#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpdc/ntpdc-opts.texi#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpdc/ntpdc.1#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpq/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpq/ntpq-opts.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpq/ntpq-opts.h#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpq/ntpq-opts.texi#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpq/ntpq.1#2 integrate
.. //depot/projects/zfs/contrib/ntp/ntpq/ntpq.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/packageinfo.sh#2 integrate
.. //depot/projects/zfs/contrib/ntp/parseutil/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/scripts/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/sntp/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/sntp/aclocal.m4#2 integrate
.. //depot/projects/zfs/contrib/ntp/sntp/config.h.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/sntp/configure#2 integrate
.. //depot/projects/zfs/contrib/ntp/sntp/configure.ac#2 integrate
.. //depot/projects/zfs/contrib/ntp/sntp/libopts/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/sntp/sntp-opts.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/sntp/sntp-opts.def#2 integrate
.. //depot/projects/zfs/contrib/ntp/sntp/sntp-opts.h#2 integrate
.. //depot/projects/zfs/contrib/ntp/sntp/sntp-opts.texi#2 integrate
.. //depot/projects/zfs/contrib/ntp/sntp/sntp.1#2 integrate
.. //depot/projects/zfs/contrib/ntp/sntp/version.def#2 integrate
.. //depot/projects/zfs/contrib/ntp/util/Makefile.in#2 integrate
.. //depot/projects/zfs/contrib/ntp/util/ntp-keygen-opts.c#2 integrate
.. //depot/projects/zfs/contrib/ntp/util/ntp-keygen-opts.h#2 integrate
.. //depot/projects/zfs/contrib/ntp/util/ntp-keygen-opts.texi#2 integrate
.. //depot/projects/zfs/contrib/ntp/util/ntp-keygen.1#2 integrate
.. //depot/projects/zfs/contrib/ntp/version#2 integrate
.. //depot/projects/zfs/contrib/ntp/version.m4#2 integrate
.. //depot/projects/zfs/contrib/one-true-awk/FIXES#2 integrate
.. //depot/projects/zfs/contrib/one-true-awk/b.c#2 integrate
.. //depot/projects/zfs/contrib/one-true-awk/lib.c#2 integrate
.. //depot/projects/zfs/contrib/one-true-awk/mac.code#2 delete
.. //depot/projects/zfs/contrib/one-true-awk/main.c#2 integrate
.. //depot/projects/zfs/contrib/one-true-awk/makefile#2 integrate
.. //depot/projects/zfs/contrib/one-true-awk/maketab.c#2 integrate
.. //depot/projects/zfs/contrib/one-true-awk/proctab.c#2 integrate
.. //depot/projects/zfs/contrib/one-true-awk/proto.h#2 integrate
.. //depot/projects/zfs/contrib/one-true-awk/run.c#2 integrate
.. //depot/projects/zfs/contrib/openpam/include/security/pam_appl.h#2 integrate
.. //depot/projects/zfs/contrib/opie/libopie/getutmpentry.c#2 integrate
.. //depot/projects/zfs/contrib/opie/libopie/insecure.c#2 integrate
.. //depot/projects/zfs/contrib/opie/libopie/login.c#2 integrate
.. //depot/projects/zfs/contrib/pf/man/pf.conf.5#2 integrate
.. //depot/projects/zfs/contrib/pf/pfctl/parse.y#2 integrate
.. //depot/projects/zfs/contrib/pf/pfctl/pf_print_state.c#2 integrate
.. //depot/projects/zfs/contrib/pf/pfctl/pfctl_parser.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/CACerts#2 integrate
.. //depot/projects/zfs/contrib/sendmail/FREEBSD-upgrade#2 integrate
.. //depot/projects/zfs/contrib/sendmail/LICENSE#2 integrate
.. //depot/projects/zfs/contrib/sendmail/PGPKEYS#2 integrate
.. //depot/projects/zfs/contrib/sendmail/README#2 integrate
.. //depot/projects/zfs/contrib/sendmail/RELEASE_NOTES#2 integrate
.. //depot/projects/zfs/contrib/sendmail/cf/README#2 integrate
.. //depot/projects/zfs/contrib/sendmail/cf/cf/submit.cf#2 integrate
.. //depot/projects/zfs/contrib/sendmail/cf/feature/ldap_routing.m4#2 integrate
.. //depot/projects/zfs/contrib/sendmail/cf/m4/cfhead.m4#2 integrate
.. //depot/projects/zfs/contrib/sendmail/cf/m4/proto.m4#2 integrate
.. //depot/projects/zfs/contrib/sendmail/cf/m4/version.m4#2 integrate
.. //depot/projects/zfs/contrib/sendmail/contrib/qtool.pl#2 integrate
.. //depot/projects/zfs/contrib/sendmail/contrib/smcontrol.pl#2 integrate
.. //depot/projects/zfs/contrib/sendmail/doc/op/op.me#2 integrate
.. //depot/projects/zfs/contrib/sendmail/include/libmilter/mfapi.h#2 integrate
.. //depot/projects/zfs/contrib/sendmail/include/libmilter/mfdef.h#2 integrate
.. //depot/projects/zfs/contrib/sendmail/include/sm/conf.h#2 integrate
.. //depot/projects/zfs/contrib/sendmail/include/sm/ldap.h#2 integrate
.. //depot/projects/zfs/contrib/sendmail/include/sm/sem.h#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libmilter/Makefile.m4#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libmilter/comm.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libmilter/docs/api.html#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libmilter/docs/overview.html#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libmilter/engine.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libmilter/example.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libmilter/handler.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libmilter/libmilter.h#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libmilter/listener.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libmilter/main.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libmilter/worker.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libsm/debug.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libsm/ldap.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libsm/mbdb.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libsm/sem.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libsm/t-sem.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libsmdb/smdb1.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libsmdb/smdb2.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/libsmutil/safefile.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/praliases/praliases.8#2 integrate
.. //depot/projects/zfs/contrib/sendmail/praliases/praliases.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/Makefile.m4#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/README#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/TRACEFLAGS#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/collect.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/conf.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/conf.h#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/daemon.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/deliver.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/envelope.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/headers.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/main.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/map.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/milter.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/queue.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/ratectrl.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/readcf.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/savemail.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/sendmail.8#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/sendmail.h#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/sfsasl.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/srvrsmtp.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/tls.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/usersmtp.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/util.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/src/version.c#2 integrate
.. //depot/projects/zfs/contrib/sendmail/vacation/vacation.c#2 integrate
.. //depot/projects/zfs/contrib/smbfs/smbutil/view.c#2 integrate
.. //depot/projects/zfs/contrib/tcp_wrappers/hosts_access.c#2 integrate
.. //depot/projects/zfs/contrib/telnet/telnetd/sys_term.c#2 integrate
.. //depot/projects/zfs/contrib/telnet/telnetd/telnetd.c#2 integrate
.. //depot/projects/zfs/contrib/top/username.c#2 integrate
.. //depot/projects/zfs/contrib/top/utils.c#2 integrate
.. //depot/projects/zfs/contrib/top/utils.h#2 integrate
.. //depot/projects/zfs/contrib/tzcode/stdtime/asctime.c#1 branch
.. //depot/projects/zfs/contrib/tzcode/stdtime/ctime.3#1 branch
.. //depot/projects/zfs/contrib/tzcode/stdtime/difftime.c#1 branch
.. //depot/projects/zfs/contrib/tzcode/stdtime/localtime.c#1 branch
.. //depot/projects/zfs/contrib/tzcode/stdtime/private.h#1 branch
.. //depot/projects/zfs/contrib/tzcode/stdtime/time2posix.3#1 branch
.. //depot/projects/zfs/contrib/tzcode/stdtime/tzfile.5#1 branch
.. //depot/projects/zfs/contrib/tzcode/stdtime/tzfile.h#1 branch
.. //depot/projects/zfs/contrib/tzcode/zic/README#1 branch
.. //depot/projects/zfs/contrib/tzcode/zic/Theory#1 branch
.. //depot/projects/zfs/contrib/tzcode/zic/ialloc.c#1 branch
.. //depot/projects/zfs/contrib/tzcode/zic/private.h#1 branch
.. //depot/projects/zfs/contrib/tzcode/zic/scheck.c#1 branch
.. //depot/projects/zfs/contrib/tzcode/zic/zdump.8#1 branch
.. //depot/projects/zfs/contrib/tzcode/zic/zdump.c#1 branch
.. //depot/projects/zfs/contrib/tzcode/zic/zdump/Makefile#1 branch
.. //depot/projects/zfs/contrib/tzcode/zic/zic.8#1 branch
.. //depot/projects/zfs/contrib/tzcode/zic/zic.c#1 branch
.. //depot/projects/zfs/contrib/tzcode/zic/zic/Makefile#1 branch
.. //depot/projects/zfs/contrib/tzdata/africa#1 branch
.. //depot/projects/zfs/contrib/tzdata/antarctica#1 branch
.. //depot/projects/zfs/contrib/tzdata/asia#1 branch
.. //depot/projects/zfs/contrib/tzdata/australasia#1 branch
.. //depot/projects/zfs/contrib/tzdata/backward#1 branch
.. //depot/projects/zfs/contrib/tzdata/etcetera#1 branch
.. //depot/projects/zfs/contrib/tzdata/europe#1 branch
.. //depot/projects/zfs/contrib/tzdata/factory#1 branch
.. //depot/projects/zfs/contrib/tzdata/leapseconds#1 branch
.. //depot/projects/zfs/contrib/tzdata/northamerica#1 branch
.. //depot/projects/zfs/contrib/tzdata/pacificnew#1 branch
.. //depot/projects/zfs/contrib/tzdata/southamerica#1 branch
.. //depot/projects/zfs/contrib/tzdata/systemv#1 branch
.. //depot/projects/zfs/contrib/tzdata/yearistype.sh#1 branch
.. //depot/projects/zfs/contrib/tzdata/zone.tab#1 branch
.. //depot/projects/zfs/crypto/heimdal/kcm/connect.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/ChangeLog#2 integrate
.. //depot/projects/zfs/crypto/openssh/INSTALL#2 integrate
.. //depot/projects/zfs/crypto/openssh/PROTOCOL#2 integrate
.. //depot/projects/zfs/crypto/openssh/PROTOCOL.agent#2 integrate
.. //depot/projects/zfs/crypto/openssh/PROTOCOL.certkeys#1 branch
.. //depot/projects/zfs/crypto/openssh/PROTOCOL.mux#1 branch
.. //depot/projects/zfs/crypto/openssh/README#2 integrate
.. //depot/projects/zfs/crypto/openssh/README.smartcard#2 delete
.. //depot/projects/zfs/crypto/openssh/addrmatch.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/auth-krb5.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/auth-options.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/auth-options.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/auth-rh-rsa.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/auth-rhosts.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/auth-rsa.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/auth.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/auth.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/auth2-hostbased.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/auth2-pubkey.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/authfd.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/authfd.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/authfile.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/authfile.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/bufaux.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/buffer.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/buffer.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/canohost.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/channels.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/channels.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/clientloop.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/clientloop.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/config.guess#2 integrate
.. //depot/projects/zfs/crypto/openssh/config.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/config.h.in#2 integrate
.. //depot/projects/zfs/crypto/openssh/defines.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/dh.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/dns.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/dns.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/hostfile.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/hostfile.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/kex.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/kex.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/kexdhs.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/kexgexs.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/key.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/key.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/loginrec.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/match.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/misc.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/misc.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/monitor.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/monitor_fdpass.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/monitor_wrap.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/mux.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/myproposal.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/nchan.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/openbsd-compat/openbsd-compat.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/openbsd-compat/openssl-compat.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/openbsd-compat/port-aix.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/openbsd-compat/port-aix.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/openbsd-compat/port-linux.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/openbsd-compat/port-linux.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/openbsd-compat/pwcache.c#1 branch
.. //depot/projects/zfs/crypto/openssh/openbsd-compat/readpassphrase.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/pathnames.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/pkcs11.h#1 branch
.. //depot/projects/zfs/crypto/openssh/platform.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/platform.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/readconf.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/readconf.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/roaming.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/roaming_client.c#1 branch
.. //depot/projects/zfs/crypto/openssh/roaming_common.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/roaming_serv.c#1 branch
.. //depot/projects/zfs/crypto/openssh/scard-opensc.c#2 delete
.. //depot/projects/zfs/crypto/openssh/scard.c#2 delete
.. //depot/projects/zfs/crypto/openssh/scard.h#2 delete
.. //depot/projects/zfs/crypto/openssh/scp.1#2 integrate
.. //depot/projects/zfs/crypto/openssh/scp.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/servconf.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/servconf.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/session.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/sftp-client.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/sftp-client.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/sftp-common.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/sftp-common.h#2 integrate
.. //depot/projects/zfs/crypto/openssh/sftp-server.8#2 integrate
.. //depot/projects/zfs/crypto/openssh/sftp-server.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/sftp.1#2 integrate
.. //depot/projects/zfs/crypto/openssh/sftp.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/ssh-add.1#2 integrate
.. //depot/projects/zfs/crypto/openssh/ssh-add.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/ssh-agent.1#2 integrate
.. //depot/projects/zfs/crypto/openssh/ssh-agent.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/ssh-dss.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/ssh-keygen.1#2 integrate
.. //depot/projects/zfs/crypto/openssh/ssh-keygen.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/ssh-keyscan.1#2 integrate
.. //depot/projects/zfs/crypto/openssh/ssh-keyscan.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/ssh-keysign.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/ssh-pkcs11-client.c#1 branch
.. //depot/projects/zfs/crypto/openssh/ssh-pkcs11-helper.0#1 branch
.. //depot/projects/zfs/crypto/openssh/ssh-pkcs11-helper.8#1 branch
.. //depot/projects/zfs/crypto/openssh/ssh-pkcs11-helper.c#1 branch
.. //depot/projects/zfs/crypto/openssh/ssh-pkcs11.c#1 branch
.. //depot/projects/zfs/crypto/openssh/ssh-pkcs11.h#1 branch
.. //depot/projects/zfs/crypto/openssh/ssh-rand-helper.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/ssh-rsa.c#2 integrate
.. //depot/projects/zfs/crypto/openssh/ssh.1#2 integrate
.. //depot/projects/zfs/crypto/openssh/ssh.c#2 integrate
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon May 3 22:30:08 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 50B241065686; Mon, 3 May 2010 22:30:08 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 148B91065692;
Mon, 3 May 2010 22:30:08 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from mail.cksoft.de (mail.cksoft.de [195.88.108.3])
by mx1.freebsd.org (Postfix) with ESMTP id 6B2248FC13;
Mon, 3 May 2010 22:30:07 +0000 (UTC)
Received: from localhost (amavis.fra.cksoft.de [192.168.74.71])
by mail.cksoft.de (Postfix) with ESMTP id 9877141C7A9;
Tue, 4 May 2010 00:30:06 +0200 (CEST)
X-Virus-Scanned: amavisd-new at cksoft.de
Received: from mail.cksoft.de ([192.168.74.103])
by localhost (amavis.fra.cksoft.de [192.168.74.71]) (amavisd-new,
port 10024)
with ESMTP id epgkS+RqqwY1; Tue, 4 May 2010 00:30:06 +0200 (CEST)
Received: by mail.cksoft.de (Postfix, from userid 66)
id 22A4341C7A8; Tue, 4 May 2010 00:30:06 +0200 (CEST)
Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net
[10.111.66.10])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(No client certificate requested)
by mail.int.zabbadoz.net (Postfix) with ESMTP id 498BC4448EC;
Mon, 3 May 2010 22:25:37 +0000 (UTC)
Date: Mon, 3 May 2010 22:25:37 +0000 (UTC)
From: "Bjoern A. Zeeb"
X-X-Sender: bz@maildrop.int.zabbadoz.net
To: Marko Zec
In-Reply-To: <201005040006.11204.zec@icir.org>
Message-ID: <20100503222206.K23815@maildrop.int.zabbadoz.net>
References: <201005032103.o43L3nah081080@repoman.freebsd.org>
<201005040006.11204.zec@icir.org>
X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: Ana Kukec ,
Perforce Change Reviews
Subject: Re: PERFORCE change 177677 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, 03 May 2010 22:30:08 -0000
On Tue, 4 May 2010, Marko Zec wrote:
> On Monday 03 May 2010 23:03:49 Ana Kukec wrote:
>> http://p4web.freebsd.org/@@177677?ac=10
>>
>> Change 177677 by anchie@anchie_malimis on 2010/05/03 21:03:44
>>
>> Getting rid of the global variable V_send_so from files other then
>> send.[ch].
>
> Just wondering - isn't this change actually increasing the possibility for a
> race between packet datapath and send.ko kldloading / kldunloading? I.e. had
Yes, but it simplifies locking which is to come once the rest is
correct; as you have figured, you cannot do it lock-free anyway in the module
case ("pfil problem").
> Also, if I'm not mistaking, even if send_sendso_input() returns an error, it
> will have the mbuf consumed / freed, so any further attempts to do anything
> with the mbuf will crash the system. Do we really want to do m_freem(m) at
> the bottom of send_sendso_input()?
No we don't. Well not in the case there is no socket. Ana knows
already but having this checkpointed in p4 helped me to see where we
were;)
/bz
--
Bjoern A. Zeeb See you when I see you.
From owner-p4-projects@FreeBSD.ORG Tue May 4 06:03:17 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 113A51065742; Tue, 4 May 2010 06:03:17 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 97BDB106572F
for ; Tue, 4 May 2010 06:03:16 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
by mx1.freebsd.org (Postfix) with ESMTP id 849108FC17
for ; Tue, 4 May 2010 06:03:16 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4463GKU051902
for ; Tue, 4 May 2010 06:03:16 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4463GGF051900
for perforce@freebsd.org; Tue, 4 May 2010 06:03:16 GMT
(envelope-from pgj@FreeBSD.org)
Date: Tue, 4 May 2010 06:03:16 GMT
Message-Id: <201005040603.o4463GGF051900@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 177694 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Tue, 04 May 2010 06:03:17 -0000
http://p4web.freebsd.org/@@177694?ac=10
Change 177694 by pgj@csupor on 2010/05/04 06:03:09
Fix -O2 compilation problem (temporarily).
Affected files ...
.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#64 edit
.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_stat.c#27 edit
.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#73 edit
Differences ...
==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#64 (text+ko) ====
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2009 Gabor Pali
+ * Copyright (c) 2009, 2010 Gabor Pali
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -319,6 +319,12 @@
struct bpf_type *bpti_next;
};
+/* Timestamp type. */
+struct timestamp_type {
+ u_int32_t ts_sec;
+ u_int32_t ts_usec;
+};
+
/* General statistics type. */
struct stat_type {
enum stat stt_type;
@@ -360,7 +366,8 @@
#ifdef SCTP
struct sctp_stat {
- struct sctpstat s;
+ struct timestamp_type discontinuitytime;
+ struct sctpstat *s;
};
#endif
@@ -433,12 +440,6 @@
};
#endif
-/* Timestamp type. */
-struct timestamp_type {
- u_int32_t ts_sec;
- u_int32_t ts_usec;
-};
-
struct val2str {
int val;
const char *str;
==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_stat.c#27 (text+ko) ====
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2009 Gabor Pali
+ * Copyright (c) 2009, 2010 Gabor Pali
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -204,6 +204,24 @@
break;
#endif /* !IPSEC */
+ /*
+ * XXX : Try to avoid breaking strict aliasing rules, but it might not be
+ * the best solution.
+ */
+
+#ifdef SCTP
+ case stat_SCTP:
+ sttp->stt_data = malloc(sizeof(struct sctp_stat));
+ if (sttp->stt_data == NULL) {
+ sttp->stt_error = NETSTAT_ERROR_NOMEMORY;
+ free(buffer);
+ return(-1);
+ }
+ ((struct sctp_stat *)sttp->stt_data)->discontinuitytime.ts_sec = ((struct sctpstat *)buffer)->sctps_discontinuitytime.tv_sec;
+ ((struct sctp_stat *)sttp->stt_data)->discontinuitytime.ts_usec = ((struct sctpstat *)buffer)->sctps_discontinuitytime.tv_usec;
+ ((struct sctp_stat *)sttp->stt_data)->s = (struct sctpstat *)buffer;
+ break;
+#endif /* !SCTP */
default:
sttp->stt_data = buffer;
}
==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#73 (text+ko) ====
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2009 Gabor Pali
+ * Copyright (c) 2009, 2010 Gabor Pali
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -1298,7 +1298,8 @@
void
netstat_stat_free(struct stat_type *sttp)
{
- if (sttp->stt_type == stat_IPcomp)
+ if (sttp->stt_type == stat_IPcomp ||
+ sttp->stt_type == stat_SCTP)
free(((struct ipcomp_stat *)sttp->stt_data)->s);
free(sttp->stt_data);
free(sttp);
@@ -1655,16 +1656,12 @@
#ifdef SCTP
#define SCTP_ACC(field) \
- STATS_ACC(u_int32_t,sctp,field)
+ STATS_ACCP(u_int32_t,sctp,field)
const struct timestamp_type *
netstat_sctps_get_discontinuitytime(const struct sctp_stat *ssp)
{
-// return ((const struct timestamp_type *)&ssp->s.sctps_discontinuitytime);
- const struct timestamp_type * result;
- struct sctpstat ss = ssp->s;
- result = (const struct timestamp_type *)&ss.sctps_discontinuitytime;
- return result;
+ return &ssp->discontinuitytime;
}
STATS_GET(sctp,SCTP);
From owner-p4-projects@FreeBSD.ORG Tue May 4 08:08:22 2010
Return-Path:
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 5D3EC1065674; Tue, 4 May 2010 08:08:22 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 209B4106566B
for ; Tue, 4 May 2010 08:08:22 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
by mx1.freebsd.org (Postfix) with ESMTP id 0E2748FC0C
for ; Tue, 4 May 2010 08:08:22 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4488MhY063122
for ; Tue, 4 May 2010 08:08:22 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4488LZV063120
for perforce@freebsd.org; Tue, 4 May 2010 08:08:21 GMT
(envelope-from pgj@FreeBSD.org)
Date: Tue, 4 May 2010 08:08:21 GMT
Message-Id: <201005040808.o4488LZV063120@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali
To: Perforce Change Reviews
Precedence: bulk
Cc:
Subject: PERFORCE change 177699 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: