From owner-p4-projects@FreeBSD.ORG Sun Jun 3 02:22:44 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA51716A492; Sun, 3 Jun 2007 02:22:43 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 AAF7016A482 for ; Sun, 3 Jun 2007 02:22:43 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8E98013C4B8 for ; Sun, 3 Jun 2007 02:22:43 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l532MhbA029131 for ; Sun, 3 Jun 2007 02:22:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l532MhN0029125 for perforce@freebsd.org; Sun, 3 Jun 2007 02:22:43 GMT (envelope-from sam@freebsd.org) Date: Sun, 3 Jun 2007 02:22:43 GMT Message-Id: <200706030222.l532MhN0029125@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 120812 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 02:22:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=120812 Change 120812 by sam@sam_laptop on 2007/06/03 02:21:42 o correct bg scan operation (on 2915 cards at least); use a short dwell time for scans that send a probe request frame; w/o this the f/w reliably gets stuck (30ms value taken from linux driver) o rewrite code to construct a multi-channel scan list; this list must be run-length encoded based on the band of the channels (untested and we may need to discard the channel order crafted by net80211 as the run-length encoding may overflow the max #channels allowed by the f/w) o #if 0 code to trigger a scan of all channels to suppress compiler complaints o add scan request dump msgs when debugging Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#39 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#39 (text+ko) ==== @@ -167,7 +167,9 @@ static void iwi_scan_end(struct ieee80211com *); static void iwi_set_channel(struct ieee80211com *); static void iwi_scan_curchan(struct ieee80211com *, unsigned long maxdwell); +#if 0 static void iwi_scan_allchan(struct ieee80211com *, unsigned long maxdwell); +#endif static void iwi_scan_mindwell(struct ieee80211com *); static void iwi_assoc(struct ieee80211com *ic); static void iwi_ops(void *, int); @@ -1388,7 +1390,7 @@ chan = (struct iwi_notif_scan_channel *)(notif + 1); DPRINTFN(3, ("Scan of channel %u complete (%u)\n", - ic->ic_channels[chan->nchan].ic_freq, chan->nchan)); + ieee80211_ieee2mhz(chan->nchan, 0), chan->nchan)); /* Reset the timer, the scan is still going */ sc->sc_scan_timer = 3; @@ -2663,8 +2665,27 @@ *st = (*st & 0x0f) | ((scan_type & 0xf) << 4); } +static int +scan_type(const struct ieee80211_scan_state *ss, + const struct ieee80211_channel *chan) +{ + /* We can only set one essid for a directed scan */ + if (ss->ss_nssid != 0) + return IWI_SCAN_TYPE_BDIRECTED; + if ((ss->ss_flags & IEEE80211_SCAN_ACTIVE) && + (chan->ic_flags & IEEE80211_CHAN_PASSIVE) == 0) + return IWI_SCAN_TYPE_BROADCAST; + return IWI_SCAN_TYPE_PASSIVE; +} + +static __inline int +scan_band(const struct ieee80211_channel *c) +{ + return IEEE80211_IS_CHAN_5GHZ(c) ? IWI_CHAN_5GHZ : IWI_CHAN_2GHZ; +} + /* - * Scan on ic_curchan according to ic_scan (essid, active/passive, dwell ...) + * Start a scan on the current channel or all channels. */ static int iwi_scanchan(struct iwi_softc *sc, unsigned long maxdwell, int mode) @@ -2674,7 +2695,6 @@ struct ieee80211_scan_state *ss; struct iwi_scan_ext scan; int error = 0; - int i, type; IWI_LOCK_CHECK(sc); if (sc->flags & IWI_FLAG_SCANNING) { @@ -2688,47 +2708,97 @@ ic = &sc->sc_ic; ss = ic->ic_scan; - chan = ic->ic_curchan; memset(&scan, 0, sizeof scan); scan.full_scan_index = htole32(++sc->sc_scangen); scan.dwell_time[IWI_SCAN_TYPE_PASSIVE] = htole16(maxdwell); - scan.dwell_time[IWI_SCAN_TYPE_BROADCAST] = htole16(maxdwell); - scan.dwell_time[IWI_SCAN_TYPE_BDIRECTED] = htole16(maxdwell); + if (ic->ic_flags_ext & IEEE80211_FEXT_BGSCAN) { + /* + * Use very short dwell times for when we send probe request + * frames. Without this bg scans hang. Ideally this should + * be handled with early-termination as done by net80211 but + * that's not feasible (aborting a scan is problematic). + */ + scan.dwell_time[IWI_SCAN_TYPE_BROADCAST] = htole16(30); + scan.dwell_time[IWI_SCAN_TYPE_BDIRECTED] = htole16(30); + } else { + scan.dwell_time[IWI_SCAN_TYPE_BROADCAST] = htole16(maxdwell); + scan.dwell_time[IWI_SCAN_TYPE_BDIRECTED] = htole16(maxdwell); + } /* We can only set one essid for a directed scan */ if (ss->ss_nssid != 0) { - type = IWI_SCAN_TYPE_BDIRECTED; error = iwi_cmd(sc, IWI_CMD_SET_ESSID, ss->ss_ssid[0].ssid, ss->ss_ssid[0].len); if (error) return (error); - } else if ((ss->ss_flags & IEEE80211_SCAN_ACTIVE) && - (chan->ic_flags & IEEE80211_CHAN_PASSIVE) == 0) { - type = IWI_SCAN_TYPE_BROADCAST; - } else - type = IWI_SCAN_TYPE_PASSIVE; + } if (mode == IWI_SCAN_ALLCHAN) { - for (i = 0; i < ss->ss_last;) { + int i, next, band, b, bstart; + /* + * Convert scan list to run-length encoded channel list + * the firmware requires (preserving the order setup by + * net80211). The first entry in each run specifies the + * band and the count of items in the run. + */ + next = 0; /* next open slot */ + bstart = 0; /* NB: not needed, silence compiler */ + band = -1; /* NB: impossible value */ + KASSERT(ss->ss_last > 0, ("no channels")); + for (i = 0; i < ss->ss_last; i++) { chan = ss->ss_chans[i]; - scan.channels[++i] = ieee80211_chan2ieee(ic, chan); - set_scan_type(&scan, i, type); + b = scan_band(chan); + if (b != band) { + if (band != -1) + scan.channels[bstart] = + (next - bstart) | band; + /* NB: this allocates a slot for the run-len */ + band = b, bstart = next++; + } + if (next >= IWI_SCAN_CHANNELS) { + DPRINTF(("truncating scan list\n")); + break; + } + scan.channels[next] = ieee80211_chan2ieee(ic, chan); + set_scan_type(&scan, next, scan_type(ss, chan)); + next++; } - DPRINTF(("Scanning on %d channel(s)\n", i)); + scan.channels[bstart] = (next - bstart) | band; } else { /* Scan the current channel only */ - i = 1; - scan.channels[i] = ieee80211_chan2ieee(ic, chan); - set_scan_type(&scan, i, type); - DPRINTF(("Scanning on channel %u\n", - ieee80211_chan2ieee(ic, chan))); + chan = ic->ic_curchan; + scan.channels[0] = 1 | scan_band(chan); + scan.channels[1] = ieee80211_chan2ieee(ic, chan); + set_scan_type(&scan, 1, scan_type(ss, chan)); + } +#ifdef IWI_DEBUG + if (iwi_debug > 0) { + static const char *scantype[8] = + { "PSTOP", "PASV", "DIR", "BCAST", "BDIR", "5", "6", "7" }; + int i; + printf("Scan request: index %u dwell %d/%d/%d\n" + , le32toh(scan.full_scan_index) + , le16toh(scan.dwell_time[IWI_SCAN_TYPE_PASSIVE]) + , le16toh(scan.dwell_time[IWI_SCAN_TYPE_BROADCAST]) + , le16toh(scan.dwell_time[IWI_SCAN_TYPE_BDIRECTED]) + ); + i = 0; + do { + int run = scan.channels[i]; + if (run == 0) + break; + printf("Scan %d %s channels:", run & 0x3f, + run & IWI_CHAN_2GHZ ? "2.4GHz" : "5GHz"); + for (run &= 0x3f, i++; run > 0; run--, i++) { + uint8_t type = scan.scan_type[i/2]; + printf(" %u/%s", scan.channels[i], + scantype[(i & 1 ? type : type>>4) & 7]); + } + printf("\n"); + } while (i < IWI_SCAN_CHANNELS); } - if (IEEE80211_IS_CHAN_5GHZ(chan)) - scan.channels[0] = i | IWI_CHAN_5GHZ; - else - scan.channels[0] = i | IWI_CHAN_2GHZ; - +#endif sc->flags |= IWI_FLAG_SCANNING; sc->sc_scan_timer = 3; sc->sc_ifp->if_timer = 1; @@ -3547,6 +3617,7 @@ iwi_scan_cmd(sc, IWI_SCAN_CURCHAN); } +#if 0 static void iwi_scan_allchan(struct ieee80211com *ic, unsigned long maxdwell) { @@ -3556,6 +3627,7 @@ sc->sc_maxdwell = maxdwell; iwi_scan_cmd(sc, IWI_SCAN_ALLCHAN); } +#endif static void iwi_scan_mindwell(struct ieee80211com *ic) From owner-p4-projects@FreeBSD.ORG Sun Jun 3 04:02:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A74F316A46C; Sun, 3 Jun 2007 04:01:59 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B30EB16A473 for ; Sun, 3 Jun 2007 04:01:56 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A19C913C44C for ; Sun, 3 Jun 2007 04:01:56 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5341uYF024748 for ; Sun, 3 Jun 2007 04:01:56 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5341lv0024593 for perforce@freebsd.org; Sun, 3 Jun 2007 04:01:47 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 3 Jun 2007 04:01:47 GMT Message-Id: <200706030401.l5341lv0024593@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 120817 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 04:02:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=120817 Change 120817 by mjacob@mjexp on 2007/06/03 04:00:47 IFC Affected files ... .. //depot/projects/mjexp/Makefile.inc1#11 integrate .. //depot/projects/mjexp/UPDATING#17 integrate .. //depot/projects/mjexp/bin/chflags/chflags.1#2 integrate .. //depot/projects/mjexp/bin/pax/ar_io.c#2 integrate .. //depot/projects/mjexp/bin/pax/file_subs.c#2 integrate .. //depot/projects/mjexp/bin/pax/pat_rep.c#2 integrate .. //depot/projects/mjexp/bin/pax/sel_subs.c#2 integrate .. //depot/projects/mjexp/bin/pax/tables.c#2 integrate .. //depot/projects/mjexp/contrib/file/ChangeLog#2 integrate .. //depot/projects/mjexp/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/mjexp/contrib/file/LEGAL.NOTICE#2 integrate .. //depot/projects/mjexp/contrib/file/Localstuff#2 integrate .. //depot/projects/mjexp/contrib/file/MAINT#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/animation#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/archive#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/audio#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/cad#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/cafebabe#1 branch .. //depot/projects/mjexp/contrib/file/Magdir/commands#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/console#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/database#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/editors#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/elf#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/images#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/java#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/linux#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/mach#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/mime#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/mips#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/os2#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/os400#1 branch .. //depot/projects/mjexp/contrib/file/Magdir/perl#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/python#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/revision#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/riff#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/sql#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/sun#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/sysex#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/tex#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/tgif#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/unicode#1 branch .. //depot/projects/mjexp/contrib/file/Magdir/varied.out#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/vmware#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/mjexp/contrib/file/Magdir/xwindows#2 integrate .. //depot/projects/mjexp/contrib/file/Makefile.am#2 integrate .. //depot/projects/mjexp/contrib/file/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/file/README#2 integrate .. //depot/projects/mjexp/contrib/file/apprentice.c#2 integrate .. //depot/projects/mjexp/contrib/file/apptype.c#2 integrate .. //depot/projects/mjexp/contrib/file/ascmagic.c#2 integrate .. //depot/projects/mjexp/contrib/file/compress.c#2 integrate .. //depot/projects/mjexp/contrib/file/config.h.in#2 integrate .. //depot/projects/mjexp/contrib/file/configure#2 integrate .. //depot/projects/mjexp/contrib/file/configure.in#2 integrate .. //depot/projects/mjexp/contrib/file/file.c#2 integrate .. //depot/projects/mjexp/contrib/file/file.h#2 integrate .. //depot/projects/mjexp/contrib/file/fsmagic.c#2 integrate .. //depot/projects/mjexp/contrib/file/funcs.c#2 integrate .. //depot/projects/mjexp/contrib/file/install-sh#2 integrate .. //depot/projects/mjexp/contrib/file/is_tar.c#2 integrate .. //depot/projects/mjexp/contrib/file/magic.c#2 integrate .. //depot/projects/mjexp/contrib/file/magic.h#2 integrate .. //depot/projects/mjexp/contrib/file/magic.mime#2 integrate .. //depot/projects/mjexp/contrib/file/magic2mime#2 integrate .. //depot/projects/mjexp/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/mjexp/contrib/file/names.h#2 integrate .. //depot/projects/mjexp/contrib/file/patchlevel.h#2 integrate .. //depot/projects/mjexp/contrib/file/print.c#2 integrate .. //depot/projects/mjexp/contrib/file/readelf.c#2 integrate .. //depot/projects/mjexp/contrib/file/softmagic.c#2 integrate .. //depot/projects/mjexp/contrib/file/tar.h#2 integrate .. //depot/projects/mjexp/contrib/file/test.c#2 integrate .. //depot/projects/mjexp/contrib/gcc/gcc.c#3 integrate .. //depot/projects/mjexp/crypto/openssh/pathnames.h#2 integrate .. //depot/projects/mjexp/crypto/openssh/ssh_config.5#3 integrate .. //depot/projects/mjexp/crypto/openssh/sshd_config.5#3 integrate .. //depot/projects/mjexp/etc/defaults/periodic.conf#4 integrate .. //depot/projects/mjexp/etc/defaults/rc.conf#12 integrate .. //depot/projects/mjexp/etc/etc.amd64/ttys#2 integrate .. //depot/projects/mjexp/etc/etc.arm/ttys#2 integrate .. //depot/projects/mjexp/etc/etc.i386/ttys#2 integrate .. //depot/projects/mjexp/etc/etc.ia64/ttys#2 integrate .. //depot/projects/mjexp/etc/etc.powerpc/ttys#3 integrate .. //depot/projects/mjexp/etc/etc.sparc64/ttys#2 integrate .. //depot/projects/mjexp/etc/login.conf#2 integrate .. //depot/projects/mjexp/etc/rc.d/cleanvar#3 integrate .. //depot/projects/mjexp/etc/rc.d/initrandom#2 integrate .. //depot/projects/mjexp/etc/rc.d/jail#4 integrate .. //depot/projects/mjexp/etc/rc.d/tmp#2 integrate .. //depot/projects/mjexp/etc/rc.d/var#4 integrate .. //depot/projects/mjexp/etc/root/dot.cshrc#2 integrate .. //depot/projects/mjexp/etc/root/dot.profile#2 integrate .. //depot/projects/mjexp/games/fortune/datfiles/fortunes#12 integrate .. //depot/projects/mjexp/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/cc/cc_tools/Makefile#3 integrate .. //depot/projects/mjexp/lib/libarchive/Makefile#11 integrate .. //depot/projects/mjexp/lib/libarchive/archive.h.in#12 integrate .. //depot/projects/mjexp/lib/libarchive/archive_entry.3#4 integrate .. //depot/projects/mjexp/lib/libarchive/archive_entry.c#9 integrate .. //depot/projects/mjexp/lib/libarchive/archive_entry.h#4 integrate .. //depot/projects/mjexp/lib/libarchive/archive_entry_copy_stat.c#1 branch .. //depot/projects/mjexp/lib/libarchive/archive_entry_private.h#1 branch .. //depot/projects/mjexp/lib/libarchive/archive_entry_stat.c#1 branch .. //depot/projects/mjexp/lib/libarchive/archive_platform.h#7 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read.3#9 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read.c#11 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_extract.c#10 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_private.h#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_compression_bzip2.c#8 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_compression_compress.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_compression_gzip.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_compression_none.c#9 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_compression_program.c#1 branch .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_ar.c#4 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_cpio.c#7 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_empty.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_iso9660.c#8 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_tar.c#11 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_zip.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_string.c#4 integrate .. //depot/projects/mjexp/lib/libarchive/archive_string.h#4 integrate .. //depot/projects/mjexp/lib/libarchive/archive_util.3#4 integrate .. //depot/projects/mjexp/lib/libarchive/archive_util.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write.3#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_disk.c#8 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_disk_set_standard_lookup.c#4 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_private.h#2 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_compression_bzip2.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_compression_gzip.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_compression_none.c#7 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_compression_program.c#1 branch .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format_ar.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format_cpio.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format_pax.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format_shar.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format_ustar.c#7 integrate .. //depot/projects/mjexp/lib/libarchive/config_freebsd.h#5 integrate .. //depot/projects/mjexp/lib/libarchive/filter_fork.c#1 branch .. //depot/projects/mjexp/lib/libarchive/filter_fork.h#1 branch .. //depot/projects/mjexp/lib/libarchive/libarchive_internals.3#1 branch .. //depot/projects/mjexp/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/mjexp/lib/libarchive/test/README#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/main.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/test/test.h#3 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_acl_basic.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_acl_pax.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_archive_api_feature.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_entry.c#1 branch .. //depot/projects/mjexp/lib/libarchive/test/test_read_compress_program.c#1 branch .. //depot/projects/mjexp/lib/libarchive/test/test_read_data_large.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_read_extract.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_read_format_ar.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_read_format_zip.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_read_large.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_read_position.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_read_truncated.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_tar_filenames.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_compress_program.c#1 branch .. //depot/projects/mjexp/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_disk_perms.c#4 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_format_ar.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_format_cpio_empty.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_format_shar_empty.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_format_tar.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_format_tar_empty.c#2 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_open_memory.c#3 integrate .. //depot/projects/mjexp/lib/libc/amd64/Symbol.map#4 integrate .. //depot/projects/mjexp/lib/libc/arm/Symbol.map#5 integrate .. //depot/projects/mjexp/lib/libc/db/hash/hash.c#3 integrate .. //depot/projects/mjexp/lib/libc/gen/Symbol.map#6 integrate .. //depot/projects/mjexp/lib/libc/gen/arc4random.c#3 integrate .. //depot/projects/mjexp/lib/libc/i386/Symbol.map#5 integrate .. //depot/projects/mjexp/lib/libc/ia64/Symbol.map#3 integrate .. //depot/projects/mjexp/lib/libc/net/Symbol.map#6 integrate .. //depot/projects/mjexp/lib/libc/posix1e/Symbol.map#3 integrate .. //depot/projects/mjexp/lib/libc/powerpc/Symbol.map#5 integrate .. //depot/projects/mjexp/lib/libc/quad/Symbol.map#3 integrate .. //depot/projects/mjexp/lib/libc/regex/engine.c#5 integrate .. //depot/projects/mjexp/lib/libc/rpc/Symbol.map#3 integrate .. //depot/projects/mjexp/lib/libc/sparc64/Symbol.map#3 integrate .. //depot/projects/mjexp/lib/libc/stdtime/Symbol.map#3 integrate .. //depot/projects/mjexp/lib/libc/sys/Symbol.map#4 integrate .. //depot/projects/mjexp/lib/libfetch/Makefile#3 integrate .. //depot/projects/mjexp/lib/libfetch/fetch.3#3 integrate .. //depot/projects/mjexp/lib/libkvm/kvm_proc.c#5 integrate .. //depot/projects/mjexp/lib/libmagic/config.h#2 integrate .. //depot/projects/mjexp/lib/libpam/modules/pam_login_access/login_access.c#2 integrate .. //depot/projects/mjexp/lib/libthread_db/arch/amd64/libpthread_md.c#2 integrate .. //depot/projects/mjexp/lib/msun/src/s_cbrtf.c#2 integrate .. //depot/projects/mjexp/lib/ncurses/form/Makefile#4 integrate .. //depot/projects/mjexp/lib/ncurses/menu/Makefile#4 integrate .. //depot/projects/mjexp/lib/ncurses/ncurses/Makefile#6 integrate .. //depot/projects/mjexp/lib/ncurses/panel/Makefile#4 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/installation/common/install.sgml#5 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#17 integrate .. //depot/projects/mjexp/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/mjexp/sbin/geom/class/stripe/geom_stripe.c#3 integrate .. //depot/projects/mjexp/sbin/newfs_msdos/newfs_msdos.c#2 integrate .. //depot/projects/mjexp/sbin/savecore/savecore.c#2 integrate .. //depot/projects/mjexp/share/man/man4/Makefile#15 integrate .. //depot/projects/mjexp/share/man/man4/mmc.4#1 branch .. //depot/projects/mjexp/share/man/man4/mmcsd.4#1 branch .. //depot/projects/mjexp/share/man/man4/ng_bpf.4#2 integrate .. //depot/projects/mjexp/share/man/man4/pcm.4#5 integrate .. //depot/projects/mjexp/share/man/man4/pty.4#3 integrate .. //depot/projects/mjexp/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/mjexp/share/man/man4/snd_spicds.4#3 integrate .. //depot/projects/mjexp/share/man/man5/make.conf.5#2 integrate .. //depot/projects/mjexp/share/man/man5/rc.conf.5#12 integrate .. //depot/projects/mjexp/share/man/man9/bus_alloc_resource.9#2 integrate .. //depot/projects/mjexp/share/man/man9/locking.9#2 integrate .. //depot/projects/mjexp/share/misc/bsd-family-tree#6 integrate .. //depot/projects/mjexp/share/mk/bsd.sys.mk#4 integrate .. //depot/projects/mjexp/share/skel/dot.cshrc#2 integrate .. //depot/projects/mjexp/share/skel/dot.profile#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/busdma_machdep.c#5 integrate .. //depot/projects/mjexp/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/mjexp/sys/amd64/amd64/intr_machdep.c#8 integrate .. //depot/projects/mjexp/sys/amd64/amd64/machdep.c#11 integrate .. //depot/projects/mjexp/sys/amd64/amd64/pmap.c#13 integrate .. //depot/projects/mjexp/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/mjexp/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/mjexp/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/mjexp/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/mjexp/sys/arm/arm/intr.c#4 integrate .. //depot/projects/mjexp/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/mjexp/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/mjexp/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/mjexp/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/avila_ata.c#5 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425.c#6 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425var.h#4 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/uart_bus_ixp425.c#3 integrate .. //depot/projects/mjexp/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#3 integrate .. //depot/projects/mjexp/sys/boot/i386/Makefile#2 integrate .. //depot/projects/mjexp/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/mjexp/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/mjexp/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/mjexp/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/mjexp/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/mjexp/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/mjexp/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/mjexp/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/mjexp/sys/boot/i386/loader/main.c#3 integrate .. //depot/projects/mjexp/sys/boot/ia64/common/exec.c#2 integrate .. //depot/projects/mjexp/sys/cam/README.quirks#1 branch .. //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#13 integrate .. //depot/projects/mjexp/sys/coda/coda_vnops.c#5 integrate .. //depot/projects/mjexp/sys/compat/linprocfs/linprocfs.c#14 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/mjexp/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/mjexp/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/mjexp/sys/conf/files#26 integrate .. //depot/projects/mjexp/sys/conf/options#19 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/mjexp/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/mjexp/sys/dev/ath/if_ath.c#11 integrate .. //depot/projects/mjexp/sys/dev/bge/if_bge.c#16 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_lro.c#6 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_sge.c#9 integrate .. //depot/projects/mjexp/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/mjexp/sys/dev/cxgb/sys/uipc_mvec.c#8 integrate .. //depot/projects/mjexp/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/mjexp/sys/dev/em/README#3 integrate .. //depot/projects/mjexp/sys/dev/em/if_em.c#9 integrate .. //depot/projects/mjexp/sys/dev/en/midway.c#4 integrate .. //depot/projects/mjexp/sys/dev/fxp/if_fxp.c#8 integrate .. //depot/projects/mjexp/sys/dev/lmc/if_lmc.c#4 integrate .. //depot/projects/mjexp/sys/dev/md/md.c#4 integrate .. //depot/projects/mjexp/sys/dev/pccard/pccard.c#4 integrate .. //depot/projects/mjexp/sys/dev/pccard/pccardvarp.h#3 integrate .. //depot/projects/mjexp/sys/dev/pccbb/pccbb.c#8 integrate .. //depot/projects/mjexp/sys/dev/pccbb/pccbbvar.h#3 integrate .. //depot/projects/mjexp/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/mjexp/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/mjexp/sys/dev/sk/if_sk.c#8 integrate .. //depot/projects/mjexp/sys/dev/sound/clone.c#1 branch .. //depot/projects/mjexp/sys/dev/sound/clone.h#1 branch .. //depot/projects/mjexp/sys/dev/sound/isa/ess.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/emu10k1.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/envy24.c#9 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/envy24.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/envy24ht.c#8 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/envy24ht.h#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/solo.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/spicds.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/via8233.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/ac97.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/buffer.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/channel.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/channel.h#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/dsp.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/dsp.h#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/feeder.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/sndstat.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/sound.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/sound.h#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/vchan.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/unit.c#1 branch .. //depot/projects/mjexp/sys/dev/sound/unit.h#1 branch .. //depot/projects/mjexp/sys/dev/sound/usb/uaudio.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/version.h#1 branch .. //depot/projects/mjexp/sys/dev/usb/if_ural.c#10 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdevs#11 integrate .. //depot/projects/mjexp/sys/fs/devfs/devfs_vnops.c#9 integrate .. //depot/projects/mjexp/sys/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/mjexp/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/mjexp/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/mjexp/sys/fs/nullfs/null_vnops.c#5 integrate .. //depot/projects/mjexp/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/mjexp/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/mjexp/sys/fs/smbfs/smbfs_node.c#5 integrate .. //depot/projects/mjexp/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/mjexp/sys/fs/unionfs/union.h#3 integrate .. //depot/projects/mjexp/sys/fs/unionfs/union_subr.c#6 integrate .. //depot/projects/mjexp/sys/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/mjexp/sys/gnu/fs/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/mjexp/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#4 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#4 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/mjexp/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/mjexp/sys/i386/i386/busdma_machdep.c#5 integrate .. //depot/projects/mjexp/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/mjexp/sys/i386/i386/intr_machdep.c#8 integrate .. //depot/projects/mjexp/sys/i386/i386/machdep.c#13 integrate .. //depot/projects/mjexp/sys/i386/i386/pmap.c#14 integrate .. //depot/projects/mjexp/sys/i386/i386/sys_machdep.c#6 integrate .. //depot/projects/mjexp/sys/i386/i386/trap.c#7 integrate .. //depot/projects/mjexp/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/mjexp/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/mjexp/sys/i386/include/specialreg.h#5 integrate .. //depot/projects/mjexp/sys/i386/include/vmparam.h#5 integrate .. //depot/projects/mjexp/sys/ia64/ia64/busdma_machdep.c#4 integrate .. //depot/projects/mjexp/sys/ia64/ia64/exception.S#3 integrate .. //depot/projects/mjexp/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/mjexp/sys/ia64/ia64/locore.S#2 integrate .. //depot/projects/mjexp/sys/ia64/ia64/machdep.c#8 integrate .. //depot/projects/mjexp/sys/ia64/ia64/pmap.c#8 integrate .. //depot/projects/mjexp/sys/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/mjexp/sys/ia64/include/vmparam.h#4 integrate .. //depot/projects/mjexp/sys/kern/init_main.c#10 integrate .. //depot/projects/mjexp/sys/kern/kern_acct.c#8 integrate .. //depot/projects/mjexp/sys/kern/kern_alq.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_clock.c#8 integrate .. //depot/projects/mjexp/sys/kern/kern_conf.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_descrip.c#12 integrate .. //depot/projects/mjexp/sys/kern/kern_event.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_exec.c#8 integrate .. //depot/projects/mjexp/sys/kern/kern_exit.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_fork.c#11 integrate .. //depot/projects/mjexp/sys/kern/kern_intr.c#12 integrate .. //depot/projects/mjexp/sys/kern/kern_ktrace.c#9 integrate .. //depot/projects/mjexp/sys/kern/kern_linker.c#8 integrate .. //depot/projects/mjexp/sys/kern/kern_malloc.c#6 integrate .. //depot/projects/mjexp/sys/kern/kern_mib.c#6 integrate .. //depot/projects/mjexp/sys/kern/kern_mtxpool.c#2 integrate .. //depot/projects/mjexp/sys/kern/kern_proc.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_resource.c#11 integrate .. //depot/projects/mjexp/sys/kern/kern_sig.c#13 integrate .. //depot/projects/mjexp/sys/kern/kern_sx.c#11 integrate .. //depot/projects/mjexp/sys/kern/kern_synch.c#14 integrate .. //depot/projects/mjexp/sys/kern/kern_thread.c#9 integrate .. //depot/projects/mjexp/sys/kern/link_elf.c#4 integrate .. //depot/projects/mjexp/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/mjexp/sys/kern/subr_mbpool.c#2 integrate .. //depot/projects/mjexp/sys/kern/subr_trap.c#8 integrate .. //depot/projects/mjexp/sys/kern/subr_witness.c#12 integrate .. //depot/projects/mjexp/sys/kern/sys_pipe.c#5 integrate .. //depot/projects/mjexp/sys/kern/tty_cons.c#3 integrate .. //depot/projects/mjexp/sys/kern/uipc_sockbuf.c#5 integrate .. //depot/projects/mjexp/sys/kern/uipc_socket.c#13 integrate .. //depot/projects/mjexp/sys/kern/uipc_usrreq.c#12 integrate .. //depot/projects/mjexp/sys/kern/vfs_aio.c#5 integrate .. //depot/projects/mjexp/sys/kern/vfs_bio.c#12 integrate .. //depot/projects/mjexp/sys/kern/vfs_cluster.c#4 integrate .. //depot/projects/mjexp/sys/kern/vfs_lookup.c#7 integrate .. //depot/projects/mjexp/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/mjexp/sys/kern/vfs_syscalls.c#13 integrate .. //depot/projects/mjexp/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/mjexp/sys/kern/vnode_if.src#5 integrate .. //depot/projects/mjexp/sys/modules/cxgb/Makefile#4 integrate .. //depot/projects/mjexp/sys/modules/dcons/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/mjexp/sys/net/ethernet.h#7 integrate .. //depot/projects/mjexp/sys/net/if_bridge.c#9 integrate .. //depot/projects/mjexp/sys/net/if_ethersubr.c#10 integrate .. //depot/projects/mjexp/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/mjexp/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/mjexp/sys/netinet/sctp.h#6 integrate .. //depot/projects/mjexp/sys/netinet/sctp_asconf.c#10 integrate .. //depot/projects/mjexp/sys/netinet/sctp_auth.c#9 integrate .. //depot/projects/mjexp/sys/netinet/sctp_bsd_addr.c#6 integrate .. //depot/projects/mjexp/sys/netinet/sctp_bsd_addr.h#6 integrate .. //depot/projects/mjexp/sys/netinet/sctp_constants.h#10 integrate .. //depot/projects/mjexp/sys/netinet/sctp_indata.c#13 integrate .. //depot/projects/mjexp/sys/netinet/sctp_input.c#13 integrate .. //depot/projects/mjexp/sys/netinet/sctp_input.h#4 integrate .. //depot/projects/mjexp/sys/netinet/sctp_lock_bsd.h#6 integrate .. //depot/projects/mjexp/sys/netinet/sctp_os_bsd.h#9 integrate .. //depot/projects/mjexp/sys/netinet/sctp_output.c#14 integrate .. //depot/projects/mjexp/sys/netinet/sctp_output.h#6 integrate .. //depot/projects/mjexp/sys/netinet/sctp_pcb.c#13 integrate .. //depot/projects/mjexp/sys/netinet/sctp_pcb.h#9 integrate .. //depot/projects/mjexp/sys/netinet/sctp_peeloff.c#8 integrate .. //depot/projects/mjexp/sys/netinet/sctp_structs.h#12 integrate .. //depot/projects/mjexp/sys/netinet/sctp_sysctl.c#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_timer.c#11 integrate .. //depot/projects/mjexp/sys/netinet/sctp_uio.h#13 integrate .. //depot/projects/mjexp/sys/netinet/sctp_usrreq.c#13 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.c#13 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.h#10 integrate .. //depot/projects/mjexp/sys/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/mjexp/sys/netinet/tcp_input.c#16 integrate .. //depot/projects/mjexp/sys/netinet/tcp_syncache.c#11 integrate .. //depot/projects/mjexp/sys/netinet/tcp_timer.c#8 integrate .. //depot/projects/mjexp/sys/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/mjexp/sys/netinet/tcp_var.h#10 integrate .. //depot/projects/mjexp/sys/netinet6/sctp6_usrreq.c#11 integrate .. //depot/projects/mjexp/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/mjexp/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/mjexp/sys/netipsec/key.c#2 integrate .. //depot/projects/mjexp/sys/nfs4client/nfs4_vnops.c#4 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/mjexp/sys/pc98/pc98/machdep.c#12 integrate .. //depot/projects/mjexp/sys/pci/ncr.c#6 integrate .. //depot/projects/mjexp/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/clock.c#3 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/intr_machdep.c#4 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/machdep.c#7 integrate .. //depot/projects/mjexp/sys/security/audit/audit.c#8 integrate .. //depot/projects/mjexp/sys/security/audit/audit.h#3 integrate .. //depot/projects/mjexp/sys/security/audit/audit_bsm_token.c#5 integrate .. //depot/projects/mjexp/sys/security/audit/audit_private.h#4 integrate .. //depot/projects/mjexp/sys/security/audit/audit_syscalls.c#8 integrate .. //depot/projects/mjexp/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/mjexp/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/bus_machdep.c#4 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/machdep.c#8 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/bus_machdep.c#4 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/intr_machdep.c#6 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/machdep.c#8 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/pmap.c#11 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/tsb.c#7 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/tte_hash.c#7 integrate .. //depot/projects/mjexp/sys/sys/conf.h#4 integrate .. //depot/projects/mjexp/sys/sys/filedesc.h#4 integrate .. //depot/projects/mjexp/sys/sys/proc.h#14 integrate .. //depot/projects/mjexp/sys/sys/resource.h#2 integrate .. //depot/projects/mjexp/sys/sys/resourcevar.h#2 integrate .. //depot/projects/mjexp/sys/sys/sx.h#9 integrate .. //depot/projects/mjexp/sys/sys/syslimits.h#2 integrate .. //depot/projects/mjexp/sys/sys/vmmeter.h#5 integrate .. //depot/projects/mjexp/sys/sys/vnode.h#9 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_inode.c#3 integrate .. //depot/projects/mjexp/sys/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/mjexp/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/mjexp/sys/ufs/ufs/ufs_gjournal.c#2 integrate .. //depot/projects/mjexp/sys/ufs/ufs/ufs_quota.c#8 integrate .. //depot/projects/mjexp/sys/vm/swap_pager.c#9 integrate .. //depot/projects/mjexp/sys/vm/uma_core.c#8 integrate .. //depot/projects/mjexp/sys/vm/vm_contig.c#8 integrate .. //depot/projects/mjexp/sys/vm/vm_fault.c#9 integrate .. //depot/projects/mjexp/sys/vm/vm_glue.c#7 integrate .. //depot/projects/mjexp/sys/vm/vm_map.c#8 integrate .. //depot/projects/mjexp/sys/vm/vm_meter.c#4 integrate .. //depot/projects/mjexp/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/mjexp/sys/vm/vm_object.c#9 integrate .. //depot/projects/mjexp/sys/vm/vm_page.c#12 integrate .. //depot/projects/mjexp/sys/vm/vm_pageout.c#6 integrate .. //depot/projects/mjexp/sys/vm/vm_pageq.c#4 integrate .. //depot/projects/mjexp/sys/vm/vm_zeroidle.c#8 integrate .. //depot/projects/mjexp/sys/vm/vnode_pager.c#4 integrate .. //depot/projects/mjexp/tools/regression/usr.bin/lastcomm/README#2 integrate .. //depot/projects/mjexp/tools/regression/usr.bin/lastcomm/v1-sparc64.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/lastcomm/v2-sparc64.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.sbin/sa/v1-sparc64-sav.in#1 branch .. //depot/projects/mjexp/tools/regression/usr.sbin/sa/v1-sparc64-sav.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.sbin/sa/v1-sparc64-u.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.sbin/sa/v1-sparc64-usr.in#1 branch .. //depot/projects/mjexp/tools/regression/usr.sbin/sa/v1-sparc64-usr.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.sbin/sa/v2-sparc64-sav.in#1 branch .. //depot/projects/mjexp/tools/regression/usr.sbin/sa/v2-sparc64-u.out#1 branch .. //depot/projects/mjexp/tools/regression/usr.sbin/sa/v2-sparc64-usr.in#1 branch .. //depot/projects/mjexp/usr.bin/file/config.h#2 integrate .. //depot/projects/mjexp/usr.bin/file/file.1#2 integrate .. //depot/projects/mjexp/usr.bin/file/magic.5#2 integrate .. //depot/projects/mjexp/usr.bin/gzip/gzip.1#3 integrate .. //depot/projects/mjexp/usr.bin/gzip/gzip.c#2 integrate .. //depot/projects/mjexp/usr.bin/less/lesspipe.sh#2 integrate .. //depot/projects/mjexp/usr.bin/make/main.c#4 integrate .. //depot/projects/mjexp/usr.bin/tar/Makefile#4 integrate .. //depot/projects/mjexp/usr.bin/tar/bsdtar.1#4 integrate .. //depot/projects/mjexp/usr.bin/tar/bsdtar.c#5 integrate .. //depot/projects/mjexp/usr.bin/tar/bsdtar.h#5 integrate .. //depot/projects/mjexp/usr.bin/tar/read.c#8 integrate .. //depot/projects/mjexp/usr.bin/tar/write.c#11 integrate .. //depot/projects/mjexp/usr.sbin/dconschat/dconschat.c#2 integrate .. //depot/projects/mjexp/usr.sbin/ppp/command.c#2 integrate .. //depot/projects/mjexp/usr.sbin/ppp/ppp.8.m4#2 integrate .. //depot/projects/mjexp/usr.sbin/ppp/radius.c#3 integrate .. //depot/projects/mjexp/usr.sbin/ppp/radius.h#2 integrate Differences ... ==== //depot/projects/mjexp/Makefile.inc1#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.581 2007/05/19 20:34:29 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.582 2007/05/26 20:17:19 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -309,7 +309,7 @@ rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/c++/3.4 usr/include/sys usr/lib \ + usr/bin usr/games usr/include/sys usr/lib \ usr/libexec usr/sbin usr/share/dict \ usr/share/groff_font/devX100 \ usr/share/groff_font/devX100-12 \ @@ -505,7 +505,7 @@ # and Makefile.inc1 causes the correct PATH to be used, rather than a # modification of the current environment's PATH. In addition, we need # to quote multiword values. -# +# buildenvvars: @echo ${WMAKEENV:Q} @@ -1113,7 +1113,7 @@ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install -_prereq_libs: ${_prereq_libs:S/$/__PL/} +_prereq_libs: ${_prereq_libs:S/$/__PL/} _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} ==== //depot/projects/mjexp/UPDATING#17 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20070529: + The ether_ioctl() function has been synchronized with ioctl(2) + and ifnet.if_ioctl. Due to that, the size of one of its arguments + has changed on 64-bit architectures. All kernel modules using + ether_ioctl() need to be rebuilt on such architectures. + 20070516: Improved INCLUDE_CONFIG_FILE support has been introduced to the config(8) utility. In order to take advantage of this new @@ -795,4 +801,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.491 2007/05/16 17:23:53 wkoszek Exp $ +$FreeBSD: src/UPDATING,v 1.492 2007/05/29 12:40:45 yar Exp $ ==== //depot/projects/mjexp/bin/chflags/chflags.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.28 2006/03/10 12:37:19 trhodes Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -66,7 +66,7 @@ If the .Ar file is a symbolic link, -change the mode of the link itself rather than the file to which it points. +change the file flags of the link itself rather than the file to which it points. .It Fl L If the .Fl R ==== //depot/projects/mjexp/bin/pax/ar_io.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.26 2005/03/12 06:38:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.28 2007/05/25 17:53:37 brian Exp $"); #include #include @@ -1109,8 +1109,8 @@ int ar_next(void) { + static char *arcbuf; char buf[PAXPATHLEN+2]; - static int freeit = 0; sigset_t o_mask; /* @@ -1228,17 +1228,14 @@ * try to open new archive */ if (ar_open(buf) >= 0) { - if (freeit) { - (void)free((char *)(uintptr_t)arcname); - freeit = 0; - } - if ((arcname = strdup(buf)) == NULL) { + free(arcbuf); + if ((arcbuf = strdup(buf)) == NULL) { done = 1; lstrval = -1; paxwarn(0, "Cannot save archive name."); return(-1); } - freeit = 1; + arcname = arcbuf; break; } tty_prnt("Cannot open %s, try again\n", buf); ==== //depot/projects/mjexp/bin/pax/file_subs.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.21 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.22 2007/05/24 06:44:37 rse Exp $"); #include #include @@ -284,7 +284,7 @@ */ if ((to_sb->st_dev==sb.st_dev)&&(to_sb->st_ino == sb.st_ino)) { paxwarn(1, "Unable to link file %s to itself", to); - return(-1);; + return(-1); } /* ==== //depot/projects/mjexp/bin/pax/pat_rep.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.25 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.27 2007/05/25 17:53:37 brian Exp $"); #include #include @@ -140,7 +140,7 @@ regerror(res, &(rep->rcmp), rebuf, sizeof(rebuf)); paxwarn(1, "%s while compiling regular expression %s", rebuf, str); # endif - (void)free((char *)rep); + free(rep); return(-1); } @@ -152,11 +152,11 @@ *pt1++ = *str; if ((pt2 = strchr(pt1, *str)) == NULL) { # ifdef NET2_REGEX - (void)free((char *)rep->rcmp); + free(rep->rcmp); # else - regfree(&(rep->rcmp)); + regfree(&rep->rcmp); # endif - (void)free((char *)rep); + free(rep); paxwarn(1, "Invalid replacement string %s", str); return(-1); } @@ -181,11 +181,11 @@ break; default: # ifdef NET2_REGEX - (void)free((char *)rep->rcmp); + free(rep->rcmp); # else - regfree(&(rep->rcmp)); + regfree(&rep->rcmp); # endif - (void)free((char *)rep); + free(rep); *pt1 = *str; paxwarn(1, "Invalid replacement string option %s", str); return(-1); @@ -401,7 +401,7 @@ return(-1); } *ppt = pt->fow; - (void)free((char *)pt); + free(pt); arcn->pat = NULL; return(0); } ==== //depot/projects/mjexp/bin/pax/sel_subs.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.19 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.21 2007/05/25 17:53:38 brian Exp $"); #include #include @@ -412,7 +412,7 @@ */ if (str_sec(str, &(pt->low_time)) < 0) { paxwarn(1, "Illegal lower time range %s", str); - (void)free((char *)pt); + free(pt); goto out; } pt->flgs |= HASLOW; @@ -424,7 +424,7 @@ */ if (str_sec(up_pt, &(pt->high_time)) < 0) { paxwarn(1, "Illegal upper time range %s", up_pt); - (void)free((char *)pt); + free(pt); goto out; } pt->flgs |= HASHIGH; @@ -436,7 +436,7 @@ if (pt->low_time > pt->high_time) { paxwarn(1, "Upper %s and lower %s time overlap", up_pt, str); - (void)free((char *)pt); + free(pt); return(-1); } } ==== //depot/projects/mjexp/bin/pax/tables.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.22 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.24 2007/05/25 17:53:38 brian Exp $"); #include #include @@ -178,8 +178,8 @@ */ if (--pt->nlink <= 1) { *ppt = pt->fow; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); } return(1); } @@ -198,7 +198,7 @@ ltab[indx] = pt; return(0); } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Hard link table out of memory"); @@ -254,8 +254,8 @@ * remove and free it */ *ppt = pt->fow; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); } /* @@ -288,8 +288,8 @@ while (pt != NULL) { ppt = pt; pt = ppt->fow; - (void)free((char *)ppt->name); - (void)free((char *)ppt); + free(ppt->name); + free(ppt); } } return; @@ -460,7 +460,7 @@ paxwarn(1, "File time table ran out of memory"); if (pt != NULL) - (void)free((char *)pt); + free(pt); return(-1); } @@ -538,7 +538,7 @@ if (strcmp(nname, pt->nname) == 0) return(0); - (void)free((char *)pt->nname); + free(pt->nname); if ((pt->nname = strdup(nname)) == NULL) { paxwarn(1, "Cannot update rename table"); return(-1); @@ -557,9 +557,9 @@ ntab[indx] = pt; return(0); } - (void)free((char *)pt->oname); + free(pt->oname); } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Interactive rename table out of memory"); return(-1); @@ -994,7 +994,7 @@ atab[indx] = pt; return; } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Directory access time reset table ran out of memory"); @@ -1051,8 +1051,8 @@ *ppt = pt->fow; *mtime = pt->mtime; *atime = pt->atime; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); return(0); } ==== //depot/projects/mjexp/contrib/file/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,194 @@ +2007-05-24 10:00 Christos Zoulas + + * Fix another integer overflow (Colin Percival) + +2007-03-26 13:58 Christos Zoulas + + * make sure that all of struct magic_set is initialized appropriately + (Brett) + +2007-03-25 17:44 Christos Zoulas + + * reset left bytes in the buffer (Dmitry V. Levin) + + * compilation failed with COMPILE_ONLY and ENABLE_CONDITIONALS + (Peter Avalos) + +2007-03-15 10:51 Christos Zoulas + + * fix fortran and nroff reversed tests (Dmitry V. Levin) + + * fix exclude option (Dmitry V. Levin) + +2007-02-08 17:30 Christos Zoulas + + * fix integer underflow in file_printf which can lead to + to exploitable heap overflow (Jean-Sebastien Guay-Lero) + +2007-02-05 11:35 Christos Zoulas + + * make socket/pipe reading more robust + +2007-01-25 16:01 Christos Zoulas + + * Centralize all the tests in file_buffer. + + * Add exclude flag. + +2007-01-18 05:29 Anon Ymous + + * Move the "type" detection code from parse() into its own table + driven routine. This avoids maintaining multiple lists in + file.h. + + * Add an optional conditional field (ust before the type field). + This code is wrapped in "#ifdef ENABLE_CONDITIONALS" as it is + likely to go away. + +2007-01-16 23:24 Anon Ymous + + * Fix an initialization bug in check_mem(). + +2007-01-16 14:58 Anon Ymous + + * Add a "default" type to print a message if nothing previously + matched at that level or since the last default at that + level. This is useful for setting up switch-like statements. + It can also be used to do if/else constructions without a + redundant second test. + + * Fix the "x" special case test so that one can test for that + string with "=x". + + * Allow "search" to search the entire buffer if the "/N" + search count is missing. + + * Make "regex" work! It now starts its search at the + specified offset and takes an (optional) "/N" line count to + specify the search range; otherwise it searches to the end + of the file. The match is now grabbed correctly for format + strings and the offset set to the end of the match. + + * Add a "/s" flag to "regex" and "search" to set the offset to + the start of the match. By default the offset is set to the + end of the match, as it is with other tests. This is mostly + useful for "regex". + + * Make "search", "string" and "pstring" use the same + file_strncmp() routine so that they support the same flags; + "bestring16" and "lestring16" call the same routine, but + with flags = 0. Also add a "/C" flag (in analogy to "/c") + to ignore the case on uppercase (lowercase) characters in + the test string. + + * Strict adherence to C style string escapes. A warnings are + printed when compiling. Note: previously "\a" was + incorrectly translated to 'a' instead of an (i.e., + BELL, typically 0x07). + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 3 05:53:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 537C016A488; Sun, 3 Jun 2007 05:53:05 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 73BC716A482; Sun, 3 Jun 2007 05:53:04 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 1E9FE13C458; Sun, 3 Jun 2007 05:53:04 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.13.8/8.13.4) with ESMTP id l535q4v7004667; Sat, 2 Jun 2007 23:52:04 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Sat, 02 Jun 2007 23:52:23 -0600 (MDT) Message-Id: <20070602.235223.-1592322846.imp@bsdimp.com> To: rpaulo@freebsd.org From: "M. Warner Losh" In-Reply-To: <200706021439.l52Edj6g051339@repoman.freebsd.org> References: <200706021439.l52Edj6g051339@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (harmony.bsdimp.com [127.0.0.1]); Sat, 02 Jun 2007 23:52:04 -0600 (MDT) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 120782 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 05:53:05 -0000 In message: <200706021439.l52Edj6g051339@repoman.freebsd.org> Rui Paulo writes: : http://perforce.freebsd.org/chv.cgi?CH=120782 : : Change 120782 by rpaulo@rpaulo_epsilon on 2007/06/02 14:38:42 : : Need to use bus_set_resource() on the probe routine or else : the IRQ will only be setup on the second time the module is : loaded. You mean "only be printed on the probe line the second time the module is loaded" right? Warner From owner-p4-projects@FreeBSD.ORG Sun Jun 3 09:52:04 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 893F016A469; Sun, 3 Jun 2007 09:52:04 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 349BE16A41F for ; Sun, 3 Jun 2007 09:52:04 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2411613C4B7 for ; Sun, 3 Jun 2007 09:52:04 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l539q4Td056287 for ; Sun, 3 Jun 2007 09:52:04 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l539q3eC056262 for perforce@freebsd.org; Sun, 3 Jun 2007 09:52:03 GMT (envelope-from taleks@FreeBSD.org) Date: Sun, 3 Jun 2007 09:52:03 GMT Message-Id: <200706030952.l539q3eC056262@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to taleks@FreeBSD.org using -f From: Alexey Tarasov To: Perforce Change Reviews Cc: Subject: PERFORCE change 120824 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 09:52:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=120824 Change 120824 by taleks@taleks_th on 2007/06/03 09:51:31 pxe_dns: implemented simple DNS resolving using UDP sockets. pxe_core: added set nameserver function, updated receiving cycle. pxe_filter: small changes to remove debug information. pxe_sock: first dummy implementation for UDP. pxe_udp: checksum calculation and socket writing update. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#6 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#12 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#10 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_dns.c#2 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_dns.h#2 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_filter.c#2 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.h#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_udp.c#2 edit Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#6 (text+ko) ==== @@ -183,15 +183,17 @@ * or for proxy server. Default arp_table size is 8. It seems more than enough. */ - if (NULL != pxe_arp_table_search(arp_reply->body.src_paddr)) { + const MAC_ADDR *kmac = pxe_arp_table_search(arp_reply->body.src_paddr); + if (NULL != kmac) { #ifdef PXE_DEBUG uint8_t *octet = (uint8_t *)&arp_reply->body.src_paddr; uint8_t *mac = arp_reply->body.src_hwaddr; printf("MAC of %d.%d.%d.%d already known: %x:%x:%x:%x:%x:%x\n", octet[0], octet[1], octet[2], octet[3], - mac[0], mac[1], mac[2], mac[3], mac[4], mac[5] + (*kmac)[0], (*kmac)[1], (*kmac)[2], (*kmac)[3], (*kmac)[4], (*kmac)[5] ); #endif + /* NOTE: theoretically it's possible mac != known mac. Ignore for now. */ return (0); } @@ -282,9 +284,6 @@ if (timeToDie == 0) { -#ifdef PXE_DEBUG_HELL - printf("."); -#endif --trysLeft; if (trysLeft == 0) { /* have not recieved anything, return nothing */ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#12 (text+ko) ==== @@ -752,7 +752,7 @@ } #ifdef PXE_DEBUG - printf("recv_packets(): size = %d, proto = %d, frame_length = %d bytes\n.", buffer_size, protocol, frame_size); + printf("recv_packets(): size = %d, proto = %d, frame_length = %d bytes.\n", buffer_size, protocol, frame_size); #endif /* we are interested in ARP & IP packets */ @@ -776,7 +776,6 @@ drop_flag = 1; /* drop this packet */ } - /* checking first fragment, this may help to avoid memory allocation * and memblock copy in main cycle below */ @@ -814,7 +813,7 @@ (!core_protocol[iphdr->protocol](&dummy_pack, (buffer_size == frame_size) ? PXE_CORE_HANDLE : PXE_CORE_FRAG, NULL)) ) { - drop_flag = 1; + drop_flag = 1; } else { pack = pxe_core_alloc_packet(buffer_size); @@ -845,6 +844,8 @@ } } + received = frame_size; + while (received < buffer_size) { if (!pxe_core_get_packet(PXENV_UNDI_ISR_IN_GET_NEXT, undi_isr)) @@ -898,8 +899,9 @@ func = PXENV_UNDI_ISR_IN_GET_NEXT; - if (received == buffer_size) +/* if (received == buffer_size) return processed_packets; +*/ goto packet_start; @@ -1029,6 +1031,13 @@ return ns_ip.ip; } +void +pxe_set_nsip32(uint32_t new_ip) +{ + + ns_ip.ip = new_ip; +} + const MAC_ADDR* pxe_get_mymac() { ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#10 (text+ko) ==== @@ -118,5 +118,6 @@ /* returns nameserver ip */ uint32_t pxe_get_nsip32(); +void pxe_set_nsip32(uint32_t new_ns); #endif // PXE_CORE_H_INCLUDED ==== //depot/projects/soc2007/taleks-pxe_http/pxe_dns.c#2 (text+ko) ==== @@ -4,56 +4,375 @@ #include "pxe_dns.h" #include "pxe_sock.h" +/* write_question_for()- writes labels for provided domain name + * in: + * question - where to write + * name - domain name + * out: + * NULL - if failed + * non NULL- ponits to the next byte after labeled name. + */ +char * +write_question_for(uint8_t *question, const char *name) +{ + size_t len = strlen(name); + + if (len > 255) { /* oversize */ + return (NULL); + } + + size_t ind = len; + uint8_t symbol_count = 0; + uint8_t *res = question + len; + char *np = name + len - 1; + question[len + 1] = 0; /* label end of question */ + + /* placing from the end, replacing dots with symbol counter */ + for ( ; ind != 0; --ind) { + + *res = *np; + + if ( *res == '.') { + + if (symbol_count == 0) { /* example..of.error */ + return (NULL); + } + + *res = symbol_count; + symbol_count = 0; + + } else { + ++symbol_count; + } + + --res; + --np; + } + + *res = symbol_count; /* length for first label */ + + /* +1 for first length, +1 for \0 */ + return (question + len + 2); +} + +/* create_dns_packet()- creates DNS request packet + * in: + * name - domain name to resolve + * data - buffer for request packet. + * max_size - size of buffer [NOT IMPLEMENTED] + * id - request id to distinguish requests + * out: + * 0 - failed + * >0 - size of created packet + */ int -create_dns_packet(char *name, void *data, int max_size) { +create_dns_packet(char *name, void *data, int max_size, uint16_t id, uint16_t query_type) { PXE_DNS_REQUEST_HDR *request = (PXE_DNS_REQUEST_HDR *)data; + uint8_t *question = (uint8_t *)(data + sizeof(PXE_DNS_REQUEST_HDR)); - /* data must be set with zeroes, so fill only needed values */ - request->id = le2be16(1); + pxe_memset(request, 0, sizeof(PXE_DNS_REQUEST_HDR)); + + /* header set with zeroes, so fill only needed values */ + request->id = le2be16(id); request->flags = le2be16(PXE_DNS_DEFAULT_FLAGS); - request->questions_num = le2be16(1); + request->qdcount = le2be16(1); + + question = write_question_for(question, name); + + if (question == NULL) /* failed to write question section */ + return (0); /* may be, name size is to big */ + + PXE_DNS_REQUEST_FOOT *foot = (PXE_DNS_REQUEST_FOOT *)question; + + /* finishing creating of packet */ + foot->qtype = le2be16(query_type); + foot->qclass = le2be16(PXE_DNS_CLASS_IN); + + question += sizeof(PXE_DNS_REQUEST_FOOT); + + /* return total size of packet */ + return (((void *)question) - data); +} + +/* skip_name() - gets name from answers + * in: + * org - pointer to packet data start + * off - offset to name or part of name to get + * to_place - where to place name. NULL, if not interesting for us + * out: + * bytes, read from offset (name definition length) + */ +int +skip_name(uint8_t *org, uint16_t off, uint8_t *to_place) +{ + uint8_t label[64]; + label[0] = 0; + + int res =0 ; + uint8_t *data = org + off; + + while (*data != 0) { + + if (*data < 64) { /* just a label */ + pxe_memcpy(data + 1, label, *data); + label[*data] = 0; + + if (to_place != 0) { /* updating to_pace, if interesting */ + + if (to_place[0] != 0) /* add dot, if there is part of name in buffer */ + strcat((char *)to_place, "."); + + strcat((char *)to_place, (const char*)label); + } + + res += (1 + *data); + data += (1 + *data); + + } else {/* compression enabled, this is part of pointer */ + uint16_t off = (((*data) & 0x3f) << 8) + *(data + 1); + skip_name(org, off, to_place); + + res += 1; + break; + } + } - /* TODO: finish it after sleeping. - * 1. count number of symbols in domain name part betweenn dots - * 2. place name to request - * 3. place query type and class - */ + res += 1; /* ending zero skip */ + return (res); } +/* parse_dns_reply() - parses reply from DNS server + * in: + * data - pointer to buffer, containing packet data + * size - buffer size + * name - domain name to resolve + * canme - where to store cname if found. + * out: + * 0 - parsing failed, or packet has no information about our domain + * ip - success, 32bit ip4 address + */ uint32_t -pxe_gethostbyname(char *name) +parse_dns_reply(uint8_t* data, int size, char *name, uint16_t id, uint8_t *cname) { - /* sanity check */ - if (name == NULL) { + + cname[0] = 0; + + if (size < sizeof(PXE_DNS_REQUEST_HDR) + 8) { /* too small packet to be with data */ +#ifdef PXE_DEBUG + printf("parse_dns_reply(): too small packet.\n"); +#endif + return (0); + } + + PXE_DNS_REQUEST_HDR *hdr = (PXE_DNS_REQUEST_HDR *)data; + uint8_t *answer = data + sizeof(PXE_DNS_REQUEST_HDR); + + if ( hdr->id != le2be16(id)) { /* wrong id */ +#ifdef PXE_DEBUG + printf("parse_dns_reply(): wrong id %d, expected %d.\n", le2be16(hdr->id), id); +#endif + return (0); + } + + uint16_t flags = le2be16(hdr->flags); + + if ( (flags & 0xf800) != 0x8000) { /* QR != 1 */ +#ifdef PXE_DEBUG + printf("parse_dns_reply(): got request. Ignoring it.\n"); +#endif return (0); } - int socket = pxe_socket(); +#ifdef PXE_DEBUG + printf("parse_dns_reply(): query/answer/ns/additional = %d/%d/%d/%d\n", + le2be16(hdr->qdcount), le2be16(hdr->ancount), le2be16(hdr->nscount), le2be16(hdr->arcount) + ); +#endif + /* getting server return code */ + int rcode = (flags & 0x000f); - if (socket == -1) { - printf("pxe_gethostbyname(): failed to create socket.\n"); + switch(rcode) { + case 0: /* good */ + break; + case 1: + printf("parse_dns_reply(): server said format error.\n"); + return (0); + break; + case 2: + printf("parse_dns_reply(): server failed.\n"); + return (0); + break; + case 3: + printf("parse_dns_reply(): name error, domain not exists?\n"); + return (0); + break; + case 4: + printf("parse_dns_reply(): requested operation not implemented.\n"); + return (0); + break; + case 5: + printf("parse_dns_reply(): access refused.\n"); + return (0); + break; + default: + printf("parse_dns_reply(): don't know nothing about rcode = %d.\n", rcode); return (0); + break; } - uint8_t dns_pack[512]; + /* server reported success */ - pxe_memset(dns_pack, 0, 512); + if (hdr->ancount == 0) { /* there is no answers */ + printf("parse_dns_reply(): there are no answers in DNS server reply.\n"); + return (0); + } + + uint8_t aname[256]; /* storage for domain names in answers */ - int size = create_dns_packet(name, dns_pack, 512); + switch (le2be16(hdr->qdcount)) { + case 0: /* best case, nothing must be skipped to get answer data */ + break; + case 1: + + aname[0] = 0; + answer += skip_name(data, answer - data, aname); +#ifdef PXE_DEBUG + printf("question: %s\n", aname); +#endif + /* answer points to zero, skipping claas/type */ + answer += sizeof(PXE_DNS_REQUEST_FOOT); + break; - if (size == 0) { - goto ret; + default: /* error */ + printf("parse_dns_reply(): me sent only one query, but server says %d.\n", le2be16(hdr->qdcount)); + return (0); } - int trys = PXE_MAX_DNS_TRYS; - int time = 0; + + /* parsing answers, authorative section and additional section, hoping to find A resource record */ + uint16_t index = le2be16(hdr->ancount) + le2be16(hdr->nscount) + le2be16(hdr->arcount); + + while (index) { + + aname[0] = 0; + answer += skip_name(data, answer - data, aname); + +#ifdef PXE_DEBUG + printf("answer: %s", aname); +#endif + PXE_DNS_REQUEST_FOOT *ans_foot = (PXE_DNS_REQUEST_FOOT *)answer; + + if (le2be16(ans_foot->qclass) != PXE_DNS_CLASS_IN) { + printf("parse_dns_reply(): IN expected, got 0x%x.\n", le2be16(ans_foot->qclass)); + return (0); + } + + answer += sizeof(PXE_DNS_REQUEST_FOOT); + + PXE_DNS_REQUEST_FOOT2 *ans_foot2 = (PXE_DNS_REQUEST_FOOT2 *)answer; + + answer += sizeof(PXE_DNS_REQUEST_FOOT2); + + uint16_t qtype = le2be16(ans_foot->qtype); + uint16_t rdlength = le2be16(ans_foot2->rdlength); + + if (qtype == PXE_DNS_QUERY_A) { + /* successfully got A record */ + + if ( (!strcmp(aname, name)) || /* A for our address */ + ((cname[0]) && (!strcmp(aname, cname))) /* A for our CNAME */ + ) + + { + /* sanity check */ + if (rdlength != 4) { /* wrong length of ip4 adrress length*/ + return (0); + } + + /* answer points to rdata = ip4 */ + PXE_IPADDR ret; + + ret.octet[0] = answer[0]; + ret.octet[1] = answer[1]; + ret.octet[2] = answer[2]; + ret.octet[3] = answer[3]; +#ifdef PXE_DEBUG + printf(" = %d.%d.%d.%d\n", + ret.octet[0], ret.octet[1], ret.octet[2], ret.octet[3] + ); +#endif + return ret.ip; + } + +#ifdef PXE_DEBUG + printf("parse_dns_reply(): A resource record '%s' is strange. Ignoring it.\n", aname); +#endif + } + + if (qtype == PXE_DNS_QUERY_CNAME) { + + cname[0] = 0; + skip_name(data, answer - data, cname); +#ifdef PXE_DEBUG + printf(" is alias to %s\n", (char *)cname); +#endif + + } else { + printf("parse_dns_reply(): A or CNAME expected, but got 0x%x, rdlength: %d.\n", qtype, rdlength); + } + + answer += rdlength; + --index; + } + + /* have not found anyrhing good */ + return (0); +} +/* pxe_gethostbyname() - returns ip4 address by domain name + * in: + * name - domain name to resolve + * out: + * 0 - if failed + * ip4addr - if success + */ +uint32_t +pxe_gethostbyname(char *name) +{ + /* sanity check */ + if (name == NULL) { + return (0); + } + + /* 512 bytes is limit for packet, sent via UDP */ + uint8_t dns_pack[512]; + uint8_t cname[256]; + + pxe_memset(dns_pack, 0, 512); + + int size = 0; + int trys = PXE_MAX_DNS_TRYS; + int time = 0; + uint16_t id = 1; while (trys) { -#ifdef PXE_DEBUG - printf("?"); -#endif + + int socket = pxe_socket(); + + if (socket == -1) { + printf("pxe_gethostbyname(): failed to create socket.\n"); + return (0); + } + + + size = create_dns_packet(name, dns_pack, 512, id, PXE_DNS_QUERY_A); + + if (size == 0) { + printf("pxe_gethostbyname(): failed to create request.\n"); + return (0); + } + if (size != pxe_sendto(socket, pxe_get_nsip32(), 53, dns_pack, size)) { printf("pxe_gethostbyname(): failed to send DNS request.\n"); pxe_close(socket); @@ -61,7 +380,7 @@ } time = 0; - + while (time < PXE_MAX_DNS_TIMEOUT) { if (!pxe_core_recv_packets()) { @@ -72,16 +391,42 @@ size = pxe_recv(socket, dns_pack, 512); if (size > 0) { - /* TODO: process dns reply */ - printf("pxe_gethostbyname(): Received DNS reply (%d bytes).\n", size); - goto ret; +#ifdef PXE_DEBUG + printf("pxe_gethostbyname(): Received DNS reply (%d bytes).\n", size); +#endif + uint32_t res = parse_dns_reply(dns_pack, size, name, id, cname); + + if (res != 0) { + pxe_close(socket); + return (res); + } + + pxe_sock_rewind(socket, size); /* NOTE: remove this after normal implementing of sockets */ + + if (cname[0] != 0) { /* failed to get A, but found CNAME, need to send other request */ + + size = create_dns_packet(name, dns_pack, 512, id, PXE_DNS_QUERY_CNAME); + + if (size == 0) { + printf("pxe_gethostbyname(): failed to create request.\n"); + break; /* next try */ + } + + if (size != pxe_send(socket, dns_pack, size)) { + printf("pxe_gethostbyname(): failed to send DNS request.\n"); + pxe_close(socket); + return (0); + } + } + } } trys -= 1; + id += 1; + + pxe_close(socket); } -ret: - pxe_close(socket); return (0); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_dns.h#2 (text+ko) ==== @@ -3,17 +3,20 @@ #include +/* + * Reference: RFC 1035 + */ /* max seconds to wait DNS reply in milliseconds */ #define PXE_MAX_DNS_TIMEOUT 10000 /* how many times to try, if there is no reply */ #define PXE_MAX_DNS_TRYS 3 -/* query flags */ +/* query flags, set only RecursionDesired bit */ #define PXE_DNS_DEFAULT_FLAGS 0x0100 /* query A and CNAME records */ #define PXE_DNS_QUERY_A 0x0001 -#define PXE_DNS_CNAME 0x0005 +#define PXE_DNS_QUERY_CNAME 0x0005 /* query class */ -#define PXE_DNS_CLASS_INET 0x0001 +#define PXE_DNS_CLASS_IN 0x0001 /* returns ip address by name, or 0 if failed */ uint32_t pxe_gethostbyname(char *name); @@ -21,15 +24,59 @@ typedef struct pxe_dns_request_hdr { uint16_t id; /* query identifier */ uint16_t flags; - uint16_t questions_num; - uint16_t answers_num; - uint16_t auths_num; - uint16_t adds_num; + + + uint16_t qdcount; /* number of entries in the question section */ + uint16_t ancount; /* number of resource records in the answer section*/ + uint16_t nscount; /* name server resource records in the authority + * records section. + */ + uint16_t arcount; /* number of resource records in the additional + * records section. + */ } __packed PXE_DNS_REQUEST_HDR; +/* flags are (copied from RFC 1035): + * 1 1 1 1 1 1 + * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 + * +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ + * |QR| Opcode |AA|TC|RD|RA| Z | RCODE | + * +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+ + * QR - 0 for query, 1 for reply + * OPCODE - kind of query + * 0 - a standard query (QUERY) + * 1 - an inverse query (IQUERY) + * 2 - a server status request (STATUS) + * AA - set if authorative + * TC - set if message truncated + * RD - set if recursion desired + * RA - set if recursion available + * Z - reserved, must be zeroed + * RCODE - return code: + * 0 - no error + * 1 - format error + * 2 - server failed + * 3 - name error + * 4 - not implemented + * 5 - refused + */ + +/* RCODE values */ +#define PXE_RCODE_NOERROR 0x0 +#define PXE_RCODE_FORMAT_ERROR 0x1 +#define PXE_RCODE_SERVER_FAILED 0x2 +#define PXE_RCODE_NAME_ERROR 0x3 +#define PXE_RCODE_NOT_IMPLEMENTED 0x4 +#define PXE_RCODE_REFUSED 0x5 + typedef struct pxe_dns_request_foot { - uint16_t type; - uint16_t class; -} __packed PXE_FNS_REQUEST_FOOT; + uint16_t qtype; /* type of query, e.g. A */ + uint16_t qclass; /* class of query, e.g. IN */ +} __packed PXE_DNS_REQUEST_FOOT; + +typedef struct pxe_dns_request_foot2 { + uint32_t ttl; /* seconds answer will be valid to cache */ + uint16_t rdlength; /* length of data, followed by this structure */ +} __packed PXE_DNS_REQUEST_FOOT2; #endif ==== //depot/projects/soc2007/taleks-pxe_http/pxe_filter.c#2 (text+ko) ==== @@ -47,14 +47,19 @@ free_head->prev = NULL; ++all_filters; } - + +#ifdef PXE_DEBUG_HELL + printf("_pxe_filter_alloc(): entry = 0x%x, head = 0x%x.\n", res, free_head); +#endif return (res); } void _pxe_filter_free(PXE_FILTER_ENTRY *entry) { - +#ifdef PXE_DEBUG_HELL + printf("_pxe_filter_free(): entry = 0x%x, head = 0x%x.\n", entry, free_head); +#endif entry->next = free_head; entry->prev = NULL; @@ -72,9 +77,14 @@ PXE_FILTER_ENTRY * pxe_filter_add(uint32_t src_ip, uint16_t src_port, uint32_t dst_ip, uint16_t dst_port, void *socket, uint8_t proto) { - +#ifdef PXE_DEBUG + if (socket == NULL) { + printf("pxe_filter_add(): NULL socket.\n"); + return (NULL); + } +#endif if (free_head == NULL) { - printf("pxe_filter_add(): filter table is full.\n"); + printf("pxe_filter_add(): filter table is full (all_filter = %d).\n", all_filters); return (NULL); /* there is no space for filters */ } @@ -212,6 +222,15 @@ int pxe_filter_remove(PXE_FILTER_ENTRY *filter) { +#ifdef PXE_DEBUG + if (filter == NULL) { + printf("pxe_filter_remove(): NULL filter.\n"); + return (0); + } + + printf("pxe_filter_remove(): removing filter 0x%x.\n", filter); + +#endif if (filter != filters_head) { /* non head filter */ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#5 (text+ko) ==== @@ -40,11 +40,12 @@ sock->state = PXE_SOCKET_FREE; +/* NOTE: may be it's not good place for it if (sock->filter) { pxe_filter_remove(sock->filter); sock->filter = NULL; } - +*/ return (1); } @@ -58,33 +59,39 @@ if (socket == -1) return (-1); +#ifdef PXE_DEBUG + printf("pxe_socket(): created socket %d.\n", socket); +#endif /* creating buffers */ - PXE_SOCKET *sock = &pxe_sockets[socket]; + PXE_BUFFER *rbuf = &pxe_sockets[socket].recv_buffer; + PXE_BUFFER *sbuf = &pxe_sockets[socket].send_buffer; - sock->send_buffer.data = pxe_alloc(PXE_DEFAULT_SEND_BUFSIZE); + sbuf->data = pxe_alloc(PXE_DEFAULT_SEND_BUFSIZE); - if (sock->send_buffer.data == NULL) { + if (sbuf->data == NULL) { pxe_socket_free(socket); return (-1); } - sock->send_buffer.bufsize = PXE_DEFAULT_SEND_BUFSIZE; - sock->send_buffer.bufleft = PXE_DEFAULT_SEND_BUFSIZE; - sock->send_buffer.next_data = sock->send_buffer.data; + sbuf->bufsize = PXE_DEFAULT_SEND_BUFSIZE; + sbuf->bufleft = PXE_DEFAULT_SEND_BUFSIZE; + sbuf->free_start = sbuf->data; + sbuf->free_end = sbuf->data + sbuf->bufsize; - sock->recv_buffer.data = pxe_alloc(PXE_DEFAULT_RECV_BUFSIZE); + rbuf->data = pxe_alloc(PXE_DEFAULT_RECV_BUFSIZE); - if (sock->recv_buffer.data == NULL) { + if (rbuf->data == NULL) { - pxe_free(sock->send_buffer.data); + pxe_free(rbuf->data); pxe_socket_free(socket); return (-1); } - sock->recv_buffer.bufsize = PXE_DEFAULT_RECV_BUFSIZE; - sock->recv_buffer.bufleft = PXE_DEFAULT_RECV_BUFSIZE; - sock->recv_buffer.next_data = sock->recv_buffer.data; + rbuf->bufsize = PXE_DEFAULT_RECV_BUFSIZE; + rbuf->bufleft = PXE_DEFAULT_RECV_BUFSIZE; + rbuf->free_start = rbuf->data; + rbuf->free_end = rbuf->data + rbuf->bufsize; return (socket); } @@ -92,12 +99,30 @@ int pxe_close(int socket) { +#ifdef PXE_DEBUG + printf("pxe_close(): closing socket %d\n", socket); +#endif + if ( (socket >= PXE_DEFAULT_SOCKETS) || (socket == -1)) { + printf("pxe_close(): invalid socket %d\n", socket); + return (0); + } + + PXE_SOCKET *sock = &pxe_sockets[socket]; - if (socket > PXE_DEFAULT_SOCKETS) { + if (sock->state == PXE_SOCKET_FREE) { +#ifdef PXE_DEBUG + printf("pxe_close(): socket %d already closed.\n", socket); +#endif return (0); } - PXE_SOCKET *sock = &pxe_sockets[socket]; + if (sock->filter != NULL) + pxe_filter_remove(sock->filter); + else { +#ifdef PXE_DEBUG + printf("pxe_close(): filter for socket already NULL.\n"); +#endif + } pxe_free(sock->send_buffer.data); pxe_free(sock->recv_buffer.data); @@ -115,7 +140,9 @@ PXE_FILTER_ENTRY *filter = pxe_filter_add(0, 0, pxe_get_myip32(), port, &pxe_sockets[socket], proto); if (filter == NULL) { +#ifdef PXE_DEBUG printf("pxe_listen(): failed to add filter.\n"); +#endif return (-1); } @@ -143,7 +170,7 @@ pxe_accept(int socket) { - if (socket > PXE_DEFAULT_SOCKETS) { + if ( (socket >= PXE_DEFAULT_SOCKETS) || (socket == -1)) { return (-1); } @@ -196,7 +223,7 @@ if (sock->state == PXE_SOCKET_FREE) continue; - printf("%d: filter 0x%x, recv/send: %d/%d, waiting: %d.\n ", + printf("%d: filter 0x%x, recv/send: %d/%d, waiting: %d.\n", socket, sock->filter, sock->recv, sock->sent, sock->waiting ); } @@ -205,7 +232,7 @@ int pxe_sock_bufspace(int socket) { - if (socket > PXE_DEFAULT_SOCKETS) { + if ( (socket >= PXE_DEFAULT_SOCKETS) || (socket == -1)) { return (-1); } @@ -215,51 +242,66 @@ int pxe_sock_place(int socket, void* data, uint16_t size) { -#ifdef PXE_DEBUG_HELL - printf("pxe_sock_place(): sock: %d, data: 0x%x, size: %d\n", socket, data, size); +#ifdef PXE_DEBUG + printf("pxe_sock_place(): socket: %d, data: 0x%x, size: %d\n", socket, data, size); #endif - if (socket > PXE_DEFAULT_SOCKETS) { + if ( (socket >= PXE_DEFAULT_SOCKETS) || (socket == -1)) { return (-1); } - PXE_SOCKET *sock = &pxe_sockets[socket]; + PXE_BUFFER *rbuf = &pxe_sockets[socket].recv_buffer; uint16_t copy_size = size; /* there is no enogh space available in recv buffer * try as much as possible. */ - if (sock->recv_buffer.bufleft < size) { + if (rbuf->bufleft < size) { - copy_size = sock->recv_buffer.bufleft; + copy_size = rbuf->bufleft; if (copy_size == 0) return (0); } - pxe_memcpy(data, sock->recv_buffer.next_data, copy_size); + pxe_memcpy(data, rbuf->free_start, copy_size); - sock->recv_buffer.next_data += copy_size; - sock->recv_buffer.bufleft -= copy_size; - + rbuf->free_start += copy_size; + rbuf->bufleft -= copy_size; + +#ifdef PXE_DEBUG + printf("pxe_sock_place(): left: %d\n", rbuf->bufleft); +#endif return (copy_size); } int +pxe_sock_get(PXE_SOCKET *sock) +{ + int res = sock - pxe_sockets; + + if (res > PXE_DEFAULT_SOCKETS) + return (-1); + + return (res); +} + +int pxe_sock_rewind(int socket, uint16_t size) { - if (socket > PXE_DEFAULT_SOCKETS) { + + if ( (socket >= PXE_DEFAULT_SOCKETS) || (socket == -1)) { return (-1); } PXE_SOCKET *sock = &pxe_sockets[socket]; - uint16_t rew_bytes = sock->recv_buffer.next_data - sock->recv_buffer.data; + uint16_t rew_bytes = sock->recv_buffer.free_start - sock->recv_buffer.data; /* if data to rewind enough, than rewing size, else only available rew_bytes */ if (rew_bytes > size) rew_bytes = size; - sock->recv_buffer.next_data -= rew_bytes; + sock->recv_buffer.free_start -= rew_bytes; sock->recv_buffer.bufleft += rew_bytes; return (rew_bytes); @@ -284,9 +326,6 @@ pxe_sendto(int socket, uint32_t ip, uint16_t port, void *data, uint16_t size) { -#ifdef PXE_DEBUG - printf("pxe_sendto(): ip:port = %8x:%d, size = %d bytes.\n", ip, port, size); -#endif if (size + sizeof(PXE_UDP_PACKET) > PXE_DEFAULT_SEND_BUFSIZE) { printf("pxe_sendto(): send buffer too small for %d bytes.\n", size); return (-1); @@ -311,7 +350,11 @@ * is local port. */ uint16_t lport = filter->dst_port; - + +#ifdef PXE_DEBUG + printf("pxe_sendto(): %8x:%d -> %8x:%d, size = %d bytes.\n", pxe_get_myip32(), lport, ip, port, size); +#endif + if (!pxe_udp_send(udp_pack, ip, port, lport, size + sizeof(PXE_UDP_PACKET), 1)) { printf("pxe_sendto(): failed to send data.\n"); return (-1); @@ -326,7 +369,7 @@ pxe_connect(int socket, uint32_t ip, uint16_t port, uint8_t proto) { - if (socket > PXE_DEFAULT_SOCKETS) { + if ( (socket >= PXE_DEFAULT_SOCKETS) || (socket == -1)) { return (0); } @@ -355,23 +398,81 @@ return (0); } + sock->filter = entry; + /* all is ok */ return (1); } - +/* assuming socket is UDP, need to think about TCP/UDP functions calling, + * also, need to understand how to update buffer for multiple received dgrams >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 3 10:39:00 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D050916A46C; Sun, 3 Jun 2007 10:38:59 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A866316A469 for ; Sun, 3 Jun 2007 10:38:59 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by mx1.freebsd.org (Postfix) with ESMTP id 671FF13C469 for ; Sun, 3 Jun 2007 10:38:59 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by core.fnop.net (Postfix) with ESMTP id A5CE2690ADF; Sun, 3 Jun 2007 11:36:54 +0100 (WEST) Received: by core.fnop.net (Postfix, from userid 1015) id 64CF3690AE2; Sun, 3 Jun 2007 11:36:54 +0100 (WEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on core.fnop.net X-Spam-Level: X-Spam-Status: No, score=-0.4 required=5.0 tests=AWL,BAYES_00, RCVD_IN_SORBS_DUL autolearn=no version=3.1.7 Received: from epsilon.local.fnop.net (unknown [83.144.140.161]) by core.fnop.net (Postfix) with ESMTP id BC971690ADF; Sun, 3 Jun 2007 11:36:52 +0100 (WEST) Date: Sun, 03 Jun 2007 11:38:51 +0100 Message-ID: <86tztpxqys.wl%rpaulo@fnop.net> From: Rui Paulo To: "M. Warner Losh" In-Reply-To: <20070602.235223.-1592322846.imp@bsdimp.com> References: <200706021439.l52Edj6g051339@repoman.freebsd.org> <20070602.235223.-1592322846.imp@bsdimp.com> User-Agent: Wanderlust/2.15.5 (Almost Unreal) Emacs/21.3 Mule/5.0 (SAKAKI) X-cite-me: rpaulo MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Virus-Scanned: ClamAV using ClamSMTP Cc: perforce@freebsd.org Subject: Re: PERFORCE change 120782 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 10:39:00 -0000 At Sat, 02 Jun 2007 23:52:23 -0600 (MDT), M. Warner Losh wrote: > > In message: <200706021439.l52Edj6g051339@repoman.freebsd.org> > Rui Paulo writes: > : http://perforce.freebsd.org/chv.cgi?CH=120782 > : > : Change 120782 by rpaulo@rpaulo_epsilon on 2007/06/02 14:38:42 > : > : Need to use bus_set_resource() on the probe routine or else > : the IRQ will only be setup on the second time the module is > : loaded. > > You mean "only be printed on the probe line the second time the module > is loaded" right? No. If I caused interrupts by moving the laptop, asmc_intr() would not be run. -- Rui Paulo From owner-p4-projects@FreeBSD.ORG Sun Jun 3 10:48:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC34916A46E; Sun, 3 Jun 2007 10:48:31 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 861F116A46C for ; Sun, 3 Jun 2007 10:48:31 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 771D213C4B7 for ; Sun, 3 Jun 2007 10:48:31 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l53AmVSf010089 for ; Sun, 3 Jun 2007 10:48:31 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l53AmVGJ010086 for perforce@freebsd.org; Sun, 3 Jun 2007 10:48:31 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 3 Jun 2007 10:48:31 GMT Message-Id: <200706031048.l53AmVGJ010086@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 10:48:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=120827 Change 120827 by rdivacky@rdivacky_witten on 2007/06/03 10:48:09 Implement kern_statat. Not tested at all yet. Suggested by: rwatson Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#5 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#5 (text+ko) ==== @@ -91,6 +91,8 @@ int flags, int mode, struct nameidata *nd); static int kern_common_access(struct thread *td, char *path, enum uio_seg pathseg, int flags, struct nameidata *nd); +static int kern_common_stat(struct thread *td, struct stat *sbp, + struct nameidata *nd); /* * The module initialization routine for POSIX asynchronous I/O will @@ -2132,18 +2134,53 @@ kern_stat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { struct nameidata nd; - struct stat sb; - int error, vfslocked; - + NDINIT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); + + return kern_common_stat(td, sbp, nd); +} + +int +kern_statat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp, int dfd) +{ + int error; + struct nameidata nd; + struct vnode *dir_vn; + + if (dirfd == AT_FDCWD) + dir_vn = NULL; + else { + error = fgetvp(td, dirfd, &dir_vn); + if (error) + return (error); + if (dir_vn->v_type != VDIR) { + vrele(dir_vn); + return (ENOTDIR); + } + } + + NDINIT_AT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + + error = kern_common_stat(td, sbp, &nd); + if (dirfd != AT_FDCWD) + vrele(dir_vn); + return (error); +} + +static int +kern_common_stat(struct thread *td, struct stat *sbp, struct nameidata *nd) +{ + struct stat sb; + int error, vfslocked; + vfslocked = NDHASGIANT(&nd); - error = vn_stat(nd.ni_vp, &sb, td->td_ucred, NOCRED, td); + error = vn_stat(nd->ni_vp, &sb, td->td_ucred, NOCRED, td); NDFREE(&nd, NDF_ONLY_PNBUF); - vput(nd.ni_vp); + vput(nd->ni_vp); VFS_UNLOCK_GIANT(vfslocked); if (mtx_owned(&Giant)) printf("stat(%d): %s\n", vfslocked, path); @@ -2152,7 +2189,6 @@ *sbp = sb; return (0); } - /* * Get file status; this version does not follow links. */ From owner-p4-projects@FreeBSD.ORG Sun Jun 3 10:53:48 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D55D16A46C; Sun, 3 Jun 2007 10:53:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 F01A516A469 for ; Sun, 3 Jun 2007 10:53:47 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E0BFD13C45B for ; Sun, 3 Jun 2007 10:53:47 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l53ArlNf013584 for ; Sun, 3 Jun 2007 10:53:47 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l53Arlso013578 for perforce@freebsd.org; Sun, 3 Jun 2007 10:53:47 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 3 Jun 2007 10:53:47 GMT Message-Id: <200706031053.l53Arlso013578@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120828 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 10:53:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=120828 Change 120828 by rdivacky@rdivacky_witten on 2007/06/03 10:52:47 Remove pointless path and pathseg arguments from kern_common_* functions. They serve no purpose... Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#6 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#6 (text+ko) ==== @@ -87,10 +87,10 @@ const struct timespec *, int, int); static int vn_access(struct vnode *vp, int user_flags, struct ucred *cred, struct thread *td); -static int kern_common_open(struct thread *td, char *path, enum uio_seg pathseg, - int flags, int mode, struct nameidata *nd); -static int kern_common_access(struct thread *td, char *path, enum uio_seg pathseg, - int flags, struct nameidata *nd); +static int kern_common_open(struct thread *td, int flags, int mode, + struct nameidata *nd); +static int kern_common_access(struct thread *td, int flags, + struct nameidata *nd); static int kern_common_stat(struct thread *td, struct stat *sbp, struct nameidata *nd); @@ -970,7 +970,7 @@ AUDIT_ARG(mode, mode); NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td); - return kern_common_open(td, path, pathseg, flags, mode, &nd); + return kern_common_open(td, flags, mode, &nd); } int @@ -999,15 +999,14 @@ NDINIT_AT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); - error = kern_common_open(td, path, pathseg, flags, mode, &nd); + error = kern_common_open(td, flags, mode, &nd); if (dirfd != AT_FDCWD) vrele(dir_vn); return (error); } static int -kern_common_open(struct thread *td, char *path, enum uio_seg pathseg, int flags, - int mode, struct nameidata *nd) +kern_common_open(struct thread *td, int flags, int mode, struct nameidata *nd) { struct proc *p = td->td_proc; struct filedesc *fdp = p->p_fd; @@ -1908,7 +1907,7 @@ NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td); - return kern_common_access(td, path, pathseg, flags, &nd); + return kern_common_access(td, flags, &nd); } int @@ -1933,15 +1932,14 @@ NDINIT_AT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); - error = kern_common_access(td, path, pathseg, flags, &nd); + error = kern_common_access(td, flags, &nd); if (dirfd != AT_FDCWD) vrele(dir_vn); return (error); } static int -kern_common_access(struct thread *td, char *path, enum uio_seg pathseg, int flags, - struct nameidata *nd) +kern_common_access(struct thread *td, int flags, struct nameidata *nd) { struct ucred *cred, *tmpcred; struct vnode *vp; From owner-p4-projects@FreeBSD.ORG Sun Jun 3 11:01:59 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADF9116A41F; Sun, 3 Jun 2007 11:01:59 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 754BF16A46C for ; Sun, 3 Jun 2007 11:01:59 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6638213C44B for ; Sun, 3 Jun 2007 11:01:59 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l53B1xhn021255 for ; Sun, 3 Jun 2007 11:01:59 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l53B1xSe021245 for perforce@freebsd.org; Sun, 3 Jun 2007 11:01:59 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 3 Jun 2007 11:01:59 GMT Message-Id: <200706031101.l53B1xSe021245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 11:02:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=120830 Change 120830 by rdivacky@rdivacky_witten on 2007/06/03 11:01:11 Implement kern_lstatat. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#7 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#7 (text+ko) ==== @@ -93,6 +93,8 @@ struct nameidata *nd); static int kern_common_stat(struct thread *td, struct stat *sbp, struct nameidata *nd); +static int kern_common_lstat(struct thread *td, struct stat *sbp, + struct nameidata *nd); /* * The module initialization routine for POSIX asynchronous I/O will @@ -2216,18 +2218,53 @@ int kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { - struct vnode *vp; - struct stat sb; struct nameidata nd; - int error, vfslocked; NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | LOCKSHARED | MPSAFE | AUDITVNODE1, pathseg, path, td); if ((error = namei(&nd)) != 0) return (error); + + return kern_common_lstat(td, sbp, &nd) +} + +int +kern_lstatat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp, int dfd) +{ + int error; + struct nameidata nd; + struct vnode *dir_vn; + + if (dirfd == AT_FDCWD) + dir_vn = NULL; + else { + error = fgetvp(td, dirfd, &dir_vn); + if (error) + return (error); + if (dir_vn->v_type != VDIR) { + vrele(dir_vn); + return (ENOTDIR); + } + } + + NDINIT_AT(&nd, LOOKUP, NOFOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + + error = kern_common_stat(td, sbp, &nd); + if (dirfd != AT_FDCWD) + vrele(dir_vn); + return (error); +} + +static int +kern_common_lstat(struct thread *td, struct stat *sbp, struct nameidata *nd) +{ + struct vnode *vp; + struct stat sb; + int error, vfslocked; + vfslocked = NDHASGIANT(&nd); - vp = nd.ni_vp; + vp = nd->ni_vp; error = vn_stat(vp, &sb, td->td_ucred, NOCRED, td); NDFREE(&nd, NDF_ONLY_PNBUF); vput(vp); From owner-p4-projects@FreeBSD.ORG Sun Jun 3 11:03:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66F8C16A46B; Sun, 3 Jun 2007 11:03:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 4319416A468 for ; Sun, 3 Jun 2007 11:03:01 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 33CB513C448 for ; Sun, 3 Jun 2007 11:03:01 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l53B31kY022265 for ; Sun, 3 Jun 2007 11:03:01 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l53B30vi022254 for perforce@freebsd.org; Sun, 3 Jun 2007 11:03:00 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 3 Jun 2007 11:03:00 GMT Message-Id: <200706031103.l53B30vi022254@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120831 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 11:03:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=120831 Change 120831 by rdivacky@rdivacky_witten on 2007/06/03 11:02:30 Add prototypes of kern_[l]statat to syscallsubr.h Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#3 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#3 (text+ko) ==== @@ -107,6 +107,8 @@ enum uio_seg segflg); int kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp); +int kern_lstatat(struct thread *td, char *path, enum uio_seg pathseg, + struct stat *sbp, int dfd); int kern_lutimes(struct thread *td, char *path, enum uio_seg pathseg, struct timeval *tptr, enum uio_seg tptrseg); int kern_mkdir(struct thread *td, char *path, enum uio_seg segflg, @@ -168,6 +170,8 @@ int kern_sigsuspend(struct thread *td, sigset_t mask); int kern_stat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp); +int kern_statat(struct thread *td, char *path, enum uio_seg pathseg, + struct stat *sbp, int dfd); int kern_statfs(struct thread *td, char *path, enum uio_seg pathseg, struct statfs *buf); int kern_symlink(struct thread *td, char *path, char *link, From owner-p4-projects@FreeBSD.ORG Sun Jun 3 11:10:11 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E514316A469; Sun, 3 Jun 2007 11:10:10 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 B42C816A400 for ; Sun, 3 Jun 2007 11:10:10 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A500A13C455 for ; Sun, 3 Jun 2007 11:10:10 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l53BAAd8030014 for ; Sun, 3 Jun 2007 11:10:10 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l53BAAHU030007 for perforce@freebsd.org; Sun, 3 Jun 2007 11:10:10 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 3 Jun 2007 11:10:10 GMT Message-Id: <200706031110.l53BAAHU030007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120832 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 11:10:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=120832 Change 120832 by rdivacky@rdivacky_witten on 2007/06/03 11:10:04 Implement linux_fstatat64 using kern_[l]statat. Suggested by: rwatson Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#5 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#5 (text+ko) ==== @@ -579,35 +579,21 @@ return (error); } -/* XXX: racy? */ int linux_fstatat64(struct thread *td, struct linux_fstatat64_args *args) { - int error; - char *path, *newpath; - int fd, dfd, flags = O_RDONLY; + char *path; + int error, dfd; struct stat buf; if (args->flag & ~LINUX_AT_SYMLINK_NOFOLLOW) return (EINVAL); - if (args->flag & LINUX_AT_SYMLINK_NOFOLLOW) - flags |= O_NOFOLLOW; + LCONVPATHEXIST(td, args->filename, &path); - /* open the file */ - path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - error = copyinstr(args->pathname, path, MAXPATHLEN, NULL); - if (error) { - free(path, M_TEMP); - return (EFAULT); - } - - LCONVPATH_SEG(td, path, &newpath, 0, UIO_SYSSPACE); - free(path, M_TEMP); - #ifdef DEBUG if (ldebug(fstatat64)) - printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, newpath, args->flag); + printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, args->path, args->flag); #endif if (args->dfd == LINUX_AT_FDCWD) @@ -615,26 +601,17 @@ else dfd = args->dfd; - error = kern_openat(td, newpath, UIO_SYSSPACE, flags, 0, dfd); - if (error) { - LFREEPATH(newpath); - return (error); - } - /* file opened */ - fd = td->td_retval[0]; - td->td_retval[0] = 0; - - /* do the actual fstat */ - - error = kern_fstat(td, fd, &buf); + if (args->flags & LINUX_AT_SYMLINK_NOFOLLOW) + error = kern_statat(td, fd, &buf, dfd); + else + error = kern_lstatat(td, fd, &buf, dfd); + translate_fd_major_minor(td, fd, &buf); if (!error) error = stat64_copyout(&buf, args->statbuf); + LFREEPATH(path); - /* close the opened file */ - kern_close(td, fd); - LFREEPATH(newpath); - return (0); + return (error); } #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ From owner-p4-projects@FreeBSD.ORG Sun Jun 3 11:32:04 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A13A216A46B; Sun, 3 Jun 2007 11:32:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 6F07916A400 for ; Sun, 3 Jun 2007 11:32:03 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5DA4D13C448 for ; Sun, 3 Jun 2007 11:32:03 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l53BW3UP051921 for ; Sun, 3 Jun 2007 11:32:03 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l53BVbZX051331 for perforce@freebsd.org; Sun, 3 Jun 2007 11:31:37 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 3 Jun 2007 11:31:37 GMT Message-Id: <200706031131.l53BVbZX051331@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120833 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 11:32:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=120833 Change 120833 by rdivacky@rdivacky_witten on 2007/06/03 11:30:51 IFC Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/smp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_dummy.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/intr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/conf/AVILA#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/asm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/pmap.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/profile.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/uart_bus_ixp425.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/common/loader.8#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/ia64/common/exec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/bsm/audit.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/bsm/audit_internal.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/bsm/audit_record.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/README.quirks#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_periph.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_periph.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_sim.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_sim.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/coda/coda_vnops.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/misc.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/types.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/Makefile.arm#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/Makefile.i386#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/NOTES#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files.amd64#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files.i386#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files.pc98#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/kern.mk#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/kmod.mk#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/options#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/dnlc.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/sys/dnlc.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/crypto/camellia/camellia.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/crypto/camellia/camellia.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/advansys/advansys.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aha/aha.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic/aic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/amd/amd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/asr/asr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/buslogic/bt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ciss/cissvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_ctl_defs.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/common/jhash.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_l2t.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_l2t.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_offload.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_offload.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/sys/mbufq.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/t3fw-3.2.bin.gz.uu#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/t3fw-4.0.0.bin.gz.uu#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/cxgb/ulp/toecore/toedev.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/LICENSE#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/README#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_80003es2lan.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_80003es2lan.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_82540.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_82541.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_82541.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_82542.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_82543.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_82543.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_82571.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_82571.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_82575.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_82575.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_api.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_api.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_defines.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_hw.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_ich8lan.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_ich8lan.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_mac.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_mac.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_manage.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_manage.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_nvm.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_nvm.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_osdep.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_phy.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_phy.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/e1000_regs.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/if_em.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/if_em.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/if_em_hw.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/if_em_hw.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/em/if_em_osdep.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/en/midway.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/firewire/fwdma.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/firewire/sbp_targ.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/hptiop/hptiop.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/hptiop/hptiop.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iicbus/icee.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iir/iir.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ipmi/ipmi_smbios.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/led/led.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/led/led.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/md/md.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mii/mii.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mly/mly.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mmc/bridge.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mmc/mmcbr_if.m#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mmc/mmcbus_if.m#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/eth_z8e.dat.gz.uu#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/mxge_lro.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pccard/pccardvarp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pci/pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pci/pci_if.m#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/re/if_re.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/rr232x/osm_bsd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/clone.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/clone.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/envy24.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/ac97.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/channel.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/feeder_fmt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/unit.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/unit.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sound/version.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/stge/if_stgereg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/scmouse.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/trm/trm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_cl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_cl_externs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_cl_fwif.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_cl_fwimg.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_cl_ioctl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_osl_cam.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_osl_externs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_osl_includes.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_osl_inline.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_osl_ioctl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/twa/tw_osl_types.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_cuereg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_kuereg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_rum.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_rumreg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_rumvar.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_uralvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/rt2573_ucode.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/umass.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ums.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/wds/wd7000.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/procfs/procfs_ioctl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/pseudofs/pseudofs_fileno.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/pseudofs/pseudofs_internal.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/umapfs/umap_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/geom.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/geom_dev.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/geom_disk.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/geom_disk.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/geom_io.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/geom_slice.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/geom_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/part/g_part.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/part/g_part.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/FreeBSD/support/spin.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/xfs_bit.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/xfs_bmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/xfs_dir.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/xfs_ialloc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/xfs_log.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/xfs_log_recover.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/xfs_rtalloc.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/conf/NOTES#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/conf/PAE#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/bios.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/io_apic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/mptable_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/msi.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/support.s#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/trap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/proc.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/smp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/isa/atpic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_support.s#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/pci/pci_bus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/locore.S#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/mca.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ia64/include/vmparam.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/isa/isa_common.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/Make.tags.inc#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_main.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_acct.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_alq.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_clock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_conf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_event.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_exec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_exit.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_fork.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_intr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_jail.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_linker.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_lock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_mib.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_mtxpool.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_proc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_resource.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_sig.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_sx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_synch.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_thread.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_time.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/link_elf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sched_ule.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_bus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_lock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_mbpool.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_prof.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_rman.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_trap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/subr_witness.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sys_generic.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/tty_cons.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_default.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vnode_if.src#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/crypto/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/dcons/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/em/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/hptiop/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/if_lagg/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/if_trunk/Makefile#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/linux/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/mfi/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/mfi/mfip/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/mxge/mxge/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/netgraph/car/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/rum/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/twa/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/ethernet.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_bridge.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_lagg.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_lagg.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_trunk.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_trunk.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/pfkeyv2.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/route.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_amrr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_car.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_car.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_mppc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_nat.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/icmp6.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/if_ether.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/in.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/in_cksum.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/in_gif.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_ecn.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_id.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_input.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_options.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_options.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/ip_output.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/libalias/alias_proxy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_asconf.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_auth.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_crc32.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_crc32.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_header.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_indata.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_input.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_os.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_output.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_peeloff.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_timer.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctputil.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctputil.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_debug.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_fsm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_reass.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_sack.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_timewait.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/esp_camellia.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/esp_camellia.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/esp_core.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/nd6.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/route6.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet6/sctp6_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/key.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipx/ipx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipx/ipx.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipx/ipx_cksum.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipx/ipx_if.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipx/ipx_input.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipx/ipx_outputfl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipx/ipx_pcb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipx/ipx_pcb.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipx/ipx_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipx/spx_debug.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netipx/spx_debug.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netnatm/natm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/opencrypto/cryptodev.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/opencrypto/xform.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/opencrypto/xform.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/if_tl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/if_vr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/intpm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pci/ncr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powerpc/nexus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_ioctl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_audit.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_system.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/include/profile.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/include/ver.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/include/vmparam.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/bus_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sparc64/sparc64/upa.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/include/cache.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/include/iommureg.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/include/iommuvar.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/include/ofw_upa.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/include/pmap.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/include/profile.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/include/upa.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/include/ver.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/include/vmparam.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/bus_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/hviommu.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/nexus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/tick.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/tsb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/tte_hash.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/acct.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/callout.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/conf.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/disk.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/filedesc.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/interrupt.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/lock_profile.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/lockf.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/mbuf.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/mount.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/param.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/priv.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/proc.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/resource.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/resourcevar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/rwlock.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/socket.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/socketvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sx.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysctl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysent.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syslimits.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/systm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/vmmeter.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/vnode.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ufs/ufs_gjournal.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/swap_pager.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/uma_core.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/uma_int.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_contig.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_fault.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_glue.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_map.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_meter.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_object.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_page.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_page.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_param.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.41 2007/03/24 22:21:01 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.42 2007/04/14 16:29:15 maxim Exp $ .include @@ -8,10 +8,10 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ - isa kern libkern modules net net80211 netatalk netatm \ +CSCOPEDIRS= bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \ + i4b isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ - netsmb nfs nfsclient nfs4client rpc pccard pci sys \ + netsmb nfs nfsclient nfs4client rpc pccard pci security sys \ ufs vm ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.23 2007/03/22 18:16:38 jkim Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 3 11:54:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AF0216A469; Sun, 3 Jun 2007 11:54:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 F056316A400 for ; Sun, 3 Jun 2007 11:54:31 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E101213C468 for ; Sun, 3 Jun 2007 11:54:31 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l53BsVPO077996 for ; Sun, 3 Jun 2007 11:54:31 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l53BsVQU077984 for perforce@freebsd.org; Sun, 3 Jun 2007 11:54:31 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 3 Jun 2007 11:54:31 GMT Message-Id: <200706031154.l53BsVQU077984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120835 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 11:54:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=120835 Change 120835 by rdivacky@rdivacky_witten on 2007/06/03 11:53:31 Compilation etc. fixes. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#9 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#6 (text+ko) ==== @@ -133,6 +133,25 @@ fdclose(fdp, fdp->fd_ofiles[fd], fd, td); } +static void +translate_path_major_minor_at(struct thread *td, char *path, struct stat *buf, int dfd) +{ + struct proc *p = td->td_proc; + struct filedesc *fdp = p->p_fd; + int fd; + int temp; + + if (!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode)) + return; + temp = td->td_retval[0]; + if (kern_openat(td, path, UIO_SYSSPACE, O_RDONLY, 0, dfd) != 0) + return; + fd = td->td_retval[0]; + td->td_retval[0] = temp; + translate_fd_major_minor(td, fd, buf); + fdclose(fdp, fdp->fd_ofiles[fd], fd, td); +} + static int newstat_copyout(struct stat *buf, void *ubuf) { @@ -589,11 +608,11 @@ if (args->flag & ~LINUX_AT_SYMLINK_NOFOLLOW) return (EINVAL); - LCONVPATHEXIST(td, args->filename, &path); + LCONVPATHEXIST(td, args->pathname, &path); #ifdef DEBUG if (ldebug(fstatat64)) - printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, args->path, args->flag); + printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, path, args->flag); #endif if (args->dfd == LINUX_AT_FDCWD) @@ -601,12 +620,12 @@ else dfd = args->dfd; - if (args->flags & LINUX_AT_SYMLINK_NOFOLLOW) - error = kern_statat(td, fd, &buf, dfd); + if (args->flag & LINUX_AT_SYMLINK_NOFOLLOW) + error = kern_statat(td, path, UIO_SYSSPACE, &buf, dfd); else - error = kern_lstatat(td, fd, &buf, dfd); + error = kern_lstatat(td, path, UIO_SYSSPACE, &buf, dfd); - translate_fd_major_minor(td, fd, &buf); + translate_path_major_minor_at(td, args->pathname, &buf, dfd); if (!error) error = stat64_copyout(&buf, args->statbuf); LFREEPATH(path); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#9 (text+ko) ==== @@ -1033,7 +1033,7 @@ fp = nfp; cmode = ((mode &~ fdp->fd_cmask) & ALLPERMS) &~ S_ISTXT; td->td_dupfd = -1; /* XXX check for fdopen */ - error = vn_open(&nd, &flags, cmode, fp); + error = vn_open(nd, &flags, cmode, fp); if (error) { /* * If the vn_open replaced the method vector, something @@ -2134,6 +2134,7 @@ kern_stat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { struct nameidata nd; + int error; NDINIT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | MPSAFE | AUDITVNODE1, @@ -2141,11 +2142,11 @@ if ((error = namei(&nd)) != 0) return (error); - return kern_common_stat(td, sbp, nd); + return kern_common_stat(td, sbp, &nd); } int -kern_statat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp, int dfd) +kern_statat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp, int dirfd) { int error; struct nameidata nd; @@ -2177,13 +2178,14 @@ struct stat sb; int error, vfslocked; - vfslocked = NDHASGIANT(&nd); + vfslocked = NDHASGIANT(nd); error = vn_stat(nd->ni_vp, &sb, td->td_ucred, NOCRED, td); - NDFREE(&nd, NDF_ONLY_PNBUF); + NDFREE(nd, NDF_ONLY_PNBUF); vput(nd->ni_vp); VFS_UNLOCK_GIANT(vfslocked); + /* dont bother with the path as this is hopefully going away soon */ if (mtx_owned(&Giant)) - printf("stat(%d): %s\n", vfslocked, path); + printf("stat(%d):\n", vfslocked); if (error) return (error); *sbp = sb; @@ -2219,6 +2221,7 @@ kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { struct nameidata nd; + int error; NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | LOCKSHARED | MPSAFE | AUDITVNODE1, @@ -2226,11 +2229,11 @@ if ((error = namei(&nd)) != 0) return (error); - return kern_common_lstat(td, sbp, &nd) + return kern_common_lstat(td, sbp, &nd); } int -kern_lstatat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp, int dfd) +kern_lstatat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp, int dirfd) { int error; struct nameidata nd; @@ -2263,10 +2266,10 @@ struct stat sb; int error, vfslocked; - vfslocked = NDHASGIANT(&nd); + vfslocked = NDHASGIANT(nd); vp = nd->ni_vp; error = vn_stat(vp, &sb, td->td_ucred, NOCRED, td); - NDFREE(&nd, NDF_ONLY_PNBUF); + NDFREE(nd, NDF_ONLY_PNBUF); vput(vp); VFS_UNLOCK_GIANT(vfslocked); if (error) From owner-p4-projects@FreeBSD.ORG Sun Jun 3 12:23:07 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CC7616A469; Sun, 3 Jun 2007 12:23:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 48D3316A421 for ; Sun, 3 Jun 2007 12:23:07 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 39A8D13C4AD for ; Sun, 3 Jun 2007 12:23:07 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l53CN7nA006962 for ; Sun, 3 Jun 2007 12:23:07 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l53CN7s0006956 for perforce@freebsd.org; Sun, 3 Jun 2007 12:23:07 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 3 Jun 2007 12:23:07 GMT Message-Id: <200706031223.l53CN7s0006956@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120836 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 12:23:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=120836 Change 120836 by rdivacky@rdivacky_witten on 2007/06/03 12:22:56 Switch lstat and stat in linux_fstatat64(). Call namei() to prevent panic. Lock the leaf node in stat syscalls. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#10 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#7 (text+ko) ==== @@ -621,9 +621,9 @@ dfd = args->dfd; if (args->flag & LINUX_AT_SYMLINK_NOFOLLOW) + error = kern_lstatat(td, path, UIO_SYSSPACE, &buf, dfd); + else error = kern_statat(td, path, UIO_SYSSPACE, &buf, dfd); - else - error = kern_lstatat(td, path, UIO_SYSSPACE, &buf, dfd); translate_path_major_minor_at(td, args->pathname, &buf, dfd); if (!error) ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#10 (text+ko) ==== @@ -2134,13 +2134,10 @@ kern_stat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { struct nameidata nd; - int error; NDINIT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td); - if ((error = namei(&nd)) != 0) - return (error); return kern_common_stat(td, sbp, &nd); } @@ -2164,7 +2161,8 @@ } } - NDINIT_AT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | AUDITVNODE1 | + MPSAFE, pathseg, path, td, dir_vn); error = kern_common_stat(td, sbp, &nd); if (dirfd != AT_FDCWD) @@ -2178,6 +2176,8 @@ struct stat sb; int error, vfslocked; + if ((error = namei(nd)) != 0) + return (error); vfslocked = NDHASGIANT(nd); error = vn_stat(nd->ni_vp, &sb, td->td_ucred, NOCRED, td); NDFREE(nd, NDF_ONLY_PNBUF); @@ -2221,13 +2221,10 @@ kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { struct nameidata nd; - int error; NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | LOCKSHARED | MPSAFE | AUDITVNODE1, pathseg, path, td); - if ((error = namei(&nd)) != 0) - return (error); return kern_common_lstat(td, sbp, &nd); } @@ -2251,9 +2248,10 @@ } } - NDINIT_AT(&nd, LOOKUP, NOFOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | LOCKSHARED | AUDITVNODE1 | + MPSAFE, pathseg, path, td, dir_vn); - error = kern_common_stat(td, sbp, &nd); + error = kern_common_lstat(td, sbp, &nd); if (dirfd != AT_FDCWD) vrele(dir_vn); return (error); @@ -2266,6 +2264,8 @@ struct stat sb; int error, vfslocked; + if ((error = namei(nd)) != 0) + return (error); vfslocked = NDHASGIANT(nd); vp = nd->ni_vp; error = vn_stat(vp, &sb, td->td_ucred, NOCRED, td); From owner-p4-projects@FreeBSD.ORG Sun Jun 3 12:57:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80F2516A421; Sun, 3 Jun 2007 12:57:50 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 589AB16A400 for ; Sun, 3 Jun 2007 12:57:50 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 48A6B13C43E for ; Sun, 3 Jun 2007 12:57:50 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l53CvoqE047601 for ; Sun, 3 Jun 2007 12:57:50 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l53CvnWi047589 for perforce@freebsd.org; Sun, 3 Jun 2007 12:57:49 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 3 Jun 2007 12:57:49 GMT Message-Id: <200706031257.l53CvnWi047589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120837 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 12:57:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=120837 Change 120837 by rdivacky@rdivacky_witten on 2007/06/03 12:57:02 Implement linux_fchownat(). Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_dummy.c#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_syscall.h#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysent.c#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.master#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_dummy.c#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_proto.h#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_syscall.h#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysent.c#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/syscalls.master#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#11 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#4 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_dummy.c#4 (text+ko) ==== @@ -98,7 +98,6 @@ DUMMY(migrate_pages); DUMMY(mkdirat); DUMMY(mknodat); -DUMMY(fchownat); DUMMY(futimesat); DUMMY(unlinkat); DUMMY(renameat); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#3 (text+ko) ==== @@ -886,7 +886,11 @@ register_t dummy; }; struct linux_fchownat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char uid_l_[PADL_(l_uid16_t)]; l_uid16_t uid; char uid_r_[PADR_(l_uid16_t)]; + char gid_l_[PADL_(l_gid16_t)]; l_gid16_t gid; char gid_r_[PADR_(l_gid16_t)]; + char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; }; struct linux_futimesat_args { register_t dummy; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_syscall.h#3 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysent.c#3 (text+ko) ==== @@ -318,7 +318,7 @@ { AS(linux_openat_args), (sy_call_t *)linux_openat, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 295 = linux_openat */ { 0, (sy_call_t *)linux_mkdirat, AUE_NULL, NULL, 0, 0 }, /* 296 = linux_mkdirat */ { 0, (sy_call_t *)linux_mknodat, AUE_NULL, NULL, 0, 0 }, /* 297 = linux_mknodat */ - { 0, (sy_call_t *)linux_fchownat, AUE_NULL, NULL, 0, 0 }, /* 298 = linux_fchownat */ + { AS(linux_fchownat_args), (sy_call_t *)linux_fchownat, AUE_NULL, NULL, 0, 0 }, /* 298 = linux_fchownat */ { 0, (sy_call_t *)linux_futimesat, AUE_NULL, NULL, 0, 0 }, /* 299 = linux_futimesat */ { AS(linux_fstatat64_args), (sy_call_t *)linux_fstatat64, AUE_NULL, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ { 0, (sy_call_t *)linux_unlinkat, AUE_NULL, NULL, 0, 0 }, /* 301 = linux_unlinkat */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.master#3 (text+ko) ==== @@ -467,7 +467,8 @@ l_int flags, l_int mode); } 296 AUE_NULL STD { int linux_mkdirat(void); } 297 AUE_NULL STD { int linux_mknodat(void); } -298 AUE_NULL STD { int linux_fchownat(void); } +298 AUE_NULL STD { int linux_fchownat(l_int dfd, char *filename, \ + l_uid16_t uid, l_gid16_t gid, l_int flag); } 299 AUE_NULL STD { int linux_futimesat(void); } 300 AUE_NULL STD { int linux_fstatat64(l_int dfd, char *pathname, \ struct l_stat64 *statbuf, l_int flag); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#5 (text+ko) ==== @@ -1287,6 +1287,35 @@ } int +linux_fchownat(struct thread *td, struct linux_fchownat_args *args) +{ + char *path; + int error, dfd; + + if (args->flag & ~LINUX_AT_SYMLINK_NOFOLLOW) + return (EINVAL); + + LCONVPATHEXIST(td, args->filename, &path); + +#ifdef DEBUG + if (ldebug(fchownat)) + printf(ARGS(fchownat, "%s, %d, %d"), path, args->uid, args->gid); +#endif + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + if (args->flag & LINUX_AT_SYMLINK_NOFOLLOW) + error = kern_lchownat(td, path, UIO_SYSSPACE, args->uid, args->gid, dfd); + else + error = kern_chownat(td, path, UIO_SYSSPACE, args->uid, args->gid, dfd); + LFREEPATH(path); + return (error); +} + +int linux_lchown(struct thread *td, struct linux_lchown_args *args) { char *path; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_dummy.c#3 (text+ko) ==== @@ -89,7 +89,6 @@ DUMMY(migrate_pages); DUMMY(mkdirat); DUMMY(mknodat); -DUMMY(fchownat); DUMMY(futimesat); DUMMY(unlinkat); DUMMY(renameat); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_proto.h#3 (text+ko) ==== @@ -905,7 +905,11 @@ register_t dummy; }; struct linux_fchownat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char uid_l_[PADL_(l_uid16_t)]; l_uid16_t uid; char uid_r_[PADR_(l_uid16_t)]; + char gid_l_[PADL_(l_gid16_t)]; l_gid16_t gid; char gid_r_[PADR_(l_gid16_t)]; + char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; }; struct linux_futimesat_args { register_t dummy; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_syscall.h#3 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysent.c#3 (text+ko) ==== @@ -317,7 +317,7 @@ { AS(linux_openat_args), (sy_call_t *)linux_openat, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 295 = linux_openat */ { 0, (sy_call_t *)linux_mkdirat, AUE_NULL, NULL, 0, 0 }, /* 296 = linux_mkdirat */ { 0, (sy_call_t *)linux_mknodat, AUE_NULL, NULL, 0, 0 }, /* 297 = linux_mknodat */ - { 0, (sy_call_t *)linux_fchownat, AUE_NULL, NULL, 0, 0 }, /* 298 = linux_fchownat */ + { AS(linux_fchownat_args), (sy_call_t *)linux_fchownat, AUE_NULL, NULL, 0, 0 }, /* 298 = linux_fchownat */ { 0, (sy_call_t *)linux_futimesat, AUE_NULL, NULL, 0, 0 }, /* 299 = linux_futimesat */ { AS(linux_fstatat64_args), (sy_call_t *)linux_fstatat64, AUE_NULL, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ { 0, (sy_call_t *)linux_unlinkat, AUE_NULL, NULL, 0, 0 }, /* 301 = linux_unlinkat */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/syscalls.master#3 (text+ko) ==== @@ -477,7 +477,8 @@ l_int flags, l_int mode); } 296 AUE_NULL STD { int linux_mkdirat(void); } 297 AUE_NULL STD { int linux_mknodat(void); } -298 AUE_NULL STD { int linux_fchownat(void); } +298 AUE_NULL STD { int linux_fchownat(l_int dfd, char *filename, \ + l_uid16_t uid, l_gid16_t gid, l_int flag); } 299 AUE_NULL STD { int linux_futimesat(void); } 300 AUE_NULL STD { int linux_fstatat64(l_int dfd, char *pathname, \ struct l_stat64 *statbuf, l_int flag); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#11 (text+ko) ==== @@ -95,6 +95,10 @@ struct nameidata *nd); static int kern_common_lstat(struct thread *td, struct stat *sbp, struct nameidata *nd); +static int kern_common_chown(struct thread *td, int uid, int gid, + struct nameidata *nd); +static int kern_common_lchown(struct thread *td, int uid, int gid, + struct nameidata *nd); /* * The module initialization routine for POSIX asynchronous I/O will @@ -2814,18 +2818,55 @@ kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid) { + struct nameidata nd; + + AUDIT_ARG(owner, uid, gid); + NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); + + return kern_common_chown(td, uid, gid, &nd); +} + +int +kern_chownat(struct thread *td, char *path, enum uio_seg pathseg, int uid, + int gid, int dirfd) +{ int error; struct nameidata nd; + struct vnode *dir_vn; + + if (dirfd == AT_FDCWD) + dir_vn = NULL; + else { + error = fgetvp(td, dirfd, &dir_vn); + if (error) + return (error); + if (dir_vn->v_type != VDIR) { + vrele(dir_vn); + return (ENOTDIR); + } + } + + NDINIT_AT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + + error = kern_common_chown(td, uid, gid, &nd); + if (dirfd != AT_FDCWD) + vrele(dir_vn); + return (error); + +} + +static int +kern_common_chown(struct thread *td, int uid, int gid, struct nameidata *nd) +{ + int error; int vfslocked; - AUDIT_ARG(owner, uid, gid); - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); - if ((error = namei(&nd)) != 0) + if ((error = namei(nd)) != 0) return (error); - vfslocked = NDHASGIANT(&nd); - NDFREE(&nd, NDF_ONLY_PNBUF); - error = setfown(td, nd.ni_vp, uid, gid); - vrele(nd.ni_vp); + vfslocked = NDHASGIANT(nd); + NDFREE(nd, NDF_ONLY_PNBUF); + error = setfown(td, nd->ni_vp, uid, gid); + vrele(nd->ni_vp); VFS_UNLOCK_GIANT(vfslocked); return (error); } @@ -2857,18 +2898,55 @@ kern_lchown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid) { + struct nameidata nd; + + AUDIT_ARG(owner, uid, gid); + NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); + + return kern_common_lchown(td, uid, gid, &nd); +} + +int +kern_lchownat(struct thread *td, char *path, enum uio_seg pathseg, int uid, + int gid, int dirfd) +{ int error; struct nameidata nd; + struct vnode *dir_vn; + + if (dirfd == AT_FDCWD) + dir_vn = NULL; + else { + error = fgetvp(td, dirfd, &dir_vn); + if (error) + return (error); + if (dir_vn->v_type != VDIR) { + vrele(dir_vn); + return (ENOTDIR); + } + } + + NDINIT_AT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + + error = kern_common_chown(td, uid, gid, &nd); + if (dirfd != AT_FDCWD) + vrele(dir_vn); + return (error); + +} + +static int +kern_common_lchown(struct thread *td, int uid, int gid, struct nameidata *nd) +{ + int error; int vfslocked; - AUDIT_ARG(owner, uid, gid); - NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); - if ((error = namei(&nd)) != 0) + if ((error = namei(nd)) != 0) return (error); - vfslocked = NDHASGIANT(&nd); - NDFREE(&nd, NDF_ONLY_PNBUF); - error = setfown(td, nd.ni_vp, uid, gid); - vrele(nd.ni_vp); + vfslocked = NDHASGIANT(nd); + NDFREE(nd, NDF_ONLY_PNBUF); + error = setfown(td, nd->ni_vp, uid, gid); + vrele(nd->ni_vp); VFS_UNLOCK_GIANT(vfslocked); return (error); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#4 (text+ko) ==== @@ -67,6 +67,8 @@ int mode); int kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid); +int kern_chownat(struct thread *td, char *path, enum uio_seg pathseg, int uid, + int gid, int dirfd); int kern_clock_getres(struct thread *td, clockid_t clock_id, struct timespec *ts); int kern_clock_gettime(struct thread *td, clockid_t clock_id, @@ -103,6 +105,8 @@ int kern_kldunload(struct thread *td, int fileid, int flags); int kern_lchown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid); +int kern_lchownat(struct thread *td, char *path, enum uio_seg pathseg, + int uid, int gid, int dirfd); int kern_link(struct thread *td, char *path, char *link, enum uio_seg segflg); int kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, From owner-p4-projects@FreeBSD.ORG Sun Jun 3 13:12:09 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B1FB16A46C; Sun, 3 Jun 2007 13:12:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 0DBE716A468 for ; Sun, 3 Jun 2007 13:12:09 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F1D7213C4BC for ; Sun, 3 Jun 2007 13:12:08 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l53DC8vN060811 for ; Sun, 3 Jun 2007 13:12:08 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l53DC83q060793 for perforce@freebsd.org; Sun, 3 Jun 2007 13:12:08 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 3 Jun 2007 13:12:08 GMT Message-Id: <200706031312.l53DC83q060793@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120838 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 13:12:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=120838 Change 120838 by rdivacky@rdivacky_witten on 2007/06/03 13:11:39 Implement linux_chmodat(). Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_dummy.c#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_syscall.h#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysent.c#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.master#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_dummy.c#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_proto.h#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_syscall.h#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysent.c#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/syscalls.master#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#12 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#5 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_dummy.c#5 (text+ko) ==== @@ -104,7 +104,6 @@ DUMMY(linkat); DUMMY(symlinkat); DUMMY(readlinkat); -DUMMY(fchmodat); DUMMY(pselect6); DUMMY(ppoll); DUMMY(unshare); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#4 (text+ko) ==== @@ -917,7 +917,9 @@ register_t dummy; }; struct linux_fchmodat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char mode_l_[PADL_(l_mode_t)]; l_mode_t mode; char mode_r_[PADR_(l_mode_t)]; }; struct linux_faccessat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_syscall.h#4 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysent.c#4 (text+ko) ==== @@ -326,7 +326,7 @@ { 0, (sy_call_t *)linux_linkat, AUE_NULL, NULL, 0, 0 }, /* 303 = linux_linkat */ { 0, (sy_call_t *)linux_symlinkat, AUE_NULL, NULL, 0, 0 }, /* 304 = linux_symlinkat */ { 0, (sy_call_t *)linux_readlinkat, AUE_NULL, NULL, 0, 0 }, /* 305 = linux_readlinkat */ - { 0, (sy_call_t *)linux_fchmodat, AUE_NULL, NULL, 0, 0 }, /* 306 = linux_fchmodat */ + { AS(linux_fchmodat_args), (sy_call_t *)linux_fchmodat, AUE_NULL, NULL, 0, 0 }, /* 306 = linux_fchmodat */ { AS(linux_faccessat_args), (sy_call_t *)linux_faccessat, AUE_NULL, NULL, 0, 0 }, /* 307 = linux_faccessat */ { 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0 }, /* 308 = linux_pselect6 */ { 0, (sy_call_t *)linux_ppoll, AUE_NULL, NULL, 0, 0 }, /* 309 = linux_ppoll */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.master#4 (text+ko) ==== @@ -477,7 +477,8 @@ 303 AUE_NULL STD { int linux_linkat(void); } 304 AUE_NULL STD { int linux_symlinkat(void); } 305 AUE_NULL STD { int linux_readlinkat(void); } -306 AUE_NULL STD { int linux_fchmodat(void); } +306 AUE_NULL STD { int linux_fchmodat(l_int dfd, char *filename, \ + l_mode_t mode); } 307 AUE_NULL STD { int linux_faccessat(l_int dfd, char *filename, l_int mode); } 308 AUE_NULL STD { int linux_pselect6(void); } 309 AUE_NULL STD { int linux_ppoll(void); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#6 (text+ko) ==== @@ -664,6 +664,28 @@ } int +linux_fchmodat(struct thread *td, struct linux_fchmodat_args *args) +{ + char *path; + int error, dfd; + + LCONVPATHEXIST(td, args->filename, &path); + +#ifdef DEBUG + if (ldebug(fchownat)) + printf(ARGS(fchownat, "%s, %d, %d"), path, args->uid, args->gid); +#endif + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + error = kern_chmodat(td, path, UIO_SYSSPACE, args->mode, dfd); + LFREEPATH(path); + return (error); +} +int linux_mkdir(struct thread *td, struct linux_mkdir_args *args) { char *path; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_dummy.c#4 (text+ko) ==== @@ -95,7 +95,6 @@ DUMMY(linkat); DUMMY(symlinkat); DUMMY(readlinkat); -DUMMY(fchmodat); DUMMY(pselect6); DUMMY(ppoll); DUMMY(unshare); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_proto.h#4 (text+ko) ==== @@ -936,7 +936,9 @@ register_t dummy; }; struct linux_fchmodat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char mode_l_[PADL_(l_mode_t)]; l_mode_t mode; char mode_r_[PADR_(l_mode_t)]; }; struct linux_faccessat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_syscall.h#4 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysent.c#4 (text+ko) ==== @@ -325,7 +325,7 @@ { 0, (sy_call_t *)linux_linkat, AUE_NULL, NULL, 0, 0 }, /* 303 = linux_linkat */ { 0, (sy_call_t *)linux_symlinkat, AUE_NULL, NULL, 0, 0 }, /* 304 = linux_symlinkat */ { 0, (sy_call_t *)linux_readlinkat, AUE_NULL, NULL, 0, 0 }, /* 305 = linux_readlinkat */ - { 0, (sy_call_t *)linux_fchmodat, AUE_NULL, NULL, 0, 0 }, /* 306 = linux_fchmodat */ + { AS(linux_fchmodat_args), (sy_call_t *)linux_fchmodat, AUE_NULL, NULL, 0, 0 }, /* 306 = linux_fchmodat */ { AS(linux_faccessat_args), (sy_call_t *)linux_faccessat, AUE_NULL, NULL, 0, 0 }, /* 307 = linux_faccessat */ { 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0 }, /* 308 = linux_pselect6 */ { 0, (sy_call_t *)linux_ppoll, AUE_NULL, NULL, 0, 0 }, /* 309 = linux_ppoll */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/syscalls.master#4 (text+ko) ==== @@ -487,7 +487,8 @@ 303 AUE_NULL STD { int linux_linkat(void); } 304 AUE_NULL STD { int linux_symlinkat(void); } 305 AUE_NULL STD { int linux_readlinkat(void); } -306 AUE_NULL STD { int linux_fchmodat(void); } +306 AUE_NULL STD { int linux_fchmodat(l_int dfd, char *filename, \ + l_mode_t mode); } 307 AUE_NULL STD { int linux_faccessat(l_int dfd, char *filename, l_int mode); } 308 AUE_NULL STD { int linux_pselect6(void); } 309 AUE_NULL STD { int linux_ppoll(void); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#12 (text+ko) ==== @@ -99,6 +99,7 @@ struct nameidata *nd); static int kern_common_lchown(struct thread *td, int uid, int gid, struct nameidata *nd); +static int kern_common_chmod(struct thread *td, int mode, struct nameidata *nd); /* * The module initialization routine for POSIX asynchronous I/O will @@ -2672,18 +2673,52 @@ int kern_chmod(struct thread *td, char *path, enum uio_seg pathseg, int mode) { + struct nameidata nd; + AUDIT_ARG(mode, mode); + NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); + + return kern_common_chmod(td, mode, &nd); +} + +int +kern_chmodat(struct thread *td, char *path, enum uio_seg pathseg, int mode, int dirfd) +{ int error; struct nameidata nd; + struct vnode *dir_vn; + + if (dirfd == AT_FDCWD) + dir_vn = NULL; + else { + error = fgetvp(td, dirfd, &dir_vn); + if (error) + return (error); + if (dir_vn->v_type != VDIR) { + vrele(dir_vn); + return (ENOTDIR); + } + } + + NDINIT_AT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + + error = kern_common_chmod(td, mode, &nd); + if (dirfd != AT_FDCWD) + vrele(dir_vn); + return (error); +} + +static int +kern_common_chmod(struct thread *td, int mode, struct nameidata *nd) +{ + int error; int vfslocked; - AUDIT_ARG(mode, mode); - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); - if ((error = namei(&nd)) != 0) + if ((error = namei(nd)) != 0) return (error); - vfslocked = NDHASGIANT(&nd); - NDFREE(&nd, NDF_ONLY_PNBUF); - error = setfmode(td, nd.ni_vp, mode); - vrele(nd.ni_vp); + vfslocked = NDHASGIANT(nd); + NDFREE(nd, NDF_ONLY_PNBUF); + error = setfmode(td, nd->ni_vp, mode); + vrele(nd->ni_vp); VFS_UNLOCK_GIANT(vfslocked); return (error); } @@ -2852,7 +2887,6 @@ if (dirfd != AT_FDCWD) vrele(dir_vn); return (error); - } static int ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#5 (text+ko) ==== @@ -65,6 +65,8 @@ int kern_chdir(struct thread *td, char *path, enum uio_seg pathseg); int kern_chmod(struct thread *td, char *path, enum uio_seg pathseg, int mode); +int kern_chmodat(struct thread *td, char *path, enum uio_seg pathseg, + int mode, int dirfd); int kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid); int kern_chownat(struct thread *td, char *path, enum uio_seg pathseg, int uid, From owner-p4-projects@FreeBSD.ORG Sun Jun 3 13:35:39 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BF5616A46E; Sun, 3 Jun 2007 13:35:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 C9E3916A46C for ; Sun, 3 Jun 2007 13:35:38 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B9ED713C468 for ; Sun, 3 Jun 2007 13:35:38 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l53DZccP082021 for ; Sun, 3 Jun 2007 13:35:38 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l53DZcGZ082006 for perforce@freebsd.org; Sun, 3 Jun 2007 13:35:38 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 3 Jun 2007 13:35:38 GMT Message-Id: <200706031335.l53DZcGZ082006@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120839 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 13:35:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=120839 Change 120839 by rdivacky@rdivacky_witten on 2007/06/03 13:34:53 Implement linux_readlinkat(). Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_dummy.c#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_syscall.h#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysent.c#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.master#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_dummy.c#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_proto.h#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_syscall.h#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysent.c#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/syscalls.master#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#13 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#6 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_dummy.c#6 (text+ko) ==== @@ -103,7 +103,6 @@ DUMMY(renameat); DUMMY(linkat); DUMMY(symlinkat); -DUMMY(readlinkat); DUMMY(pselect6); DUMMY(ppoll); DUMMY(unshare); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#5 (text+ko) ==== @@ -914,7 +914,10 @@ register_t dummy; }; struct linux_readlinkat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + char bufsiz_l_[PADL_(l_int)]; l_int bufsiz; char bufsiz_r_[PADR_(l_int)]; }; struct linux_fchmodat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_syscall.h#5 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysent.c#5 (text+ko) ==== @@ -325,7 +325,7 @@ { 0, (sy_call_t *)linux_renameat, AUE_NULL, NULL, 0, 0 }, /* 302 = linux_renameat */ { 0, (sy_call_t *)linux_linkat, AUE_NULL, NULL, 0, 0 }, /* 303 = linux_linkat */ { 0, (sy_call_t *)linux_symlinkat, AUE_NULL, NULL, 0, 0 }, /* 304 = linux_symlinkat */ - { 0, (sy_call_t *)linux_readlinkat, AUE_NULL, NULL, 0, 0 }, /* 305 = linux_readlinkat */ + { AS(linux_readlinkat_args), (sy_call_t *)linux_readlinkat, AUE_NULL, NULL, 0, 0 }, /* 305 = linux_readlinkat */ { AS(linux_fchmodat_args), (sy_call_t *)linux_fchmodat, AUE_NULL, NULL, 0, 0 }, /* 306 = linux_fchmodat */ { AS(linux_faccessat_args), (sy_call_t *)linux_faccessat, AUE_NULL, NULL, 0, 0 }, /* 307 = linux_faccessat */ { 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0 }, /* 308 = linux_pselect6 */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.master#5 (text+ko) ==== @@ -476,7 +476,8 @@ 302 AUE_NULL STD { int linux_renameat(void); } 303 AUE_NULL STD { int linux_linkat(void); } 304 AUE_NULL STD { int linux_symlinkat(void); } -305 AUE_NULL STD { int linux_readlinkat(void); } +305 AUE_NULL STD { int linux_readlinkat(l_int dfd, char *path, \ + char *buf, l_int bufsiz); } 306 AUE_NULL STD { int linux_fchmodat(l_int dfd, char *filename, \ l_mode_t mode); } 307 AUE_NULL STD { int linux_faccessat(l_int dfd, char *filename, l_int mode); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#7 (text+ko) ==== @@ -672,8 +672,8 @@ LCONVPATHEXIST(td, args->filename, &path); #ifdef DEBUG - if (ldebug(fchownat)) - printf(ARGS(fchownat, "%s, %d, %d"), path, args->uid, args->gid); + if (ldebug(fchmodat)) + printf(ARGS(fchmodat, "%s, %d, %d"), path, args->uid, args->gid); #endif if (args->dfd == LINUX_AT_FDCWD) @@ -787,6 +787,30 @@ } int +linux_readlinkat(struct thread *td, struct linux_readlinkat_args *args) +{ + char *name; + int error, dfd; + + LCONVPATHEXIST(td, args->path, &name); + +#ifdef DEBUG + if (ldebug(readlinkat)) + printf(ARGS(readlinkat, "%s, %p, %d"), name, (void *)args->buf, + args->bufsiz); +#endif + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + error = kern_readlinkat(td, name, UIO_SYSSPACE, args->buf, UIO_USERSPACE, + args->bufsiz, dfd); + LFREEPATH(name); + return (error); +} +int linux_truncate(struct thread *td, struct linux_truncate_args *args) { char *path; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_dummy.c#5 (text+ko) ==== @@ -94,7 +94,6 @@ DUMMY(renameat); DUMMY(linkat); DUMMY(symlinkat); -DUMMY(readlinkat); DUMMY(pselect6); DUMMY(ppoll); DUMMY(unshare); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_proto.h#5 (text+ko) ==== @@ -933,7 +933,10 @@ register_t dummy; }; struct linux_readlinkat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + char bufsiz_l_[PADL_(l_int)]; l_int bufsiz; char bufsiz_r_[PADR_(l_int)]; }; struct linux_fchmodat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_syscall.h#5 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysent.c#5 (text+ko) ==== @@ -324,7 +324,7 @@ { 0, (sy_call_t *)linux_renameat, AUE_NULL, NULL, 0, 0 }, /* 302 = linux_renameat */ { 0, (sy_call_t *)linux_linkat, AUE_NULL, NULL, 0, 0 }, /* 303 = linux_linkat */ { 0, (sy_call_t *)linux_symlinkat, AUE_NULL, NULL, 0, 0 }, /* 304 = linux_symlinkat */ - { 0, (sy_call_t *)linux_readlinkat, AUE_NULL, NULL, 0, 0 }, /* 305 = linux_readlinkat */ + { AS(linux_readlinkat_args), (sy_call_t *)linux_readlinkat, AUE_NULL, NULL, 0, 0 }, /* 305 = linux_readlinkat */ { AS(linux_fchmodat_args), (sy_call_t *)linux_fchmodat, AUE_NULL, NULL, 0, 0 }, /* 306 = linux_fchmodat */ { AS(linux_faccessat_args), (sy_call_t *)linux_faccessat, AUE_NULL, NULL, 0, 0 }, /* 307 = linux_faccessat */ { 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0 }, /* 308 = linux_pselect6 */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/syscalls.master#5 (text+ko) ==== @@ -486,7 +486,8 @@ 302 AUE_NULL STD { int linux_renameat(void); } 303 AUE_NULL STD { int linux_linkat(void); } 304 AUE_NULL STD { int linux_symlinkat(void); } -305 AUE_NULL STD { int linux_readlinkat(void); } +305 AUE_NULL STD { int linux_readlinkat(l_int dfd, char *path, \ + char *buf, l_int bufsiz); } 306 AUE_NULL STD { int linux_fchmodat(l_int dfd, char *filename, \ l_mode_t mode); } 307 AUE_NULL STD { int linux_faccessat(l_int dfd, char *filename, l_int mode); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#13 (text+ko) ==== @@ -100,6 +100,8 @@ static int kern_common_lchown(struct thread *td, int uid, int gid, struct nameidata *nd); static int kern_common_chmod(struct thread *td, int mode, struct nameidata *nd); +static int kern_common_readlink(struct thread *td, char *buf, + enum uio_seg bufseg, int count, struct nameidata *nd); /* * The module initialization routine for POSIX asynchronous I/O will @@ -2437,20 +2439,57 @@ kern_readlink(struct thread *td, char *path, enum uio_seg pathseg, char *buf, enum uio_seg bufseg, int count) { - register struct vnode *vp; + struct nameidata nd; + NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, + pathseg, path, td); + + return kern_common_readlink(td, buf, bufseg, count, &nd); +} + +int +kern_readlinkat(struct thread *td, char *path, enum uio_seg pathseg, char *buf, + enum uio_seg bufseg, int count, int dirfd) +{ + int error; + struct nameidata nd; + struct vnode *dir_vn; + + if (dirfd == AT_FDCWD) + dir_vn = NULL; + else { + error = fgetvp(td, dirfd, &dir_vn); + if (error) + return (error); + if (dir_vn->v_type != VDIR) { + vrele(dir_vn); + return (ENOTDIR); + } + } + + NDINIT_AT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, + path, td, dir_vn); + + error = kern_common_readlink(td, buf, bufseg, count, &nd); + if (dirfd != AT_FDCWD) + vrele(dir_vn); + return (error); +} + +static int +kern_common_readlink(struct thread *td, char *buf, enum uio_seg bufseg, int count, + struct nameidata *nd) +{ + struct vnode *vp; struct iovec aiov; struct uio auio; int error; - struct nameidata nd; int vfslocked; - NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, - pathseg, path, td); - if ((error = namei(&nd)) != 0) + if ((error = namei(nd)) != 0) return (error); - NDFREE(&nd, NDF_ONLY_PNBUF); - vfslocked = NDHASGIANT(&nd); - vp = nd.ni_vp; + NDFREE(nd, NDF_ONLY_PNBUF); + vfslocked = NDHASGIANT(nd); + vp = nd->ni_vp; #ifdef MAC error = mac_check_vnode_readlink(td->td_ucred, vp); if (error) { ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#6 (text+ko) ==== @@ -140,6 +140,8 @@ int kern_pwritev(struct thread *td, int fd, struct uio *auio, off_t offset); int kern_readlink(struct thread *td, char *path, enum uio_seg pathseg, char *buf, enum uio_seg bufseg, int count); +int kern_readlinkat(struct thread *td, char *path, enum uio_seg pathseg, + char *buf, enum uio_seg bufseg, int count, int dirfd); int kern_readv(struct thread *td, int fd, struct uio *auio); int kern_recvit(struct thread *td, int s, struct msghdr *mp, enum uio_seg fromseg, struct mbuf **controlp); From owner-p4-projects@FreeBSD.ORG Sun Jun 3 15:08:35 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0AA616A46B; Sun, 3 Jun 2007 15:08:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 6C4EC16A421 for ; Sun, 3 Jun 2007 15:08:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5C92813C448 for ; Sun, 3 Jun 2007 15:08:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l53F8YLT064765 for ; Sun, 3 Jun 2007 15:08:34 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l53F8Ypm064756 for perforce@freebsd.org; Sun, 3 Jun 2007 15:08:34 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 3 Jun 2007 15:08:34 GMT Message-Id: <200706031508.l53F8Ypm064756@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120842 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 15:08:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=120842 Change 120842 by rdivacky@rdivacky_witten on 2007/06/03 15:07:41 Implement linux_unlinkat(), linux_linkat() and linux_symlinkat(). The corresponding kern_* functions for unlinkat and symlinkat are copied from *at-less versions because there is a loop. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_dummy.c#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_syscall.h#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysent.c#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.master#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#8 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_dummy.c#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_proto.h#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_syscall.h#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysent.c#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/syscalls.master#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#14 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#7 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_dummy.c#7 (text+ko) ==== @@ -99,10 +99,7 @@ DUMMY(mkdirat); DUMMY(mknodat); DUMMY(futimesat); -DUMMY(unlinkat); DUMMY(renameat); -DUMMY(linkat); -DUMMY(symlinkat); DUMMY(pselect6); DUMMY(ppoll); DUMMY(unshare); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#6 (text+ko) ==== @@ -902,16 +902,24 @@ char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; }; struct linux_unlinkat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char pathname_l_[PADL_(char *)]; char * pathname; char pathname_r_[PADR_(char *)]; + char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; }; struct linux_renameat_args { register_t dummy; }; struct linux_linkat_args { - register_t dummy; + char olddfd_l_[PADL_(l_int)]; l_int olddfd; char olddfd_r_[PADR_(l_int)]; + char oldname_l_[PADL_(char *)]; char * oldname; char oldname_r_[PADR_(char *)]; + char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; + char newname_l_[PADL_(char *)]; char * newname; char newname_r_[PADR_(char *)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; }; struct linux_symlinkat_args { - register_t dummy; + char oldname_l_[PADL_(char *)]; char * oldname; char oldname_r_[PADR_(char *)]; + char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; + char newname_l_[PADL_(char *)]; char * newname; char newname_r_[PADR_(char *)]; }; struct linux_readlinkat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_syscall.h#6 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysent.c#6 (text+ko) ==== @@ -321,10 +321,10 @@ { AS(linux_fchownat_args), (sy_call_t *)linux_fchownat, AUE_NULL, NULL, 0, 0 }, /* 298 = linux_fchownat */ { 0, (sy_call_t *)linux_futimesat, AUE_NULL, NULL, 0, 0 }, /* 299 = linux_futimesat */ { AS(linux_fstatat64_args), (sy_call_t *)linux_fstatat64, AUE_NULL, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ - { 0, (sy_call_t *)linux_unlinkat, AUE_NULL, NULL, 0, 0 }, /* 301 = linux_unlinkat */ + { AS(linux_unlinkat_args), (sy_call_t *)linux_unlinkat, AUE_NULL, NULL, 0, 0 }, /* 301 = linux_unlinkat */ { 0, (sy_call_t *)linux_renameat, AUE_NULL, NULL, 0, 0 }, /* 302 = linux_renameat */ - { 0, (sy_call_t *)linux_linkat, AUE_NULL, NULL, 0, 0 }, /* 303 = linux_linkat */ - { 0, (sy_call_t *)linux_symlinkat, AUE_NULL, NULL, 0, 0 }, /* 304 = linux_symlinkat */ + { AS(linux_linkat_args), (sy_call_t *)linux_linkat, AUE_NULL, NULL, 0, 0 }, /* 303 = linux_linkat */ + { AS(linux_symlinkat_args), (sy_call_t *)linux_symlinkat, AUE_NULL, NULL, 0, 0 }, /* 304 = linux_symlinkat */ { AS(linux_readlinkat_args), (sy_call_t *)linux_readlinkat, AUE_NULL, NULL, 0, 0 }, /* 305 = linux_readlinkat */ { AS(linux_fchmodat_args), (sy_call_t *)linux_fchmodat, AUE_NULL, NULL, 0, 0 }, /* 306 = linux_fchmodat */ { AS(linux_faccessat_args), (sy_call_t *)linux_faccessat, AUE_NULL, NULL, 0, 0 }, /* 307 = linux_faccessat */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.master#6 (text+ko) ==== @@ -467,18 +467,19 @@ l_int flags, l_int mode); } 296 AUE_NULL STD { int linux_mkdirat(void); } 297 AUE_NULL STD { int linux_mknodat(void); } -298 AUE_NULL STD { int linux_fchownat(l_int dfd, char *filename, \ +298 AUE_NULL STD { int linux_fchownat(l_int dfd, char *filename, \ l_uid16_t uid, l_gid16_t gid, l_int flag); } 299 AUE_NULL STD { int linux_futimesat(void); } 300 AUE_NULL STD { int linux_fstatat64(l_int dfd, char *pathname, \ struct l_stat64 *statbuf, l_int flag); } -301 AUE_NULL STD { int linux_unlinkat(void); } +301 AUE_NULL STD { int linux_unlinkat(l_int dfd, char *pathname, l_int flag); } 302 AUE_NULL STD { int linux_renameat(void); } -303 AUE_NULL STD { int linux_linkat(void); } -304 AUE_NULL STD { int linux_symlinkat(void); } -305 AUE_NULL STD { int linux_readlinkat(l_int dfd, char *path, \ +303 AUE_NULL STD { int linux_linkat(l_int olddfd, char *oldname, \ + l_int newdfd, char *newname, l_int flags); } +304 AUE_NULL STD { int linux_symlinkat(char *oldname, l_int newdfd, char *newname); } +305 AUE_NULL STD { int linux_readlinkat(l_int dfd, char *path, \ char *buf, l_int bufsiz); } -306 AUE_NULL STD { int linux_fchmodat(l_int dfd, char *filename, \ +306 AUE_NULL STD { int linux_fchmodat(l_int dfd, char *filename, \ l_mode_t mode); } 307 AUE_NULL STD { int linux_faccessat(l_int dfd, char *filename, l_int mode); } 308 AUE_NULL STD { int linux_pselect6(void); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#8 (text+ko) ==== @@ -630,6 +630,40 @@ } int +linux_unlinkat(struct thread *td, struct linux_unlinkat_args *args) +{ + char *path; + int error, dfd; + struct stat st; + + if (args->flag & ~LINUX_AT_REMOVEDIR) + return (EINVAL); + + LCONVPATHEXIST(td, args->pathname, &path); + +#ifdef DEBUG + if (ldebug(unlinkat)) + printf(ARGS(unlinkat, "%s"), path); +#endif + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + if (args->flag & LINUX_AT_REMOVEDIR) + error = kern_rmdirat(td, path, UIO_SYSSPACE, dfd); + else + error = kern_unlinkat(td, path, UIO_SYSSPACE, dfd); + if (error == EPERM) + /* Introduce POSIX noncompliant behaviour of Linux */ + if (kern_stat(td, path, UIO_SYSSPACE, &st) == 0) + if (S_ISDIR(st.st_mode)) + error = EISDIR; + LFREEPATH(path); + return (error); +} +int linux_chdir(struct thread *td, struct linux_chdir_args *args) { char *path; @@ -673,7 +707,7 @@ #ifdef DEBUG if (ldebug(fchmodat)) - printf(ARGS(fchmodat, "%s, %d, %d"), path, args->uid, args->gid); + printf(ARGS(fchmodat, "%s, %d"), path, args->mode); #endif if (args->dfd == LINUX_AT_FDCWD) @@ -768,6 +802,35 @@ } int +linux_symlinkat(struct thread *td, struct linux_symlinkat_args *args) +{ + char *path, *to; + int error, dfd; + + LCONVPATHEXIST(td, args->oldname, &path); + /* Expand LCONVPATHCREATE so that `path' can be freed on errors */ + error = linux_emul_convpath(td, args->newname, UIO_USERSPACE, &to, 1); + if (to == NULL) { + LFREEPATH(path); + return (error); + } + +#ifdef DEBUG + if (ldebug(symlinkat)) + printf(ARGS(symlinkat, "%s, %s"), path, to); +#endif + if (args->newdfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->newdfd; + + error = kern_symlinkat(td, path, to, UIO_SYSSPACE, dfd); + LFREEPATH(path); + LFREEPATH(to); + return (error); +} + +int linux_readlink(struct thread *td, struct linux_readlink_args *args) { char *name; @@ -868,6 +931,48 @@ } int +linux_linkat(struct thread *td, struct linux_linkat_args *args) +{ + char *path, *to; + int error, olddfd, newdfd; + + /* + * don't laugh they really introduced flags argument + * which is forbidden to use ;) + */ + if (args->flags != 0) + return (EINVAL); + + LCONVPATHEXIST(td, args->oldname, &path); + /* Expand LCONVPATHCREATE so that `path' can be freed on errors */ + error = linux_emul_convpath(td, args->newname, UIO_USERSPACE, &to, 1); + if (to == NULL) { + LFREEPATH(path); + return (error); + } + +#ifdef DEBUG + if (ldebug(linkat)) + printf(ARGS(linkat, "%i, %s, %i, %s, %i"), args->olddfd, path, + args->newdfd, to, args->flags); +#endif + if (args->olddfd == LINUX_AT_FDCWD) + olddfd = AT_FDCWD; + else + olddfd = args->olddfd; + + if (args->newdfd == LINUX_AT_FDCWD) + newdfd = AT_FDCWD; + else + newdfd = args->newdfd; + + error = kern_linkat(td, path, to, UIO_SYSSPACE, olddfd, newdfd); + LFREEPATH(path); + LFREEPATH(to); + return (error); +} + +int linux_fdatasync(td, uap) struct thread *td; struct linux_fdatasync_args *uap; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_dummy.c#6 (text+ko) ==== @@ -90,10 +90,7 @@ DUMMY(mkdirat); DUMMY(mknodat); DUMMY(futimesat); -DUMMY(unlinkat); DUMMY(renameat); -DUMMY(linkat); -DUMMY(symlinkat); DUMMY(pselect6); DUMMY(ppoll); DUMMY(unshare); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_proto.h#6 (text+ko) ==== @@ -921,16 +921,24 @@ char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; }; struct linux_unlinkat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char pathname_l_[PADL_(char *)]; char * pathname; char pathname_r_[PADR_(char *)]; + char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; }; struct linux_renameat_args { register_t dummy; }; struct linux_linkat_args { - register_t dummy; + char olddfd_l_[PADL_(l_int)]; l_int olddfd; char olddfd_r_[PADR_(l_int)]; + char oldname_l_[PADL_(char *)]; char * oldname; char oldname_r_[PADR_(char *)]; + char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; + char newname_l_[PADL_(char *)]; char * newname; char newname_r_[PADR_(char *)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; }; struct linux_symlinkat_args { - register_t dummy; + char oldname_l_[PADL_(char *)]; char * oldname; char oldname_r_[PADR_(char *)]; + char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; + char newname_l_[PADL_(char *)]; char * newname; char newname_r_[PADR_(char *)]; }; struct linux_readlinkat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_syscall.h#6 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysent.c#6 (text+ko) ==== @@ -320,10 +320,10 @@ { AS(linux_fchownat_args), (sy_call_t *)linux_fchownat, AUE_NULL, NULL, 0, 0 }, /* 298 = linux_fchownat */ { 0, (sy_call_t *)linux_futimesat, AUE_NULL, NULL, 0, 0 }, /* 299 = linux_futimesat */ { AS(linux_fstatat64_args), (sy_call_t *)linux_fstatat64, AUE_NULL, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ - { 0, (sy_call_t *)linux_unlinkat, AUE_NULL, NULL, 0, 0 }, /* 301 = linux_unlinkat */ + { AS(linux_unlinkat_args), (sy_call_t *)linux_unlinkat, AUE_NULL, NULL, 0, 0 }, /* 301 = linux_unlinkat */ { 0, (sy_call_t *)linux_renameat, AUE_NULL, NULL, 0, 0 }, /* 302 = linux_renameat */ - { 0, (sy_call_t *)linux_linkat, AUE_NULL, NULL, 0, 0 }, /* 303 = linux_linkat */ - { 0, (sy_call_t *)linux_symlinkat, AUE_NULL, NULL, 0, 0 }, /* 304 = linux_symlinkat */ + { AS(linux_linkat_args), (sy_call_t *)linux_linkat, AUE_NULL, NULL, 0, 0 }, /* 303 = linux_linkat */ + { AS(linux_symlinkat_args), (sy_call_t *)linux_symlinkat, AUE_NULL, NULL, 0, 0 }, /* 304 = linux_symlinkat */ { AS(linux_readlinkat_args), (sy_call_t *)linux_readlinkat, AUE_NULL, NULL, 0, 0 }, /* 305 = linux_readlinkat */ { AS(linux_fchmodat_args), (sy_call_t *)linux_fchmodat, AUE_NULL, NULL, 0, 0 }, /* 306 = linux_fchmodat */ { AS(linux_faccessat_args), (sy_call_t *)linux_faccessat, AUE_NULL, NULL, 0, 0 }, /* 307 = linux_faccessat */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/syscalls.master#6 (text+ko) ==== @@ -482,10 +482,11 @@ 299 AUE_NULL STD { int linux_futimesat(void); } 300 AUE_NULL STD { int linux_fstatat64(l_int dfd, char *pathname, \ struct l_stat64 *statbuf, l_int flag); } -301 AUE_NULL STD { int linux_unlinkat(void); } +301 AUE_NULL STD { int linux_unlinkat(l_int dfd, char *pathname, l_int flag); } 302 AUE_NULL STD { int linux_renameat(void); } -303 AUE_NULL STD { int linux_linkat(void); } -304 AUE_NULL STD { int linux_symlinkat(void); } +303 AUE_NULL STD { int linux_linkat(l_int olddfd, char *oldname, \ + l_int newdfd, char *newname, l_int flags); } +304 AUE_NULL STD { int linux_symlinkat(char *oldname, l_int newdfd, char *newname); } 305 AUE_NULL STD { int linux_readlinkat(l_int dfd, char *path, \ char *buf, l_int bufsiz); } 306 AUE_NULL STD { int linux_fchmodat(l_int dfd, char *filename, \ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#14 (text+ko) ==== @@ -102,6 +102,8 @@ static int kern_common_chmod(struct thread *td, int mode, struct nameidata *nd); static int kern_common_readlink(struct thread *td, char *buf, enum uio_seg bufseg, int count, struct nameidata *nd); +static int kern_common_link(struct thread *td, struct nameidata *ndp, + struct nameidata *ndl); /* * The module initialization routine for POSIX asynchronous I/O will @@ -1442,20 +1444,82 @@ int kern_link(struct thread *td, char *path, char *link, enum uio_seg segflg) { + struct nameidata ndp, ndl; + + bwillwrite(); + NDINIT(&ndp, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, segflg, path, td); + NDINIT(&ndl, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE2, + segflg, link, td); + + return kern_common_link(td, &ndp, &ndl); +} + +int +kern_linkat(struct thread *td, char *path, char *link, enum uio_seg segflg, + int olddirfd, int newdirfd) +{ + struct nameidata ndp, ndl; + int error; + struct vnode *pdir_vn, *ldir_vn; + + if (olddirfd == AT_FDCWD) + pdir_vn = NULL; + else { + error = fgetvp(td, olddirfd, &pdir_vn); + if (error) + return (error); + if (pdir_vn->v_type != VDIR) { + vrele(pdir_vn); + return (ENOTDIR); + } + } + + NDINIT_AT(&ndp, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, segflg, path, td, pdir_vn); + + if (newdirfd == AT_FDCWD) + ldir_vn = NULL; + else { + error = fgetvp(td, newdirfd, &ldir_vn); + if (error) + return (error); + if (ldir_vn->v_type != VDIR) { + vrele(ldir_vn); + return (ENOTDIR); + } + } + + NDINIT_AT(&ndl, CREATE, LOCKPARENT | SAVENAME| MPSAFE | AUDITVNODE1, segflg, + link, td, ldir_vn); + + error = kern_common_link(td, &ndp, &ndl); + if (olddirfd != AT_FDCWD) + vrele(pdir_vn); + if (newdirfd != AT_FDCWD) + vrele(ldir_vn); + return (error); + + NDINIT(&ndp, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, segflg, path, td); + NDINIT(&ndl, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE2, + segflg, link, td); + + return kern_common_link(td, &ndp, &ndl); +} + +static int +kern_common_link(struct thread *td, struct nameidata *ndp, struct nameidata *ndl) +{ struct vnode *vp; struct mount *mp; - struct nameidata nd; int vfslocked; int lvfslocked; int error; bwillwrite(); - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, segflg, path, td); - if ((error = namei(&nd)) != 0) + if ((error = namei(ndp)) != 0) return (error); - vfslocked = NDHASGIANT(&nd); - NDFREE(&nd, NDF_ONLY_PNBUF); - vp = nd.ni_vp; + vfslocked = NDHASGIANT(ndp); + NDFREE(ndp, NDF_ONLY_PNBUF); + vp = ndp->ni_vp; if (vp->v_type == VDIR) { vrele(vp); VFS_UNLOCK_GIANT(vfslocked); @@ -1466,33 +1530,31 @@ VFS_UNLOCK_GIANT(vfslocked); return (error); } - NDINIT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE2, - segflg, link, td); - if ((error = namei(&nd)) == 0) { - lvfslocked = NDHASGIANT(&nd); - if (nd.ni_vp != NULL) { - if (nd.ni_dvp == nd.ni_vp) - vrele(nd.ni_dvp); + if ((error = namei(ndl)) == 0) { + lvfslocked = NDHASGIANT(ndl); + if (ndl->ni_vp != NULL) { + if (ndl->ni_dvp == ndl->ni_vp) + vrele(ndl->ni_dvp); else - vput(nd.ni_dvp); - vrele(nd.ni_vp); + vput(ndl->ni_dvp); + vrele(ndl->ni_vp); error = EEXIST; } else if ((error = vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td)) == 0) { - VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); + VOP_LEASE(ndl->ni_dvp, td, td->td_ucred, LEASE_WRITE); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); error = can_hardlink(vp, td, td->td_ucred); if (error == 0) #ifdef MAC error = mac_check_vnode_link(td->td_ucred, - nd.ni_dvp, vp, &nd.ni_cnd); + ndl->ni_dvp, vp, &(ndl->ni_cnd)); if (error == 0) #endif - error = VOP_LINK(nd.ni_dvp, vp, &nd.ni_cnd); + error = VOP_LINK(ndl->ni_dvp, vp, &(ndl->ni_cnd)); VOP_UNLOCK(vp, 0, td); - vput(nd.ni_dvp); + vput(ndl->ni_dvp); } - NDFREE(&nd, NDF_ONLY_PNBUF); + NDFREE(ndl, NDF_ONLY_PNBUF); VFS_UNLOCK_GIANT(lvfslocked); } vrele(vp); @@ -1594,6 +1656,91 @@ return (error); } +int +kern_symlinkat(struct thread *td, char *path, char *link, enum uio_seg segflg, + int dirfd) +{ + struct mount *mp; + struct vattr vattr; + char *syspath; + int error; + struct nameidata nd; + int vfslocked; + struct vnode *dir_vn; + + if (segflg == UIO_SYSSPACE) { + syspath = path; + } else { + syspath = uma_zalloc(namei_zone, M_WAITOK); + if ((error = copyinstr(path, syspath, MAXPATHLEN, NULL)) != 0) + goto out; + } + AUDIT_ARG(text, syspath); +restart: + if (dirfd == AT_FDCWD) + dir_vn = NULL; + else { + error = fgetvp(td, dirfd, &dir_vn); + if (error) + return (error); + if (dir_vn->v_type != VDIR) { + vrele(dir_vn); + return (ENOTDIR); + } + } + bwillwrite(); + NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, + segflg, link, td, dir_vn); + if ((error = namei(&nd)) != 0) + goto out; + vfslocked = NDHASGIANT(&nd); + if (nd.ni_vp) { + NDFREE(&nd, NDF_ONLY_PNBUF); + if (nd.ni_vp == nd.ni_dvp) + vrele(nd.ni_dvp); + else + vput(nd.ni_dvp); + vrele(nd.ni_vp); + VFS_UNLOCK_GIANT(vfslocked); + error = EEXIST; + goto out; + } + if (vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { + NDFREE(&nd, NDF_ONLY_PNBUF); + vput(nd.ni_dvp); + VFS_UNLOCK_GIANT(vfslocked); + if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) + goto out; + goto restart; + } + VATTR_NULL(&vattr); + FILEDESC_SLOCK(td->td_proc->p_fd); + vattr.va_mode = ACCESSPERMS &~ td->td_proc->p_fd->fd_cmask; + FILEDESC_SUNLOCK(td->td_proc->p_fd); +#ifdef MAC + vattr.va_type = VLNK; + error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, + &vattr); + if (error) + goto out2; +#endif + VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); + error = VOP_SYMLINK(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr, syspath); + if (error == 0) + vput(nd.ni_vp); +#ifdef MAC +out2: +#endif + NDFREE(&nd, NDF_ONLY_PNBUF); + vput(nd.ni_dvp); + vn_finished_write(mp); + VFS_UNLOCK_GIANT(vfslocked); +out: + if (segflg != UIO_SYSSPACE) + uma_zfree(namei_zone, syspath); + return (error); +} + /* * Delete a whiteout from the filesystem. */ @@ -1732,6 +1879,82 @@ return (error); } +int +kern_unlinkat(struct thread *td, char *path, enum uio_seg pathseg, int dirfd) +{ + struct mount *mp; + struct vnode *vp, *dir_vn; + int error; + struct nameidata nd; + int vfslocked; + +restart: + if (dirfd == AT_FDCWD) + dir_vn = NULL; + else { + error = fgetvp(td, dirfd, &dir_vn); + if (error) + return (error); + if (dir_vn->v_type != VDIR) { + vrele(dir_vn); + return (ENOTDIR); + } + } + bwillwrite(); + NDINIT_AT(&nd, DELETE, LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, + pathseg, path, td, dir_vn); + if ((error = namei(&nd)) != 0) + return (error == EINVAL ? EPERM : error); + vfslocked = NDHASGIANT(&nd); + vp = nd.ni_vp; + if (vp->v_type == VDIR) + error = EPERM; /* POSIX */ + else { + /* + * The root of a mounted filesystem cannot be deleted. + * + * XXX: can this only be a VDIR case? + */ + if (vp->v_vflag & VV_ROOT) + error = EBUSY; + } + if (error == 0) { + if (vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { + NDFREE(&nd, NDF_ONLY_PNBUF); + vput(nd.ni_dvp); + if (vp == nd.ni_dvp) + vrele(vp); + else + vput(vp); + VFS_UNLOCK_GIANT(vfslocked); + if ((error = vn_start_write(NULL, &mp, + V_XSLEEP | PCATCH)) != 0) + return (error); + goto restart; + } +#ifdef MAC + error = mac_check_vnode_delete(td->td_ucred, nd.ni_dvp, vp, + &nd.ni_cnd); + if (error) + goto out; +#endif + VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); + error = VOP_REMOVE(nd.ni_dvp, vp, &nd.ni_cnd); +#ifdef MAC +out: +#endif + vn_finished_write(mp); + } + NDFREE(&nd, NDF_ONLY_PNBUF); + vput(nd.ni_dvp); + if (vp == nd.ni_dvp) + vrele(vp); + else + vput(vp); + VFS_UNLOCK_GIANT(vfslocked); + return (error); +} + /* * Reposition read/write file offset. */ @@ -2660,6 +2883,7 @@ } /* + * * Common implementation code for chmod(), lchmod() and fchmod(). */ static int @@ -3819,6 +4043,85 @@ return (error); } +int +kern_rmdirat(struct thread *td, char *path, enum uio_seg pathseg, int dirfd) +{ + struct mount *mp; + struct vnode *vp, *dir_vn; + int error; + struct nameidata nd; + int vfslocked; + +restart: + if (dirfd == AT_FDCWD) + dir_vn = NULL; + else { + error = fgetvp(td, dirfd, &dir_vn); + if (error) + return (error); + if (dir_vn->v_type != VDIR) { + vrele(dir_vn); + return (ENOTDIR); + } + } + bwillwrite(); + NDINIT_AT(&nd, DELETE, LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, + pathseg, path, td, dir_vn); + if ((error = namei(&nd)) != 0) + return (error); + vfslocked = NDHASGIANT(&nd); + vp = nd.ni_vp; + if (vp->v_type != VDIR) { + error = ENOTDIR; + goto out; + } + /* + * No rmdir "." please. + */ + if (nd.ni_dvp == vp) { + error = EINVAL; + goto out; + } + /* + * The root of a mounted filesystem cannot be deleted. + */ + if (vp->v_vflag & VV_ROOT) { + error = EBUSY; + goto out; + } +#ifdef MAC + error = mac_check_vnode_delete(td->td_ucred, nd.ni_dvp, vp, + &nd.ni_cnd); + if (error) + goto out; +#endif + if (vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { + NDFREE(&nd, NDF_ONLY_PNBUF); + vput(vp); + if (nd.ni_dvp == vp) + vrele(nd.ni_dvp); + else + vput(nd.ni_dvp); + VFS_UNLOCK_GIANT(vfslocked); + if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) + return (error); + goto restart; + } + VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); + VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); + error = VOP_RMDIR(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd); + vn_finished_write(mp); +out: + NDFREE(&nd, NDF_ONLY_PNBUF); + vput(vp); + if (nd.ni_dvp == vp) + vrele(nd.ni_dvp); + else + vput(nd.ni_dvp); + VFS_UNLOCK_GIANT(vfslocked); + return (error); +} + #ifdef COMPAT_43 /* * Read a block of directory entries in a filesystem independent format. ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#7 (text+ko) ==== @@ -111,6 +111,8 @@ int uid, int gid, int dirfd); int kern_link(struct thread *td, char *path, char *link, enum uio_seg segflg); +int kern_linkat(struct thread *td, char *path, char *link, + enum uio_seg segflg, int olddfd, int newdfd); int kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp); int kern_lstatat(struct thread *td, char *path, enum uio_seg pathseg, @@ -148,6 +150,7 @@ int kern_rename(struct thread *td, char *from, char *to, enum uio_seg pathseg); int kern_rmdir(struct thread *td, char *path, enum uio_seg pathseg); +int kern_rmdirat(struct thread *td, char *path, enum uio_seg pathseg, int dirfd); int kern_sched_rr_get_interval(struct thread *td, pid_t pid, struct timespec *ts); int kern_semctl(struct thread *td, int semid, int semnum, int cmd, @@ -184,9 +187,12 @@ struct statfs *buf); int kern_symlink(struct thread *td, char *path, char *link, enum uio_seg segflg); +int kern_symlinkat(struct thread *td, char *path, char *link, + enum uio_seg segflg, int dirfd); int kern_truncate(struct thread *td, char *path, enum uio_seg pathseg, off_t length); int kern_unlink(struct thread *td, char *path, enum uio_seg pathseg); +int kern_unlinkat(struct thread *td, char *path, enum uio_seg pathseg, int dirfd); int kern_utimes(struct thread *td, char *path, enum uio_seg pathseg, struct timeval *tptr, enum uio_seg tptrseg); int kern_wait(struct thread *td, pid_t pid, int *status, int options, From owner-p4-projects@FreeBSD.ORG Sun Jun 3 21:35:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54E9D16A468; Sun, 3 Jun 2007 21:35:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 0AC8916A400 for ; Sun, 3 Jun 2007 21:35:28 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from vlakno.cz (vlk.vlakno.cz [62.168.28.247]) by mx1.freebsd.org (Postfix) with ESMTP id BA77B13C45A for ; Sun, 3 Jun 2007 21:35:27 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from localhost (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 228392FEE69 for ; Sun, 3 Jun 2007 23:35:26 +0200 (CEST) X-Virus-Scanned: amavisd-new at vlakno.cz Received: from vlakno.cz ([127.0.0.1]) by localhost (vlk.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fq1L0vaqZb4q for ; Sun, 3 Jun 2007 23:35:25 +0200 (CEST) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 275EF66C8F6 for ; Sun, 3 Jun 2007 23:35:25 +0200 (CEST) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.13.8/8.13.8/Submit) id l53LZOGP048055 for perforce@FreeBSD.org; Sun, 3 Jun 2007 23:35:24 +0200 (CEST) (envelope-from rdivacky) Date: Sun, 3 Jun 2007 23:35:24 +0200 From: Roman Divacky To: Perforce Change Reviews Message-ID: <20070603213524.GA48034@freebsd.org> References: <200706031508.l53F8Ypm064756@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200706031508.l53F8Ypm064756@repoman.freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: Subject: Re: PERFORCE change 120842 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 21:35:28 -0000 On Sun, Jun 03, 2007 at 03:08:34PM +0000, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=120842 > > Change 120842 by rdivacky@rdivacky_witten on 2007/06/03 15:07:41 > > Implement linux_unlinkat(), linux_linkat() and linux_symlinkat(). > The corresponding kern_* functions for unlinkat and symlinkat are copied > from *at-less versions because there is a loop. maybe I can keep only the *at versions and change all the consumers to use that to avoid code duplication. there are only a few consumers. roman From owner-p4-projects@FreeBSD.ORG Mon Jun 4 00:57:16 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 962FB16A468; Mon, 4 Jun 2007 00:57:16 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4C61F16A421 for ; Mon, 4 Jun 2007 00:57:16 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3A79B13C448 for ; Mon, 4 Jun 2007 00:57:16 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l540vGA4075171 for ; Mon, 4 Jun 2007 00:57:16 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l540v9na075072 for perforce@freebsd.org; Mon, 4 Jun 2007 00:57:09 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 4 Jun 2007 00:57:09 GMT Message-Id: <200706040057.l540v9na075072@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 120857 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, 04 Jun 2007 00:57:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=120857 Change 120857 by kmacy@kmacy_vt-x:opentoe_init on 2007/06/04 00:56:09 IFC Affected files ... .. //depot/projects/opentoe/Makefile.inc1#4 integrate .. //depot/projects/opentoe/UPDATING#8 integrate .. //depot/projects/opentoe/bin/chflags/chflags.1#2 integrate .. //depot/projects/opentoe/bin/pax/ar_io.c#2 integrate .. //depot/projects/opentoe/bin/pax/file_subs.c#2 integrate .. //depot/projects/opentoe/bin/pax/pat_rep.c#2 integrate .. //depot/projects/opentoe/bin/pax/sel_subs.c#2 integrate .. //depot/projects/opentoe/bin/pax/tables.c#2 integrate .. //depot/projects/opentoe/contrib/file/ChangeLog#2 integrate .. //depot/projects/opentoe/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/opentoe/contrib/file/LEGAL.NOTICE#2 integrate .. //depot/projects/opentoe/contrib/file/Localstuff#2 integrate .. //depot/projects/opentoe/contrib/file/MAINT#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/animation#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/archive#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/audio#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/c-lang#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/cad#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/cafebabe#1 branch .. //depot/projects/opentoe/contrib/file/Magdir/commands#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/console#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/database#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/editors#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/elf#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/fonts#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/images#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/java#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/linux#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/mach#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/mathematica#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/mime#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/mips#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/misctools#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/os2#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/os400#1 branch .. //depot/projects/opentoe/contrib/file/Magdir/perl#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/python#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/revision#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/riff#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/sql#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/sun#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/sysex#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/tex#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/tgif#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/unicode#1 branch .. //depot/projects/opentoe/contrib/file/Magdir/varied.out#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/vmware#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/wordprocessors#2 integrate .. //depot/projects/opentoe/contrib/file/Magdir/xwindows#2 integrate .. //depot/projects/opentoe/contrib/file/Makefile.am#2 integrate .. //depot/projects/opentoe/contrib/file/Makefile.in#2 integrate .. //depot/projects/opentoe/contrib/file/README#2 integrate .. //depot/projects/opentoe/contrib/file/apprentice.c#2 integrate .. //depot/projects/opentoe/contrib/file/apptype.c#2 integrate .. //depot/projects/opentoe/contrib/file/ascmagic.c#2 integrate .. //depot/projects/opentoe/contrib/file/compress.c#2 integrate .. //depot/projects/opentoe/contrib/file/config.h.in#2 integrate .. //depot/projects/opentoe/contrib/file/configure#2 integrate .. //depot/projects/opentoe/contrib/file/configure.in#2 integrate .. //depot/projects/opentoe/contrib/file/file.c#2 integrate .. //depot/projects/opentoe/contrib/file/file.h#2 integrate .. //depot/projects/opentoe/contrib/file/fsmagic.c#2 integrate .. //depot/projects/opentoe/contrib/file/funcs.c#2 integrate .. //depot/projects/opentoe/contrib/file/install-sh#2 integrate .. //depot/projects/opentoe/contrib/file/is_tar.c#2 integrate .. //depot/projects/opentoe/contrib/file/magic.c#2 integrate .. //depot/projects/opentoe/contrib/file/magic.h#2 integrate .. //depot/projects/opentoe/contrib/file/magic.mime#2 integrate .. //depot/projects/opentoe/contrib/file/magic2mime#2 integrate .. //depot/projects/opentoe/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/opentoe/contrib/file/names.h#2 integrate .. //depot/projects/opentoe/contrib/file/patchlevel.h#2 integrate .. //depot/projects/opentoe/contrib/file/print.c#2 integrate .. //depot/projects/opentoe/contrib/file/readelf.c#2 integrate .. //depot/projects/opentoe/contrib/file/softmagic.c#2 integrate .. //depot/projects/opentoe/contrib/file/tar.h#2 integrate .. //depot/projects/opentoe/contrib/file/test.c#2 integrate .. //depot/projects/opentoe/contrib/gcc/gcc.c#3 integrate .. //depot/projects/opentoe/crypto/openssh/pathnames.h#2 integrate .. //depot/projects/opentoe/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/opentoe/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/opentoe/etc/defaults/periodic.conf#4 integrate .. //depot/projects/opentoe/etc/defaults/rc.conf#5 integrate .. //depot/projects/opentoe/etc/etc.amd64/ttys#2 integrate .. //depot/projects/opentoe/etc/etc.arm/ttys#2 integrate .. //depot/projects/opentoe/etc/etc.i386/ttys#2 integrate .. //depot/projects/opentoe/etc/etc.ia64/ttys#2 integrate .. //depot/projects/opentoe/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/opentoe/etc/etc.sparc64/ttys#2 integrate .. //depot/projects/opentoe/etc/login.conf#2 integrate .. //depot/projects/opentoe/etc/rc.d/cleanvar#3 integrate .. //depot/projects/opentoe/etc/rc.d/initrandom#2 integrate .. //depot/projects/opentoe/etc/rc.d/jail#2 integrate .. //depot/projects/opentoe/etc/rc.d/tmp#2 integrate .. //depot/projects/opentoe/etc/rc.d/var#3 integrate .. //depot/projects/opentoe/etc/root/dot.cshrc#2 integrate .. //depot/projects/opentoe/etc/root/dot.profile#2 integrate .. //depot/projects/opentoe/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/opentoe/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/opentoe/gnu/usr.bin/cc/cc_tools/Makefile#3 integrate .. //depot/projects/opentoe/lib/libarchive/Makefile#5 integrate .. //depot/projects/opentoe/lib/libarchive/archive.h.in#5 integrate .. //depot/projects/opentoe/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_entry_copy_stat.c#1 branch .. //depot/projects/opentoe/lib/libarchive/archive_entry_private.h#1 branch .. //depot/projects/opentoe/lib/libarchive/archive_entry_stat.c#1 branch .. //depot/projects/opentoe/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read.3#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read.c#4 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_extract.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_private.h#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_compression_bzip2.c#4 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_compression_compress.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_compression_program.c#1 branch .. //depot/projects/opentoe/lib/libarchive/archive_read_support_format_ar.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_format_empty.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_format_tar.c#5 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_support_format_zip.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_util.3#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_disk.c#6 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_disk_set_standard_lookup.c#4 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_private.h#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_compression_none.c#4 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_compression_program.c#1 branch .. //depot/projects/opentoe/lib/libarchive/archive_write_set_format_ar.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_format_pax.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_format_shar.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_write_set_format_ustar.c#4 integrate .. //depot/projects/opentoe/lib/libarchive/config_freebsd.h#3 integrate .. //depot/projects/opentoe/lib/libarchive/filter_fork.c#1 branch .. //depot/projects/opentoe/lib/libarchive/filter_fork.h#1 branch .. //depot/projects/opentoe/lib/libarchive/libarchive_internals.3#1 branch .. //depot/projects/opentoe/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/README#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/main.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/test.h#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_acl_basic.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_acl_pax.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_archive_api_feature.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_entry.c#1 branch .. //depot/projects/opentoe/lib/libarchive/test/test_read_compress_program.c#1 branch .. //depot/projects/opentoe/lib/libarchive/test/test_read_data_large.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_extract.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_format_ar.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_format_zip.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_large.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_position.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_read_truncated.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_tar_filenames.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_compress_program.c#1 branch .. //depot/projects/opentoe/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_disk_perms.c#4 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_format_ar.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_format_cpio_empty.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_format_shar_empty.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_format_tar.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_format_tar_empty.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/test/test_write_open_memory.c#3 integrate .. //depot/projects/opentoe/lib/libc/amd64/Symbol.map#3 integrate .. //depot/projects/opentoe/lib/libc/arm/Symbol.map#3 integrate .. //depot/projects/opentoe/lib/libc/db/hash/hash.c#2 integrate .. //depot/projects/opentoe/lib/libc/gen/Symbol.map#4 integrate .. //depot/projects/opentoe/lib/libc/gen/arc4random.c#2 integrate .. //depot/projects/opentoe/lib/libc/i386/Symbol.map#4 integrate .. //depot/projects/opentoe/lib/libc/ia64/Symbol.map#3 integrate .. //depot/projects/opentoe/lib/libc/net/Symbol.map#3 integrate .. //depot/projects/opentoe/lib/libc/posix1e/Symbol.map#3 integrate .. //depot/projects/opentoe/lib/libc/powerpc/Symbol.map#3 integrate .. //depot/projects/opentoe/lib/libc/quad/Symbol.map#3 integrate .. //depot/projects/opentoe/lib/libc/regex/engine.c#2 integrate .. //depot/projects/opentoe/lib/libc/rpc/Symbol.map#3 integrate .. //depot/projects/opentoe/lib/libc/sparc64/Symbol.map#3 integrate .. //depot/projects/opentoe/lib/libc/stdtime/Symbol.map#3 integrate .. //depot/projects/opentoe/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/opentoe/lib/libfetch/Makefile#3 integrate .. //depot/projects/opentoe/lib/libfetch/fetch.3#3 integrate .. //depot/projects/opentoe/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/opentoe/lib/libmagic/config.h#2 integrate .. //depot/projects/opentoe/lib/libpam/modules/pam_login_access/login_access.c#2 integrate .. //depot/projects/opentoe/lib/libthread_db/arch/amd64/libpthread_md.c#2 integrate .. //depot/projects/opentoe/lib/msun/src/s_cbrtf.c#2 integrate .. //depot/projects/opentoe/lib/ncurses/form/Makefile#2 integrate .. //depot/projects/opentoe/lib/ncurses/menu/Makefile#2 integrate .. //depot/projects/opentoe/lib/ncurses/ncurses/Makefile#3 integrate .. //depot/projects/opentoe/lib/ncurses/panel/Makefile#2 integrate .. //depot/projects/opentoe/release/doc/en_US.ISO8859-1/installation/common/install.sgml#3 integrate .. //depot/projects/opentoe/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate .. //depot/projects/opentoe/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/opentoe/sbin/geom/class/stripe/geom_stripe.c#3 integrate .. //depot/projects/opentoe/sbin/newfs_msdos/newfs_msdos.c#2 integrate .. //depot/projects/opentoe/sbin/savecore/savecore.c#2 integrate .. //depot/projects/opentoe/share/man/man4/Makefile#6 integrate .. //depot/projects/opentoe/share/man/man4/mmc.4#1 branch .. //depot/projects/opentoe/share/man/man4/mmcsd.4#1 branch .. //depot/projects/opentoe/share/man/man4/ng_bpf.4#2 integrate .. //depot/projects/opentoe/share/man/man4/pcm.4#2 integrate .. //depot/projects/opentoe/share/man/man4/pty.4#2 integrate .. //depot/projects/opentoe/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/opentoe/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/opentoe/share/man/man5/make.conf.5#2 integrate .. //depot/projects/opentoe/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/opentoe/share/man/man9/bus_alloc_resource.9#2 integrate .. //depot/projects/opentoe/share/man/man9/locking.9#3 integrate .. //depot/projects/opentoe/share/misc/bsd-family-tree#3 integrate .. //depot/projects/opentoe/share/mk/Makefile#3 integrate .. //depot/projects/opentoe/share/mk/bsd.port.options.mk#1 branch .. //depot/projects/opentoe/share/mk/bsd.sys.mk#3 integrate .. //depot/projects/opentoe/share/skel/dot.cshrc#2 integrate .. //depot/projects/opentoe/share/skel/dot.profile#2 integrate .. //depot/projects/opentoe/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/opentoe/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/opentoe/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/opentoe/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/opentoe/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/opentoe/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/opentoe/sys/arm/arm/intr.c#2 integrate .. //depot/projects/opentoe/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/opentoe/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/opentoe/sys/coda/coda_vnops.c#3 integrate .. //depot/projects/opentoe/sys/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/opentoe/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/opentoe/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/opentoe/sys/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/opentoe/sys/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/opentoe/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/opentoe/sys/conf/Makefile.ia64#3 integrate .. //depot/projects/opentoe/sys/conf/files#8 integrate .. //depot/projects/opentoe/sys/conf/options#7 integrate .. //depot/projects/opentoe/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/opentoe/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/opentoe/sys/dev/acpica/acpi_ec.c#5 integrate .. //depot/projects/opentoe/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/opentoe/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/opentoe/sys/dev/cxgb/cxgb_main.c#11 integrate .. //depot/projects/opentoe/sys/dev/em/README#3 integrate .. //depot/projects/opentoe/sys/dev/em/if_em.c#3 integrate .. //depot/projects/opentoe/sys/dev/md/md.c#2 integrate .. //depot/projects/opentoe/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/opentoe/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/opentoe/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/opentoe/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/opentoe/sys/dev/mpt/mpilib/mpi_log_fc.h#2 delete .. //depot/projects/opentoe/sys/dev/mpt/mpilib/mpi_log_sas.h#2 delete .. //depot/projects/opentoe/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/opentoe/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/opentoe/sys/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/opentoe/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/opentoe/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/opentoe/sys/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/opentoe/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/opentoe/sys/dev/pccard/pccardvarp.h#2 integrate .. //depot/projects/opentoe/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/opentoe/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/opentoe/sys/dev/sound/clone.c#1 branch .. //depot/projects/opentoe/sys/dev/sound/clone.h#1 branch .. //depot/projects/opentoe/sys/dev/sound/pci/envy24ht.c#6 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/opentoe/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/ac97.c#5 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/buffer.c#4 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/channel.h#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/feeder_fmt.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/vchan.c#3 integrate .. //depot/projects/opentoe/sys/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/opentoe/sys/dev/sound/unit.c#1 branch .. //depot/projects/opentoe/sys/dev/sound/unit.h#1 branch .. //depot/projects/opentoe/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/opentoe/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/opentoe/sys/dev/sound/version.h#1 branch .. //depot/projects/opentoe/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/opentoe/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/opentoe/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/opentoe/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/opentoe/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/opentoe/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/opentoe/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/opentoe/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/opentoe/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/opentoe/sys/gnu/fs/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/opentoe/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/opentoe/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/opentoe/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/opentoe/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/opentoe/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/opentoe/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/opentoe/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/opentoe/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/opentoe/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/opentoe/sys/kern/init_main.c#4 integrate .. //depot/projects/opentoe/sys/kern/kern_acct.c#3 integrate .. //depot/projects/opentoe/sys/kern/kern_alq.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_clock.c#4 integrate .. //depot/projects/opentoe/sys/kern/kern_conf.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/opentoe/sys/kern/kern_exec.c#4 integrate .. //depot/projects/opentoe/sys/kern/kern_exit.c#4 integrate .. //depot/projects/opentoe/sys/kern/kern_fork.c#4 integrate .. //depot/projects/opentoe/sys/kern/kern_intr.c#4 integrate .. //depot/projects/opentoe/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/opentoe/sys/kern/kern_linker.c#3 integrate .. //depot/projects/opentoe/sys/kern/kern_malloc.c#5 integrate .. //depot/projects/opentoe/sys/kern/kern_mib.c#5 integrate .. //depot/projects/opentoe/sys/kern/kern_proc.c#3 integrate .. //depot/projects/opentoe/sys/kern/kern_resource.c#4 integrate .. //depot/projects/opentoe/sys/kern/kern_sig.c#4 integrate .. //depot/projects/opentoe/sys/kern/kern_sx.c#7 integrate .. //depot/projects/opentoe/sys/kern/kern_synch.c#4 integrate .. //depot/projects/opentoe/sys/kern/kern_thread.c#4 integrate .. //depot/projects/opentoe/sys/kern/link_elf.c#2 integrate .. //depot/projects/opentoe/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/opentoe/sys/kern/subr_lock.c#7 integrate .. //depot/projects/opentoe/sys/kern/subr_trap.c#3 integrate .. //depot/projects/opentoe/sys/kern/tty_cons.c#2 integrate .. //depot/projects/opentoe/sys/kern/uipc_sockbuf.c#5 integrate .. //depot/projects/opentoe/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/opentoe/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/opentoe/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/opentoe/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/opentoe/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/opentoe/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/opentoe/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/opentoe/sys/kern/vnode_if.src#3 integrate .. //depot/projects/opentoe/sys/modules/dcons/Makefile#2 integrate .. //depot/projects/opentoe/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/opentoe/sys/net/if_bridge.c#3 integrate .. //depot/projects/opentoe/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/opentoe/sys/netinet/sctp_bsd_addr.c#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/opentoe/sys/netinet/sctp_indata.c#10 integrate .. //depot/projects/opentoe/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/opentoe/sys/netinet/sctp_input.h#3 integrate .. //depot/projects/opentoe/sys/netinet/sctp_os_bsd.h#7 integrate .. //depot/projects/opentoe/sys/netinet/sctp_output.c#10 integrate .. //depot/projects/opentoe/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/opentoe/sys/netinet/sctp_pcb.c#10 integrate .. //depot/projects/opentoe/sys/netinet/sctp_pcb.h#8 integrate .. //depot/projects/opentoe/sys/netinet/sctp_structs.h#9 integrate .. //depot/projects/opentoe/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/opentoe/sys/netinet/sctp_usrreq.c#10 integrate .. //depot/projects/opentoe/sys/netinet/sctputil.c#10 integrate .. //depot/projects/opentoe/sys/netinet/sctputil.h#8 integrate .. //depot/projects/opentoe/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/opentoe/sys/netinet6/in6.c#3 integrate .. //depot/projects/opentoe/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/opentoe/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/opentoe/sys/netinet6/sctp6_usrreq.c#8 integrate .. //depot/projects/opentoe/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/opentoe/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/opentoe/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/opentoe/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/opentoe/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/opentoe/sys/powerpc/powerpc/machdep.c#4 integrate .. //depot/projects/opentoe/sys/security/audit/audit.c#4 integrate .. //depot/projects/opentoe/sys/security/audit/audit.h#3 integrate .. //depot/projects/opentoe/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/opentoe/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/opentoe/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/opentoe/sys/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/opentoe/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/opentoe/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/opentoe/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/opentoe/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/opentoe/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/opentoe/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/opentoe/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/opentoe/sys/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/opentoe/sys/sun4v/include/vmparam.h#4 integrate .. //depot/projects/opentoe/sys/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/projects/opentoe/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/opentoe/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/opentoe/sys/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/opentoe/sys/sun4v/sun4v/tte_hash.c#3 integrate .. //depot/projects/opentoe/sys/sys/conf.h#2 integrate .. //depot/projects/opentoe/sys/sys/filedesc.h#4 integrate .. //depot/projects/opentoe/sys/sys/proc.h#5 integrate .. //depot/projects/opentoe/sys/sys/resource.h#2 integrate .. //depot/projects/opentoe/sys/sys/resourcevar.h#2 integrate .. //depot/projects/opentoe/sys/sys/sx.h#6 integrate .. //depot/projects/opentoe/sys/sys/vmmeter.h#3 integrate .. //depot/projects/opentoe/sys/sys/vnode.h#5 integrate .. //depot/projects/opentoe/sys/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/opentoe/sys/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/opentoe/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/opentoe/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/opentoe/sys/vm/swap_pager.c#4 integrate .. //depot/projects/opentoe/sys/vm/uma_core.c#3 integrate .. //depot/projects/opentoe/sys/vm/vm_contig.c#4 integrate .. //depot/projects/opentoe/sys/vm/vm_fault.c#5 integrate .. //depot/projects/opentoe/sys/vm/vm_glue.c#3 integrate .. //depot/projects/opentoe/sys/vm/vm_map.c#5 integrate .. //depot/projects/opentoe/sys/vm/vm_meter.c#3 integrate .. //depot/projects/opentoe/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/opentoe/sys/vm/vm_object.c#4 integrate .. //depot/projects/opentoe/sys/vm/vm_page.c#3 integrate .. //depot/projects/opentoe/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/opentoe/sys/vm/vm_pageq.c#3 integrate .. //depot/projects/opentoe/sys/vm/vm_zeroidle.c#3 integrate .. //depot/projects/opentoe/sys/vm/vnode_pager.c#3 integrate .. //depot/projects/opentoe/tools/regression/usr.bin/lastcomm/README#2 integrate .. //depot/projects/opentoe/tools/regression/usr.bin/lastcomm/v1-sparc64.out#1 branch .. //depot/projects/opentoe/tools/regression/usr.bin/lastcomm/v2-sparc64.out#1 branch .. //depot/projects/opentoe/tools/regression/usr.sbin/sa/v1-sparc64-sav.in#1 branch .. //depot/projects/opentoe/tools/regression/usr.sbin/sa/v1-sparc64-sav.out#1 branch .. //depot/projects/opentoe/tools/regression/usr.sbin/sa/v1-sparc64-u.out#1 branch .. //depot/projects/opentoe/tools/regression/usr.sbin/sa/v1-sparc64-usr.in#1 branch .. //depot/projects/opentoe/tools/regression/usr.sbin/sa/v1-sparc64-usr.out#1 branch .. //depot/projects/opentoe/tools/regression/usr.sbin/sa/v2-sparc64-sav.in#1 branch .. //depot/projects/opentoe/tools/regression/usr.sbin/sa/v2-sparc64-u.out#1 branch .. //depot/projects/opentoe/tools/regression/usr.sbin/sa/v2-sparc64-usr.in#1 branch .. //depot/projects/opentoe/usr.bin/file/config.h#2 integrate .. //depot/projects/opentoe/usr.bin/file/file.1#2 integrate .. //depot/projects/opentoe/usr.bin/file/magic.5#2 integrate .. //depot/projects/opentoe/usr.bin/gzip/gzip.1#2 integrate .. //depot/projects/opentoe/usr.bin/gzip/gzip.c#2 integrate .. //depot/projects/opentoe/usr.bin/less/lesspipe.sh#2 integrate .. //depot/projects/opentoe/usr.bin/make/main.c#3 integrate .. //depot/projects/opentoe/usr.bin/tar/Makefile#4 integrate .. //depot/projects/opentoe/usr.bin/tar/bsdtar.1#3 integrate .. //depot/projects/opentoe/usr.bin/tar/bsdtar.c#3 integrate .. //depot/projects/opentoe/usr.bin/tar/bsdtar.h#2 integrate .. //depot/projects/opentoe/usr.bin/tar/read.c#4 integrate .. //depot/projects/opentoe/usr.bin/tar/write.c#6 integrate .. //depot/projects/opentoe/usr.sbin/dconschat/dconschat.c#2 integrate .. //depot/projects/opentoe/usr.sbin/ppp/command.c#2 integrate .. //depot/projects/opentoe/usr.sbin/ppp/ppp.8.m4#2 integrate .. //depot/projects/opentoe/usr.sbin/ppp/radius.c#2 integrate .. //depot/projects/opentoe/usr.sbin/ppp/radius.h#2 integrate Differences ... ==== //depot/projects/opentoe/Makefile.inc1#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.581 2007/05/19 20:34:29 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.582 2007/05/26 20:17:19 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -309,7 +309,7 @@ rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/c++/3.4 usr/include/sys usr/lib \ + usr/bin usr/games usr/include/sys usr/lib \ usr/libexec usr/sbin usr/share/dict \ usr/share/groff_font/devX100 \ usr/share/groff_font/devX100-12 \ @@ -505,7 +505,7 @@ # and Makefile.inc1 causes the correct PATH to be used, rather than a # modification of the current environment's PATH. In addition, we need # to quote multiword values. -# +# buildenvvars: @echo ${WMAKEENV:Q} @@ -1113,7 +1113,7 @@ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install -_prereq_libs: ${_prereq_libs:S/$/__PL/} +_prereq_libs: ${_prereq_libs:S/$/__PL/} _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} ==== //depot/projects/opentoe/UPDATING#8 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20070529: + The ether_ioctl() function has been synchronized with ioctl(2) + and ifnet.if_ioctl. Due to that, the size of one of its arguments + has changed on 64-bit architectures. All kernel modules using + ether_ioctl() need to be rebuilt on such architectures. + 20070516: Improved INCLUDE_CONFIG_FILE support has been introduced to the config(8) utility. In order to take advantage of this new @@ -795,4 +801,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.491 2007/05/16 17:23:53 wkoszek Exp $ +$FreeBSD: src/UPDATING,v 1.492 2007/05/29 12:40:45 yar Exp $ ==== //depot/projects/opentoe/bin/chflags/chflags.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.28 2006/03/10 12:37:19 trhodes Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -66,7 +66,7 @@ If the .Ar file is a symbolic link, -change the mode of the link itself rather than the file to which it points. +change the file flags of the link itself rather than the file to which it points. .It Fl L If the .Fl R ==== //depot/projects/opentoe/bin/pax/ar_io.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.26 2005/03/12 06:38:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.28 2007/05/25 17:53:37 brian Exp $"); #include #include @@ -1109,8 +1109,8 @@ int ar_next(void) { + static char *arcbuf; char buf[PAXPATHLEN+2]; - static int freeit = 0; sigset_t o_mask; /* @@ -1228,17 +1228,14 @@ * try to open new archive */ if (ar_open(buf) >= 0) { - if (freeit) { - (void)free((char *)(uintptr_t)arcname); - freeit = 0; - } - if ((arcname = strdup(buf)) == NULL) { + free(arcbuf); + if ((arcbuf = strdup(buf)) == NULL) { done = 1; lstrval = -1; paxwarn(0, "Cannot save archive name."); return(-1); } - freeit = 1; + arcname = arcbuf; break; } tty_prnt("Cannot open %s, try again\n", buf); ==== //depot/projects/opentoe/bin/pax/file_subs.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.21 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.22 2007/05/24 06:44:37 rse Exp $"); #include #include @@ -284,7 +284,7 @@ */ if ((to_sb->st_dev==sb.st_dev)&&(to_sb->st_ino == sb.st_ino)) { paxwarn(1, "Unable to link file %s to itself", to); - return(-1);; + return(-1); } /* ==== //depot/projects/opentoe/bin/pax/pat_rep.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.25 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.27 2007/05/25 17:53:37 brian Exp $"); #include #include @@ -140,7 +140,7 @@ regerror(res, &(rep->rcmp), rebuf, sizeof(rebuf)); paxwarn(1, "%s while compiling regular expression %s", rebuf, str); # endif - (void)free((char *)rep); + free(rep); return(-1); } @@ -152,11 +152,11 @@ *pt1++ = *str; if ((pt2 = strchr(pt1, *str)) == NULL) { # ifdef NET2_REGEX - (void)free((char *)rep->rcmp); + free(rep->rcmp); # else - regfree(&(rep->rcmp)); + regfree(&rep->rcmp); # endif - (void)free((char *)rep); + free(rep); paxwarn(1, "Invalid replacement string %s", str); return(-1); } @@ -181,11 +181,11 @@ break; default: # ifdef NET2_REGEX - (void)free((char *)rep->rcmp); + free(rep->rcmp); # else - regfree(&(rep->rcmp)); + regfree(&rep->rcmp); # endif - (void)free((char *)rep); + free(rep); *pt1 = *str; paxwarn(1, "Invalid replacement string option %s", str); return(-1); @@ -401,7 +401,7 @@ return(-1); } *ppt = pt->fow; - (void)free((char *)pt); + free(pt); arcn->pat = NULL; return(0); } ==== //depot/projects/opentoe/bin/pax/sel_subs.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.19 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.21 2007/05/25 17:53:38 brian Exp $"); #include #include @@ -412,7 +412,7 @@ */ if (str_sec(str, &(pt->low_time)) < 0) { paxwarn(1, "Illegal lower time range %s", str); - (void)free((char *)pt); + free(pt); goto out; } pt->flgs |= HASLOW; @@ -424,7 +424,7 @@ */ if (str_sec(up_pt, &(pt->high_time)) < 0) { paxwarn(1, "Illegal upper time range %s", up_pt); - (void)free((char *)pt); + free(pt); goto out; } pt->flgs |= HASHIGH; @@ -436,7 +436,7 @@ if (pt->low_time > pt->high_time) { paxwarn(1, "Upper %s and lower %s time overlap", up_pt, str); - (void)free((char *)pt); + free(pt); return(-1); } } ==== //depot/projects/opentoe/bin/pax/tables.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.22 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.24 2007/05/25 17:53:38 brian Exp $"); #include #include @@ -178,8 +178,8 @@ */ if (--pt->nlink <= 1) { *ppt = pt->fow; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); } return(1); } @@ -198,7 +198,7 @@ ltab[indx] = pt; return(0); } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Hard link table out of memory"); @@ -254,8 +254,8 @@ * remove and free it */ *ppt = pt->fow; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); } /* @@ -288,8 +288,8 @@ while (pt != NULL) { ppt = pt; pt = ppt->fow; - (void)free((char *)ppt->name); - (void)free((char *)ppt); + free(ppt->name); + free(ppt); } } return; @@ -460,7 +460,7 @@ paxwarn(1, "File time table ran out of memory"); if (pt != NULL) - (void)free((char *)pt); + free(pt); return(-1); } @@ -538,7 +538,7 @@ if (strcmp(nname, pt->nname) == 0) return(0); - (void)free((char *)pt->nname); + free(pt->nname); if ((pt->nname = strdup(nname)) == NULL) { paxwarn(1, "Cannot update rename table"); return(-1); @@ -557,9 +557,9 @@ ntab[indx] = pt; return(0); } - (void)free((char *)pt->oname); + free(pt->oname); } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Interactive rename table out of memory"); return(-1); @@ -994,7 +994,7 @@ atab[indx] = pt; return; } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Directory access time reset table ran out of memory"); @@ -1051,8 +1051,8 @@ *ppt = pt->fow; *mtime = pt->mtime; *atime = pt->atime; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); return(0); } ==== //depot/projects/opentoe/contrib/file/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,194 @@ +2007-05-24 10:00 Christos Zoulas + + * Fix another integer overflow (Colin Percival) + +2007-03-26 13:58 Christos Zoulas + + * make sure that all of struct magic_set is initialized appropriately + (Brett) + +2007-03-25 17:44 Christos Zoulas + + * reset left bytes in the buffer (Dmitry V. Levin) + + * compilation failed with COMPILE_ONLY and ENABLE_CONDITIONALS + (Peter Avalos) + +2007-03-15 10:51 Christos Zoulas + + * fix fortran and nroff reversed tests (Dmitry V. Levin) + + * fix exclude option (Dmitry V. Levin) + +2007-02-08 17:30 Christos Zoulas + + * fix integer underflow in file_printf which can lead to + to exploitable heap overflow (Jean-Sebastien Guay-Lero) + +2007-02-05 11:35 Christos Zoulas + + * make socket/pipe reading more robust + +2007-01-25 16:01 Christos Zoulas + + * Centralize all the tests in file_buffer. + + * Add exclude flag. + +2007-01-18 05:29 Anon Ymous + + * Move the "type" detection code from parse() into its own table + driven routine. This avoids maintaining multiple lists in + file.h. + + * Add an optional conditional field (ust before the type field). + This code is wrapped in "#ifdef ENABLE_CONDITIONALS" as it is + likely to go away. + +2007-01-16 23:24 Anon Ymous + + * Fix an initialization bug in check_mem(). + +2007-01-16 14:58 Anon Ymous + + * Add a "default" type to print a message if nothing previously + matched at that level or since the last default at that + level. This is useful for setting up switch-like statements. + It can also be used to do if/else constructions without a + redundant second test. + + * Fix the "x" special case test so that one can test for that + string with "=x". + + * Allow "search" to search the entire buffer if the "/N" + search count is missing. + + * Make "regex" work! It now starts its search at the + specified offset and takes an (optional) "/N" line count to + specify the search range; otherwise it searches to the end + of the file. The match is now grabbed correctly for format + strings and the offset set to the end of the match. + + * Add a "/s" flag to "regex" and "search" to set the offset to + the start of the match. By default the offset is set to the + end of the match, as it is with other tests. This is mostly + useful for "regex". + + * Make "search", "string" and "pstring" use the same + file_strncmp() routine so that they support the same flags; + "bestring16" and "lestring16" call the same routine, but + with flags = 0. Also add a "/C" flag (in analogy to "/c") + to ignore the case on uppercase (lowercase) characters in + the test string. + + * Strict adherence to C style string escapes. A warnings are + printed when compiling. Note: previously "\a" was + incorrectly translated to 'a' instead of an (i.e., + BELL, typically 0x07). + + * Make this compile with "-Wall -Wextra" and all the warning + flags used with WARNS=4 in the NetBSD source. Also make it + pass lint. + + * Many "cleanups" and hopefully not too many new bugs! + +2007-01-16 14:56 Anon Ymous + + * make several more files compile with gcc warnings + on and also make them pass lint. + +2007-01-16 14:54 Anon Ymous + + * fix a puts()/putc() usage goof in file.c + + * make file.c compile with gcc warnings and pass lint + +2006-12-11 16:49 Christos Zoulas + + * fix byteswapping issue + + * report the number of bytes we tried to + allocate when allocation fails + + * add a few missed cases in the strength routine + +2006-12-08 16:32 Christos Zoulas + + * store and print the line number of the magic + entry for debugging. + + * if the magic entry did not print anything, + don't treat it as a match + + * change the magic strength algorithm to take + into account the relationship op. + + * fix a bug in search where we could accidentally + return a match. + + * propagate the error return from match to + file_softmagic. + +2006-11-25 13:35 Christos Zoulas + + * Don't store the current offset in the magic + struct, because it needs to be restored and + it was not done properly all the time. Bug + found by: Arkadiusz Miskiewicz + + * Fix problem in the '\0' separator; and don't + print it as an additional separator; print + it as the only separator. + +2006-11-17 10:51 Christos Zoulas + + * Added a -0 option to print a '\0' separator + Etienne Buira + +2006-10-31 15:14 Christos Zoulas + + * Check offset before copying (Mike Frysinger) + + * merge duplicated code + + * add quad date support + + * make sure that we nul terminate desc (Ryoji Kanai) + + * don't process elf notes multiple times + + * allow -z to report empty compressed files + + * use calloc to initialize the ascii buffers (Jos van den Oever) + +2006-06-08 11:11 Christos Zoulas + + * QNX fixes (Mike Gorchak) + + * Add quad support. + + * FIFO checks (Dr. Werner Fink) + + * Linux ELF fixes (Dr. Werner Fink) + + * Magic format checks (Dr. Werner Fink) + + * Magic format function improvent (Karl Chen) + +2006-05-03 11:11 Christos Zoulas + + * Pick up some elf changes and some constant fixes from SUSE + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 4 04:57:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DF6816A469; Mon, 4 Jun 2007 04:57:24 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0C8C916A400 for ; Mon, 4 Jun 2007 04:57:24 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DA3CA13C44C for ; Mon, 4 Jun 2007 04:57:23 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l544vN9x014452 for ; Mon, 4 Jun 2007 04:57:23 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l544vNUw014446 for perforce@freebsd.org; Mon, 4 Jun 2007 04:57:23 GMT (envelope-from thompsa@freebsd.org) Date: Mon, 4 Jun 2007 04:57:23 GMT Message-Id: <200706040457.l544vNUw014446@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120874 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, 04 Jun 2007 04:57:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=120874 Change 120874 by thompsa@thompsa_heff on 2007/06/04 04:57:22 Remove check for state > INIT before scanning, ieee80211_init will not put us into SCAN if IEEE80211_ROAMING_MANUAL is set. Fixes one failure of WPA. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#40 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#40 (text+ko) ==== @@ -3537,9 +3537,6 @@ msleep(sc, &sc->sc_mtx, 0, "iwicmd", hz/10); } - if (ic->ic_state == IEEE80211_S_INIT) - goto done; - switch (cmd) { case IWI_ASSOC: iwi_auth_and_assoc(sc); From owner-p4-projects@FreeBSD.ORG Mon Jun 4 06:53:48 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EBA716A468; Mon, 4 Jun 2007 06:53:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 D284716A41F for ; Mon, 4 Jun 2007 06:53:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C385E13C4BB for ; Mon, 4 Jun 2007 06:53:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l546rlqq021827 for ; Mon, 4 Jun 2007 06:53:47 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l546rlT5021821 for perforce@freebsd.org; Mon, 4 Jun 2007 06:53:47 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 4 Jun 2007 06:53:47 GMT Message-Id: <200706040653.l546rlT5021821@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120879 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, 04 Jun 2007 06:53:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=120879 Change 120879 by hselasky@hselasky_mini_itx on 2007/06/04 06:53:08 Finished converting uipaq to new USB stack. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uipaq.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uipaq.c#3 (text+ko) ==== @@ -54,317 +54,451 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include #include -#include +#include +#include -#include /*UCDC_* stuff */ +#include -#include -#include #include "usbdevs.h" -#include - -#ifdef UIPAQ_DEBUG -#define DPRINTF(x) if (uipaqdebug) printf x -#define DPRINTFN(n,x) if (uipaqdebug>(n)) printf x -int uipaqdebug = 0; -#else -#define DPRINTF(x) -#define DPRINTFN(n,x) -#endif - #define UIPAQ_CONFIG_NO 1 #define UIPAQ_IFACE_INDEX 0 -#define UIPAQIBUFSIZE 1024 -#define UIPAQOBUFSIZE 1024 +#define UIPAQ_BUF_SIZE 1024 +#define UIPAQ_N_DATA_TRANSFER 4 + +#define DPRINTF(...) do { } while (0) struct uipaq_softc { - struct ucom_softc sc_ucom; - u_int16_t sc_lcr; /* state for DTR/RTS */ - u_int16_t sc_flags; + struct ucom_super_softc sc_super_ucom; + struct ucom_softc sc_ucom; + + struct usbd_xfer *sc_xfer_data[UIPAQ_N_DATA_TRANSFER]; + struct usbd_device *sc_udev; + + uint16_t sc_line; + uint8_t sc_lsr; /* local status register */ + uint8_t sc_msr; /* modem status register */ + uint8_t sc_flag; +#define UIPAQ_FLAG_READ_STALL 0x01 +#define UIPAQ_FLAG_WRITE_STALL 0x02 +#define UIPAQ_FLAG_INTR_STALL 0x04 }; -/* Callback routines */ -static void uipaq_set(void *, int, int, int); +static device_probe_t uipaq_probe; +static device_attach_t uipaq_attach; +static device_detach_t uipaq_detach; + +static usbd_callback_t uipaq_write_callback; +static usbd_callback_t uipaq_read_callback; +static usbd_callback_t uipaq_write_clear_stall_callback; +static usbd_callback_t uipaq_read_clear_stall_callback; + +static void uipaq_start_read(struct ucom_softc *ucom); +static void uipaq_stop_read(struct ucom_softc *ucom); +static void uipaq_start_write(struct ucom_softc *ucom); +static void uipaq_stop_write(struct ucom_softc *ucom); +static void uipaq_cfg_do_request(struct uipaq_softc *sc, usb_device_request_t *req, void *data); +static void uipaq_cfg_set_dtr(struct ucom_softc *ucom, uint8_t onoff); +static void uipaq_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff); +static void uipaq_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff); + +static const struct usbd_config uipaq_config_data[UIPAQ_N_DATA_TRANSFER] = { + + [0] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_OUT, + .bufsize = UIPAQ_BUF_SIZE, + .flags = 0, + .callback = &uipaq_write_callback, + }, + + [1] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .bufsize = UIPAQ_BUF_SIZE, + .flags = USBD_SHORT_XFER_OK, + .callback = &uipaq_read_callback, + }, -/* Support routines. */ -/* based on uppc module by Sam Lawrance */ -static void uipaq_dtr(struct uipaq_softc *sc, int onoff); -static void uipaq_rts(struct uipaq_softc *sc, int onoff); -static void uipaq_break(struct uipaq_softc* sc, int onoff); + [2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &uipaq_write_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, -int uipaq_detach(device_t self); + [3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .callback = &uipaq_read_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, +}; -struct ucom_callback uipaq_callback = { - NULL, - uipaq_set, - NULL, - NULL, - NULL, /*open*/ - NULL, /*close*/ - NULL, - NULL +static const struct ucom_callback uipaq_callback = { + .ucom_cfg_set_dtr = &uipaq_cfg_set_dtr, + .ucom_cfg_set_rts = &uipaq_cfg_set_rts, + .ucom_cfg_set_break = &uipaq_cfg_set_break, + .ucom_start_read = &uipaq_start_read, + .ucom_stop_read = &uipaq_stop_read, + .ucom_start_write = &uipaq_start_write, + .ucom_stop_write = &uipaq_stop_write, }; -struct uipaq_type { - struct usb_devno uv_dev; - u_int16_t uv_flags; +static const struct usb_devno uipaq_devs[] = { + { USB_VENDOR_HP, USB_PRODUCT_HP_2215 }, + { USB_VENDOR_HP, USB_PRODUCT_HP_568J }, + { USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC }, + { USB_VENDOR_CASIO, USB_PRODUCT_CASIO_BE300 }, + { USB_VENDOR_SHARP, USB_PRODUCT_SHARP_WZERO3ES }, }; -static const struct uipaq_type uipaq_devs[] = { - {{ USB_VENDOR_HP, USB_PRODUCT_HP_2215 }, 0 }, - {{ USB_VENDOR_HP, USB_PRODUCT_HP_568J }, 0}, - {{ USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC } , 0}, - {{ USB_VENDOR_CASIO, USB_PRODUCT_CASIO_BE300 } , 0}, - {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_WZERO3ES }, 0}, +#define uipaq_lookup(v, p) ((const void *)usb_lookup(uipaq_devs, v, p)) + +static device_method_t uipaq_methods[] = { + DEVMETHOD(device_probe, uipaq_probe), + DEVMETHOD(device_attach, uipaq_attach), + DEVMETHOD(device_detach, uipaq_detach), + { 0, 0 } }; -#define uipaq_lookup(v, p) ((const struct uipaq_type *)usb_lookup(uipaq_devs, v, p)) +static devclass_t uipaq_devclass; -USB_MATCH(uipaq) -{ - USB_MATCH_START(uipaq, uaa); +static driver_t uipaq_driver = { + .name = "uipaq", + .methods = uipaq_methods, + .size = sizeof(struct uipaq_softc), +}; - if (uaa->iface != NULL) - return (UMATCH_NONE); +DRIVER_MODULE(uipaq, uhub, uipaq_driver, uipaq_devclass, usbd_driver_load, 0); +MODULE_DEPEND(uipaq, usb, 1, 1, 1); +MODULE_DEPEND(uipaq, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); - DPRINTFN(20,("uipaq: vendor=0x%x, product=0x%x\n", - uaa->vendor, uaa->product)); +static int +uipaq_probe(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + const struct usb_devno *up; - return (uipaq_lookup(uaa->vendor, uaa->product) != NULL ? - UMATCH_VENDOR_PRODUCT : UMATCH_NONE); + if (uaa->iface == NULL) { + up = uipaq_lookup(uaa->vendor, uaa->product); + if (up) { + return UMATCH_VENDOR_PRODUCT; + } + } + return UMATCH_NONE; } static int -uipaq_attach(device_t self) +uipaq_attach(device_t dev) { - struct uipaq_softc *sc = device_get_softc(self); - struct usb_attach_arg *uaa = device_get_ivars(self); - usbd_device_handle dev = uaa->device; - usbd_interface_handle iface; - usb_interface_descriptor_t *id; - usb_endpoint_descriptor_t *ed; - char *devinfop; - int i; - usbd_status err; - struct ucom_softc *ucom = &sc->sc_ucom; + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct uipaq_softc *sc = device_get_softc(dev); + int error; + + if (sc == NULL) { + return ENOMEM; + } + + sc->sc_udev = uaa->device; - ucom->sc_dev = self; - ucom->sc_udev = dev; + usbd_set_desc(dev, uaa->device); - DPRINTFN(10,("\nuipaq_attach: sc=%p\n", sc)); + error = usbd_set_config_no(uaa->device, UIPAQ_CONFIG_NO, 1); - /* Move the device into the configured state. */ - err = usbd_set_config_no(dev, UIPAQ_CONFIG_NO, 1); - if (err) { - device_printf(ucom->sc_dev, - "failed to set configuration: %s\n", usbd_errstr(err)); - goto bad; + if (error) { + device_printf(dev, "setting config " + "number failed!\n"); + goto detach; } - err = usbd_device2interface_handle(dev, UIPAQ_IFACE_INDEX, &iface); - if (err) { - device_printf(ucom->sc_dev, "failed to get interface: %s\n", - usbd_errstr(err)); - goto bad; + error = usbd_transfer_setup(uaa->device, UIPAQ_IFACE_INDEX, + sc->sc_xfer_data, uipaq_config_data, + UIPAQ_N_DATA_TRANSFER, + sc, &Giant); + if (error) { + goto detach; } - devinfop = malloc (1024, M_USBDEV, M_WAITOK); - if (devinfop == NULL) { - err = ENOMEM; - goto bad; + /* clear stall at first run */ + sc->sc_flag |= (UIPAQ_FLAG_READ_STALL| + UIPAQ_FLAG_WRITE_STALL); + + error = ucom_attach(&(sc->sc_super_ucom), &(sc->sc_ucom), 1, sc, + &uipaq_callback, &Giant); + if (error) { + goto detach; } - usbd_devinfo(dev, 0, devinfop); - ucom->sc_dev = self; - device_set_desc_copy(self, devinfop); - device_printf(ucom->sc_dev, "%s\n", devinfop); - free(devinfop, M_USBDEV); + + return 0; + + detach: + uipaq_detach(dev); + return ENXIO; +} + +int +uipaq_detach(device_t dev) +{ + struct uipaq_softc *sc = device_get_softc(dev); + + ucom_detach(&(sc->sc_super_ucom), &(sc->sc_ucom), 1); + + usbd_transfer_unsetup(sc->sc_xfer_data, UIPAQ_N_DATA_TRANSFER); + + return 0; +} + +static void +uipaq_start_read(struct ucom_softc *ucom) +{ + struct uipaq_softc *sc = ucom->sc_parent; + /* start read endpoint */ + usbd_transfer_start(sc->sc_xfer_data[1]); + return; +} + +static void +uipaq_stop_read(struct ucom_softc *ucom) +{ + struct uipaq_softc *sc = ucom->sc_parent; + /* stop read endpoint */ + usbd_transfer_stop(sc->sc_xfer_data[3]); + usbd_transfer_stop(sc->sc_xfer_data[1]); + return; +} + +static void +uipaq_start_write(struct ucom_softc *ucom) +{ + struct uipaq_softc *sc = ucom->sc_parent; + usbd_transfer_start(sc->sc_xfer_data[0]); + return; +} + +static void +uipaq_stop_write(struct ucom_softc *ucom) +{ + struct uipaq_softc *sc = ucom->sc_parent; + usbd_transfer_stop(sc->sc_xfer_data[2]); + usbd_transfer_stop(sc->sc_xfer_data[0]); + return; +} + +static void +uipaq_cfg_do_request(struct uipaq_softc *sc, usb_device_request_t *req, + void *data) +{ + uint16_t length; + usbd_status err; - sc->sc_flags = uipaq_lookup(uaa->vendor, uaa->product)->uv_flags; - id = usbd_get_interface_descriptor(iface); - ucom->sc_iface = iface; - ucom->sc_ibufsize = UIPAQIBUFSIZE; - ucom->sc_obufsize = UIPAQOBUFSIZE; - ucom->sc_ibufsizepad = UIPAQIBUFSIZE; - ucom->sc_opkthdrlen = 0; - ucom->sc_callback = &uipaq_callback; - ucom->sc_parent = sc; - ucom->sc_bulkin_no = ucom->sc_bulkout_no = -1; - for (i=0; ibNumEndpoints; i++) { - ed = usbd_interface2endpoint_descriptor(iface, i); - if (ed == NULL) { - device_printf(ucom->sc_dev, - "no endpoint descriptor for %d\n", i); - goto bad; - } - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && - (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) { - ucom->sc_bulkin_no = ed->bEndpointAddress; - } else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT && - (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) { - ucom->sc_bulkout_no = ed->bEndpointAddress; - } + if (ucom_cfg_is_gone(&(sc->sc_ucom))) { + goto error; } - if (ucom->sc_bulkin_no == -1 || ucom->sc_bulkout_no == -1) { - device_printf(ucom->sc_dev, - "no proper endpoints found (%d,%d)\n", - ucom->sc_bulkin_no, ucom->sc_bulkout_no); - return (ENXIO); + + err = usbd_do_request_flags_mtx(sc->sc_udev, &Giant, req, + data, 0, NULL, 1000); + + if (err) { + + DPRINTF(-1, "device request failed, err=%s " + "(ignored)\n", usbd_errstr(err)); + + error: + length = UGETW(req->wLength); + + if ((req->bmRequestType & UT_READ) && length) { + bzero(data, length); + } } - - ucom_attach(&sc->sc_ucom); - return (0); -bad: - DPRINTF(("uipaq_attach: ATTACH ERROR\n")); - ucom->sc_dying = 1; - return (ENXIO); + return; } -void -uipaq_dtr(struct uipaq_softc* sc, int onoff) +static void +uipaq_cfg_set_dtr(struct ucom_softc *ucom, uint8_t onoff) { + struct uipaq_softc *sc = ucom->sc_parent; usb_device_request_t req; - struct ucom_softc *ucom = &sc->sc_ucom; - usbd_status err; - int retries = 3; - DPRINTF(("%s: uipaq_dtr: onoff=%x\n", device_get_nameunit(ucom->sc_dev), onoff)); + DPRINTF(0, "onoff=%d\n", onoff); - /* Avoid sending unnecessary requests */ - if (onoff && (sc->sc_lcr & UCDC_LINE_DTR)) - return; - if (!onoff && !(sc->sc_lcr & UCDC_LINE_DTR)) - return; + if (onoff) + sc->sc_line |= UCDC_LINE_DTR; + else + sc->sc_line &= ~UCDC_LINE_DTR; - /* Other parameters depend on reg */ req.bmRequestType = UT_WRITE_CLASS_INTERFACE; req.bRequest = UCDC_SET_CONTROL_LINE_STATE; - sc->sc_lcr = onoff ? sc->sc_lcr | UCDC_LINE_DTR : sc->sc_lcr & ~UCDC_LINE_DTR; - USETW(req.wValue, sc->sc_lcr); - USETW(req.wIndex, 0x0); + USETW(req.wValue, sc->sc_line); + req.wIndex[0] = UIPAQ_IFACE_INDEX; + req.wIndex[1] = 0; USETW(req.wLength, 0); - /* Fire off the request a few times if necessary */ - while (retries) { - err = usbd_do_request(ucom->sc_udev, &req, NULL); - if (!err) - break; - retries--; - } + uipaq_cfg_do_request(sc, &req, NULL); + return; } -void -uipaq_rts(struct uipaq_softc* sc, int onoff) +static void +uipaq_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff) { + struct uipaq_softc *sc = ucom->sc_parent; usb_device_request_t req; - struct ucom_softc *ucom = &sc->sc_ucom; - usbd_status err; - int retries = 3; - DPRINTF(("%s: uipaq_rts: onoff=%x\n", device_get_nameunit(ucom->sc_dev), onoff)); + DPRINTF(0, "onoff=%d\n", onoff); - /* Avoid sending unnecessary requests */ - if (onoff && (sc->sc_lcr & UCDC_LINE_RTS)) return; - if (!onoff && !(sc->sc_lcr & UCDC_LINE_RTS)) return; + if (onoff) + sc->sc_line |= UCDC_LINE_RTS; + else + sc->sc_line &= ~UCDC_LINE_RTS; req.bmRequestType = UT_WRITE_CLASS_INTERFACE; req.bRequest = UCDC_SET_CONTROL_LINE_STATE; - sc->sc_lcr = onoff ? sc->sc_lcr | UCDC_LINE_RTS : sc->sc_lcr & ~UCDC_LINE_RTS; - USETW(req.wValue, sc->sc_lcr); - USETW(req.wIndex, 0x0); + USETW(req.wValue, sc->sc_line); + req.wIndex[0] = UIPAQ_IFACE_INDEX; + req.wIndex[1] = 0; USETW(req.wLength, 0); - while (retries) { - err = usbd_do_request(ucom->sc_udev, &req, NULL); - if (!err) - break; - retries--; - } + uipaq_cfg_do_request(sc, &req, NULL); + return; } -void -uipaq_break(struct uipaq_softc* sc, int onoff) +static void +uipaq_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff) { + struct uipaq_softc *sc = ucom->sc_parent; usb_device_request_t req; - struct ucom_softc *ucom = &sc->sc_ucom; - usbd_status err; - int retries = 3; + uint16_t temp; - DPRINTF(("%s: uipaq_break: onoff=%x\n", device_get_nameunit(ucom->sc_dev), onoff)); + temp = onoff ? UCDC_BREAK_ON : UCDC_BREAK_OFF; req.bmRequestType = UT_WRITE_CLASS_INTERFACE; req.bRequest = UCDC_SEND_BREAK; + USETW(req.wValue, temp); + req.wIndex[0] = UIPAQ_IFACE_INDEX; + req.wIndex[1] = 0; + USETW(req.wLength, 0); - USETW(req.wValue, onoff ? UCDC_BREAK_ON : UCDC_BREAK_OFF); - USETW(req.wIndex, 0x0); - USETW(req.wLength, 0); + uipaq_cfg_do_request(sc, &req, NULL); + return; +} + +static void +uipaq_write_callback(struct usbd_xfer *xfer) +{ + struct uipaq_softc *sc = xfer->priv_sc; + uint32_t actlen; + + USBD_CHECK_STATUS(xfer); + +tr_error: + if (xfer->error != USBD_CANCELLED) { + sc->sc_flag |= UIPAQ_FLAG_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer_data[2]); + } + return; + +tr_setup: +tr_transferred: + if (sc->sc_flag & UIPAQ_FLAG_WRITE_STALL) { + usbd_transfer_start(sc->sc_xfer_data[2]); + return; + } + + if(ucom_get_data(&(sc->sc_ucom), xfer->buffer, + UIPAQ_BUF_SIZE, &actlen)) { + + xfer->length = actlen; - while (retries) { - err = usbd_do_request(ucom->sc_udev, &req, NULL); - if (!err) - break; - retries--; + usbd_start_hardware(xfer); } + return; } -void -uipaq_set(void *addr, int portno, int reg, int onoff) +static void +uipaq_write_clear_stall_callback(struct usbd_xfer *xfer) { - struct uipaq_softc* sc = addr; - struct ucom_softc *ucom = &sc->sc_ucom; + struct uipaq_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, sc->sc_xfer_data[0]); + return; + + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, sc->sc_xfer_data[0]); + sc->sc_flag &= ~UIPAQ_FLAG_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer_data[0]); + return; - switch (reg) { - case UCOM_SET_DTR: - uipaq_dtr(addr, onoff); - break; - case UCOM_SET_RTS: - uipaq_rts(addr, onoff); - break; - case UCOM_SET_BREAK: - uipaq_break(addr, onoff); - break; - default: - printf("%s: unhandled set request: reg=%x onoff=%x\n", - device_get_nameunit(ucom->sc_dev), reg, onoff); - return; - } + tr_error: + sc->sc_flag &= ~UIPAQ_FLAG_WRITE_STALL; + DPRINTF(0, "clear stall failed, error=%s\n", + usbd_errstr(xfer->error)); + return; } -int -uipaq_detach(device_t self) +static void +uipaq_read_callback(struct usbd_xfer *xfer) { - struct uipaq_softc *sc = device_get_softc(self); - struct ucom_softc *ucom = &sc->sc_ucom; - int rv = 0; + struct uipaq_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_error: + if (xfer->error != USBD_CANCELLED) { + sc->sc_flag |= UIPAQ_FLAG_READ_STALL; + usbd_transfer_start(sc->sc_xfer_data[3]); + } + return; - DPRINTF(("uipaq_detach: sc=%p flags=%d\n", sc, flags)); - ucom->sc_dying = 1; + tr_transferred: + ucom_put_data(&(sc->sc_ucom), xfer->buffer, xfer->actlen); - return (rv); + tr_setup: + if (sc->sc_flag & UIPAQ_FLAG_READ_STALL) { + usbd_transfer_start(sc->sc_xfer_data[3]); + } else { + usbd_start_hardware(xfer); + } + return; } -static device_method_t uipaq_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, uipaq_match), - DEVMETHOD(device_attach, uipaq_attach), - DEVMETHOD(device_detach, uipaq_detach), +static void +uipaq_read_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct uipaq_softc *sc = xfer->priv_sc; + + USBD_CHECK_STATUS(xfer); + + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, sc->sc_xfer_data[1]); + return; - { 0, 0 } -}; -static driver_t uipaq_driver = { - "ucom", - uipaq_methods, - sizeof (struct uipaq_softc) -}; + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, sc->sc_xfer_data[1]); + sc->sc_flag &= ~UIPAQ_FLAG_READ_STALL; + usbd_transfer_start(sc->sc_xfer_data[1]); + return; -DRIVER_MODULE(uipaq, uhub, uipaq_driver, ucom_devclass, usbd_driver_load, 0); -MODULE_DEPEND(uipaq, usb, 1, 1, 1); -MODULE_DEPEND(uipaq, ucom,UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); + tr_error: + sc->sc_flag &= ~UIPAQ_FLAG_READ_STALL; + DPRINTF(0, "clear stall failed, error=%s\n", + usbd_errstr(xfer->error)); + return; +} From owner-p4-projects@FreeBSD.ORG Mon Jun 4 06:56:52 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 972DD16A46D; Mon, 4 Jun 2007 06:56:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 5439916A421 for ; Mon, 4 Jun 2007 06:56:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 44F5F13C45E for ; Mon, 4 Jun 2007 06:56:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l546uq8v024378 for ; Mon, 4 Jun 2007 06:56:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l546uqfK024372 for perforce@freebsd.org; Mon, 4 Jun 2007 06:56:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 4 Jun 2007 06:56:52 GMT Message-Id: <200706040656.l546uqfK024372@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120880 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, 04 Jun 2007 06:56:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=120880 Change 120880 by hselasky@hselasky_mini_itx on 2007/06/04 06:56:26 Updates to uhub.c. Make the code more style compliant. Make all debugging printouts go through DPRINTF(). Add a timer instead of looping when clearing of stall fails. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhub.c#11 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhub.c#11 (text+ko) ==== @@ -1,3 +1,6 @@ +#include +__FBSDID("$FreeBSD: src/sys/dev/usb/uhub.c,v 1.74 2007/02/03 21:11:11 flz Exp $"); + /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -39,7 +42,6 @@ * USB spec: http://www.usb.org/developers/docs/usbspec.zip */ -#include #include #include #include @@ -50,31 +52,35 @@ #include #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uhub.c,v 1.74 2007/02/03 21:11:11 flz Exp $"); +#define UHUB_INTR_INTERVAL 250 /* ms */ -#define UHUB_INTR_INTERVAL 250 /* ms */ +#ifdef USB_DEBUG +#define DPRINTF(sc,n,fmt,...) \ + do { if (uhub_debug > (n)) { \ + printf("%s:%s: " fmt, (sc)->sc_name, \ + __FUNCTION__,## __VA_ARGS__); } } while (0) -#ifdef USB_DEBUG -#undef DPRINTF -#undef DPRINTFN -#define DPRINTF(x) { if (uhubdebug) { printf("%s: ", __FUNCTION__); printf x; } } -#define DPRINTFN(n,x) { if (uhubdebug>(n)) { printf("%s: ", __FUNCTION__); printf x; } } -int uhubdebug = 0; +static int uhub_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, uhub, CTLFLAG_RW, 0, "USB uhub"); -SYSCTL_INT(_hw_usb_uhub, OID_AUTO, debug, CTLFLAG_RW, - &uhubdebug, 0, "uhub debug level"); +SYSCTL_INT(_hw_usb_uhub, OID_AUTO, debug, CTLFLAG_RW, &uhub_debug, 0, + "uhub debug level"); +#else +#define DPRINTF(...) do { } while (0) #endif -struct uhub_softc -{ - device_t sc_dev; /* base device */ - struct usbd_device * sc_hub; /* USB device */ - struct usbd_xfer * sc_xfer[2]; /* interrupt xfer */ - u_int8_t sc_running; +struct uhub_softc { + struct __callout sc_watchdog; + device_t sc_dev; /* base device */ + struct usbd_device *sc_hub; /* USB device */ + struct usbd_xfer *sc_xfer[2]; /* interrupt xfer */ + uint8_t sc_flags; +#define UHUB_FLAG_RUNNING 0x01 +#define UHUB_FLAG_INTR_STALL 0x02 + uint8_t sc_name[32]; }; -#define UHUB_PROTO(sc) ((sc)->sc_hub->ddesc.bDeviceProtocol) -#define UHUB_IS_HIGH_SPEED(sc) (UHUB_PROTO(sc) != UDPROTO_FSHUB) -#define UHUB_IS_SINGLE_TT(sc) (UHUB_PROTO(sc) == UDPROTO_HSHUBSTT) +#define UHUB_PROTO(sc) ((sc)->sc_hub->ddesc.bDeviceProtocol) +#define UHUB_IS_HIGH_SPEED(sc) (UHUB_PROTO(sc) != UDPROTO_FSHUB) +#define UHUB_IS_SINGLE_TT(sc) (UHUB_PROTO(sc) == UDPROTO_HSHUBSTT) /* prototypes for type checking: */ @@ -86,26 +92,136 @@ static bus_child_location_str_t uhub_child_location_string; static bus_child_pnpinfo_str_t uhub_child_pnpinfo_string; +static usbd_callback_t uhub_intr_callback; +static usbd_callback_t uhub_intr_clear_stall_callback; + +static void uhub_watchdog(void *arg); + +static const struct usbd_config uhub_config[2] = { + + [0] = { + .type = UE_INTERRUPT, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_ANY, + .timeout = 0, + .flags = USBD_SHORT_XFER_OK, + .bufsize = 0, /* use wMaxPacketSize */ + .callback = &uhub_intr_callback, + .interval = UHUB_INTR_INTERVAL, + }, + + [1] = { + .type = UE_CONTROL, + .endpoint = 0, + .direction = UE_DIR_ANY, + .timeout = USBD_DEFAULT_TIMEOUT, + .flags = 0, + .bufsize = sizeof(usb_device_request_t), + .callback = &uhub_intr_clear_stall_callback, + }, +}; + /* - * Hub interrupt. - * This an indication that some port has changed status. - * Notify the bus event handler thread that we need - * to be explored again. + * driver instance for "hub" connected to "usb" + * and "hub" connected to "hub" */ +static devclass_t uhub_devclass; + +static driver_t uhub_driver = +{ + .name = "uhub", + .methods = (device_method_t []) + { + DEVMETHOD(device_probe, uhub_probe), + DEVMETHOD(device_attach, uhub_attach), + DEVMETHOD(device_detach, uhub_detach), + + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + + DEVMETHOD(bus_child_location_str, uhub_child_location_string), + DEVMETHOD(bus_child_pnpinfo_str, uhub_child_pnpinfo_string), + DEVMETHOD(bus_driver_added, uhub_driver_added), + {0,0} + }, + .size = sizeof(struct uhub_softc) +}; + +DRIVER_MODULE(uhub, usb, uhub_driver, uhub_devclass, 0, 0); +DRIVER_MODULE(uhub, uhub, uhub_driver, uhub_devclass, usbd_driver_load, 0); +MODULE_DEPEND(uhub, usb, 1, 1, 1); + static void -uhub_interrupt(struct usbd_xfer *xfer) +uhub_watchdog(void *arg) +{ + struct uhub_softc *sc = arg; + mtx_assert(&usb_global_lock, MA_OWNED); + usbd_transfer_start(sc->sc_xfer[0]); + mtx_unlock(&usb_global_lock); + return; +} + +static void +uhub_intr_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct uhub_softc *sc = xfer->priv_sc; + struct usbd_xfer *xfer_other = sc->sc_xfer[0]; + + USBD_CHECK_STATUS(xfer); + + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, xfer_other); + return; + + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, xfer_other); + + sc->sc_flags &= ~UHUB_FLAG_INTR_STALL; + usbd_transfer_start(xfer_other); + return; + + tr_error: + sc->sc_flags &= ~UHUB_FLAG_INTR_STALL; + if (xfer->error != USBD_CANCELLED) { + __callout_reset(&(sc->sc_watchdog), hz, &uhub_watchdog, sc); + DPRINTF(sc, -1, "Interrupt pipe stopped! Watchdog started!\n"); + } + return; +} + +static void +uhub_intr_callback(struct usbd_xfer *xfer) { + struct uhub_softc *sc = xfer->priv_sc; + USBD_CHECK_STATUS(xfer); tr_transferred: - usb_needs_explore(((struct uhub_softc *)(xfer->priv_sc))->sc_hub); + DPRINTF(sc, 1, "\n"); + /* + * This is an indication that some port + * has changed status. Notify the bus + * event handler thread that we need + * to be explored again: + */ + usb_needs_explore(sc->sc_hub); tr_setup: + if (sc->sc_flags & UHUB_FLAG_INTR_STALL) { + usbd_transfer_start(sc->sc_xfer[1]); + } else { + usbd_start_hardware(xfer); + } + return; + tr_error: - /* re-transfer xfer->buffer; - * xfer->length is unchanged - */ - usbd_start_hardware(xfer); + if (xfer->error != USBD_CANCELLED) { + /* start clear stall */ + sc->sc_flags |= UHUB_FLAG_INTR_STALL; + usbd_transfer_start(sc->sc_xfer[1]); + } return; } @@ -116,13 +232,14 @@ struct uhub_softc *sc = udev->hub->hubsoftc; struct usbd_port *up; usbd_status err; - int speed; - int port; - int change, status; + uint16_t port; + uint16_t change; + uint16_t status; + uint8_t speed; - DPRINTFN(10, ("udev=%p addr=%d\n", udev, udev->address)); + DPRINTF(sc, 10, "udev=%p addr=%d\n", udev, udev->address); - if (!sc->sc_running) + if (!(sc->sc_flags & UHUB_FLAG_RUNNING)) { return (USBD_NOT_STARTED); } @@ -139,17 +256,17 @@ err = usbreq_get_port_status(udev, port, &up->status); if (err) { - DPRINTF(("get port status failed, " - "error=%s\n", usbd_errstr(err))); + DPRINTF(sc, 0, "get port status failed, " + "error=%s\n", usbd_errstr(err)); continue; } status = UGETW(up->status.wPortStatus); change = UGETW(up->status.wPortChange); - DPRINTFN(3,("%s: port %d status 0x%04x 0x%04x\n", - device_get_nameunit(sc->sc_dev), port, status, change)); + DPRINTF(sc, 3, "port %d status 0x%04x 0x%04x\n", + port, status, change); if(change & UPS_C_PORT_ENABLED) { - DPRINTF(("C_PORT_ENABLED 0x%x\n", change)); + DPRINTF(sc, 0, "C_PORT_ENABLED 0x%x\n", change); usbreq_clear_port_feature(udev, port, UHF_C_PORT_ENABLE); if(change & UPS_C_CONNECT_STATUS) { @@ -159,31 +276,30 @@ } else if(status & UPS_PORT_ENABLED) { - device_printf(sc->sc_dev, - "illegal enable change, port %d\n", port); + DPRINTF(sc, -1, "illegal enable change, " + "port %d\n", port); } else { /* port error condition */ if(up->restartcnt) /* no message first time */ { - device_printf(sc->sc_dev, - "port error, restarting " - "port %d\n", port); + DPRINTF(sc, -1, "port error, restarting " + "port %d\n", port); } - if(up->restartcnt++ < USBD_RESTART_MAX) + if(up->restartcnt++ < USBD_RESTART_MAX) { goto disconnect; - else - device_printf(sc->sc_dev, - "port error, giving up " - "port %d\n", port); + } else { + DPRINTF(sc, -1, "port error, giving up " + "port %d\n", port); + } } } if(!(change & UPS_C_CONNECT_STATUS)) { - DPRINTFN(3,("port=%d !C_CONNECT_" - "STATUS\n", port)); + DPRINTF(sc, 3, "port=%d !C_CONNECT_" + "STATUS\n", port); /* no status change, just do recursive explore */ if(up->device != NULL) { @@ -202,21 +318,13 @@ } } } -#if 0 && defined(DIAGNOSTIC) - if((up->device == NULL) && - (status & UPS_CURRENT_CONNECT_STATUS)) - { - device_printf(sc->sc_dev, - "connected, no device\n"); - } -#endif continue; } /* we have a connect status change, handle it */ - DPRINTF(("status change hub=%d port=%d\n", - udev->address, port)); + DPRINTF(sc, 0, "status change hub=%d port=%d\n", + udev->address, port); usbreq_clear_port_feature(udev, port, UHF_C_PORT_CONNECTION); /*usbreq_clear_port_feature(udev, port, UHF_C_PORT_ENABLE);*/ /* @@ -230,8 +338,8 @@ if(up->device != NULL) { /* disconnected */ - DPRINTF(("device addr=%d disappeared " - "on port %d\n", up->device->address, port)); + DPRINTF(sc, 0, "device addr=%d disappeared " + "on port %d\n", up->device->address, port); usbd_free_device(up, 1); usbreq_clear_port_feature(udev, port, UHF_C_PORT_CONNECTION); @@ -239,8 +347,8 @@ if(!(status & UPS_CURRENT_CONNECT_STATUS)) { /* nothing connected, just ignore it */ - DPRINTFN(3,("port=%d !CURRENT_CONNECT_STATUS\n", - port)); + DPRINTF(sc, 3, "port=%d !CURRENT_CONNECT_STATUS\n", + port); continue; } @@ -248,8 +356,8 @@ if(!(status & UPS_PORT_POWER)) { - device_printf(sc->sc_dev, "strange, connected port %d " - "has no power\n", port); + DPRINTF(sc, -1, "strange, connected port %d " + "has no power\n", port); } /* wait for maximum device power up time */ @@ -258,8 +366,8 @@ /* reset port, which implies enabling it */ if(usbreq_reset_port(udev, port, &up->status)) { - device_printf(sc->sc_dev, - "port %d reset failed\n", port); + DPRINTF(sc, -1, "port %d reset " + "failed\n", port); continue; } @@ -267,8 +375,8 @@ err = usbreq_get_port_status(udev, port, &up->status); if(err) { - DPRINTF(("get port status failed, " - "error=%s\n", usbd_errstr(err))); + DPRINTF(sc, 0, "get port status failed, " + "error=%s\n", usbd_errstr(err)); continue; } status = UGETW(up->status.wPortStatus); @@ -276,11 +384,8 @@ if(!(status & UPS_CURRENT_CONNECT_STATUS)) { /* nothing connected, just ignore it */ -#ifdef DIAGNOSTIC - device_printf(sc->sc_dev, - "port %d, device disappeared " - "after reset\n", port); -#endif + DPRINTF(sc, 1, "port %d, device disappeared " + "after reset\n", port); continue; } @@ -292,12 +397,10 @@ /* get device info and set its address */ err = usbd_new_device(sc->sc_dev, udev->bus, udev->depth + 1, speed, port, up); - - /* XXX retry a few times? */ - if(err) + if (err) { - DPRINTFN(-1,("usb_new_device failed, " - "error=%s\n", usbd_errstr(err))); + DPRINTF(sc, -1, "usb_new_device failed, " + "error=%s\n", usbd_errstr(err)); /* Avoid addressing problems by disabling. */ /* usbd_reset_port(udev, port, &up->status); */ @@ -306,8 +409,8 @@ * some other serious problem. Since we cannot leave * at 0 we have to disable the port instead. */ - device_printf(sc->sc_dev, "device problem (%s), " - "disabling port %d\n", usbd_errstr(err), port); + DPRINTF(sc, -1, "device problem (%s), " + "disabling port %d\n", usbd_errstr(err), port); usbreq_clear_port_feature(udev, port, UHF_PORT_ENABLE); } else @@ -330,7 +433,6 @@ struct usb_attach_arg *uaa = device_get_ivars(dev); usb_device_descriptor_t *dd = usbd_get_device_descriptor(uaa->device); - DPRINTFN(5,("dd=%p\n", dd)); /* * the subclass for hubs, is ignored, * because it is 0 for some @@ -350,40 +452,52 @@ struct usb_attach_arg *uaa = device_get_ivars(dev); struct usbd_device *udev = uaa->device; struct usbd_hub *hub; - usbd_status err; usb_device_request_t req; usb_hub_descriptor_t hubdesc; - int port, nports, removable, pwrdly; - char devinfo[256]; + uint16_t port; + uint16_t nports; + uint16_t removable; + uint16_t pwrdly; + usbd_status err; - DPRINTFN(1,("\n")); + if (sc == NULL) { + return ENOMEM; + } sc->sc_hub = udev; sc->sc_dev = dev; + snprintf(sc->sc_name, sizeof(sc->sc_name), "%s", + device_get_nameunit(dev)); + + usbd_set_desc(dev, udev); + + __callout_init_mtx(&(sc->sc_watchdog), + &usb_global_lock, CALLOUT_RETURNUNLOCKED); + err = usbd_set_config_index(udev, 0, 1); if(err) { - DPRINTF(("%s: configuration failed, error=%s\n", - device_get_nameunit(dev), usbd_errstr(err))); + DPRINTF(sc, -1, "configuration failed, error=%s\n", + usbd_errstr(err)); goto error; } /* NOTE: "usbd_set_config_index()" will change * variables in "udev" ! */ - DPRINTFN(1,("depth=%d selfpowered=%d, parent=%p, " + DPRINTF(sc, 1, "depth=%d selfpowered=%d, parent=%p, " "parent->selfpowered=%d\n", udev->depth, udev->self_powered, udev->powersrc->parent, udev->powersrc->parent ? - udev->powersrc->parent->self_powered : 0)); + udev->powersrc->parent->self_powered : 0); if(udev->depth > USB_HUB_MAX_DEPTH) { - device_printf(dev, "hub depth (%d) exceeded, hub ignored\n", - USB_HUB_MAX_DEPTH); + DPRINTF(sc, -1, "hub depth, %d, exceeded. HUB ignored!\n", + USB_HUB_MAX_DEPTH); goto error; } @@ -391,14 +505,14 @@ (udev->powersrc->parent != NULL) && (!udev->powersrc->parent->self_powered)) { - device_printf(dev, "bus powered hub connected to bus powered hub, " - "ignored\n"); + DPRINTF(sc, -1, "bus powered hub connected to " + "bus powered hub. HUB ignored!\n"); goto error; } /* get hub descriptor */ - DPRINTFN(1,("getting hub descriptor\n")); + DPRINTF(sc, 1, "getting hub descriptor\n"); req.bmRequestType = UT_READ_CLASS_DEVICE; req.bRequest = UR_GET_DESCRIPTOR; @@ -412,90 +526,57 @@ if(!err && (nports >= 8)) { - u_int16_t len = (USB_HUB_DESCRIPTOR_SIZE-1) + ((nports+7) / 8); + uint16_t len = (USB_HUB_DESCRIPTOR_SIZE-1) + ((nports+7) / 8); USETW(req.wLength, len); err = usbd_do_request(udev, &req, &hubdesc); } if(err) { - DPRINTF(("%s: getting hub descriptor failed, error=%s\n", - device_get_nameunit(dev), usbd_errstr(err))); + DPRINTF(sc, -1, "getting hub descriptor failed," + "error=%s\n", usbd_errstr(err)); goto error; } if(hubdesc.bNbrPorts != nports) { - DPRINTF(("%s: number of ports changed!\n", - device_get_nameunit(dev))); + DPRINTF(sc, -1, "number of ports changed!\n"); goto error; } if(nports == 0) { - DPRINTF(("%s: portless HUB!\n", - device_get_nameunit(dev))); + DPRINTF(sc, -1, "portless HUB!\n"); goto error; } udev->hub = malloc((sizeof(hub[0]) + (sizeof(hub[0].ports[0]) * nports)), - M_USBDEV, M_NOWAIT|M_ZERO); + M_USBDEV, M_WAITOK|M_ZERO); if(udev->hub == NULL) { goto error; } - hub = udev->hub; - - hub->hubsoftc = sc; - hub->explore = uhub_explore; - hub->hubdesc = hubdesc; - - static const struct usbd_config usbd_config[2] = - { - [0] = { - .type = UE_INTERRUPT, - .endpoint = -1, /* any pipe number */ - .direction = -1, /* any pipe direction */ - .timeout = 0, - .flags = USBD_SHORT_XFER_OK, - .bufsize = 0x100 / 8, - .callback = uhub_interrupt, - .interval = UHUB_INTR_INTERVAL, - }, - - [1] = { - .type = UE_CONTROL, - .endpoint = 0, - .direction = -1, - .timeout = USBD_DEFAULT_TIMEOUT, - .flags = 0, - .bufsize = sizeof(usb_device_request_t), - .callback = &usbd_clearstall_callback, - }, - }; - /* set up interrupt pipe */ - err = usbd_transfer_setup(udev, 0, &sc->sc_xfer[0], - &usbd_config[0], 2, sc, NULL); + err = usbd_transfer_setup(udev, 0, sc->sc_xfer, + uhub_config, 2, sc, &usb_global_lock); if(err) { - device_printf(dev, "cannot open interrupt pipe\n"); + DPRINTF(sc, -1, "cannot setup interrupt transfer, " + "errstr=%s!\n", usbd_errstr(err)); goto error; } - /* setup clear stall */ - sc->sc_xfer[0]->clearstall_xfer = - sc->sc_xfer[1]; + hub = udev->hub; - usbd_transfer_start_safe(sc->sc_xfer[0]); + hub->hubsoftc = sc; + hub->explore = uhub_explore; + hub->hubdesc = hubdesc; /* wait with power off for a while */ usbd_delay_ms(udev, USB_POWER_DOWN_TIME); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, udev, dev); - /* * To have the best chance of success we do things in the exact same * order as Windoze98. This should not be necessary, but some @@ -524,8 +605,8 @@ /* XXX should check for none, individual, or ganged power? */ removable = 0; - pwrdly = (hubdesc.bPwrOn2PwrGood * UHD_PWRON_FACTOR) + - USB_EXTRA_POWER_UP_TIME; + pwrdly = ((hubdesc.bPwrOn2PwrGood * UHD_PWRON_FACTOR) + + USB_EXTRA_POWER_UP_TIME); for(port = 1; port <= nports; @@ -554,18 +635,15 @@ err = usbreq_set_port_feature(udev, port, UHF_PORT_POWER); if(err) { - device_printf(dev, "port %d power on failed, %s\n", - port, usbd_errstr(err)); + DPRINTF(sc, -1, "port %d power on failed, %s\n", + port, usbd_errstr(err)); } - DPRINTF(("turn on port %d power\n", port)); + DPRINTF(sc, 0, "turn on port %d power\n", port); /* wait for stable power */ usbd_delay_ms(udev, pwrdly); } - usbd_devinfo(udev, 1, devinfo, sizeof(devinfo)); - device_set_desc_copy(dev, devinfo); - device_printf(dev, "%s\n", devinfo); device_printf(dev, "%d port%s with %d " "removable, %s powered\n", nports, (nports != 1) ? "s" : "", @@ -573,15 +651,22 @@ /* the usual exploration will finish the setup */ - sc->sc_running = 1; + sc->sc_flags |= UHUB_FLAG_RUNNING; + + /* start the interrupt endpoint */ + + usbd_transfer_start_safe(sc->sc_xfer[0]); + return 0; error: + usbd_transfer_unsetup(sc->sc_xfer, 2); + if(udev->hub) { free(udev->hub, M_USBDEV); + udev->hub = NULL; } - udev->hub = NULL; return ENXIO; } @@ -595,9 +680,8 @@ struct uhub_softc *sc = device_get_softc(dev); struct usbd_hub *hub = sc->sc_hub->hub; struct usbd_port *up; - int port, nports; - - DPRINTF(("sc=%port\n", sc)); + uint16_t port; + uint16_t nports; /* detach all children first */ bus_generic_detach(dev); @@ -623,10 +707,13 @@ } } - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_hub, - sc->sc_dev); + usbd_transfer_unsetup(sc->sc_xfer, 2); + + mtx_lock(&usb_global_lock); + __callout_stop(&(sc->sc_watchdog)); + mtx_unlock(&usb_global_lock); - usbd_transfer_unsetup(&sc->sc_xfer[0], 2); + __callout_drain(&(sc->sc_watchdog)); free(hub, M_USBDEV); sc->sc_hub->hub = NULL; @@ -647,7 +734,9 @@ struct uhub_softc *sc = device_get_softc(parent); struct usbd_hub *hub = sc->sc_hub->hub; struct usbd_device *udev; - int port, nports, iface_index; + uint16_t port; + uint16_t nports; + uint8_t iface_index; mtx_lock(&usb_global_lock); @@ -681,7 +770,7 @@ mtx_unlock(&usb_global_lock); - DPRINTFN(0,("device not on hub\n")); + DPRINTF(sc, 0, "device not on hub\n"); if(buflen) { @@ -716,7 +805,9 @@ struct usbd_hub *hub = sc->sc_hub->hub; struct usbd_interface *iface; struct usbd_device *udev; - int port, nports, iface_index; + uint16_t port; + uint16_t nports; + uint8_t iface_index; mtx_lock(&usb_global_lock); @@ -750,7 +841,7 @@ mtx_unlock(&usb_global_lock); - DPRINTFN(0,("device not on hub\n")); + DPRINTF(sc, 0, "device not on hub\n"); if(buflen) { @@ -794,35 +885,3 @@ return (0); } - -/* - * driver instance for "hub" connected to "usb" - * and "hub" connected to "hub" - */ -static devclass_t uhub_devclass; - -static driver_t uhub_driver = -{ - .name = "uhub", - .methods = (device_method_t []) - { - DEVMETHOD(device_probe, uhub_probe), - DEVMETHOD(device_attach, uhub_attach), - DEVMETHOD(device_detach, uhub_detach), - - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - - DEVMETHOD(bus_child_location_str, uhub_child_location_string), - DEVMETHOD(bus_child_pnpinfo_str, uhub_child_pnpinfo_string), - DEVMETHOD(bus_driver_added, uhub_driver_added), - {0,0} - }, - .size = sizeof(struct uhub_softc) -}; - -DRIVER_MODULE(uhub, usb, uhub_driver, uhub_devclass, 0, 0); -MODULE_DEPEND(uhub, usb, 1, 1, 1); - -DRIVER_MODULE(uhub, uhub, uhub_driver, uhub_devclass, usbd_driver_load, 0); From owner-p4-projects@FreeBSD.ORG Mon Jun 4 07:04:02 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09C6F16A46C; Mon, 4 Jun 2007 07:04:02 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 A949716A421 for ; Mon, 4 Jun 2007 07:04:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9AFA413C4B9 for ; Mon, 4 Jun 2007 07:04:01 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l54741xn031975 for ; Mon, 4 Jun 2007 07:04:01 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l54741P3031963 for perforce@freebsd.org; Mon, 4 Jun 2007 07:04:01 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 4 Jun 2007 07:04:01 GMT Message-Id: <200706040704.l54741P3031963@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120881 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, 04 Jun 2007 07:04:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=120881 Change 120881 by hselasky@hselasky_mini_itx on 2007/06/04 07:03:55 Add more comments to wMaxPacketSize of root control endpoints, and adjust the value where needed. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#26 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#32 (text+ko) ==== @@ -3116,7 +3116,7 @@ UDESC_ENDPOINT, UE_DIR_IN | EHCI_INTR_ENDPT, UE_INTERRUPT, - {8, 0}, /* max packet */ + {8, 0}, /* max packet (63 ports) */ 255 }, }; ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#26 (text+ko) ==== @@ -2225,7 +2225,7 @@ UDESC_ENDPOINT, UE_DIR_IN | OHCI_INTR_ENDPT, UE_INTERRUPT, - {8, 0}, /* max packet */ + {32, 0}, /* max packet (255 ports) */ 255 }, }; ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#26 (text+ko) ==== @@ -2353,7 +2353,7 @@ UDESC_ENDPOINT, UE_DIR_IN | UHCI_INTR_ENDPT, UE_INTERRUPT, - {8}, + {8, 0}, /* max packet (63 ports) */ 255 }, }; From owner-p4-projects@FreeBSD.ORG Mon Jun 4 07:08:07 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE95316A469; Mon, 4 Jun 2007 07:08:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 532FA16A41F for ; Mon, 4 Jun 2007 07:08:07 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4405413C468 for ; Mon, 4 Jun 2007 07:08:07 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l54787k7035456 for ; Mon, 4 Jun 2007 07:08:07 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l54786Zf035447 for perforce@freebsd.org; Mon, 4 Jun 2007 07:08:06 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 4 Jun 2007 07:08:06 GMT Message-Id: <200706040708.l54786Zf035447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120882 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, 04 Jun 2007 07:08:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=120882 Change 120882 by hselasky@hselasky_mini_itx on 2007/06/04 07:08:00 Add a new function, usb_cdev_opened(). Some other small nits. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#39 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#13 (text+ko) ==== @@ -1,3 +1,6 @@ +#include +__FBSDID("$FreeBSD: src/sys/dev/usb/usb_cdev.c $"); + /*- * Copyright (c) 2006 Hans Petter Selasky. All rights reserved. * @@ -27,13 +30,10 @@ * */ -#include #include #include #include #include -#include -#include #include #include #include @@ -45,11 +45,9 @@ #include #include -__FBSDID("$FreeBSD: src/sys/dev/usb/usb_cdev.c $"); - #ifdef USB_DEBUG -#define DPRINTF(n,fmt,...) \ - do { if (usb_cdev_debug > (n)) { \ +#define DPRINTF(n,fmt,...) \ + do { if (usb_cdev_debug > (n)) { \ printf("%s: " fmt, __FUNCTION__,## __VA_ARGS__); } } while (0) static int usb_cdev_debug = 0; @@ -190,8 +188,8 @@ sc->sc_flags |= context_bit; - error = mtx_sleep(ident, sc->sc_mtx_ptr, PRIBIO|PCATCH, - "usb_cdev_msleep", 0); + error = mtx_sleep(ident, sc->sc_mtx_ptr, PCATCH, + "usb_cdev_msleep", 0); return usb_cdev_exit_context(sc, context_bit, error); } @@ -205,8 +203,8 @@ USB_CDEV_FLAG_SLEEP_IOCTL_WR| USB_CDEV_FLAG_WAKEUP_IOCTL_RD| USB_CDEV_FLAG_WAKEUP_IOCTL_WR); - return usb_cdev_msleep(sc, &(sc->sc_wakeup_ioctl), context_bit, - timeout); + return usb_cdev_msleep(sc, &(sc->sc_wakeup_ioctl), + context_bit, timeout); } void @@ -251,13 +249,13 @@ } /* - * the synchronization part is a little more + * The synchronization part is a little more * complicated, hence there are two modes: * * 1) read only and write only, two threads * 2) read and write, one thread * - * the job of the following function is to ensure + * The job of the following function is to ensure * that only one thread enters a piece of code at * a time: */ @@ -326,6 +324,20 @@ return; } +uint8_t +usb_cdev_opened(struct usb_cdev *sc) +{ + uint8_t temp; + mtx_lock(sc->sc_mtx_ptr); + temp = + (sc->sc_flags & + (USB_CDEV_FLAG_OPEN_READ| + USB_CDEV_FLAG_OPEN_WRITE| + USB_CDEV_FLAG_GONE)) ? 1 : 0; + mtx_unlock(sc->sc_mtx_ptr); + return temp; +} + static int32_t usb_cdev_open(struct cdev *dev, int32_t oflags, int32_t devtype, struct thread *td) @@ -492,8 +504,8 @@ wakeup(&(sc->sc_wakeup_ioctl)); } - error = mtx_sleep(&(sc->sc_wakeup_close_read), sc->sc_mtx_ptr, - PRIBIO, "usb_cdev_sync_read", 0); + error = mtx_sleep(&(sc->sc_wakeup_close_read), sc->sc_mtx_ptr, + 0, "usb_cdev_sync_read", 0); } if (sc->sc_flags & USB_CDEV_FLAG_SELECT_READ) { @@ -537,7 +549,7 @@ while (sc->sc_flags & USB_CDEV_FLAG_FLUSHING_WRITE) { error = mtx_sleep(&(sc->sc_wakeup_flush), sc->sc_mtx_ptr, - PRIBIO|PCATCH, "usb_cdev_flush", 0); + PCATCH, "usb_cdev_flush", 0); if (error || (sc->sc_flags & context_bit & (USB_CDEV_FLAG_GONE| @@ -578,7 +590,7 @@ } error = mtx_sleep(&(sc->sc_wakeup_close_write), sc->sc_mtx_ptr, - PRIBIO, "usb_cdev_sync_write", 0); + 0, "usb_cdev_sync_write", 0); } if (sc->sc_flags & USB_CDEV_FLAG_SELECT_WRITE) { @@ -821,7 +833,11 @@ error = EBUSY; break; } +#if defined(__NetBSD__) + sc->sc_async_rd = td; +#else sc->sc_async_rd = td->td_proc; +#endif } else { sc->sc_async_rd = NULL; } @@ -832,7 +848,11 @@ error = EBUSY; break; } +#if defined(__NetBSD__) + sc->sc_async_wr = td; +#else sc->sc_async_wr = td->td_proc; +#endif } else { sc->sc_async_wr = NULL; } @@ -1014,7 +1034,7 @@ const char **pp_dev, uid_t _uid, gid_t _gid, - int _perms, + int32_t _perms, u_int32_t rd_size, u_int16_t rd_packets, u_int32_t wr_size, @@ -1068,7 +1088,9 @@ rd_size, rd_packets); if (sc->sc_rdq_pointer == NULL) { - goto detach; + if (rd_size || rd_packets) { + goto detach; + } } sc->sc_wrq_pointer = @@ -1076,7 +1098,9 @@ wr_size, wr_packets); if (sc->sc_wrq_pointer == NULL) { - goto detach; + if (wr_size || wr_packets) { + goto detach; + } } for (n = 0; n < USB_CDEV_COUNT; n++) { @@ -1161,7 +1185,7 @@ USB_CDEV_FLAG_OPEN_WRITE)) { error = mtx_sleep(&(sc->sc_wakeup_detach), sc->sc_mtx_ptr, - PRIBIO, "usb_cdev_sync_detach", 0); + 0, "usb_cdev_sync_detach", 0); } mtx_unlock(sc->sc_mtx_ptr); ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#39 (text+ko) ==== @@ -73,6 +73,7 @@ struct usbd_xfer; struct usbd_pipe; struct usbd_bus; +struct usbd_clone; struct usbd_config; struct usbd_device; struct usbd_interface; @@ -84,6 +85,7 @@ struct proc; struct usb_hid_descriptor; struct usb_device; /* Linux compat */ +struct cdev; typedef uint8_t usbd_status; @@ -173,9 +175,12 @@ device_t bdev; /* filled by HC driver */ bus_dma_tag_t dma_tag; /* filled by HC driver */ + eventhandler_tag usb_clone_tag; struct usbd_bus_methods *methods; /* filled by HC driver */ struct usbd_device *devices[USB_MAX_DEVICES]; struct proc *event_thread; + struct cdev *usb_cdev; + struct usbd_clone *usb_clone_root; uint32_t no_intrs; @@ -190,12 +195,17 @@ */ uint8_t use_polling; uint8_t usbrev; /* USB revision */ + uint8_t usb_clone_count; +#define USB_BUS_MAX_CLONES 128 + #define USBREV_UNKNOWN 0 #define USBREV_PRE_1_0 1 #define USBREV_1_0 2 #define USBREV_1_1 3 #define USBREV_2_0 4 -#define USBREV_STR { "unknown", "pre 1.0", "1.0", "1.1", "2.0" } +#define USBREV_2_5 5 +#define USBREV_STR { "unknown", "pre 1.0", "1.0", "1.1", "2.0", "2.5" } + uint8_t usb_name[32]; }; struct usbd_interface { @@ -235,7 +245,8 @@ device_t subdevs_end[0]; struct usb_device *linux_dev; - usb_event_cookie_t cookie; /* unique connection id */ + uint16_t refcount; +#define USB_DEV_REFCOUNT_MAX 0xffff uint16_t power; /* mA the device uses */ int16_t langid; /* language for strings */ @@ -265,6 +276,7 @@ #define USBD_PROBED_GENERIC_AND_FOUND 3 uint8_t serial[32]; /* serial number */ + uint8_t detaching; }; struct usbd_config { @@ -556,8 +568,8 @@ usbd_status usbd_probe_and_attach(device_t parent, int32_t port, struct usbd_port *up); usbd_status usbd_new_device(device_t parent, struct usbd_bus *bus, int32_t depth, int32_t speed, int32_t port, struct usbd_port *up); void usbd_free_device(struct usbd_port *up, uint8_t free_subdev); -void usb_detach_wait(device_t dv); -void usb_detach_wakeup(device_t dv); +struct usbd_device *usbd_ref_device(struct usbd_bus *bus, uint8_t addr); +void usbd_unref_device(struct usbd_device *udev); struct usbd_interface *usbd_get_iface(struct usbd_device *udev, uint8_t iface_index); void usbd_set_desc(device_t dev, struct usbd_device *udev); void * usbd_alloc_mbufs(struct malloc_type *type, struct usbd_ifqueue *ifq, uint32_t block_size, uint16_t block_number); @@ -609,8 +621,6 @@ extern uint8_t usb_driver_added_refcount; -void usbd_add_dev_event(int32_t type, struct usbd_device *udev); -void usbd_add_drv_event(int32_t type, struct usbd_device *udev, device_t dev); void usb_needs_explore(struct usbd_device *udev); void usb_needs_probe_and_attach(void); @@ -657,18 +667,17 @@ void usbd_clearstall_callback(struct usbd_xfer *xfer); void usbd_do_poll(struct usbd_device *udev); void usbd_set_polling(struct usbd_device *udev, int32_t on); -int32_t usbd_ratecheck(struct timeval *last); const struct usb_devno * usb_match_device(const struct usb_devno *tbl, uint32_t nentries, uint32_t size, uint16_t vendor, uint16_t product); int32_t usbd_driver_load(struct module *mod, int32_t what, void *arg); /* prototypes from usb_requests.c */ usbd_status usbreq_reset_port(struct usbd_device *udev, int32_t port, usb_port_status_t *ps); -usbd_status usbreq_get_desc(struct usbd_device *udev, int32_t type, int32_t index, int32_t len, void *desc, int32_t timeout); -usbd_status usbreq_get_string_any(struct usbd_device *udev, int32_t si, char *buf, int32_t len); -usbd_status usbreq_get_string_desc(struct usbd_device *udev, int32_t sindex, int32_t langid, usb_string_descriptor_t *sdesc, int32_t *plen); -usbd_status usbreq_get_config_desc(struct usbd_device *udev, int32_t confidx, usb_config_descriptor_t *d); -usbd_status usbreq_get_config_desc_full(struct usbd_device *udev, int32_t conf, void *d, int32_t size); +usbd_status usbreq_get_desc(struct usbd_device *udev, uint8_t type, uint8_t index, uint16_t len, void *desc, uint32_t timeout); +usbd_status usbreq_get_string_any(struct usbd_device *udev, uint8_t si, char *buf, uint16_t len); +usbd_status usbreq_get_string_desc(struct usbd_device *udev, uint8_t sindex, uint16_t langid, usb_string_descriptor_t *sdesc, uint8_t *plen); +usbd_status usbreq_get_config_desc(struct usbd_device *udev, uint8_t confidx, usb_config_descriptor_t *d); +usbd_status usbreq_get_config_desc_full(struct usbd_device *udev, uint8_t conf, void *d, uint16_t size); usbd_status usbreq_get_device_desc(struct usbd_device *udev, usb_device_descriptor_t *d); usbd_status usbreq_get_interface(struct usbd_device *udev, uint8_t iface_index, uint8_t *aiface); usbd_status usbreq_set_interface(struct usbd_device *udev, uint8_t iface_index, uint8_t altno); @@ -720,6 +729,7 @@ void usb_cdev_put_data_error(struct usb_cdev *sc); uint8_t usb_cdev_get_data(struct usb_cdev *sc, uint8_t *buf, uint32_t len, uint32_t *actlen, uint8_t what); void usb_cdev_get_data_error(struct usb_cdev *sc); +uint8_t usb_cdev_opened(struct usb_cdev *sc); typedef int32_t (usb_cdev_open_t)(struct usb_cdev *sc, int32_t fflags, int32_t mode, struct thread *td); typedef int32_t (usb_cdev_ioctl_t)(struct usb_cdev *sc, u_long cmd, caddr_t addr, int32_t fflags, struct thread *td); @@ -739,6 +749,7 @@ void *sc_wrq_pointer; struct mtx *sc_mtx_ptr; void *sc_priv_ptr; + void *sc_fifo_ptr; #define USB_CDEV_COUNT 4 struct cdev *sc_cdev[USB_CDEV_COUNT]; struct cdev *sc_last_cdev; @@ -808,4 +819,15 @@ /* prototypes from "usb_compat_linux.c" */ void usb_linux_free_usb_device(struct usb_device *dev); +/* USB clone support */ +struct usbd_clone { + struct mtx mtx; + struct usb_cdev cdev; + + struct usbd_bus *bus; + struct usbd_clone *next; + + uint8_t unit; +}; + #endif /* _USB_SUBR_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Jun 4 07:14:16 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 491AB16A469; Mon, 4 Jun 2007 07:14:16 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 F351016A421 for ; Mon, 4 Jun 2007 07:14:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E45E413C447 for ; Mon, 4 Jun 2007 07:14:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l547EFjM041951 for ; Mon, 4 Jun 2007 07:14:15 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l547EFXP041945 for perforce@freebsd.org; Mon, 4 Jun 2007 07:14:15 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 4 Jun 2007 07:14:15 GMT Message-Id: <200706040714.l547EFXP041945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120884 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, 04 Jun 2007 07:14:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=120884 Change 120884 by hselasky@hselasky_mini_itx on 2007/06/04 07:13:18 Some nits here and there. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ufm.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/ums.c#18 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ufm.c#10 (text+ko) ==== @@ -207,7 +207,7 @@ sc->sc_cdev.sc_ioctl = &ufm_ioctl; error = usb_cdev_attach(&(sc->sc_cdev), sc, &(sc->sc_mtx), p_buf, - UID_ROOT, GID_OPERATOR, 0644, 1, 1, 1, 1); + UID_ROOT, GID_OPERATOR, 0644, 0, 0, 0, 0); if (error) { goto detach; } ==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#18 (text+ko) ==== @@ -541,7 +541,7 @@ ufoma_cfg_do_request(sc, &req, sc->sc_modetable); - error = mtx_sleep(&(sc->sc_currentmode), &Giant, PZERO, "ufoma_link", hz); + error = mtx_sleep(&(sc->sc_currentmode), &Giant, 0, "ufoma_link", hz); if(error){ DPRINTF(sc, 0, "NO response\n"); @@ -563,7 +563,8 @@ ufoma_cfg_do_request(sc, &req, NULL); - error = mtx_sleep(&(sc->sc_currentmode), &Giant, PZERO, "fmaact", (UFOMA_MAX_TIMEOUT*hz)); + error = mtx_sleep(&(sc->sc_currentmode), &Giant, 0, + "fmaact", (UFOMA_MAX_TIMEOUT*hz)); if(error){ DPRINTF(sc, 0, "No response\n"); } ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#17 (text+ko) ==== @@ -514,6 +514,7 @@ struct ugen_softc *sc = DEV2SC(dev); struct ugen_endpoint *sce = DEV2SCE(dev); struct usbd_xfer *temp_xfer[4]; + int32_t error; PRINTFN(5, ("flag=%d, mode=%d\n", flag, mode)); @@ -547,7 +548,7 @@ } /* wait for routine(s) to exit */ - mtx_sleep(sce, &sc->sc_mtx, PRIBIO, "ugensync", 0); + error = mtx_sleep(sce, &sc->sc_mtx, 0, "ugensync", 0); } /* free all memory after that one has @@ -1021,8 +1022,8 @@ sce->state |= (UGEN_RD_SLP|UGEN_RD_WUP); - error = mtx_sleep(sce, &sc->sc_mtx, (PZERO|PCATCH), - "ugen wait callback", 0); + error = mtx_sleep(sce, &sc->sc_mtx, PCATCH, + "ugen wait callback", 0); sce->state &= ~(UGEN_RD_SLP|UGEN_RD_WUP); @@ -1245,8 +1246,8 @@ sce->state |= (UGEN_WR_SLP|UGEN_WR_WUP); - error = mtx_sleep(sce, &sc->sc_mtx, (PZERO|PCATCH), - "ugen wait callback", 0); + error = mtx_sleep(sce, &sc->sc_mtx, PCATCH, + "ugen wait callback", 0); sce->state &= ~(UGEN_WR_SLP|UGEN_WR_WUP); @@ -1875,7 +1876,7 @@ #define si ((struct usb_string_desc *)addr) if(usbreq_get_string_desc (sc->sc_udev, si->usd_string_index, - si->usd_language_id, &si->usd_desc, &len)) + si->usd_language_id, &si->usd_desc, NULL)) { error = EINVAL; break; ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#17 (text+ko) ==== @@ -461,7 +461,7 @@ tr_error: /* bomb out */ sc->sc_flags &= ~UKBD_FLAG_INTR_STALL; - DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); + DPRINTF(-1, "error=%s\n", usbd_errstr(xfer->error)); return; } @@ -546,7 +546,7 @@ return; tr_error: - DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error)); + DPRINTF(-1, "error=%s\n", usbd_errstr(xfer->error)); return; } ==== //depot/projects/usb/src/sys/dev/usb/umodem.c#20 (text+ko) ==== @@ -130,8 +130,8 @@ struct ucom_super_softc sc_super_ucom; struct ucom_softc sc_ucom; - struct usbd_xfer * sc_xfer_data[UMODEM_N_DATA_TRANSFER]; - struct usbd_xfer * sc_xfer_intr[UMODEM_N_INTR_TRANSFER]; + struct usbd_xfer *sc_xfer_data[UMODEM_N_DATA_TRANSFER]; + struct usbd_xfer *sc_xfer_intr[UMODEM_N_INTR_TRANSFER]; struct usbd_device *sc_udev; u_int16_t sc_line; ==== //depot/projects/usb/src/sys/dev/usb/ums.c#18 (text+ko) ==== @@ -175,7 +175,7 @@ tr_error: /* bomb out */ sc->sc_flags &= ~UMS_FLAG_INTR_STALL; - DPRINTF(0, "clear stall failed, error=%s!\n", + DPRINTF(-1, "clear stall failed, error=%s!\n", usbd_errstr(xfer->error)); return; } @@ -537,7 +537,7 @@ err = usb_cdev_attach(&(sc->sc_cdev), sc, &(sc->sc_mtx), p_buf, UID_ROOT, GID_OPERATOR, 0644, UMS_BUF_SIZE, UMS_IFQ_MAXLEN, - 1, 1 /* dummy write buffer */); + 0, 0); if (err) { goto detach; } From owner-p4-projects@FreeBSD.ORG Mon Jun 4 07:17:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A30F216A469; Mon, 4 Jun 2007 07:17:20 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 7496216A421 for ; Mon, 4 Jun 2007 07:17:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6561B13C487 for ; Mon, 4 Jun 2007 07:17:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l547HKCb044810 for ; Mon, 4 Jun 2007 07:17:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l547HKfK044801 for perforce@freebsd.org; Mon, 4 Jun 2007 07:17:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 4 Jun 2007 07:17:20 GMT Message-Id: <200706040717.l547HKfK044801@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120885 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, 04 Jun 2007 07:17:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=120885 Change 120885 by hselasky@hselasky_mini_itx on 2007/06/04 07:16:51 This is the start of a completely new /dev/usbX backend that can be used to access any USB device on the USB bus. "/dev/usbX" now uses the "usb_cdev" system that makes it detach safe among other things. Remove support for "usbd", "/dev/usb" hence this utility has been replaced by "devd". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/usb.h#10 edit .. //depot/projects/usb/src/sys/dev/usb/usb_requests.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#37 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb.c#13 (text+ko) ==== @@ -50,11 +50,8 @@ #include #include -#include /* UIO_XXX */ #include #include -#include /* FXXX */ -#include /* IOR()/IOW()/IORW() */ #include #include #include @@ -63,13 +60,7 @@ #include #include #include -#include - -#define DEV2UNIT(d) (minor(d)) -#define DEV2BUS(d) (*((struct usbd_bus **)&((d)->si_drv1))) -#define USB_DEV_MINOR 255 /* event queue device */ - MALLOC_DEFINE(M_USB, "USB", "USB"); MALLOC_DEFINE(M_USBDEV, "USBdev", "USB device"); MALLOC_DEFINE(M_USBHC, "USBHC", "USB host controller"); @@ -83,58 +74,82 @@ int usbdebug = 0; SYSCTL_INT(_hw_usb, OID_AUTO, debug, CTLFLAG_RW, &usbdebug, 0, "usb debug level"); +#endif -/* - * 0 - do usual exploration - * 1 - do not use timeout exploration - * >1 - do no exploration - */ -int usb_noexplore = 0; +#if ((__FreeBSD_version >= 700001) || (__FreeBSD_version == 0) || \ + ((__FreeBSD_version >= 600034) && (__FreeBSD_version < 700000))) +#define USB_UCRED struct ucred *ucred, +#else +#define USB_UCRED #endif -#define USB_MAX_EVENTS 100 -struct usb_event_wrapper -{ - struct usb_event ue; - TAILQ_ENTRY(usb_event_wrapper) next; -}; +uint8_t usb_driver_added_refcount; -static TAILQ_HEAD(, usb_event_wrapper) usb_events = - TAILQ_HEAD_INITIALIZER(usb_events); +static uint8_t usb_post_init_called = 0; -#ifndef usb_global_lock -struct mtx usb_global_lock; -#endif - static device_probe_t usb_probe; static device_attach_t usb_attach; static device_detach_t usb_detach; -/* these variables are protected by "usb_global_lock" */ -static int usb_nevents = 0; -static struct selinfo usb_selevent; -static struct proc *usb_async_proc; /* process that wants USB SIGIO */ -static int usb_dev_open = 0; +static int usb_dummy_open(struct cdev *dev, int oflags, int devtype, struct thread *td); +static void usb_discover(struct usbd_bus *bus); +static void usb_event_thread(struct usbd_bus *bus); +static void usb_create_event_thread(struct usbd_bus *bus); +static void __usb_attach(device_t dev, struct usbd_bus *bus); +static void usb_post_init(void *arg); +static struct usbd_clone *usb_clone_sub(struct usbd_bus *bus); +static void usb_clone_remove(struct usbd_bus *bus); +static void usb_clone(void *arg, USB_UCRED char *name, int namelen, struct cdev **dev); +static int usb_ioctl(struct usb_cdev *dev, u_long cmd, caddr_t addr, int32_t fflags, struct thread *td); +static void usb_init(void *arg); +static void usb_uninit(void *arg); + +static devclass_t usb_devclass; +static driver_t usb_driver = +{ + .name = "usb", + .methods = (device_method_t []) + { + DEVMETHOD(device_probe, usb_probe), + DEVMETHOD(device_attach, usb_attach), + DEVMETHOD(device_detach, usb_detach), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + {0,0} + }, + .size = 0, /* the softc must be set by the attacher! */ +}; + +DRIVER_MODULE(usb, ohci, usb_driver, usb_devclass, 0, 0); +DRIVER_MODULE(usb, uhci, usb_driver, usb_devclass, 0, 0); +DRIVER_MODULE(usb, ehci, usb_driver, usb_devclass, 0, 0); + +MODULE_DEPEND(usb, usb, 1, 1, 1); +MODULE_VERSION(usb, 1); + +static cdevsw_t usb_dummy_cdevsw = { + .d_version = D_VERSION, + .d_open = usb_dummy_open, + .d_name = "usb_dummy_cdev", +}; -/**/ -static const char * const usbrev_str[] = USBREV_STR; +static int +usb_dummy_open(struct cdev *dev, int oflags, int devtype, struct thread *td) +{ + return ENODEV; +} -/* - * usb_discover - explore the device tree from the root - * - * usb_discover device nodes, kthread - */ +/*------------------------------------------------------------------------* + * usb_discover - explore the device tree from the root + *------------------------------------------------------------------------*/ static void usb_discover(struct usbd_bus *bus) { + int32_t error; + PRINTFN(2,("\n")); -#ifdef USB_DEBUG - if(usb_noexplore > 1) - { - return; - } -#endif mtx_assert(&usb_global_lock, MA_OWNED); /* check that only one thread is exploring @@ -144,8 +159,8 @@ { bus->wait_explore = 1; - mtx_sleep(&bus->wait_explore, &usb_global_lock, PWAIT, - "usb wait explore", 0); + error = mtx_sleep(&bus->wait_explore, &usb_global_lock, 0, + "usb wait explore", 0); } bus->is_exploring = 1; @@ -179,6 +194,8 @@ static void usb_event_thread(struct usbd_bus *bus) { + int32_t error; + mtx_lock(&usb_global_lock); while(1) @@ -188,20 +205,11 @@ break; } -#ifdef USB_DEBUG - if(usb_noexplore < 2) -#endif - { - usb_discover(bus); - } + usb_discover(bus); + + error = mtx_sleep(&bus->needs_explore, &usb_global_lock, + 0, "usbevt", hz * 60); -#ifdef USB_DEBUG - mtx_sleep(&bus->needs_explore, &usb_global_lock, PWAIT, - "usbevt", usb_noexplore ? 0 : hz * 60); -#else - mtx_sleep(&bus->needs_explore, &usb_global_lock, PWAIT, - "usbevt", hz * 60); -#endif PRINTFN(2,("woke up\n")); } @@ -231,8 +239,6 @@ return; } -u_int8_t usb_driver_added_refcount; - void usb_needs_probe_and_attach(void) { @@ -286,128 +292,8 @@ return; } -static int -usb_event_get_next(struct usb_event *ue) -{ - struct usb_event_wrapper *uew; - int err; - - mtx_lock(&usb_global_lock); - - uew = TAILQ_FIRST(&usb_events); - - if(uew == NULL) - { - usb_nevents = 0; - err = 0; - } - else - { - *ue = uew->ue; - - TAILQ_REMOVE(&usb_events, uew, next); - - free(uew, M_USBDEV); - - if(usb_nevents) - { - usb_nevents--; - } - err = 1; - } - mtx_unlock(&usb_global_lock); - return (err); -} - -static void -usb_event_add(int type, struct usb_event *uep) -{ - struct usb_event_wrapper *uew; - struct timeval thetime; +/* called from "{ehci,ohci,uhci}_pci_attach()" */ - uew = malloc(sizeof *uew, M_USBDEV, M_WAITOK|M_ZERO); - if(uew == NULL) - { - return; - } - uew->ue = *uep; - uew->ue.ue_type = type; - microtime(&thetime); - TIMEVAL_TO_TIMESPEC(&thetime, &uew->ue.ue_time); - - mtx_lock(&usb_global_lock); - - if(USB_EVENT_IS_DETACH(type)) - { - struct usb_event_wrapper *uewi, *uewi_next; - - for (uewi = TAILQ_FIRST(&usb_events); - uewi; - uewi = uewi_next) - { - uewi_next = TAILQ_NEXT(uewi, next); - if(uewi->ue.u.ue_driver.ue_cookie.cookie == - uep->u.ue_device.udi_cookie.cookie) - { - TAILQ_REMOVE(&usb_events, uewi, next); - free(uewi, M_USBDEV); - usb_nevents--; - uewi_next = TAILQ_FIRST(&usb_events); - } - } - } - if(usb_nevents >= USB_MAX_EVENTS) - { - /* too many queued events, drop an old one */ - PRINTF(("event dropped\n")); - - struct usb_event ue; - (void)usb_event_get_next(&ue); - } - TAILQ_INSERT_TAIL(&usb_events, uew, next); - usb_nevents++; - wakeup(&usb_events); - selwakeuppri(&usb_selevent, PZERO); - if(usb_async_proc != NULL) - { - PROC_LOCK(usb_async_proc); - psignal(usb_async_proc, SIGIO); - PROC_UNLOCK(usb_async_proc); - } - - mtx_unlock(&usb_global_lock); - return; -} - -void -usbd_add_dev_event(int type, struct usbd_device *udev) -{ - struct usb_event ue; - - bzero(&ue, sizeof(ue)); - - usbd_fill_deviceinfo(udev, &ue.u.ue_device, - USB_EVENT_IS_ATTACH(type)); - usb_event_add(type, &ue); - return; -} - -void -usbd_add_drv_event(int type, struct usbd_device *udev, device_t dev) -{ - struct usb_event ue; - - bzero(&ue, sizeof(ue)); - - ue.u.ue_driver.ue_cookie = udev->cookie; - strncpy(ue.u.ue_driver.ue_devname, device_get_nameunit(dev), - sizeof ue.u.ue_driver.ue_devname); - usb_event_add(type, &ue); - return; -} - -/* called from uhci_pci_attach */ - static int usb_probe(device_t dev) { @@ -415,15 +301,12 @@ return (UMATCH_GENERIC); } -extern cdevsw_t usb_cdevsw; - static void __usb_attach(device_t dev, struct usbd_bus *bus) { + dev_clone_fn usb_clone_ptr = &usb_clone; usbd_status err; u_int8_t speed; - struct usb_event ue; - struct cdev *cdev; PRINTF(("\n")); @@ -431,36 +314,38 @@ bus->root_port.power = USB_MAX_POWER; - device_printf(bus->bdev, "USB revision %s", - usbrev_str[bus->usbrev]); + switch (bus->usbrev) { + case USBREV_1_0: + speed = USB_SPEED_FULL; + device_printf(bus->bdev, "12MBps Full Speed USB v1.0\n"); + break; - switch (bus->usbrev) - { - case USBREV_1_0: case USBREV_1_1: speed = USB_SPEED_FULL; + device_printf(bus->bdev, "12MBps Full Speed USB v1.1\n"); break; case USBREV_2_0: speed = USB_SPEED_HIGH; + device_printf(bus->bdev, "480MBps High Speed USB v2.0\n"); + break; + + case USBREV_2_5: + speed = USB_SPEED_VARIABLE; + device_printf(bus->bdev, "Wireless USB v2.5\n"); break; default: - printf(", not supported\n"); + device_printf(bus->bdev, "Unsupported USB revision!\n"); return; } - printf("\n"); - /* make sure not to use tsleep() if we are cold booting */ if(cold) { bus->use_polling++; } - ue.u.ue_ctrlr.ue_bus = device_get_unit(bus->bdev); - usb_event_add(USB_EVENT_CTRLR_ATTACH, &ue); - err = usbd_new_device(bus->bdev, bus, 0, speed, 0, &bus->root_port); if(!err) @@ -495,20 +380,24 @@ usb_create_event_thread(bus); - /* the per controller devices (used for usb_discover) */ - /* XXX This is redundant now, but old usbd's will want it */ - cdev = make_dev(&usb_cdevsw, device_get_unit(dev), UID_ROOT, GID_OPERATOR, - 0660, "usb%d", device_get_unit(dev)); + snprintf(bus->usb_name, sizeof(bus->usb_name), "usb%u", device_get_unit(dev)); + + bus->usb_clone_tag = EVENTHANDLER_REGISTER(dev_clone, usb_clone_ptr, bus, 1000); + if (bus->usb_clone_tag == NULL) { + device_printf(dev, "Registering clone handler failed!\n"); + } + + /* create a dummy device so that we are visible */ + bus->usb_cdev = + make_dev(&usb_dummy_cdevsw, device_get_unit(dev), + UID_ROOT, GID_OPERATOR, 0660, "%s ", bus->usb_name); - if(cdev) - { - DEV2BUS(cdev) = bus; + if (bus->usb_cdev == NULL) { + device_printf(dev, "Creating dummy device failed!\n"); } return; } -static u_int8_t usb_post_init_called = 0; - static int usb_attach(device_t dev) { @@ -572,7 +461,7 @@ usb_detach(device_t dev) { struct usbd_bus *bus = device_get_softc(dev); - struct usb_event ue; + int32_t error; PRINTF(("start\n")); @@ -583,8 +472,8 @@ { bus->wait_explore = 1; - mtx_sleep(&bus->wait_explore, &usb_global_lock, PWAIT, - "usb wait explore", 0); + mtx_sleep(&bus->wait_explore, &usb_global_lock, 0, + "usb wait explore", 0); } /* detach children first */ @@ -604,19 +493,13 @@ { wakeup(&bus->needs_explore); - if(mtx_sleep(bus, &usb_global_lock, PWAIT, "usbdet", hz * 60)) - { - device_printf(bus->bdev, - "event thread didn't die\n"); - } + error = mtx_sleep(bus, &usb_global_lock, 0, "usbdet", 0); + PRINTF(("event thread dead\n")); } mtx_unlock(&usb_global_lock); - ue.u.ue_ctrlr.ue_bus = device_get_unit(bus->bdev); - usb_event_add(USB_EVENT_CTRLR_DETACH, &ue); - mtx_lock(&bus->mtx); if(bus->bdev == dev) { @@ -632,351 +515,345 @@ device_printf(dev, "unexpected bus->bdev value!\n"); } mtx_unlock(&bus->mtx); + + if (bus->usb_cdev) { + destroy_dev(bus->usb_cdev); + bus->usb_cdev = NULL; + } + + if (bus->usb_clone_tag) { + EVENTHANDLER_DEREGISTER(dev_clone, bus->usb_clone_tag); + bus->usb_clone_tag = NULL; + } + + usb_clone_remove(bus); + return (0); } -static int -usbopen(struct cdev *dev, int flag, int mode, struct thread *proc) +static struct usbd_clone * +usb_clone_sub(struct usbd_bus *bus) { - int error = 0; + struct usbd_clone *sub; + int32_t error; + const char *p_name[2]; + char n_name[64]; + + mtx_lock(&(bus->mtx)); + sub = bus->usb_clone_root; + mtx_unlock(&(bus->mtx)); + + while (sub) { + if (!usb_cdev_opened(&(sub->cdev))) { + return sub; + } + sub = sub->next; + } + + sub = malloc(sizeof(*sub), M_USBDEV, M_ZERO|M_WAITOK); + if (sub == NULL) { + return NULL; + } - mtx_lock(&usb_global_lock); + mtx_lock(&(bus->mtx)); + sub->unit = bus->usb_clone_count; + if (bus->usb_clone_count < USB_BUS_MAX_CLONES) { + bus->usb_clone_count ++; + } + mtx_unlock(&(bus->mtx)); - if(DEV2UNIT(dev) == USB_DEV_MINOR) - { - if(usb_dev_open) - { - error = EBUSY; - goto done; - } - usb_dev_open = 1; - usb_async_proc = 0; + if (sub->unit >= USB_BUS_MAX_CLONES) { + /* limit reached */ + goto error; } - else - { - struct usbd_bus *bus = DEV2BUS(dev); + + snprintf(n_name, sizeof(n_name), "%s.%02x", bus->usb_name, sub->unit); + + mtx_init(&(sub->mtx), "usb_clone", NULL, MTX_DEF|MTX_RECURSE); + + p_name[0] = n_name; + p_name[1] = NULL; + + sub->cdev.sc_ioctl = &usb_ioctl; + sub->bus = bus; - if(bus->root_port.device == NULL) - { - /* device is beeing detached */ - error = EIO; - goto done; - } + error = usb_cdev_attach(&(sub->cdev), sub, &(sub->mtx), + p_name, UID_ROOT, GID_OPERATOR, 0660, + 0, 0, 0, 0); + if (error) { + goto error; } - done: - mtx_unlock(&usb_global_lock); - return (error); + /* insert sub-device into a one-way linked list */ + + mtx_lock(&(bus->mtx)); + sub->next = bus->usb_clone_root; + bus->usb_clone_root = sub; + mtx_unlock(&(bus->mtx)); + return sub; + + error: + free(sub, M_USBDEV); + return NULL; } -static int -usbread(struct cdev *dev, struct uio *uio, int flag) +static void +usb_clone_remove(struct usbd_bus *bus) { - struct usb_event ue; - int error = 0; + struct usbd_clone *sub; + struct usbd_clone *next; + uint8_t done = 0; - if(DEV2UNIT(dev) != USB_DEV_MINOR) - { - return (ENODEV); - } + while (1) { - if(uio->uio_resid != sizeof(struct usb_event)) - { - return (EINVAL); - } + /* first prevent any further clones from + * being created: + */ + mtx_lock(&(bus->mtx)); + bus->usb_clone_count = USB_BUS_MAX_CLONES; + sub = bus->usb_clone_root; + bus->usb_clone_root = NULL; + mtx_unlock(&(bus->mtx)); - mtx_lock(&usb_global_lock); + /* XXX wait for any leftover VOP_LOOKUP() calls + * to finish. Really we should lock some lock + * here to lock that problem out! --hps + */ + usb_delay_ms(bus, 500); - for(;;) - { - if(usb_event_get_next(&ue) != 0) - { - break; + if (sub == NULL) { + if (done) { + break; + } else { + done = 1; } - if(flag & IO_NDELAY) - { - error = EWOULDBLOCK; - break; - } - error = mtx_sleep(&usb_events, &usb_global_lock, - (PZERO|PCATCH), "usbrea", 0); - if(error) - { - break; - } - } + } else { + done = 0; + } + + /* teardown all cloned devices */ + while (sub) { + + usb_cdev_detach(&(sub->cdev)); + + next = sub->next; + + mtx_destroy(&(sub->mtx)); - mtx_unlock(&usb_global_lock); + free(sub, M_USBDEV); - if(!error) - { - error = uiomove((void *)&ue, uio->uio_resid, uio); + sub = next; + } } - return (error); + return; } -static int -usbclose(struct cdev *dev, int flag, int mode, struct thread *proc) +static void +usb_clone(void *arg, USB_UCRED char *name, int namelen, struct cdev **dev) { - if(DEV2UNIT(dev) == USB_DEV_MINOR) - { - mtx_lock(&usb_global_lock); + struct usbd_bus *bus = arg; + struct usbd_clone *sub; + + if (*dev) { + return; + } - usb_async_proc = 0; - usb_dev_open = 0; + if (strcmp(name, bus->usb_name) != 0) { + return; + } - mtx_unlock(&usb_global_lock); + sub = usb_clone_sub(bus); + if (sub == NULL) { + return; } - return (0); + + *dev = sub->cdev.sc_cdev[0]; + + dev_ref(*dev); + return; } static int -usbioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *p) +usb_ioctl(struct usb_cdev *dev, u_long cmd, caddr_t addr, + int32_t fflags, struct thread *td) { + struct usbd_clone *sub = dev->sc_priv_ptr; + struct usbd_bus *bus = sub->bus; + struct usbd_device *udev = 0; int error = 0; - mtx_lock(&usb_global_lock); + usb_cdev_unlock(dev, fflags); - if(DEV2UNIT(dev) == USB_DEV_MINOR) - { - switch (cmd) - { - case FIONBIO: - /* all handled in the upper FS layer */ - break; + switch (cmd) { + /* this part should be deleted */ + case USB_DISCOVER: + break; - case FIOASYNC: - if(*(int *)data) - usb_async_proc = p->td_proc; - else - usb_async_proc = 0; - - break; - - default: - error = EINVAL; - break; - } - } - else + case USB_REQUEST: { - struct usbd_bus *bus = DEV2BUS(dev); + struct usb_ctl_request *ur = (void *)addr; + uint16_t len = UGETW(ur->ucr_request.wLength); + uint8_t isread = (ur->ucr_request.bmRequestType & UT_READ) ? 1 : 0; + void *ptr = 0; - if(bus->root_port.device == NULL) - { - /* detached */ - error = EIO; + udev = usbd_ref_device(bus, ur->ucr_addr); + if (udev == NULL) { + error = ENXIO; goto done; } - switch (cmd) - { - /* this part should be deleted */ - case USB_DISCOVER: - break; - case USB_REQUEST: - { - struct usb_ctl_request *ur = (void *)data; - int len = UGETW(ur->ucr_request.wLength); - struct iovec iov; - struct uio uio; - void *ptr = 0; - int addr = ur->ucr_addr; - usbd_status err; - int error = 0; + PRINTF(("USB_REQUEST addr=%d len=%d\n", ur->ucr_addr, len)); - PRINTF(("USB_REQUEST addr=%d len=%d\n", addr, len)); - if((len < 0) || - (len > 32768)) - { - error = EINVAL; - goto done; + if (len != 0) { + ptr = malloc(len, M_TEMP, M_WAITOK); + if (ptr == NULL) { + error = ENOMEM; + goto ret001; } - - if((addr < 0) || - (addr >= USB_MAX_DEVICES) || - (bus->devices[addr] == 0 /* might be checked by usbd_do_request_flags */)) - { - error = EINVAL; - goto done; - } - - if(len != 0) - { - iov.iov_base = (caddr_t)ur->ucr_data; - iov.iov_len = len; - uio.uio_iov = &iov; - uio.uio_iovcnt = 1; - uio.uio_resid = len; - uio.uio_offset = 0; - uio.uio_segflg = UIO_USERSPACE; - uio.uio_rw = - ur->ucr_request.bmRequestType & UT_READ ? - UIO_READ : UIO_WRITE; - uio.uio_procp = p; - ptr = malloc(len, M_TEMP, M_WAITOK); - if(uio.uio_rw == UIO_WRITE) - { - error = uiomove(ptr, len, &uio); - if(error) - { - goto ret; - } - } - } - err = usbd_do_request_flags - (bus->devices[addr], &ur->ucr_request, ptr, - ur->ucr_flags, &ur->ucr_actlen, - USBD_DEFAULT_TIMEOUT); - if(err) - { - error = EIO; - goto ret; - } - if(len != 0) - { - if(uio.uio_rw == UIO_READ) - { - error = uiomove(ptr, len, &uio); - if(error) - { - goto ret; - } + if (isread == 0) { + error = copyin(ur->ucr_data, ptr, len); + if (error) { + goto ret001; } } - ret: - if(ptr) - { - free(ptr, M_TEMP); - } - goto done; } - case USB_DEVICEINFO: - { - struct usb_device_info *di = (void *)data; - int addr = di->udi_addr; + mtx_lock(dev->sc_mtx_ptr); + error = usbd_do_request_flags_mtx + (udev, dev->sc_mtx_ptr, &ur->ucr_request, ptr, ur->ucr_flags, + &ur->ucr_actlen, USBD_DEFAULT_TIMEOUT); + mtx_unlock(dev->sc_mtx_ptr); + + if (error) { + error = EIO; + goto ret001; + } - if((addr < 1) || - (addr >= USB_MAX_DEVICES)) - { - error = EINVAL; - goto done; + if (len != 0) { + if (isread) { + error = copyout(ptr, ur->ucr_data, len); + if (error) { + goto ret001; + } } + } + ret001: + if (ptr) { + free(ptr, M_TEMP); + } + usbd_unref_device(udev); + goto done; + } - if (bus->devices[addr] == 0) - { - error = ENXIO; - goto done; - } + case USB_DEVICEINFO: + { + struct usb_device_info *di = (void *)addr; - error = usbd_fill_deviceinfo(bus->devices[addr], di, 1); - goto done; + udev = usbd_ref_device(bus, di->udi_addr); + if (udev == NULL) { + error = ENXIO; + goto done; } - case USB_DEVICESTATS: - *(struct usb_device_stats *)data = bus->stats; - break; + error = usbd_fill_deviceinfo(udev, di, 1); - default: - error = EINVAL; - break; - } + usbd_unref_device(udev); + goto done; } - done: - mtx_unlock(&usb_global_lock); - return (error); -} + case USB_DEVICESTATS: + *(struct usb_device_stats *)addr = bus->stats; + break; -static int -usbpoll(struct cdev *dev, int events, struct thread *td) -{ - int revents, mask; - int unit = DEV2UNIT(dev); + case USB_DEVICEENUMERATE: + { + struct usb_device_enumerate *ude = (void *)addr; + struct usbd_port *pp; + usb_port_status_t ps; + uint8_t old_addr; + uint8_t buf[8]; - if(unit == USB_DEV_MINOR) - { - revents = 0; - mask = POLLIN | POLLRDNORM; + udev = usbd_ref_device(bus, ude->ude_addr); + if (udev == NULL) { + error = ENXIO; + goto done; + } - mtx_lock(&usb_global_lock); + old_addr = udev->address; + pp = udev->powersrc; + if (pp == NULL) { + error = EINVAL; + goto ret002; + } - if((events & mask) && (usb_nevents > 0)) - { - revents |= events & mask; + error = usbreq_reset_port(pp->parent, pp->portno, &ps); + if (error) { + error = ENXIO; + goto ret002; } - if((revents == 0) && (events & mask)) - { - selrecord(td, &usb_selevent); + + /* After that the port has been reset + * our device should be at address + * zero: + */ + udev->address = 0; + + /* It should be allowed to read some descriptors + * from address zero: + */ + error = usbreq_get_desc(udev, UDESC_DEVICE, 0, 8, buf, 0); + if (error) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 4 07:18:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7907316A469; Mon, 4 Jun 2007 07:18:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 3EA8616A41F for ; Mon, 4 Jun 2007 07:18:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3062813C448 for ; Mon, 4 Jun 2007 07:18:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l547IMmO045681 for ; Mon, 4 Jun 2007 07:18:22 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l547ILKQ045675 for perforce@freebsd.org; Mon, 4 Jun 2007 07:18:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 4 Jun 2007 07:18:21 GMT Message-Id: <200706040718.l547ILKQ045675@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120886 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, 04 Jun 2007 07:18:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=120886 Change 120886 by hselasky@hselasky_mini_itx on 2007/06/04 07:18:14 Remove unused function. Use usbd_transfer_start() where possible instead of usbd_transfer_start_safe(). Some style changes (tabify). Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#25 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#25 (text+ko) ==== @@ -1,3 +1,6 @@ +#include +__FBSDID("$FreeBSD: src/sys/dev/usb/usb_transfer.c $"); + /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -35,7 +38,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include @@ -47,8 +49,6 @@ #include #include -__FBSDID("$FreeBSD: src/sys/dev/usb2/usb_transfer.c $"); - #ifdef USB_DEBUG void usbd_dump_iface(struct usbd_interface *iface) @@ -1284,7 +1284,11 @@ usbd_copy_in(&(xfer->buf_data), sizeof(*req), data, length); } - usbd_transfer_start_safe(xfer); + if (mtx) { + usbd_transfer_start(xfer); + } else { + usbd_transfer_start_safe(xfer); + } if(req->bmRequestType & UT_READ) { @@ -1318,11 +1322,12 @@ usbd_fill_get_report(usb_device_request_t *req, u_int8_t iface_no, u_int8_t type, u_int8_t id, u_int16_t size) { - req->bmRequestType = UT_READ_CLASS_INTERFACE; - req->bRequest = UR_GET_REPORT; - USETW2(req->wValue, type, id); - USETW(req->wIndex, iface_no); - USETW(req->wLength, size); + req->bmRequestType = UT_READ_CLASS_INTERFACE; + req->bRequest = UR_GET_REPORT; + USETW2(req->wValue, type, id); + req->wIndex[0] = iface_no; + req->wIndex[1] = 0; + USETW(req->wLength, size); return; } @@ -1330,12 +1335,12 @@ usbd_fill_set_report(usb_device_request_t *req, u_int8_t iface_no, u_int8_t type, u_int8_t id, u_int16_t size) { - req->bmRequestType = UT_WRITE_CLASS_INTERFACE; - req->bRequest = UR_SET_REPORT; - USETW2(req->wValue, type, id); + req->bmRequestType = UT_WRITE_CLASS_INTERFACE; + req->bRequest = UR_SET_REPORT; + USETW2(req->wValue, type, id); req->wIndex[0] = iface_no; req->wIndex[1] = 0; - USETW(req->wLength, size); + USETW(req->wLength, size); return; } @@ -1464,23 +1469,6 @@ } /* - * usbd_ratecheck() can limit the number of error messages that occurs. - * When a device is unplugged it may take up to 0.25s for the hub driver - * to notice it. If the driver continuosly tries to do I/O operations - * this can generate a large number of messages. - */ -int -usbd_ratecheck(struct timeval *last) -{ - if(last->tv_sec == time_second) - { - return (0); - } - last->tv_sec = time_second; - return (1); -} - -/* * Search for a vendor/product pair in an array. The item size is * given as an argument. */ From owner-p4-projects@FreeBSD.ORG Mon Jun 4 07:21:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6223916A41F; Mon, 4 Jun 2007 07:21:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 F1B5416A468 for ; Mon, 4 Jun 2007 07:21:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E3DD213C43E for ; Mon, 4 Jun 2007 07:21:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l547LRM6047772 for ; Mon, 4 Jun 2007 07:21:27 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l547LR92047740 for perforce@freebsd.org; Mon, 4 Jun 2007 07:21:27 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 4 Jun 2007 07:21:27 GMT Message-Id: <200706040721.l547LR92047740@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120887 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, 04 Jun 2007 07:21:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=120887 Change 120887 by hselasky@hselasky_mini_itx on 2007/06/04 07:20:42 Compile fix. The USB project should be compilable now, if I did not forget anything! Affected files ... .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#12 (text+ko) ==== @@ -378,7 +378,7 @@ static u_int16_t uaudio_mixer_determine_class(const struct uaudio_terminal_node *iot, struct uaudio_mixer_node *mix); -static const u_int16_t +static u_int16_t uaudio_mixer_feature_name(const struct uaudio_terminal_node *iot, struct uaudio_mixer_node *mix); @@ -2566,7 +2566,7 @@ { 0x0000, SOUND_MIXER_VOLUME }, }; -static const u_int16_t +static u_int16_t uaudio_mixer_feature_name(const struct uaudio_terminal_node *iot, struct uaudio_mixer_node *mix) { From owner-p4-projects@FreeBSD.ORG Mon Jun 4 17:23:59 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CED516A46C; Mon, 4 Jun 2007 17:23:59 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 CF7A116A421 for ; Mon, 4 Jun 2007 17:23:58 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BE82813C45E for ; Mon, 4 Jun 2007 17:23:58 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l54HNwGP082727 for ; Mon, 4 Jun 2007 17:23:58 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l54HNwjT082718 for perforce@freebsd.org; Mon, 4 Jun 2007 17:23:58 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 4 Jun 2007 17:23:58 GMT Message-Id: <200706041723.l54HNwjT082718@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120919 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, 04 Jun 2007 17:23:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=120919 Change 120919 by rdivacky@rdivacky_witten on 2007/06/04 17:23:48 o Introduce kern_get_at() function instead of duplicating the same code everywhere o Reimplement kern_symlink and kern_unlink as wrappers around their *at counterparts to avoid code duplication o vrele(dir_vn) in kern_symlink and kern_unlink as necessary The code upto this commit has bugs :( including panics, deadlocks etc. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#15 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#15 (text+ko) ==== @@ -85,6 +85,7 @@ static int setfflags(struct thread *td, struct vnode *, int); static int setutimes(struct thread *td, struct vnode *, const struct timespec *, int, int); +static int kern_get_at(struct thread *td, int dirfd, struct vnode **dir_vn); static int vn_access(struct vnode *vp, int user_flags, struct ucred *cred, struct thread *td); static int kern_common_open(struct thread *td, int flags, int mode, @@ -984,6 +985,26 @@ return kern_common_open(td, flags, mode, &nd); } +static int +kern_get_at(struct thread *td, int dirfd, struct vnode **dir_vn) +{ + int error; + + if (dirfd == AT_FDCWD) + *dir_vn = NULL; + else { + error = fgetvp(td, dirfd, dir_vn); + if (error) + return (error); + if ((*dir_vn)->v_type != VDIR) { + vrele(*dir_vn); + return (ENOTDIR); + } + } + + return (0); +} + int kern_openat(struct thread *td, char *path, enum uio_seg pathseg, int flags, int mode, int dirfd) @@ -996,22 +1017,14 @@ AUDIT_ARG(mode, mode); /* XXX: audit dirfd */ - if (dirfd == AT_FDCWD) - dir_vn = NULL; - else { - error = fgetvp(td, dirfd, &dir_vn); - if (error) - return (error); - if (dir_vn->v_type != VDIR) { - vrele(dir_vn); - return (ENOTDIR); - } - } + error = kern_get_at(td, dirfd, &dir_vn); + if (error) + return (error); NDINIT_AT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); error = kern_common_open(td, flags, mode, &nd); - if (dirfd != AT_FDCWD) + if (dir_vn) vrele(dir_vn); return (error); } @@ -1462,47 +1475,25 @@ int error; struct vnode *pdir_vn, *ldir_vn; - if (olddirfd == AT_FDCWD) - pdir_vn = NULL; - else { - error = fgetvp(td, olddirfd, &pdir_vn); - if (error) - return (error); - if (pdir_vn->v_type != VDIR) { - vrele(pdir_vn); - return (ENOTDIR); - } - } + error = kern_get_at(td, olddirfd, &pdir_vn); + if (error) + return (error); NDINIT_AT(&ndp, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, segflg, path, td, pdir_vn); - if (newdirfd == AT_FDCWD) - ldir_vn = NULL; - else { - error = fgetvp(td, newdirfd, &ldir_vn); - if (error) - return (error); - if (ldir_vn->v_type != VDIR) { - vrele(ldir_vn); - return (ENOTDIR); - } - } + error = kern_get_at(td, newdirfd, &ldir_vn); + if (error) + return (error); NDINIT_AT(&ndl, CREATE, LOCKPARENT | SAVENAME| MPSAFE | AUDITVNODE1, segflg, link, td, ldir_vn); error = kern_common_link(td, &ndp, &ndl); - if (olddirfd != AT_FDCWD) + if (pdir_vn) vrele(pdir_vn); - if (newdirfd != AT_FDCWD) + if (ldir_vn) vrele(ldir_vn); return (error); - - NDINIT(&ndp, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, segflg, path, td); - NDINIT(&ndl, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE2, - segflg, link, td); - - return kern_common_link(td, &ndp, &ndl); } static int @@ -1587,73 +1578,7 @@ int kern_symlink(struct thread *td, char *path, char *link, enum uio_seg segflg) { - struct mount *mp; - struct vattr vattr; - char *syspath; - int error; - struct nameidata nd; - int vfslocked; - - if (segflg == UIO_SYSSPACE) { - syspath = path; - } else { - syspath = uma_zalloc(namei_zone, M_WAITOK); - if ((error = copyinstr(path, syspath, MAXPATHLEN, NULL)) != 0) - goto out; - } - AUDIT_ARG(text, syspath); -restart: - bwillwrite(); - NDINIT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, - segflg, link, td); - if ((error = namei(&nd)) != 0) - goto out; - vfslocked = NDHASGIANT(&nd); - if (nd.ni_vp) { - NDFREE(&nd, NDF_ONLY_PNBUF); - if (nd.ni_vp == nd.ni_dvp) - vrele(nd.ni_dvp); - else - vput(nd.ni_dvp); - vrele(nd.ni_vp); - VFS_UNLOCK_GIANT(vfslocked); - error = EEXIST; - goto out; - } - if (vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { - NDFREE(&nd, NDF_ONLY_PNBUF); - vput(nd.ni_dvp); - VFS_UNLOCK_GIANT(vfslocked); - if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) - goto out; - goto restart; - } - VATTR_NULL(&vattr); - FILEDESC_SLOCK(td->td_proc->p_fd); - vattr.va_mode = ACCESSPERMS &~ td->td_proc->p_fd->fd_cmask; - FILEDESC_SUNLOCK(td->td_proc->p_fd); -#ifdef MAC - vattr.va_type = VLNK; - error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, - &vattr); - if (error) - goto out2; -#endif - VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); - error = VOP_SYMLINK(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr, syspath); - if (error == 0) - vput(nd.ni_vp); -#ifdef MAC -out2: -#endif - NDFREE(&nd, NDF_ONLY_PNBUF); - vput(nd.ni_dvp); - vn_finished_write(mp); - VFS_UNLOCK_GIANT(vfslocked); -out: - if (segflg != UIO_SYSSPACE) - uma_zfree(namei_zone, syspath); - return (error); + return kern_symlinkat(td, path, link, segflg, AT_FDCWD); } int @@ -1666,7 +1591,7 @@ int error; struct nameidata nd; int vfslocked; - struct vnode *dir_vn; + struct vnode *dir_vn = NULL; if (segflg == UIO_SYSSPACE) { syspath = path; @@ -1677,17 +1602,11 @@ } AUDIT_ARG(text, syspath); restart: - if (dirfd == AT_FDCWD) - dir_vn = NULL; - else { - error = fgetvp(td, dirfd, &dir_vn); - if (error) - return (error); - if (dir_vn->v_type != VDIR) { - vrele(dir_vn); - return (ENOTDIR); - } - } + if (dir_vn) + vrele(dir_vn); + error = kern_get_at(td, dirfd, &dir_vn); + if (error) + return (error); bwillwrite(); NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, segflg, link, td, dir_vn); @@ -1736,6 +1655,8 @@ vn_finished_write(mp); VFS_UNLOCK_GIANT(vfslocked); out: + if (dir_vn) + vrele(dir_vn); if (segflg != UIO_SYSSPACE) uma_zfree(namei_zone, syspath); return (error); @@ -1817,94 +1738,32 @@ int kern_unlink(struct thread *td, char *path, enum uio_seg pathseg) { - struct mount *mp; - struct vnode *vp; - int error; - struct nameidata nd; - int vfslocked; - -restart: - bwillwrite(); - NDINIT(&nd, DELETE, LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, - pathseg, path, td); - if ((error = namei(&nd)) != 0) - return (error == EINVAL ? EPERM : error); - vfslocked = NDHASGIANT(&nd); - vp = nd.ni_vp; - if (vp->v_type == VDIR) - error = EPERM; /* POSIX */ - else { - /* - * The root of a mounted filesystem cannot be deleted. - * - * XXX: can this only be a VDIR case? - */ - if (vp->v_vflag & VV_ROOT) - error = EBUSY; - } - if (error == 0) { - if (vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { - NDFREE(&nd, NDF_ONLY_PNBUF); - vput(nd.ni_dvp); - if (vp == nd.ni_dvp) - vrele(vp); - else - vput(vp); - VFS_UNLOCK_GIANT(vfslocked); - if ((error = vn_start_write(NULL, &mp, - V_XSLEEP | PCATCH)) != 0) - return (error); - goto restart; - } -#ifdef MAC - error = mac_check_vnode_delete(td->td_ucred, nd.ni_dvp, vp, - &nd.ni_cnd); - if (error) - goto out; -#endif - VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); - error = VOP_REMOVE(nd.ni_dvp, vp, &nd.ni_cnd); -#ifdef MAC -out: -#endif - vn_finished_write(mp); - } - NDFREE(&nd, NDF_ONLY_PNBUF); - vput(nd.ni_dvp); - if (vp == nd.ni_dvp) - vrele(vp); - else - vput(vp); - VFS_UNLOCK_GIANT(vfslocked); - return (error); + return kern_unlinkat(td, path, pathseg, AT_FDCWD); } int kern_unlinkat(struct thread *td, char *path, enum uio_seg pathseg, int dirfd) { struct mount *mp; - struct vnode *vp, *dir_vn; + struct vnode *vp, *dir_vn = NULL; int error; struct nameidata nd; int vfslocked; restart: - if (dirfd == AT_FDCWD) - dir_vn = NULL; - else { - error = fgetvp(td, dirfd, &dir_vn); - if (error) - return (error); - if (dir_vn->v_type != VDIR) { - vrele(dir_vn); - return (ENOTDIR); - } - } + if (dir_vn) + vrele(dir_vn); + error = kern_get_at(td, dirfd, &dir_vn); + if (error) + return (error); bwillwrite(); NDINIT_AT(&nd, DELETE, LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); - if ((error = namei(&nd)) != 0) + if ((error = namei(&nd)) != 0) { + if (dir_vn) + vrele(dir_vn); return (error == EINVAL ? EPERM : error); + } vfslocked = NDHASGIANT(&nd); vp = nd.ni_vp; if (vp->v_type == VDIR) @@ -1928,8 +1787,11 @@ vput(vp); VFS_UNLOCK_GIANT(vfslocked); if ((error = vn_start_write(NULL, &mp, - V_XSLEEP | PCATCH)) != 0) + V_XSLEEP | PCATCH)) != 0) { + if (dir_vn) + vrele(dir_vn); return (error); + } goto restart; } #ifdef MAC @@ -1947,6 +1809,8 @@ } NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); + if (dir_vn) + vrele(dir_vn); if (vp == nd.ni_dvp) vrele(vp); else @@ -2149,23 +2013,15 @@ struct nameidata nd; struct vnode *dir_vn; - if (dirfd == AT_FDCWD) - dir_vn = NULL; - else { - error = fgetvp(td, dirfd, &dir_vn); - if (error) - return (error); - if (dir_vn->v_type != VDIR) { - vrele(dir_vn); - return (ENOTDIR); - } - } + error = kern_get_at(td, dirfd, &dir_vn); + if (error) + return (error); NDINIT_AT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); error = kern_common_access(td, flags, &nd); - if (dirfd != AT_FDCWD) + if (dir_vn) vrele(dir_vn); return (error); } @@ -2379,23 +2235,15 @@ struct nameidata nd; struct vnode *dir_vn; - if (dirfd == AT_FDCWD) - dir_vn = NULL; - else { - error = fgetvp(td, dirfd, &dir_vn); - if (error) - return (error); - if (dir_vn->v_type != VDIR) { - vrele(dir_vn); - return (ENOTDIR); - } - } + error = kern_get_at(td, dirfd, &dir_vn); + if (error) + return (error); NDINIT_AT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); error = kern_common_stat(td, sbp, &nd); - if (dirfd != AT_FDCWD) + if (dir_vn) vrele(dir_vn); return (error); } @@ -2466,23 +2314,15 @@ struct nameidata nd; struct vnode *dir_vn; - if (dirfd == AT_FDCWD) - dir_vn = NULL; - else { - error = fgetvp(td, dirfd, &dir_vn); - if (error) - return (error); - if (dir_vn->v_type != VDIR) { - vrele(dir_vn); - return (ENOTDIR); - } - } + error = kern_get_at(td, dirfd, &dir_vn); + if (error) + return (error); NDINIT_AT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | LOCKSHARED | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); error = kern_common_lstat(td, sbp, &nd); - if (dirfd != AT_FDCWD) + if (dir_vn) vrele(dir_vn); return (error); } @@ -2677,23 +2517,15 @@ struct nameidata nd; struct vnode *dir_vn; - if (dirfd == AT_FDCWD) - dir_vn = NULL; - else { - error = fgetvp(td, dirfd, &dir_vn); - if (error) - return (error); - if (dir_vn->v_type != VDIR) { - vrele(dir_vn); - return (ENOTDIR); - } - } + error = kern_get_at(td, dirfd, &dir_vn); + if (error) + return (error); NDINIT_AT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); error = kern_common_readlink(td, buf, bufseg, count, &nd); - if (dirfd != AT_FDCWD) + if (dir_vn) vrele(dir_vn); return (error); } @@ -2950,22 +2782,14 @@ struct nameidata nd; struct vnode *dir_vn; - if (dirfd == AT_FDCWD) - dir_vn = NULL; - else { - error = fgetvp(td, dirfd, &dir_vn); - if (error) - return (error); - if (dir_vn->v_type != VDIR) { - vrele(dir_vn); - return (ENOTDIR); - } - } + error = kern_get_at(td, dirfd, &dir_vn); + if (error) + return (error); NDINIT_AT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); error = kern_common_chmod(td, mode, &nd); - if (dirfd != AT_FDCWD) + if (dir_vn) vrele(dir_vn); return (error); } @@ -3132,22 +2956,14 @@ struct nameidata nd; struct vnode *dir_vn; - if (dirfd == AT_FDCWD) - dir_vn = NULL; - else { - error = fgetvp(td, dirfd, &dir_vn); - if (error) - return (error); - if (dir_vn->v_type != VDIR) { - vrele(dir_vn); - return (ENOTDIR); - } - } + error = kern_get_at(td, dirfd, &dir_vn); + if (error) + return (error); NDINIT_AT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); error = kern_common_chown(td, uid, gid, &nd); - if (dirfd != AT_FDCWD) + if (dir_vn) vrele(dir_vn); return (error); } @@ -3211,22 +3027,14 @@ struct nameidata nd; struct vnode *dir_vn; - if (dirfd == AT_FDCWD) - dir_vn = NULL; - else { - error = fgetvp(td, dirfd, &dir_vn); - if (error) - return (error); - if (dir_vn->v_type != VDIR) { - vrele(dir_vn); - return (ENOTDIR); - } - } + error = kern_get_at(td, dirfd, &dir_vn); + if (error) + return (error); NDINIT_AT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); error = kern_common_chown(td, uid, gid, &nd); - if (dirfd != AT_FDCWD) + if (dir_vn) vrele(dir_vn); return (error); @@ -3978,69 +3786,7 @@ int kern_rmdir(struct thread *td, char *path, enum uio_seg pathseg) { - struct mount *mp; - struct vnode *vp; - int error; - struct nameidata nd; - int vfslocked; - -restart: - bwillwrite(); - NDINIT(&nd, DELETE, LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, - pathseg, path, td); - if ((error = namei(&nd)) != 0) - return (error); - vfslocked = NDHASGIANT(&nd); - vp = nd.ni_vp; - if (vp->v_type != VDIR) { - error = ENOTDIR; - goto out; - } - /* - * No rmdir "." please. - */ - if (nd.ni_dvp == vp) { - error = EINVAL; - goto out; - } - /* - * The root of a mounted filesystem cannot be deleted. - */ - if (vp->v_vflag & VV_ROOT) { - error = EBUSY; - goto out; - } -#ifdef MAC - error = mac_check_vnode_delete(td->td_ucred, nd.ni_dvp, vp, - &nd.ni_cnd); - if (error) - goto out; -#endif - if (vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { - NDFREE(&nd, NDF_ONLY_PNBUF); - vput(vp); - if (nd.ni_dvp == vp) - vrele(nd.ni_dvp); - else - vput(nd.ni_dvp); - VFS_UNLOCK_GIANT(vfslocked); - if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) - return (error); - goto restart; - } - VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); - error = VOP_RMDIR(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd); - vn_finished_write(mp); -out: - NDFREE(&nd, NDF_ONLY_PNBUF); - vput(vp); - if (nd.ni_dvp == vp) - vrele(nd.ni_dvp); - else - vput(nd.ni_dvp); - VFS_UNLOCK_GIANT(vfslocked); - return (error); + return kern_rmdirat(td, path, pathseg, AT_FDCWD); } int @@ -4053,17 +3799,9 @@ int vfslocked; restart: - if (dirfd == AT_FDCWD) - dir_vn = NULL; - else { - error = fgetvp(td, dirfd, &dir_vn); - if (error) - return (error); - if (dir_vn->v_type != VDIR) { - vrele(dir_vn); - return (ENOTDIR); - } - } + error = kern_get_at(td, dirfd, &dir_vn); + if (error) + return (error); bwillwrite(); NDINIT_AT(&nd, DELETE, LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); From owner-p4-projects@FreeBSD.ORG Mon Jun 4 19:05:07 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE3D916A421; Mon, 4 Jun 2007 19:05:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 7859B16A400 for ; Mon, 4 Jun 2007 19:05:07 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 674D613C43E for ; Mon, 4 Jun 2007 19:05:07 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l54J5756082726 for ; Mon, 4 Jun 2007 19:05:07 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l54J57TX082696 for perforce@freebsd.org; Mon, 4 Jun 2007 19:05:07 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 4 Jun 2007 19:05:07 GMT Message-Id: <200706041905.l54J57TX082696@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120925 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, 04 Jun 2007 19:05:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=120925 Change 120925 by rdivacky@rdivacky_witten on 2007/06/04 19:04:41 Modify kern_alternate_path() to take dirfd argument as this is needed for linuxulator. Use it as such for *at syscalls. Finally those functions work reliably. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysvec.c#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#9 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#8 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_uid16.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_util.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_util.h#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/svr4/svr4_sysvec.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/ibcs2/ibcs2_util.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysvec.c#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_lookup.c#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#8 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysvec.c#3 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -787,7 +788,7 @@ */ if ((error = exec_shell_imgact(imgp)) == 0) { linux_emul_convpath(FIRST_THREAD_IN_PROC(imgp->proc), - imgp->interpreter_name, UIO_SYSSPACE, &rpath, 0); + imgp->interpreter_name, UIO_SYSSPACE, &rpath, 0, AT_FDCWD); if (rpath != NULL) { len = strlen(rpath) + 1; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#9 (text+ko) ==== @@ -183,33 +183,26 @@ int linux_openat(struct thread *td, struct linux_openat_args *args) { - char *newpath, *path; - int error, dirfd; + char *path; + int dfd; - path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - error = copyinstr(args->filename, path, MAXPATHLEN, NULL); - if (error) { - free(path, M_TEMP); - return (error); - } + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; if (args->flags & LINUX_O_CREAT) - LCONVPATH_SEG(td, path, &newpath, 1, UIO_SYSSPACE); + LCONVPATH_AT(td, args->filename, &path, 1, dfd); else - LCONVPATH_SEG(td, path, &newpath, 0, UIO_SYSSPACE); - free(path, M_TEMP); + LCONVPATH_AT(td, args->filename, &path, 0, dfd); #ifdef DEBUG if (ldebug(openat)) +#endif printf(ARGS(openat, "%i, %s, 0x%x, 0x%x"), args->dfd, - newpath, args->flags, args->mode); -#endif - if (args->dfd == LINUX_AT_FDCWD) - dirfd = AT_FDCWD; - else - dirfd = args->dfd; + path, args->flags, args->mode); - return linux_common_open(td, path, args->flags, args->mode, dirfd); + return linux_common_open(td, path, args->flags, args->mode, dfd); } int @@ -587,18 +580,18 @@ if (args->mode & ~(F_OK | X_OK | W_OK | R_OK)) return (EINVAL); - LCONVPATHEXIST(td, args->filename, &path); + if (args->dfd == LINUX_AT_FDCWD) + dfd = -1; + else + dfd = args->dfd; + + LCONVPATHEXIST_AT(td, args->filename, &path, dfd); #ifdef DEBUG if (ldebug(access)) printf(ARGS(access, "%s, %d"), path, args->mode); #endif - if (args->dfd == LINUX_AT_FDCWD) - dfd = -1; - else - dfd = args->dfd; - error = kern_accessat(td, path, UIO_SYSSPACE, args->mode, dfd); LFREEPATH(path); @@ -639,25 +632,25 @@ if (args->flag & ~LINUX_AT_REMOVEDIR) return (EINVAL); - LCONVPATHEXIST(td, args->pathname, &path); + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + LCONVPATHEXIST_AT(td, args->pathname, &path, dfd); #ifdef DEBUG if (ldebug(unlinkat)) printf(ARGS(unlinkat, "%s"), path); #endif - if (args->dfd == LINUX_AT_FDCWD) - dfd = AT_FDCWD; - else - dfd = args->dfd; - if (args->flag & LINUX_AT_REMOVEDIR) error = kern_rmdirat(td, path, UIO_SYSSPACE, dfd); else error = kern_unlinkat(td, path, UIO_SYSSPACE, dfd); if (error == EPERM) /* Introduce POSIX noncompliant behaviour of Linux */ - if (kern_stat(td, path, UIO_SYSSPACE, &st) == 0) + if (kern_statat(td, path, UIO_SYSSPACE, &st, dfd) == 0) if (S_ISDIR(st.st_mode)) error = EISDIR; LFREEPATH(path); @@ -703,17 +696,17 @@ char *path; int error, dfd; - LCONVPATHEXIST(td, args->filename, &path); + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + LCONVPATHEXIST_AT(td, args->filename, &path, dfd); #ifdef DEBUG if (ldebug(fchmodat)) printf(ARGS(fchmodat, "%s, %d"), path, args->mode); #endif - - if (args->dfd == LINUX_AT_FDCWD) - dfd = AT_FDCWD; - else - dfd = args->dfd; error = kern_chmodat(td, path, UIO_SYSSPACE, args->mode, dfd); LFREEPATH(path); @@ -761,7 +754,7 @@ LCONVPATHEXIST(td, args->from, &from); /* Expand LCONVPATHCREATE so that `from' can be freed on errors */ - error = linux_emul_convpath(td, args->to, UIO_USERSPACE, &to, 1); + error = linux_emul_convpath(td, args->to, UIO_USERSPACE, &to, 1, AT_FDCWD); if (to == NULL) { LFREEPATH(from); return (error); @@ -785,7 +778,7 @@ LCONVPATHEXIST(td, args->path, &path); /* Expand LCONVPATHCREATE so that `path' can be freed on errors */ - error = linux_emul_convpath(td, args->to, UIO_USERSPACE, &to, 1); + error = linux_emul_convpath(td, args->to, UIO_USERSPACE, &to, 1, AT_FDCWD); if (to == NULL) { LFREEPATH(path); return (error); @@ -807,9 +800,14 @@ char *path, *to; int error, dfd; - LCONVPATHEXIST(td, args->oldname, &path); + if (args->newdfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->newdfd; + + LCONVPATHEXIST_AT(td, args->oldname, &path, dfd); /* Expand LCONVPATHCREATE so that `path' can be freed on errors */ - error = linux_emul_convpath(td, args->newname, UIO_USERSPACE, &to, 1); + error = linux_emul_convpath(td, args->newname, UIO_USERSPACE, &to, 1, dfd); if (to == NULL) { LFREEPATH(path); return (error); @@ -819,10 +817,6 @@ if (ldebug(symlinkat)) printf(ARGS(symlinkat, "%s, %s"), path, to); #endif - if (args->newdfd == LINUX_AT_FDCWD) - dfd = AT_FDCWD; - else - dfd = args->newdfd; error = kern_symlinkat(td, path, to, UIO_SYSSPACE, dfd); LFREEPATH(path); @@ -855,7 +849,12 @@ char *name; int error, dfd; - LCONVPATHEXIST(td, args->path, &name); + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + LCONVPATHEXIST_AT(td, args->path, &name, dfd); #ifdef DEBUG if (ldebug(readlinkat)) @@ -863,11 +862,6 @@ args->bufsiz); #endif - if (args->dfd == LINUX_AT_FDCWD) - dfd = AT_FDCWD; - else - dfd = args->dfd; - error = kern_readlinkat(td, name, UIO_SYSSPACE, args->buf, UIO_USERSPACE, args->bufsiz, dfd); LFREEPATH(name); @@ -914,7 +908,7 @@ LCONVPATHEXIST(td, args->path, &path); /* Expand LCONVPATHCREATE so that `path' can be freed on errors */ - error = linux_emul_convpath(td, args->to, UIO_USERSPACE, &to, 1); + error = linux_emul_convpath(td, args->to, UIO_USERSPACE, &to, 1, AT_FDCWD); if (to == NULL) { LFREEPATH(path); return (error); @@ -943,9 +937,19 @@ if (args->flags != 0) return (EINVAL); - LCONVPATHEXIST(td, args->oldname, &path); + if (args->olddfd == LINUX_AT_FDCWD) + olddfd = AT_FDCWD; + else + olddfd = args->olddfd; + + if (args->newdfd == LINUX_AT_FDCWD) + newdfd = AT_FDCWD; + else + newdfd = args->newdfd; + + LCONVPATHEXIST_AT(td, args->oldname, &path, olddfd); /* Expand LCONVPATHCREATE so that `path' can be freed on errors */ - error = linux_emul_convpath(td, args->newname, UIO_USERSPACE, &to, 1); + error = linux_emul_convpath(td, args->newname, UIO_USERSPACE, &to, 1, newdfd); if (to == NULL) { LFREEPATH(path); return (error); @@ -956,16 +960,7 @@ printf(ARGS(linkat, "%i, %s, %i, %s, %i"), args->olddfd, path, args->newdfd, to, args->flags); #endif - if (args->olddfd == LINUX_AT_FDCWD) - olddfd = AT_FDCWD; - else - olddfd = args->olddfd; - if (args->newdfd == LINUX_AT_FDCWD) - newdfd = AT_FDCWD; - else - newdfd = args->newdfd; - error = kern_linkat(td, path, to, UIO_SYSSPACE, olddfd, newdfd); LFREEPATH(path); LFREEPATH(to); @@ -1446,17 +1441,17 @@ if (args->flag & ~LINUX_AT_SYMLINK_NOFOLLOW) return (EINVAL); - LCONVPATHEXIST(td, args->filename, &path); + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + LCONVPATHEXIST_AT(td, args->filename, &path, dfd); #ifdef DEBUG if (ldebug(fchownat)) printf(ARGS(fchownat, "%s, %d, %d"), path, args->uid, args->gid); #endif - - if (args->dfd == LINUX_AT_FDCWD) - dfd = AT_FDCWD; - else - dfd = args->dfd; if (args->flag & LINUX_AT_SYMLINK_NOFOLLOW) error = kern_lchownat(td, path, UIO_SYSSPACE, args->uid, args->gid, dfd); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#8 (text+ko) ==== @@ -608,18 +608,18 @@ if (args->flag & ~LINUX_AT_SYMLINK_NOFOLLOW) return (EINVAL); - LCONVPATHEXIST(td, args->pathname, &path); + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + LCONVPATHEXIST_AT(td, args->pathname, &path, dfd); #ifdef DEBUG if (ldebug(fstatat64)) printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, path, args->flag); #endif - if (args->dfd == LINUX_AT_FDCWD) - dfd = AT_FDCWD; - else - dfd = args->dfd; - if (args->flag & LINUX_AT_SYMLINK_NOFOLLOW) error = kern_lstatat(td, path, UIO_SYSSPACE, &buf, dfd); else ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_uid16.c#2 (text+ko) ==== @@ -29,6 +29,7 @@ #include "opt_compat.h" +#include #include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_util.c#2 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -65,16 +66,17 @@ * named file, i.e. we check if the directory it should be in exists. */ int -linux_emul_convpath(td, path, pathseg, pbuf, cflag) +linux_emul_convpath(td, path, pathseg, pbuf, cflag, dfd) struct thread *td; char *path; enum uio_seg pathseg; char **pbuf; int cflag; + int dfd; { - return (kern_alternate_path(td, linux_emul_path, path, pathseg, pbuf, - cflag)); + return kern_alternate_path(td, linux_emul_path, path, pathseg, pbuf, + cflag, dfd); } void ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_util.h#2 (text+ko) ==== @@ -51,22 +51,23 @@ extern const char linux_emul_path[]; -int linux_emul_convpath(struct thread *, char *, enum uio_seg, char **, int); +int linux_emul_convpath(struct thread *, char *, enum uio_seg, char **, int, int); -#define LCONVPATH_SEG(td, upath, pathp, i, seg) \ +#define LCONVPATH_AT(td, upath, pathp, i, dfd) \ do { \ int _error; \ \ - _error = linux_emul_convpath(td, upath, seg, \ - pathp, i); \ + _error = linux_emul_convpath(td, upath, UIO_USERSPACE, \ + pathp, i, dfd); \ if (*(pathp) == NULL) \ return (_error); \ } while (0) #define LCONVPATH(td, upath, pathp, i) \ - LCONVPATH_SEG(td, upath, pathp, i, UIO_USERSPACE) + LCONVPATH_AT(td, upath, pathp, i, AT_FDCWD) #define LCONVPATHEXIST(td, upath, pathp) LCONVPATH(td, upath, pathp, 0) +#define LCONVPATHEXIST_AT(td, upath, pathp, dfd) LCONVPATH_AT(td, upath, pathp, 0, dfd) #define LCONVPATHCREAT(td, upath, pathp) LCONVPATH(td, upath, pathp, 1) #define LFREEPATH(path) free(path, M_TEMP) ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/svr4/svr4_sysvec.c#2 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -258,7 +259,7 @@ { return (kern_alternate_path(td, svr4_emul_path, path, pathseg, pbuf, - create)); + create, AT_FDCWD)); } static int ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/ibcs2/ibcs2_util.c#2 (text+ko) ==== @@ -32,6 +32,7 @@ #include __FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_util.c,v 1.19 2005/02/07 22:02:18 jhb Exp $"); +#include #include #include #include @@ -55,5 +56,5 @@ { return (kern_alternate_path(td, ibcs2_emul_path, path, pathseg, pbuf, - cflag)); + cflag, AT_FDCWD)); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysvec.c#2 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -775,7 +776,7 @@ */ if ((error = exec_shell_imgact(imgp)) == 0) { linux_emul_convpath(FIRST_THREAD_IN_PROC(imgp->proc), - imgp->interpreter_name, UIO_SYSSPACE, &rpath, 0); + imgp->interpreter_name, UIO_SYSSPACE, &rpath, 0, AT_FDCWD); if (rpath != NULL) { len = strlen(rpath) + 1; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_lookup.c#5 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -1004,12 +1005,13 @@ */ int kern_alternate_path(struct thread *td, const char *prefix, char *path, - enum uio_seg pathseg, char **pathbuf, int create) + enum uio_seg pathseg, char **pathbuf, int create, int dirfd) { struct nameidata nd, ndroot; char *ptr, *buf, *cp; size_t len, sz; int error; + struct vnode *dir_vn; buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK); *pathbuf = buf; @@ -1042,6 +1044,18 @@ goto keeporig; } + if (dirfd == AT_FDCWD) + dir_vn = NULL; + else { + /* + * we want the original because the "prefix" + * is included in the already opened dirfd + */ + bcopy(ptr, buf, len); + return (0); + } + + /* * We know that there is a / somewhere in this pathname. * Search backwards for it, to find the file's parent dir @@ -1054,13 +1068,13 @@ for (cp = &ptr[len] - 1; *cp != '/'; cp--); *cp = '\0'; - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_SYSSPACE, buf, td); + NDINIT_AT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_SYSSPACE, buf, td, dir_vn); error = namei(&nd); *cp = '/'; if (error != 0) goto keeporig; } else { - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_SYSSPACE, buf, td); + NDINIT_AT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_SYSSPACE, buf, td, dir_vn); error = namei(&nd); if (error != 0) ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#8 (text+ko) ==== @@ -60,7 +60,7 @@ int kern_adjtime(struct thread *td, struct timeval *delta, struct timeval *olddelta); int kern_alternate_path(struct thread *td, const char *prefix, char *path, - enum uio_seg pathseg, char **pathbuf, int create); + enum uio_seg pathseg, char **pathbuf, int create, int dirfd); int kern_bind(struct thread *td, int fd, struct sockaddr *sa); int kern_chdir(struct thread *td, char *path, enum uio_seg pathseg); int kern_chmod(struct thread *td, char *path, enum uio_seg pathseg, From owner-p4-projects@FreeBSD.ORG Mon Jun 4 19:06:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 470E716A469; Mon, 4 Jun 2007 19:06:12 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 23AF916A421 for ; Mon, 4 Jun 2007 19:06:12 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 11F1D13C448 for ; Mon, 4 Jun 2007 19:06:12 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l54J6BeB083654 for ; Mon, 4 Jun 2007 19:06:11 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l54J68uV083594 for perforce@freebsd.org; Mon, 4 Jun 2007 19:06:08 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 4 Jun 2007 19:06:08 GMT Message-Id: <200706041906.l54J68uV083594@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 120926 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, 04 Jun 2007 19:06:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=120926 Change 120926 by mjacob@mjexp on 2007/06/04 19:05:38 IFC Affected files ... .. //depot/projects/mjexp/share/mk/Makefile#3 integrate .. //depot/projects/mjexp/share/mk/bsd.port.options.mk#1 branch .. //depot/projects/mjexp/sys/amd64/amd64/machdep.c#12 integrate .. //depot/projects/mjexp/sys/amd64/amd64/tsc.c#3 integrate .. //depot/projects/mjexp/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/mjexp/sys/amd64/isa/clock.c#6 integrate .. //depot/projects/mjexp/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/mjexp/sys/arm/include/vmparam.h#4 integrate .. //depot/projects/mjexp/sys/cam/cam_xpt.c#13 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/mjexp/sys/conf/Makefile.ia64#4 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/mjexp/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/mjexp/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi_ec.c#5 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi_timer.c#3 integrate .. //depot/projects/mjexp/sys/dev/ath/if_ath.c#12 integrate .. //depot/projects/mjexp/sys/dev/bge/if_bge.c#17 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/mjexp/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/mjexp/sys/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/mjexp/sys/dev/gem/if_gemvar.h#4 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfi.c#10 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfivar.h#5 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpilib/mpi_log_fc.h#2 delete .. //depot/projects/mjexp/sys/dev/mpt/mpilib/mpi_log_sas.h#2 delete .. //depot/projects/mjexp/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt.c#10 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt.h#14 integrate .. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#23 integrate .. //depot/projects/mjexp/sys/dev/pccbb/pccbb.c#9 integrate .. //depot/projects/mjexp/sys/dev/pccbb/pccbb_pci.c#4 integrate .. //depot/projects/mjexp/sys/dev/pccbb/pccbbvar.h#4 integrate .. //depot/projects/mjexp/sys/dev/sound/clone.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/atiixp.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/emu10kx.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/envy24ht.c#9 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/es137x.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.c#13 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/via8233.c#8 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/ac97.c#8 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/channel.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/dsp.c#8 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/feeder.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/feeder_fmt.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/feeder_rate.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/feeder_volume.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/mixer.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/sndstat.c#5 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/sound.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/vchan.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/usb/uaudio_pcm.c#4 integrate .. //depot/projects/mjexp/sys/dev/speaker/spkr.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/mjexp/sys/geom/cache/g_cache.c#2 integrate .. //depot/projects/mjexp/sys/geom/journal/g_journal.c#5 integrate .. //depot/projects/mjexp/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/mjexp/sys/i386/i386/elan-mmcr.c#4 integrate .. //depot/projects/mjexp/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/tsc.c#3 integrate .. //depot/projects/mjexp/sys/i386/isa/clock.c#8 integrate .. //depot/projects/mjexp/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_poll.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/mjexp/sys/kern/kern_tc.c#2 integrate .. //depot/projects/mjexp/sys/kern/subr_lock.c#7 integrate .. //depot/projects/mjexp/sys/kern/uipc_socket.c#14 integrate .. //depot/projects/mjexp/sys/netgraph/bluetooth/common/ng_bluetooth.c#2 integrate .. //depot/projects/mjexp/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/mjexp/sys/netgraph/ng_ppp.c#6 integrate .. //depot/projects/mjexp/sys/netinet/sctp_indata.c#14 integrate .. //depot/projects/mjexp/sys/netinet/sctp_os_bsd.h#10 integrate .. //depot/projects/mjexp/sys/netinet/sctp_output.c#15 integrate .. //depot/projects/mjexp/sys/netinet/sctp_pcb.c#14 integrate .. //depot/projects/mjexp/sys/netinet/sctp_pcb.h#10 integrate .. //depot/projects/mjexp/sys/netinet/sctp_usrreq.c#14 integrate .. //depot/projects/mjexp/sys/netinet/tcp_timewait.c#3 integrate .. //depot/projects/mjexp/sys/netinet6/frag6.c#3 integrate .. //depot/projects/mjexp/sys/netinet6/in6.c#6 integrate .. //depot/projects/mjexp/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/mjexp/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/mjexp/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/mjexp/sys/netinet6/sctp6_usrreq.c#12 integrate .. //depot/projects/mjexp/sys/pc98/cbus/clock.c#7 integrate .. //depot/projects/mjexp/sys/security/audit/audit.c#9 integrate .. //depot/projects/mjexp/sys/security/audit/audit.h#4 integrate .. //depot/projects/mjexp/sys/security/audit/audit_arg.c#7 integrate .. //depot/projects/mjexp/sys/security/audit/audit_bsm.c#4 integrate .. //depot/projects/mjexp/sys/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/mjexp/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/mjexp/sys/security/audit/audit_private.h#5 integrate .. //depot/projects/mjexp/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/mjexp/sys/sparc64/include/vmparam.h#4 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/pmap.c#6 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/mjexp/sys/sun4v/include/vmparam.h#4 integrate .. //depot/projects/mjexp/sys/sys/sysctl.h#4 integrate Differences ... ==== //depot/projects/mjexp/share/mk/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/Makefile,v 1.49 2007/04/03 20:15:59 kan Exp $ +# $FreeBSD: src/share/mk/Makefile,v 1.51 2007/06/01 15:32:23 pav Exp $ # @(#)Makefile 8.1 (Berkeley) 6/8/93 FILES= bsd.README @@ -7,8 +7,9 @@ FILES+= bsd.kmod.mk FILES+= bsd.lib.mk bsd.libnames.mk bsd.links.mk bsd.man.mk bsd.nls.mk FILES+= bsd.obj.mk bsd.own.mk -FILES+= bsd.port.mk bsd.port.post.mk bsd.port.pre.mk bsd.port.subdir.mk -FILES+= bsd.prog.mk bsd.snmpmod.mk bsd.subdir.mk bsd.sys.mk bsd.symver.mk +FILES+= bsd.port.mk bsd.port.options.mk bsd.port.post.mk +FILES+= bsd.port.pre.mk bsd.port.subdir.mk bsd.prog.mk +FILES+= bsd.snmpmod.mk bsd.subdir.mk bsd.sys.mk bsd.symver.mk FILES+= sys.mk version_gen.awk NO_OBJ= FILESDIR= ${BINDIR}/mk ==== //depot/projects/mjexp/sys/amd64/amd64/machdep.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.672 2007/05/31 22:52:10 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.673 2007/06/03 23:18:29 alc Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -163,7 +163,13 @@ long Maxmem = 0; long realmem = 0; -#define PHYSMAP_SIZE (2 * 30) +/* + * The number of PHYSMAP entries must be one less than the number of + * PHYSSEG entries because the PHYSMAP entry that spans the largest + * physical address that is accessible by ISA DMA is split into two + * PHYSSEG entries. + */ +#define PHYSMAP_SIZE (2 * (VM_PHYSSEG_MAX - 1)) vm_paddr_t phys_avail[PHYSMAP_SIZE + 2]; vm_paddr_t dump_avail[PHYSMAP_SIZE + 2]; ==== //depot/projects/mjexp/sys/amd64/amd64/tsc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.207 2007/03/26 18:03:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.208 2007/06/04 18:25:01 dwmalone Exp $"); #include "opt_clock.h" @@ -204,7 +204,7 @@ if (tsc_timecounter.tc_frequency == 0) return (EOPNOTSUPP); freq = tsc_freq; - error = sysctl_handle_int(oidp, &freq, sizeof(freq), req); + error = sysctl_handle_quad(oidp, &freq, 0, req); if (error == 0 && req->newptr != NULL) { tsc_freq = freq; tsc_timecounter.tc_frequency = tsc_freq; @@ -212,8 +212,8 @@ return (error); } -SYSCTL_PROC(_machdep, OID_AUTO, tsc_freq, CTLTYPE_LONG | CTLFLAG_RW, - 0, sizeof(u_int), sysctl_machdep_tsc_freq, "IU", ""); +SYSCTL_PROC(_machdep, OID_AUTO, tsc_freq, CTLTYPE_QUAD | CTLFLAG_RW, + 0, sizeof(u_int), sysctl_machdep_tsc_freq, "QU", ""); static unsigned tsc_get_timecount(struct timecounter *tc) ==== //depot/projects/mjexp/sys/amd64/include/vmparam.h#4 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.47 2007/05/05 19:50:26 alc Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.48 2007/06/03 23:18:29 alc Exp $ */ @@ -93,6 +93,44 @@ #define VM_PHYSSEG_DENSE /* + * The number of PHYSSEG entries must be one greater than the number + * of phys_avail entries because the phys_avail entry that spans the + * largest physical address that is accessible by ISA DMA is split + * into two PHYSSEG entries. + */ +#define VM_PHYSSEG_MAX 31 + +/* + * Create two free page pools: VM_FREEPOOL_DEFAULT is the default pool + * from which physical pages are allocated and VM_FREEPOOL_DIRECT is + * the pool from which physical pages for page tables and small UMA + * objects are allocated. + */ +#define VM_NFREEPOOL 2 +#define VM_FREEPOOL_DEFAULT 0 +#define VM_FREEPOOL_DIRECT 1 + +/* + * Create two free page lists: VM_FREELIST_DEFAULT is for physical + * pages that are above the largest physical address that is + * accessible by ISA DMA and VM_FREELIST_ISADMA is for physical pages + * that are below that address. + */ +#define VM_NFREELIST 2 +#define VM_FREELIST_DEFAULT 0 +#define VM_FREELIST_ISADMA 1 + +/* + * An allocation size of 16MB is supported in order to optimize the + * use of the direct map by UMA. Specifically, a cache line contains + * at most 8 PDEs, collectively mapping 16MB of physical memory. By + * reducing the number of distinct 16MB "pages" that are used by UMA, + * the physical memory allocator reduces the likelihood of both 2MB + * page TLB misses and cache misses caused by 2MB page TLB misses. + */ +#define VM_NFREEORDER 13 + +/* * Virtual addresses of things. Derived from the page directory and * page table indexes from pmap.h for precision. * Because of the page that is both a PD and PT, it looks a little ==== //depot/projects/mjexp/sys/amd64/isa/clock.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.230 2007/02/23 12:18:26 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.231 2007/06/04 18:25:02 dwmalone Exp $"); /* * Routines to handle clock hardware. @@ -839,7 +839,7 @@ * is is too generic. Should use it everywhere. */ freq = timer_freq; - error = sysctl_handle_int(oidp, &freq, sizeof(freq), req); + error = sysctl_handle_int(oidp, &freq, 0, req); if (error == 0 && req->newptr != NULL) set_timer_freq(freq, hz); return (error); ==== //depot/projects/mjexp/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 (text) ==== @@ -27,7 +27,7 @@ #include "opt_uart.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.3 2007/04/02 22:00:21 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.4 2007/06/04 17:53:42 marcel Exp $"); #include #include @@ -80,5 +80,6 @@ uart_bus_space_io = &at91_bs_tag; uart_bus_space_mem = NULL; /* Check the environment for overrides */ - return (uart_getenv(devtype, di, class)); + uart_getenv(devtype, di, class); + return (0); } ==== //depot/projects/mjexp/sys/arm/include/vmparam.h#4 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.9 2007/05/28 21:04:22 alc Exp $ + * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.10 2007/06/04 08:02:22 alc Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -59,6 +59,16 @@ #define VM_PHYSSEG_DENSE /* + * Create two free page pools: VM_FREEPOOL_DEFAULT is the default pool + * from which physical pages are allocated and VM_FREEPOOL_DIRECT is + * the pool from which physical pages for small UMA objects are + * allocated. + */ +#define VM_NFREEPOOL 2 +#define VM_FREEPOOL_DEFAULT 0 +#define VM_FREEPOOL_DIRECT 1 + +/* * we support 2 free lists: * * - DEFAULT for all systems @@ -69,6 +79,11 @@ #define VM_FREELIST_DEFAULT 0 #define VM_FREELIST_ISADMA 1 +/* + * The largest allocation size is 1MB. + */ +#define VM_NFREEORDER 9 + #define UPT_MAX_ADDRESS VADDR(UPTPTDI + 3, 0) #define UPT_MIN_ADDRESS VADDR(UPTPTDI, 0) ==== //depot/projects/mjexp/sys/cam/cam_xpt.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.187 2007/05/16 16:57:21 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.188 2007/06/04 18:25:02 dwmalone Exp $"); #include #include @@ -6355,7 +6355,7 @@ int error, bool; bool = cam_srch_hi; - error = sysctl_handle_int(oidp, &bool, sizeof(bool), req); + error = sysctl_handle_int(oidp, &bool, 0, req); if (error != 0 || req->newptr == NULL) return (error); if (bool == 0 || bool == 1) { ==== //depot/projects/mjexp/sys/cam/scsi/scsi_all.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.50 2007/05/23 13:27:37 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.51 2007/06/04 18:25:03 dwmalone Exp $"); #include @@ -3023,7 +3023,7 @@ int error, delay; delay = scsi_delay; - error = sysctl_handle_int(oidp, &delay, sizeof(delay), req); + error = sysctl_handle_int(oidp, &delay, 0, req); if (error != 0 || req->newptr == NULL) return (error); return (set_scsi_delay(delay)); ==== //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kstat.c,v 1.1 2007/04/06 01:09:06 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_kstat.c,v 1.2 2007/06/04 18:25:03 dwmalone Exp $"); #include #include @@ -102,7 +102,7 @@ uint64_t val; val = ksent->value.ui64; - return sysctl_handle_int(oidp, &val, sizeof(val), req); + return sysctl_handle_quad(oidp, &val, 0, req); } void @@ -118,7 +118,7 @@ SYSCTL_ADD_PROC(&ksp->ks_sysctl_ctx, SYSCTL_CHILDREN(ksp->ks_sysctl_root), OID_AUTO, ksent->name, CTLTYPE_QUAD | CTLFLAG_RD, ksent, sizeof(*ksent), - kstat_sysctl, "IU", ""); + kstat_sysctl, "QU", ""); } } ==== //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_vfs.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.5 2007/05/02 01:03:10 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.6 2007/06/04 11:31:45 pjd Exp $"); #include #include @@ -110,7 +110,7 @@ } int -traverse(vnode_t **cvpp) +traverse(vnode_t **cvpp, int lktype) { kthread_t *td = curthread; vnode_t *cvp; @@ -119,7 +119,7 @@ int error; cvp = *cvpp; - error = 0; + tvp = NULL; /* * If this vnode is mounted on, then we transparently indirect @@ -135,22 +135,26 @@ vfsp = vn_mountedvfs(cvp); if (vfsp == NULL) break; - VN_RELE(cvp); + /* + * tvp is NULL for *cvpp vnode, which we can't unlock. + */ + if (tvp != NULL) + vput(cvp); + else + vrele(cvp); /* * The read lock must be held across the call to VFS_ROOT() to * prevent a concurrent unmount from destroying the vfs. */ - error = VFS_ROOT(vfsp, 0, &tvp, td); - if (error) - break; - VOP_UNLOCK(tvp, 0, td); - + error = VFS_ROOT(vfsp, lktype, &tvp, td); + if (error != 0) + return (error); cvp = tvp; } *cvpp = cvp; - return (error); + return (0); } int ==== //depot/projects/mjexp/sys/compat/opensolaris/sys/vfs.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/opensolaris/sys/vfs.h,v 1.1 2007/04/06 01:09:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/vfs.h,v 1.2 2007/06/04 11:31:45 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_VFS_H_ @@ -107,7 +107,7 @@ int flags __unused); void vfs_clearmntopt(vfs_t *vfsp, const char *name); int vfs_optionisset(const vfs_t *vfsp, const char *opt, char **argp); -int traverse(vnode_t **cvpp); +int traverse(vnode_t **cvpp, int lktype); int domount(kthread_t *td, vnode_t *vp, const char *fstype, char *fspath, char *fspec, int fsflags); ==== //depot/projects/mjexp/sys/conf/Makefile.ia64#4 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.69 2007/05/16 17:23:53 wkoszek Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.70 2007/06/02 21:30:39 marcel Exp $ # # Makefile for FreeBSD # @@ -16,8 +16,6 @@ # after which config should be rerun for all machines. # -GCC3= you bet - # Which version of config(8) is required. %VERSREQ= 600004 ==== //depot/projects/mjexp/sys/contrib/ipfilter/netinet/fil.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.50 2006/08/16 12:06:35 guido Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.51 2007/06/04 02:54:35 darrenr Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -17,7 +17,11 @@ #include #if defined(__NetBSD__) # if (NetBSD >= 199905) && !defined(IPFILTER_LKM) && defined(_KERNEL) -# include "opt_ipfilter_log.h" +# if (__NetBSD_Version__ < 399001400) +# include "opt_ipfilter_log.h" +# else +# include "opt_ipfilter.h" +# endif # endif #endif #if defined(_KERNEL) && defined(__FreeBSD_version) && \ @@ -34,6 +38,9 @@ #else # include #endif +#if (defined(__SVR4) || defined(__svr4__)) && defined(sun) +# include +#endif #if !defined(_AIX51) # include #endif @@ -81,7 +88,11 @@ # endif # include "radix_ipf.h" #endif -#include +#ifdef __osf__ +# include "radix_ipf.h" +#else +# include +#endif #include #include #include @@ -100,6 +111,9 @@ #ifdef __hpux # undef _NET_ROUTE_INCLUDED #endif +#ifdef __osf__ +# undef _RADIX_H_ +#endif #include "netinet/ip_compat.h" #ifdef USE_INET6 # include @@ -141,7 +155,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.50 2006/08/16 12:06:35 guido Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.51 2007/06/04 02:54:35 darrenr Exp $"; /* static const char rcsid[] = "@(#)$Id: fil.c,v 2.243.2.78 2006/03/29 11:19:54 darrenr Exp $"; */ #endif @@ -154,7 +168,7 @@ fr_info_t frcache[2][8]; -struct filterstats frstats[2] = { { 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0 } }; +struct filterstats frstats[2]; struct frentry *ipfilter[2][2] = { { NULL, NULL }, { NULL, NULL } }, *ipfilter6[2][2] = { { NULL, NULL }, { NULL, NULL } }, *ipacct6[2][2] = { { NULL, NULL }, { NULL, NULL } }, @@ -235,11 +249,14 @@ static int fr_updateipid __P((fr_info_t *)); #ifdef IPFILTER_LOOKUP static int fr_grpmapinit __P((frentry_t *fr)); -static INLINE void *fr_resolvelookup __P((u_int, u_int, lookupfunc_t *)); +static INLINE void *fr_resolvelookup __P((u_int, u_int, i6addr_t *, lookupfunc_t *)); #endif static void frsynclist __P((frentry_t *, void *)); static ipftuneable_t *fr_findtunebyname __P((const char *)); static ipftuneable_t *fr_findtunebycookie __P((void *, void **)); +static int ipf_geniter __P((ipftoken_t *, ipfgeniter_t *)); +static int ipf_frruleiter __P((void *, int, void *)); +static void ipf_unlinktoken __P((ipftoken_t *)); /* @@ -319,7 +336,7 @@ { "fr_srcgrpmap", fr_srcgrpmap, fr_grpmapinit }, { "fr_dstgrpmap", fr_dstgrpmap, fr_grpmapinit }, #endif - { "", NULL } + { "", NULL, NULL } }; @@ -532,7 +549,16 @@ return IPPROTO_NONE; hdr = fin->fin_dp; - shift = 8 + (hdr->ip6e_len << 3); + switch (proto) + { + case IPPROTO_FRAGMENT : + shift = 8; + break; + default : + shift = 8 + (hdr->ip6e_len << 3); + break; + } + if (shift > fin->fin_dlen) { /* Nasty extension header length? */ fin->fin_flx |= FI_BAD; return IPPROTO_NONE; @@ -551,6 +577,7 @@ break; } + fin->fin_exthdr = fin->fin_dp; fin->fin_dp = (char *)fin->fin_dp + shift; fin->fin_dlen -= shift; @@ -600,24 +627,22 @@ fr_info_t *fin; { struct ip6_ext *hdr; - int shift; if (frpr_ipv6exthdr(fin, 0, IPPROTO_ROUTING) == IPPROTO_NONE) return IPPROTO_NONE; + hdr = fin->fin_exthdr; - hdr = fin->fin_dp; - shift = 8 + (hdr->ip6e_len << 3); - /* - * Nasty extension header length? - */ - if ((shift < sizeof(struct ip6_hdr)) || - ((shift - sizeof(struct ip6_hdr)) & 15)) { + if ((hdr->ip6e_len & 1) != 0) { + /* + * The routing header data is made up of 128 bit IPv6 addresses + * which means it must be a multiple of 2 lots of 8 in length. + */ fin->fin_flx |= FI_BAD; /* * Compensate for the changes made in frpr_ipv6exthdr() */ - fin->fin_dlen += shift; - fin->fin_dp = (char *)fin->fin_dp - shift; + fin->fin_dlen += 8 + (hdr->ip6e_len << 3); + fin->fin_dp = hdr; return IPPROTO_NONE; } @@ -643,16 +668,20 @@ fr_info_t *fin; { struct ip6_frag *frag; + int extoff; fin->fin_flx |= FI_FRAG; if (frpr_ipv6exthdr(fin, 0, IPPROTO_FRAGMENT) == IPPROTO_NONE) return; + extoff = (char *)fin->fin_exthdr - (char *)fin->fin_dp; + if (frpr_pullup(fin, sizeof(*frag)) == -1) return; - frag = fin->fin_dp; + fin->fin_exthdr = (char *)fin->fin_dp + extoff; + frag = fin->fin_exthdr; /* * Fragment but no fragmentation info set? Bad packet... */ @@ -702,10 +731,12 @@ int minicmpsz = sizeof(struct icmp6_hdr); struct icmp6_hdr *icmp6; - if (frpr_pullup(fin, ICMP6ERR_MINPKTLEN + 8 - sizeof(ip6_t)) == -1) + if (frpr_pullup(fin, ICMP6ERR_MINPKTLEN - sizeof(ip6_t)) == -1) return; if (fin->fin_dlen > 1) { + ip6_t *ip6; + icmp6 = fin->fin_dp; fin->fin_data[0] = *(u_short *)icmp6; @@ -720,12 +751,26 @@ case ICMP6_PACKET_TOO_BIG : case ICMP6_TIME_EXCEEDED : case ICMP6_PARAM_PROB : + fin->fin_flx |= FI_ICMPERR; if ((fin->fin_m != NULL) && (M_LEN(fin->fin_m) < fin->fin_plen)) { if (fr_coalesce(fin) != 1) return; } - fin->fin_flx |= FI_ICMPERR; + + if (frpr_pullup(fin, ICMP6ERR_MINPKTLEN) == -1) + return; + + /* + * If the destination of this packet doesn't match the + * source of the original packet then this packet is + * not correct. + */ + ip6 = (ip6_t *)((char *)icmp6 + ICMPERR_ICMPHLEN); + if (IP6_NEQ(&fin->fin_fi.fi_dst, + (i6addr_t *)&ip6->ip6_src)) + fin->fin_flx |= FI_BAD; + minicmpsz = ICMP6ERR_IPICMPHLEN - sizeof(ip6_t); break; default : @@ -752,8 +797,13 @@ frpr_short6(fin, sizeof(struct udphdr)); - if (frpr_udpcommon(fin) == 0) + if (frpr_udpcommon(fin) == 0) { + u_char p = fin->fin_p; + + fin->fin_p = IPPROTO_UDP; fr_checkv6sum(fin); + fin->fin_p = p; + } } @@ -772,8 +822,13 @@ frpr_short6(fin, sizeof(struct tcphdr)); - if (frpr_tcpcommon(fin) == 0) + if (frpr_tcpcommon(fin) == 0) { + u_char p = fin->fin_p; + + fin->fin_p = IPPROTO_TCP; fr_checkv6sum(fin); + fin->fin_p = p; + } } @@ -862,18 +917,26 @@ fr_info_t *fin; int plen; { -#if defined(_KERNEL) if (fin->fin_m != NULL) { if (fin->fin_dp != NULL) plen += (char *)fin->fin_dp - ((char *)fin->fin_ip + fin->fin_hlen); plen += fin->fin_hlen; if (M_LEN(fin->fin_m) < plen) { +#if defined(_KERNEL) if (fr_pullup(fin->fin_m, fin, plen) == NULL) return -1; +#else + /* + * Fake fr_pullup failing + */ + *fin->fin_mp = NULL; + fin->fin_m = NULL; + fin->fin_ip = NULL; + return -1; +#endif } } -#endif return 0; } @@ -987,6 +1050,22 @@ oip = (ip_t *)((char *)fin->fin_dp + ICMPERR_ICMPHLEN); if ((ntohs(oip->ip_off) & IP_OFFMASK) != 0) fin->fin_flx |= FI_BAD; + + /* + * If the destination of this packet doesn't match the + * source of the original packet then this packet is + * not correct. + */ + if (oip->ip_src.s_addr != fin->fin_daddr) + fin->fin_flx |= FI_BAD; + + /* + * If the destination of this packet doesn't match the + * source of the original packet then this packet is + * not correct. + */ + if (oip->ip_src.s_addr != fin->fin_daddr) + fin->fin_flx |= FI_BAD; break; default : break; @@ -1054,14 +1133,27 @@ */ if ((flags & TH_URG) != 0 && (tcp->th_urp == 0)) { fin->fin_flx |= FI_BAD; +#if 0 } else if ((flags & TH_URG) == 0 && (tcp->th_urp != 0)) { - /* Ignore this case, it shows up in "real" traffic with */ - /* bogus values in the urgent pointer field. */ - ; + /* + * Ignore this case (#if 0) as it shows up in "real" + * traffic with bogus values in the urgent pointer field. + */ + fin->fin_flx |= FI_BAD; +#endif } else if (((flags & (TH_SYN|TH_FIN)) != 0) && ((flags & (TH_RST|TH_ACK)) == TH_RST)) { /* TH_FIN|TH_RST|TH_ACK seems to appear "naturally" */ fin->fin_flx |= FI_BAD; +#if 1 + } else if (((flags & TH_SYN) != 0) && + ((flags & (TH_URG|TH_PUSH)) != 0)) { + /* + * SYN with URG and PUSH set is not for normal TCP but it is + * possible(?) with T/TCP...but who uses T/TCP? + */ + fin->fin_flx |= FI_BAD; +#endif } else if (!(flags & TH_ACK)) { /* * If the ack bit isn't set, then either the SYN or @@ -1347,13 +1439,16 @@ */ off &= IP_MF|IP_OFFMASK; if (off != 0) { + int morefrag = off & IP_MF; + fi->fi_flx |= FI_FRAG; off &= IP_OFFMASK; if (off != 0) { fin->fin_flx |= FI_FRAGBODY; off <<= 3; if ((off + fin->fin_dlen > 65535) || - (fin->fin_dlen == 0) || (fin->fin_dlen & 7)) { + (fin->fin_dlen == 0) || + ((morefrag != 0) && ((fin->fin_dlen & 7) != 0))) { /* * The length of the packet, starting at its * offset cannot exceed 65535 (0xffff) as the @@ -1507,18 +1602,24 @@ fin->fin_rule = 0xffffffff; fin->fin_group[0] = -1; fin->fin_group[1] = '\0'; - fin->fin_dlen = fin->fin_plen - hlen; fin->fin_dp = (char *)ip + hlen; v = fin->fin_v; - if (v == 4) + if (v == 4) { + fin->fin_plen = ip->ip_len; + fin->fin_dlen = fin->fin_plen - hlen; + frpr_ipv4hdr(fin); #ifdef USE_INET6 - else if (v == 6) { + } else if (v == 6) { + fin->fin_plen = ntohs(((ip6_t *)ip)->ip6_plen); + fin->fin_dlen = fin->fin_plen; + fin->fin_plen += hlen; + if (frpr_ipv6hdr(fin) == -1) return -1; +#endif } -#endif if (fin->fin_ip == NULL) return -1; return 0; @@ -1680,7 +1781,7 @@ */ i = ((*lip & *lm) != *ld); FR_DEBUG(("0. %#08x & %#08x != %#08x\n", - *lip, *lm, *ld)); + ntohl(*lip), ntohl(*lm), ntohl(*ld))); if (i) return 1; @@ -1691,7 +1792,7 @@ lip++, lm++, ld++; i |= ((*lip & *lm) != *ld); FR_DEBUG(("1. %#08x & %#08x != %#08x\n", - *lip, *lm, *ld)); + ntohl(*lip), ntohl(*lm), ntohl(*ld))); if (i) return 1; @@ -1714,20 +1815,20 @@ #endif i = ((*lip & *lm) != *ld); FR_DEBUG(("2a. %#08x & %#08x != %#08x\n", - *lip, *lm, *ld)); + ntohl(*lip), ntohl(*lm), ntohl(*ld))); if (fi->fi_v == 6) { lip++, lm++, ld++; i |= ((*lip & *lm) != *ld); FR_DEBUG(("2b. %#08x & %#08x != %#08x\n", - *lip, *lm, *ld)); + ntohl(*lip), ntohl(*lm), ntohl(*ld))); lip++, lm++, ld++; i |= ((*lip & *lm) != *ld); FR_DEBUG(("2c. %#08x & %#08x != %#08x\n", - *lip, *lm, *ld)); + ntohl(*lip), ntohl(*lm), ntohl(*ld))); lip++, lm++, ld++; i |= ((*lip & *lm) != *ld); FR_DEBUG(("2d. %#08x & %#08x != %#08x\n", - *lip, *lm, *ld)); + ntohl(*lip), ntohl(*lm), ntohl(*ld))); } else { lip += 3; lm += 3; @@ -1756,20 +1857,20 @@ #endif i = ((*lip & *lm) != *ld); FR_DEBUG(("3a. %#08x & %#08x != %#08x\n", - *lip, *lm, *ld)); + ntohl(*lip), ntohl(*lm), ntohl(*ld))); if (fi->fi_v == 6) { lip++, lm++, ld++; i |= ((*lip & *lm) != *ld); FR_DEBUG(("3b. %#08x & %#08x != %#08x\n", - *lip, *lm, *ld)); + ntohl(*lip), ntohl(*lm), ntohl(*ld))); lip++, lm++, ld++; i |= ((*lip & *lm) != *ld); FR_DEBUG(("3c. %#08x & %#08x != %#08x\n", - *lip, *lm, *ld)); + ntohl(*lip), ntohl(*lm), ntohl(*ld))); lip++, lm++, ld++; i |= ((*lip & *lm) != *ld); FR_DEBUG(("3d. %#08x & %#08x != %#08x\n", - *lip, *lm, *ld)); + ntohl(*lip), ntohl(*lm), ntohl(*ld))); } else { lip += 3; lm += 3; @@ -2297,9 +2398,6 @@ int v = IP_V(ip); mb_t *mc = NULL; mb_t *m; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 4 19:11:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7912616A469; Mon, 4 Jun 2007 19:11:15 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2F94016A421 for ; Mon, 4 Jun 2007 19:11:15 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id E2D8B13C45E for ; Mon, 4 Jun 2007 19:11:14 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.13.8/8.13.4) with ESMTP id l54JAIiF030270; Mon, 4 Jun 2007 13:10:18 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Mon, 04 Jun 2007 13:10:38 -0600 (MDT) Message-Id: <20070604.131038.58456299.imp@bsdimp.com> To: rpaulo@fnop.net From: "M. Warner Losh" In-Reply-To: <86tztpxqys.wl%rpaulo@fnop.net> References: <200706021439.l52Edj6g051339@repoman.freebsd.org> <20070602.235223.-1592322846.imp@bsdimp.com> <86tztpxqys.wl%rpaulo@fnop.net> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (harmony.bsdimp.com [127.0.0.1]); Mon, 04 Jun 2007 13:10:19 -0600 (MDT) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 120782 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, 04 Jun 2007 19:11:15 -0000 In message: <86tztpxqys.wl%rpaulo@fnop.net> Rui Paulo writes: : At Sat, 02 Jun 2007 23:52:23 -0600 (MDT), : M. Warner Losh wrote: : > : > In message: <200706021439.l52Edj6g051339@repoman.freebsd.org> : > Rui Paulo writes: : > : http://perforce.freebsd.org/chv.cgi?CH=120782 : > : : > : Change 120782 by rpaulo@rpaulo_epsilon on 2007/06/02 14:38:42 : > : : > : Need to use bus_set_resource() on the probe routine or else : > : the IRQ will only be setup on the second time the module is : > : loaded. : > : > You mean "only be printed on the probe line the second time the module : > is loaded" right? : : No. : If I caused interrupts by moving the laptop, asmc_intr() would not be : run. That's totally bizarre and would indicate a rather serious bug if it were true. Warner From owner-p4-projects@FreeBSD.ORG Mon Jun 4 20:17:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87F4816A478; Mon, 4 Jun 2007 20:17:51 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 5AB7B16A476 for ; Mon, 4 Jun 2007 20:17:51 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 49DAF13C4C1 for ; Mon, 4 Jun 2007 20:17:51 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l54KHpoZ054011 for ; Mon, 4 Jun 2007 20:17:51 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l54KHohh053993 for perforce@freebsd.org; Mon, 4 Jun 2007 20:17:50 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 4 Jun 2007 20:17:50 GMT Message-Id: <200706042017.l54KHohh053993@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120927 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, 04 Jun 2007 20:17:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=120927 Change 120927 by rdivacky@rdivacky_witten on 2007/06/04 20:16:51 Implement the rest of the *at syscalls. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_dummy.c#8 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_syscall.h#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysent.c#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.master#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#10 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_misc.c#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_util.h#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_dummy.c#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_proto.h#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_syscall.h#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysent.c#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/syscalls.master#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#16 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#9 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_dummy.c#8 (text+ko) ==== @@ -96,10 +96,6 @@ DUMMY(inotify_add_watch); DUMMY(inotify_rm_watch); DUMMY(migrate_pages); -DUMMY(mkdirat); -DUMMY(mknodat); -DUMMY(futimesat); -DUMMY(renameat); DUMMY(pselect6); DUMMY(ppoll); DUMMY(unshare); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#7 (text+ko) ==== @@ -880,10 +880,15 @@ char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_mkdirat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char pathname_l_[PADL_(char *)]; char * pathname; char pathname_r_[PADR_(char *)]; + char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_mknodat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; + char dev_l_[PADL_(l_uint)]; l_uint dev; char dev_r_[PADR_(l_uint)]; }; struct linux_fchownat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; @@ -893,7 +898,9 @@ char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; }; struct linux_futimesat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char utimes_l_[PADL_(struct l_timeval *)]; struct l_timeval * utimes; char utimes_r_[PADR_(struct l_timeval *)]; }; struct linux_fstatat64_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; @@ -907,7 +914,10 @@ char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; }; struct linux_renameat_args { - register_t dummy; + char olddfd_l_[PADL_(l_int)]; l_int olddfd; char olddfd_r_[PADR_(l_int)]; + char oldname_l_[PADL_(char *)]; char * oldname; char oldname_r_[PADR_(char *)]; + char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; + char newname_l_[PADL_(char *)]; char * newname; char newname_r_[PADR_(char *)]; }; struct linux_linkat_args { char olddfd_l_[PADL_(l_int)]; l_int olddfd; char olddfd_r_[PADR_(l_int)]; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_syscall.h#7 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysent.c#7 (text+ko) ==== @@ -316,13 +316,13 @@ { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL, NULL, 0, 0 }, /* 293 = linux_inotify_rm_watch */ { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL, NULL, 0, 0 }, /* 294 = linux_migrate_pages */ { AS(linux_openat_args), (sy_call_t *)linux_openat, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 295 = linux_openat */ - { 0, (sy_call_t *)linux_mkdirat, AUE_NULL, NULL, 0, 0 }, /* 296 = linux_mkdirat */ - { 0, (sy_call_t *)linux_mknodat, AUE_NULL, NULL, 0, 0 }, /* 297 = linux_mknodat */ + { AS(linux_mkdirat_args), (sy_call_t *)linux_mkdirat, AUE_NULL, NULL, 0, 0 }, /* 296 = linux_mkdirat */ + { AS(linux_mknodat_args), (sy_call_t *)linux_mknodat, AUE_NULL, NULL, 0, 0 }, /* 297 = linux_mknodat */ { AS(linux_fchownat_args), (sy_call_t *)linux_fchownat, AUE_NULL, NULL, 0, 0 }, /* 298 = linux_fchownat */ - { 0, (sy_call_t *)linux_futimesat, AUE_NULL, NULL, 0, 0 }, /* 299 = linux_futimesat */ + { AS(linux_futimesat_args), (sy_call_t *)linux_futimesat, AUE_NULL, NULL, 0, 0 }, /* 299 = linux_futimesat */ { AS(linux_fstatat64_args), (sy_call_t *)linux_fstatat64, AUE_NULL, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ { AS(linux_unlinkat_args), (sy_call_t *)linux_unlinkat, AUE_NULL, NULL, 0, 0 }, /* 301 = linux_unlinkat */ - { 0, (sy_call_t *)linux_renameat, AUE_NULL, NULL, 0, 0 }, /* 302 = linux_renameat */ + { AS(linux_renameat_args), (sy_call_t *)linux_renameat, AUE_NULL, NULL, 0, 0 }, /* 302 = linux_renameat */ { AS(linux_linkat_args), (sy_call_t *)linux_linkat, AUE_NULL, NULL, 0, 0 }, /* 303 = linux_linkat */ { AS(linux_symlinkat_args), (sy_call_t *)linux_symlinkat, AUE_NULL, NULL, 0, 0 }, /* 304 = linux_symlinkat */ { AS(linux_readlinkat_args), (sy_call_t *)linux_readlinkat, AUE_NULL, NULL, 0, 0 }, /* 305 = linux_readlinkat */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.master#7 (text+ko) ==== @@ -465,15 +465,16 @@ 294 AUE_NULL STD { int linux_migrate_pages(void); } 295 AUE_OPEN_RWTC STD { int linux_openat(l_int dfd, char *filename, \ l_int flags, l_int mode); } -296 AUE_NULL STD { int linux_mkdirat(void); } -297 AUE_NULL STD { int linux_mknodat(void); } +296 AUE_NULL STD { int linux_mkdirat(l_int dfd, char *pathname, l_int mode); } +297 AUE_NULL STD { int linux_mknodat(l_int dfd, char *filename, l_int mode, l_uint dev); } 298 AUE_NULL STD { int linux_fchownat(l_int dfd, char *filename, \ l_uid16_t uid, l_gid16_t gid, l_int flag); } -299 AUE_NULL STD { int linux_futimesat(void); } +299 AUE_NULL STD { int linux_futimesat(l_int dfd, char *filename, struct l_timeval *utimes); } 300 AUE_NULL STD { int linux_fstatat64(l_int dfd, char *pathname, \ struct l_stat64 *statbuf, l_int flag); } 301 AUE_NULL STD { int linux_unlinkat(l_int dfd, char *pathname, l_int flag); } -302 AUE_NULL STD { int linux_renameat(void); } +302 AUE_NULL STD { int linux_renameat(l_int olddfd, char *oldname, l_int newdfd, \ + char *newname); } 303 AUE_NULL STD { int linux_linkat(l_int olddfd, char *oldname, \ l_int newdfd, char *newname, l_int flags); } 304 AUE_NULL STD { int linux_symlinkat(char *oldname, l_int newdfd, char *newname); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#10 (text+ko) ==== @@ -712,6 +712,7 @@ LFREEPATH(path); return (error); } + int linux_mkdir(struct thread *td, struct linux_mkdir_args *args) { @@ -730,6 +731,28 @@ } int +linux_mkdirat(struct thread *td, struct linux_mkdirat_args *args) +{ + char *path; + int error, dfd; + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + LCONVPATHCREAT_AT(td, args->pathname, &path, dfd); + +#ifdef DEBUG + if (ldebug(mkdirat)) + printf(ARGS(mkdirat, "%s, %d"), path, args->mode); +#endif + error = kern_mkdirat(td, path, UIO_SYSSPACE, args->mode, dfd); + LFREEPATH(path); + return (error); +} + +int linux_rmdir(struct thread *td, struct linux_rmdir_args *args) { char *path; @@ -771,6 +794,40 @@ } int +linux_renameat(struct thread *td, struct linux_renameat_args *args) +{ + char *from, *to; + int error, olddfd, newdfd; + + if (args->olddfd == LINUX_AT_FDCWD) + olddfd = AT_FDCWD; + else + olddfd = args->olddfd; + + if (args->newdfd == LINUX_AT_FDCWD) + newdfd = AT_FDCWD; + else + newdfd = args->newdfd; + + LCONVPATHEXIST_AT(td, args->oldname, &from, olddfd); + /* Expand LCONVPATHCREATE so that `from' can be freed on errors */ + error = linux_emul_convpath(td, args->newname, UIO_USERSPACE, &to, 1, newdfd); + if (to == NULL) { + LFREEPATH(from); + return (error); + } + +#ifdef DEBUG + if (ldebug(renameat)) + printf(ARGS(renameat, "%s, %s"), from, to); +#endif + error = kern_renameat(td, from, to, UIO_SYSSPACE, olddfd, newdfd); + LFREEPATH(from); + LFREEPATH(to); + return (error); +} + +int linux_symlink(struct thread *td, struct linux_symlink_args *args) { char *path, *to; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_misc.c#3 (text+ko) ==== @@ -86,6 +86,7 @@ #include #endif +#include #include #include #include @@ -818,6 +819,43 @@ LFREEPATH(fname); return (error); } + +int +linux_futimesat(struct thread *td, struct linux_futimesat_args *args) +{ + l_timeval ltv[2]; + struct timeval tv[2], *tvp = NULL; + char *fname; + int error, dfd; + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + LCONVPATHEXIST_AT(td, args->filename, &fname, dfd); + +#ifdef DEBUG + if (ldebug(futimesat)) + printf(ARGS(futimesat, "%s, *"), fname); +#endif + + if (args->utimes!= NULL) { + if ((error = copyin(args->utimes, ltv, sizeof ltv))) { + LFREEPATH(fname); + return (error); + } + tv[0].tv_sec = ltv[0].tv_sec; + tv[0].tv_usec = ltv[0].tv_usec; + tv[1].tv_sec = ltv[1].tv_sec; + tv[1].tv_usec = ltv[1].tv_usec; + tvp = tv; + } + + error = kern_utimesat(td, fname, UIO_SYSSPACE, tvp, UIO_SYSSPACE, dfd); + LFREEPATH(fname); + return (error); +} #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ #define __WCLONE 0x80000000 @@ -955,6 +993,56 @@ return (error); } +int +linux_mknodat(struct thread *td, struct linux_mknodat_args *args) +{ + char *path; + int error, dfd; + + if (args->dfd == LINUX_AT_FDCWD) + dfd = AT_FDCWD; + else + dfd = args->dfd; + + LCONVPATHCREAT_AT(td, args->filename, &path, dfd); + +#ifdef DEBUG + if (ldebug(mknodat)) + printf(ARGS(mknodat, "%s, %d, %d"), path, args->mode, args->dev); +#endif + + switch (args->mode & S_IFMT) { + case S_IFIFO: + case S_IFSOCK: + error = kern_mkfifoat(td, path, UIO_SYSSPACE, args->mode, dfd); + break; + + case S_IFCHR: + case S_IFBLK: + error = kern_mknodat(td, path, UIO_SYSSPACE, args->mode, + args->dev, dfd); + break; + + case S_IFDIR: + error = EPERM; + break; + + case 0: + args->mode |= S_IFREG; + /* FALLTHROUGH */ + case S_IFREG: + error = kern_openat(td, path, UIO_SYSSPACE, + O_WRONLY | O_CREAT | O_TRUNC, args->mode, dfd); + break; + + default: + error = EINVAL; + break; + } + LFREEPATH(path); + return (error); +} + /* * UGH! This is just about the dumbest idea I've ever heard!! */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_util.h#3 (text+ko) ==== @@ -69,6 +69,7 @@ #define LCONVPATHEXIST(td, upath, pathp) LCONVPATH(td, upath, pathp, 0) #define LCONVPATHEXIST_AT(td, upath, pathp, dfd) LCONVPATH_AT(td, upath, pathp, 0, dfd) #define LCONVPATHCREAT(td, upath, pathp) LCONVPATH(td, upath, pathp, 1) +#define LCONVPATHCREAT_AT(td, upath, pathp, dfd) LCONVPATH_AT(td, upath, pathp, 1, dfd) #define LFREEPATH(path) free(path, M_TEMP) #define DUMMY(s) \ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_dummy.c#7 (text+ko) ==== @@ -87,10 +87,6 @@ DUMMY(inotify_add_watch); DUMMY(inotify_rm_watch); DUMMY(migrate_pages); -DUMMY(mkdirat); -DUMMY(mknodat); -DUMMY(futimesat); -DUMMY(renameat); DUMMY(pselect6); DUMMY(ppoll); DUMMY(unshare); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_proto.h#7 (text+ko) ==== @@ -899,10 +899,15 @@ char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_mkdirat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char pathname_l_[PADL_(char *)]; char * pathname; char pathname_r_[PADR_(char *)]; + char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_mknodat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; + char dev_l_[PADL_(l_uint)]; l_uint dev; char dev_r_[PADR_(l_uint)]; }; struct linux_fchownat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; @@ -912,7 +917,9 @@ char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; }; struct linux_futimesat_args { - register_t dummy; + char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; + char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char utimes_l_[PADL_(struct l_timeval *)]; struct l_timeval * utimes; char utimes_r_[PADR_(struct l_timeval *)]; }; struct linux_fstatat64_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; @@ -926,7 +933,10 @@ char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; }; struct linux_renameat_args { - register_t dummy; + char olddfd_l_[PADL_(l_int)]; l_int olddfd; char olddfd_r_[PADR_(l_int)]; + char oldname_l_[PADL_(char *)]; char * oldname; char oldname_r_[PADR_(char *)]; + char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; + char newname_l_[PADL_(char *)]; char * newname; char newname_r_[PADR_(char *)]; }; struct linux_linkat_args { char olddfd_l_[PADL_(l_int)]; l_int olddfd; char olddfd_r_[PADR_(l_int)]; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_syscall.h#7 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysent.c#7 (text+ko) ==== @@ -315,13 +315,13 @@ { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL, NULL, 0, 0 }, /* 293 = linux_inotify_rm_watch */ { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL, NULL, 0, 0 }, /* 294 = linux_migrate_pages */ { AS(linux_openat_args), (sy_call_t *)linux_openat, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 295 = linux_openat */ - { 0, (sy_call_t *)linux_mkdirat, AUE_NULL, NULL, 0, 0 }, /* 296 = linux_mkdirat */ - { 0, (sy_call_t *)linux_mknodat, AUE_NULL, NULL, 0, 0 }, /* 297 = linux_mknodat */ + { AS(linux_mkdirat_args), (sy_call_t *)linux_mkdirat, AUE_NULL, NULL, 0, 0 }, /* 296 = linux_mkdirat */ + { AS(linux_mknodat_args), (sy_call_t *)linux_mknodat, AUE_NULL, NULL, 0, 0 }, /* 297 = linux_mknodat */ { AS(linux_fchownat_args), (sy_call_t *)linux_fchownat, AUE_NULL, NULL, 0, 0 }, /* 298 = linux_fchownat */ - { 0, (sy_call_t *)linux_futimesat, AUE_NULL, NULL, 0, 0 }, /* 299 = linux_futimesat */ + { AS(linux_futimesat_args), (sy_call_t *)linux_futimesat, AUE_NULL, NULL, 0, 0 }, /* 299 = linux_futimesat */ { AS(linux_fstatat64_args), (sy_call_t *)linux_fstatat64, AUE_NULL, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ { AS(linux_unlinkat_args), (sy_call_t *)linux_unlinkat, AUE_NULL, NULL, 0, 0 }, /* 301 = linux_unlinkat */ - { 0, (sy_call_t *)linux_renameat, AUE_NULL, NULL, 0, 0 }, /* 302 = linux_renameat */ + { AS(linux_renameat_args), (sy_call_t *)linux_renameat, AUE_NULL, NULL, 0, 0 }, /* 302 = linux_renameat */ { AS(linux_linkat_args), (sy_call_t *)linux_linkat, AUE_NULL, NULL, 0, 0 }, /* 303 = linux_linkat */ { AS(linux_symlinkat_args), (sy_call_t *)linux_symlinkat, AUE_NULL, NULL, 0, 0 }, /* 304 = linux_symlinkat */ { AS(linux_readlinkat_args), (sy_call_t *)linux_readlinkat, AUE_NULL, NULL, 0, 0 }, /* 305 = linux_readlinkat */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/syscalls.master#7 (text+ko) ==== @@ -475,15 +475,16 @@ 294 AUE_NULL STD { int linux_migrate_pages(void); } 295 AUE_OPEN_RWTC STD { int linux_openat(l_int dfd, char *filename, \ l_int flags, l_int mode); } -296 AUE_NULL STD { int linux_mkdirat(void); } -297 AUE_NULL STD { int linux_mknodat(void); } +296 AUE_NULL STD { int linux_mkdirat(l_int dfd, char *pathname, l_int mode); } +297 AUE_NULL STD { int linux_mknodat(l_int dfd, char *filename, l_int mode, l_uint dev); } 298 AUE_NULL STD { int linux_fchownat(l_int dfd, char *filename, \ l_uid16_t uid, l_gid16_t gid, l_int flag); } -299 AUE_NULL STD { int linux_futimesat(void); } +299 AUE_NULL STD { int linux_futimesat(l_int dfd, char *filename, struct l_timeval *utimes); } 300 AUE_NULL STD { int linux_fstatat64(l_int dfd, char *pathname, \ struct l_stat64 *statbuf, l_int flag); } 301 AUE_NULL STD { int linux_unlinkat(l_int dfd, char *pathname, l_int flag); } -302 AUE_NULL STD { int linux_renameat(void); } +302 AUE_NULL STD { int linux_renameat(l_int olddfd, char *oldname, l_int newdfd, \ + char *newname); } 303 AUE_NULL STD { int linux_linkat(l_int olddfd, char *oldname, \ l_int newdfd, char *newname, l_int flags); } 304 AUE_NULL STD { int linux_symlinkat(char *oldname, l_int newdfd, char *newname); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#16 (text+ko) ==== @@ -105,6 +105,10 @@ enum uio_seg bufseg, int count, struct nameidata *nd); static int kern_common_link(struct thread *td, struct nameidata *ndp, struct nameidata *ndl); +static int kern_common_utimes(struct thread *td, char *path, enum uio_seg pathseg, + struct timeval *tptr, enum uio_seg tptrseg, struct nameidata *nd); +static int kern_common_rename(struct thread *td, char *from, char *to, + enum uio_seg pathseg, struct nameidata *fromnd, struct nameidata *tond); /* * The module initialization routine for POSIX asynchronous I/O will @@ -1208,7 +1212,14 @@ kern_mknod(struct thread *td, char *path, enum uio_seg pathseg, int mode, int dev) { - struct vnode *vp; + return kern_mknodat(td, path, pathseg, mode, dev, AT_FDCWD); +} + +int +kern_mknodat(struct thread *td, char *path, enum uio_seg pathseg, int mode, + int dev, int dirfd) +{ + struct vnode *vp, *dir_vn = NULL; struct mount *mp; struct vattr vattr; int error; @@ -1236,11 +1247,19 @@ if (error) return (error); restart: + if (dir_vn) + vrele(dir_vn); + error = kern_get_at(td, dirfd, &dir_vn); + if (error) + return (error); bwillwrite(); - NDINIT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, - pathseg, path, td); - if ((error = namei(&nd)) != 0) + NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, + pathseg, path, td, dir_vn); + if ((error = namei(&nd)) != 0) { + if (dir_vn) + vrele(dir_vn); return (error); + } vfslocked = NDHASGIANT(&nd); vp = nd.ni_vp; if (vp != NULL) { @@ -1251,6 +1270,8 @@ vput(nd.ni_dvp); vrele(vp); VFS_UNLOCK_GIANT(vfslocked); + if (dir_vn) + vrele(dir_vn); return (EEXIST); } else { VATTR_NULL(&vattr); @@ -1282,8 +1303,11 @@ NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); VFS_UNLOCK_GIANT(vfslocked); - if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) + if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) { + if (dir_vn) + vrele(dir_vn); return (error); + } goto restart; } #ifdef MAC @@ -1302,6 +1326,8 @@ vput(nd.ni_vp); } } + if (dir_vn) + vrele(dir_vn); NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); vn_finished_write(mp); @@ -1333,19 +1359,34 @@ int kern_mkfifo(struct thread *td, char *path, enum uio_seg pathseg, int mode) { + return kern_mkfifoat(td, path, pathseg, mode, AT_FDCWD); +} + +int +kern_mkfifoat(struct thread *td, char *path, enum uio_seg pathseg, int mode, int dirfd) +{ struct mount *mp; struct vattr vattr; int error; struct nameidata nd; int vfslocked; + struct vnode *dir_vn = NULL; AUDIT_ARG(mode, mode); restart: + if (dir_vn) + vrele(dir_vn); + error = kern_get_at(td, dirfd, &dir_vn); + if (error) + return (error); bwillwrite(); - NDINIT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, - pathseg, path, td); - if ((error = namei(&nd)) != 0) + NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, + pathseg, path, td, dir_vn); + if ((error = namei(&nd)) != 0) { + if (dir_vn) + vrele(dir_vn); return (error); + } vfslocked = NDHASGIANT(&nd); if (nd.ni_vp != NULL) { NDFREE(&nd, NDF_ONLY_PNBUF); @@ -1355,14 +1396,19 @@ vput(nd.ni_dvp); vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); + if (dir_vn) + vrele(dir_vn); return (EEXIST); } if (vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); VFS_UNLOCK_GIANT(vfslocked); - if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) + if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) { + if (dir_vn) + vrele(dir_vn); return (error); + } goto restart; } VATTR_NULL(&vattr); @@ -1383,6 +1429,8 @@ #ifdef MAC out: #endif + if (dir_vn) + vrele(dir_vn); vput(nd.ni_dvp); vn_finished_write(mp); VFS_UNLOCK_GIANT(vfslocked); @@ -3199,20 +3247,49 @@ kern_utimes(struct thread *td, char *path, enum uio_seg pathseg, struct timeval *tptr, enum uio_seg tptrseg) { + struct nameidata nd; + + NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); + + return kern_common_utimes(td, path, pathseg, tptr, tptrseg, &nd); +} + +int +kern_utimesat(struct thread *td, char *path, enum uio_seg pathseg, + struct timeval *tptr, enum uio_seg tptrseg, int dirfd) +{ + int error; + struct nameidata nd; + struct vnode *dir_vn; + + error = kern_get_at(td, dirfd, &dir_vn); + if (error) + return (error); + + NDINIT_AT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + + error = kern_common_utimes(td, path, pathseg, tptr, tptrseg, &nd); + if (dir_vn) + vrele(dir_vn); + return (error); +} + +static int +kern_common_utimes(struct thread *td, char *path, enum uio_seg pathseg, + struct timeval *tptr, enum uio_seg tptrseg, struct nameidata *nd) +{ struct timespec ts[2]; int error; - struct nameidata nd; int vfslocked; if ((error = getutimes(tptr, tptrseg, ts)) != 0) return (error); - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); - if ((error = namei(&nd)) != 0) + if ((error = namei(nd)) != 0) return (error); - vfslocked = NDHASGIANT(&nd); - NDFREE(&nd, NDF_ONLY_PNBUF); - error = setutimes(td, nd.ni_vp, ts, 2, tptr == NULL); - vrele(nd.ni_vp); + vfslocked = NDHASGIANT(nd); + NDFREE(nd, NDF_ONLY_PNBUF); + error = setutimes(td, nd->ni_vp, ts, 2, tptr == NULL); + vrele(nd->ni_vp); VFS_UNLOCK_GIANT(vfslocked); return (error); } @@ -3564,14 +3641,8 @@ int kern_rename(struct thread *td, char *from, char *to, enum uio_seg pathseg) { - struct mount *mp = NULL; - struct vnode *tvp, *fvp, *tdvp; struct nameidata fromnd, tond; - int tvfslocked; - int fvfslocked; - int error; - bwillwrite(); #ifdef MAC NDINIT(&fromnd, DELETE, LOCKPARENT | LOCKLEAF | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, from, td); @@ -3579,43 +3650,92 @@ NDINIT(&fromnd, DELETE, WANTPARENT | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, from, td); #endif - if ((error = namei(&fromnd)) != 0) + NDINIT(&tond, RENAME, LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | + MPSAFE | AUDITVNODE2, pathseg, to, td); + + return kern_common_rename(td, from, to, pathseg, &fromnd, &tond); +} + +int +kern_renameat(struct thread *td, char *from, char *to, enum uio_seg pathseg, int fdirfd, int tdirfd) +{ + struct nameidata fromnd, tond; + struct vnode *fdir_vn, *tdir_vn; + int error; + + error = kern_get_at(td, fdirfd, &fdir_vn); + if (error) + return (error); + error = kern_get_at(td, tdirfd, &tdir_vn); + if (error) + return (error); + +#ifdef MAC + NDINIT_AT(&fromnd, DELETE, LOCKPARENT | LOCKLEAF | SAVESTART | MPSAFE | + AUDITVNODE1, pathseg, from, td, fdir_vn); +#else + NDINIT_AT(&fromnd, DELETE, WANTPARENT | SAVESTART | MPSAFE | + AUDITVNODE1, pathseg, from, td, fdir_vn); +#endif + NDINIT_AT(&tond, RENAME, LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | + MPSAFE | AUDITVNODE2, pathseg, to, td, tdir_vn); + + error = kern_common_rename(td, from, to, pathseg, &fromnd, &tond); + + if (fdir_vn) + vrele(fdir_vn); + if (tdir_vn) + vrele(tdir_vn); + + return (error); +} + +static int +kern_common_rename(struct thread *td, char *from, char *to, enum uio_seg pathseg, + struct nameidata *fromnd, struct nameidata *tond) +{ + struct mount *mp = NULL; + struct vnode *tvp, *fvp, *tdvp; + int tvfslocked; + int fvfslocked; + int error; + + bwillwrite(); + if ((error = namei(fromnd)) != 0) return (error); - fvfslocked = NDHASGIANT(&fromnd); + fvfslocked = NDHASGIANT(fromnd); tvfslocked = 0; #ifdef MAC - error = mac_check_vnode_rename_from(td->td_ucred, fromnd.ni_dvp, - fromnd.ni_vp, &fromnd.ni_cnd); - VOP_UNLOCK(fromnd.ni_dvp, 0, td); - if (fromnd.ni_dvp != fromnd.ni_vp) - VOP_UNLOCK(fromnd.ni_vp, 0, td); + error = mac_check_vnode_rename_from(td->td_ucred, fromnd->ni_dvp, + fromnd->ni_vp, &(fromnd->ni_cnd)); + VOP_UNLOCK(fromnd->ni_dvp, 0, td); + if (fromnd->ni_dvp != fromnd->ni_vp) + VOP_UNLOCK(fromnd->ni_vp, 0, td); #endif - fvp = fromnd.ni_vp; + fvp = fromnd->ni_vp; if (error == 0) error = vn_start_write(fvp, &mp, V_WAIT | PCATCH); if (error != 0) { - NDFREE(&fromnd, NDF_ONLY_PNBUF); - vrele(fromnd.ni_dvp); + NDFREE(fromnd, NDF_ONLY_PNBUF); + vrele(fromnd->ni_dvp); vrele(fvp); goto out1; } - NDINIT(&tond, RENAME, LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | - MPSAFE | AUDITVNODE2, pathseg, to, td); - if (fromnd.ni_vp->v_type == VDIR) - tond.ni_cnd.cn_flags |= WILLBEDIR; - if ((error = namei(&tond)) != 0) { + if (fromnd->ni_vp->v_type == VDIR) + tond->ni_cnd.cn_flags |= WILLBEDIR; + if ((error = namei(tond)) != 0) { /* Translate error code for rename("dir1", "dir2/."). */ if (error == EISDIR && fvp->v_type == VDIR) error = EINVAL; - NDFREE(&fromnd, NDF_ONLY_PNBUF); - vrele(fromnd.ni_dvp); + NDFREE(fromnd, NDF_ONLY_PNBUF); + vrele(fromnd->ni_dvp); vrele(fvp); vn_finished_write(mp); goto out1; } - tvfslocked = NDHASGIANT(&tond); - tdvp = tond.ni_dvp; - tvp = tond.ni_vp; + tvfslocked = NDHASGIANT(tond); + tdvp = tond->ni_dvp; + tvp = tond->ni_vp; if (tvp != NULL) { if (fvp->v_type == VDIR && tvp->v_type != VDIR) { error = ENOTDIR; @@ -3636,38 +3756,38 @@ #ifdef MAC else error = mac_check_vnode_rename_to(td->td_ucred, tdvp, - tond.ni_vp, fromnd.ni_dvp == tdvp, &tond.ni_cnd); + tond->ni_vp, fromnd->ni_dvp == tdvp, &(tond->ni_cnd)); #endif out: if (!error) { VOP_LEASE(tdvp, td, td->td_ucred, LEASE_WRITE); - if (fromnd.ni_dvp != tdvp) { - VOP_LEASE(fromnd.ni_dvp, td, td->td_ucred, LEASE_WRITE); + if (fromnd->ni_dvp != tdvp) { + VOP_LEASE(fromnd->ni_dvp, td, td->td_ucred, LEASE_WRITE); } if (tvp) { VOP_LEASE(tvp, td, td->td_ucred, LEASE_WRITE); } - error = VOP_RENAME(fromnd.ni_dvp, fromnd.ni_vp, &fromnd.ni_cnd, - tond.ni_dvp, tond.ni_vp, &tond.ni_cnd); - NDFREE(&fromnd, NDF_ONLY_PNBUF); - NDFREE(&tond, NDF_ONLY_PNBUF); + error = VOP_RENAME(fromnd->ni_dvp, fromnd->ni_vp, &(fromnd->ni_cnd), + tond->ni_dvp, tond->ni_vp, &(tond->ni_cnd)); + NDFREE(fromnd, NDF_ONLY_PNBUF); + NDFREE(tond, NDF_ONLY_PNBUF); } else { - NDFREE(&fromnd, NDF_ONLY_PNBUF); - NDFREE(&tond, NDF_ONLY_PNBUF); + NDFREE(fromnd, NDF_ONLY_PNBUF); + NDFREE(tond, NDF_ONLY_PNBUF); if (tvp) vput(tvp); if (tdvp == tvp) vrele(tdvp); else vput(tdvp); - vrele(fromnd.ni_dvp); + vrele(fromnd->ni_dvp); vrele(fvp); } - vrele(tond.ni_startdir); + vrele(tond->ni_startdir); vn_finished_write(mp); out1: - if (fromnd.ni_startdir) - vrele(fromnd.ni_startdir); + if (fromnd->ni_startdir) + vrele(fromnd->ni_startdir); VFS_UNLOCK_GIANT(fvfslocked); VFS_UNLOCK_GIANT(tvfslocked); if (error == -1) @@ -3699,8 +3819,14 @@ int kern_mkdir(struct thread *td, char *path, enum uio_seg segflg, int mode) { + return kern_mkdirat(td, path, segflg, mode, AT_FDCWD); +} + +int +kern_mkdirat(struct thread *td, char *path, enum uio_seg segflg, int mode, int dirfd) +{ struct mount *mp; - struct vnode *vp; + struct vnode *vp, *dir_vn = NULL; struct vattr vattr; int error; struct nameidata nd; @@ -3708,12 +3834,20 @@ AUDIT_ARG(mode, mode); restart: + if (dir_vn) + vrele(dir_vn); + error = kern_get_at(td, dirfd, &dir_vn); + if (error) + return (error); bwillwrite(); - NDINIT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, - segflg, path, td); + NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, + segflg, path, td, dir_vn); nd.ni_cnd.cn_flags |= WILLBEDIR; - if ((error = namei(&nd)) != 0) + if ((error = namei(&nd)) != 0) { + if (dir_vn) + vrele(dir_vn); return (error); + } vfslocked = NDHASGIANT(&nd); vp = nd.ni_vp; if (vp != NULL) { @@ -3729,14 +3863,19 @@ vput(nd.ni_dvp); vrele(vp); VFS_UNLOCK_GIANT(vfslocked); + if (dir_vn) + vrele(dir_vn); return (EEXIST); } if (vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); VFS_UNLOCK_GIANT(vfslocked); - if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) + if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) { + if (dir_vn) + vrele(dir_vn); return (error); + } goto restart; } VATTR_NULL(&vattr); @@ -3755,6 +3894,8 @@ #ifdef MAC out: #endif + if (dir_vn) + vrele(dir_vn); NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); if (!error) @@ -3793,7 +3934,7 @@ kern_rmdirat(struct thread *td, char *path, enum uio_seg pathseg, int dirfd) { struct mount *mp; - struct vnode *vp, *dir_vn; + struct vnode *vp, *dir_vn = NULL; int error; struct nameidata nd; int vfslocked; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#9 (text+ko) ==== @@ -121,10 +121,16 @@ struct timeval *tptr, enum uio_seg tptrseg); int kern_mkdir(struct thread *td, char *path, enum uio_seg segflg, int mode); +int kern_mkdirat(struct thread *td, char *path, enum uio_seg segflg, + int mode, int dirfd); int kern_mkfifo(struct thread *td, char *path, enum uio_seg pathseg, int mode); +int kern_mkfifoat(struct thread *td, char *path, enum uio_seg pathseg, + int mode, int dirfd); int kern_mknod(struct thread *td, char *path, enum uio_seg pathseg, int mode, int dev); +int kern_mknodat(struct thread *td, char *path, enum uio_seg pathseg, + int mode, int dev, int dirfd); int kern_msgctl(struct thread *, int, int, struct msqid_ds *); int kern_msgsnd(struct thread *, int, const void *, size_t, int, long); int kern_msgrcv(struct thread *, int, void *, size_t, long, int, long *); @@ -149,6 +155,8 @@ enum uio_seg fromseg, struct mbuf **controlp); int kern_rename(struct thread *td, char *from, char *to, enum uio_seg pathseg); +int kern_renameat(struct thread *td, char *from, char *to, + enum uio_seg pathseg, int fdirfd, int tdirfd); int kern_rmdir(struct thread *td, char *path, enum uio_seg pathseg); int kern_rmdirat(struct thread *td, char *path, enum uio_seg pathseg, int dirfd); int kern_sched_rr_get_interval(struct thread *td, pid_t pid, @@ -195,6 +203,8 @@ int kern_unlinkat(struct thread *td, char *path, enum uio_seg pathseg, int dirfd); int kern_utimes(struct thread *td, char *path, enum uio_seg pathseg, struct timeval *tptr, enum uio_seg tptrseg); +int kern_utimesat(struct thread *td, char *path, enum uio_seg pathseg, + struct timeval *tptr, enum uio_seg tptrseg, int dirfd); int kern_wait(struct thread *td, pid_t pid, int *status, int options, struct rusage *rup); int kern_writev(struct thread *td, int fd, struct uio *auio); From owner-p4-projects@FreeBSD.ORG Mon Jun 4 20:31:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFB9116A469; Mon, 4 Jun 2007 20:31:08 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 3C79216A421 for ; Mon, 4 Jun 2007 20:31:08 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2AB4E13C45A for ; Mon, 4 Jun 2007 20:31:08 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l54KV8he067255 for ; Mon, 4 Jun 2007 20:31:08 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l54KV71o067216 for perforce@freebsd.org; Mon, 4 Jun 2007 20:31:07 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 4 Jun 2007 20:31:07 GMT Message-Id: <200706042031.l54KV71o067216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 120928 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, 04 Jun 2007 20:31:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=120928 Change 120928 by lulf@lulf_carrot on 2007/06/04 20:30:43 - Add attach routine. This is without rename and offset support for now since I need detach to test it. (A bit of a backwards-error I made when deciding to start on attach first.) Both userland support and support for the kernel verbs are added. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#6 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#13 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#11 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#6 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#11 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#6 (text+ko) ==== @@ -55,6 +55,7 @@ #include "gvinum.h" +void gvinum_attach(int, char **); void gvinum_create(int, char **); void gvinum_help(void); void gvinum_list(int, char **); @@ -112,7 +113,44 @@ exit(0); } +/* Attach a plex to a volume or a subdisk to a plex. */ void +gvinum_attach(int argc, char **argv) +{ + struct gctl_req *req; + const char *errstr; + int rename; + off_t offset; + + rename = 0; + offset = -1; + if (argc < 3) { + warnx("usage:\tattach [rename] " + "[]\n" + "\tattach [rename]"); + } + if (argc > 3) { + if (!strcmp(argv[3], "rename")) { + rename = 1; + if (argc == 5) + offset = strtol(argv[4], NULL, 0); + } else + offset = strtol(argv[3], NULL, 0); + } + req = gctl_get_handle(); + gctl_ro_param(req, "class", -1, "VINUM"); + gctl_ro_param(req, "verb", -1, "attach"); + gctl_ro_param(req, "child", -1, argv[1]); + gctl_ro_param(req, "parent", -1, argv[2]); + gctl_ro_param(req, "offset", sizeof(off_t), &offset); + gctl_ro_param(req, "rename", sizeof(int), &rename); + errstr = gctl_issue(req); + if (errstr != NULL) + warnx("attach failed: %s", errstr); + gctl_free(req); +} + +void gvinum_create(int argc, char **argv) { struct gctl_req *req; @@ -332,6 +370,9 @@ " Check the parity blocks of a RAID-5 plex.\n" "create description-file\n" " Create as per description-file or open editor.\n" + "attach plex volume [rename]\n" + "attach subdisk plex [offset] [rename]\n" + " Attach a plex to a volume, or a subdisk to a plex\n" "l | list [-r] [-v] [-V] [volume | plex | subdisk]\n" " List information about specified objects.\n" "ld [-r] [-v] [-V] [volume]\n" @@ -890,6 +931,8 @@ gvinum_create(argc, argv); else if (!strcmp(argv[0], "exit") || !strcmp(argv[0], "quit")) exit(0); + else if (!strcmp(argv[0], "attach")) + gvinum_attach(argc, argv); else if (!strcmp(argv[0], "help")) gvinum_help(); else if (!strcmp(argv[0], "list") || !strcmp(argv[0], "l")) ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#13 (text+ko) ==== @@ -51,6 +51,7 @@ #endif int gv_create(struct g_geom *, struct gctl_req *); +void gv_attach(struct gv_softc *, struct gctl_req *); static void gv_orphan(struct g_consumer *cp) @@ -193,6 +194,64 @@ return (0); } +/* Handle userland request of attaching object. */ +void +gv_attach(struct gv_softc *sc, struct gctl_req *req) +{ + struct gv_volume *v; + struct gv_plex *p; + struct gv_sd *s; + off_t *offset; + int *rename, type_child, type_parent; + char *child, *parent; + + child = gctl_get_param(req, "child", NULL); + if (child == NULL) { + gctl_error(req, "no child given"); + return; + } + parent = gctl_get_param(req, "parent", NULL); + if (parent == NULL) { + gctl_error(req, "no parent given"); + return; + } + + offset = gctl_get_paraml(req, "offset", sizeof(*offset)); + rename = gctl_get_paraml(req, "rename", sizeof(*rename)); + type_child = gv_object_type(sc, child); + type_parent = gv_object_type(sc, parent); + + switch (type_child) { + case GV_TYPE_PLEX: + if (type_parent != GV_TYPE_VOL) { + gctl_error(req, "no such volume to attach to"); + return; + } + v = gv_find_vol(sc, parent); + p = gv_find_plex(sc, child); + /* XXX: Rename not supported yet. */ + gv_post_event(sc, GV_EVENT_ATTACH_PLEX, p, v, NULL); + break; + case GV_TYPE_SD: + if (type_parent != GV_TYPE_PLEX) { + gctl_error(req, "no such plex to attach to"); + return; + } + p = gv_find_plex(sc, parent); + s = gv_find_sd(sc, child); + if (p->org == GV_PLEX_RAID5) { + gctl_error(req, "cannot add subdisk to a raid5 plex"); + return; + } + /* XXX: Rename not supported yet. */ + gv_post_event(sc, GV_EVENT_ATTACH_SD, s, p, NULL); + break; + default: + gctl_error(req, "invalid child type"); + break; + } +} + /* Handle userland requests for creating new objects. */ int gv_create(struct g_geom *gp, struct gctl_req *req) @@ -310,7 +369,10 @@ gp = LIST_FIRST(&mp->geom); sc = gp->softc; - if (!strcmp(verb, "list")) { + if (!strcmp(verb, "attach")) { + gv_attach(sc, req); + + } else if (!strcmp(verb, "list")) { gv_list(gp, req); /* Save our configuration back to disk. */ @@ -610,6 +672,26 @@ /*gv_start_volume(v);*/ break; + case GV_EVENT_ATTACH_PLEX: + printf("VINUM: event 'attach'\n"); + p = ev->arg1; + v = ev->arg2; + err = gv_attach_plex(p, v, 0); + if (err) + printf("VINUM: error attaching %s to " + "%s\n", p->name, v->name); + break; + + case GV_EVENT_ATTACH_SD: + printf("VINUM: event 'attach'\n"); + s = ev->arg1; + p = ev->arg2; + err = gv_attach_sd(s, p, -1, 0); + if (err) + printf("VINUM: error attaching %s to " + "%s\n", s->name, p->name); + break; + case GV_EVENT_THREAD_EXIT: printf("VINUM: event 'thread exit'\n"); g_free(ev); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#11 (text+ko) ==== @@ -90,6 +90,8 @@ off_t gv_vol_size(struct gv_volume *); off_t gv_plex_size(struct gv_plex *); int gv_plexdown(struct gv_volume *); +int gv_attach_plex(struct gv_plex *, struct gv_volume *, int); +int gv_attach_sd(struct gv_sd *, struct gv_plex *, off_t, int); void gv_worker(void *); void gv_post_event(struct gv_softc *, int, void *, void *, void *); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#6 (text+ko) ==== @@ -1043,3 +1043,87 @@ } mtx_destroy(&sc->config_mtx); } + +/* General 'attach' routine. */ +int +gv_attach_plex(struct gv_plex *p, struct gv_volume *v, int rename) +{ + struct gv_sd *s; + + g_topology_assert(); + + if (p->vol_sc != NULL) { + printf("VINUM: plex %s already attached", p->name); + return (GV_ERR_ISATTACHED); + } + + /* Stale all subdisks of this plex. */ + LIST_FOREACH(s, &p->subdisks, in_plex) { + if (s->state != GV_SD_STALE) + gv_set_sd_state(s, GV_SD_STALE, GV_SETSTATE_FORCE); + } + /* Attach to volume. Make sure volume is not up and running. */ + if (gv_provider_is_open(v->provider)) { + printf("VINUM: volume %s is busy, cannot attach %s\n", v->name, + p->name); + return (GV_ERR_ISOPEN); + } + p->vol_sc = v; + strlcpy(p->volume, v->name, GV_MAXVOLNAME); + v->plexcount++; + if (rename) { + /* XXX: Check if taken?. */ + snprintf(p->name, GV_MAXPLEXNAME, "%s.p%d", v->name, + v->plexcount - 1); + /* XXX: Rename subdisks? Original vinum does not. */ +/* LIST_FOREACH(s, &p->subdisks, in_plex) + strlcpy(s->plex, newplexname, GV_MAXPLEXNAME);*/ + } + LIST_INSERT_HEAD(&v->plexes, p, in_volume); + + /* Get plex up again. */ + gv_set_plex_state(p, GV_PLEX_UP, 0); + gv_save_config(p->vinumconf); + return (0); +} + +int +gv_attach_sd(struct gv_sd *s, struct gv_plex *p, off_t offset, int rename) +{ + struct gv_sd *s2; + int error; + + g_topology_assert(); + + /* If subdisk is attached, don't do it. */ + if (s->plex_sc != NULL) { + printf("VINUM: subdisk %s already attached", s->name); + return (GV_ERR_ISATTACHED); + } + + gv_set_sd_state(s, GV_SD_STALE, GV_SETSTATE_FORCE); + /* First check that this subdisk doesn't overlap with another of the + * plexes subdisks. */ + LIST_FOREACH(s2, &p->subdisks, in_plex) { + if (((s2->plex_offset > offset) && + (s2->plex_offset < s->size + offset)) || + ((offset > s2->plex_offset) && + (offset < s2->size + s2->plex_offset))) + return (GV_ERR_BADOFFSET); + } + /* Attach the subdisk to the plex at given offset. */ + s->plex_offset = offset; + strlcpy(s->plex, p->name, GV_MAXPLEXNAME); + + error = gv_sd_to_plex(s, p); + if (error) + return (error); + if (rename) { + snprintf(s->name, GV_MAXSDNAME, "%s.%d", s->plex, + p->sdcount - 1); + } + gv_save_config(p->vinumconf); + /* We don't update the subdisk state since the user might have to + * initiate a rebuild/sync first. */ + return (0); +} ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#11 (text+ko) ==== @@ -130,6 +130,7 @@ #define GV_ERR_NOTFOUND (-9) /* Object not found. */ #define GV_ERR_NAMETAKEN (-10) /* Object name is taken. */ #define GV_ERR_NOSPACE (-11) /* No space left on drive/subdisk. */ +#define GV_ERR_BADOFFSET (-12) /* Invalid offset specified. */ /* * hostname is 256 bytes long, but we don't need to shlep multiple copies in @@ -194,6 +195,8 @@ #define GV_EVENT_PARITY_CHECK 19 #define GV_EVENT_START_PLEX 20 #define GV_EVENT_START_VOLUME 21 +#define GV_EVENT_ATTACH_PLEX 22 +#define GV_EVENT_ATTACH_SD 23 struct gv_event { int type; From owner-p4-projects@FreeBSD.ORG Mon Jun 4 21:04:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8922816A46E; Mon, 4 Jun 2007 21:04:49 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 14C8C16A46C for ; Mon, 4 Jun 2007 21:04:49 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 05A5E13C4AD for ; Mon, 4 Jun 2007 21:04:49 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l54L4m8x015437 for ; Mon, 4 Jun 2007 21:04:48 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l54L4mE1015431 for perforce@freebsd.org; Mon, 4 Jun 2007 21:04:48 GMT (envelope-from piso@freebsd.org) Date: Mon, 4 Jun 2007 21:04:48 GMT Message-Id: <200706042104.l54L4mE1015431@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 120930 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, 04 Jun 2007 21:04:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=120930 Change 120930 by piso@piso_newluxor on 2007/06/04 21:04:15 -s/scl_handler/scl_filter/ where appropriate -whitespace Spotted by: marius Affected files ... .. //depot/projects/soc2006/intr_filter/sparc64/sbus/sbus.c#14 edit Differences ... ==== //depot/projects/soc2006/intr_filter/sparc64/sbus/sbus.c#14 (text+ko) ==== @@ -635,10 +635,10 @@ int res; scl = (struct sbus_clr *)arg; - if (scl->scl_handler != NULL) { + if (scl->scl_filter != NULL) { res = scl->scl_filter(scl->scl_arg); SYSIO_WRITE8(scl->scl_sc, scl->scl_clr, 0); - } else + } else res = FILTER_SCHEDULE_THREAD; return (res); } @@ -650,7 +650,7 @@ scl = (struct sbus_clr *)arg; scl->scl_handler(scl->scl_arg); - if (scl->scl_handler == NULL) + if (scl->scl_filter == NULL) SYSIO_WRITE8(scl->scl_sc, scl->scl_clr, 0); } From owner-p4-projects@FreeBSD.ORG Mon Jun 4 21:04:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 790ED16A46B; Mon, 4 Jun 2007 21:04:49 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 859BF16A400 for ; Mon, 4 Jun 2007 21:04:49 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 72F3A13C4AE for ; Mon, 4 Jun 2007 21:04:49 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l54L4nGZ015452 for ; Mon, 4 Jun 2007 21:04:49 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l54L4n6E015443 for perforce@freebsd.org; Mon, 4 Jun 2007 21:04:49 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 4 Jun 2007 21:04:49 GMT Message-Id: <200706042104.l54L4n6E015443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 120931 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, 04 Jun 2007 21:04:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=120931 Change 120931 by lulf@lulf_carrot on 2007/06/04 21:04:41 - Import new changes. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files#6 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.amd64#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.i386#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.pc98#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/kern.mk#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/support.s#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/linux_support.s#1 branch .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_clock.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_sig.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_bus.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/lock_profile.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/vnode.h#3 integrate Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1210 2007/05/22 12:00:31 mav Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1211 2007/05/25 09:48:18 kmacy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -514,6 +514,8 @@ dev/cs/if_cs_isa.c optional cs isa dev/cs/if_cs_pccard.c optional cs pccard dev/cxgb/cxgb_main.c optional cxgb pci +dev/cxgb/cxgb_offload.c optional cxgb pci +dev/cxgb/cxgb_l2t.c optional cxgb pci dev/cxgb/cxgb_lro.c optional cxgb pci dev/cxgb/cxgb_sge.c optional cxgb pci dev/cxgb/common/cxgb_mc5.c optional cxgb pci ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.amd64#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.101 2007/04/06 04:51:50 kan Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.103 2007/05/23 15:45:51 kib Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -231,9 +231,11 @@ amd64/linux32/linux32_locore.s optional compat_linux32 \ dependency "linux32_assym.h" amd64/linux32/linux32_machdep.c optional compat_linux32 +amd64/linux32/linux32_support.s optional compat_linux32 \ + dependency "linux32_assym.h" amd64/linux32/linux32_sysent.c optional compat_linux32 amd64/linux32/linux32_sysvec.c optional compat_linux32 -compat/linux/linux_emul.c optional compat_linux32 +compat/linux/linux_emul.c optional compat_linux32 compat/linux/linux_file.c optional compat_linux32 compat/linux/linux_futex.c optional compat_linux32 compat/linux/linux_getcwd.c optional compat_linux32 ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.i386#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.574 2007/04/06 11:29:52 nyan Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.576 2007/05/23 15:45:51 kib Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -345,6 +345,8 @@ dependency "linux_assym.h" i386/linux/linux_machdep.c optional compat_linux i386/linux/linux_ptrace.c optional compat_linux +i386/linux/linux_support.s optional compat_linux \ + dependency "linux_assym.h" i386/linux/linux_sysent.c optional compat_linux i386/linux/linux_sysvec.c optional compat_linux i386/pci/pci_bus.c optional pci ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.pc98#2 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.352 2007/04/06 11:30:31 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.354 2007/05/23 15:45:51 kib Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -221,6 +221,8 @@ dependency "linux_assym.h" i386/linux/linux_machdep.c optional compat_linux i386/linux/linux_ptrace.c optional compat_linux +i386/linux/linux_support.s optional compat_linux \ + dependency "linux_assym.h" i386/linux/linux_sysent.c optional compat_linux i386/linux/linux_sysvec.c optional compat_linux i386/pci/pci_bus.c optional pci ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/kern.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.51 2007/05/19 04:45:54 kan Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.52 2007/05/24 21:53:42 obrien Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -12,7 +12,10 @@ .else CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - ${_wundef} -Wno-pointer-sign -fformat-extensions + ${_wundef} ${_Wno_pointer_sign} -fformat-extensions +.if !defined(WITH_GCC3) +_Wno_pointer_sign=-Wno-pointer-sign +.endif .if !defined(NO_UNDEF) _wundef= -Wundef .endif ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/support.s#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/support.s,v 1.117 2007/03/31 01:47:37 jkim Exp $ + * $FreeBSD: src/sys/i386/i386/support.s,v 1.118 2007/05/23 08:33:05 kib Exp $ */ #include "opt_npx.h" @@ -1513,51 +1513,6 @@ incl %eax ret -/*****************************************************************************/ -/* linux_futex support */ -/*****************************************************************************/ - -futex_fault: - movl $0,PCB_ONFAULT(%ecx) - movl $-EFAULT,%eax - ret - -ENTRY(futex_xchgl) - movl PCPU(CURPCB),%ecx - movl $futex_fault,PCB_ONFAULT(%ecx) - movl 4(%esp),%eax - movl 8(%esp),%edx - cmpl $VM_MAXUSER_ADDRESS-4,%edx - ja futex_fault - -#ifdef SMP - lock -#endif - xchgl %eax,(%edx) - movl 12(%esp),%edx - movl %eax,(%edx) - xorl %eax,%eax - movl $0,PCB_ONFAULT(%ecx) - ret - -ENTRY(futex_addl) - movl PCPU(CURPCB),%ecx - movl $futex_fault,PCB_ONFAULT(%ecx) - movl 4(%esp),%eax - movl 8(%esp),%edx - cmpl $VM_MAXUSER_ADDRESS-4,%edx - ja futex_fault - -#ifdef SMP - lock -#endif - xaddl %eax,(%edx) - movl 12(%esp),%edx - movl %eax,(%edx) - xorl %eax,%eax - movl $0,PCB_ONFAULT(%ecx) - ret - /* * Support for BB-profiling (gcc -a). The kernbb program will extract * the data from the kernel. ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_clock.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.195 2007/05/20 22:11:49 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.196 2007/05/23 17:27:01 rwatson Exp $"); #include "opt_device_polling.h" #include "opt_hwpmc_hooks.h" @@ -174,8 +174,8 @@ * Set divisors to 1 (normal case) and let the machine-specific * code do its bit. */ + mtx_init(&time_lock, "time lock", NULL, MTX_SPIN); cpu_initclocks(); - mtx_init(&time_lock, "time lock", NULL, MTX_SPIN); /* * Compute profhz/stathz, and fix profhz if needed. ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_malloc.c#4 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.158 2007/05/18 07:10:45 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.159 2007/05/27 13:13:46 rwatson Exp $"); #include "opt_ddb.h" #include "opt_vm.h" @@ -321,10 +321,6 @@ } } #endif -#if 0 - if (size == 0) - kdb_enter("zero size malloc"); -#endif #ifdef MALLOC_MAKE_FAILURES if ((flags & M_NOWAIT) && (malloc_failure_rate != 0)) { atomic_add_int(&malloc_nowait_count, 1); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_sig.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.342 2007/03/21 21:20:50 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.343 2007/05/23 17:27:42 rwatson Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -1977,6 +1977,10 @@ * regardless of the signal action (eg, blocked or ignored). * * Other ignored signals are discarded immediately. + * + * NB: This function may be entered from the debugger via the "kill" DDB + * command. There is little that can be done to mitigate the possibly messy + * side effects of this unwise possibility. */ void psignal(struct proc *p, int sig) ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_bus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_bus.c,v 1.199 2007/02/26 19:28:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_bus.c,v 1.200 2007/05/23 17:28:21 sam Exp $"); #include "opt_bus.h" @@ -3850,7 +3850,7 @@ /** * @brief Enumerate all hinted devices for this bus. * - * Walks throught he hints for this bus and calls the bus_hinted_child + * Walks through the hints for this bus and calls the bus_hinted_child * routine for each one it fines. It searches first for the specific * bus that's being probed for hinted children (eg isa0), and then for * generic children (eg isa). ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_mqueue.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.23 2007/04/11 16:22:59 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_mqueue.c,v 1.24 2007/05/23 13:36:02 cognet Exp $"); #include #include @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_cache.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.108 2007/04/04 09:11:33 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.112 2007/05/25 22:23:38 pjd Exp $"); #include #include @@ -293,37 +293,6 @@ } /* - * cache_leaf_test() - * - * Test whether this (directory) vnode's namei cache entry contains - * subdirectories or not. Used to determine whether the directory is - * a leaf in the namei cache or not. Note: the directory may still - * contain files in the namei cache. - * - * Returns 0 if the directory is a leaf, -1 if it isn't. - */ -int -cache_leaf_test(struct vnode *vp) -{ - struct namecache *ncpc; - int leaf; - - leaf = 0; - CACHE_LOCK(); - for (ncpc = LIST_FIRST(&vp->v_cache_src); - ncpc != NULL; - ncpc = LIST_NEXT(ncpc, nc_src) - ) { - if (ncpc->nc_vp != NULL && ncpc->nc_vp->v_type == VDIR) { - leaf = -1; - break; - } - } - CACHE_UNLOCK(); - return (leaf); -} - -/* * Lookup an entry in the cache * * Lookup is called with dvp pointing to the directory to search, @@ -346,7 +315,7 @@ { struct namecache *ncp; u_int32_t hash; - int error; + int error, ltype; if (!doingcache) { cnp->cn_flags &= ~MAKEENTRY; @@ -452,13 +421,16 @@ CACHE_UNLOCK(); return (-1); } - if (cnp->cn_flags & ISDOTDOT) + ltype = 0; /* silence gcc warning */ + if (cnp->cn_flags & ISDOTDOT) { + ltype = VOP_ISLOCKED(dvp, cnp->cn_thread); VOP_UNLOCK(dvp, 0, cnp->cn_thread); + } VI_LOCK(*vpp); CACHE_UNLOCK(); error = vget(*vpp, cnp->cn_lkflags | LK_INTERLOCK, cnp->cn_thread); if (cnp->cn_flags & ISDOTDOT) - vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, cnp->cn_thread); + vn_lock(dvp, ltype | LK_RETRY, cnp->cn_thread); if (error) { *vpp = NULL; goto retry; @@ -611,24 +583,15 @@ { struct nchashhead *ncpp; struct namecache *ncp, *nnp; - struct nchashhead mplist; - LIST_INIT(&mplist); - ncp = NULL; - /* Scan hash tables for applicable entries */ CACHE_LOCK(); for (ncpp = &nchashtbl[nchash]; ncpp >= nchashtbl; ncpp--) { - for (ncp = LIST_FIRST(ncpp); ncp != 0; ncp = nnp) { - nnp = LIST_NEXT(ncp, nc_hash); - if (ncp->nc_dvp->v_mount == mp) { - LIST_REMOVE(ncp, nc_hash); - LIST_INSERT_HEAD(&mplist, ncp, nc_hash); - } + LIST_FOREACH_SAFE(ncp, ncpp, nc_hash, nnp) { + if (ncp->nc_dvp->v_mount == mp) + cache_zap(ncp); } } - while (!LIST_EMPTY(&mplist)) - cache_zap(LIST_FIRST(&mplist)); CACHE_UNLOCK(); } ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/lock_profile.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/lock_profile.h,v 1.12 2007/04/03 18:36:27 kmacy Exp $ + * $FreeBSD: src/sys/sys/lock_profile.h,v 1.13 2007/05/23 18:46:54 jhb Exp $ */ @@ -84,8 +84,6 @@ u_int hash = 0; struct lock_profile_object *l = &lo->lo_profile_obj; - lo->lo_flags = 0; - lo->lo_name = name; l->lpo_acqtime = 0; l->lpo_waittime = 0; l->lpo_filename = NULL; ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/vnode.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)vnode.h 8.7 (Berkeley) 2/4/94 - * $FreeBSD: src/sys/sys/vnode.h,v 1.324 2007/05/18 13:02:13 kib Exp $ + * $FreeBSD: src/sys/sys/vnode.h,v 1.325 2007/05/25 22:16:17 pjd Exp $ */ #ifndef _SYS_VNODE_H_ @@ -565,7 +565,6 @@ struct componentname *cnp); void cache_purge(struct vnode *vp); void cache_purgevfs(struct mount *mp); -int cache_leaf_test(struct vnode *vp); int change_dir(struct vnode *vp, struct thread *td); int change_root(struct vnode *vp, struct thread *td); void cvtstat(struct stat *st, struct ostat *ost); From owner-p4-projects@FreeBSD.ORG Tue Jun 5 08:51:47 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6ED916A46C; Tue, 5 Jun 2007 08:51:46 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 B586816A468 for ; Tue, 5 Jun 2007 08:51:46 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A3BF513C46C for ; Tue, 5 Jun 2007 08:51:46 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l558pkff090232 for ; Tue, 5 Jun 2007 08:51:46 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l558pkXH090223 for perforce@freebsd.org; Tue, 5 Jun 2007 08:51:46 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Tue, 5 Jun 2007 08:51:46 GMT Message-Id: <200706050851.l558pkXH090223@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 120967 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2007 08:51:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=120967 Change 120967 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/05 08:50:51 Zhouyi Zhou add his first MAC test program follows the idea of tools/regression/fstest Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/LICENSE#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/README#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/macproc.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/tests/conf#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/tests/misc.sh#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/tests/signal/00.t#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jun 5 10:10:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B28B16A468; Tue, 5 Jun 2007 10:10:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 DD5C016A400 for ; Tue, 5 Jun 2007 10:10:36 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CB76413C458 for ; Tue, 5 Jun 2007 10:10:36 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l55AAaec069653 for ; Tue, 5 Jun 2007 10:10:36 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l55AAat0069644 for perforce@freebsd.org; Tue, 5 Jun 2007 10:10:36 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 5 Jun 2007 10:10:36 GMT Message-Id: <200706051010.l55AAat0069644@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120976 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2007 10:10:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=120976 Change 120976 by rdivacky@rdivacky_witten on 2007/06/05 10:09:57 *at syscalls are defined by POSIX so unBSDify the definition of AT_FDCWD. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/fcntl.h#3 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/fcntl.h#3 (text+ko) ==== @@ -105,9 +105,7 @@ #ifdef _KERNEL #define FHASLOCK 0x4000 /* descriptor holds advisory lock */ #endif -#ifdef __BSD_VISIBLE -#define AT_FDCWD -100 /* just like Linux */ -#endif +#define AT_FDCWD -100 /* CWD for *at syscals */ /* Defined by POSIX 1003.1; BSD default, but must be distinct from O_RDONLY. */ #define O_NOCTTY 0x8000 /* don't assign controlling terminal */ From owner-p4-projects@FreeBSD.ORG Tue Jun 5 16:20:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96DBE16A46B; Tue, 5 Jun 2007 16:20:51 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5734816A468 for ; Tue, 5 Jun 2007 16:20:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 40AF113C483 for ; Tue, 5 Jun 2007 16:20:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l55GKpdu039997 for ; Tue, 5 Jun 2007 16:20:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l55GKExC038987 for perforce@freebsd.org; Tue, 5 Jun 2007 16:20:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 5 Jun 2007 16:20:14 GMT Message-Id: <200706051620.l55GKExC038987@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120999 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2007 16:20:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=120999 Change 120999 by rwatson@rwatson_zoo on 2007/06/05 16:19:53 Integrate TrustedBSD base branch from FreeBSD CVS: - file(1) 4.21 - X11R6 -> local cleanups - Support for compiling stack-protected programs - threadlock (much less sched_lock); !SCHED_CORE - ipfilter update - if_em, mpt, update - much sound - new accounting file format - 64-bit sysctl type (quad) - bsdtar/libarchive compression program support Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#86 integrate .. //depot/projects/trustedbsd/base/UPDATING#82 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#12 integrate .. //depot/projects/trustedbsd/base/bin/pax/ar_io.c#11 integrate .. //depot/projects/trustedbsd/base/bin/pax/file_subs.c#8 integrate .. //depot/projects/trustedbsd/base/bin/pax/pat_rep.c#10 integrate .. //depot/projects/trustedbsd/base/bin/pax/sel_subs.c#8 integrate .. //depot/projects/trustedbsd/base/bin/pax/tables.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/LEGAL.NOTICE#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Localstuff#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/MAINT#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/animation#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/archive#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/audio#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/c-lang#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/cad#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/cafebabe#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/commands#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/console#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/database#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/editors#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/elf#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/filesystems#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/fonts#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/images#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/java#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/linux#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/lisp#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/mach#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/mathematica#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/mime#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/mips#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/misctools#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/msdos#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/os2#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/os400#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/perl#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/python#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/revision#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/riff#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/sgml#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/sql#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/sun#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/sysex#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/tex#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/tgif#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/unicode#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/varied.out#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/vmware#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/wordprocessors#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/xwindows#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Makefile.am#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/README#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/apprentice.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/apptype.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/ascmagic.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/compress.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/config.h.in#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/configure#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/configure.in#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/fsmagic.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/funcs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/install-sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/is_tar.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.mime#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic2mime#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/mkinstalldirs#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/names.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/patchlevel.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/print.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/file/readelf.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/softmagic.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/file/tar.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/test.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcc.c#19 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/pathnames.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config.5#18 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config.5#20 integrate .. //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#24 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#68 integrate .. //depot/projects/trustedbsd/base/etc/etc.amd64/ttys#3 integrate .. //depot/projects/trustedbsd/base/etc/etc.arm/ttys#3 integrate .. //depot/projects/trustedbsd/base/etc/etc.i386/ttys#4 integrate .. //depot/projects/trustedbsd/base/etc/etc.ia64/ttys#6 integrate .. //depot/projects/trustedbsd/base/etc/etc.powerpc/ttys#5 integrate .. //depot/projects/trustedbsd/base/etc/etc.sparc64/ttys#12 integrate .. //depot/projects/trustedbsd/base/etc/login.conf#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/cleanvar#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/initrandom#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/jail#18 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/tmp#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/var#7 integrate .. //depot/projects/trustedbsd/base/etc/root/dot.cshrc#4 integrate .. //depot/projects/trustedbsd/base/etc/root/dot.profile#2 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#61 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/Makefile#18 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#27 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#18 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#21 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.h#14 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry_copy_stat.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry_private.h#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry_stat.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_platform.h#17 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.3#15 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.c#17 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_extract.c#20 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_bzip2.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_compress.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_gzip.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_none.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_program.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_ar.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_cpio.c#17 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_empty.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_iso9660.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#23 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_zip.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_string.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_string.h#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_util.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_util.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.3#13 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_disk_set_standard_lookup.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_private.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_bzip2.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_gzip.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_none.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_compression_program.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ar.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_cpio.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#22 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_shar.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_ustar.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/config_freebsd.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/filter_fork.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/filter_fork.h#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/libarchive_internals.3#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/README#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/main.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_acl_basic.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_acl_pax.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_archive_api_feature.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_entry.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_compress_program.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_data_large.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_extract.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_ar.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_format_zip.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_large.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_position.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_read_truncated.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_tar_filenames.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_compress_program.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_disk_perms.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_ar.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_cpio_empty.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_shar_empty.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_tar.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_format_tar_empty.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/test/test_write_open_memory.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/Symbol.map#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/Symbol.map#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/hash/hash.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/Symbol.map#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/arc4random.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/Symbol.map#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/Symbol.map#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/Symbol.map#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/Symbol.map#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/powerpc/Symbol.map#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/quad/Symbol.map#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/regex/engine.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/Symbol.map#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/Symbol.map#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdtime/Symbol.map#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/Symbol.map#5 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/Makefile#21 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/fetch.3#16 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_proc.c#32 integrate .. //depot/projects/trustedbsd/base/lib/libmagic/config.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_login_access/login_access.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libthread_db/arch/amd64/libpthread_md.c#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_cbrtf.c#4 integrate .. //depot/projects/trustedbsd/base/lib/ncurses/form/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/ncurses/menu/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/ncurses/ncurses/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/ncurses/panel/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/install.sgml#21 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 integrate .. //depot/projects/trustedbsd/base/release/doc/share/sgml/release.ent#18 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/stripe/geom_stripe.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/newfs_msdos/newfs_msdos.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/savecore/savecore.c#17 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#78 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mmc.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/mmcsd.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ng_bpf.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pcm.4#18 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pty.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snd_spicds.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#44 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#70 integrate .. //depot/projects/trustedbsd/base/share/man/man9/bus_alloc_resource.9#10 integrate .. //depot/projects/trustedbsd/base/share/man/man9/locking.9#2 integrate .. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#34 integrate .. //depot/projects/trustedbsd/base/share/mk/Makefile#16 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.port.options.mk#1 branch .. //depot/projects/trustedbsd/base/share/mk/bsd.sys.mk#19 integrate .. //depot/projects/trustedbsd/base/share/skel/dot.cshrc#2 integrate .. //depot/projects/trustedbsd/base/share/skel/dot.profile#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/cpu_switch.S#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/genassym.c#16 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/identcpu.c#18 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/intr_machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#35 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#26 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_watchdog.c#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#42 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#33 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/tsc.c#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/vm_machdep.c#27 integrate .. //depot/projects/trustedbsd/base/sys/amd64/ia32/ia32_syscall.c#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/pcpu.h#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/specialreg.h#14 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/vmparam.h#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/clock.c#20 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_machdep.c#19 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/intr.c#11 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/machdep.c#12 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#22 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/trap.c#18 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/undefined.c#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#21 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/uart_cpu_at91rm9200usart.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pcpu.h#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/vmparam.h#9 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#35 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_all.c#21 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_vnops.c#21 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#44 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#55 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ndis.c#16 integrate .. //depot/projects/trustedbsd/base/sys/compat/ndis/subr_ntoskrnl.c#17 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/kern/opensolaris_vfs.c#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#35 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.ia64#21 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#87 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#117 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#83 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/fil.c#19 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_auth.c#15 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_auth.h#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_compat.h#16 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_fil.h#12 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_frag.c#13 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_frag.h#7 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#11 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_htable.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_htable.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_log.c#14 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_lookup.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_lookup.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_nat.c#16 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_nat.h#10 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_pool.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_pool.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_proxy.c#13 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_proxy.h#7 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#8 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_scan.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_scan.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_state.c#16 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_state.h#9 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_sync.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_sync.h#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ipl.h#12 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/mlfk_ipl.c#10 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_asus.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_panasonic.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdHardware.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_cpu.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_dock.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_ec.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_timer.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#38 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#68 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/README#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#65 integrate .. //depot/projects/trustedbsd/base/sys/dev/gem/if_gem.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/gem/if_gemreg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/gem/if_gemvar.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_mod.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/md/md.c#52 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfi.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mfi/mfivar.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_cnfg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_init.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_ioc.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_log_fc.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_log_sas.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_raid.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_sas.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_targ.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccardvarp.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#53 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb_pci.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbvar.h#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/clone.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/clone.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/atiixp.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10kx.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/envy24ht.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/es137x.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/ac97.c#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/buffer.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/channel.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/channel.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/dsp.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/dsp.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder_fmt.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder_rate.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder_volume.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/mixer.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sndstat.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.h#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/vchan.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/vchan.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/unit.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/unit.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio_pcm.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/version.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/speaker/spkr.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvscom.c#22 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#50 integrate .. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#42 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#40 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_io.c#18 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_ctl.c#21 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_ioctl.c#17 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_status.c#21 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_io.c#23 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vnops.c#28 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union.h#13 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_subr.c#25 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vnops.c#30 integrate .. //depot/projects/trustedbsd/base/sys/geom/cache/g_cache.c#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.c#15 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_kern.c#22 integrate .. //depot/projects/trustedbsd/base/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#20 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#20 integrate .. //depot/projects/trustedbsd/base/sys/geom/stripe/g_stripe.c#10 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/elan-mmcr.c#22 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/intr_machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#71 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_clock.c#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#57 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_watchdog.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#77 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#55 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/tsc.c#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#54 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/imgact_coff.c#21 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/pcpu.h#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/specialreg.h#16 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/vmparam.h#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/clock.c#38 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/npx.c#36 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#33 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia32/ia32_trap.c#8 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/interrupt.c#31 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#65 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/mp_machdep.c#29 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#59 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/trap.c#46 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/vm_machdep.c#43 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/pcpu.h#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_main.c#52 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#36 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_alq.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_clock.c#40 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_condvar.c#36 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_conf.c#34 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_cpu.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#73 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#66 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#58 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#64 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_idle.c#21 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_intr.c#50 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_kse.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_kthread.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_lockf.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mib.c#24 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#52 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_poll.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_resource.c#40 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_rwlock.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_shutdown.c#35 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#72 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_subr.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_switch.c#42 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sx.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#54 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thr.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#59 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_time.c#35 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_umtx.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/ksched.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/link_elf.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/link_elf_obj.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_4bsd.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_core.c#7 delete .. //depot/projects/trustedbsd/base/sys/kern/sched_ule.c#36 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_lock.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_prof.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_sleepqueue.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_smp.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_taskqueue.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_trap.c#45 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_turnstile.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#67 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_generic.c#42 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_process.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty.c#40 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_cons.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_sockbuf.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#69 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#59 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#67 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_cluster.c#40 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#89 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#79 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#65 integrate .. //depot/projects/trustedbsd/base/sys/kern/vnode_if.src#33 integrate .. //depot/projects/trustedbsd/base/sys/modules/dcons/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/sound/sound/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#21 integrate .. //depot/projects/trustedbsd/base/sys/net/if_media.h#21 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/common/ng_bluetooth.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_base.c#30 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_ppp.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_bsd_addr.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_constants.h#9 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_indata.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_input.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_input.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_output.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_output.h#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.h#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_structs.h#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_timer.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_usrreq.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.h#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#44 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/frag6.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6.c#28 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_ifattach.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_var.h#15 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_var.h#18 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/sctp6_usrreq.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_sock.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_trantcp.c#18 integrate .. //depot/projects/trustedbsd/base/sys/nfs4client/nfs4_vnops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_bio.c#34 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vnops.c#46 integrate .. //depot/projects/trustedbsd/base/sys/pc98/cbus/clock.c#8 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/machdep.c#19 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/pcpu.h#8 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/intr_machdep.c#12 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/machdep.c#44 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/trap.c#27 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/vm_machdep.c#35 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#19 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.h#8 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_arg.c#10 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#13 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_klib.c#7 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#9 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#11 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#14 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_worker.c#8 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_lomac/mac_lomac.c#33 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/pcpu.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/vmparam.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/intr_machdep.c#22 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/machdep.c#55 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_machdep.c#28 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#62 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/trap.c#40 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/tsb.c#21 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/vm_machdep.c#39 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/include/vmparam.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/intr_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/pmap.c#6 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/trap.c#6 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/tsb.c#4 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/sun4v/vm_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/conf.h#34 integrate .. //depot/projects/trustedbsd/base/sys/sys/filedesc.h#29 integrate .. //depot/projects/trustedbsd/base/sys/sys/mutex.h#34 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#84 integrate .. //depot/projects/trustedbsd/base/sys/sys/resource.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/resourcevar.h#19 integrate .. //depot/projects/trustedbsd/base/sys/sys/sched.h#17 integrate .. //depot/projects/trustedbsd/base/sys/sys/sx.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysctl.h#36 integrate .. //depot/projects/trustedbsd/base/sys/sys/turnstile.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/vmmeter.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#69 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_inode.c#23 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_snapshot.c#46 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_bmap.c#17 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_extattr.c#31 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#34 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#55 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#50 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#39 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#53 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#50 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#54 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_meter.c#25 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_mmap.c#38 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#68 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#74 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#45 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageq.c#24 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_zeroidle.c#24 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#51 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/lastcomm/README#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/lastcomm/v1-sparc64.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/lastcomm/v2-sparc64.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.sbin/sa/v1-sparc64-sav.in#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.sbin/sa/v1-sparc64-sav.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.sbin/sa/v1-sparc64-u.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.sbin/sa/v1-sparc64-usr.in#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.sbin/sa/v1-sparc64-usr.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.sbin/sa/v2-sparc64-sav.in#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.sbin/sa/v2-sparc64-u.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.sbin/sa/v2-sparc64-usr.in#1 branch .. //depot/projects/trustedbsd/base/usr.bin/file/config.h#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/file/file.1#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/file/magic.5#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/gzip/gzip.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/gzip/gzip.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/less/lesspipe.sh#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/main.c#34 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/Makefile#14 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar.1#14 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar.c#17 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar.h#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/read.c#16 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/write.c#20 integrate .. //depot/projects/trustedbsd/base/usr.sbin/dconschat/dconschat.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/command.c#18 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/ppp.8.m4#25 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/radius.c#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/radius.h#9 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#86 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.581 2007/05/19 20:34:29 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.582 2007/05/26 20:17:19 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -309,7 +309,7 @@ rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/c++/3.4 usr/include/sys usr/lib \ + usr/bin usr/games usr/include/sys usr/lib \ usr/libexec usr/sbin usr/share/dict \ usr/share/groff_font/devX100 \ usr/share/groff_font/devX100-12 \ @@ -505,7 +505,7 @@ # and Makefile.inc1 causes the correct PATH to be used, rather than a # modification of the current environment's PATH. In addition, we need # to quote multiword values. -# +# buildenvvars: @echo ${WMAKEENV:Q} @@ -1113,7 +1113,7 @@ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install -_prereq_libs: ${_prereq_libs:S/$/__PL/} +_prereq_libs: ${_prereq_libs:S/$/__PL/} _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} ==== //depot/projects/trustedbsd/base/UPDATING#82 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20070529: + The ether_ioctl() function has been synchronized with ioctl(2) + and ifnet.if_ioctl. Due to that, the size of one of its arguments + has changed on 64-bit architectures. All kernel modules using + ether_ioctl() need to be rebuilt on such architectures. + 20070516: Improved INCLUDE_CONFIG_FILE support has been introduced to the config(8) utility. In order to take advantage of this new @@ -795,4 +801,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.491 2007/05/16 17:23:53 wkoszek Exp $ +$FreeBSD: src/UPDATING,v 1.492 2007/05/29 12:40:45 yar Exp $ ==== //depot/projects/trustedbsd/base/bin/chflags/chflags.1#12 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.28 2006/03/10 12:37:19 trhodes Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -66,7 +66,7 @@ If the .Ar file is a symbolic link, -change the mode of the link itself rather than the file to which it points. +change the file flags of the link itself rather than the file to which it points. .It Fl L If the .Fl R ==== //depot/projects/trustedbsd/base/bin/pax/ar_io.c#11 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.26 2005/03/12 06:38:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.28 2007/05/25 17:53:37 brian Exp $"); #include #include @@ -1109,8 +1109,8 @@ int ar_next(void) { + static char *arcbuf; char buf[PAXPATHLEN+2]; - static int freeit = 0; sigset_t o_mask; /* @@ -1228,17 +1228,14 @@ * try to open new archive */ if (ar_open(buf) >= 0) { - if (freeit) { - (void)free((char *)(uintptr_t)arcname); - freeit = 0; - } - if ((arcname = strdup(buf)) == NULL) { + free(arcbuf); + if ((arcbuf = strdup(buf)) == NULL) { done = 1; lstrval = -1; paxwarn(0, "Cannot save archive name."); return(-1); } - freeit = 1; + arcname = arcbuf; break; } tty_prnt("Cannot open %s, try again\n", buf); ==== //depot/projects/trustedbsd/base/bin/pax/file_subs.c#8 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.21 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.22 2007/05/24 06:44:37 rse Exp $"); #include #include @@ -284,7 +284,7 @@ */ if ((to_sb->st_dev==sb.st_dev)&&(to_sb->st_ino == sb.st_ino)) { paxwarn(1, "Unable to link file %s to itself", to); - return(-1);; + return(-1); } /* ==== //depot/projects/trustedbsd/base/bin/pax/pat_rep.c#10 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.25 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.27 2007/05/25 17:53:37 brian Exp $"); #include #include @@ -140,7 +140,7 @@ regerror(res, &(rep->rcmp), rebuf, sizeof(rebuf)); paxwarn(1, "%s while compiling regular expression %s", rebuf, str); # endif - (void)free((char *)rep); + free(rep); return(-1); } @@ -152,11 +152,11 @@ *pt1++ = *str; if ((pt2 = strchr(pt1, *str)) == NULL) { # ifdef NET2_REGEX - (void)free((char *)rep->rcmp); + free(rep->rcmp); # else - regfree(&(rep->rcmp)); + regfree(&rep->rcmp); # endif - (void)free((char *)rep); + free(rep); paxwarn(1, "Invalid replacement string %s", str); return(-1); } @@ -181,11 +181,11 @@ break; default: # ifdef NET2_REGEX - (void)free((char *)rep->rcmp); + free(rep->rcmp); # else - regfree(&(rep->rcmp)); + regfree(&rep->rcmp); # endif - (void)free((char *)rep); + free(rep); *pt1 = *str; paxwarn(1, "Invalid replacement string option %s", str); return(-1); @@ -401,7 +401,7 @@ return(-1); } *ppt = pt->fow; - (void)free((char *)pt); + free(pt); arcn->pat = NULL; return(0); } ==== //depot/projects/trustedbsd/base/bin/pax/sel_subs.c#8 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.19 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.21 2007/05/25 17:53:38 brian Exp $"); #include #include @@ -412,7 +412,7 @@ */ if (str_sec(str, &(pt->low_time)) < 0) { paxwarn(1, "Illegal lower time range %s", str); - (void)free((char *)pt); + free(pt); goto out; } pt->flgs |= HASLOW; @@ -424,7 +424,7 @@ */ if (str_sec(up_pt, &(pt->high_time)) < 0) { paxwarn(1, "Illegal upper time range %s", up_pt); - (void)free((char *)pt); + free(pt); goto out; } pt->flgs |= HASHIGH; @@ -436,7 +436,7 @@ if (pt->low_time > pt->high_time) { paxwarn(1, "Upper %s and lower %s time overlap", up_pt, str); - (void)free((char *)pt); + free(pt); return(-1); } } ==== //depot/projects/trustedbsd/base/bin/pax/tables.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.22 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.24 2007/05/25 17:53:38 brian Exp $"); #include #include @@ -178,8 +178,8 @@ */ if (--pt->nlink <= 1) { *ppt = pt->fow; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); } return(1); } @@ -198,7 +198,7 @@ ltab[indx] = pt; return(0); } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Hard link table out of memory"); @@ -254,8 +254,8 @@ * remove and free it */ *ppt = pt->fow; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); } /* @@ -288,8 +288,8 @@ while (pt != NULL) { ppt = pt; pt = ppt->fow; - (void)free((char *)ppt->name); - (void)free((char *)ppt); + free(ppt->name); + free(ppt); } } return; @@ -460,7 +460,7 @@ paxwarn(1, "File time table ran out of memory"); if (pt != NULL) - (void)free((char *)pt); + free(pt); return(-1); } @@ -538,7 +538,7 @@ if (strcmp(nname, pt->nname) == 0) return(0); - (void)free((char *)pt->nname); + free(pt->nname); if ((pt->nname = strdup(nname)) == NULL) { paxwarn(1, "Cannot update rename table"); return(-1); @@ -557,9 +557,9 @@ ntab[indx] = pt; return(0); } - (void)free((char *)pt->oname); + free(pt->oname); } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Interactive rename table out of memory"); return(-1); @@ -994,7 +994,7 @@ atab[indx] = pt; return; } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Directory access time reset table ran out of memory"); @@ -1051,8 +1051,8 @@ *ppt = pt->fow; *mtime = pt->mtime; *atime = pt->atime; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); return(0); } ==== //depot/projects/trustedbsd/base/contrib/file/ChangeLog#4 (text+ko) ==== @@ -1,3 +1,194 @@ +2007-05-24 10:00 Christos Zoulas + + * Fix another integer overflow (Colin Percival) + +2007-03-26 13:58 Christos Zoulas + + * make sure that all of struct magic_set is initialized appropriately + (Brett) + +2007-03-25 17:44 Christos Zoulas + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 5 16:36:19 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07D4116A46E; Tue, 5 Jun 2007 16:36:19 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 BF0CC16A46C for ; Tue, 5 Jun 2007 16:36:18 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A8A7213C469 for ; Tue, 5 Jun 2007 16:36:18 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l55GaIDC053548 for ; Tue, 5 Jun 2007 16:36:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l55GZvN0053202 for perforce@freebsd.org; Tue, 5 Jun 2007 16:35:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 5 Jun 2007 16:35:57 GMT Message-Id: <200706051635.l55GZvN0053202@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 121001 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2007 16:36:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=121001 Change 121001 by rwatson@rwatson_zoo on 2007/06/05 16:33:46 Integrate TrustedBSD priv branch. Affected files ... .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/genassym.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/tsc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/isa/clock.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_machdep.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/intr.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/trap.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/pcpu.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/vmparam.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/cam/cam_xpt.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/coda/coda_vnops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_misc.c#15 integrate .. //depot/projects/trustedbsd/priv/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/compat/svr4/svr4_misc.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/conf/Makefile.ia64#3 integrate .. //depot/projects/trustedbsd/priv/sys/conf/NOTES#14 integrate .. //depot/projects/trustedbsd/priv/sys/conf/files#16 integrate .. //depot/projects/trustedbsd/priv/sys/conf/options#11 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/Osd/OsdHardware.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_timer.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bge.c#12 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ciss/ciss.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/README#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/em/if_em.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/dev/gem/if_gem.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/gem/if_gemvar.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hwpmc/hwpmc_mod.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/md/md.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfivar.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpilib/mpi_log_fc.h#2 delete .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpilib/mpi_log_sas.h#2 delete .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_cam.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pccard/pccard.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pccard/pccardvarp.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pccbb/pccbb_pci.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pccbb/pccbbvar.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/clone.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/sound/clone.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/atiixp.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/emu10kx.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24ht.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/es137x.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/via8233.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/buffer.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/channel.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/channel.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/dsp.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/dsp.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/feeder.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/feeder_fmt.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/feeder_rate.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/feeder_volume.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/mixer.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sndstat.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sound.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sound.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/vchan.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/unit.c#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/sound/unit.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/usb/uaudio_pcm.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/version.h#1 branch .. //depot/projects/trustedbsd/priv/sys/dev/speaker/spkr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uplcom.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uvscom.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_status.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/smbfs/smbfs_vnops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/fs/unionfs/union.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/fs/unionfs/union_vnops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/geom/cache/g_cache.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/eli/g_eli.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/geom/geom_kern.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/geom/raid3/g_raid3.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/elan-mmcr.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/mp_machdep.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/mp_watchdog.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/trap.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/tsc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/include/vmparam.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/i386/isa/clock.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/isa/npx.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_machdep.c#12 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia32/ia32_trap.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/mp_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/trap.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/init_main.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_acct.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_alq.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_clock.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_condvar.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_conf.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_cpu.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_descrip.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_exec.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_exit.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_fork.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_idle.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_intr.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_kse.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_kthread.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_ktrace.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_linker.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_malloc.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_mbuf.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_mib.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_poll.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_proc.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_resource.c#13 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_sig.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_subr.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_switch.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_sx.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_synch.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_sysctl.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_tc.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_thr.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_thread.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_time.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_umtx.c#12 integrate .. //depot/projects/trustedbsd/priv/sys/kern/ksched.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/kern/link_elf.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sched_core.c#5 delete .. //depot/projects/trustedbsd/priv/sys/kern/sched_ule.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_lock.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_prof.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_smp.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_trap.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/subr_witness.c#12 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sys_generic.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sys_process.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/tty.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/tty_cons.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_sockbuf.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/uipc_socket.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_aio.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_cluster.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_syscalls.c#14 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_vnops.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vnode_if.src#5 integrate .. //depot/projects/trustedbsd/priv/sys/modules/dcons/Makefile#2 integrate .. //depot/projects/trustedbsd/priv/sys/modules/sound/sound/Makefile#3 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_bridge.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_media.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/bluetooth/common/ng_bluetooth.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/ng_ppp.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_bsd_addr.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_constants.h#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_input.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_input.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_output.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.h#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_structs.h#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_timer.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_usrreq.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.h#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/frag6.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_usrreq.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/netncp/ncp_sock.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/nfs4client/nfs4_vnops.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_vnops.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/cbus/clock.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/include/pcpu.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/intr_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/machdep.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/trap.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/vm_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit.c#13 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_arg.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_bsm.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_pipe.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_private.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_syscalls.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_worker.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/security/mac_lomac/mac_lomac.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/pcpu.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/include/vmparam.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/machdep.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/trap.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/tsb.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/include/vmparam.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/intr_machdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/machdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/pmap.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/trap.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tsb.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/vm_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/conf.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/filedesc.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mutex.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/proc.h#9 integrate .. //depot/projects/trustedbsd/priv/sys/sys/resource.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/resourcevar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sched.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sx.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/sys/sysctl.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/sys/turnstile.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/sys/vmmeter.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/vnode.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_inode.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_snapshot.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_extattr.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_quota.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/vm/swap_pager.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/vm/uma_core.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_contig.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_fault.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_glue.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_map.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_meter.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_mmap.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_object.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_page.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_pageq.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vm_zeroidle.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/vm/vnode_pager.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/cpu_switch.S#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.156 2007/03/30 00:06:20 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.157 2007/06/05 00:16:43 jeff Exp $ */ #include @@ -73,19 +73,16 @@ movq TD_PCB(%rsi),%rdx /* newtd->td_proc */ movq PCB_CR3(%rdx),%rdx movq %rdx,%cr3 /* new address space */ - /* set bit in new pm_active */ - movq TD_PROC(%rsi),%rdx - movq P_VMSPACE(%rdx), %rdx - LK btsl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */ - jmp sw1 + jmp swact /* - * cpu_switch(old, new) + * cpu_switch(old, new, mtx) * * Save the current thread state, then select the next thread to run * and load its state. * %rdi = oldtd * %rsi = newtd + * %rdx = mtx */ ENTRY(cpu_switch) /* Switch to new thread. First, save context. */ @@ -147,17 +144,33 @@ movq TD_PCB(%rsi),%r8 /* switch address space */ - movq PCB_CR3(%r8),%rdx + movq PCB_CR3(%r8),%rcx movq %cr3,%rax - cmpq %rdx,%rax /* Same address space? */ - je sw1 - movq %rdx,%cr3 /* new address space */ - + cmpq %rcx,%rax /* Same address space? */ + jne swinact + movq %rdx, TD_LOCK(%rdi) /* Release the old thread */ + /* Wait for the new thread to become unblocked */ + movq $blocked_lock, %rdx +1: + movq TD_LOCK(%rsi),%rcx + cmpq %rcx, %rdx + je 1b + jmp sw1 +swinact: + movq %rcx,%cr3 /* new address space */ movl PCPU(CPUID), %eax /* Release bit from old pmap->pm_active */ - movq TD_PROC(%rdi), %rdx /* oldproc */ - movq P_VMSPACE(%rdx), %rdx - LK btrl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */ + movq TD_PROC(%rdi), %rcx /* oldproc */ + movq P_VMSPACE(%rcx), %rcx + LK btrl %eax, VM_PMAP+PM_ACTIVE(%rcx) /* clear old */ + movq %rdx, TD_LOCK(%rdi) /* Release the old thread */ +swact: + /* Wait for the new thread to become unblocked */ + movq $blocked_lock, %rdx +1: + movq TD_LOCK(%rsi),%rcx + cmpq %rcx, %rdx + je 1b /* Set bit in new pmap->pm_active */ movq TD_PROC(%rsi),%rdx /* newproc */ ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/genassym.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.161 2007/03/30 00:06:20 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.162 2007/06/05 00:13:49 jeff Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -76,6 +76,7 @@ ASSYM(PM_ACTIVE, offsetof(struct pmap, pm_active)); ASSYM(P_SFLAG, offsetof(struct proc, p_sflag)); +ASSYM(TD_LOCK, offsetof(struct thread, td_lock)); ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/identcpu.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.153 2007/03/26 18:03:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.154 2007/05/30 14:23:26 des Exp $"); #include "opt_cpu.h" @@ -236,7 +236,7 @@ "\015" "\016CX16" /* CMPXCHG16B Instruction */ "\017xTPR" /* Send Task Priority Messages*/ - "\020" + "\020PDCM" /* Perf/Debug Capability MSR */ "\021" "\022" "\023DCA" /* Direct Cache Access */ @@ -342,13 +342,8 @@ } if (cpu_feature & CPUID_HTT && strcmp(cpu_vendor, - "AuthenticAMD") == 0) { + "AuthenticAMD") == 0) cpu_feature &= ~CPUID_HTT; - if (bootverbose) - printf("\nHTT bit cleared - FreeBSD" - " does not have licensing issues" - " requiring it.\n"); - } /* * If this CPU supports HTT or CMP then mention the ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/intr_machdep.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.32 2007/05/08 21:29:12 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.34 2007/06/04 21:38:44 attilio Exp $ */ /* @@ -250,7 +250,7 @@ * processed too. */ (*isrc->is_count)++; - PCPU_LAZY_INC(cnt.v_intr); + PCPU_INC(cnt.v_intr); ie = isrc->is_event; @@ -310,7 +310,7 @@ struct thread *td; struct intr_event *ie; struct intr_handler *ih; - int error, vector, thread; + int error, vector, thread, ret; td = curthread; @@ -321,7 +321,7 @@ * processed too. */ (*isrc->is_count)++; - PCPU_LAZY_INC(cnt.v_intr); + PCPU_INC(cnt.v_intr); ie = isrc->is_event; @@ -356,6 +356,7 @@ * a trapframe as its argument. */ td->td_intr_nesting_level++; + ret = 0; thread = 0; critical_enter(); TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { @@ -367,9 +368,17 @@ ih->ih_filter, ih->ih_argument == NULL ? frame : ih->ih_argument, ih->ih_name); if (ih->ih_argument == NULL) - ih->ih_filter(frame); + ret = ih->ih_filter(frame); else - ih->ih_filter(ih->ih_argument); + ret = ih->ih_filter(ih->ih_argument); + /* + * Wrapper handler special case: see + * i386/intr_machdep.c::intr_execute_handlers() + */ + if (!thread) { + if (ret == FILTER_SCHEDULE_THREAD) + thread = 1; + } } /* ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.671 2007/05/18 07:10:42 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.674 2007/06/05 00:00:49 jeff Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -163,7 +163,13 @@ long Maxmem = 0; long realmem = 0; -#define PHYSMAP_SIZE (2 * 30) +/* + * The number of PHYSMAP entries must be one less than the number of + * PHYSSEG entries because the PHYSMAP entry that spans the largest + * physical address that is accessible by ISA DMA is split into two + * PHYSSEG entries. + */ +#define PHYSMAP_SIZE (2 * (VM_PHYSSEG_MAX - 1)) vm_paddr_t phys_avail[PHYSMAP_SIZE + 2]; vm_paddr_t dump_avail[PHYSMAP_SIZE + 2]; @@ -221,8 +227,8 @@ vm_ksubmap_init(&kmi); printf("avail memory = %ju (%ju MB)\n", - ptoa((uintmax_t)VMCNT_GET(free_count)), - ptoa((uintmax_t)VMCNT_GET(free_count)) / 1048576); + ptoa((uintmax_t)cnt.v_free_count), + ptoa((uintmax_t)cnt.v_free_count) / 1048576); /* * Set up buffers, so they can be used to read disk labels. @@ -460,9 +466,9 @@ #ifdef SMP /* Schedule ourselves on the indicated cpu. */ - mtx_lock_spin(&sched_lock); + thread_lock(curthread); sched_bind(curthread, cpu_id); - mtx_unlock_spin(&sched_lock); + thread_unlock(curthread); #endif /* Calibrate by measuring a short delay. */ @@ -473,9 +479,9 @@ intr_restore(reg); #ifdef SMP - mtx_lock_spin(&sched_lock); + thread_lock(curthread); sched_unbind(curthread); - mtx_unlock_spin(&sched_lock); + thread_unlock(curthread); #endif /* ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/mp_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.285 2007/05/19 05:03:59 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.286 2007/06/04 23:56:07 jeff Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -46,6 +46,7 @@ #include #include #include +#include #include #include @@ -590,26 +591,8 @@ while (smp_started == 0) ia32_pause(); - /* ok, now grab sched_lock and enter the scheduler */ - mtx_lock_spin(&sched_lock); + sched_throw(NULL); - /* - * Correct spinlock nesting. The idle thread context that we are - * borrowing was created so that it would start out with a single - * spin lock (sched_lock) held in fork_trampoline(). Since we've - * explicitly acquired locks in this function, the nesting count - * is now 2 rather than 1. Since we are nested, calling - * spinlock_exit() will simply adjust the counts without allowing - * spin lock using code to interrupt us. - */ - spinlock_exit(); - KASSERT(curthread->td_md.md_spinlock_count == 1, ("invalid count")); - - PCPU_SET(switchtime, cpu_ticks()); - PCPU_SET(switchticks, ticks); - - cpu_throw(NULL, choosethread()); /* doesn't return */ - panic("scheduler returned us to %s", __func__); /* NOTREACHED */ } @@ -988,12 +971,12 @@ if (ipi_bitmap & (1 << IPI_PREEMPT)) { struct thread *running_thread = curthread; - mtx_lock_spin(&sched_lock); + thread_lock(running_thread); if (running_thread->td_critnest > 1) running_thread->td_owepreempt = 1; else mi_switch(SW_INVOL | SW_PREEMPT, NULL); - mtx_unlock_spin(&sched_lock); + thread_unlock(running_thread); } /* Nothing to do for AST */ @@ -1177,11 +1160,9 @@ if (mp_ncpus == 1) return; - mtx_lock_spin(&sched_lock); atomic_store_rel_int(&aps_ready, 1); while (smp_started == 0) ia32_pause(); - mtx_unlock_spin(&sched_lock); } SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, release_aps, NULL); ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/mp_watchdog.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/mp_watchdog.c,v 1.4 2005/02/28 08:55:53 pjd Exp $ + * $FreeBSD: src/sys/amd64/amd64/mp_watchdog.c,v 1.5 2007/06/04 23:56:33 jeff Exp $ */ #include "opt_mp_watchdog.h" @@ -105,9 +105,7 @@ * locks to make sure. Then reset the timer. */ mtx_lock(&Giant); - mtx_lock_spin(&sched_lock); watchdog_timer = WATCHDOG_THRESHOLD; - mtx_unlock_spin(&sched_lock); mtx_unlock(&Giant); callout_reset(&watchdog_callout, 1 * hz, watchdog_function, NULL); } @@ -156,34 +154,6 @@ sysctl_watchdog, "I", ""); /* - * A badly behaved sysctl that leaks the sched lock when written to. Then - * spin holding it just to make matters worse. This can be used to test the - * effectiveness of the watchdog by generating a fairly hard and nast hang. - * Note that Giant is also held in the current world order when we get here. - */ -static int -sysctl_leak_schedlock(SYSCTL_HANDLER_ARGS) -{ - int error, temp; - - temp = 0; - error = sysctl_handle_int(oidp, &temp, 0, req); - if (error) - return (error); - - if (req->newptr != NULL) { - if (temp) { - printf("Leaking the sched lock...\n"); - mtx_lock_spin(&sched_lock); - while (1); - } - } - return (0); -} -SYSCTL_PROC(_debug, OID_AUTO, leak_schedlock, CTLTYPE_INT|CTLFLAG_RW, 0, 0, - sysctl_leak_schedlock, "IU", ""); - -/* * Drop into the debugger by sending an IPI NMI to the boot processor. */ static void ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.586 2007/05/20 22:33:41 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.587 2007/05/31 22:52:10 attilio Exp $"); /* * Manages physical address maps. @@ -620,7 +620,7 @@ * numbers of pv entries. */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); } @@ -633,7 +633,7 @@ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0 && req->newptr) { - shpgperproc = (pv_entry_max - VMCNT_GET(page_count)) / maxproc; + shpgperproc = (pv_entry_max - cnt.v_page_count) / maxproc; pv_entry_high_water = 9 * (pv_entry_max / 10); } return (error); @@ -648,7 +648,7 @@ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0 && req->newptr) { - pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; pv_entry_high_water = 9 * (pv_entry_max / 10); } return (error); @@ -1149,7 +1149,8 @@ */ m->right = *free; *free = m; - VMCNT_SUB(wire_count, 1); + + atomic_subtract_int(&cnt.v_wire_count, 1); return 1; } @@ -1459,7 +1460,7 @@ pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */ m->wire_count--; - VMCNT_SUB(wire_count, 1); + atomic_subtract_int(&cnt.v_wire_count, 1); vm_page_free_zero(m); PMAP_LOCK_DESTROY(pmap); } ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/trap.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.316 2007/05/27 19:16:45 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.317 2007/06/04 21:38:44 attilio Exp $"); /* * AMD64 Trap and System call handling @@ -163,7 +163,7 @@ register_t addr = 0; ksiginfo_t ksi; - PCPU_LAZY_INC(cnt.v_trap); + PCPU_INC(cnt.v_trap); type = frame->tf_trapno; #ifdef SMP @@ -737,10 +737,10 @@ ksiginfo_t ksi; /* - * note: PCPU_LAZY_INC() can only be used if we can afford + * note: PCPU_INC() can only be used if we can afford * occassional inaccuracy in the count. */ - PCPU_LAZY_INC(cnt.v_syscall); + PCPU_INC(cnt.v_syscall); #ifdef DIAGNOSTIC if (ISPL(frame->tf_cs) != SEL_UPL) { ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/tsc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.207 2007/03/26 18:03:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.208 2007/06/04 18:25:01 dwmalone Exp $"); #include "opt_clock.h" @@ -204,7 +204,7 @@ if (tsc_timecounter.tc_frequency == 0) return (EOPNOTSUPP); freq = tsc_freq; - error = sysctl_handle_int(oidp, &freq, sizeof(freq), req); + error = sysctl_handle_quad(oidp, &freq, 0, req); if (error == 0 && req->newptr != NULL) { tsc_freq = freq; tsc_timecounter.tc_frequency = tsc_freq; @@ -212,8 +212,8 @@ return (error); } -SYSCTL_PROC(_machdep, OID_AUTO, tsc_freq, CTLTYPE_LONG | CTLFLAG_RW, - 0, sizeof(u_int), sysctl_machdep_tsc_freq, "IU", ""); +SYSCTL_PROC(_machdep, OID_AUTO, tsc_freq, CTLTYPE_QUAD | CTLFLAG_RW, + 0, sizeof(u_int), sysctl_machdep_tsc_freq, "QU", ""); static unsigned tsc_get_timecount(struct timecounter *tc) ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/vm_machdep.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.254 2007/04/24 21:17:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.255 2007/06/04 23:57:29 jeff Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -170,7 +170,7 @@ * pcb2->pcb_[fg]sbase: cloned above */ - /* Setup to release sched_lock in fork_exit(). */ + /* Setup to release spin count in fork_exit(). */ td2->td_md.md_spinlock_count = 1; td2->td_md.md_saved_flags = PSL_KERNEL | PSL_I; @@ -304,7 +304,7 @@ * pcb2->pcb_[fg]sbase: cloned above */ - /* Setup to release sched_lock in fork_exit(). */ + /* Setup to release spin count in fork_exit(). */ td->td_md.md_spinlock_count = 1; td->td_md.md_saved_flags = PSL_KERNEL | PSL_I; } ==== //depot/projects/trustedbsd/priv/sys/amd64/ia32/ia32_syscall.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.17 2006/12/17 06:48:39 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.18 2007/06/04 21:38:45 attilio Exp $"); /* * 386 Trap and System call handling @@ -105,10 +105,10 @@ ksiginfo_t ksi; /* - * note: PCPU_LAZY_INC() can only be used if we can afford + * note: PCPU_INC() can only be used if we can afford * occassional inaccuracy in the count. */ - PCPU_LAZY_INC(cnt.v_syscall); + PCPU_INC(cnt.v_syscall); td->td_pticks = 0; td->td_frame = frame; ==== //depot/projects/trustedbsd/priv/sys/amd64/include/pcpu.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.47 2007/03/11 05:54:28 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.48 2007/06/04 21:38:45 attilio Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -56,7 +56,8 @@ extern struct pcpu *pcpup; #define PCPU_GET(member) (pcpup->pc_ ## member) -#define PCPU_LAZY_INC(member) (++pcpup->pc_ ## member) +#define PCPU_ADD(member, val) (pcpup->pc_ ## member += (val)) +#define PCPU_INC(member) PCPU_ADD(member, 1) #define PCPU_PTR(member) (&pcpup->pc_ ## member) #define PCPU_SET(member, val) (pcpup->pc_ ## member = (val)) @@ -110,10 +111,31 @@ }) /* + * Adds the value to the per-cpu counter name. The implementation + * must be atomic with respect to interrupts. + */ +#define __PCPU_ADD(name, val) do { \ + __pcpu_type(name) __val; \ + struct __s { \ + u_char __b[MIN(sizeof(__pcpu_type(name)), 8)]; \ + } __s; \ + \ + __val = (val); \ + if (sizeof(__val) == 1 || sizeof(__val) == 2 || \ + sizeof(__val) == 4 || sizeof(__val) == 8) { \ + __s = *(struct __s *)(void *)&__val; \ + __asm __volatile("add %1,%%gs:%0" \ + : "=m" (*(struct __s *)(__pcpu_offset(name))) \ + : "r" (__s)); \ + } else \ + *__PCPU_PTR(name) += __val; \ +} while (0) + +/* * Increments the value of the per-cpu counter name. The implementation * must be atomic with respect to interrupts. */ -#define __PCPU_LAZY_INC(name) do { \ +#define __PCPU_INC(name) do { \ CTASSERT(sizeof(__pcpu_type(name)) == 1 || \ sizeof(__pcpu_type(name)) == 2 || \ sizeof(__pcpu_type(name)) == 4 || \ @@ -159,7 +181,8 @@ } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 5 16:40:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4293416A469; Tue, 5 Jun 2007 16:40:56 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0B48716A41F for ; Tue, 5 Jun 2007 16:40:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E827613C45E for ; Tue, 5 Jun 2007 16:40:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l55GettR057356 for ; Tue, 5 Jun 2007 16:40:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l55GeO15056899 for perforce@freebsd.org; Tue, 5 Jun 2007 16:40:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 5 Jun 2007 16:40:24 GMT Message-Id: <200706051640.l55GeO15056899@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 121002 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2007 16:40:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=121002 Change 121002 by rwatson@rwatson_zoo on 2007/06/05 16:40:20 Integrate TrustedBSD audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/Makefile.inc1#21 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#23 integrate .. //depot/projects/trustedbsd/audit3/bin/chflags/chflags.1#7 integrate .. //depot/projects/trustedbsd/audit3/bin/pax/ar_io.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/pax/file_subs.c#2 integrate .. //depot/projects/trustedbsd/audit3/bin/pax/pat_rep.c#2 integrate .. //depot/projects/trustedbsd/audit3/bin/pax/sel_subs.c#2 integrate .. //depot/projects/trustedbsd/audit3/bin/pax/tables.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/ChangeLog#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/LEGAL.NOTICE#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Localstuff#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/MAINT#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/animation#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/archive#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/audio#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/c-lang#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/cad#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/cafebabe#1 branch .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/commands#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/console#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/database#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/editors#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/elf#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/filesystems#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/fonts#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/images#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/java#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/linux#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/lisp#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/mach#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/mathematica#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/mime#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/mips#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/misctools#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/msdos#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/os2#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/os400#1 branch .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/perl#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/python#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/revision#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/riff#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/sgml#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/sql#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/sun#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/sysex#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/tex#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/tgif#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/unicode#1 branch .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/varied.out#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/varied.script#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/vmware#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/wordprocessors#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Magdir/xwindows#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Makefile.am#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/Makefile.in#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/README#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/apprentice.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/apptype.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/ascmagic.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/compress.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/config.h.in#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/configure#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/configure.in#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/file.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/file.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/fsmagic.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/funcs.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/install-sh#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/is_tar.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/magic.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/magic.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/magic.mime#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/magic2mime#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/mkinstalldirs#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/names.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/patchlevel.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/print.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/readelf.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/softmagic.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/tar.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/file/test.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/gcc/gcc.c#6 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/pathnames.h#4 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh_config.5#7 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshd_config.5#7 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/periodic.conf#12 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#22 integrate .. //depot/projects/trustedbsd/audit3/etc/etc.amd64/ttys#2 integrate .. //depot/projects/trustedbsd/audit3/etc/etc.arm/ttys#2 integrate .. //depot/projects/trustedbsd/audit3/etc/etc.i386/ttys#2 integrate .. //depot/projects/trustedbsd/audit3/etc/etc.ia64/ttys#3 integrate .. //depot/projects/trustedbsd/audit3/etc/etc.powerpc/ttys#4 integrate .. //depot/projects/trustedbsd/audit3/etc/etc.sparc64/ttys#7 integrate .. //depot/projects/trustedbsd/audit3/etc/login.conf#4 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/cleanvar#7 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/initrandom#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/jail#9 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/tmp#5 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/var#6 integrate .. //depot/projects/trustedbsd/audit3/etc/root/dot.cshrc#2 integrate .. //depot/projects/trustedbsd/audit3/etc/root/dot.profile#2 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#19 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libgomp/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/cc_tools/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/Makefile#13 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive.h.in#13 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry.3#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry.c#11 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry.h#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry_copy_stat.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry_private.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_entry_stat.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_platform.h#10 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read.3#10 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read.c#11 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_extract.c#11 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_compression_bzip2.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_compression_compress.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_compression_gzip.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_compression_none.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_compression_program.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_ar.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_cpio.c#12 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_empty.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_iso9660.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_tar.c#15 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_zip.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_string.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_string.h#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_util.3#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_util.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write.3#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write.c#10 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_disk.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_disk_set_standard_lookup.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_private.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_compression_bzip2.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_compression_gzip.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_compression_none.c#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_compression_program.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_ar.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_cpio.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_pax.c#12 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_shar.c#7 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_write_set_format_ustar.c#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/config_freebsd.h#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/filter_fork.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/filter_fork.h#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/libarchive_internals.3#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/README#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/main.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test.h#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_acl_basic.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_acl_pax.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_archive_api_feature.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_entry.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_compress_program.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_data_large.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_extract.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_format_ar.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_format_isorr_bz2.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_format_zip.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_large.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_position.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_read_truncated.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_tar_filenames.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_compress_program.c#1 branch .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_disk.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_disk_perms.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_format_ar.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_format_cpio_empty.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_format_shar_empty.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_format_tar.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_format_tar_empty.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/test/test_write_open_memory.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/amd64/Symbol.map#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/arm/Symbol.map#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/db/hash/hash.c#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/Symbol.map#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/arc4random.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/i386/Symbol.map#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/Symbol.map#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/Symbol.map#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/posix1e/Symbol.map#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/powerpc/Symbol.map#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/quad/Symbol.map#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/regex/engine.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/rpc/Symbol.map#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/Symbol.map#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdtime/Symbol.map#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/Symbol.map#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libfetch/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/lib/libfetch/fetch.3#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libkvm/kvm_proc.c#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libmagic/config.h#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_login_access/login_access.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libthread_db/arch/amd64/libpthread_md.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/msun/src/s_cbrtf.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/ncurses/form/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/ncurses/menu/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/ncurses/ncurses/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/ncurses/panel/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/installation/common/install.sgml#8 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/trustedbsd/audit3/release/doc/share/sgml/release.ent#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/stripe/geom_stripe.c#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/newfs_msdos/newfs_msdos.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/savecore/savecore.c#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#21 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/mmc.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/mmcsd.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_bpf.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/pcm.4#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/pty.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_envy24ht.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/snd_spicds.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#14 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/rc.conf.5#18 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/bus_alloc_resource.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/locking.9#2 integrate .. //depot/projects/trustedbsd/audit3/share/misc/bsd-family-tree#14 integrate .. //depot/projects/trustedbsd/audit3/share/mk/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.port.options.mk#1 branch .. //depot/projects/trustedbsd/audit3/share/mk/bsd.sys.mk#6 integrate .. //depot/projects/trustedbsd/audit3/share/skel/dot.cshrc#2 integrate .. //depot/projects/trustedbsd/audit3/share/skel/dot.profile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/cpu_switch.S#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/genassym.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/identcpu.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/intr_machdep.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/machdep.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/mp_machdep.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/mp_watchdog.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/pmap.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/trap.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/tsc.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/vm_machdep.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/ia32/ia32_syscall.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/specialreg.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/vmparam.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/isa/clock.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_machdep.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/intr.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/machdep.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/pmap.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/trap.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/undefined.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/vm_machdep.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/uart_cpu_at91rm9200usart.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/pcpu.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/vmparam.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_xpt.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_all.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/coda/coda_vnops.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linprocfs/linprocfs.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_misc.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/subr_ndis.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/kern/opensolaris_vfs.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_misc.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/Makefile.ia64#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#23 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#33 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options#20 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/fil.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_auth.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_compat.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_fil.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_frag.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_frag.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_htable.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_htable.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_log.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_lookup.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_lookup.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_nat.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_nat.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_pool.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_pool.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_proxy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_proxy.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_scan.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_scan.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_state.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_state.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_sync.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_sync.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ipl.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/mlfk_ipl.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_asus.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_panasonic.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/Osd/OsdHardware.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_dock.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_ec.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_timer.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#20 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bge.c#20 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ciss/ciss.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/README#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.c#22 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/gem/if_gem.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/gem/if_gemreg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/gem/if_gemvar.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hwpmc/hwpmc_mod.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/md/md.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mfi/mfi.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mfi/mfivar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_cnfg.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_init.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_ioc.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_log_fc.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_log_sas.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_raid.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_sas.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_targ.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.h#15 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_cam.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccard/pccard.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccard/pccardvarp.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb_pci.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbbvar.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/clone.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/clone.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/atiixp.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/emu10kx.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/envy24ht.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/es137x.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/via8233.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/ac97.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/buffer.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/channel.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/channel.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/dsp.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/dsp.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/feeder.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/feeder_fmt.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/feeder_rate.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/feeder_volume.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/mixer.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/sndstat.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/sound.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/sound.h#13 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/vchan.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/vchan.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/unit.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/unit.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/usb/uaudio.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/usb/uaudio_pcm.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/version.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/speaker/spkr.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/syscons/syscons.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uplcom.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uvscom.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/devfs/devfs_vnops.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/fifofs/fifo_vnops.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/msdosfs_vfsops.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/nwfs/nwfs_io.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/procfs/procfs_ctl.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/procfs/procfs_ioctl.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/procfs/procfs_status.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/smbfs/smbfs_io.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/smbfs/smbfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/unionfs/union.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/unionfs/union_subr.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/unionfs/union_vnops.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/cache/g_cache.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_kern.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/mirror/g_mirror.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/stripe/g_stripe.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/elan-mmcr.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/intr_machdep.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/machdep.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/mp_clock.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/mp_machdep.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/mp_watchdog.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/pmap.c#20 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/trap.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/tsc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/vm_machdep.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/imgact_coff.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/pcpu.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/specialreg.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/vmparam.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/isa/clock.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/isa/npx.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_machdep.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia32/ia32_trap.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/interrupt.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/machdep.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/mp_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/pmap.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/trap.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/vm_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/init_main.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_acct.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_alq.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_clock.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_condvar.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_conf.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_cpu.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_descrip.c#21 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exec.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#23 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#24 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_idle.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_intr.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_kse.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_kthread.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_ktrace.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_linker.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_lockf.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_malloc.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mbuf.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mib.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mutex.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_poll.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_proc.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_resource.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_rwlock.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_shutdown.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_subr.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_switch.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sx.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_synch.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sysctl.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_tc.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_thr.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_thread.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_time.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_umtx.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/ksched.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/link_elf.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/link_elf_obj.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sched_4bsd.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sched_core.c#6 delete .. //depot/projects/trustedbsd/audit3/sys/kern/sched_ule.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_lock.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_prof.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_sleepqueue.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_smp.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_taskqueue.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_trap.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_turnstile.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_witness.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sys_generic.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sys_process.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/tty.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/tty_cons.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_sockbuf.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_socket.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_aio.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_bio.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_cluster.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#21 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#40 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_vnops.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vnode_if.src#12 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/dcons/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/sound/sound/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_bridge.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_media.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/bluetooth/common/ng_bluetooth.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_ppp.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_bsd_addr.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_input.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_input.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_os_bsd.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_output.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_pcb.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_structs.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_usrreq.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctputil.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctputil.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_usrreq.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/frag6.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/in6.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/in6_ifattach.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/in6_var.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/ip6_var.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/sctp6_usrreq.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netncp/ncp_sock.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/netsmb/smb_trantcp.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/nfs4client/nfs4_vnops.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_bio.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_vnops.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/cbus/clock.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/pc98/machdep.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/intr_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/machdep.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/trap.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/vm_machdep.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#46 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#25 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#31 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#28 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#32 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#41 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#42 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#22 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_lomac/mac_lomac.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/include/pcpu.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/include/vmparam.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/intr_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/machdep.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/mp_machdep.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/pmap.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/trap.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/tsb.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/vm_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sun4v/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sun4v/include/vmparam.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sun4v/sun4v/intr_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sun4v/sun4v/tsb.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sun4v/sun4v/vm_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/conf.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/filedesc.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mutex.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/proc.h#24 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/resource.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/resourcevar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sched.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sx.h#12 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysctl.h#13 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/turnstile.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/vmmeter.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/vnode.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_inode.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_snapshot.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_bmap.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_extattr.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_quota.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/swap_pager.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/uma_core.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_contig.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_fault.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_glue.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_map.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_meter.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_mmap.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_object.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#20 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_pageout.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_pageq.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_zeroidle.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vnode_pager.c#12 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/usr.bin/lastcomm/README#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/usr.bin/lastcomm/v1-sparc64.out#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/usr.bin/lastcomm/v2-sparc64.out#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/usr.sbin/sa/v1-sparc64-sav.in#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/usr.sbin/sa/v1-sparc64-sav.out#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/usr.sbin/sa/v1-sparc64-u.out#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/usr.sbin/sa/v1-sparc64-usr.in#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/usr.sbin/sa/v1-sparc64-usr.out#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/usr.sbin/sa/v2-sparc64-sav.in#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/usr.sbin/sa/v2-sparc64-u.out#1 branch .. //depot/projects/trustedbsd/audit3/tools/regression/usr.sbin/sa/v2-sparc64-usr.in#1 branch .. //depot/projects/trustedbsd/audit3/usr.bin/file/config.h#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/file/file.1#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/file/magic.5#8 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/gzip/gzip.1#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/gzip/gzip.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/less/lesspipe.sh#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/make/main.c#10 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tar/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tar/bsdtar.1#10 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tar/bsdtar.c#9 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tar/bsdtar.h#7 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tar/read.c#9 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tar/write.c#12 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/dconschat/dconschat.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ppp/command.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ppp/ppp.8.m4#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ppp/radius.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ppp/radius.h#4 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/Makefile.inc1#21 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.581 2007/05/19 20:34:29 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.582 2007/05/26 20:17:19 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -309,7 +309,7 @@ rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/c++/3.4 usr/include/sys usr/lib \ + usr/bin usr/games usr/include/sys usr/lib \ usr/libexec usr/sbin usr/share/dict \ usr/share/groff_font/devX100 \ usr/share/groff_font/devX100-12 \ @@ -505,7 +505,7 @@ # and Makefile.inc1 causes the correct PATH to be used, rather than a # modification of the current environment's PATH. In addition, we need # to quote multiword values. -# +# buildenvvars: @echo ${WMAKEENV:Q} @@ -1113,7 +1113,7 @@ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install -_prereq_libs: ${_prereq_libs:S/$/__PL/} +_prereq_libs: ${_prereq_libs:S/$/__PL/} _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} ==== //depot/projects/trustedbsd/audit3/UPDATING#23 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20070529: + The ether_ioctl() function has been synchronized with ioctl(2) + and ifnet.if_ioctl. Due to that, the size of one of its arguments + has changed on 64-bit architectures. All kernel modules using + ether_ioctl() need to be rebuilt on such architectures. + 20070516: Improved INCLUDE_CONFIG_FILE support has been introduced to the config(8) utility. In order to take advantage of this new @@ -795,4 +801,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.491 2007/05/16 17:23:53 wkoszek Exp $ +$FreeBSD: src/UPDATING,v 1.492 2007/05/29 12:40:45 yar Exp $ ==== //depot/projects/trustedbsd/audit3/bin/chflags/chflags.1#7 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.28 2006/03/10 12:37:19 trhodes Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -66,7 +66,7 @@ If the .Ar file is a symbolic link, -change the mode of the link itself rather than the file to which it points. +change the file flags of the link itself rather than the file to which it points. .It Fl L If the .Fl R ==== //depot/projects/trustedbsd/audit3/bin/pax/ar_io.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.26 2005/03/12 06:38:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.28 2007/05/25 17:53:37 brian Exp $"); #include #include @@ -1109,8 +1109,8 @@ int ar_next(void) { + static char *arcbuf; char buf[PAXPATHLEN+2]; - static int freeit = 0; sigset_t o_mask; /* @@ -1228,17 +1228,14 @@ * try to open new archive */ if (ar_open(buf) >= 0) { - if (freeit) { - (void)free((char *)(uintptr_t)arcname); - freeit = 0; - } - if ((arcname = strdup(buf)) == NULL) { + free(arcbuf); + if ((arcbuf = strdup(buf)) == NULL) { done = 1; lstrval = -1; paxwarn(0, "Cannot save archive name."); return(-1); } - freeit = 1; + arcname = arcbuf; break; } tty_prnt("Cannot open %s, try again\n", buf); ==== //depot/projects/trustedbsd/audit3/bin/pax/file_subs.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.21 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/file_subs.c,v 1.22 2007/05/24 06:44:37 rse Exp $"); #include #include @@ -284,7 +284,7 @@ */ if ((to_sb->st_dev==sb.st_dev)&&(to_sb->st_ino == sb.st_ino)) { paxwarn(1, "Unable to link file %s to itself", to); - return(-1);; + return(-1); } /* ==== //depot/projects/trustedbsd/audit3/bin/pax/pat_rep.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.25 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/pat_rep.c,v 1.27 2007/05/25 17:53:37 brian Exp $"); #include #include @@ -140,7 +140,7 @@ regerror(res, &(rep->rcmp), rebuf, sizeof(rebuf)); paxwarn(1, "%s while compiling regular expression %s", rebuf, str); # endif - (void)free((char *)rep); + free(rep); return(-1); } @@ -152,11 +152,11 @@ *pt1++ = *str; if ((pt2 = strchr(pt1, *str)) == NULL) { # ifdef NET2_REGEX - (void)free((char *)rep->rcmp); + free(rep->rcmp); # else - regfree(&(rep->rcmp)); + regfree(&rep->rcmp); # endif - (void)free((char *)rep); + free(rep); paxwarn(1, "Invalid replacement string %s", str); return(-1); } @@ -181,11 +181,11 @@ break; default: # ifdef NET2_REGEX - (void)free((char *)rep->rcmp); + free(rep->rcmp); # else - regfree(&(rep->rcmp)); + regfree(&rep->rcmp); # endif - (void)free((char *)rep); + free(rep); *pt1 = *str; paxwarn(1, "Invalid replacement string option %s", str); return(-1); @@ -401,7 +401,7 @@ return(-1); } *ppt = pt->fow; - (void)free((char *)pt); + free(pt); arcn->pat = NULL; return(0); } ==== //depot/projects/trustedbsd/audit3/bin/pax/sel_subs.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.19 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.21 2007/05/25 17:53:38 brian Exp $"); #include #include @@ -412,7 +412,7 @@ */ if (str_sec(str, &(pt->low_time)) < 0) { paxwarn(1, "Illegal lower time range %s", str); - (void)free((char *)pt); + free(pt); goto out; } pt->flgs |= HASLOW; @@ -424,7 +424,7 @@ */ if (str_sec(up_pt, &(pt->high_time)) < 0) { paxwarn(1, "Illegal upper time range %s", up_pt); - (void)free((char *)pt); + free(pt); goto out; } pt->flgs |= HASHIGH; @@ -436,7 +436,7 @@ if (pt->low_time > pt->high_time) { paxwarn(1, "Upper %s and lower %s time overlap", up_pt, str); - (void)free((char *)pt); + free(pt); return(-1); } } ==== //depot/projects/trustedbsd/audit3/bin/pax/tables.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.22 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/tables.c,v 1.24 2007/05/25 17:53:38 brian Exp $"); #include #include @@ -178,8 +178,8 @@ */ if (--pt->nlink <= 1) { *ppt = pt->fow; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); } return(1); } @@ -198,7 +198,7 @@ ltab[indx] = pt; return(0); } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Hard link table out of memory"); @@ -254,8 +254,8 @@ * remove and free it */ *ppt = pt->fow; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); } /* @@ -288,8 +288,8 @@ while (pt != NULL) { ppt = pt; pt = ppt->fow; - (void)free((char *)ppt->name); - (void)free((char *)ppt); + free(ppt->name); + free(ppt); } } return; @@ -460,7 +460,7 @@ paxwarn(1, "File time table ran out of memory"); if (pt != NULL) - (void)free((char *)pt); + free(pt); return(-1); } @@ -538,7 +538,7 @@ if (strcmp(nname, pt->nname) == 0) return(0); - (void)free((char *)pt->nname); + free(pt->nname); if ((pt->nname = strdup(nname)) == NULL) { paxwarn(1, "Cannot update rename table"); return(-1); @@ -557,9 +557,9 @@ ntab[indx] = pt; return(0); } - (void)free((char *)pt->oname); + free(pt->oname); } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Interactive rename table out of memory"); return(-1); @@ -994,7 +994,7 @@ atab[indx] = pt; return; } - (void)free((char *)pt); + free(pt); } paxwarn(1, "Directory access time reset table ran out of memory"); @@ -1051,8 +1051,8 @@ *ppt = pt->fow; *mtime = pt->mtime; *atime = pt->atime; - (void)free((char *)pt->name); - (void)free((char *)pt); + free(pt->name); + free(pt); return(0); } ==== //depot/projects/trustedbsd/audit3/contrib/file/ChangeLog#4 (text+ko) ==== @@ -1,3 +1,194 @@ +2007-05-24 10:00 Christos Zoulas + + * Fix another integer overflow (Colin Percival) + +2007-03-26 13:58 Christos Zoulas + + * make sure that all of struct magic_set is initialized appropriately + (Brett) + +2007-03-25 17:44 Christos Zoulas + + * reset left bytes in the buffer (Dmitry V. Levin) + + * compilation failed with COMPILE_ONLY and ENABLE_CONDITIONALS + (Peter Avalos) + +2007-03-15 10:51 Christos Zoulas + + * fix fortran and nroff reversed tests (Dmitry V. Levin) + + * fix exclude option (Dmitry V. Levin) + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 5 16:52:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 996E816A469; Tue, 5 Jun 2007 16:52:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 555C716A421 for ; Tue, 5 Jun 2007 16:52:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 414E613C455 for ; Tue, 5 Jun 2007 16:52:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l55GqALk076468 for ; Tue, 5 Jun 2007 16:52:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l55Gq9Ea076462 for perforce@freebsd.org; Tue, 5 Jun 2007 16:52:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 5 Jun 2007 16:52:09 GMT Message-Id: <200706051652.l55Gq9Ea076462@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 121003 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2007 16:52:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=121003 Change 121003 by rwatson@rwatson_zoo on 2007/06/05 16:51:57 Convert a few more priv_check_cred() calls to priv_check() now that life is simpler. Affected files ... .. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_vnops.c#11 edit .. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#12 edit Differences ... ==== //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_vnops.c#11 (text+ko) ==== @@ -1160,8 +1160,7 @@ if (uid != de->de_uid || gid != de->de_gid) { if ((ap->a_cred->cr_uid != de->de_uid) || uid != de->de_uid || (gid != de->de_gid && !groupmember(gid, ap->a_cred))) { - error = priv_check_cred(ap->a_td->td_ucred, - PRIV_VFS_CHOWN, 0); + error = priv_check(ap->a_td, PRIV_VFS_CHOWN); if (error) return (error); } @@ -1172,8 +1171,7 @@ if (vap->va_mode != (mode_t)VNOVAL) { if (ap->a_cred->cr_uid != de->de_uid) { - error = priv_check_cred(ap->a_td->td_ucred, - PRIV_VFS_ADMIN, 0); + error = priv_check(ap->a_td, PRIV_VFS_ADMIN); if (error) return (error); } ==== //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#12 (text+ko) ==== @@ -114,8 +114,7 @@ * p_candebug() should implement it, or other checks * are missing. */ - error = priv_check_cred(td->td_ucred, - PRIV_DEBUG_SUGID, 0); + error = priv_check(td, PRIV_DEBUG_SUGID); if (error) break; } From owner-p4-projects@FreeBSD.ORG Tue Jun 5 20:14:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD4A416A469; Tue, 5 Jun 2007 20:14:15 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4F77716A46C for ; Tue, 5 Jun 2007 20:14:15 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 437BF13C4BC for ; Tue, 5 Jun 2007 20:14:15 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l55KEFRx069718 for ; Tue, 5 Jun 2007 20:14:15 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l55KEEQD069712 for perforce@freebsd.org; Tue, 5 Jun 2007 20:14:14 GMT (envelope-from peter@freebsd.org) Date: Tue, 5 Jun 2007 20:14:14 GMT Message-Id: <200706052014.l55KEEQD069712@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 121010 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2007 20:14:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=121010 Change 121010 by peter@peter_daintree on 2007/06/05 20:13:37 Track uma direct map pages as "wired" for visibility to top. There should really be a "kernel" counter, not 'wired'. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/uma_machdep.c#4 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/uma_machdep.c#4 (text+ko) ==== @@ -67,6 +67,7 @@ } pa = m->phys_addr; dump_add_page(pa); + kernel_pmap->pm_stats.wired_count++; va = (void *)PHYS_TO_DMAP(pa); if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) pagezero(va); @@ -80,6 +81,7 @@ vm_paddr_t pa; pa = DMAP_TO_PHYS((vm_offset_t)mem); + kernel_pmap->pm_stats.wired_count--; dump_drop_page(pa); m = PHYS_TO_VM_PAGE(pa); vm_page_free(m); From owner-p4-projects@FreeBSD.ORG Tue Jun 5 20:48:04 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C745716A46C; Tue, 5 Jun 2007 20:48:03 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 89C0216A400 for ; Tue, 5 Jun 2007 20:48:03 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7BB2013C4B7 for ; Tue, 5 Jun 2007 20:48:03 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l55Km3K7008603 for ; Tue, 5 Jun 2007 20:48:03 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l55KkvWW099070 for perforce@freebsd.org; Tue, 5 Jun 2007 20:46:57 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 5 Jun 2007 20:46:57 GMT Message-Id: <200706052046.l55KkvWW099070@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 121013 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2007 20:48:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=121013 Change 121013 by mjacob@mjexp on 2007/06/05 20:46:02 IFC Affected files ... .. //depot/projects/mjexp/ObsoleteFiles.inc#17 integrate .. //depot/projects/mjexp/bin/date/date.1#2 integrate .. //depot/projects/mjexp/contrib/bind9/CHANGES#5 integrate .. //depot/projects/mjexp/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/mjexp/contrib/bind9/FAQ#4 integrate .. //depot/projects/mjexp/contrib/bind9/FAQ.xml#4 integrate .. //depot/projects/mjexp/contrib/bind9/FREEBSD-Upgrade#2 integrate .. //depot/projects/mjexp/contrib/bind9/Makefile.in#3 integrate .. //depot/projects/mjexp/contrib/bind9/README#4 integrate .. //depot/projects/mjexp/contrib/bind9/README.idnkit#1 branch .. //depot/projects/mjexp/contrib/bind9/acconfig.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkconf.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/nslookup.docbook#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/aclconf.c#3 delete .. //depot/projects/mjexp/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/controlconf.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/aclconf.h#3 delete .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/client.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/config.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/control.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/globals.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/logconf.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/lwresd.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/server.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/sortlist.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/tkeyconf.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/tsigconf.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/zoneconf.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/logconf.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwdgabn.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwdgrbn.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/main.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/query.c#4 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/sortlist.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/tkeyconf.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/tsigconf.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/unix/os.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/zoneconf.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/nsupdate/nsupdate.8#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc-confgen.8#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc-confgen.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/configure.in#4 integrate .. //depot/projects/mjexp/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/README-SGML#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#2 delete .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#2 delete .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#2 delete .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#2 delete .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#2 delete .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#2 delete .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#2 delete .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#2 delete .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#2 delete .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#2 delete .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/misc/dnssec#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/misc/migration-4to9#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/misc/rfc-compliance#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/misc/roadmap#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/misc/sdb#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc4193.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc4255.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc4343.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc4367.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/doc/rfc/rfc4431.txt#1 branch .. //depot/projects/mjexp/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/Makefile.in#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/api#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/daemon.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/ftruncate.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/mktemp.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/putenv.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/readv.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/setenv.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/setitimer.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/strdup.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/strpbrk.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/strsep.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/utimes.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/bsd/writev.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/configure#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/dst/dst_internal.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/dst/hmac_link.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/dst/md5_locl.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/arpa/inet.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/fd_setsize.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/hesiod.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/irp.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/irs.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/isc/ctl.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/isc/dst.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/isc/heap.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/isc/list.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/isc/logging.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/isc/memcluster.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/isc/tree.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/netdb.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/netgroup.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/res_update.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/inet_addr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/inet_data.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/inet_makeaddr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/inet_net_ntop.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/inet_neta.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/inet_netof.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/dns.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/dns_gr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/dns_ho.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/dns_nw.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/dns_p.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/dns_pr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/dns_pw.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/dns_sv.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/gai_strerror.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/gen.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/gen_gr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/gen_ho.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/gen_ng.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/gen_nw.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/gen_p.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/gen_pr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/gen_pw.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/gen_sv.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getaddrinfo.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getgrent.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getgrent_r.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/gethostent.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getnameinfo.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getnetent.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getprotoent.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getprotoent_r.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getpwent.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getpwent_r.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getservent.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getservent_r.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/hesiod_p.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irp.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irp_gr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irp_ho.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irp_ng.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irp_nw.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irp_p.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irp_pr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irp_pw.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irp_sv.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irpmarshall.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irs_data.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irs_data.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irs_p.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/lcl.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/lcl_gr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/lcl_ho.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/lcl_ng.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/lcl_nw.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/lcl_p.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/lcl_pr.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/lcl_pw.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/lcl_sv.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/nis.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/nis_gr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/nis_ho.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/nis_ng.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/nis_nw.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/nis_p.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/nis_pr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/nis_pw.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/nis_sv.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/nul_ng.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/pathnames.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/util.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/assertions.mdoc#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/base64.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/ctl_p.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/ctl_p.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/ev_connects.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/ev_streams.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/ev_timers.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/ev_waits.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/heap.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/heap.mdoc#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/hex.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/logging.mdoc#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/logging_p.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/movefile.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/tree.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/tree.mdoc#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/make/includes.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/make/rules.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/nameser/ns_date.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/nameser/ns_name.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/nameser/ns_netint.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/nameser/ns_print.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/nameser/ns_sign.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/nameser/ns_verify.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/port_before.h.in#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/herror.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_data.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_debug.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_init.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_mkupdate.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_private.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_query.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_send.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_sendsigned.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_update.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind9/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind9/include/bind9/check.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind9/version.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/Makefile.in#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/acache.c#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/dns/acl.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/byaddr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/cache.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/callbacks.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/compress.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/db.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/dbiterator.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/dbtable.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/diff.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/dispatch.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/dlz.c#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/dns/dnssec.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/ds.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/dst_api.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/dst_internal.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/dst_lib.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/dst_openssl.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/dst_result.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/gen.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/gssapi_link.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/gssapictx.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/hmac_link.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/acache.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/acl.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/cache.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/compress.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/diff.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/dlz.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/events.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/keytable.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/log.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/master.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/message.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/name.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/order.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/peer.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/rdataset.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/request.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/resolver.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/result.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/sdlz.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/time.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/tsig.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/types.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/validator.h#4 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/version.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/view.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/xfrin.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/zone.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dst/result.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/keytable.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/lib.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/log.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/lookup.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/masterdump.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/name.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/ncache.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/nsec.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/openssl_link.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/openssldh_link.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/openssldsa_link.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/opensslrsa_link.c#4 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/order.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/peer.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/portlist.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rbtdb.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rbtdb64.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rbtdb64.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rcode.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/spf_99.c#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/spf_99.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdatalist.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdataset.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/resolver.c#5 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/result.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/sdlz.c#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/dns/soa.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/ssu.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/stats.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/tcpmsg.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/time.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/timer.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/tkey.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/ttl.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/validator.c#4 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/version.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/zonekey.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/zt.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/base64.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/bitstring.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/buffer.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/bufferlist.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/commandline.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/entropy.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/error.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/event.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/fsaccess.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/hash.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/heap.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/hex.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/hmacmd5.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/hmacsha.c#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/app.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/error.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/event.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/file.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/heap.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/hmacsha.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/list.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/log.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/os.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/parseint.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/random.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/ratelimiter.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/refcount.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/region.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/result.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/resultclass.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/rwlock.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/serial.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/sha1.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/sha2.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/sockaddr.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/stdio.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/stdlib.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/symtab.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/task.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/taskpool.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/util.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/version.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/inet_aton.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/inet_ntop.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/lex.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/lib.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/log.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/md5.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/mips/include/isc/atomic.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/isc/mutexblock.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/netaddr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/netscope.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/nls/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/isc/nothreads/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/nothreads/condition.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/nothreads/include/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/nothreads/include/isc/condition.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/nothreads/include/isc/once.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/nothreads/include/isc/thread.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/nothreads/mutex.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/nothreads/thread.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/ondestroy.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/parseint.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/isc/print.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/pthreads/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/pthreads/condition.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/pthreads/include/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/pthreads/include/isc/condition.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/pthreads/include/isc/once.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/pthreads/include/isc/thread.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/pthreads/thread.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/random.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/ratelimiter.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/refcount.c#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/isc/region.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/serial.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/sha1.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/sha2.c#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/isc/sockaddr.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/isc/string.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/strtoul.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/symtab.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/task.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/task_p.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/taskpool.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/timer_p.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/app.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/dir.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/entropy.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/errno2result.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/errno2result.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/file.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/fsaccess.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/include/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/include/isc/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/include/isc/dir.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/include/isc/int.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/include/isc/keyboard.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/include/isc/netdb.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/include/isc/offset.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/include/isc/stat.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/include/isc/stdtime.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/include/isc/strerror.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/include/isc/syslog.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/include/isc/time.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/interfaceiter.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/ipv6.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/keyboard.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/resource.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/stdio.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/strerror.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/syslog.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/version.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/isccc/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/alist.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/api#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/base64.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/cc.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/ccmsg.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/include/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/include/isccc/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/include/isccc/alist.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/include/isccc/base64.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/include/isccc/cc.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/include/isccc/ccmsg.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/include/isccc/events.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/include/isccc/lib.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/include/isccc/result.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/include/isccc/sexpr.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/include/isccc/symtab.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/include/isccc/symtype.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/include/isccc/types.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/include/isccc/util.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/include/isccc/version.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/lib.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/result.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/sexpr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/symtab.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/version.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/aclconf.c#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/include/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/include/isccfg/log.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/include/isccfg/version.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/log.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/parser.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/version.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/assert_p.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/context.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/context_p.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/gai_strerror.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/getaddrinfo.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/gethost.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/getnameinfo.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/getrrset.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/herror.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/include/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/include/lwres/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/include/lwres/context.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/include/lwres/int.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/include/lwres/ipv6.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/include/lwres/lang.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/include/lwres/list.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/include/lwres/lwpacket.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/include/lwres/lwres.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/include/lwres/netdb.h.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/include/lwres/result.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/include/lwres/stdlib.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/include/lwres/version.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/lwbuffer.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/lwconfig.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/lwinetaton.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/lwpacket.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/lwres_gabn.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/lwres_grbn.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/lwres_noop.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/lwresutil.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres.3#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_buffer.3#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_buffer.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_config.3#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_config.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_context.3#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_context.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gabn.3#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gabn.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gethostent.3#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gethostent.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getipnode.3#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getipnode.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gnba.3#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gnba.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_inetntop.3#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_inetntop.html#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 5 21:28:26 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4F1F16A468; Tue, 5 Jun 2007 21:28:26 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 242E716A41F for ; Tue, 5 Jun 2007 21:28:26 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 17B0B13C489 for ; Tue, 5 Jun 2007 21:28:26 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l55LSQHv041477 for ; Tue, 5 Jun 2007 21:28:26 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l55LOUol038252 for perforce@freebsd.org; Tue, 5 Jun 2007 21:24:30 GMT (envelope-from peter@freebsd.org) Date: Tue, 5 Jun 2007 21:24:30 GMT Message-Id: <200706052124.l55LOUol038252@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 121017 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2007 21:28:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=121017 Change 121017 by peter@peter_overcee on 2007/06/05 21:22:36 IFC @121011 Affected files ... .. //depot/projects/hammer/MAINTAINERS#45 integrate .. //depot/projects/hammer/Makefile#42 integrate .. //depot/projects/hammer/Makefile.inc1#123 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#26 integrate .. //depot/projects/hammer/UPDATING#101 integrate .. //depot/projects/hammer/bin/chflags/chflags.1#13 integrate .. //depot/projects/hammer/bin/csh/config.h#9 integrate .. //depot/projects/hammer/bin/csh/config_p.h#4 integrate .. //depot/projects/hammer/bin/date/date.1#15 integrate .. //depot/projects/hammer/bin/mv/mv.1#6 integrate .. //depot/projects/hammer/bin/pax/ar_io.c#8 integrate .. //depot/projects/hammer/bin/pax/file_subs.c#4 integrate .. //depot/projects/hammer/bin/pax/pat_rep.c#6 integrate .. //depot/projects/hammer/bin/pax/sel_subs.c#4 integrate .. //depot/projects/hammer/bin/pax/tables.c#4 integrate .. //depot/projects/hammer/bin/rcp/rcp.c#9 integrate .. //depot/projects/hammer/contrib/amd/amq/amq.8#6 integrate .. //depot/projects/hammer/contrib/bind9/CHANGES#7 integrate .. //depot/projects/hammer/contrib/bind9/COPYRIGHT#4 integrate .. //depot/projects/hammer/contrib/bind9/FAQ#6 integrate .. //depot/projects/hammer/contrib/bind9/FAQ.xml#4 integrate .. //depot/projects/hammer/contrib/bind9/FREEBSD-Upgrade#9 integrate .. //depot/projects/hammer/contrib/bind9/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/README#6 integrate .. //depot/projects/hammer/contrib/bind9/README.idnkit#1 branch .. //depot/projects/hammer/contrib/bind9/acconfig.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/check-tool.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.8#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.html#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.8#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.html#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.1#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.html#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dighost.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.1#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.html#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/include/dig/dig.h#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.1#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.html#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.8#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.html#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.8#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.html#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssectool.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/aclconf.c#4 delete .. //depot/projects/hammer/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/client.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/config.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/control.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/controlconf.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/aclconf.h#3 delete .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/client.h#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/config.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/control.h#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/globals.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/logconf.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/lwresd.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/server.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/sortlist.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/tkeyconf.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/tsigconf.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/zoneconf.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/log.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/logconf.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwdgabn.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwdgrbn.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.8#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.html#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/main.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.8#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.5#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.html#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.docbook#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.html#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/query.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/server.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/sortlist.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/tkeyconf.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/tsigconf.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/unix/include/named/os.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/unix/os.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/update.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/xfrout.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/zoneconf.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.8#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.html#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.8#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.html#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.8#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf.5#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf.html#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.html#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/hammer/contrib/bind9/configure.in#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM-book.xml#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch01.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch02.html#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch03.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch04.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch05.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch06.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch07.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch08.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch09.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/README-SGML#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/hammer/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/hammer/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/dnssec#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/migration#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/migration-4to9#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/options#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/rfc-compliance#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/roadmap#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/sdb#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/rfc/index#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4193.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4255.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4343.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4367.txt#1 branch .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4431.txt#1 branch .. //depot/projects/hammer/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/api#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/daemon.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/ftruncate.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/mktemp.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/putenv.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/readv.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/setenv.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/setitimer.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/strdup.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/strpbrk.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/strsep.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/utimes.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/writev.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/configure#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/configure.in#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/dst_api.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/dst_internal.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/hmac_link.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/md5.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/md5_dgst.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/md5_locl.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/support.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/arpa/inet.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/fd_setsize.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/hesiod.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/irp.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/irs.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/ctl.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/dst.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/eventlib.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/heap.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/list.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/logging.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/memcluster.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/tree.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/netdb.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/netgroup.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/res_update.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/include/resolv.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_addr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_data.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_makeaddr.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_net_ntop.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_neta.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_netof.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_ntop.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_pton.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/nsap_addr.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_gr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_ho.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_nw.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_p.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_pr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_pw.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_sv.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gai_strerror.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_gr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_ho.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_ng.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_nw.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_p.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_pr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_pw.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_sv.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getaddrinfo.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getgrent.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getgrent_r.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gethostent.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gethostent_r.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getnameinfo.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getnetent.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getnetent_r.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getnetgrent_r.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getprotoent.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getprotoent_r.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getpwent.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getpwent_r.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getservent.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getservent_r.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/hesiod.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/hesiod_p.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_gr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_ho.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_ng.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_nw.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_p.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_pr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_pw.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_sv.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irpmarshall.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irs_data.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irs_data.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irs_p.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_gr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_ho.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_ng.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_nw.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_p.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_pr.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_pw.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_sv.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis_gr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis_ho.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis_ng.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis_nw.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis_p.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis_pr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis_pw.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis_sv.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nul_ng.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/pathnames.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/util.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/assertions.mdoc#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/base64.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ctl_p.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ctl_p.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ev_connects.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ev_files.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ev_streams.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ev_timers.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ev_waits.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/eventlib.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/eventlib_p.h#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/heap.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/heap.mdoc#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/hex.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/logging.mdoc#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/logging_p.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/memcluster.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/movefile.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/tree.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/tree.mdoc#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/make/includes.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/make/rules.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_date.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_name.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_netint.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_parse.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_print.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_sign.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_ttl.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_verify.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/port_before.h.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/herror.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_comp.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_data.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_debug.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_debug.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_findzonecut.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_init.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_mkupdate.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_mkupdate.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_private.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_query.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_send.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_sendsigned.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_update.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/api#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/check.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/getaddresses.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/include/bind9/check.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/version.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/acache.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/acl.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/adb.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/api#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/byaddr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/cache.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/callbacks.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/compress.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/db.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dbiterator.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dbtable.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/diff.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dispatch.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dlz.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/dnssec.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/ds.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_api.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_internal.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_lib.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_openssl.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_result.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/forward.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/gen-unix.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/gen.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/gssapi_link.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/gssapictx.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/hmac_link.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/acache.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/acl.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/cache.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/compress.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/diff.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dlz.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/events.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/forward.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/keytable.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/log.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/master.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/masterdump.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/message.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/name.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/order.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/peer.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rbt.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdataset.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/request.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/resolver.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/result.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/sdlz.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/time.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/tsig.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/types.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/validator.h#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/version.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/view.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/xfrin.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/zone.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/result.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/journal.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/key.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/keytable.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/lib.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/log.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/lookup.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/masterdump.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/message.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/name.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/ncache.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/nsec.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/openssl_link.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/openssldh_link.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/openssldsa_link.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/opensslrsa_link.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/order.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/peer.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/portlist.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbt.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb64.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb64.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rcode.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ds_43.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rt_21.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/spf_99.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/spf_99.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdatalist.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdataset.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/resolver.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/result.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/sdlz.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/soa.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/ssu.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/stats.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/tcpmsg.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/time.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/timer.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/tkey.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/tsig.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/ttl.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/validator.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/version.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/xfrin.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/zone.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/zonekey.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/zt.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/api#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/base64.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/bitstring.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/buffer.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/bufferlist.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/commandline.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/entropy.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/error.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/event.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/fsaccess.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/hash.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/heap.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/hex.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/hmacmd5.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/hmacsha.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/include/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/app.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/error.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/event.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/file.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/heap.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/hmacsha.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/list.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/log.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/mem.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/netaddr.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/os.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/parseint.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/print.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/quota.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/random.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/ratelimiter.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/refcount.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/region.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/result.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/resultclass.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/rwlock.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/serial.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/sha1.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/sha2.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/sockaddr.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/stdio.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/stdlib.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/symtab.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/task.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/taskpool.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/util.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/version.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/inet_aton.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/inet_ntop.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/inet_pton.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/lex.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/lfsr.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/lib.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/log.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/md5.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/mem.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/mips/include/isc/atomic.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/mutexblock.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/netaddr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/netscope.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/nls/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/nls/msgcat.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/condition.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/include/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/include/isc/condition.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/include/isc/once.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/include/isc/thread.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/mutex.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/nothreads/thread.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/ondestroy.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/parseint.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/print.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/condition.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/include/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/include/isc/condition.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/include/isc/once.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/include/isc/thread.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/mutex.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/pthreads/thread.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/quota.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/random.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/ratelimiter.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/refcount.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/region.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/result.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/rwlock.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/serial.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/sha1.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/sha2.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/sockaddr.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/string.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/strtoul.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/symtab.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/task.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/task_p.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/taskpool.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/timer.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/timer_p.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/app.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/dir.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/entropy.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/errno2result.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/errno2result.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/file.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/fsaccess.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/dir.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/int.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/keyboard.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/netdb.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/offset.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/stat.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/stdtime.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/strerror.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/syslog.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/include/isc/time.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/interfaceiter.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/ipv6.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/keyboard.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/net.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/os.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/resource.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/socket.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/stdio.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/stdtime.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/strerror.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/syslog.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/version.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isccc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/alist.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/api#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/base64.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/cc.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/ccmsg.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/include/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/alist.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/base64.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/cc.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/ccmsg.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/events.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/lib.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/result.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/sexpr.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/symtab.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/symtype.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/types.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/util.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/include/isccc/version.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/lib.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/result.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/sexpr.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/symtab.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccc/version.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/aclconf.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isccfg/api#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/log.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/include/isccfg/version.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/log.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/namedconf.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/parser.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isccfg/version.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/api#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/assert_p.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/context.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/context_p.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/gai_strerror.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/getaddrinfo.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/gethost.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/getipnode.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/getnameinfo.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/getrrset.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/herror.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/include/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/context.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/int.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/ipv6.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/lang.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/list.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/lwpacket.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/lwres.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/netdb.h.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/platform.h.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/result.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/stdlib.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/include/lwres/version.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/lwbuffer.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/lwconfig.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/lwinetaton.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/lwinetntop.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/lwinetpton.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/lwpacket.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/lwres_gabn.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/lwres_grbn.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/lwres_noop.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/lwresutil.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres.3#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres.html#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_buffer.3#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_buffer.html#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_config.3#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_config.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_config.html#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_context.3#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_context.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_context.html#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gabn.3#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gabn.html#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gethostent.3#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gethostent.html#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getipnode.3#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getipnode.html#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 5 23:13:06 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5C5416A46E; Tue, 5 Jun 2007 23:13:06 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5AD7016A421 for ; Tue, 5 Jun 2007 23:13:06 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4FE0913C45A for ; Tue, 5 Jun 2007 23:13:06 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l55ND6X7045156 for ; Tue, 5 Jun 2007 23:13:06 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l55N9sZx042474 for perforce@freebsd.org; Tue, 5 Jun 2007 23:09:54 GMT (envelope-from imp@freebsd.org) Date: Tue, 5 Jun 2007 23:09:54 GMT Message-Id: <200706052309.l55N9sZx042474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 121022 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2007 23:13:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=121022 Change 121022 by imp@imp_paco-paco on 2007/06/05 23:09:11 IFC @121008 Affected files ... .. //depot/projects/arm/src/MAINTAINERS#7 integrate .. //depot/projects/arm/src/Makefile#11 integrate .. //depot/projects/arm/src/Makefile.inc1#27 integrate .. //depot/projects/arm/src/ObsoleteFiles.inc#21 integrate .. //depot/projects/arm/src/UPDATING#16 integrate .. //depot/projects/arm/src/bin/chflags/chflags.1#2 integrate .. //depot/projects/arm/src/bin/csh/config.h#3 integrate .. //depot/projects/arm/src/bin/csh/config_p.h#3 integrate .. //depot/projects/arm/src/bin/date/date.1#2 integrate .. //depot/projects/arm/src/bin/pax/ar_io.c#2 integrate .. //depot/projects/arm/src/bin/pax/file_subs.c#2 integrate .. //depot/projects/arm/src/bin/pax/pat_rep.c#2 integrate .. //depot/projects/arm/src/bin/pax/sel_subs.c#2 integrate .. //depot/projects/arm/src/bin/pax/tables.c#2 integrate .. //depot/projects/arm/src/bin/rcp/rcp.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/CHANGES#6 integrate .. //depot/projects/arm/src/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/arm/src/contrib/bind9/FAQ#4 integrate .. //depot/projects/arm/src/contrib/bind9/FAQ.xml#4 integrate .. //depot/projects/arm/src/contrib/bind9/FREEBSD-Upgrade#2 integrate .. //depot/projects/arm/src/contrib/bind9/Makefile.in#3 integrate .. //depot/projects/arm/src/contrib/bind9/README#4 integrate .. //depot/projects/arm/src/contrib/bind9/README.idnkit#1 branch .. //depot/projects/arm/src/contrib/bind9/acconfig.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkconf.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/nslookup.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/aclconf.c#3 delete .. //depot/projects/arm/src/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/controlconf.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/aclconf.h#3 delete .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/client.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/config.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/control.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/globals.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/logconf.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/lwresd.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/server.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/sortlist.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/tkeyconf.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/tsigconf.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/include/named/zoneconf.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/logconf.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwdgabn.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwdgrbn.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/main.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/query.c#5 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/sortlist.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/tkeyconf.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/tsigconf.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/unix/os.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/named/zoneconf.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/nsupdate.8#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc-confgen.8#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc-confgen.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/configure.in#4 integrate .. //depot/projects/arm/src/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/README-SGML#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#2 delete .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#2 delete .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#2 delete .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#2 delete .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#2 delete .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#2 delete .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#2 delete .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#2 delete .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#2 delete .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#2 delete .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/misc/dnssec#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/misc/migration-4to9#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/misc/rfc-compliance#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/misc/roadmap#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/misc/sdb#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc4193.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc4255.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc4343.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc4367.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/doc/rfc/rfc4431.txt#1 branch .. //depot/projects/arm/src/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/Makefile.in#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/api#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/daemon.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/ftruncate.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/mktemp.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/putenv.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/readv.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/setenv.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/setitimer.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/strdup.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/strpbrk.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/strsep.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/utimes.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/bsd/writev.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/configure#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/dst/dst_internal.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/dst/hmac_link.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/dst/md5_locl.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/arpa/inet.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/fd_setsize.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/hesiod.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/irp.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/irs.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/isc/ctl.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/isc/dst.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/isc/heap.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/isc/list.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/isc/logging.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/isc/memcluster.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/isc/tree.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/netdb.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/netgroup.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/res_update.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/inet_addr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/inet_data.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/inet_makeaddr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/inet_net_ntop.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/inet_neta.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/inet_netof.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/dns.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/dns_gr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/dns_ho.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/dns_nw.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/dns_p.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/dns_pr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/dns_pw.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/dns_sv.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/gai_strerror.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/gen.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/gen_gr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/gen_ho.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/gen_ng.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/gen_nw.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/gen_p.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/gen_pr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/gen_pw.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/gen_sv.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getaddrinfo.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getgrent.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getgrent_r.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/gethostent.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getnameinfo.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getnetent.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getprotoent.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getprotoent_r.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getpwent.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getpwent_r.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getservent.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/getservent_r.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/hesiod_p.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irp.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irp_gr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irp_ho.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irp_ng.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irp_nw.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irp_p.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irp_pr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irp_pw.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irp_sv.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irpmarshall.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irs_data.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irs_data.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/irs_p.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/lcl.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/lcl_gr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/lcl_ho.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/lcl_ng.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/lcl_nw.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/lcl_p.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/lcl_pr.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/lcl_pw.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/lcl_sv.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/nis.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/nis_gr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/nis_ho.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/nis_ng.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/nis_nw.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/nis_p.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/nis_pr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/nis_pw.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/nis_sv.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/nul_ng.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/pathnames.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/irs/util.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/assertions.mdoc#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/base64.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/ctl_p.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/ctl_p.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/ev_connects.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/ev_streams.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/ev_timers.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/ev_waits.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/heap.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/heap.mdoc#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/hex.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/logging.mdoc#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/logging_p.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/movefile.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/tree.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/isc/tree.mdoc#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/make/includes.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/make/rules.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/nameser/ns_date.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/nameser/ns_name.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/nameser/ns_netint.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/nameser/ns_print.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/nameser/ns_sign.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/nameser/ns_verify.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/port_before.h.in#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/herror.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_data.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_debug.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_init.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_mkupdate.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_private.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_query.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_send.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_sendsigned.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind/resolv/res_update.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind9/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind9/include/bind9/check.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/bind9/version.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/Makefile.in#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/acache.c#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/dns/acl.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/byaddr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/cache.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/callbacks.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/compress.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/db.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dbiterator.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dbtable.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/diff.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dispatch.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dlz.c#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/dns/dnssec.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/ds.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dst_api.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dst_internal.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dst_lib.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dst_openssl.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/dst_result.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/gen.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/gssapi_link.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/gssapictx.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/hmac_link.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/acache.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/acl.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/cache.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/compress.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/diff.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/dlz.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/events.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/keytable.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/log.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/master.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/message.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/name.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/order.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/peer.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/rdataset.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/request.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/resolver.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/result.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/sdlz.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/time.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/tsig.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/types.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/validator.h#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/version.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/view.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/xfrin.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/zone.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/include/dst/result.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/keytable.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/lib.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/log.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/lookup.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/masterdump.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/name.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/ncache.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/nsec.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/openssl_link.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/openssldh_link.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/openssldsa_link.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/opensslrsa_link.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/order.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/peer.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/portlist.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rbtdb.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rbtdb64.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rbtdb64.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rcode.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/spf_99.c#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/spf_99.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdatalist.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdataset.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/resolver.c#6 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/result.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/sdlz.c#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/dns/soa.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/ssu.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/stats.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/tcpmsg.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/time.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/timer.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/tkey.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/ttl.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/validator.c#4 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/version.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/zonekey.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/dns/zt.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/base64.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/bitstring.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/buffer.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/bufferlist.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/commandline.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/entropy.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/error.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/event.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/fsaccess.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/hash.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/heap.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/hex.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/hmacmd5.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/hmacsha.c#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/app.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/error.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/event.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/file.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/heap.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/hmacsha.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/list.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/log.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/os.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/parseint.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/random.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/ratelimiter.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/refcount.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/region.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/result.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/resultclass.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/rwlock.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/serial.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/sha1.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/sha2.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/sockaddr.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/stdio.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/stdlib.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/symtab.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/task.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/taskpool.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/util.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/include/isc/version.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/inet_aton.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/inet_ntop.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/lex.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/lib.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/log.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/md5.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/mips/include/isc/atomic.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/mutexblock.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/netaddr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/netscope.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/nls/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/nothreads/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/nothreads/condition.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/nothreads/include/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/nothreads/include/isc/condition.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/nothreads/include/isc/once.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/nothreads/include/isc/thread.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/nothreads/mutex.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/nothreads/thread.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/ondestroy.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/parseint.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/print.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/pthreads/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/pthreads/condition.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/pthreads/include/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/pthreads/include/isc/condition.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/pthreads/include/isc/once.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/pthreads/include/isc/thread.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/pthreads/thread.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/random.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/ratelimiter.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/refcount.c#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/region.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/serial.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/sha1.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/sha2.c#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/sockaddr.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/string.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/strtoul.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/symtab.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/task.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/task_p.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/taskpool.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/timer_p.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/app.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/dir.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/entropy.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/errno2result.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/errno2result.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/file.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/fsaccess.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/include/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/include/isc/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/include/isc/dir.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/include/isc/int.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/include/isc/keyboard.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/include/isc/netdb.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/include/isc/offset.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/include/isc/stat.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/include/isc/stdtime.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/include/isc/strerror.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/include/isc/syslog.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/include/isc/time.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/interfaceiter.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/ipv6.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/keyboard.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/resource.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/stdio.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/strerror.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/syslog.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/version.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isccc/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/alist.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/api#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/base64.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/cc.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/ccmsg.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/include/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/include/isccc/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/include/isccc/alist.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/include/isccc/base64.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/include/isccc/cc.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/include/isccc/ccmsg.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/include/isccc/events.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/include/isccc/lib.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/include/isccc/result.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/include/isccc/sexpr.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/include/isccc/symtab.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/include/isccc/symtype.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/include/isccc/types.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/include/isccc/util.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/include/isccc/version.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/lib.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/result.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/sexpr.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/symtab.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccc/version.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/aclconf.c#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/include/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h#1 branch .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/include/isccfg/log.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/include/isccfg/version.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/log.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/parser.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/isccfg/version.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/assert_p.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/context.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/context_p.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/gai_strerror.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/getaddrinfo.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/gethost.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/getnameinfo.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/getrrset.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/herror.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/include/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/include/lwres/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/include/lwres/context.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/include/lwres/int.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/include/lwres/ipv6.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/include/lwres/lang.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/include/lwres/list.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/include/lwres/lwpacket.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/include/lwres/lwres.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/include/lwres/netdb.h.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/include/lwres/result.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/include/lwres/stdlib.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/include/lwres/version.h#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/lwbuffer.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/lwconfig.c#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/lwinetaton.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/lwpacket.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/lwres_gabn.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/lwres_grbn.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/lwres_noop.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/lwresutil.c#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/Makefile.in#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres.3#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_buffer.3#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_buffer.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_config.3#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_config.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_context.3#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_context.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gabn.3#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gabn.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gethostent.3#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_gethostent.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getipnode.3#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getipnode.html#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#3 integrate .. //depot/projects/arm/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 6 00:00:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DACC816A469; Wed, 6 Jun 2007 00:00:42 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 82FE116A400 for ; Wed, 6 Jun 2007 00:00:42 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by mx1.freebsd.org (Postfix) with ESMTP id 01DB813C465 for ; Wed, 6 Jun 2007 00:00:39 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by core.fnop.net (Postfix) with ESMTP id 2538E690AED; Wed, 6 Jun 2007 00:58:22 +0100 (WEST) Received: by core.fnop.net (Postfix, from userid 1015) id D3730690AF9; Wed, 6 Jun 2007 00:58:21 +0100 (WEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on core.fnop.net X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=AWL,BAYES_00, FORGED_RCVD_HELO,RCVD_IN_SORBS_DUL autolearn=no version=3.1.7 Received: from epsilon.local.fnop.net (87-196-25-235.net.novis.pt [87.196.25.235]) by core.fnop.net (Postfix) with ESMTP id 5376E690AED; Wed, 6 Jun 2007 00:58:21 +0100 (WEST) Date: Wed, 06 Jun 2007 01:00:32 +0100 Message-ID: <864plmostb.wl%rpaulo@fnop.net> From: Rui Paulo To: "M. Warner Losh" In-Reply-To: <20070604.131038.58456299.imp@bsdimp.com> References: <200706021439.l52Edj6g051339@repoman.freebsd.org> <20070602.235223.-1592322846.imp@bsdimp.com> <86tztpxqys.wl%rpaulo@fnop.net> <20070604.131038.58456299.imp@bsdimp.com> User-Agent: Wanderlust/2.15.5 (Almost Unreal) Emacs/21.3 Mule/5.0 (SAKAKI) X-cite-me: rpaulo MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Virus-Scanned: ClamAV using ClamSMTP Cc: rpaulo@fnop.net, perforce@freebsd.org Subject: Re: PERFORCE change 120782 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2007 00:00:43 -0000 At Mon, 04 Jun 2007 13:10:38 -0600 (MDT), M. Warner Losh wrote: > > In message: <86tztpxqys.wl%rpaulo@fnop.net> > Rui Paulo writes: > : At Sat, 02 Jun 2007 23:52:23 -0600 (MDT), > : M. Warner Losh wrote: > : > > : > In message: <200706021439.l52Edj6g051339@repoman.freebsd.org> > : > Rui Paulo writes: > : > : http://perforce.freebsd.org/chv.cgi?CH=120782 > : > : > : > : Change 120782 by rpaulo@rpaulo_epsilon on 2007/06/02 14:38:42 > : > : > : > : Need to use bus_set_resource() on the probe routine or else > : > : the IRQ will only be setup on the second time the module is > : > : loaded. > : > > : > You mean "only be printed on the probe line the second time the module > : > is loaded" right? > : > : No. > : If I caused interrupts by moving the laptop, asmc_intr() would not be > : run. > > That's totally bizarre and would indicate a rather serious bug if it > were true. I guess you're right. Probably the problem was that I didn't move the laptop too hard. -- Rui Paulo From owner-p4-projects@FreeBSD.ORG Wed Jun 6 00:26:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 493FC16A46C; Wed, 6 Jun 2007 00:26:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 E204716A400; Wed, 6 Jun 2007 00:26:02 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by mx1.freebsd.org (Postfix) with ESMTP id 5FAFB13C465; Wed, 6 Jun 2007 00:26:02 +0000 (UTC) (envelope-from rpaulo@fnop.net) Received: from core.fnop.net (mx.fnop.net [82.102.11.82]) by core.fnop.net (Postfix) with ESMTP id 1750F690AED; Wed, 6 Jun 2007 01:23:45 +0100 (WEST) Received: by core.fnop.net (Postfix, from userid 1015) id CA69C690AFA; Wed, 6 Jun 2007 01:23:44 +0100 (WEST) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on core.fnop.net X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=AWL,BAYES_00, FORGED_RCVD_HELO,RCVD_IN_SORBS_DUL autolearn=no version=3.1.7 Received: from epsilon.local.fnop.net (87-196-25-235.net.novis.pt [87.196.25.235]) by core.fnop.net (Postfix) with ESMTP id 23C8D690AED; Wed, 6 Jun 2007 01:23:44 +0100 (WEST) Date: Wed, 06 Jun 2007 01:25:56 +0100 Message-ID: <86myzeq67f.wl%rpaulo@fnop.net> From: Rui Paulo To: attilio@FreeBSD.org In-Reply-To: <4661BFD0.1080107@FreeBSD.org> References: <200706021756.l52Huq9A049371@repoman.freebsd.org> <4661BFD0.1080107@FreeBSD.org> User-Agent: Wanderlust/2.15.5 (Almost Unreal) Emacs/21.3 Mule/5.0 (SAKAKI) X-cite-me: rpaulo MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Virus-Scanned: ClamAV using ClamSMTP Cc: Perforce Change Reviews , Rui Paulo Subject: Re: PERFORCE change 120788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2007 00:26:03 -0000 At Sat, 02 Jun 2007 21:06:56 +0200, Attilio Rao wrote: > > Rui Paulo wrote: > > http://perforce.freebsd.org/chv.cgi?CH=120788 > > Change 120788 by rpaulo@rpaulo_epsilon on 2007/06/02 17:55:58 > > Add locking. > > Affected files ... > > Ah, but it seems you don't use a "fast" interrupt handler, so you > should not use a spinlock... spinlocks should only be used in fast > interrupt handlers, otherwise you bring up all the disvantages of the > model... Could you please comment on this? If I'm not doing something wrong, I need to use spin locks on my interrupt handler, or else witness_checkorder will complain with "blockable sleep lock". Note that I'm using FILTERs. Thanks in advance. -- Rui Paulo From owner-p4-projects@FreeBSD.ORG Wed Jun 6 02:19:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31C8E16A469; Wed, 6 Jun 2007 02:19:57 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0A9D616A41F for ; Wed, 6 Jun 2007 02:19:57 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E7D9E13C457 for ; Wed, 6 Jun 2007 02:19:56 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l562JuOk032982 for ; Wed, 6 Jun 2007 02:19:56 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l562Juc8032973 for perforce@freebsd.org; Wed, 6 Jun 2007 02:19:56 GMT (envelope-from imp@freebsd.org) Date: Wed, 6 Jun 2007 02:19:56 GMT Message-Id: <200706060219.l562Juc8032973@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 121027 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2007 02:19:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=121027 Change 121027 by imp@imp_paco-paco on 2007/06/06 02:19:34 IFC @121025 Affected files ... .. //depot/projects/arm/src/contrib/bind9/lib/isc/arm/include/isc/atomic.h#1 branch .. //depot/projects/arm/src/lib/bind/config.mk#3 integrate .. //depot/projects/arm/src/share/man/man9/condvar.9#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/ac97.c#13 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/ac97_patch.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/uftdi.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#32 integrate .. //depot/projects/arm/src/sys/netinet/sctp_sysctl.c#6 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.c#16 integrate Differences ... ==== //depot/projects/arm/src/lib/bind/config.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/config.mk,v 1.18 2007/06/03 16:49:57 dougb Exp $ +# $FreeBSD: src/lib/bind/config.mk,v 1.19 2007/06/05 22:17:16 dougb Exp $ .include @@ -65,8 +65,6 @@ # Use the right version of the atomic.h file from lib/isc .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" ISC_ATOMIC_ARCH= x86_32 -.elif ${MACHINE_ARCH} == "arm" -ISC_ATOMIC_ARCH= noatomic .else ISC_ATOMIC_ARCH= ${MACHINE_ARCH} .endif ==== //depot/projects/arm/src/share/man/man9/condvar.9#4 (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/man9/condvar.9,v 1.19 2007/03/30 18:07:26 julian Exp $ +.\" $FreeBSD: src/share/man/man9/condvar.9,v 1.21 2007/06/05 20:53:18 imp Exp $ .\" -.Dd March 21, 2007 +.Dd June 5, 2007 .Dt CONDVAR 9 .Os .Sh NAME @@ -117,6 +117,12 @@ or .Xr sx 9 lock. +A +.Xr mutex 9 +argument must be initialized with +.Dv MTX_DEF +and not +.Dv MTX_SPIN . A thread must hold .Fa lock before calling ==== //depot/projects/arm/src/sys/dev/sound/pcm/ac97.c#13 (text+ko) ==== @@ -32,7 +32,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97.c,v 1.71 2007/06/04 18:25:04 dwmalone Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97.c,v 1.72 2007/06/05 20:30:16 ariff Exp $"); MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec"); @@ -48,7 +48,8 @@ unsigned enable:1; /* entry is enabled */ }; -#define AC97_NAMELEN 16 +#define AC97_MIXER_SIZE SOUND_MIXER_NRDEVICES + struct ac97_info { kobj_t methods; device_t dev; @@ -57,8 +58,8 @@ u_int32_t subvendor; unsigned count, caps, se, extcaps, extid, extstat, noext:1; u_int32_t flags; - struct ac97mixtable_entry mix[32]; - char name[AC97_NAMELEN]; + struct ac97mixtable_entry mix[AC97_MIXER_SIZE]; + char name[16]; struct mtx *lock; }; @@ -75,7 +76,7 @@ ac97_patch patch; }; -static const struct ac97mixtable_entry ac97mixtable_default[32] = { +static const struct ac97mixtable_entry ac97mixtable_default[AC97_MIXER_SIZE] = { /* [offset] reg bits of st mu re mk en */ [SOUND_MIXER_VOLUME] = { AC97_MIX_MASTER, 5, 0, 1, 1, 6, 0, 1 }, [SOUND_MIXER_OGAIN] = { AC97_MIX_AUXOUT, 5, 0, 1, 1, 0, 0, 0 }, @@ -614,12 +615,13 @@ i = ac97_rdcd(codec, AC97_REG_RESET); j = ac97_rdcd(codec, AC97_REG_RESET); + k = ac97_rdcd(codec, AC97_REG_RESET); /* * Let see if this codec can return consistent value. * If not, turn on aggressive read workaround * (STAC9704 comes in mind). */ - if (i != j) { + if (i != j || j != k) { codec->flags |= AC97_F_RDCD_BUG; i = ac97_rdcd(codec, AC97_REG_RESET); } @@ -674,7 +676,7 @@ } } - for (i = 0; i < 32; i++) { + for (i = 0; i < AC97_MIXER_SIZE; i++) { codec->mix[i] = ac97mixtable_default[i]; } ac97_fix_auxout(codec); @@ -682,7 +684,7 @@ if (codec_patch) codec_patch(codec); - for (i = 0; i < 32; i++) { + for (i = 0; i < AC97_MIXER_SIZE; i++) { k = codec->noext? codec->mix[i].enable : 1; reg = codec->mix[i].reg; if (reg < 0) @@ -826,7 +828,8 @@ if (codec == NULL) return NULL; - snprintf(codec->name, AC97_NAMELEN, "%s:ac97", device_get_nameunit(dev)); + snprintf(codec->name, sizeof(codec->name), "%s:ac97", + device_get_nameunit(dev)); codec->lock = snd_mtxcreate(codec->name, "ac97 codec"); codec->methods = kobj_create(cls, M_AC97, M_WAITOK | M_ZERO); codec->dev = dev; @@ -980,12 +983,12 @@ #endif mask = 0; - for (i = 0; i < 32; i++) + for (i = 0; i < AC97_MIXER_SIZE; i++) mask |= codec->mix[i].enable? 1 << i : 0; mix_setdevs(m, mask); mask = 0; - for (i = 0; i < 32; i++) + for (i = 0; i < AC97_MIXER_SIZE; i++) mask |= codec->mix[i].recidx? 1 << i : 0; mix_setrecdevs(m, mask); @@ -1024,7 +1027,7 @@ { struct ac97_info *codec = mix_getdevinfo(m); - if (codec == NULL) + if (codec == NULL || dev >= AC97_MIXER_SIZE) return -1; return ac97_setmixer(codec, dev, left, right); } @@ -1037,7 +1040,7 @@ if (codec == NULL) return -1; - for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) + for (i = 0; i < AC97_MIXER_SIZE; i++) if ((src & (1 << i)) != 0) break; return (ac97_setrecsrc(codec, i) == 0)? 1 << i : -1; ==== //depot/projects/arm/src/sys/dev/sound/pcm/ac97_patch.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97_patch.c,v 1.8 2007/04/19 13:54:22 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97_patch.c,v 1.9 2007/06/05 20:12:40 ariff Exp $"); void ad1886_patch(struct ac97_info* codec) { @@ -91,6 +91,15 @@ case 0x03511462: /* MSI L725 */ ac97_wrcd(codec, 0x7a, ac97_rdcd(codec, 0x7a) & 0xfffd); break; + case 0x10ca1734: + /* + * Amilo Pro V2055 with ALC655 has phone out by default + * disabled (surround on), leaving us only with internal + * speakers. This should really go to mixer. We write the + * Data Flow Control reg. + */ + ac97_wrcd(codec, 0x6a, ac97_rdcd(codec, 0x6a) | 0x0001); + break; default: break; } ==== //depot/projects/arm/src/sys/dev/usb/uftdi.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.25 2007/04/30 16:15:19 takawata Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.26 2007/06/05 21:06:17 imp Exp $"); /* * FTDI FT8U100AX serial adapter driver @@ -167,7 +167,12 @@ uaa->product == USB_PRODUCT_FTDI_MX2_3 || uaa->product == USB_PRODUCT_FTDI_MX4_5 || uaa->product == USB_PRODUCT_FTDI_LK202 || - uaa->product == USB_PRODUCT_FTDI_LK204)) + uaa->product == USB_PRODUCT_FTDI_LK204 || + uaa->product == USB_PRODUCT_FTDI_EISCOU || + uaa->product == USB_PRODUCT_FTDI_UOPTBR || + uaa->product == USB_PRODUCT_FTDI_EMCU2D || + uaa->product == USB_PRODUCT_FTDI_PCMSFU || + uaa->product == USB_PRODUCT_FTDI_EMCU2H )) return (UMATCH_VENDOR_PRODUCT); if (uaa->vendor == USB_VENDOR_SIIG2 && (uaa->product == USB_PRODUCT_SIIG2_US2308)) @@ -250,6 +255,11 @@ case USB_PRODUCT_FTDI_MX4_5: case USB_PRODUCT_FTDI_LK202: case USB_PRODUCT_FTDI_LK204: + case USB_PRODUCT_FTDI_EISCOU: + case USB_PRODUCT_FTDI_UOPTBR: + case USB_PRODUCT_FTDI_EMCU2D: + case USB_PRODUCT_FTDI_PCMSFU: + case USB_PRODUCT_FTDI_EMCU2H: sc->sc_type = UFTDI_TYPE_8U232AM; sc->sc_hdrlen = 0; break; ==== //depot/projects/arm/src/sys/dev/usb/usbdevs#32 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.295 2007/05/29 20:05:13 imp Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.296 2007/06/05 21:06:17 imp Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -1024,6 +1024,12 @@ product FTDI SERIAL_8U100AX 0x8372 8U100AX Serial product FTDI SERIAL_8U232AM 0x6001 8U232AM Serial product FTDI SERIAL_2232C 0x6010 FT2232C Dual port Serial +/* Gude Analog- und Digitalsysteme products also uses FTDI's id: */ +product FTDI EISCOU 0xe888 "Expert ISDN Control USB" +product FTDI UOPTBR 0xe889 "USB-RS232 OptoBridge" +product FTDI EMCU2D 0xe88a "Expert mouseCLOCK USB II" +product FTDI PCMSFU 0xe88b "Precision Clock MSF USB" +product FTDI EMCU2H 0xe88c "Expert mouseCLOCK USB II HBG" /* Fuji photo products */ product FUJIPHOTO MASS0100 0x0100 Mass Storage ==== //depot/projects/arm/src/sys/netinet/sctp_sysctl.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctp_sysctl.c,v 1.8 2007/05/29 09:29:02 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_sysctl.c,v 1.9 2007/06/06 00:40:41 rrs Exp $"); #include #include @@ -192,6 +192,8 @@ /* neither Mac OS X nor FreeBSD support mulitple routing functions */ if ((vrf = sctp_find_vrf(inp->def_vrf_id)) == NULL) { + SCTP_INP_RUNLOCK(inp); + SCTP_INP_INFO_RUNLOCK(); return (-1); } if (inp->sctp_flags & SCTP_PCB_FLAGS_BOUNDALL) { @@ -273,11 +275,18 @@ } memset((void *)&xladdr, 0, sizeof(union sctp_sockstore)); xladdr.last = 1; + SCTP_INP_RUNLOCK(inp); + SCTP_INP_INFO_RUNLOCK(); error = SYSCTL_OUT(req, &xladdr, sizeof(struct xsctp_laddr)); + if (error) return (error); - else + + else { + SCTP_INP_INFO_RLOCK(); + SCTP_INP_RLOCK(inp); return (0); + } } /* ==== //depot/projects/arm/src/sys/netinet/sctputil.c#16 (text+ko) ==== @@ -31,7 +31,7 @@ /* $KAME: sctputil.c,v 1.37 2005/03/07 23:26:09 itojun Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/sctputil.c,v 1.36 2007/06/01 11:19:54 rrs Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/sctputil.c,v 1.37 2007/06/06 00:40:41 rrs Exp $"); #include #include @@ -5027,6 +5027,9 @@ * there. */ sinfo->sinfo_flags &= 0x00ff; + if ((control->sinfo_flags >> 8) & SCTP_DATA_UNORDERED) { + sinfo->sinfo_flags |= SCTP_UNORDERED; + } } if (fromlen && from) { struct sockaddr *to; From owner-p4-projects@FreeBSD.ORG Wed Jun 6 06:43:26 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E22316A469; Wed, 6 Jun 2007 06:43:26 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0BA0016A400 for ; Wed, 6 Jun 2007 06:43:26 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F24C813C48A for ; Wed, 6 Jun 2007 06:43:25 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l566hPvp081467 for ; Wed, 6 Jun 2007 06:43:25 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l566hPxh081457 for perforce@freebsd.org; Wed, 6 Jun 2007 06:43:25 GMT (envelope-from andrew@freebsd.org) Date: Wed, 6 Jun 2007 06:43:25 GMT Message-Id: <200706060643.l566hPxh081457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 121037 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2007 06:43:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=121037 Change 121037 by andrew@andrew_hermies on 2007/06/06 06:43:25 Add a library to handle communications between the back and frontend. It only allows communications on a unix socket currently but this could be extended. The protocol will be based on an XML stream each for the back and front ends. the XML processing will be done with libbsdxml on the back-end. Affected files ... .. //depot/projects/soc2007/andrew-update/Makefile#2 edit .. //depot/projects/soc2007/andrew-update/lib/Makefile#1 add .. //depot/projects/soc2007/andrew-update/lib/facund_connection.c#1 add .. //depot/projects/soc2007/andrew-update/lib/facund_connection.h#1 add .. //depot/projects/soc2007/andrew-update/lib/facund_private.h#1 add .. //depot/projects/soc2007/andrew-update/lib/facund_server.c#1 add Differences ... ==== //depot/projects/soc2007/andrew-update/Makefile#2 (text+ko) ==== @@ -1,3 +1,3 @@ -SUBDIR= backend +SUBDIR= lib backend .include From owner-p4-projects@FreeBSD.ORG Wed Jun 6 06:48:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EC7B16A468; Wed, 6 Jun 2007 06:48:33 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B8E2916A41F for ; Wed, 6 Jun 2007 06:48:32 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id ABE4A13C455 for ; Wed, 6 Jun 2007 06:48:32 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l566mWdv086190 for ; Wed, 6 Jun 2007 06:48:32 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l566mWm8086181 for perforce@freebsd.org; Wed, 6 Jun 2007 06:48:32 GMT (envelope-from andrew@freebsd.org) Date: Wed, 6 Jun 2007 06:48:32 GMT Message-Id: <200706060648.l566mWm8086181@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 121038 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2007 06:48:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=121038 Change 121038 by andrew@andrew_hermies on 2007/06/06 06:47:47 Use the new library to communicate with the front-end over a unix socket. Affected files ... .. //depot/projects/soc2007/andrew-update/backend/Makefile#5 edit .. //depot/projects/soc2007/andrew-update/backend/facund-be.c#6 edit Differences ... ==== //depot/projects/soc2007/andrew-update/backend/Makefile#5 (text+ko) ==== @@ -1,7 +1,7 @@ PROG= facund-be -CFLAGS+=-pthread -LDADD+= -lutil -lmd +CFLAGS+=-pthread -I${.CURDIR}/../lib +LDADD+= -lbsdxml -lutil -lmd ${.OBJDIR}/../lib/libfacund.a MAN= ==== //depot/projects/soc2007/andrew-update/backend/facund-be.c#6 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include +#include #include #include #include @@ -46,6 +47,8 @@ #include #include +#include + /* Check if there are updates every 30min */ static const time_t default_check_period = 30 * 60; @@ -55,6 +58,7 @@ static int has_update(const char *); static void *look_for_updates(void *); static char **get_base_dirs(char *); +static void *do_communication(void *); /* * Looks for updates on the system with a root of basedir @@ -225,10 +229,42 @@ return ret; } +static void * +do_communication(void *data) +{ + struct facund_conn *conn = (struct facund_conn *)data; + + signal(SIGPIPE, SIG_DFL); + + while(1) { + int ret = 0; + if(facund_server_start(conn) == -1) { + fprintf(stderr, + "ERROR: Couldn't start the connection\n"); + break; + } + + while(ret == 0) { + ret = facund_server_get_request(conn); + if (ret == -1) { + fprintf(stderr, + "ERROR: Couldn't read data from network\n"); + } + } + + facund_server_finish(conn); + if (ret == -1) + break; + } + + return NULL; +} + int main(int argc __unused, char *argv[] __unused) { - pthread_t update_thread; + pthread_t update_thread, comms_thread; + struct facund_conn *conn; const char *config_file; char *basedirs_string, **base_dirs; int config_fd; @@ -282,11 +318,24 @@ config_file); } + /* Create the data connection */ + conn = facund_connect_server("/tmp/facund"); + if (conn == NULL) { + errx(1, "Could not open a socket: %s\n", strerror(errno)); + } + pthread_create(&update_thread, NULL, look_for_updates, base_dirs); + pthread_create(&comms_thread, NULL, do_communication, conn); + + pthread_join(comms_thread, NULL); pthread_join(update_thread, NULL); + if (conn != NULL) + facund_cleanup(conn); + if (base_dirs != NULL) free(base_dirs); + free(basedirs_string); return 0; } From owner-p4-projects@FreeBSD.ORG Wed Jun 6 06:50:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A46D16A469; Wed, 6 Jun 2007 06:50:36 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E367116A473 for ; Wed, 6 Jun 2007 06:50:35 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BD76713C4BD for ; Wed, 6 Jun 2007 06:50:35 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l566oZ79088252 for ; Wed, 6 Jun 2007 06:50:35 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l566oZc1088246 for perforce@freebsd.org; Wed, 6 Jun 2007 06:50:35 GMT (envelope-from andrew@freebsd.org) Date: Wed, 6 Jun 2007 06:50:35 GMT Message-Id: <200706060650.l566oZc1088246@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 121039 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2007 06:50:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=121039 Change 121039 by andrew@andrew_hermies on 2007/06/06 06:49:41 Add the start of a front end. Currently it can partialy communicate with the back end. Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund-fe.glade#1 add .. //depot/projects/soc2007/andrew-update/frontend/facund.py#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 6 09:05:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A25E16A46B; Wed, 6 Jun 2007 09:05:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 4337916A41F for ; Wed, 6 Jun 2007 09:05:28 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 341DD13C4B0 for ; Wed, 6 Jun 2007 09:05:28 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5695Sao026558 for ; Wed, 6 Jun 2007 09:05:28 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5695RMB026549 for perforce@freebsd.org; Wed, 6 Jun 2007 09:05:27 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Wed, 6 Jun 2007 09:05:27 GMT Message-Id: <200706060905.l5695RMB026549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 121047 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2007 09:05:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=121047 Change 121047 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/06 09:05:04 Because mac/mls itself forbid the redirection of stderr, I use a tmp file to store the result of stderr and stdout Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/macproc.c#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/tests/misc.sh#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/tests/signal/00.t#2 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/macproc.c#2 (text+ko) ==== @@ -59,10 +59,11 @@ fprintf(stderr, "Usage: \n"); fprintf(stderr, "\ - -w seconds Wait for n seconds before exits\n"); + -w seconds Wait for n seconds before exits\n\ + -f pidfile The pid file should be written to\n"); exit(1); } -const char *pid_file="pidfile"; +char *pid_file = NULL; struct pidfh *pfh = NULL; @@ -75,7 +76,7 @@ struct timeval begin,loop; pid_t otherpid; - while ((ch = getopt(argc, argv, "w:")) != -1) { + while ((ch = getopt(argc, argv, "w:f:")) != -1) { switch(ch) { case 'w': seconds = (long)strtol(optarg, &endp, 0); @@ -85,6 +86,9 @@ exit(1); } break; + case 'f': + pid_file = optarg; + break; default: usage(); } @@ -97,6 +101,11 @@ usage(); } + if (pid_file == NULL){ + fprintf(stderr, "must supply pid file\n"); + usage(); + } + gettimeofday(&begin, (struct timezone *)NULL); pfh = pidfile_open(pid_file, 0600, &otherpid); ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/tests/misc.sh#2 (text+ko) ==== @@ -3,6 +3,8 @@ ntest=1 pid=0 pid_file="`pwd`/pidfile" +tmp_file="`pwd`/tmp" + echo ${dir} | egrep '^/' >/dev/null 2>&1 if [ $? -eq 0 ]; then @@ -14,21 +16,21 @@ macproc="${maindir}/macproc" . ${maindir}/tests/conf -maccmdnotexpect() +maccmdnotexpectanyerror() { - e="${1}" - shift m="${1}" shift c="${1}" shift - r=`setpmac ${m} ${c} $* 2>&1` - echo ${r}|egrep ${e} >/dev/null 2>&1 - if [ $? -eq 0 ]; then +# r=`setpmac ${m} ${c} $* 2>&1` + setpmac ${m} ${c} $* 2>${tmp_file} 1>>${tmp_file} + r=`cat ${tmp_file}` + if [ ${#r} -eq 0 ]; then + echo "ok ${ntest}" + else echo ${r} echo "not ok ${ntest}" - else - echo "ok ${ntest}" + exit fi ntest=`expr $ntest + 1` } @@ -41,12 +43,16 @@ shift c="${1}" shift - r=`setpmac ${m} ${c} $* 2>&1` - echo ${r}|egrep ${e} >/dev/null 2>&1 +# r=`setpmac ${m} ${c} $* 2>&1` + setpmac ${m} ${c} $* 2>${tmp_file} 1>>${tmp_file} + setfmac mls/equal ${tmp_file} + r=`cat ${tmp_file}` + echo ${r}|egrep "${e}" >/dev/null 2>&1 if [ $? -eq 0 ]; then echo "ok ${ntest}" else echo "not ok ${ntest}" + exit fi ntest=`expr $ntest + 1` } ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/tests/signal/00.t#2 (text+ko) ==== @@ -6,17 +6,29 @@ dir=`dirname $0` . ${dir}/../misc.sh +#following test case is to show, when subject's effective mls level does not dominate +#object's effective mls level, a ESRCH is returned when signaling +t=`sysctl security.mac.mls.enabled=0` +maccmdnotexpectanyerror "mls/3(2-7)" ${macproc} -w 20 -f "${pid_file}" +getmacprocpid +t=`sysctl security.mac.mls.enabled=1` +maccmdexpect "No such process" "mls/low" kill ${pid} +maccmdnotexpectanyerror "mls/3(2-7)" kill ${pid} +t=`sysctl security.mac.mls.enabled=0` +rm ${pid_file} +rm ${tmp_file} - -maccmdnotexpect "Invalid" "mls/3(2-7)" ${macproc} -w 20 -#not expect Invalide argument +#following test case is to show, when object's effective mls level does not dominate +#subject's effective mls level, a EACCES is returned when signaling t=`sysctl security.mac.mls.enabled=0` +maccmdnotexpectanyerror "mls/low(low-high)" ${macproc} -w 20 -f "${pid_file}" getmacprocpid t=`sysctl security.mac.mls.enabled=1` -maccmdexpect "No" "mls/low" kill ${pid} -#expect No such process -maccmdnotexpect "No" "mls/3(2-7)" kill ${pid} -#not expect No such process +maccmdexpect "Permission denied" "mls/3(2-7)" kill ${pid} +maccmdnotexpectanyerror "mls/low(low-high)" kill ${pid} +t=`sysctl security.mac.mls.enabled=0` +rm ${pid_file} +rm ${tmp_file} From owner-p4-projects@FreeBSD.ORG Wed Jun 6 09:38:14 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F26216A46B; Wed, 6 Jun 2007 09:38:14 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4D09F16A421 for ; Wed, 6 Jun 2007 09:38:14 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3BE4013C45A for ; Wed, 6 Jun 2007 09:38:14 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l569cEkd050088 for ; Wed, 6 Jun 2007 09:38:14 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l569c94C050085 for perforce@freebsd.org; Wed, 6 Jun 2007 09:38:09 GMT (envelope-from piso@freebsd.org) Date: Wed, 6 Jun 2007 09:38:09 GMT Message-Id: <200706060938.l569c94C050085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 121049 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2007 09:38:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=121049 Change 121049 by piso@piso_skytech on 2007/06/06 09:37:21 IFC@121044 Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/genassym.c#6 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#31 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/io_apic.c#7 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/machdep.c#12 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/mp_machdep.c#9 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/trap.c#11 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/tsc.c#3 integrate .. //depot/projects/soc2006/intr_filter/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/amd64/ia32/ia32_syscall.c#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/pcpu.h#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/include/vmparam.h#4 integrate .. //depot/projects/soc2006/intr_filter/amd64/isa/clock.c#10 integrate .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_machdep.c#13 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/intr.c#25 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/trap.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/undefined.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/arm/vm_machdep.c#8 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/soc2006/intr_filter/arm/include/pcpu.h#3 integrate .. //depot/projects/soc2006/intr_filter/arm/include/vmparam.h#6 integrate .. //depot/projects/soc2006/intr_filter/cam/cam_xpt.c#12 integrate .. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_all.c#4 integrate .. //depot/projects/soc2006/intr_filter/compat/linprocfs/linprocfs.c#14 integrate .. //depot/projects/soc2006/intr_filter/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/soc2006/intr_filter/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_misc.c#6 integrate .. //depot/projects/soc2006/intr_filter/conf/Makefile.ia64#3 integrate .. //depot/projects/soc2006/intr_filter/conf/NOTES#19 integrate .. //depot/projects/soc2006/intr_filter/conf/files#21 integrate .. //depot/projects/soc2006/intr_filter/conf/options#19 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_auth.h#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_fil.h#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_frag.c#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_ftp_pxy.c#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_log.c#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_nat.c#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_pptp_pxy.c#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_proxy.c#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_rcmd_pxy.c#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_scan.c#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_state.c#4 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_sync.c#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ip_sync.h#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/ipl.h#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate .. //depot/projects/soc2006/intr_filter/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/acpi_support/acpi_asus.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_ec.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_timer.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_ath.c#16 integrate .. //depot/projects/soc2006/intr_filter/dev/bge/if_bge.c#19 integrate .. //depot/projects/soc2006/intr_filter/dev/ciss/ciss.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/gem/if_gem.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/gem/if_gemvar.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/hwpmc/hwpmc_mod.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/md/md.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfi.c#14 integrate .. //depot/projects/soc2006/intr_filter/dev/mfi/mfivar.h#6 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/ciphy.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/ciphyreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/miidevs#9 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/rlphy.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/mmc/mmc.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpilib/mpi_log_fc.h#2 delete .. //depot/projects/soc2006/intr_filter/dev/mpt/mpilib/mpi_log_sas.h#2 delete .. //depot/projects/soc2006/intr_filter/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt.h#11 integrate .. //depot/projects/soc2006/intr_filter/dev/mpt/mpt_cam.c#15 integrate .. //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge.c#11 integrate .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#16 integrate .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbbvar.h#10 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/clone.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/atiixp.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24ht.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/es137x.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/hda/hdac.c#13 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pci/via8233.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/ac97.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/ac97_patch.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/channel.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/dsp.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/feeder.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/feeder_fmt.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/feeder_rate.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/feeder_volume.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/mixer.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/sndstat.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/sound.c#10 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/pcm/vchan.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/usb/uaudio_pcm.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/speaker/spkr.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/syscons/syscons.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uftdi.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uplcom.c#8 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/usbdevs#16 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uvscom.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/soc2006/intr_filter/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/soc2006/intr_filter/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/soc2006/intr_filter/fs/procfs/procfs_ioctl.c#7 integrate .. //depot/projects/soc2006/intr_filter/fs/procfs/procfs_status.c#4 integrate .. //depot/projects/soc2006/intr_filter/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/soc2006/intr_filter/geom/cache/g_cache.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/eli/g_eli.c#10 integrate .. //depot/projects/soc2006/intr_filter/geom/geom_kern.c#2 integrate .. //depot/projects/soc2006/intr_filter/geom/journal/g_journal.c#5 integrate .. //depot/projects/soc2006/intr_filter/geom/mirror/g_mirror.c#7 integrate .. //depot/projects/soc2006/intr_filter/geom/part/g_part.c#4 integrate .. //depot/projects/soc2006/intr_filter/geom/part/g_part_apm.c#3 integrate .. //depot/projects/soc2006/intr_filter/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/soc2006/intr_filter/geom/raid3/g_raid3.c#7 integrate .. //depot/projects/soc2006/intr_filter/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/soc2006/intr_filter/gnu/fs/reiserfs/reiserfs_vfsops.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/elan-mmcr.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/genassym.c#5 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#38 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/io_apic.c#7 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/machdep.c#14 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/mp_clock.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/mp_watchdog.c#2 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/swtch.s#3 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/trap.c#10 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/tsc.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/soc2006/intr_filter/i386/include/pcpu.h#4 integrate .. //depot/projects/soc2006/intr_filter/i386/include/vmparam.h#5 integrate .. //depot/projects/soc2006/intr_filter/i386/isa/clock.c#13 integrate .. //depot/projects/soc2006/intr_filter/i386/isa/npx.c#6 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_machdep.c#11 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia32/ia32_trap.c#4 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#28 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/machdep.c#9 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/mp_machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/pmap.c#9 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/trap.c#8 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/vm_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/ia64/include/pcpu.h#4 integrate .. //depot/projects/soc2006/intr_filter/kern/init_main.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_acct.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_alq.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_clock.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_condvar.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_cpu.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_exit.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_fork.c#12 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_idle.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#43 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_kse.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_kthread.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_lockf.c#2 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_mbuf.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_mutex.c#11 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_poll.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_proc.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_resource.c#12 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_rwlock.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_shutdown.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_sig.c#12 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_subr.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_switch.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_synch.c#12 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_sysctl.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_tc.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_thr.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_thread.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_time.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/kern_umtx.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/ksched.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_4bsd.c#11 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_core.c#7 delete .. //depot/projects/soc2006/intr_filter/kern/sched_ule.c#14 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_lock.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_prof.c#4 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_smp.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_taskqueue.c#3 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_trap.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_turnstile.c#8 integrate .. //depot/projects/soc2006/intr_filter/kern/subr_witness.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/sys_generic.c#10 integrate .. //depot/projects/soc2006/intr_filter/kern/sys_process.c#5 integrate .. //depot/projects/soc2006/intr_filter/kern/tty.c#6 integrate .. //depot/projects/soc2006/intr_filter/kern/uipc_socket.c#16 integrate .. //depot/projects/soc2006/intr_filter/net/if_fwsubr.c#4 integrate .. //depot/projects/soc2006/intr_filter/net/if_media.h#3 integrate .. //depot/projects/soc2006/intr_filter/net80211/_ieee80211.h#6 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211.c#8 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211.h#4 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_acl.c#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_crypto.c#3 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_crypto.h#3 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_crypto_none.c#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_freebsd.c#5 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_freebsd.h#5 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_input.c#11 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_ioctl.c#8 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_node.c#7 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_node.h#3 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_output.c#9 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_proto.c#7 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_proto.h#6 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_var.h#8 integrate .. //depot/projects/soc2006/intr_filter/net80211/ieee80211_xauth.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/common/ng_bluetooth.c#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_base.c#6 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_ppp.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_constants.h#10 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_indata.c#11 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_input.c#12 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_input.h#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_os_bsd.h#10 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_output.c#11 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_output.h#7 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_pcb.c#11 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_pcb.h#9 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_structs.h#10 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_timer.c#9 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctp_usrreq.c#11 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctputil.c#12 integrate .. //depot/projects/soc2006/intr_filter/netinet/sctputil.h#10 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_timewait.c#2 integrate .. //depot/projects/soc2006/intr_filter/netinet6/frag6.c#4 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6.c#10 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/soc2006/intr_filter/netinet6/in6_var.h#4 integrate .. //depot/projects/soc2006/intr_filter/netinet6/ip6_var.h#3 integrate .. //depot/projects/soc2006/intr_filter/netinet6/sctp6_usrreq.c#11 integrate .. //depot/projects/soc2006/intr_filter/netncp/ncp_sock.c#4 integrate .. //depot/projects/soc2006/intr_filter/netsmb/smb_trantcp.c#3 integrate .. //depot/projects/soc2006/intr_filter/nfsclient/nfs_bio.c#5 integrate .. //depot/projects/soc2006/intr_filter/pc98/cbus/clock.c#9 integrate .. //depot/projects/soc2006/intr_filter/pc98/pc98/machdep.c#11 integrate .. //depot/projects/soc2006/intr_filter/powerpc/include/pcpu.h#3 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/trap.c#6 integrate .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/vm_machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit.c#8 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit.h#6 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_arg.c#9 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_bsm.c#5 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_pipe.c#4 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_private.h#6 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_syscalls.c#8 integrate .. //depot/projects/soc2006/intr_filter/security/audit/audit_worker.c#5 integrate .. //depot/projects/soc2006/intr_filter/security/mac_lomac/mac_lomac.c#8 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/pcpu.h#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/vmparam.h#4 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/trap.c#5 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/tsb.c#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/vm_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/pcpu.h#6 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/vmparam.h#4 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/mp_machdep.c#6 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/trap.c#7 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/vm_machdep.c#5 integrate .. //depot/projects/soc2006/intr_filter/sys/mutex.h#10 integrate .. //depot/projects/soc2006/intr_filter/sys/pcpu.h#6 integrate .. //depot/projects/soc2006/intr_filter/sys/proc.h#13 integrate .. //depot/projects/soc2006/intr_filter/sys/resourcevar.h#3 integrate .. //depot/projects/soc2006/intr_filter/sys/sched.h#8 integrate .. //depot/projects/soc2006/intr_filter/sys/sysctl.h#8 integrate .. //depot/projects/soc2006/intr_filter/sys/turnstile.h#2 integrate .. //depot/projects/soc2006/intr_filter/sys/umtx.h#7 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_snapshot.c#7 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/soc2006/intr_filter/vm/swap_pager.c#10 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_fault.c#11 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_glue.c#6 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_meter.c#7 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_object.c#12 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_page.c#12 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_pageout.c#7 integrate .. //depot/projects/soc2006/intr_filter/vm/vm_zeroidle.c#7 integrate .. //depot/projects/soc2006/intr_filter/vm/vnode_pager.c#6 integrate Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/amd64/cpu_switch.S#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.156 2007/03/30 00:06:20 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.158 2007/06/06 07:35:07 davidxu Exp $ */ #include @@ -73,19 +73,16 @@ movq TD_PCB(%rsi),%rdx /* newtd->td_proc */ movq PCB_CR3(%rdx),%rdx movq %rdx,%cr3 /* new address space */ - /* set bit in new pm_active */ - movq TD_PROC(%rsi),%rdx - movq P_VMSPACE(%rdx), %rdx - LK btsl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */ - jmp sw1 + jmp swact /* - * cpu_switch(old, new) + * cpu_switch(old, new, mtx) * * Save the current thread state, then select the next thread to run * and load its state. * %rdi = oldtd * %rsi = newtd + * %rdx = mtx */ ENTRY(cpu_switch) /* Switch to new thread. First, save context. */ @@ -147,17 +144,33 @@ movq TD_PCB(%rsi),%r8 /* switch address space */ - movq PCB_CR3(%r8),%rdx + movq PCB_CR3(%r8),%rcx movq %cr3,%rax - cmpq %rdx,%rax /* Same address space? */ - je sw1 - movq %rdx,%cr3 /* new address space */ - + cmpq %rcx,%rax /* Same address space? */ + jne swinact + movq %rdx, TD_LOCK(%rdi) /* Release the old thread */ + /* Wait for the new thread to become unblocked */ + movq $blocked_lock, %rdx +1: + movq TD_LOCK(%rsi),%rcx + cmpq %rcx, %rdx + je 1b + jmp sw1 +swinact: + movq %rcx,%cr3 /* new address space */ movl PCPU(CPUID), %eax /* Release bit from old pmap->pm_active */ - movq TD_PROC(%rdi), %rdx /* oldproc */ - movq P_VMSPACE(%rdx), %rdx - LK btrl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */ + movq TD_PROC(%rdi), %rcx /* oldproc */ + movq P_VMSPACE(%rcx), %rcx + LK btrl %eax, VM_PMAP+PM_ACTIVE(%rcx) /* clear old */ + movq %rdx, TD_LOCK(%rdi) /* Release the old thread */ +swact: + /* Wait for the new thread to become unblocked */ + movq $blocked_lock, %rdx +1: + movq TD_LOCK(%rsi),%rcx + cmpq %rcx, %rdx + je 1b /* Set bit in new pmap->pm_active */ movq TD_PROC(%rsi),%rdx /* newproc */ @@ -190,9 +203,7 @@ movq %rbx, (%rax) movq %rbx, PCPU(RSP0) - movl TD_TID(%rsi), %eax movq %r8, PCPU(CURPCB) - movl %eax, PCPU(CURTID) movq %rsi, PCPU(CURTHREAD) /* into next thread */ testl $PCB_32BIT,PCB_FLAGS(%r8) ==== //depot/projects/soc2006/intr_filter/amd64/amd64/genassym.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.161 2007/03/30 00:06:20 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.163 2007/06/06 07:35:07 davidxu Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -76,6 +76,7 @@ ASSYM(PM_ACTIVE, offsetof(struct pmap, pm_active)); ASSYM(P_SFLAG, offsetof(struct proc, p_sflag)); +ASSYM(TD_LOCK, offsetof(struct thread, td_lock)); ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); @@ -193,7 +194,6 @@ ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp)); ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0)); -ASSYM(PC_CURTID, offsetof(struct pcpu, pc_curtid)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#31 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.33 2007/05/31 19:25:34 piso Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.34 2007/06/04 21:38:44 attilio Exp $ */ /* @@ -250,7 +250,7 @@ * processed too. */ (*isrc->is_count)++; - PCPU_LAZY_INC(cnt.v_intr); + PCPU_INC(cnt.v_intr); ie = isrc->is_event; @@ -321,7 +321,7 @@ * processed too. */ (*isrc->is_count)++; - PCPU_LAZY_INC(cnt.v_intr); + PCPU_INC(cnt.v_intr); ie = isrc->is_event; ==== //depot/projects/soc2006/intr_filter/amd64/amd64/io_apic.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.30 2007/05/08 21:29:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.31 2007/06/05 18:57:48 jhb Exp $"); #include "opt_isa.h" @@ -492,7 +492,7 @@ intbase = next_ioapic_base; printf("ioapic%u: Assuming intbase of %d\n", io->io_id, intbase); - } else if (intbase != next_ioapic_base) + } else if (intbase != next_ioapic_base && bootverbose) printf("ioapic%u: WARNING: intbase %d != expected base %d\n", io->io_id, intbase, next_ioapic_base); io->io_intbase = intbase; ==== //depot/projects/soc2006/intr_filter/amd64/amd64/machdep.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.672 2007/05/31 22:52:10 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.675 2007/06/06 07:35:07 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -163,7 +163,13 @@ long Maxmem = 0; long realmem = 0; -#define PHYSMAP_SIZE (2 * 30) +/* + * The number of PHYSMAP entries must be one less than the number of + * PHYSSEG entries because the PHYSMAP entry that spans the largest + * physical address that is accessible by ISA DMA is split into two + * PHYSSEG entries. + */ +#define PHYSMAP_SIZE (2 * (VM_PHYSSEG_MAX - 1)) vm_paddr_t phys_avail[PHYSMAP_SIZE + 2]; vm_paddr_t dump_avail[PHYSMAP_SIZE + 2]; @@ -460,9 +466,9 @@ #ifdef SMP /* Schedule ourselves on the indicated cpu. */ - mtx_lock_spin(&sched_lock); + thread_lock(curthread); sched_bind(curthread, cpu_id); - mtx_unlock_spin(&sched_lock); + thread_unlock(curthread); #endif /* Calibrate by measuring a short delay. */ @@ -473,9 +479,9 @@ intr_restore(reg); #ifdef SMP - mtx_lock_spin(&sched_lock); + thread_lock(curthread); sched_unbind(curthread); - mtx_unlock_spin(&sched_lock); + thread_unlock(curthread); #endif /* @@ -1173,7 +1179,6 @@ PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); - PCPU_SET(curtid, thread0.td_tid); PCPU_SET(tssp, &common_tss[0]); /* ==== //depot/projects/soc2006/intr_filter/amd64/amd64/mp_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.285 2007/05/19 05:03:59 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.286 2007/06/04 23:56:07 jeff Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -46,6 +46,7 @@ #include #include #include +#include #include #include @@ -590,26 +591,8 @@ while (smp_started == 0) ia32_pause(); - /* ok, now grab sched_lock and enter the scheduler */ - mtx_lock_spin(&sched_lock); + sched_throw(NULL); - /* - * Correct spinlock nesting. The idle thread context that we are - * borrowing was created so that it would start out with a single - * spin lock (sched_lock) held in fork_trampoline(). Since we've - * explicitly acquired locks in this function, the nesting count - * is now 2 rather than 1. Since we are nested, calling - * spinlock_exit() will simply adjust the counts without allowing - * spin lock using code to interrupt us. - */ - spinlock_exit(); - KASSERT(curthread->td_md.md_spinlock_count == 1, ("invalid count")); - - PCPU_SET(switchtime, cpu_ticks()); - PCPU_SET(switchticks, ticks); - - cpu_throw(NULL, choosethread()); /* doesn't return */ - panic("scheduler returned us to %s", __func__); /* NOTREACHED */ } @@ -988,12 +971,12 @@ if (ipi_bitmap & (1 << IPI_PREEMPT)) { struct thread *running_thread = curthread; - mtx_lock_spin(&sched_lock); + thread_lock(running_thread); if (running_thread->td_critnest > 1) running_thread->td_owepreempt = 1; else mi_switch(SW_INVOL | SW_PREEMPT, NULL); - mtx_unlock_spin(&sched_lock); + thread_unlock(running_thread); } /* Nothing to do for AST */ @@ -1177,11 +1160,9 @@ if (mp_ncpus == 1) return; - mtx_lock_spin(&sched_lock); atomic_store_rel_int(&aps_ready, 1); while (smp_started == 0) ia32_pause(); - mtx_unlock_spin(&sched_lock); } SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, release_aps, NULL); ==== //depot/projects/soc2006/intr_filter/amd64/amd64/mp_watchdog.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/mp_watchdog.c,v 1.4 2005/02/28 08:55:53 pjd Exp $ + * $FreeBSD: src/sys/amd64/amd64/mp_watchdog.c,v 1.5 2007/06/04 23:56:33 jeff Exp $ */ #include "opt_mp_watchdog.h" @@ -105,9 +105,7 @@ * locks to make sure. Then reset the timer. */ mtx_lock(&Giant); - mtx_lock_spin(&sched_lock); watchdog_timer = WATCHDOG_THRESHOLD; - mtx_unlock_spin(&sched_lock); mtx_unlock(&Giant); callout_reset(&watchdog_callout, 1 * hz, watchdog_function, NULL); } @@ -156,34 +154,6 @@ sysctl_watchdog, "I", ""); /* - * A badly behaved sysctl that leaks the sched lock when written to. Then - * spin holding it just to make matters worse. This can be used to test the - * effectiveness of the watchdog by generating a fairly hard and nast hang. - * Note that Giant is also held in the current world order when we get here. - */ -static int -sysctl_leak_schedlock(SYSCTL_HANDLER_ARGS) -{ - int error, temp; - - temp = 0; - error = sysctl_handle_int(oidp, &temp, 0, req); - if (error) - return (error); - - if (req->newptr != NULL) { - if (temp) { - printf("Leaking the sched lock...\n"); - mtx_lock_spin(&sched_lock); - while (1); - } - } - return (0); -} -SYSCTL_PROC(_debug, OID_AUTO, leak_schedlock, CTLTYPE_INT|CTLFLAG_RW, 0, 0, - sysctl_leak_schedlock, "IU", ""); - -/* * Drop into the debugger by sending an IPI NMI to the boot processor. */ static void ==== //depot/projects/soc2006/intr_filter/amd64/amd64/trap.c#11 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.316 2007/05/27 19:16:45 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.317 2007/06/04 21:38:44 attilio Exp $"); /* * AMD64 Trap and System call handling @@ -163,7 +163,7 @@ register_t addr = 0; ksiginfo_t ksi; - PCPU_LAZY_INC(cnt.v_trap); + PCPU_INC(cnt.v_trap); type = frame->tf_trapno; #ifdef SMP @@ -737,10 +737,10 @@ ksiginfo_t ksi; /* - * note: PCPU_LAZY_INC() can only be used if we can afford + * note: PCPU_INC() can only be used if we can afford * occassional inaccuracy in the count. */ - PCPU_LAZY_INC(cnt.v_syscall); + PCPU_INC(cnt.v_syscall); #ifdef DIAGNOSTIC if (ISPL(frame->tf_cs) != SEL_UPL) { ==== //depot/projects/soc2006/intr_filter/amd64/amd64/tsc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.207 2007/03/26 18:03:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.208 2007/06/04 18:25:01 dwmalone Exp $"); #include "opt_clock.h" @@ -204,7 +204,7 @@ if (tsc_timecounter.tc_frequency == 0) return (EOPNOTSUPP); freq = tsc_freq; - error = sysctl_handle_int(oidp, &freq, sizeof(freq), req); + error = sysctl_handle_quad(oidp, &freq, 0, req); if (error == 0 && req->newptr != NULL) { tsc_freq = freq; tsc_timecounter.tc_frequency = tsc_freq; @@ -212,8 +212,8 @@ return (error); } -SYSCTL_PROC(_machdep, OID_AUTO, tsc_freq, CTLTYPE_LONG | CTLFLAG_RW, - 0, sizeof(u_int), sysctl_machdep_tsc_freq, "IU", ""); +SYSCTL_PROC(_machdep, OID_AUTO, tsc_freq, CTLTYPE_QUAD | CTLFLAG_RW, + 0, sizeof(u_int), sysctl_machdep_tsc_freq, "QU", ""); static unsigned tsc_get_timecount(struct timecounter *tc) ==== //depot/projects/soc2006/intr_filter/amd64/amd64/vm_machdep.c#5 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.254 2007/04/24 21:17:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.255 2007/06/04 23:57:29 jeff Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -170,7 +170,7 @@ * pcb2->pcb_[fg]sbase: cloned above */ - /* Setup to release sched_lock in fork_exit(). */ + /* Setup to release spin count in fork_exit(). */ td2->td_md.md_spinlock_count = 1; td2->td_md.md_saved_flags = PSL_KERNEL | PSL_I; @@ -304,7 +304,7 @@ * pcb2->pcb_[fg]sbase: cloned above */ - /* Setup to release sched_lock in fork_exit(). */ + /* Setup to release spin count in fork_exit(). */ td->td_md.md_spinlock_count = 1; td->td_md.md_saved_flags = PSL_KERNEL | PSL_I; } ==== //depot/projects/soc2006/intr_filter/amd64/ia32/ia32_syscall.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.17 2006/12/17 06:48:39 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.18 2007/06/04 21:38:45 attilio Exp $"); /* * 386 Trap and System call handling @@ -105,10 +105,10 @@ ksiginfo_t ksi; /* - * note: PCPU_LAZY_INC() can only be used if we can afford + * note: PCPU_INC() can only be used if we can afford * occassional inaccuracy in the count. */ - PCPU_LAZY_INC(cnt.v_syscall); + PCPU_INC(cnt.v_syscall); td->td_pticks = 0; td->td_frame = frame; ==== //depot/projects/soc2006/intr_filter/amd64/include/pcpu.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.47 2007/03/11 05:54:28 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.48 2007/06/04 21:38:45 attilio Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -56,7 +56,8 @@ extern struct pcpu *pcpup; #define PCPU_GET(member) (pcpup->pc_ ## member) -#define PCPU_LAZY_INC(member) (++pcpup->pc_ ## member) +#define PCPU_ADD(member, val) (pcpup->pc_ ## member += (val)) +#define PCPU_INC(member) PCPU_ADD(member, 1) #define PCPU_PTR(member) (&pcpup->pc_ ## member) #define PCPU_SET(member, val) (pcpup->pc_ ## member = (val)) @@ -110,10 +111,31 @@ }) /* + * Adds the value to the per-cpu counter name. The implementation + * must be atomic with respect to interrupts. + */ +#define __PCPU_ADD(name, val) do { \ + __pcpu_type(name) __val; \ + struct __s { \ + u_char __b[MIN(sizeof(__pcpu_type(name)), 8)]; \ + } __s; \ + \ + __val = (val); \ + if (sizeof(__val) == 1 || sizeof(__val) == 2 || \ + sizeof(__val) == 4 || sizeof(__val) == 8) { \ + __s = *(struct __s *)(void *)&__val; \ + __asm __volatile("add %1,%%gs:%0" \ + : "=m" (*(struct __s *)(__pcpu_offset(name))) \ + : "r" (__s)); \ + } else \ + *__PCPU_PTR(name) += __val; \ +} while (0) + +/* * Increments the value of the per-cpu counter name. The implementation * must be atomic with respect to interrupts. */ -#define __PCPU_LAZY_INC(name) do { \ +#define __PCPU_INC(name) do { \ CTASSERT(sizeof(__pcpu_type(name)) == 1 || \ sizeof(__pcpu_type(name)) == 2 || \ sizeof(__pcpu_type(name)) == 4 || \ @@ -159,7 +181,8 @@ } #define PCPU_GET(member) __PCPU_GET(pc_ ## member) -#define PCPU_LAZY_INC(member) __PCPU_LAZY_INC(pc_ ## member) +#define PCPU_ADD(member, val) __PCPU_ADD(pc_ ## member, val) +#define PCPU_INC(member) __PCPU_INC(pc_ ## member) #define PCPU_PTR(member) __PCPU_PTR(pc_ ## member) #define PCPU_SET(member, val) __PCPU_SET(pc_ ## member, val) ==== //depot/projects/soc2006/intr_filter/amd64/include/vmparam.h#4 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.47 2007/05/05 19:50:26 alc Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.48 2007/06/03 23:18:29 alc Exp $ */ @@ -93,6 +93,44 @@ #define VM_PHYSSEG_DENSE /* + * The number of PHYSSEG entries must be one greater than the number + * of phys_avail entries because the phys_avail entry that spans the + * largest physical address that is accessible by ISA DMA is split + * into two PHYSSEG entries. + */ +#define VM_PHYSSEG_MAX 31 + +/* + * Create two free page pools: VM_FREEPOOL_DEFAULT is the default pool + * from which physical pages are allocated and VM_FREEPOOL_DIRECT is + * the pool from which physical pages for page tables and small UMA + * objects are allocated. + */ +#define VM_NFREEPOOL 2 +#define VM_FREEPOOL_DEFAULT 0 +#define VM_FREEPOOL_DIRECT 1 + +/* + * Create two free page lists: VM_FREELIST_DEFAULT is for physical + * pages that are above the largest physical address that is + * accessible by ISA DMA and VM_FREELIST_ISADMA is for physical pages + * that are below that address. + */ +#define VM_NFREELIST 2 +#define VM_FREELIST_DEFAULT 0 +#define VM_FREELIST_ISADMA 1 + +/* + * An allocation size of 16MB is supported in order to optimize the + * use of the direct map by UMA. Specifically, a cache line contains + * at most 8 PDEs, collectively mapping 16MB of physical memory. By + * reducing the number of distinct 16MB "pages" that are used by UMA, + * the physical memory allocator reduces the likelihood of both 2MB + * page TLB misses and cache misses caused by 2MB page TLB misses. + */ +#define VM_NFREEORDER 13 + +/* * Virtual addresses of things. Derived from the page directory and * page table indexes from pmap.h for precision. * Because of the page that is both a PD and PT, it looks a little ==== //depot/projects/soc2006/intr_filter/amd64/isa/clock.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.230 2007/02/23 12:18:26 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.231 2007/06/04 18:25:02 dwmalone Exp $"); /* * Routines to handle clock hardware. @@ -839,7 +839,7 @@ * is is too generic. Should use it everywhere. */ freq = timer_freq; - error = sysctl_handle_int(oidp, &freq, sizeof(freq), req); + error = sysctl_handle_int(oidp, &freq, 0, req); if (error == 0 && req->newptr != NULL) set_timer_freq(freq, hz); return (error); ==== //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_machdep.c#13 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.43 2007/05/11 01:25:50 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.44 2007/06/05 00:00:50 jeff Exp $"); #include #include @@ -486,10 +486,10 @@ /* * Make this runnable after we are finished with it. */ - mtx_lock_spin(&sched_lock); + thread_lock(td2); TD_SET_CAN_RUN(td2); sched_add(td2, SRQ_BORING); - mtx_unlock_spin(&sched_lock); + thread_unlock(td2); return (0); } @@ -529,10 +529,10 @@ /* * Make this runnable after we are finished with it. */ - mtx_lock_spin(&sched_lock); + thread_lock(td2); TD_SET_CAN_RUN(td2); sched_add(td2, SRQ_BORING); - mtx_unlock_spin(&sched_lock); + thread_unlock(td2); /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); @@ -715,10 +715,10 @@ /* * Make this runnable after we are finished with it. */ - mtx_lock_spin(&sched_lock); + thread_lock(td2); TD_SET_CAN_RUN(td2); sched_add(td2, SRQ_BORING); - mtx_unlock_spin(&sched_lock); + thread_unlock(td2); td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; ==== //depot/projects/soc2006/intr_filter/arm/arm/intr.c#25 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 6 13:31:47 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9238016A46E; Wed, 6 Jun 2007 13:31:47 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A67DB16A469 for ; Wed, 6 Jun 2007 13:31:46 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from mu-out-0910.google.com (mu-out-0910.google.com [209.85.134.186]) by mx1.freebsd.org (Postfix) with ESMTP id 32C9613C483 for ; Wed, 6 Jun 2007 13:31:45 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: by mu-out-0910.google.com with SMTP id w9so143284mue for ; Wed, 06 Jun 2007 06:31:44 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:reply-to:user-agent:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding:sender; b=kWK8nWHd33+PZtXwHrpZ+7LtV97GcWRbeTUImpuDGsNvoVWhMPNgUf+bJCEAExr9EBTl2rLQiLlJJG0gFjNe/06O1U04ETMuSHPBzVH8MyZnnjT92QcoBM+/FMkEaD7x6dg1PFuCL7xllnuE1LXdqjGjLZizrE/E93JSzymbA9Q= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:reply-to:user-agent:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding:sender; b=a62g07GX9PiRIcBjRGlan4a4aOx+NRYGdhiH4B0uRZL5teDrTTbQ6Td5awxOXOspwUJfVLUlsx7ex2c1hSR/33LEzxLXrgKuMFxVCz5mLLDSFI5TtO8wYbRXRHqwomOUt0AgyHczznJ4cm/XTP49ZuYHVkgjEeNtJbRgVE8Wa7I= Received: by 10.82.182.1 with SMTP id e1mr980463buf.1181136704667; Wed, 06 Jun 2007 06:31:44 -0700 (PDT) Received: from ?172.31.5.25? ( [89.97.252.178]) by mx.google.com with ESMTP id 7sm1071265nfv.2007.06.06.06.31.44; Wed, 06 Jun 2007 06:31:44 -0700 (PDT) Message-ID: <4666B730.9080908@FreeBSD.org> Date: Wed, 06 Jun 2007 15:31:28 +0200 From: Attilio Rao User-Agent: Thunderbird 1.5 (X11/20060526) MIME-Version: 1.0 To: Rui Paulo References: <200706021756.l52Huq9A049371@repoman.freebsd.org> <4661BFD0.1080107@FreeBSD.org> <86myzeq67f.wl%rpaulo@fnop.net> In-Reply-To: <86myzeq67f.wl%rpaulo@fnop.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: Attilio Rao Cc: Perforce Change Reviews , Rui Paulo Subject: Re: PERFORCE change 120788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: attilio@FreeBSD.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2007 13:31:47 -0000 Rui Paulo wrote: > > If I'm not doing something wrong, I need to use spin locks on my > interrupt handler, or else witness_checkorder will complain with > "blockable sleep lock". > > Note that I'm using FILTERs. So you are doing this in the wrong way. In order to use correctly filters, please note that the support for them is compile time choosen, so you need to wrapper all filter specific parts using INTR_FILTER compat macro. You have so to provide an alternative way for !INTR_FILTERS kernel. Respect to locking, the correct thing to do here is: - blocking lock for ithreads - spin lock for fast handlers - spin lock when you need locking inside a filter (it means that you could end in the not ideal case to use a spin lock inside an ithread, in the case the filter decides the ithread needs to run and they need to be synchronized). You would choose a fast handler/filter only handler when the work the handler needs to do is simple and doesn't require too much hardwork, otherwise you would need an ithread/filter + ithread. In the latter case you can use a blocking lock (a mutex or a rwlock) if you just need syncronization of your softc inside the ithread, otherwise, as I previously mentioned, you need a spinlock too here. Attilio From owner-p4-projects@FreeBSD.ORG Wed Jun 6 18:50:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA93916A421; Wed, 6 Jun 2007 18:50:02 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5A28716A41F for ; Wed, 6 Jun 2007 18:50:02 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 44A8713C458 for ; Wed, 6 Jun 2007 18:50:02 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l56Io2oj091938 for ; Wed, 6 Jun 2007 18:50:02 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l56Io1NS091905 for perforce@freebsd.org; Wed, 6 Jun 2007 18:50:01 GMT (envelope-from imp@freebsd.org) Date: Wed, 6 Jun 2007 18:50:01 GMT Message-Id: <200706061850.l56Io1NS091905@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 121093 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2007 18:50:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=121093 Change 121093 by imp@imp_paco-paco on 2007/06/06 18:49:48 IFC @121090 Affected files ... .. //depot/projects/arm/src/contrib/nvi/cl/cl_screen.c#2 integrate .. //depot/projects/arm/src/games/fortune/datfiles/fortunes#13 integrate .. //depot/projects/arm/src/share/man/man4/wlan.4#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/cpu_switch.S#6 integrate .. //depot/projects/arm/src/sys/amd64/amd64/genassym.c#8 integrate .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#24 integrate .. //depot/projects/arm/src/sys/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/arm/src/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/onoe/onoe.c#5 integrate .. //depot/projects/arm/src/sys/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#29 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath_pci.c#8 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athioctl.h#8 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athrate.h#4 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athvar.h#17 integrate .. //depot/projects/arm/src/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/arm/src/sys/dev/firewire/firewirereg.h#6 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwdev.c#7 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwdma.c#3 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwohci.c#6 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwohci_pci.c#9 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/arm/src/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/arm/src/sys/dev/firewire/if_fwevar.h#3 integrate .. //depot/projects/arm/src/sys/dev/firewire/if_fwip.c#6 integrate .. //depot/projects/arm/src/sys/dev/firewire/if_fwipvar.h#3 integrate .. //depot/projects/arm/src/sys/dev/firewire/sbp.c#8 integrate .. //depot/projects/arm/src/sys/dev/firewire/sbp_targ.c#6 integrate .. //depot/projects/arm/src/sys/dev/mii/ciphy.c#6 integrate .. //depot/projects/arm/src/sys/dev/mii/ciphyreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/mii/miidevs#16 integrate .. //depot/projects/arm/src/sys/dev/mii/rlphy.c#8 integrate .. //depot/projects/arm/src/sys/geom/part/g_part.c#5 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/arm/src/sys/i386/i386/genassym.c#8 integrate .. //depot/projects/arm/src/sys/i386/i386/machdep.c#29 integrate .. //depot/projects/arm/src/sys/i386/i386/swtch.s#7 integrate .. //depot/projects/arm/src/sys/ia64/ia64/mp_machdep.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_mutex.c#18 integrate .. //depot/projects/arm/src/sys/kern/kern_umtx.c#18 integrate .. //depot/projects/arm/src/sys/kern/sched_4bsd.c#18 integrate .. //depot/projects/arm/src/sys/kern/sched_ule.c#19 integrate .. //depot/projects/arm/src/sys/net80211/_ieee80211.h#7 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.c#14 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.h#5 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_acl.c#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_crypto.c#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_crypto.h#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_crypto_ccmp.c#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_crypto_none.c#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_crypto_tkip.c#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_crypto_wep.c#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_freebsd.c#8 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_freebsd.h#6 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_input.c#17 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.c#16 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.h#8 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_node.c#16 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_node.h#6 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_output.c#14 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_proto.c#13 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_proto.h#9 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_var.h#15 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_xauth.c#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_carp.c#12 integrate .. //depot/projects/arm/src/sys/pc98/pc98/machdep.c#18 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/vm_machdep.c#7 integrate .. //depot/projects/arm/src/sys/sys/mutex.h#15 integrate .. //depot/projects/arm/src/sys/sys/pcpu.h#8 integrate .. //depot/projects/arm/src/sys/sys/proc.h#26 integrate .. //depot/projects/arm/src/sys/sys/umtx.h#11 integrate .. //depot/projects/arm/src/usr.bin/gzip/gzip.1#4 integrate Differences ... ==== //depot/projects/arm/src/contrib/nvi/cl/cl_screen.c#2 (text+ko) ==== @@ -6,7 +6,7 @@ * * See the LICENSE file for redistribution information. * - * $FreeBSD: src/contrib/nvi/cl/cl_screen.c,v 1.2 2001/11/09 02:23:05 rwatson Exp $ + * $FreeBSD: src/contrib/nvi/cl/cl_screen.c,v 1.4 2007/06/06 11:14:30 rafan Exp $ */ #include "config.h" @@ -25,6 +25,7 @@ #include #include #include +#include #include #include ==== //depot/projects/arm/src/games/fortune/datfiles/fortunes#13 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.239 2007/05/31 20:16:46 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.240 2007/06/06 11:12:56 ceri Exp $ % ======================================================================= @@ -27058,7 +27058,7 @@ have let me in on it by now. I contribute enough to the shule. -- Saul Goodman % -If there was in justice in the world, "trust" would be a four-letter word. +If there was any justice in the world, "trust" would be a four-letter word. % If there were a school for, say, sheet metal workers, that after three years left its graduates as unprepared for their careers as does law ==== //depot/projects/arm/src/share/man/man4/wlan.4#2 (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/wlan.4,v 1.10 2005/11/26 00:47:07 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.11 2007/06/06 07:58:03 kevlo Exp $ .\" .Dd November 26, 2005 .Dt WLAN 4 @@ -48,6 +48,7 @@ .Xr ipw 4 , .Xr iwi 4 , .Xr ral 4 , +.Xr rum 4 , .Xr ural 4 , and .Xr wi 4 @@ -125,6 +126,7 @@ .Xr iwi 4 , .Xr netintro 4 , .Xr ral 4 , +.Xr rum 4 , .Xr ural 4 , .Xr wi 4 , .Xr wlan_acl 4 , ==== //depot/projects/arm/src/sys/amd64/amd64/cpu_switch.S#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.157 2007/06/05 00:16:43 jeff Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.158 2007/06/06 07:35:07 davidxu Exp $ */ #include @@ -203,9 +203,7 @@ movq %rbx, (%rax) movq %rbx, PCPU(RSP0) - movl TD_TID(%rsi), %eax movq %r8, PCPU(CURPCB) - movl %eax, PCPU(CURTID) movq %rsi, PCPU(CURTHREAD) /* into next thread */ testl $PCB_32BIT,PCB_FLAGS(%r8) ==== //depot/projects/arm/src/sys/amd64/amd64/genassym.c#8 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.162 2007/06/05 00:13:49 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.163 2007/06/06 07:35:07 davidxu Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -194,7 +194,6 @@ ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp)); ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0)); -ASSYM(PC_CURTID, offsetof(struct pcpu, pc_curtid)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/arm/src/sys/amd64/amd64/machdep.c#24 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.674 2007/06/05 00:00:49 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.675 2007/06/06 07:35:07 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1179,7 +1179,6 @@ PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); - PCPU_SET(curtid, thread0.td_tid); PCPU_SET(tssp, &common_tss[0]); /* ==== //depot/projects/arm/src/sys/dev/ath/ah_osdep.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/ah_osdep.c,v 1.2 2007/04/10 15:48:45 rwatson Exp $ + * $FreeBSD: src/sys/dev/ath/ah_osdep.c,v 1.3 2007/06/06 15:49:15 sam Exp $ */ #include "opt_ah.h" ==== //depot/projects/arm/src/sys/dev/ath/ah_osdep.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/ah_osdep.h,v 1.1 2006/09/18 16:49:14 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ah_osdep.h,v 1.2 2007/06/06 15:49:15 sam Exp $ */ #ifndef _ATH_AH_OSDEP_H_ #define _ATH_AH_OSDEP_H_ ==== //depot/projects/arm/src/sys/dev/ath/ath_rate/onoe/onoe.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -35,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.12 2006/12/13 19:34:35 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.13 2007/06/06 15:49:16 sam Exp $"); /* * Atsushi Onoe's rate control algorithm. ==== //depot/projects/arm/src/sys/dev/ath/ath_rate/onoe/onoe.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -7,19 +7,12 @@ * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer, - without modification. + * without modification. * 2. Redistributions in binary form must reproduce at minimum a disclaimer * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.h,v 1.2 2004/12/31 22:41:45 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.h,v 1.3 2007/06/06 15:49:16 sam Exp $ */ /* ==== //depot/projects/arm/src/sys/dev/ath/if_ath.c#29 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -35,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.169 2007/06/03 02:16:48 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.170 2007/06/06 15:49:15 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. ==== //depot/projects/arm/src/sys/dev/ath/if_ath_pci.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -35,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.18 2007/02/23 12:18:33 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.19 2007/06/06 15:49:15 sam Exp $"); /* * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver. ==== //depot/projects/arm/src/sys/dev/ath/if_athioctl.h#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.17 2006/08/10 16:31:37 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.18 2007/06/06 15:49:15 sam Exp $ */ /* ==== //depot/projects/arm/src/sys/dev/ath/if_athrate.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2004-2007 Sam Leffler, Errno Consulting * Copyright (c) 2004 Video54 Technologies, Inc. * All rights reserved. * @@ -8,19 +8,12 @@ * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer, - without modification. + * without modification. * 2. Redistributions in binary form must reproduce at minimum a disclaimer * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -34,7 +27,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athrate.h,v 1.5 2006/12/13 19:34:34 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athrate.h,v 1.6 2007/06/06 15:49:15 sam Exp $ */ #ifndef _ATH_RATECTRL_H_ #define _ATH_RATECTRL_H_ ==== //depot/projects/arm/src/sys/dev/ath/if_athvar.h#17 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.60 2007/03/05 21:56:33 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.61 2007/06/06 15:49:15 sam Exp $ */ /* ==== //depot/projects/arm/src/sys/dev/firewire/firewire.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.94 2007/05/21 12:17:54 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.95 2007/06/06 14:31:36 simokawa Exp $ * */ @@ -46,6 +46,8 @@ #include #include +#include + #if defined(__DragonFly__) || __FreeBSD_version < 500000 #include /* for DELAY() */ #endif @@ -95,6 +97,7 @@ static int firewire_attach (device_t); static int firewire_detach (device_t); static int firewire_resume (device_t); +static void firewire_xfer_timeout(void *, int); #if 0 static int firewire_shutdown (device_t); #endif @@ -110,6 +113,7 @@ static void fw_vmaccess (struct fw_xfer *); #endif static int fw_bmr (struct firewire_comm *); +static void fw_dump_hdr(struct fw_pkt *, char *); static device_method_t firewire_methods[] = { /* Device interface */ @@ -178,9 +182,11 @@ int s; s = splfw(); + FW_GLOCK(fc); STAILQ_FOREACH(fwdev, &fc->devices, link) if (FW_EUI64_EQUAL(fwdev->eui, *eui)) break; + FW_GUNLOCK(fc); splx(s); if(fwdev == NULL) return NULL; @@ -196,7 +202,7 @@ { int err = 0; struct fw_xferq *xferq; - int tl = -1, len; + int len; struct fw_pkt *fp; int tcode; struct tcode_info *info; @@ -242,16 +248,15 @@ if(!(xferq->queued < xferq->maxq)){ device_printf(fc->bdev, "Discard a packet (queued=%d)\n", xferq->queued); - return EINVAL; + return EAGAIN; } + xfer->tl = -1; if (info->flag & FWTI_TLABEL) { - if ((tl = fw_get_tlabel(fc, xfer)) == -1) + if (fw_get_tlabel(fc, xfer) < 0) return EAGAIN; - fp->mode.hdr.tlrt = tl << 2; } - xfer->tl = tl; xfer->resp = 0; xfer->fc = fc; xfer->q = xferq; @@ -263,11 +268,32 @@ * Wakeup blocked process. */ void -fw_asy_callback(struct fw_xfer *xfer){ +fw_xferwake(struct fw_xfer *xfer) +{ + struct mtx *lock = &xfer->fc->wait_lock; + + mtx_lock(lock); + xfer->flag |= FWXF_WAKE; + mtx_unlock(lock); + wakeup(xfer); return; } +int +fw_xferwait(struct fw_xfer *xfer) +{ + struct mtx *lock = &xfer->fc->wait_lock; + int err = 0; + + mtx_lock(lock); + if ((xfer->flag & FWXF_WAKE) == 0) + err = msleep((void *)xfer, lock, PWAIT|PCATCH, "fw_xferwait", 0); + mtx_unlock(lock); + + return (err); +} + /* * Async. request with given xfer structure. */ @@ -279,17 +305,22 @@ #if 0 /* XXX allow bus explore packets only after bus rest */ if (fc->status < FWBUSEXPLORE) { xfer->resp = EAGAIN; - xfer->state = FWXF_BUSY; + xfer->flag = FWXF_BUSY; if (xfer->hand != NULL) xfer->hand(xfer); return; } #endif + s = splfw(); + /* Protect from interrupt/timeout */ + FW_GLOCK(fc); microtime(&xfer->tv); - s = splfw(); - xfer->state = FWXF_INQ; + xfer->flag = FWXF_INQ; STAILQ_INSERT_TAIL(&xfer->q->q, xfer, link); +#if 0 xfer->q->queued ++; +#endif + FW_GUNLOCK(fc); splx(s); /* XXX just queue for mbuf */ if (xfer->mbuf == NULL) @@ -311,11 +342,13 @@ } static void -firewire_xfer_timeout(struct firewire_comm *fc) +firewire_xfer_timeout(void *arg, int pending) { - struct fw_xfer *xfer; + struct firewire_comm *fc = (struct firewire_comm *)arg; + struct fw_xfer *xfer, *txfer; struct timeval tv; struct timeval split_timeout; + STAILQ_HEAD(, fw_xfer) xfer_timeout; int i, s; split_timeout.tv_sec = 0; @@ -323,32 +356,41 @@ microtime(&tv); timevalsub(&tv, &split_timeout); + STAILQ_INIT(&xfer_timeout); s = splfw(); + FW_GLOCK(fc); for (i = 0; i < 0x40; i ++) { while ((xfer = STAILQ_FIRST(&fc->tlabels[i])) != NULL) { if (timevalcmp(&xfer->tv, &tv, >)) /* the rests are newer than this */ break; - if (xfer->state == FWXF_START) + if ((xfer->flag & FWXF_SENT) == 0) /* not sent yet */ break; device_printf(fc->bdev, - "split transaction timeout dst=0x%x tl=0x%x state=%d\n", - xfer->send.hdr.mode.hdr.dst, i, xfer->state); + "split transaction timeout: " + "tl=0x%x flag=0x%02x\n", i, xfer->flag); + fw_dump_hdr(&xfer->send.hdr, "send"); xfer->resp = ETIMEDOUT; - fw_xfer_done(xfer); + STAILQ_REMOVE_HEAD(&fc->tlabels[i], tlabel); + STAILQ_INSERT_TAIL(&xfer_timeout, xfer, tlabel); } } + FW_GUNLOCK(fc); splx(s); + fc->timeout(fc); + + STAILQ_FOREACH_SAFE(xfer, &xfer_timeout, tlabel, txfer) + xfer->hand(xfer); } -#define WATCHDOC_HZ 10 +#define WATCHDOG_HZ 10 static void firewire_watchdog(void *arg) { struct firewire_comm *fc; - static int watchdoc_clock = 0; + static int watchdog_clock = 0; fc = (struct firewire_comm *)arg; @@ -357,13 +399,12 @@ * We encounter a timeout easily. To avoid this, * ignore clock interrupt for a while. */ - if (watchdoc_clock > WATCHDOC_HZ * 15) { - firewire_xfer_timeout(fc); - fc->timeout(fc); - } else - watchdoc_clock ++; + if (watchdog_clock > WATCHDOG_HZ * 15) + taskqueue_enqueue(fc->taskqueue, &fc->task_timeout); + else + watchdog_clock ++; - callout_reset(&fc->timeout_callout, hz / WATCHDOC_HZ, + callout_reset(&fc->timeout_callout, hz / WATCHDOG_HZ, (void *)firewire_watchdog, (void *)fc); } @@ -377,7 +418,6 @@ struct firewire_softc *sc = device_get_softc(dev); device_t pa = device_get_parent(dev); struct firewire_comm *fc; - struct proc *p; fc = (struct firewire_comm *)device_get_softc(pa); sc->fc = fc; @@ -388,15 +428,17 @@ fwdev_makedev(sc); - CALLOUT_INIT(&sc->fc->timeout_callout); - CALLOUT_INIT(&sc->fc->bmr_callout); - CALLOUT_INIT(&sc->fc->busprobe_callout); + mtx_init(&fc->wait_lock, "fwwait", NULL, MTX_DEF); + CALLOUT_INIT(&fc->timeout_callout); + CALLOUT_INIT(&fc->bmr_callout); + CALLOUT_INIT(&fc->busprobe_callout); + TASK_INIT(&fc->task_timeout, 0, firewire_xfer_timeout, (void *)fc); callout_reset(&sc->fc->timeout_callout, hz, (void *)firewire_watchdog, (void *)sc->fc); /* create thread */ - kthread_create(fw_bus_probe_thread, (void *)fc, &p, + kthread_create(fw_bus_probe_thread, (void *)fc, &fc->probe_thread, 0, 0, "fw%d_probe", unit); /* Locate our children */ @@ -457,7 +499,12 @@ sc = (struct firewire_softc *)device_get_softc(dev); fc = sc->fc; + mtx_lock(&fc->wait_lock); fc->status = FWBUSDETACH; + wakeup(fc); + if (msleep(fc->probe_thread, &fc->wait_lock, PWAIT, "fwthr", hz * 60)) + printf("firewire probe thread didn't die\n"); + mtx_unlock(&fc->wait_lock); if ((err = fwdev_destroydev(sc)) != 0) return err; @@ -479,10 +526,7 @@ free(fc->speed_map, M_FW); free(fc->crom_src_buf, M_FW); - wakeup(fc); - if (tsleep(fc, PWAIT, "fwthr", hz * 60)) - printf("firewire task thread didn't die\n"); - + mtx_destroy(&fc->wait_lock); return(0); } #if 0 @@ -501,9 +545,11 @@ while ((xfer = STAILQ_FIRST(&xferq->q)) != NULL) { STAILQ_REMOVE_HEAD(&xferq->q, link); +#if 0 xferq->queued --; +#endif xfer->resp = EAGAIN; - xfer->state = FWXF_SENTERR; + xfer->flag = FWXF_SENTERR; fw_xfer_done(xfer); } } @@ -511,12 +557,30 @@ void fw_drain_txq(struct firewire_comm *fc) { + struct fw_xfer *xfer, *txfer; + STAILQ_HEAD(, fw_xfer) xfer_drain; int i; + STAILQ_INIT(&xfer_drain); + + FW_GLOCK(fc); fw_xferq_drain(fc->atq); fw_xferq_drain(fc->ats); for(i = 0; i < fc->nisodma; i++) fw_xferq_drain(fc->it[i]); + + for (i = 0; i < 0x40; i ++) + while ((xfer = STAILQ_FIRST(&fc->tlabels[i])) != NULL) { + if (firewire_debug) + printf("tl=%d flag=%d\n", i, xfer->flag); + xfer->resp = EAGAIN; + STAILQ_REMOVE_HEAD(&fc->tlabels[i], tlabel); + STAILQ_INSERT_TAIL(&xfer_drain, xfer, tlabel); + } + FW_GUNLOCK(fc); + + STAILQ_FOREACH_SAFE(xfer, &xfer_drain, tlabel, txfer) + xfer->hand(xfer); } static void @@ -802,13 +866,17 @@ fw_bindlookup(struct firewire_comm *fc, uint16_t dest_hi, uint32_t dest_lo) { u_int64_t addr; - struct fw_bind *tfw; + struct fw_bind *tfw, *r = NULL; addr = ((u_int64_t)dest_hi << 32) | dest_lo; + FW_GLOCK(fc); STAILQ_FOREACH(tfw, &fc->binds, fclist) - if (BIND_CMP(addr, tfw) == 0) - return(tfw); - return(NULL); + if (BIND_CMP(addr, tfw) == 0) { + r = tfw; + break; + } + FW_GUNLOCK(fc); + return(r); } /* @@ -818,28 +886,29 @@ fw_bindadd(struct firewire_comm *fc, struct fw_bind *fwb) { struct fw_bind *tfw, *prev = NULL; + int r = 0; if (fwb->start > fwb->end) { printf("%s: invalid range\n", __func__); return EINVAL; } + FW_GLOCK(fc); STAILQ_FOREACH(tfw, &fc->binds, fclist) { if (fwb->end < tfw->start) break; prev = tfw; } - if (prev == NULL) { + if (prev == NULL) STAILQ_INSERT_HEAD(&fc->binds, fwb, fclist); - return (0); - } - if (prev->end < fwb->start) { + else if (prev->end < fwb->start) STAILQ_INSERT_AFTER(&fc->binds, prev, fwb, fclist); - return (0); + else { + printf("%s: bind failed\n", __func__); + r = EBUSY; } - - printf("%s: bind failed\n", __func__); - return (EBUSY); + FW_GUNLOCK(fc); + return (r); } /* @@ -855,6 +924,7 @@ int s; s = splfw(); + FW_GLOCK(fc); STAILQ_FOREACH(tfw, &fc->binds, fclist) if (tfw == fwb) { STAILQ_REMOVE(&fc->binds, fwb, fw_bind, fclist); @@ -862,6 +932,7 @@ } printf("%s: no such binding\n", __func__); + FW_GUNLOCK(fc); splx(s); return (1); found: @@ -873,6 +944,7 @@ } STAILQ_INIT(&fwb->xferlist); #endif + FW_GUNLOCK(fc); splx(s); return 0; @@ -911,6 +983,19 @@ } STAILQ_INIT(q); } +/* + * dump packet header + */ +static void +fw_dump_hdr(struct fw_pkt *fp, char *prefix) +{ + printf("%s: dst=0x%02x tl=0x%02x rt=%d tcode=0x%x pri=0x%x " + "src=0x%03x\n", prefix, + fp->mode.hdr.dst & 0x3f, + fp->mode.hdr.tlrt >> 2, fp->mode.hdr.tlrt & 3, + fp->mode.hdr.tcode, fp->mode.hdr.pri, + fp->mode.hdr.src); +} /* * To free transaction label. @@ -925,19 +1010,26 @@ return; s = splfw(); + FW_GLOCK(fc); #if 1 /* make sure the label is allocated */ STAILQ_FOREACH(txfer, &fc->tlabels[xfer->tl], tlabel) if(txfer == xfer) break; if (txfer == NULL) { - printf("%s: the xfer is not in the tlabel(%d)\n", - __FUNCTION__, xfer->tl); + printf("%s: the xfer is not in the queue " + "(tlabel=%d, flag=0x%x)\n", + __FUNCTION__, xfer->tl, xfer->flag); + fw_dump_hdr(&xfer->send.hdr, "send"); + fw_dump_hdr(&xfer->recv.hdr, "recv"); + kdb_backtrace(); + FW_GUNLOCK(fc); splx(s); return; } #endif STAILQ_REMOVE(&fc->tlabels[xfer->tl], xfer, fw_xfer, tlabel); + FW_GUNLOCK(fc); splx(s); return; } @@ -946,18 +1038,33 @@ * To obtain XFER structure by transaction label. */ static struct fw_xfer * -fw_tl2xfer(struct firewire_comm *fc, int node, int tlabel) +fw_tl2xfer(struct firewire_comm *fc, int node, int tlabel, int tcode) { struct fw_xfer *xfer; int s = splfw(); + int req; + FW_GLOCK(fc); STAILQ_FOREACH(xfer, &fc->tlabels[tlabel], tlabel) if(xfer->send.hdr.mode.hdr.dst == node) { + FW_GUNLOCK(fc); splx(s); + KASSERT(xfer->tl == tlabel, + ("xfer->tl 0x%x != 0x%x", xfer->tl, tlabel)); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 6 19:17:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5F5B16A46D; Wed, 6 Jun 2007 19:17:37 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 ACA5416A468 for ; Wed, 6 Jun 2007 19:17:37 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 93C0913C4B8 for ; Wed, 6 Jun 2007 19:17:37 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l56JHbqx019177 for ; Wed, 6 Jun 2007 19:17:37 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l56JHbhv019163 for perforce@freebsd.org; Wed, 6 Jun 2007 19:17:37 GMT (envelope-from imp@freebsd.org) Date: Wed, 6 Jun 2007 19:17:37 GMT Message-Id: <200706061917.l56JHbhv019163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 121095 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2007 19:17:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=121095 Change 121095 by imp@imp_paco-paco on 2007/06/06 19:16:58 IFC me harder... Affected files ... .. //depot/projects/arm/src/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/arm/src/sys/arm/conf/KB920X.hints#3 integrate .. //depot/projects/arm/src/sys/dev/iicbus/icee.c#10 integrate Differences ... ==== //depot/projects/arm/src/sys/arm/conf/AVILA.hints#2 (text+ko) ==== @@ -1,9 +1,31 @@ -# $FreeBSD$ +# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.2 2007/05/29 18:10:42 jhay Exp $ # Dallas Semiconductor DS1672 RTC sitting on the I2C bus hint.ds1672.0.at="iicbus0" hint.ds1672.0.addr=0xd0 -# Analog Devices AD7418 chip sitting on the I2C bus +# DBGU is unit 0 +hint.uart.0.at="ixp0" +hint.uart.0.addr=0xc8000000 +hint.uart.0.irq=15 +hint.uart.0.flags=0x10 +# USART0 is unit 1 +hint.uart.1.at="ixp0" +hint.uart.1.addr=0xc8001000 +hint.uart.1.irq=13 + +# NPE Hardware Queue Manager +hint.ixpqmgr.0.at="ixp0" +# NPE wireless NIC's, requires ixpqmgr +hint.npe.0.at="ixp0" +hint.npe.1.at="ixp0" + +# CF IDE controller +hint.ata_avila.0.at="ixp0" + +# LED connected to gpio +hint.led_avila.0.at="ixp0" + +# Analog Devices AD7418 temperature sensor hint.ad7418.0.at="iicbus0" hint.ad7418.0.addr=0x50 ==== //depot/projects/arm/src/sys/arm/conf/KB920X.hints#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/dev/iicbus/icee.c#10 (text+ko) ==== @@ -23,7 +23,8 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/dev/iicbus/icee.c,v 1.2 2007/04/17 05:48:35 imp Exp $"); + /* * Generic IIC eeprom support, modeled after the AT24C family of products. */ @@ -59,10 +60,10 @@ int wr_sz; /* What's the write page size */ }; -#define ICEE_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx) -#define ICEE_UNLOCK(_sc) mtx_unlock_spin(&(_sc)->sc_mtx) +#define ICEE_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) +#define ICEE_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) #define ICEE_LOCK_INIT(_sc) \ - mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->sc_dev), "icee", MTX_SPIN) + mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->sc_dev), "icee", MTX_DEF) #define ICEE_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); #define ICEE_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); #define ICEE_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); From owner-p4-projects@FreeBSD.ORG Wed Jun 6 22:47:35 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D859416A46F; Wed, 6 Jun 2007 22:47:34 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7C44016A421 for ; Wed, 6 Jun 2007 22:47:34 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 691E513C43E for ; Wed, 6 Jun 2007 22:47:34 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l56MlYFn039706 for ; Wed, 6 Jun 2007 22:47:34 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l56MlTqo039641 for perforce@freebsd.org; Wed, 6 Jun 2007 22:47:29 GMT (envelope-from peter@freebsd.org) Date: Wed, 6 Jun 2007 22:47:29 GMT Message-Id: <200706062247.l56MlTqo039641@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 121108 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2007 22:47:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=121108 Change 121108 by peter@peter_overcee on 2007/06/06 22:46:37 IFC @121107 Affected files ... .. //depot/projects/hammer/contrib/bind9/lib/isc/arm/include/isc/atomic.h#1 branch .. //depot/projects/hammer/contrib/nvi/cl/cl_screen.c#2 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#67 integrate .. //depot/projects/hammer/lib/bind/config.mk#10 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.3#13 integrate .. //depot/projects/hammer/share/man/man4/axe.4#12 integrate .. //depot/projects/hammer/share/man/man4/wlan.4#9 integrate .. //depot/projects/hammer/share/man/man9/condvar.9#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#40 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#46 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#160 integrate .. //depot/projects/hammer/sys/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#12 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.h#3 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#51 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#17 integrate .. //depot/projects/hammer/sys/dev/ath/if_athioctl.h#14 integrate .. //depot/projects/hammer/sys/dev/ath/if_athrate.h#5 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#27 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#36 integrate .. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#22 integrate .. //depot/projects/hammer/sys/dev/firewire/fwdev.c#22 integrate .. //depot/projects/hammer/sys/dev/firewire/fwdma.c#9 integrate .. //depot/projects/hammer/sys/dev/firewire/fwmem.c#19 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#31 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#38 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohcivar.h#11 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#27 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwevar.h#6 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwip.c#13 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwipvar.h#4 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#39 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp_targ.c#11 integrate .. //depot/projects/hammer/sys/dev/mii/ciphy.c#6 integrate .. //depot/projects/hammer/sys/dev/mii/ciphyreg.h#3 integrate .. //depot/projects/hammer/sys/dev/mii/miidevs#17 integrate .. //depot/projects/hammer/sys/dev/mii/rlphy.c#14 integrate .. //depot/projects/hammer/sys/dev/puc/puc.c#24 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/ac97.c#26 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#78 integrate .. //depot/projects/hammer/sys/geom/part/g_part.c#4 integrate .. //depot/projects/hammer/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/hammer/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/genassym.c#19 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#77 integrate .. //depot/projects/hammer/sys/i386/i386/swtch.s#17 integrate .. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#46 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#27 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#47 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#76 integrate .. //depot/projects/hammer/sys/net80211/_ieee80211.h#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#28 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.h#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_acl.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.c#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.h#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_ccmp.c#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_none.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_tkip.c#7 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_wep.c#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#36 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#32 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#16 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#39 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#21 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#27 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#27 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#16 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#28 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_xauth.c#3 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#23 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.c#5 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#8 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#42 integrate .. //depot/projects/hammer/sys/pc98/pc98/machdep.c#18 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#29 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhc.c#10 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#31 integrate .. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#25 integrate .. //depot/projects/hammer/sys/sys/mutex.h#29 integrate .. //depot/projects/hammer/sys/sys/pcpu.h#12 integrate .. //depot/projects/hammer/sys/sys/proc.h#104 integrate .. //depot/projects/hammer/sys/sys/umtx.h#15 integrate .. //depot/projects/hammer/usr.bin/gzip/gzip.1#4 integrate .. //depot/projects/hammer/usr.sbin/boot0cfg/boot0cfg.8#11 integrate Differences ... ==== //depot/projects/hammer/contrib/nvi/cl/cl_screen.c#2 (text+ko) ==== @@ -6,7 +6,7 @@ * * See the LICENSE file for redistribution information. * - * $FreeBSD: src/contrib/nvi/cl/cl_screen.c,v 1.2 2001/11/09 02:23:05 rwatson Exp $ + * $FreeBSD: src/contrib/nvi/cl/cl_screen.c,v 1.4 2007/06/06 11:14:30 rafan Exp $ */ #include "config.h" @@ -25,6 +25,7 @@ #include #include #include +#include #include #include ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#67 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.239 2007/05/31 20:16:46 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.240 2007/06/06 11:12:56 ceri Exp $ % ======================================================================= @@ -27058,7 +27058,7 @@ have let me in on it by now. I contribute enough to the shule. -- Saul Goodman % -If there was in justice in the world, "trust" would be a four-letter word. +If there was any justice in the world, "trust" would be a four-letter word. % If there were a school for, say, sheet metal workers, that after three years left its graduates as unprepared for their careers as does law ==== //depot/projects/hammer/lib/bind/config.mk#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/config.mk,v 1.18 2007/06/03 16:49:57 dougb Exp $ +# $FreeBSD: src/lib/bind/config.mk,v 1.19 2007/06/05 22:17:16 dougb Exp $ .include @@ -65,8 +65,6 @@ # Use the right version of the atomic.h file from lib/isc .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" ISC_ATOMIC_ARCH= x86_32 -.elif ${MACHINE_ARCH} == "arm" -ISC_ATOMIC_ARCH= noatomic .else ISC_ATOMIC_ARCH= ${MACHINE_ARCH} .endif ==== //depot/projects/hammer/lib/libc/net/getaddrinfo.3#13 (text+ko) ==== @@ -16,9 +16,9 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.32 2005/06/15 19:04:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.33 2007/06/06 19:24:02 remko Exp $ .\" -.Dd December 20, 2004 +.Dd June 6, 2007 .Dt GETADDRINFO 3 .Os .Sh NAME @@ -119,11 +119,41 @@ .Fa ai_protocol is zero the caller will accept any protocol. .It Fa ai_flags +The .Fa ai_flags -is formed by -.Tn OR Ns 'ing -the following values: +field to which the +.Fa hints +parameter points shall be set to zero +or be the bitwise-inclusive OR of one or more of the values +.Dv AI_ADDRCONFIG , +.Dv AI_ALL , +.Dv AI_CANONNAME , +.Dv AI_NUMERICHOST , +.Dv AI_NUMERICSERV , +.Dv AI_PASSIVE , +and +.Dv AI_V4MAPPED . .Bl -tag -width "AI_CANONNAMEXX" +.It Dv AI_ADDRCONFIG +If the +.Dv AI_ADDRCONFIG +bit is set, IPv4 addresses shall be returned only if +an IPv4 address is configured on the local system, +and IPv6 addresses shall be returned only if +an IPv6 address is configured on the local system. +.It Dv AI_ALL +If the +.Dv AI_ALL +bit is set with the +.Dv AI_V4MAPPED +bit, then +.Fn getaddrinfo +shall return all matching IPv6 and IPv4 addresses. +The +.Dv AI_ALL +bit without the +.Dv AI_V4MAPPED +bit is ignored. .It Dv AI_CANONNAME If the .Dv AI_CANONNAME @@ -142,6 +172,18 @@ .Fa hostname should be treated as a numeric string defining an IPv4 or IPv6 address and no name resolution should be attempted. +.It Dv AI_NUMERICSERV +If the +.Dv AI_NUMERICSERV +bit is set, +then a non-null +.Fa servname +string supplied shall be a numeric port string. +Otherwise, an +.Dv EAI_NONAME +error shall be returned. +This bit shall prevent any type of name resolution service +(for example, NIS+) from being invoked. .It Dv AI_PASSIVE If the .Dv AI_PASSIVE @@ -176,6 +218,25 @@ is the null pointer and .Dv AI_PASSIVE is not set. +.It Dv AI_V4MAPPED +If the +.Dv AI_V4MAPPED +flag is specified along with an +.Fa ai_family +of +.Dv AF_INET6 , +then +.Fn getaddrinfo +shall return IPv4-mapped IPv6 addresses +on finding no matching IPv6 addresses ( +.Fa ai_addrlen +shall be 16). +The +.Dv AI_V4MAPPED +flag shall be ignored unless +.Fa ai_family +equals +.Dv AF_INET6 . .El .El .Pp @@ -428,7 +489,7 @@ The .Fn getaddrinfo function is defined by the -.St -p1003.1g-2000 -draft specification and documented in +.St -p1003.1-2004 +specification and documented in .Dv "RFC 3493" , .Dq Basic Socket Interface Extensions for IPv6 . ==== //depot/projects/hammer/share/man/man4/axe.4#12 (text+ko) ==== @@ -28,9 +28,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/axe.4,v 1.13 2007/05/12 05:59:15 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/axe.4,v 1.14 2007/06/06 19:27:10 remko Exp $ .\" -.Dd May 12, 2007 +.Dd June 6, 2007 .Dt AXE 4 .Os .Sh NAME @@ -134,7 +134,7 @@ .It Buffalo (Melco Inc.) LUA-U2-KTX .It -D-Link DUBE100 +D-Link DUB-E100, revision A .It LinkSys USB200M .It ==== //depot/projects/hammer/share/man/man4/wlan.4#9 (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/wlan.4,v 1.10 2005/11/26 00:47:07 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.11 2007/06/06 07:58:03 kevlo Exp $ .\" .Dd November 26, 2005 .Dt WLAN 4 @@ -48,6 +48,7 @@ .Xr ipw 4 , .Xr iwi 4 , .Xr ral 4 , +.Xr rum 4 , .Xr ural 4 , and .Xr wi 4 @@ -125,6 +126,7 @@ .Xr iwi 4 , .Xr netintro 4 , .Xr ral 4 , +.Xr rum 4 , .Xr ural 4 , .Xr wi 4 , .Xr wlan_acl 4 , ==== //depot/projects/hammer/share/man/man9/condvar.9#9 (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/man9/condvar.9,v 1.19 2007/03/30 18:07:26 julian Exp $ +.\" $FreeBSD: src/share/man/man9/condvar.9,v 1.21 2007/06/05 20:53:18 imp Exp $ .\" -.Dd March 21, 2007 +.Dd June 5, 2007 .Dt CONDVAR 9 .Os .Sh NAME @@ -117,6 +117,12 @@ or .Xr sx 9 lock. +A +.Xr mutex 9 +argument must be initialized with +.Dv MTX_DEF +and not +.Dv MTX_SPIN . A thread must hold .Fa lock before calling ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#40 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.157 2007/06/05 00:16:43 jeff Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.158 2007/06/06 07:35:07 davidxu Exp $ */ #include @@ -203,9 +203,7 @@ movq %rbx, (%rax) movq %rbx, PCPU(RSP0) - movl TD_TID(%rsi), %eax movq %r8, PCPU(CURPCB) - movl %eax, PCPU(CURTID) movq %rsi, PCPU(CURTHREAD) /* into next thread */ testl $PCB_32BIT,PCB_FLAGS(%r8) ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#46 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.162 2007/06/05 00:13:49 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.163 2007/06/06 07:35:07 davidxu Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -194,7 +194,6 @@ ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp)); ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0)); -ASSYM(PC_CURTID, offsetof(struct pcpu, pc_curtid)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#160 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.674 2007/06/05 00:00:49 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.675 2007/06/06 07:35:07 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1179,7 +1179,6 @@ PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); - PCPU_SET(curtid, thread0.td_tid); PCPU_SET(tssp, &common_tss[0]); /* ==== //depot/projects/hammer/sys/dev/ath/ah_osdep.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/ah_osdep.c,v 1.2 2007/04/10 15:48:45 rwatson Exp $ + * $FreeBSD: src/sys/dev/ath/ah_osdep.c,v 1.3 2007/06/06 15:49:15 sam Exp $ */ #include "opt_ah.h" ==== //depot/projects/hammer/sys/dev/ath/ah_osdep.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/ah_osdep.h,v 1.1 2006/09/18 16:49:14 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ah_osdep.h,v 1.2 2007/06/06 15:49:15 sam Exp $ */ #ifndef _ATH_AH_OSDEP_H_ #define _ATH_AH_OSDEP_H_ ==== //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -35,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.12 2006/12/13 19:34:35 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.13 2007/06/06 15:49:16 sam Exp $"); /* * Atsushi Onoe's rate control algorithm. ==== //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -7,19 +7,12 @@ * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer, - without modification. + * without modification. * 2. Redistributions in binary form must reproduce at minimum a disclaimer * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.h,v 1.2 2004/12/31 22:41:45 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.h,v 1.3 2007/06/06 15:49:16 sam Exp $ */ /* ==== //depot/projects/hammer/sys/dev/ath/if_ath.c#51 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -35,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.169 2007/06/03 02:16:48 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.170 2007/06/06 15:49:15 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. ==== //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#17 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -35,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.18 2007/02/23 12:18:33 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.19 2007/06/06 15:49:15 sam Exp $"); /* * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver. ==== //depot/projects/hammer/sys/dev/ath/if_athioctl.h#14 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.17 2006/08/10 16:31:37 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.18 2007/06/06 15:49:15 sam Exp $ */ /* ==== //depot/projects/hammer/sys/dev/ath/if_athrate.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2004-2007 Sam Leffler, Errno Consulting * Copyright (c) 2004 Video54 Technologies, Inc. * All rights reserved. * @@ -8,19 +8,12 @@ * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer, - without modification. + * without modification. * 2. Redistributions in binary form must reproduce at minimum a disclaimer * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -34,7 +27,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athrate.h,v 1.5 2006/12/13 19:34:34 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athrate.h,v 1.6 2007/06/06 15:49:15 sam Exp $ */ #ifndef _ATH_RATECTRL_H_ #define _ATH_RATECTRL_H_ ==== //depot/projects/hammer/sys/dev/ath/if_athvar.h#27 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.60 2007/03/05 21:56:33 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.61 2007/06/06 15:49:15 sam Exp $ */ /* ==== //depot/projects/hammer/sys/dev/firewire/firewire.c#36 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.94 2007/05/21 12:17:54 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.95 2007/06/06 14:31:36 simokawa Exp $ * */ @@ -46,6 +46,8 @@ #include #include +#include + #if defined(__DragonFly__) || __FreeBSD_version < 500000 #include /* for DELAY() */ #endif @@ -95,6 +97,7 @@ static int firewire_attach (device_t); static int firewire_detach (device_t); static int firewire_resume (device_t); +static void firewire_xfer_timeout(void *, int); #if 0 static int firewire_shutdown (device_t); #endif @@ -110,6 +113,7 @@ static void fw_vmaccess (struct fw_xfer *); #endif static int fw_bmr (struct firewire_comm *); +static void fw_dump_hdr(struct fw_pkt *, char *); static device_method_t firewire_methods[] = { /* Device interface */ @@ -178,9 +182,11 @@ int s; s = splfw(); + FW_GLOCK(fc); STAILQ_FOREACH(fwdev, &fc->devices, link) if (FW_EUI64_EQUAL(fwdev->eui, *eui)) break; + FW_GUNLOCK(fc); splx(s); if(fwdev == NULL) return NULL; @@ -196,7 +202,7 @@ { int err = 0; struct fw_xferq *xferq; - int tl = -1, len; + int len; struct fw_pkt *fp; int tcode; struct tcode_info *info; @@ -242,16 +248,15 @@ if(!(xferq->queued < xferq->maxq)){ device_printf(fc->bdev, "Discard a packet (queued=%d)\n", xferq->queued); - return EINVAL; + return EAGAIN; } + xfer->tl = -1; if (info->flag & FWTI_TLABEL) { - if ((tl = fw_get_tlabel(fc, xfer)) == -1) + if (fw_get_tlabel(fc, xfer) < 0) return EAGAIN; - fp->mode.hdr.tlrt = tl << 2; } - xfer->tl = tl; xfer->resp = 0; xfer->fc = fc; xfer->q = xferq; @@ -263,11 +268,32 @@ * Wakeup blocked process. */ void -fw_asy_callback(struct fw_xfer *xfer){ +fw_xferwake(struct fw_xfer *xfer) +{ + struct mtx *lock = &xfer->fc->wait_lock; + + mtx_lock(lock); + xfer->flag |= FWXF_WAKE; + mtx_unlock(lock); + wakeup(xfer); return; } +int +fw_xferwait(struct fw_xfer *xfer) +{ + struct mtx *lock = &xfer->fc->wait_lock; + int err = 0; + + mtx_lock(lock); + if ((xfer->flag & FWXF_WAKE) == 0) + err = msleep((void *)xfer, lock, PWAIT|PCATCH, "fw_xferwait", 0); + mtx_unlock(lock); + + return (err); +} + /* * Async. request with given xfer structure. */ @@ -279,17 +305,22 @@ #if 0 /* XXX allow bus explore packets only after bus rest */ if (fc->status < FWBUSEXPLORE) { xfer->resp = EAGAIN; - xfer->state = FWXF_BUSY; + xfer->flag = FWXF_BUSY; if (xfer->hand != NULL) xfer->hand(xfer); return; } #endif + s = splfw(); + /* Protect from interrupt/timeout */ + FW_GLOCK(fc); microtime(&xfer->tv); - s = splfw(); - xfer->state = FWXF_INQ; + xfer->flag = FWXF_INQ; STAILQ_INSERT_TAIL(&xfer->q->q, xfer, link); +#if 0 xfer->q->queued ++; +#endif + FW_GUNLOCK(fc); splx(s); /* XXX just queue for mbuf */ if (xfer->mbuf == NULL) @@ -311,11 +342,13 @@ } static void -firewire_xfer_timeout(struct firewire_comm *fc) +firewire_xfer_timeout(void *arg, int pending) { - struct fw_xfer *xfer; + struct firewire_comm *fc = (struct firewire_comm *)arg; + struct fw_xfer *xfer, *txfer; struct timeval tv; struct timeval split_timeout; + STAILQ_HEAD(, fw_xfer) xfer_timeout; int i, s; split_timeout.tv_sec = 0; @@ -323,32 +356,41 @@ microtime(&tv); timevalsub(&tv, &split_timeout); + STAILQ_INIT(&xfer_timeout); s = splfw(); + FW_GLOCK(fc); for (i = 0; i < 0x40; i ++) { while ((xfer = STAILQ_FIRST(&fc->tlabels[i])) != NULL) { if (timevalcmp(&xfer->tv, &tv, >)) /* the rests are newer than this */ break; - if (xfer->state == FWXF_START) + if ((xfer->flag & FWXF_SENT) == 0) /* not sent yet */ break; device_printf(fc->bdev, - "split transaction timeout dst=0x%x tl=0x%x state=%d\n", - xfer->send.hdr.mode.hdr.dst, i, xfer->state); + "split transaction timeout: " + "tl=0x%x flag=0x%02x\n", i, xfer->flag); + fw_dump_hdr(&xfer->send.hdr, "send"); xfer->resp = ETIMEDOUT; - fw_xfer_done(xfer); + STAILQ_REMOVE_HEAD(&fc->tlabels[i], tlabel); + STAILQ_INSERT_TAIL(&xfer_timeout, xfer, tlabel); } } + FW_GUNLOCK(fc); splx(s); + fc->timeout(fc); + + STAILQ_FOREACH_SAFE(xfer, &xfer_timeout, tlabel, txfer) + xfer->hand(xfer); } -#define WATCHDOC_HZ 10 +#define WATCHDOG_HZ 10 static void firewire_watchdog(void *arg) { struct firewire_comm *fc; - static int watchdoc_clock = 0; + static int watchdog_clock = 0; fc = (struct firewire_comm *)arg; @@ -357,13 +399,12 @@ * We encounter a timeout easily. To avoid this, * ignore clock interrupt for a while. */ - if (watchdoc_clock > WATCHDOC_HZ * 15) { - firewire_xfer_timeout(fc); - fc->timeout(fc); - } else - watchdoc_clock ++; + if (watchdog_clock > WATCHDOG_HZ * 15) + taskqueue_enqueue(fc->taskqueue, &fc->task_timeout); + else + watchdog_clock ++; - callout_reset(&fc->timeout_callout, hz / WATCHDOC_HZ, + callout_reset(&fc->timeout_callout, hz / WATCHDOG_HZ, (void *)firewire_watchdog, (void *)fc); } @@ -377,7 +418,6 @@ struct firewire_softc *sc = device_get_softc(dev); device_t pa = device_get_parent(dev); struct firewire_comm *fc; - struct proc *p; fc = (struct firewire_comm *)device_get_softc(pa); sc->fc = fc; @@ -388,15 +428,17 @@ fwdev_makedev(sc); - CALLOUT_INIT(&sc->fc->timeout_callout); - CALLOUT_INIT(&sc->fc->bmr_callout); - CALLOUT_INIT(&sc->fc->busprobe_callout); + mtx_init(&fc->wait_lock, "fwwait", NULL, MTX_DEF); + CALLOUT_INIT(&fc->timeout_callout); + CALLOUT_INIT(&fc->bmr_callout); + CALLOUT_INIT(&fc->busprobe_callout); + TASK_INIT(&fc->task_timeout, 0, firewire_xfer_timeout, (void *)fc); callout_reset(&sc->fc->timeout_callout, hz, (void *)firewire_watchdog, (void *)sc->fc); /* create thread */ - kthread_create(fw_bus_probe_thread, (void *)fc, &p, + kthread_create(fw_bus_probe_thread, (void *)fc, &fc->probe_thread, 0, 0, "fw%d_probe", unit); /* Locate our children */ @@ -457,7 +499,12 @@ sc = (struct firewire_softc *)device_get_softc(dev); fc = sc->fc; + mtx_lock(&fc->wait_lock); fc->status = FWBUSDETACH; + wakeup(fc); + if (msleep(fc->probe_thread, &fc->wait_lock, PWAIT, "fwthr", hz * 60)) + printf("firewire probe thread didn't die\n"); + mtx_unlock(&fc->wait_lock); if ((err = fwdev_destroydev(sc)) != 0) return err; @@ -479,10 +526,7 @@ free(fc->speed_map, M_FW); free(fc->crom_src_buf, M_FW); - wakeup(fc); - if (tsleep(fc, PWAIT, "fwthr", hz * 60)) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 6 22:58:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FAE916A46D; Wed, 6 Jun 2007 22:58:49 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 080A616A421 for ; Wed, 6 Jun 2007 22:58:49 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id ED8A213C447 for ; Wed, 6 Jun 2007 22:58:48 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l56MwmSn052394 for ; Wed, 6 Jun 2007 22:58:48 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l56Mwm2k052382 for perforce@freebsd.org; Wed, 6 Jun 2007 22:58:48 GMT (envelope-from raj@freebsd.org) Date: Wed, 6 Jun 2007 22:58:48 GMT Message-Id: <200706062258.l56Mwm2k052382@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 121109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2007 22:58:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=121109 Change 121109 by raj@raj_booke_intgr on 2007/06/06 22:58:41 Fix GENERIC powerpc kernel build - remove obsolete db_memrw.c - add missing declarations and headers Affected files ... .. //depot/projects/e500/sys/conf/files.powerpc#4 edit .. //depot/projects/e500/sys/dev/powermac_nvram/powermac_nvram.c#2 edit .. //depot/projects/e500/sys/powerpc/include/pmap.h#3 edit .. //depot/projects/e500/sys/powerpc/powermac/grackle.c#3 edit .. //depot/projects/e500/sys/powerpc/powermac/uninorth.c#3 edit .. //depot/projects/e500/sys/powerpc/powerpc/db_memrw.c#3 delete .. //depot/projects/e500/sys/powerpc/powerpc/mmu_oea.c#2 edit Differences ... ==== //depot/projects/e500/sys/conf/files.powerpc#4 (text+ko) ==== @@ -109,7 +109,6 @@ powerpc/powerpc/db_disasm.c optional ddb powerpc/powerpc/db_interface.c optional ddb powerpc/powerpc/db_hwwatch.c optional ddb -powerpc/powerpc/db_memrw.c optional ddb powerpc/powerpc/db_trace.c optional ddb powerpc/powerpc/elf_machdep.c standard powerpc/powerpc/fpu.c optional aim ==== //depot/projects/e500/sys/dev/powermac_nvram/powermac_nvram.c#2 (text+ko) ==== @@ -38,6 +38,7 @@ #include #include +#include #include #include #include ==== //depot/projects/e500/sys/powerpc/include/pmap.h#3 (text+ko) ==== @@ -159,7 +159,6 @@ void pmap_deactivate(struct thread *); vm_offset_t pmap_kextract(vm_offset_t); int pmap_dev_direct_mapped(vm_offset_t, vm_size_t); -boolean_t pmap_page_executable(vm_page_t); boolean_t pmap_mmu_install(char *name, int prio); #define vtophys(va) pmap_kextract((vm_offset_t)(va)) ==== //depot/projects/e500/sys/powerpc/powermac/grackle.c#3 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include +#include #include #include #include ==== //depot/projects/e500/sys/powerpc/powermac/uninorth.c#3 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include +#include #include #include #include ==== //depot/projects/e500/sys/powerpc/powerpc/mmu_oea.c#2 (text+ko) ==== @@ -203,6 +203,8 @@ extern struct pmap ofw_pmap; +extern vm_offset_t kstack0; +extern vm_offset_t kstack0_phys; /* From owner-p4-projects@FreeBSD.ORG Thu Jun 7 02:30:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7676716A46B; Thu, 7 Jun 2007 02:30:34 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2B04A16A400 for ; Thu, 7 Jun 2007 02:30:34 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 03B4913C4BA for ; Thu, 7 Jun 2007 02:30:34 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l572UXSn063112 for ; Thu, 7 Jun 2007 02:30:33 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l572UXaq063095 for perforce@freebsd.org; Thu, 7 Jun 2007 02:30:33 GMT (envelope-from peter@freebsd.org) Date: Thu, 7 Jun 2007 02:30:33 GMT Message-Id: <200706070230.l572UXaq063095@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 121117 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2007 02:30:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=121117 Change 121117 by peter@peter_daintree on 2007/06/07 02:29:20 Unbreak the timedia boards after the great puc rewrite. Bad Marcel! No cookie! pci BARs start at 0x10, not 0. Affected files ... .. //depot/projects/hammer/sys/dev/puc/pucdata.c#28 edit Differences ... ==== //depot/projects/hammer/sys/dev/puc/pucdata.c#28 (text+ko) ==== @@ -1110,7 +1110,7 @@ *res = (port == 1 || port == 3) ? 8 : 0; return (0); case PUC_CFG_GET_RID: - *res = (port > 3) ? port - 2 : port >> 1; + *res = 0x10 + ((port > 3) ? port - 2 : port >> 1); return (0); case PUC_CFG_GET_TYPE: *res = PUC_TYPE_SERIAL; From owner-p4-projects@FreeBSD.ORG Thu Jun 7 02:31:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E6E116A46B; Thu, 7 Jun 2007 02:31:36 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C868816A421 for ; Thu, 7 Jun 2007 02:31:35 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B931013C45E for ; Thu, 7 Jun 2007 02:31:35 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l572VZ8f064620 for ; Thu, 7 Jun 2007 02:31:35 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l572VZDD064614 for perforce@freebsd.org; Thu, 7 Jun 2007 02:31:35 GMT (envelope-from peter@freebsd.org) Date: Thu, 7 Jun 2007 02:31:35 GMT Message-Id: <200706070231.l572VZDD064614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 121118 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2007 02:31:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=121118 Change 121118 by peter@peter_daintree on 2007/06/07 02:30:32 Add sysctl_rename_oid() (to support the device tree nodes that renumber themselves during an attach. eg: sio_pci and sio_puc) Affected files ... .. //depot/projects/hammer/sys/kern/kern_sysctl.c#30 edit .. //depot/projects/hammer/sys/sys/sysctl.h#33 edit Differences ... ==== //depot/projects/hammer/sys/kern/kern_sysctl.c#30 (text+ko) ==== @@ -415,6 +415,25 @@ } /* + * Rename an existing oid. + */ +void +sysctl_rename_oid(struct sysctl_oid *oidp, const char *name) +{ + ssize_t len; + char *newname; + void *oldname; + + oldname = (void *)(uintptr_t)(const void *)oidp->oid_name; + len = strlen(name); + newname = malloc(len + 1, M_SYSCTLOID, M_WAITOK); + bcopy(name, newname, len + 1); + newname[len] = '\0'; + oidp->oid_name = newname; + free(oldname, M_SYSCTLOID); +} + +/* * Reparent an existing oid. */ int ==== //depot/projects/hammer/sys/sys/sysctl.h#33 (text+ko) ==== @@ -646,6 +646,7 @@ int kind, void *arg1, int arg2, int (*handler) (SYSCTL_HANDLER_ARGS), const char *fmt, const char *descr); +void sysctl_rename_oid(struct sysctl_oid *oidp, const char *name); int sysctl_move_oid(struct sysctl_oid *oidp, struct sysctl_oid_list *parent); int sysctl_remove_oid(struct sysctl_oid *oidp, int del, int recurse); From owner-p4-projects@FreeBSD.ORG Thu Jun 7 02:31:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B343916A530; Thu, 7 Jun 2007 02:31:36 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 722C316A507 for ; Thu, 7 Jun 2007 02:31:36 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 39F2813C448 for ; Thu, 7 Jun 2007 02:31:36 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l572VaJt064633 for ; Thu, 7 Jun 2007 02:31:36 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l572VZ0C064623 for perforce@freebsd.org; Thu, 7 Jun 2007 02:31:35 GMT (envelope-from peter@freebsd.org) Date: Thu, 7 Jun 2007 02:31:35 GMT Message-Id: <200706070231.l572VZ0C064623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 121119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2007 02:31:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=121119 Change 121119 by peter@peter_daintree on 2007/06/07 02:31:16 After a device has attached, allow for the possibility that it has done a device_set_unit() to rename itself. Recompute the sysctl tree node name that we attach under. Affected files ... .. //depot/projects/hammer/sys/kern/subr_bus.c#53 edit Differences ... ==== //depot/projects/hammer/sys/kern/subr_bus.c#53 (text+ko) ==== @@ -307,6 +307,16 @@ } static void +device_sysctl_update(device_t dev) +{ + devclass_t dc = dev->devclass; + + if (dev->sysctl_tree == NULL) + return; + sysctl_rename_oid(dev->sysctl_tree, dev->nameunit + strlen(dc->name)); +} + +static void device_sysctl_fini(device_t dev) { if (dev->sysctl_tree == NULL) @@ -2387,6 +2397,7 @@ dev->state = DS_NOTPRESENT; return (error); } + device_sysctl_update(dev); dev->state = DS_ATTACHED; devadded(dev); return (0); From owner-p4-projects@FreeBSD.ORG Thu Jun 7 08:10:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E549016A473; Thu, 7 Jun 2007 08:10:33 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B82A716A46E for ; Thu, 7 Jun 2007 08:10:33 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A763D13C45E for ; Thu, 7 Jun 2007 08:10:33 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l578AXca038132 for ; Thu, 7 Jun 2007 08:10:33 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l578AVbU038128 for perforce@freebsd.org; Thu, 7 Jun 2007 08:10:31 GMT (envelope-from piso@freebsd.org) Date: Thu, 7 Jun 2007 08:10:31 GMT Message-Id: <200706070810.l578AVbU038128@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 121132 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2007 08:10:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=121132 Change 121132 by piso@piso_skytech on 2007/06/07 08:09:40 IFC@121131 Affected files ... .. //depot/projects/soc2006/intr_filter/arm/include/pcpu.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_ath.c#17 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_ath_pci.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_athrate.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/ath/if_athvar.h#12 integrate .. //depot/projects/soc2006/intr_filter/dev/bce/if_bce.c#16 integrate .. //depot/projects/soc2006/intr_filter/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/soc2006/intr_filter/dev/de/if_de.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/firewire.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/firewirereg.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/fwdev.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/fwdma.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/fwmem.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/fwohci.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/fwohci_pci.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/if_fwevar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/if_fwip.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/if_fwipvar.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/sbp.c#7 integrate .. //depot/projects/soc2006/intr_filter/dev/firewire/sbp_targ.c#6 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/brgphy.c#11 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/brgphyreg.h#3 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/miidevs#10 integrate .. //depot/projects/soc2006/intr_filter/dev/puc/puc.c#16 integrate .. //depot/projects/soc2006/intr_filter/dev/puc/pucdata.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/usb/uftdi.c#5 integrate .. //depot/projects/soc2006/intr_filter/ia64/ia64/machdep.c#10 integrate .. //depot/projects/soc2006/intr_filter/netinet/ip_carp.c#6 integrate .. //depot/projects/soc2006/intr_filter/netinet/tcp_syncache.c#12 integrate .. //depot/projects/soc2006/intr_filter/pc98/pc98/machdep.c#12 integrate .. //depot/projects/soc2006/intr_filter/sparc64/fhc/fhc.c#11 integrate .. //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#17 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sbus/sbus.c#15 integrate .. //depot/projects/soc2006/intr_filter/sys/param.h#14 integrate Differences ... ==== //depot/projects/soc2006/intr_filter/arm/include/pcpu.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27 - * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.5 2007/06/04 21:38:45 attilio Exp $ + * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.6 2007/06/06 23:23:47 jeff Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -58,7 +58,7 @@ * with respect to preemption. */ #define PCPU_ADD(member, value) (__pcpu.pc_ ## member += (value)) -#define PCPU_INC(member) PCPU_LAZY_ADD(member, 1) +#define PCPU_INC(member) PCPU_ADD(member, 1) #define PCPU_PTR(member) (&__pcpu.pc_ ## member) #define PCPU_SET(member,value) (__pcpu.pc_ ## member = (value)) ==== //depot/projects/soc2006/intr_filter/dev/ath/ah_osdep.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/ah_osdep.c,v 1.2 2007/04/10 15:48:45 rwatson Exp $ + * $FreeBSD: src/sys/dev/ath/ah_osdep.c,v 1.3 2007/06/06 15:49:15 sam Exp $ */ #include "opt_ah.h" ==== //depot/projects/soc2006/intr_filter/dev/ath/ah_osdep.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/ah_osdep.h,v 1.1 2006/09/18 16:49:14 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ah_osdep.h,v 1.2 2007/06/06 15:49:15 sam Exp $ */ #ifndef _ATH_AH_OSDEP_H_ #define _ATH_AH_OSDEP_H_ ==== //depot/projects/soc2006/intr_filter/dev/ath/ath_rate/onoe/onoe.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -35,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.12 2006/12/13 19:34:35 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.13 2007/06/06 15:49:16 sam Exp $"); /* * Atsushi Onoe's rate control algorithm. ==== //depot/projects/soc2006/intr_filter/dev/ath/ath_rate/onoe/onoe.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -7,19 +7,12 @@ * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer, - without modification. + * without modification. * 2. Redistributions in binary form must reproduce at minimum a disclaimer * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.h,v 1.2 2004/12/31 22:41:45 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.h,v 1.3 2007/06/06 15:49:16 sam Exp $ */ /* ==== //depot/projects/soc2006/intr_filter/dev/ath/if_ath.c#17 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -35,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.169 2007/06/03 02:16:48 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.170 2007/06/06 15:49:15 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. ==== //depot/projects/soc2006/intr_filter/dev/ath/if_ath_pci.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -35,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.18 2007/02/23 12:18:33 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.19 2007/06/06 15:49:15 sam Exp $"); /* * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver. ==== //depot/projects/soc2006/intr_filter/dev/ath/if_athioctl.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.17 2006/08/10 16:31:37 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.18 2007/06/06 15:49:15 sam Exp $ */ /* ==== //depot/projects/soc2006/intr_filter/dev/ath/if_athrate.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2004-2007 Sam Leffler, Errno Consulting * Copyright (c) 2004 Video54 Technologies, Inc. * All rights reserved. * @@ -8,19 +8,12 @@ * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer, - without modification. + * without modification. * 2. Redistributions in binary form must reproduce at minimum a disclaimer * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -34,7 +27,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athrate.h,v 1.5 2006/12/13 19:34:34 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athrate.h,v 1.6 2007/06/06 15:49:15 sam Exp $ */ #ifndef _ATH_RATECTRL_H_ #define _ATH_RATECTRL_H_ ==== //depot/projects/soc2006/intr_filter/dev/ath/if_athvar.h#12 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.60 2007/03/05 21:56:33 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.61 2007/06/06 15:49:15 sam Exp $ */ /* ==== //depot/projects/soc2006/intr_filter/dev/bce/if_bce.c#16 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.31 2007/05/16 23:34:11 davidch Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.32 2007/06/07 02:23:56 davidch Exp $"); /* * The following controllers are supported by this driver: @@ -109,7 +109,7 @@ /* BCM5708S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM5708S 1000Base-T" }, + "Broadcom NetXtreme II BCM5708 1000Base-SX" }, { 0, 0, 0, 0, NULL } }; @@ -359,25 +359,25 @@ DRIVER_MODULE(bce, pci, bce_driver, bce_devclass, 0, 0); DRIVER_MODULE(miibus, bce, miibus_driver, miibus_devclass, 0, 0); - - + + /****************************************************************************/ /* Tunable device values */ /****************************************************************************/ -static int bce_tso_enable = TRUE; +static int bce_tso_enable = TRUE; static int bce_msi_enable = 1; - -/* Allowable values are TRUE or FALSE */ -TUNABLE_INT("hw.bce.tso_enable", &bce_tso_enable); + +/* Allowable values are TRUE or FALSE */ +TUNABLE_INT("hw.bce.tso_enable", &bce_tso_enable); /* Allowable values are 0 (IRQ only) and 1 (IRQ or MSI) */ TUNABLE_INT("hw.bce.msi_enable", &bce_msi_enable); -SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD, 0, "bce driver parameters"); -SYSCTL_UINT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0, +SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD, 0, "bce driver parameters"); +SYSCTL_UINT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0, "TSO Enable/Disable"); -SYSCTL_UINT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0, +SYSCTL_UINT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0, "MSI | INTx selector"); - + /****************************************************************************/ /* Device probe function. */ /* */ @@ -468,7 +468,7 @@ DBPRINT(sc, BCE_VERBOSE_RESET, "Entering %s()\n", __FUNCTION__); mbuf = device_get_unit(dev); - + /* Set initial device and PHY flags */ sc->bce_flags = 0; sc->bce_phy_flags = 0; @@ -494,19 +494,19 @@ sc->bce_bhandle = rman_get_bushandle(sc->bce_res_mem); sc->bce_vhandle = (vm_offset_t) rman_get_virtual(sc->bce_res_mem); - /* If MSI is enabled in the driver, get the vector count. */ - count = bce_msi_enable ? pci_msi_count(dev) : 0; - + /* If MSI is enabled in the driver, get the vector count. */ + count = bce_msi_enable ? pci_msi_count(dev) : 0; + /* Allocate PCI IRQ resources. */ if (count == 1 && pci_alloc_msi(dev, &count) == 0 && count == 1) { rid = 1; sc->bce_flags |= BCE_USING_MSI_FLAG; DBPRINT(sc, BCE_INFO, "Allocating %d MSI interrupt(s).\n", count); } else { - rid = 0; + rid = 0; DBPRINT(sc, BCE_INFO, "Allocating IRQ interrupt.\n"); } - + sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE); @@ -632,7 +632,7 @@ /* Initialize the controller. */ if (bce_chipinit(sc)) { BCE_PRINTF("%s(%d): Controller initialization failed!\n", - __FILE__, __LINE__); + __FILE__, __LINE__); rc = ENXIO; goto bce_attach_fail; } @@ -684,25 +684,33 @@ sc->bce_stats_ticks = 1000000 & 0xffff00; /* - * The copper based NetXtreme II controllers - * use an integrated PHY at address 1 while - * the SerDes controllers use a PHY at - * address 2. + * The SerDes based NetXtreme II controllers + * that support 2.5Gb operation (currently + * 5708S) use a PHY at address 2, otherwise + * the PHY is present at address 1. */ sc->bce_phy_addr = 1; if (BCE_CHIP_BOND_ID(sc) & BCE_CHIP_BOND_ID_SERDES_BIT) { sc->bce_phy_flags |= BCE_PHY_SERDES_FLAG; sc->bce_flags |= BCE_NO_WOL_FLAG; - if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5708) { + if (BCE_CHIP_NUM(sc) != BCE_CHIP_NUM_5706) { sc->bce_phy_addr = 2; val = REG_RD_IND(sc, sc->bce_shmem_base + BCE_SHARED_HW_CFG_CONFIG); - if (val & BCE_SHARED_HW_CFG_PHY_2_5G) + if (val & BCE_SHARED_HW_CFG_PHY_2_5G) { sc->bce_phy_flags |= BCE_PHY_2_5G_CAPABLE_FLAG; + DBPRINT(sc, BCE_WARN, "Found 2.5Gb capable adapter\n"); + } } } + /* Store config data needed by the PHY driver for backplane applications */ + sc->bce_shared_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base + + BCE_SHARED_HW_CFG_CONFIG); + sc->bce_port_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base + + BCE_SHARED_HW_CFG_CONFIG); + /* Allocate DMA memory resources. */ if (bce_dma_alloc(dev)) { BCE_PRINTF("%s(%d): DMA resource allocation failed!\n", @@ -728,14 +736,14 @@ ifp->if_start = bce_start; ifp->if_init = bce_init; ifp->if_mtu = ETHERMTU; - - if (bce_tso_enable) { - ifp->if_hwassist = BCE_IF_HWASSIST | CSUM_TSO; + + if (bce_tso_enable) { + ifp->if_hwassist = BCE_IF_HWASSIST | CSUM_TSO; ifp->if_capabilities = BCE_IF_CAPABILITIES | IFCAP_TSO4; - } else { - ifp->if_hwassist = BCE_IF_HWASSIST; - ifp->if_capabilities = BCE_IF_CAPABILITIES; - } + } else { + ifp->if_hwassist = BCE_IF_HWASSIST; + ifp->if_capabilities = BCE_IF_CAPABILITIES; + } ifp->if_capenable = ifp->if_capabilities; @@ -747,9 +755,9 @@ ifp->if_snd.ifq_drv_maxlen = USABLE_TX_BD; if (sc->bce_phy_flags & BCE_PHY_2_5G_CAPABLE_FLAG) - ifp->if_baudrate = IF_Gbps(2.5); + ifp->if_baudrate = IF_Mbps(2500ULL); else - ifp->if_baudrate = IF_Gbps(1); + ifp->if_baudrate = IF_Mbps(1000); IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen); IFQ_SET_READY(&ifp->if_snd); @@ -792,7 +800,7 @@ /* Get the firmware running so IPMI still works */ BCE_LOCK(sc); bce_mgmt_init_locked(sc); - BCE_UNLOCK(sc); + BCE_UNLOCK(sc); goto bce_attach_exit; @@ -1047,7 +1055,7 @@ /* Make sure we are accessing the correct PHY address. */ if (phy != sc->bce_phy_addr) { - DBPRINT(sc, BCE_WARN, "Invalid PHY address %d for PHY write!\n", phy); + DBPRINT(sc, BCE_VERBOSE, "Invalid PHY address %d for PHY write!\n", phy); return(0); } @@ -1111,71 +1119,61 @@ { struct bce_softc *sc; struct mii_data *mii; + int val; sc = device_get_softc(dev); mii = device_get_softc(sc->bce_miibus); - DBPRINT(sc, BCE_INFO, "mii_media_active = 0x%08X\n", - mii->mii_media_active); - -#ifdef BCE_DEBUG - /* Decode the interface media flags. */ - BCE_PRINTF("Media: ( "); - switch(IFM_TYPE(mii->mii_media_active)) { - case IFM_ETHER: printf("Ethernet )"); - break; - default: printf("Unknown )"); - } - - printf(" Media Options: ( "); - switch(IFM_SUBTYPE(mii->mii_media_active)) { - case IFM_AUTO: printf("Autoselect )"); break; - case IFM_MANUAL: printf("Manual )"); break; - case IFM_NONE: printf("None )"); break; - case IFM_10_T: printf("10Base-T )"); break; - case IFM_100_TX: printf("100Base-TX )"); break; - case IFM_1000_SX: printf("1000Base-SX )"); break; - case IFM_1000_T: printf("1000Base-T )"); break; - default: printf("Other )"); - } - - printf(" Global Options: ("); - if (mii->mii_media_active & IFM_FDX) - printf(" FullDuplex"); - if (mii->mii_media_active & IFM_HDX) - printf(" HalfDuplex"); - if (mii->mii_media_active & IFM_LOOP) - printf(" Loopback"); - if (mii->mii_media_active & IFM_FLAG0) - printf(" Flag0"); - if (mii->mii_media_active & IFM_FLAG1) - printf(" Flag1"); - if (mii->mii_media_active & IFM_FLAG2) - printf(" Flag2"); - printf(" )\n"); -#endif - - BCE_CLRBIT(sc, BCE_EMAC_MODE, BCE_EMAC_MODE_PORT); + val = REG_RD(sc, BCE_EMAC_MODE); + val &= ~(BCE_EMAC_MODE_PORT | BCE_EMAC_MODE_HALF_DUPLEX | + BCE_EMAC_MODE_MAC_LOOP | BCE_EMAC_MODE_FORCE_LINK | + BCE_EMAC_MODE_25G); /* Set MII or GMII interface based on the speed negotiated by the PHY. */ - if (IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_T || - IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_SX) { - DBPRINT(sc, BCE_INFO, "Setting GMII interface.\n"); - BCE_SETBIT(sc, BCE_EMAC_MODE, BCE_EMAC_MODE_PORT_GMII); - } else { - DBPRINT(sc, BCE_INFO, "Setting MII interface.\n"); - BCE_SETBIT(sc, BCE_EMAC_MODE, BCE_EMAC_MODE_PORT_MII); + switch (IFM_SUBTYPE(mii->mii_media_active)) { + case IFM_10_T: + if (BCE_CHIP_NUM(sc) != BCE_CHIP_NUM_5706) { + DBPRINT(sc, BCE_INFO, "Enabling 10Mb interface.\n"); + val |= BCE_EMAC_MODE_PORT_MII_10; + break; + } + /* fall-through */ + case IFM_100_TX: + DBPRINT(sc, BCE_INFO, "Enabling MII interface.\n"); + val |= BCE_EMAC_MODE_PORT_MII; + break; + case IFM_2500_SX: + DBPRINT(sc, BCE_INFO, "Enabling 2.5G MAC mode.\n"); + val |= BCE_EMAC_MODE_25G; + /* fall-through */ + case IFM_1000_T: + case IFM_1000_SX: + DBPRINT(sc, BCE_INFO, "Enablinb GMII interface.\n"); + val |= BCE_EMAC_MODE_PORT_GMII; + break; + default: + val |= BCE_EMAC_MODE_PORT_GMII; } /* Set half or full duplex based on the duplicity negotiated by the PHY. */ - if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX) { + if ((mii->mii_media_active & IFM_GMASK) == IFM_HDX) { + DBPRINT(sc, BCE_INFO, "Setting Half-Duplex interface.\n"); + val |= BCE_EMAC_MODE_HALF_DUPLEX; + } else DBPRINT(sc, BCE_INFO, "Setting Full-Duplex interface.\n"); - BCE_CLRBIT(sc, BCE_EMAC_MODE, BCE_EMAC_MODE_HALF_DUPLEX); - } else { - DBPRINT(sc, BCE_INFO, "Setting Half-Duplex interface.\n"); - BCE_SETBIT(sc, BCE_EMAC_MODE, BCE_EMAC_MODE_HALF_DUPLEX); - } + + REG_WR(sc, BCE_EMAC_MODE, val); + +#if 0 + /* Todo: Enable this support in brgphy and bge. */ + /* FLAG0 is set if RX is enabled and FLAG1 if TX is enabled */ + if (mii->mii_media_active & IFM_FLAG0) + BCE_SETBIT(sc, BCE_EMAC_RX_MODE, BCE_EMAC_RX_MODE_FLOW_EN); + if (mii->mii_media_active & IFM_FLAG1) + BCE_SETBIT(sc, BCE_EMAC_RX_MODE, BCE_EMAC_TX_MODE_FLOW_EN); +#endif + } @@ -2210,9 +2208,9 @@ { struct bce_softc *sc; int i, error, rc = 0; - bus_addr_t busaddr; - bus_size_t max_size, max_seg_size; - int max_segments; + bus_addr_t busaddr; + bus_size_t max_size, max_seg_size; + int max_segments; sc = device_get_softc(dev); @@ -2404,17 +2402,17 @@ DBPRINT(sc, BCE_INFO, "tx_bd_chain_paddr[%d] = 0x%08X\n", i, (u32) sc->tx_bd_chain_paddr[i]); } - - /* Check the required size before mapping to conserve resources. */ - if (bce_tso_enable) { - max_size = BCE_TSO_MAX_SIZE; - max_segments = BCE_MAX_SEGMENTS; - max_seg_size = BCE_TSO_MAX_SEG_SIZE; - } else { - max_size = MCLBYTES * BCE_MAX_SEGMENTS; - max_segments = BCE_MAX_SEGMENTS; - max_seg_size = MCLBYTES; - } + + /* Check the required size before mapping to conserve resources. */ + if (bce_tso_enable) { + max_size = BCE_TSO_MAX_SIZE; + max_segments = BCE_MAX_SEGMENTS; + max_seg_size = BCE_TSO_MAX_SEG_SIZE; + } else { + max_size = MCLBYTES * BCE_MAX_SEGMENTS; + max_segments = BCE_MAX_SEGMENTS; + max_seg_size = MCLBYTES; + } /* Create a DMA tag for TX mbufs. */ if (bus_dma_tag_create(sc->parent_tag, @@ -2425,7 +2423,7 @@ NULL, NULL, max_size, max_segments, - max_seg_size, + max_seg_size, 0, NULL, NULL, &sc->tx_mbuf_tag)) { @@ -2562,31 +2560,31 @@ dev = sc->bce_dev; bce_dma_free(sc); - - if (sc->bce_intrhand != NULL) { + + if (sc->bce_intrhand != NULL) { DBPRINT(sc, BCE_INFO_RESET, "Removing interrupt handler.\n"); - bus_teardown_intr(dev, sc->bce_res_irq, sc->bce_intrhand); + bus_teardown_intr(dev, sc->bce_res_irq, sc->bce_intrhand); } - if (sc->bce_res_irq != NULL) { + if (sc->bce_res_irq != NULL) { DBPRINT(sc, BCE_INFO_RESET, "Releasing IRQ.\n"); - bus_release_resource(dev, SYS_RES_IRQ, sc->bce_flags & BCE_USING_MSI_FLAG ? 1 : 0, + bus_release_resource(dev, SYS_RES_IRQ, sc->bce_flags & BCE_USING_MSI_FLAG ? 1 : 0, sc->bce_res_irq); } - - if (sc->bce_flags & BCE_USING_MSI_FLAG) { + + if (sc->bce_flags & BCE_USING_MSI_FLAG) { DBPRINT(sc, BCE_INFO_RESET, "Releasing MSI vector.\n"); - pci_release_msi(dev); - } + pci_release_msi(dev); + } - if (sc->bce_res_mem != NULL) { + if (sc->bce_res_mem != NULL) { DBPRINT(sc, BCE_INFO_RESET, "Releasing PCI memory.\n"); - bus_release_resource(dev, SYS_RES_MEMORY, PCIR_BAR(0), sc->bce_res_mem); + bus_release_resource(dev, SYS_RES_MEMORY, PCIR_BAR(0), sc->bce_res_mem); } - if (sc->bce_ifp != NULL) { + if (sc->bce_ifp != NULL) { DBPRINT(sc, BCE_INFO_RESET, "Releasing IF.\n"); - if_free(sc->bce_ifp); + if_free(sc->bce_ifp); } if (mtx_initialized(&sc->bce_mtx)) @@ -3257,9 +3255,9 @@ /* Make sure the interrupt is not active. */ REG_WR(sc, BCE_PCICFG_INT_ACK_CMD, BCE_PCICFG_INT_ACK_CMD_MASK_INT); - /* + /* * Initialize DMA byte/word swapping, configure the number of DMA - * channels and PCI clock compensation delay. + * channels and PCI clock compensation delay. */ val = BCE_DMA_CONFIG_DATA_BYTE_SWAP | BCE_DMA_CONFIG_DATA_WORD_SWAP | @@ -3322,7 +3320,7 @@ val = 0x10000 + (MAX_CID_CNT * MB_KERNEL_CTX_SIZE); REG_WR(sc, BCE_MQ_KNL_BYP_WIND_START, val); REG_WR(sc, BCE_MQ_KNL_WIND_END, val); - + /* Set the page size and clear the RV2P processor stall bits. */ val = (BCM_PAGE_BITS - 8) << 24; REG_WR(sc, BCE_RV2P_CONFIG, val); @@ -3553,10 +3551,10 @@ DBRUNIF((sc->free_rx_bd > USABLE_RX_BD), BCE_PRINTF("%s(%d): Too many free rx_bd (0x%04X > 0x%04X)!\n", __FILE__, __LINE__, sc->free_rx_bd, (u16) USABLE_RX_BD)); - + /* Update some debug statistic counters */ DBRUNIF((sc->free_rx_bd < sc->rx_low_watermark), - sc->rx_low_watermark = sc->free_rx_bd); + sc->rx_low_watermark = sc->free_rx_bd); DBRUNIF((sc->free_rx_bd == 0), sc->rx_empty_count++); /* Setup the rx_bd for the first segment. */ @@ -3621,9 +3619,9 @@ sc->tx_prod = 0; sc->tx_cons = 0; sc->tx_prod_bseq = 0; - sc->used_tx_bd = 0; + sc->used_tx_bd = 0; sc->max_tx_bd = USABLE_TX_BD; - DBRUNIF(1, sc->tx_hi_watermark = USABLE_TX_BD); + DBRUNIF(1, sc->tx_hi_watermark = USABLE_TX_BD); DBRUNIF(1, sc->tx_full_count = 0); /* @@ -3733,9 +3731,9 @@ sc->rx_prod = 0; sc->rx_cons = 0; sc->rx_prod_bseq = 0; - sc->free_rx_bd = USABLE_RX_BD; - sc->max_rx_bd = USABLE_RX_BD; - DBRUNIF(1, sc->rx_low_watermark = USABLE_RX_BD); + sc->free_rx_bd = USABLE_RX_BD; + sc->max_rx_bd = USABLE_RX_BD; + DBRUNIF(1, sc->rx_low_watermark = USABLE_RX_BD); DBRUNIF(1, sc->rx_empty_count = 0); /* Initialize the RX next pointer chain entries. */ @@ -3792,7 +3790,7 @@ } /* Tell the chip about the waiting rx_bd's. */ - REG_WR16(sc, MB_RX_CID_ADDR + BCE_L2CTX_HOST_BDIDX, sc->rx_prod); + REG_WR16(sc, MB_RX_CID_ADDR + BCE_L2CTX_HOST_BDIDX, sc->rx_prod); REG_WR(sc, MB_RX_CID_ADDR + BCE_L2CTX_HOST_BSEQ, sc->rx_prod_bseq); DBRUN(BCE_VERBOSE_RECV, bce_dump_rx_chain(sc, 0, TOTAL_RX_BD)); @@ -3858,7 +3856,7 @@ BCE_UNLOCK(sc); return (0); } - + /****************************************************************************/ /* Set media options. */ @@ -3872,15 +3870,15 @@ struct bce_softc *sc; struct mii_data *mii; struct ifmedia *ifm; - + sc = ifp->if_softc; ifm = &sc->bce_ifmedia; BCE_LOCK_ASSERT(sc); mii = device_get_softc(sc->bce_miibus); - - /* Make sure the MII bus has been enumerated. */ - if (mii) { + + /* Make sure the MII bus has been enumerated. */ + if (mii) { sc->bce_link = 0; if (mii->mii_instance) { struct mii_softc *miisc; @@ -3888,7 +3886,7 @@ LIST_FOREACH(miisc, &mii->mii_phys, mii_list) mii_phy_reset(miisc); } - mii_mediachg(mii); + mii_mediachg(mii); } } @@ -4004,9 +4002,9 @@ bus_space_barrier(sc->bce_btag, sc->bce_bhandle, 0, 0, BUS_SPACE_BARRIER_READ); - /* Update some debug statistics counters */ + /* Update some debug statistics counters */ DBRUNIF((sc->free_rx_bd < sc->rx_low_watermark), - sc->rx_low_watermark = sc->free_rx_bd); + sc->rx_low_watermark = sc->free_rx_bd); DBRUNIF((sc->free_rx_bd == 0), sc->rx_empty_count++); /* Scan through the receive chain as long as there is work to do */ @@ -4016,9 +4014,9 @@ unsigned int len; u32 status; - /* Clear the mbuf pointer. */ - m = NULL; - + /* Clear the mbuf pointer. */ + m = NULL; + /* Convert the producer/consumer indices to an actual rx_bd index. */ sw_chain_cons = RX_CHAIN_IDX(sw_cons); sw_chain_prod = RX_CHAIN_IDX(sw_prod); @@ -4048,11 +4046,11 @@ __FILE__, __LINE__, sw_chain_cons); bce_breakpoint(sc)); - /* - * ToDo: If the received packet is small enough + /* + * ToDo: If the received packet is small enough * to fit into a single, non-M_EXT mbuf, - * allocate a new mbuf here, copy the data to - * that mbuf, and recycle the mapped jumbo frame. + * allocate a new mbuf here, copy the data to + * that mbuf, and recycle the mapped jumbo frame. */ /* Unmap the mbuf from DMA space. */ @@ -4212,30 +4210,30 @@ } sw_cons = NEXT_RX_BD(sw_cons); - - /* If we have a packet, pass it up the stack */ - if (m) { - /* Make sure we don't lose our place when we release the lock. */ - sc->rx_cons = sw_cons; - sc->rx_prod = sw_prod; - sc->rx_prod_bseq = sw_prod_bseq; + + /* If we have a packet, pass it up the stack */ + if (m) { + /* Make sure we don't lose our place when we release the lock. */ + sc->rx_cons = sw_cons; + sc->rx_prod = sw_prod; + sc->rx_prod_bseq = sw_prod_bseq; DBPRINT(sc, BCE_VERBOSE_RECV, "%s(): Passing received frame up.\n", __FUNCTION__); BCE_UNLOCK(sc); (*ifp->if_input)(ifp, m); DBRUNIF(1, sc->rx_mbuf_alloc--); - BCE_LOCK(sc); - - /* Recover our place. */ - sw_cons = sc->rx_cons; - sw_prod = sc->rx_prod; - sw_prod_bseq = sc->rx_prod_bseq; - hw_cons = sc->hw_rx_cons = sblk->status_rx_quick_consumer_index0; - if ((hw_cons & USABLE_RX_BD_PER_PAGE) == USABLE_RX_BD_PER_PAGE) - hw_cons++; - } - + BCE_LOCK(sc); + + /* Recover our place. */ + sw_cons = sc->rx_cons; + sw_prod = sc->rx_prod; + sw_prod_bseq = sc->rx_prod_bseq; + hw_cons = sc->hw_rx_cons = sblk->status_rx_quick_consumer_index0; + if ((hw_cons & USABLE_RX_BD_PER_PAGE) == USABLE_RX_BD_PER_PAGE) + hw_cons++; + } + /* Refresh hw_cons to see if there's new work */ if (sw_cons == hw_cons) { hw_cons = sc->hw_rx_cons = sblk->status_rx_quick_consumer_index0; @@ -4372,7 +4370,7 @@ /* Clear the tx hardware queue full flag. */ if (sc->used_tx_bd < sc->max_tx_bd) { DBRUNIF((ifp->if_drv_flags & IFF_DRV_OACTIVE), - DBPRINT(sc, BCE_WARN_SEND, + DBPRINT(sc, BCE_WARN_SEND, "%s(): Open TX chain! %d/%d (used/total)\n", __FUNCTION__, sc->used_tx_bd, sc->max_tx_bd)); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; @@ -4530,9 +4528,9 @@ return; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 7 08:21:11 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1226516A46C; Thu, 7 Jun 2007 08:21:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 BBF6016A400 for ; Thu, 7 Jun 2007 08:21:10 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id ABC0013C45A for ; Thu, 7 Jun 2007 08:21:10 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l578LAbJ047633 for ; Thu, 7 Jun 2007 08:21:10 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l578LAog047607 for perforce@freebsd.org; Thu, 7 Jun 2007 08:21:10 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Thu, 7 Jun 2007 08:21:10 GMT Message-Id: <200706070821.l578LAog047607@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 121133 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2007 08:21:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=121133 Change 121133 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/07 08:21:10 Zhouyi Zhou has to add sys directory to go further tests on MAC. And He rearrange the directory structure. Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/blowfish/arch/i386/bf_enc.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/blowfish/arch/i386/bf_enc_586.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/blowfish/arch/i386/bf_enc_686.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/blowfish/bf_ecb.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/blowfish/bf_enc.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/blowfish/bf_locl.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/blowfish/bf_pi.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/blowfish/bf_skey.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/blowfish/blowfish.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/camellia/camellia-api.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/camellia/camellia.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/camellia/camellia.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/des/arch/i386/des_enc.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/des/des.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/des/des_ecb.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/des/des_enc.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/des/des_locl.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/des/des_setkey.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/des/podd.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/des/sk.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/des/spr.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/rc4/rc4.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/rc4/rc4.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/rijndael/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/rijndael/rijndael-alg-fst.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/rijndael/rijndael-api-fst.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/rijndael/rijndael-api-fst.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/rijndael/rijndael-api.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/rijndael/rijndael.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/rijndael/rijndael_local.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/rijndael/test00.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/sha1.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/sha1.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/sha2/sha2.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/sha2/sha2.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/via/padlock.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/via/padlock.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/via/padlock_cipher.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/crypto/via/padlock_hash.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 7 08:47:44 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4073116A46B; Thu, 7 Jun 2007 08:47:44 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E4E0A16A468 for ; Thu, 7 Jun 2007 08:47:43 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D5ADB13C487 for ; Thu, 7 Jun 2007 08:47:43 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l578lhI6082012 for ; Thu, 7 Jun 2007 08:47:43 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l578lhl7082000 for perforce@freebsd.org; Thu, 7 Jun 2007 08:47:43 GMT (envelope-from andrew@freebsd.org) Date: Thu, 7 Jun 2007 08:47:43 GMT Message-Id: <200706070847.l578lhl7082000@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 121134 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2007 08:47:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=121134 Change 121134 by andrew@andrew_hermies on 2007/06/07 08:47:15 Create a facund Python package to contain front-end code that could be used by other front-ends Move the network code to the facund.network package Load the Glade file in and display it Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund.py#2 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/__init__.py#1 add .. //depot/projects/soc2007/andrew-update/frontend/facund/gui/__init__.py#1 add .. //depot/projects/soc2007/andrew-update/frontend/facund/gui/computer_model.py#1 add .. //depot/projects/soc2007/andrew-update/frontend/facund/gui/main_window.py#1 add .. //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#1 add Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund.py#2 (text+ko) ==== @@ -1,42 +1,21 @@ #!/usr/local/bin/python -import xml.sax.handler import socket +import facund.gui, facund.network -class FacundConnection(xml.sax.handler.ContentHandler): - """A class that works as a client with the Facund XML IPC""" - def __init__(self, server): - self.isReady = False - self.bufSize = 1024 - self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - self.socket.connect(server) - self.socket.send("") - self.parser = xml.sax.make_parser() - self.parser.setContentHandler(self) +#try: +# fc = facund.network.Connection("/tmp/facund") +#except socket.error: +# print "Couldn't connect to the back-end" +#while True: +# fc.interact() - # Mark the class as ready and able to hav __del__ called - self.isReady = True - - def __del__(self): - if self.isReady: - self.parser.close() - self.socket.send("") - - def interact(self): - data = self.socket.recv(self.bufSize) - self.parser.feed(data) - - def startElement(self, name, attributes): - print "> " + name - if __name__ == "__main__": - try: - fc = FacundConnection("/tmp/facund") + model = facund.gui.ComputerTreeModel() + mainWindow = facund.gui.MainWindow('facund-fe.glade') + mainWindow.setComputerTreeModel(model) - while True: - fc.interact() + mainWindow.run() - except socket.error: - print "Couldn't connect to the back-end" From owner-p4-projects@FreeBSD.ORG Thu Jun 7 08:47:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AD6116A532; Thu, 7 Jun 2007 08:47:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 6B10A16A4C7 for ; Thu, 7 Jun 2007 08:47:44 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3254913C458 for ; Thu, 7 Jun 2007 08:47:44 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l578li9b082019 for ; Thu, 7 Jun 2007 08:47:44 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l578lh9V082015 for perforce@freebsd.org; Thu, 7 Jun 2007 08:47:43 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Thu, 7 Jun 2007 08:47:43 GMT Message-Id: <200706070847.l578lh9V082015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 121135 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2007 08:47:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=121135 Change 121135 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/07 08:47:42 Zhouyi Zhou add sys directory part 2, and add tools/regression directory Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/LICENSE#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 7 09:59:14 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AD5B16A46B; Thu, 7 Jun 2007 09:59:14 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 46AB716A41F for ; Thu, 7 Jun 2007 09:59:14 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2AF6C13C44C for ; Thu, 7 Jun 2007 09:59:14 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l579xELe050780 for ; Thu, 7 Jun 2007 09:59:14 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l579xDrJ050756 for perforce@freebsd.org; Thu, 7 Jun 2007 09:59:13 GMT (envelope-from andrew@freebsd.org) Date: Thu, 7 Jun 2007 09:59:13 GMT Message-Id: <200706070959.l579xDrJ050756@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 121139 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2007 09:59:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=121139 Change 121139 by andrew@andrew_hermies on 2007/06/07 09:59:10 Add a BSD license to the Python files Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund.py#3 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/__init__.py#2 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/gui/__init__.py#2 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/gui/computer_model.py#2 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/gui/main_window.py#2 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#2 edit Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund.py#3 (text+ko) ==== @@ -1,4 +1,30 @@ #!/usr/local/bin/python +# Copyright (C) 2007, Andrew Turner, All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer +# in this position and unchanged. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name(s) of the author(s) may not be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# import socket ==== //depot/projects/soc2007/andrew-update/frontend/facund/__init__.py#2 (text+ko) ==== @@ -1,1 +1,28 @@ +# Copyright (C) 2007, Andrew Turner, All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer +# in this position and unchanged. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name(s) of the author(s) may not be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + __all__ = ["gui", "network"] ==== //depot/projects/soc2007/andrew-update/frontend/facund/gui/__init__.py#2 (text+ko) ==== @@ -1,2 +1,29 @@ +# Copyright (C) 2007, Andrew Turner, All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer +# in this position and unchanged. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name(s) of the author(s) may not be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + from computer_model import ComputerTreeModel from main_window import MainWindow ==== //depot/projects/soc2007/andrew-update/frontend/facund/gui/computer_model.py#2 (text+ko) ==== @@ -1,3 +1,30 @@ +# Copyright (C) 2007, Andrew Turner, All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer +# in this position and unchanged. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name(s) of the author(s) may not be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + import gtk import gobject ==== //depot/projects/soc2007/andrew-update/frontend/facund/gui/main_window.py#2 (text+ko) ==== @@ -1,3 +1,30 @@ +# Copyright (C) 2007, Andrew Turner, All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer +# in this position and unchanged. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name(s) of the author(s) may not be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + import gtk import gtk.gdk import gtk.glade ==== //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#2 (text+ko) ==== @@ -1,4 +1,29 @@ -#!/usr/local/bin/python +# Copyright (C) 2007, Andrew Turner, All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer +# in this position and unchanged. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name(s) of the author(s) may not be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# import xml.sax.handler import socket From owner-p4-projects@FreeBSD.ORG Thu Jun 7 11:18:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1C0316A469; Thu, 7 Jun 2007 11:18:04 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 7DA3F16A46E for ; Thu, 7 Jun 2007 11:18:04 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6C89F13C46C for ; Thu, 7 Jun 2007 11:18:04 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l57BI47T022047 for ; Thu, 7 Jun 2007 11:18:04 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l57BI3dw022039 for perforce@freebsd.org; Thu, 7 Jun 2007 11:18:03 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 7 Jun 2007 11:18:03 GMT Message-Id: <200706071118.l57BI3dw022039@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 121149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2007 11:18:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=121149 Change 121149 by rpaulo@rpaulo_epsilon on 2007/06/07 11:17:05 Adapt interrupts to INTR_FILTER compile time variable. sc_mtx is now a spin lock mutex again. While there, make asmc_sms_intr() return a proper value. Discussed with: Attilio Rao Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#12 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#12 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#11 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#12 $ * */ @@ -77,7 +77,12 @@ static int asmc_temp_getvalue(device_t, const char *); static int asmc_sms_read(device_t, const char *, int16_t *); static void asmc_sms_calibrate(device_t); +#ifdef INTR_FILTER static int asmc_sms_intr(void *); +#else +static void asmc_sms_fastintr(void *); +#endif +static void asmc_sms_printintr(device_t, uint8_t); /* * Model functions. @@ -238,7 +243,7 @@ model = asmc_match(dev); - mtx_init(&sc->sc_mtx, "asmc", NULL, MTX_DEF); + mtx_init(&sc->sc_mtx, "asmc", NULL, MTX_SPIN); asmc_init(dev); @@ -373,9 +378,15 @@ goto out; } +#ifdef INTR_FILTER error = bus_setup_intr(dev, sc->sc_res, - INTR_TYPE_MISC|INTR_MPSAFE|INTR_EXCL, + INTR_TYPE_MISC|INTR_MPSAFE, asmc_sms_intr, NULL, dev, &sc->sc_cookie); +#else + error = bus_setup_intr(dev, sc->sc_res, + INTR_TYPE_MISC|INTR_MPSAFE|INTR_FAST, + NULL, asmc_sms_fastintr, dev, &sc->sc_cookie); +#endif if (error) { device_printf(dev, "unable to setup SMS IRQ\n"); bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid, @@ -515,7 +526,7 @@ int i, error = 1; struct asmc_softc *sc = device_get_softc(dev); - mtx_lock(&sc->sc_mtx); + mtx_lock_spin(&sc->sc_mtx); outb(ASMC_CMDPORT, ASMC_CMDREAD); if (asmc_wait(dev, 0x0c)) @@ -537,7 +548,7 @@ error = 0; out: - mtx_unlock(&sc->sc_mtx); + mtx_unlock_spin(&sc->sc_mtx); return error; } @@ -548,7 +559,7 @@ int i, error = -1; struct asmc_softc *sc = device_get_softc(dev); - mtx_lock(&sc->sc_mtx); + mtx_lock_spin(&sc->sc_mtx); outb(ASMC_CMDPORT, ASMC_CMDWRITE); if (asmc_wait(dev, 0x0c)) @@ -570,7 +581,7 @@ error = 0; out: - mtx_unlock(&sc->sc_mtx); + mtx_unlock_spin(&sc->sc_mtx); return error; @@ -749,6 +760,7 @@ asmc_sms_read(dev, ASMC_KEY_SMS_Z, &sc->sms_rest_z); } +#ifdef INTR_FILTER static int asmc_sms_intr(void *arg) { @@ -756,9 +768,33 @@ device_t dev = (device_t) arg; struct asmc_softc *sc = device_get_softc(dev); - mtx_lock(&sc->sc_mtx); + mtx_lock_spin(&sc->sc_mtx); + type = inb(ASMC_INTPORT); + mtx_unlock_spin(&sc->sc_mtx); + + asmc_sms_printintr(dev, type); + + return FILTER_HANDLED; +} +#else +static void +asmc_sms_fastintr(void *arg) +{ + uint8_t type; + device_t dev = (device_t) arg; + struct asmc_softc *sc = device_get_softc(dev); + + mtx_lock_spin(&sc->sc_mtx); type = inb(ASMC_INTPORT); - mtx_unlock(&sc->sc_mtx); + mtx_unlock_spin(&sc->sc_mtx); + + asmc_sms_printintr(dev, type); +} +#endif /* INTR_FILTER */ + +static void +asmc_sms_printintr(device_t dev, uint8_t type) +{ switch (type) { case ASMC_SMS_INTFF: @@ -773,8 +809,6 @@ default: device_printf(dev, "%s unknown interrupt\n", __func__); } - - return 0; } static int From owner-p4-projects@FreeBSD.ORG Thu Jun 7 11:35:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE9FB16A475; Thu, 7 Jun 2007 11:35:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 BE5B916A46E for ; Thu, 7 Jun 2007 11:35:32 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id ACB7913C465 for ; Thu, 7 Jun 2007 11:35:32 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l57BZWwV039626 for ; Thu, 7 Jun 2007 11:35:32 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l57BZPID039530 for perforce@freebsd.org; Thu, 7 Jun 2007 11:35:25 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 7 Jun 2007 11:35:25 GMT Message-Id: <200706071135.l57BZPID039530@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 121150 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2007 11:35:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=121150 Change 121150 by rpaulo@rpaulo_epsilon on 2007/06/07 11:35:08 IFC Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/genassym.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/trap.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/tsc.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/pcpu.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/isa/clock.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/intr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/pmap.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/trap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/undefined.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/include/pcpu.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_xpt.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_misc.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/kern/opensolaris_kstat.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/Makefile.ia64#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files#11 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/options#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ath/if_ath.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ath/if_athrate.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ath/if_athvar.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/bce/if_bce.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/bge/if_bge.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ciss/ciss.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/de/if_de.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/if_em.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/firewire.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/firewirereg.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/fwdev.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/fwdma.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/fwmem.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/fwohci.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/if_fwevar.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/if_fwipvar.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/sbp.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/sbp_targ.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/gem/if_gem.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/md/md.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mfi/mfi.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mfi/mfivar.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mii/brgphy.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mii/brgphyreg.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mii/ciphy.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mii/ciphyreg.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mii/miidevs#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mii/rlphy.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmc.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mpt/mpilib/mpi_log_fc.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/dev/mpt/mpilib/mpi_log_sas.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mpt/mpt.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mpt/mpt.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/pccard/pccard.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/pccard/pccardvarp.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/puc/puc.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/puc/pucdata.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/clone.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/clone.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/envy24ht.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/ac97.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/channel.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/feeder_fmt.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/unit.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/unit.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/version.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/speaker/spkr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/syscons/syscons.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ubsa.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ucom.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/udbp.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ufm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uftdi.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uhid.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ulpt.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uplcom.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/urio.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uscanner.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uvscom.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/procfs/procfs_ioctl.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/geom/cache/g_cache.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/geom/eli/g_eli.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/geom/geom_kern.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/geom/journal/g_journal.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/geom/part/g_part.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/geom/part/g_part_apm.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/genassym.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/io_apic.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/mp_clock.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/mp_watchdog.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/pmap.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/swtch.s#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/trap.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/tsc.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/include/pcpu.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/include/vmparam.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/isa/clock.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/isa/npx.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/pmap.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/trap.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/vm_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ia64/include/pcpu.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/init_main.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_acct.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_alq.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_clock.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_condvar.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_cpu.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_exit.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_fork.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_idle.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_intr.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_kse.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_kthread.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_lockf.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_malloc.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_mbuf.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_mib.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_mutex.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_poll.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_proc.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_resource.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_rwlock.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_shutdown.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_sig.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_subr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_switch.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_synch.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_sysctl.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_tc.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_thr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_thread.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_time.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_umtx.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/ksched.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/sched_4bsd.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/sched_core.c#2 delete .. //depot/projects/soc2007/rpaulo-macbook/kern/sched_ule.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_lock.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_prof.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_smp.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_taskqueue.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_trap.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_turnstile.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_witness.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/sys_generic.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/sys_process.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/tty.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_socket.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_aio.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_bio.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_cluster.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_subr.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/dcons/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/sound/sound/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/if_fwsubr.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/if_media.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/_ieee80211.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_acl.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_crypto.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_crypto_none.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_input.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_node.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_node.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_output.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_var.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_xauth.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/bluetooth/common/ng_bluetooth.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_base.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_ppp.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/ip_carp.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_constants.h#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_indata.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_input.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_input.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_os_bsd.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_output.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_output.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_pcb.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_pcb.h#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_structs.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_sysctl.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_timer.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_usrreq.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctputil.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctputil.h#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_syncache.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_timewait.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/frag6.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6_var.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/ip6_var.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/sctp6_usrreq.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netncp/ncp_sock.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/pc98/cbus/clock.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/pc98/pc98/machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/powerpc/include/pcpu.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_arg.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_bsm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_pipe.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_private.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_worker.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/include/pcpu.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/psycho.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/vm_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/pcpu.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/intr_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/tsb.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/vm_machdep.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/mutex.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/param.h#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/pcpu.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/proc.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/resource.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/resourcevar.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/sched.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/sysctl.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/turnstile.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/umtx.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/vmmeter.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/swap_pager.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/uma_core.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_contig.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_fault.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_glue.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_map.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_meter.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_mmap.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_object.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_page.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_pageout.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_pageq.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_zeroidle.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/cpu_switch.S#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.156 2007/03/30 00:06:20 jkim Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.158 2007/06/06 07:35:07 davidxu Exp $ */ #include @@ -73,19 +73,16 @@ movq TD_PCB(%rsi),%rdx /* newtd->td_proc */ movq PCB_CR3(%rdx),%rdx movq %rdx,%cr3 /* new address space */ - /* set bit in new pm_active */ - movq TD_PROC(%rsi),%rdx - movq P_VMSPACE(%rdx), %rdx - LK btsl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* set new */ - jmp sw1 + jmp swact /* - * cpu_switch(old, new) + * cpu_switch(old, new, mtx) * * Save the current thread state, then select the next thread to run * and load its state. * %rdi = oldtd * %rsi = newtd + * %rdx = mtx */ ENTRY(cpu_switch) /* Switch to new thread. First, save context. */ @@ -147,17 +144,33 @@ movq TD_PCB(%rsi),%r8 /* switch address space */ - movq PCB_CR3(%r8),%rdx + movq PCB_CR3(%r8),%rcx movq %cr3,%rax - cmpq %rdx,%rax /* Same address space? */ - je sw1 - movq %rdx,%cr3 /* new address space */ - + cmpq %rcx,%rax /* Same address space? */ + jne swinact + movq %rdx, TD_LOCK(%rdi) /* Release the old thread */ + /* Wait for the new thread to become unblocked */ + movq $blocked_lock, %rdx +1: + movq TD_LOCK(%rsi),%rcx + cmpq %rcx, %rdx + je 1b + jmp sw1 +swinact: + movq %rcx,%cr3 /* new address space */ movl PCPU(CPUID), %eax /* Release bit from old pmap->pm_active */ - movq TD_PROC(%rdi), %rdx /* oldproc */ - movq P_VMSPACE(%rdx), %rdx - LK btrl %eax, VM_PMAP+PM_ACTIVE(%rdx) /* clear old */ + movq TD_PROC(%rdi), %rcx /* oldproc */ + movq P_VMSPACE(%rcx), %rcx + LK btrl %eax, VM_PMAP+PM_ACTIVE(%rcx) /* clear old */ + movq %rdx, TD_LOCK(%rdi) /* Release the old thread */ +swact: + /* Wait for the new thread to become unblocked */ + movq $blocked_lock, %rdx +1: + movq TD_LOCK(%rsi),%rcx + cmpq %rcx, %rdx + je 1b /* Set bit in new pmap->pm_active */ movq TD_PROC(%rsi),%rdx /* newproc */ @@ -190,9 +203,7 @@ movq %rbx, (%rax) movq %rbx, PCPU(RSP0) - movl TD_TID(%rsi), %eax movq %r8, PCPU(CURPCB) - movl %eax, PCPU(CURTID) movq %rsi, PCPU(CURTHREAD) /* into next thread */ testl $PCB_32BIT,PCB_FLAGS(%r8) ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/genassym.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.161 2007/03/30 00:06:20 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.163 2007/06/06 07:35:07 davidxu Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -76,6 +76,7 @@ ASSYM(PM_ACTIVE, offsetof(struct pmap, pm_active)); ASSYM(P_SFLAG, offsetof(struct proc, p_sflag)); +ASSYM(TD_LOCK, offsetof(struct thread, td_lock)); ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); @@ -193,7 +194,6 @@ ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp)); ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0)); -ASSYM(PC_CURTID, offsetof(struct pcpu, pc_curtid)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/intr_machdep.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.32 2007/05/08 21:29:12 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.34 2007/06/04 21:38:44 attilio Exp $ */ /* @@ -250,7 +250,7 @@ * processed too. */ (*isrc->is_count)++; - PCPU_LAZY_INC(cnt.v_intr); + PCPU_INC(cnt.v_intr); ie = isrc->is_event; @@ -310,7 +310,7 @@ struct thread *td; struct intr_event *ie; struct intr_handler *ih; - int error, vector, thread; + int error, vector, thread, ret; td = curthread; @@ -321,7 +321,7 @@ * processed too. */ (*isrc->is_count)++; - PCPU_LAZY_INC(cnt.v_intr); + PCPU_INC(cnt.v_intr); ie = isrc->is_event; @@ -356,6 +356,7 @@ * a trapframe as its argument. */ td->td_intr_nesting_level++; + ret = 0; thread = 0; critical_enter(); TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { @@ -367,9 +368,17 @@ ih->ih_filter, ih->ih_argument == NULL ? frame : ih->ih_argument, ih->ih_name); if (ih->ih_argument == NULL) - ih->ih_filter(frame); + ret = ih->ih_filter(frame); else - ih->ih_filter(ih->ih_argument); + ret = ih->ih_filter(ih->ih_argument); + /* + * Wrapper handler special case: see + * i386/intr_machdep.c::intr_execute_handlers() + */ + if (!thread) { + if (ret == FILTER_SCHEDULE_THREAD) + thread = 1; + } } /* ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/io_apic.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.30 2007/05/08 21:29:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.31 2007/06/05 18:57:48 jhb Exp $"); #include "opt_isa.h" @@ -492,7 +492,7 @@ intbase = next_ioapic_base; printf("ioapic%u: Assuming intbase of %d\n", io->io_id, intbase); - } else if (intbase != next_ioapic_base) + } else if (intbase != next_ioapic_base && bootverbose) printf("ioapic%u: WARNING: intbase %d != expected base %d\n", io->io_id, intbase, next_ioapic_base); io->io_intbase = intbase; ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.671 2007/05/18 07:10:42 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.675 2007/06/06 07:35:07 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -163,7 +163,13 @@ long Maxmem = 0; long realmem = 0; -#define PHYSMAP_SIZE (2 * 30) +/* + * The number of PHYSMAP entries must be one less than the number of + * PHYSSEG entries because the PHYSMAP entry that spans the largest + * physical address that is accessible by ISA DMA is split into two + * PHYSSEG entries. + */ +#define PHYSMAP_SIZE (2 * (VM_PHYSSEG_MAX - 1)) vm_paddr_t phys_avail[PHYSMAP_SIZE + 2]; vm_paddr_t dump_avail[PHYSMAP_SIZE + 2]; @@ -221,8 +227,8 @@ vm_ksubmap_init(&kmi); printf("avail memory = %ju (%ju MB)\n", - ptoa((uintmax_t)VMCNT_GET(free_count)), - ptoa((uintmax_t)VMCNT_GET(free_count)) / 1048576); + ptoa((uintmax_t)cnt.v_free_count), + ptoa((uintmax_t)cnt.v_free_count) / 1048576); /* * Set up buffers, so they can be used to read disk labels. @@ -460,9 +466,9 @@ #ifdef SMP /* Schedule ourselves on the indicated cpu. */ - mtx_lock_spin(&sched_lock); + thread_lock(curthread); sched_bind(curthread, cpu_id); - mtx_unlock_spin(&sched_lock); + thread_unlock(curthread); #endif /* Calibrate by measuring a short delay. */ @@ -473,9 +479,9 @@ intr_restore(reg); #ifdef SMP - mtx_lock_spin(&sched_lock); + thread_lock(curthread); sched_unbind(curthread); - mtx_unlock_spin(&sched_lock); + thread_unlock(curthread); #endif /* @@ -1173,7 +1179,6 @@ PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); - PCPU_SET(curtid, thread0.td_tid); PCPU_SET(tssp, &common_tss[0]); /* ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.285 2007/05/19 05:03:59 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.286 2007/06/04 23:56:07 jeff Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -46,6 +46,7 @@ #include #include #include +#include #include #include @@ -590,26 +591,8 @@ while (smp_started == 0) ia32_pause(); - /* ok, now grab sched_lock and enter the scheduler */ - mtx_lock_spin(&sched_lock); + sched_throw(NULL); - /* - * Correct spinlock nesting. The idle thread context that we are - * borrowing was created so that it would start out with a single - * spin lock (sched_lock) held in fork_trampoline(). Since we've - * explicitly acquired locks in this function, the nesting count - * is now 2 rather than 1. Since we are nested, calling - * spinlock_exit() will simply adjust the counts without allowing - * spin lock using code to interrupt us. - */ - spinlock_exit(); - KASSERT(curthread->td_md.md_spinlock_count == 1, ("invalid count")); - - PCPU_SET(switchtime, cpu_ticks()); - PCPU_SET(switchticks, ticks); - - cpu_throw(NULL, choosethread()); /* doesn't return */ - panic("scheduler returned us to %s", __func__); /* NOTREACHED */ } @@ -988,12 +971,12 @@ if (ipi_bitmap & (1 << IPI_PREEMPT)) { struct thread *running_thread = curthread; - mtx_lock_spin(&sched_lock); + thread_lock(running_thread); if (running_thread->td_critnest > 1) running_thread->td_owepreempt = 1; else mi_switch(SW_INVOL | SW_PREEMPT, NULL); - mtx_unlock_spin(&sched_lock); + thread_unlock(running_thread); } /* Nothing to do for AST */ @@ -1177,11 +1160,9 @@ if (mp_ncpus == 1) return; - mtx_lock_spin(&sched_lock); atomic_store_rel_int(&aps_ready, 1); while (smp_started == 0) ia32_pause(); - mtx_unlock_spin(&sched_lock); } SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, release_aps, NULL); ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/mp_watchdog.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/mp_watchdog.c,v 1.4 2005/02/28 08:55:53 pjd Exp $ + * $FreeBSD: src/sys/amd64/amd64/mp_watchdog.c,v 1.5 2007/06/04 23:56:33 jeff Exp $ */ #include "opt_mp_watchdog.h" @@ -105,9 +105,7 @@ * locks to make sure. Then reset the timer. */ mtx_lock(&Giant); - mtx_lock_spin(&sched_lock); watchdog_timer = WATCHDOG_THRESHOLD; - mtx_unlock_spin(&sched_lock); mtx_unlock(&Giant); callout_reset(&watchdog_callout, 1 * hz, watchdog_function, NULL); } @@ -156,34 +154,6 @@ sysctl_watchdog, "I", ""); /* - * A badly behaved sysctl that leaks the sched lock when written to. Then - * spin holding it just to make matters worse. This can be used to test the - * effectiveness of the watchdog by generating a fairly hard and nast hang. - * Note that Giant is also held in the current world order when we get here. - */ -static int -sysctl_leak_schedlock(SYSCTL_HANDLER_ARGS) -{ - int error, temp; - - temp = 0; - error = sysctl_handle_int(oidp, &temp, 0, req); - if (error) - return (error); - - if (req->newptr != NULL) { - if (temp) { - printf("Leaking the sched lock...\n"); - mtx_lock_spin(&sched_lock); - while (1); - } - } - return (0); -} -SYSCTL_PROC(_debug, OID_AUTO, leak_schedlock, CTLTYPE_INT|CTLFLAG_RW, 0, 0, - sysctl_leak_schedlock, "IU", ""); - -/* * Drop into the debugger by sending an IPI NMI to the boot processor. */ static void ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#5 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.586 2007/05/20 22:33:41 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.587 2007/05/31 22:52:10 attilio Exp $"); /* * Manages physical address maps. @@ -620,7 +620,7 @@ * numbers of pv entries. */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); } @@ -633,7 +633,7 @@ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0 && req->newptr) { - shpgperproc = (pv_entry_max - VMCNT_GET(page_count)) / maxproc; + shpgperproc = (pv_entry_max - cnt.v_page_count) / maxproc; pv_entry_high_water = 9 * (pv_entry_max / 10); } return (error); @@ -648,7 +648,7 @@ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0 && req->newptr) { - pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; pv_entry_high_water = 9 * (pv_entry_max / 10); } return (error); @@ -1149,7 +1149,8 @@ */ m->right = *free; *free = m; - VMCNT_SUB(wire_count, 1); + + atomic_subtract_int(&cnt.v_wire_count, 1); return 1; } @@ -1459,7 +1460,7 @@ pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */ m->wire_count--; - VMCNT_SUB(wire_count, 1); + atomic_subtract_int(&cnt.v_wire_count, 1); vm_page_free_zero(m); PMAP_LOCK_DESTROY(pmap); } ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.316 2007/05/27 19:16:45 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.317 2007/06/04 21:38:44 attilio Exp $"); /* * AMD64 Trap and System call handling @@ -163,7 +163,7 @@ register_t addr = 0; ksiginfo_t ksi; - PCPU_LAZY_INC(cnt.v_trap); + PCPU_INC(cnt.v_trap); type = frame->tf_trapno; #ifdef SMP @@ -737,10 +737,10 @@ ksiginfo_t ksi; /* - * note: PCPU_LAZY_INC() can only be used if we can afford + * note: PCPU_INC() can only be used if we can afford * occassional inaccuracy in the count. */ - PCPU_LAZY_INC(cnt.v_syscall); + PCPU_INC(cnt.v_syscall); #ifdef DIAGNOSTIC if (ISPL(frame->tf_cs) != SEL_UPL) { ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/tsc.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.207 2007/03/26 18:03:29 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.208 2007/06/04 18:25:01 dwmalone Exp $"); #include "opt_clock.h" @@ -204,7 +204,7 @@ if (tsc_timecounter.tc_frequency == 0) return (EOPNOTSUPP); freq = tsc_freq; - error = sysctl_handle_int(oidp, &freq, sizeof(freq), req); + error = sysctl_handle_quad(oidp, &freq, 0, req); if (error == 0 && req->newptr != NULL) { tsc_freq = freq; tsc_timecounter.tc_frequency = tsc_freq; @@ -212,8 +212,8 @@ return (error); } -SYSCTL_PROC(_machdep, OID_AUTO, tsc_freq, CTLTYPE_LONG | CTLFLAG_RW, - 0, sizeof(u_int), sysctl_machdep_tsc_freq, "IU", ""); +SYSCTL_PROC(_machdep, OID_AUTO, tsc_freq, CTLTYPE_QUAD | CTLFLAG_RW, + 0, sizeof(u_int), sysctl_machdep_tsc_freq, "QU", ""); static unsigned tsc_get_timecount(struct timecounter *tc) ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/vm_machdep.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.254 2007/04/24 21:17:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.255 2007/06/04 23:57:29 jeff Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -170,7 +170,7 @@ * pcb2->pcb_[fg]sbase: cloned above */ - /* Setup to release sched_lock in fork_exit(). */ + /* Setup to release spin count in fork_exit(). */ td2->td_md.md_spinlock_count = 1; td2->td_md.md_saved_flags = PSL_KERNEL | PSL_I; @@ -304,7 +304,7 @@ * pcb2->pcb_[fg]sbase: cloned above */ - /* Setup to release sched_lock in fork_exit(). */ + /* Setup to release spin count in fork_exit(). */ td->td_md.md_spinlock_count = 1; td->td_md.md_saved_flags = PSL_KERNEL | PSL_I; } ==== //depot/projects/soc2007/rpaulo-macbook/amd64/ia32/ia32_syscall.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.17 2006/12/17 06:48:39 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.18 2007/06/04 21:38:45 attilio Exp $"); /* * 386 Trap and System call handling @@ -105,10 +105,10 @@ ksiginfo_t ksi; /* - * note: PCPU_LAZY_INC() can only be used if we can afford + * note: PCPU_INC() can only be used if we can afford * occassional inaccuracy in the count. */ - PCPU_LAZY_INC(cnt.v_syscall); + PCPU_INC(cnt.v_syscall); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 7 11:44:46 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2358616A474; Thu, 7 Jun 2007 11:44:46 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 D227416A46F for ; Thu, 7 Jun 2007 11:44:45 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C2BED13C44B for ; Thu, 7 Jun 2007 11:44:45 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l57BijFK048296 for ; Thu, 7 Jun 2007 11:44:45 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l57BijuW048290 for perforce@freebsd.org; Thu, 7 Jun 2007 11:44:45 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 7 Jun 2007 11:44:45 GMT Message-Id: <200706071144.l57BijuW048290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 121152 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2007 11:44:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=121152 Change 121152 by rpaulo@rpaulo_epsilon on 2007/06/07 11:43:45 Comply with style(9). Noticed by: Attilio Rao Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#13 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#13 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#12 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#13 $ * */ @@ -202,13 +202,13 @@ for (i = 0; asmc_models[i].smc_model; i++) { if (!strncmp(model, asmc_models[i].smc_model, strlen(model))) { freeenv(model); - return &asmc_models[i]; + return (&asmc_models[i]); } } freeenv(model); - return NULL; + return (NULL); } static int @@ -217,19 +217,19 @@ struct asmc_model *model; if (resource_disabled("asmc", 0)) - return ENXIO; + return (ENXIO); model = asmc_match(dev); if (!model) - return ENXIO; + return (ENXIO); if (isa_get_irq(dev) == -1) bus_set_resource(dev, SYS_RES_IRQ, 0, ASMC_IRQ, 1); device_set_desc(dev, model->smc_desc); - return BUS_PROBE_GENERIC; + return (BUS_PROBE_GENERIC); } static int @@ -380,11 +380,11 @@ #ifdef INTR_FILTER error = bus_setup_intr(dev, sc->sc_res, - INTR_TYPE_MISC|INTR_MPSAFE, + INTR_TYPE_MISC | INTR_MPSAFE, asmc_sms_intr, NULL, dev, &sc->sc_cookie); #else error = bus_setup_intr(dev, sc->sc_res, - INTR_TYPE_MISC|INTR_MPSAFE|INTR_FAST, + INTR_TYPE_MISC | INTR_MPSAFE | INTR_FAST, NULL, asmc_sms_fastintr, dev, &sc->sc_cookie); #endif if (error) { @@ -394,7 +394,7 @@ } out: - return 0; + return (0); } static int @@ -411,7 +411,7 @@ mtx_destroy(&sc->sc_mtx); - return 0; + return (0); } static int @@ -492,7 +492,7 @@ device_printf(dev, "number of keys: %d\n", buf[3]); } - return error; + return (error); } /* @@ -508,7 +508,7 @@ for (i = 0; i < 1000; i++) { if ((inb(ASMC_CMDPORT) & ASMC_STATUS_MASK) == val) - return 0; + return (0); DELAY(10); } @@ -516,7 +516,7 @@ inb(ASMC_CMDPORT)); - return 1; + return (1); } @@ -550,7 +550,7 @@ out: mtx_unlock_spin(&sc->sc_mtx); - return error; + return (error); } static int @@ -583,7 +583,7 @@ out: mtx_unlock_spin(&sc->sc_mtx); - return error; + return (error); } @@ -596,9 +596,9 @@ uint8_t buf[1]; if (asmc_key_read(dev, ASMC_KEY_FANCOUNT, buf, 1) < 0) - return -1; + return (-1); - return buf[0]; + return (buf[0]); } static int @@ -611,11 +611,11 @@ snprintf(fankey, sizeof(fankey), key, fan); if (asmc_key_read(dev, fankey, buf, 2) < 0) - return -1; + return (-1); speed = (buf[0] << 6) | (buf[1] >> 2); - return speed; + return (speed); } static int @@ -630,7 +630,7 @@ error = sysctl_handle_int(oidp, &v, 0, req); - return error; + return (error); } static int @@ -645,7 +645,7 @@ error = sysctl_handle_int(oidp, &v, 0, req); - return error; + return (error); } @@ -661,7 +661,7 @@ error = sysctl_handle_int(oidp, &v, 0, req); - return error; + return (error); } static int @@ -676,7 +676,7 @@ error = sysctl_handle_int(oidp, &v, 0, req); - return error; + return (error); } static int @@ -691,7 +691,7 @@ error = sysctl_handle_int(oidp, &v, 0, req); - return error; + return (error); } /* @@ -703,9 +703,9 @@ uint8_t buf[2]; if (asmc_key_read(dev, key, buf, 2) < 0) - return -1; + return (-1); - return buf[0]; + return (buf[0]); } static int @@ -719,7 +719,7 @@ error = sysctl_handle_int(oidp, &val, 0, req); - return error; + return (error); } /* @@ -747,7 +747,7 @@ *val = ((int16_t)buf[0] << 8) | buf[1]; out: - return error; + return (error); } static void @@ -774,7 +774,7 @@ asmc_sms_printintr(dev, type); - return FILTER_HANDLED; + return (FILTER_HANDLED); } #else static void @@ -824,7 +824,7 @@ v = (int32_t) val; error = sysctl_handle_int(oidp, &v, 0, req); - return error; + return (error); } static int @@ -840,7 +840,7 @@ v = (int32_t) val; error = sysctl_handle_int(oidp, &v, 0, req); - return error; + return (error); } static int @@ -856,5 +856,5 @@ v = (int32_t) val; error = sysctl_handle_int(oidp, &v, sizeof(v), req); - return error; + return (error); } From owner-p4-projects@FreeBSD.ORG Thu Jun 7 11:49:54 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F77D16A421; Thu, 7 Jun 2007 11:49:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 5C27516A400 for ; Thu, 7 Jun 2007 11:49:53 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 49B0713C448 for ; Thu, 7 Jun 2007 11:49:53 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l57Bnrqp052448 for ; Thu, 7 Jun 2007 11:49:53 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l57BnroG052433 for perforce@freebsd.org; Thu, 7 Jun 2007 11:49:53 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Thu, 7 Jun 2007 11:49:53 GMT Message-Id: <200706071149.l57BnroG052433@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 121153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2007 11:49:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=121153 Change 121153 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/07 11:49:34 MAC Test needs the modification of kernel, I import the newest kernel today, and move the mactest to tools/regression Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/README#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/macproc.c#3 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/acpica/OsdEnvironment.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/acpica/acpi_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/acpica/acpi_wakeup.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/acpica/madt.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/amd64_mem.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/apic_vector.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/atomic.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/autoconf.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/bios.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/bpf_jit_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/bpf_jit_machdep.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/busdma_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/cpu_switch.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/db_disasm.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/db_interface.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/db_trace.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/dump_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/elf_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/exception.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/fpu.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/gdb_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/genassym.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/identcpu.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/in_cksum.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/initcpu.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/intr_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/io.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/io_apic.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/legacy.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/local_apic.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/locore.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/mem.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/minidump_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/mp_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/mp_watchdog.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/mpboot.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/mptable.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/mptable_pci.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/msi.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/nexus.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/pmap.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/prof_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/sigtramp.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/support.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/sys_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/trap.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/tsc.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/uio_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/uma_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/vm_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/compile/.cvsignore#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/conf/.cvsignore#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/conf/DEFAULTS#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/conf/GENERIC#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/conf/GENERIC.hints#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/conf/MAC#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/conf/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/conf/NOTES#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/ia32/ia32_exception.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/ia32/ia32_reg.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/ia32/ia32_signal.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/ia32/ia32_sigtramp.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/ia32/ia32_syscall.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/_bus.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/_inttypes.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/_limits.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/_stdint.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/_types.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/acpica_machdep.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/apicreg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/apicvar.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/asm.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/asmacros.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/atomic.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/bus.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/bus_dma.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/clock.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/cpu.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/cpufunc.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/cputypes.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/db_machdep.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/elf.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/endian.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/exec.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/float.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/floatingpoint.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/fpu.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/frame.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/gdb_machdep.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/ieeefp.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/in_cksum.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/intr_machdep.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/iodev.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/kdb.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/legacyvar.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/limits.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/md_var.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/memdev.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/metadata.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/minidump.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/mp_watchdog.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/mptable.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/mutex.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/param.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/pc/bios.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/pc/display.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/pcb.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/pcb_ext.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/pci_cfgreg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/pcpu.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/pmap.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/pmc_mdep.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/ppireg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/proc.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/profile.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/psl.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/ptrace.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/reg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/reloc.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/resource.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/runq.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/segments.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/setjmp.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/sf_buf.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/sigframe.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/signal.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/smp.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/specialreg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/stdarg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/sysarch.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/timerreg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/trap.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/tss.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/ucontext.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/varargs.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/vmparam.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/atpic.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/atpic_vector.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/clock.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/elcr.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/icu.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/isa.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/isa.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/isa_dma.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/nmi.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_dummy.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_genassym.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_ipc64.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_locore.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_proto.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_support.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_syscall.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_sysent.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_sysvec.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/syscalls.conf#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/syscalls.master#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/pci/pci_bus.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/pci/pci_cfgreg.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/autoconf.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/bcopy_page.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/bcopyinout.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/bcopyinout_xscale.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/blockio.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/bootconfig.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/bus_space_asm_generic.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/busdma_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/copystr.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_arm10.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_arm8.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_arm9.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_armv4.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_sa1.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_sa11x0.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_xscale.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/db_disasm.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/db_interface.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/db_trace.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/disassem.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/dump_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/elf_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/elf_trampoline.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/exception.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/fiq.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/fiq_subr.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/fusu.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/gdb_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/genassym.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/identcpu.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/in_cksum.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/in_cksum_arm.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/inckern.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/intr.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/irq_dispatch.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/locore.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/mem.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/nexus.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/nexus_io.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/nexus_io_asm.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/pmap.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/setcpsr.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/setstack.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/support.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/swtch.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/sys_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/trap.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/uio_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/undefined.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/vectors.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/vm_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_mci.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_mcireg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_pdcreg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_pio.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_pio_rm9200.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_pioreg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_piovar.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_pmc.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_pmcreg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_pmcvar.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_rtc.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_rtcreg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_spi.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_spireg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_ssc.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_sscreg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_st.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_streg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_twi.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_twiio.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_twireg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_usartreg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91rm92reg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91var.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/files.at91#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/files.kb920x#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/hints.at91rm9200#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/hints.at91sam9261#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/if_ate.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/if_atereg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/kb920x_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/ohci_atmelarm.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/std.at91#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/std.kb920x#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/uart_bus_at91usart.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/uart_dev_at91usart.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/compile/.cvsignore#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/.cvsignore#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/AVILA#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/AVILA.hints#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/BWCT#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/BWCT.hints#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/EP80219#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/IQ31244#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/KB920X#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/KB920X.hints#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/SIMICS#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/SKYEYE#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/_bus.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/_inttypes.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/_limits.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/_stdint.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/_types.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/armreg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/asm.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/asmacros.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/atomic.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/blockio.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/bootconfig.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/bus.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/bus_dma.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/clock.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/cpu.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/cpuconf.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/cpufunc.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/db_machdep.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/disassem.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/elf.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/endian.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/exec.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/fiq.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/float.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/floatingpoint.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/fp.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/frame.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/gdb_machdep.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/ieee.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/ieeefp.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/in_cksum.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/intr.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/katelib.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/kdb.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/limits.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/machdep.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/md_var.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/memdev.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/metadata.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/mutex.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/param.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/pcb.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/pcpu.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/pmap.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/pmc_mdep.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/proc.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/profile.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/psl.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/pte.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/ptrace.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/reg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/reloc.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/resource.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/runq.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/setjmp.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/sf_buf.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/sigframe.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/signal.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/smp.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/stdarg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/swi.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/sysarch.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/trap.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/ucontext.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/undefined.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/utrap.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/vmparam.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/assabet_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/files.sa11x0#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_dmacreg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_gpioreg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_io.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_io_asm.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_irq.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_irqhandler.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_ost.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_ostreg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_ppcreg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_reg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_var.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/std.sa11x0#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/uart_bus_sa1110.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/uart_cpu_sa1110.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/uart_dev_sa1110.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/uart_dev_sa1110.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/ep80219_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/files.ep80219#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/files.i80219#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/files.i80321#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/files.iq31244#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_aau.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_dma.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_intr.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_mcu.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_pci.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_space.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_timer.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_wdog.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321reg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321var.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/iq31244_7seg.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/iq31244_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/iq80321.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/iq80321reg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/iq80321var.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/obio.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/obio_space.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/obiovar.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/std.ep80219#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/std.i80219#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/std.i80321#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/std.iq31244#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/uart_bus_i80321.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/avila_ata.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/avila_led.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/avila_machdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/files.avila#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/files.ixp425#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/if_npe.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/if_npereg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixdp425_pci.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixdp425reg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_iic.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_intr.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_mem.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_npe.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_npereg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_npevar.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_pci.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_space.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_timer.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_wdog.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425reg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425var.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/std.avila#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/std.ixp425#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/std.xscale#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/xscalereg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/xscalevar.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/README#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/Makefile.inc#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot0/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot0/README#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot0/linker.cfg#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot0/main.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot0iic/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot0iic/main.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot0spi/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot0spi/main.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot2/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot2/board.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot2/boot2.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot2/kb920x_board.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootiic/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootiic/README#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootiic/env_vars.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootiic/env_vars.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootiic/loader_prompt.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootiic/loader_prompt.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootiic/main.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/README#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/ee.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/ee.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/env_vars.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/env_vars.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/loader_prompt.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/loader_prompt.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/main.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/arm_init.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/at91rm9200.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/delay.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/eeprom.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/emac.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/emac.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/emac_init.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/getc.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/lib.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/mci_device.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/memcmp.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/memcpy.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/memset.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/p_string.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/printf.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/putchar.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/reset.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/sd-card.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/sd-card.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/spi_flash.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/spi_flash.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/strcmp.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/strcpy.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/strcvt.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/strlen.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/tag_list.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/tag_list.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/xmodem.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/linker.cfg#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/Makefile.inc#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/bcache.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/boot.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/bootstrap.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/commands.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/console.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/dev_net.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/dev_net.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/devopen.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/help.common#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/interp.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/interp_backslash.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/interp_forth.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/interp_parse.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/isapnp.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/isapnp.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/load.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/load_elf.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/load_elf32.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/load_elf32_obj.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/load_elf64.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/load_elf64_obj.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/load_elf_obj.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/loader.8#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/ls.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/merge_help.awk#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/misc.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/module.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/newvers.sh#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/panic.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/pnp.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/reloc_elf.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/reloc_elf32.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/reloc_elf64.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/ufsread.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/Makefile.inc#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/README#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efi.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efi_nii.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efiapi.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/eficon.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efidebug.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efidef.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efidevp.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efierr.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efifpswa.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efifs.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efilib.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efinet.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efipart.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efiprot.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efipxebc.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efiser.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efistdarg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/i386/efibind.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/i386/pe.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/ia64/efibind.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/ia64/pe.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/delay.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/efi_console.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/efifs.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/efinet.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/errno.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/handles.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/libefi.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/time.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/arm/sysdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/arm/sysdep.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/dict.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/ficl.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/ficl.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/fileaccess.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/float.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/i386/sysdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/i386/sysdep.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/ia64/sysdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/ia64/sysdep.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/loader.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/math64.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/math64.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/powerpc/sysdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/powerpc/sysdep.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/prefix.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/search.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/classes.fr#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/ficlclass.fr#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/ficllocal.fr#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/fileaccess.fr#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/forml.fr#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/freebsd.fr#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/ifbrack.fr#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/jhlocal.fr#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/marker.fr#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/oo.fr#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/prefix.fr#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/softcore.awk#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/softcore.fr#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/string.fr#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/sparc64/sysdep.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/sparc64/sysdep.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/stack.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/testmain.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/tools.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/unix.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/vm.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/words.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/beastie.4th#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/frames.4th#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/loader.4th#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/loader.4th.8#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/loader.conf#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/loader.conf.5#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/loader.rc#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/pnp.4th#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/screen.4th#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/support.4th#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/Makefile.inc#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot0/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot0/boot0.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot0/boot0ext.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot0ext/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot0sio/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot2/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot2/boot1.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot2/boot2.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot2/lib.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot2/sio.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/Makefile.inc#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/btx/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/btx/btx.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/btxldr/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/btxldr/btxldr.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/lib/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/lib/btxcsu.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/lib/btxsys.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/lib/btxv86.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/lib/btxv86.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/cdboot/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/cdboot/cdboot.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/kgzldr/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/kgzldr/boot.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/kgzldr/crt.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/kgzldr/kgzldr.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/kgzldr/lib.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/kgzldr/sio.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/kgzldr/start.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libfirewire/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libfirewire/dconsole.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libfirewire/firewire.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libfirewire/fwohci.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libfirewire/fwohci.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libfirewire/fwohcireg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/amd64_tramp.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/biosacpi.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/bioscd.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/biosdisk.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/biosmem.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/biospci.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/biospnp.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/biossmap.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/bootinfo.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/bootinfo32.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/bootinfo64.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/comconsole.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/devicename.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/elf32_freebsd.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/elf64_freebsd.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/i386_copy.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/i386_module.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/libi386.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/nullconsole.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/pread.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/pxe.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/pxe.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/pxetramp.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/smbios.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/time.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/vidconsole.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/loader/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/loader/conf.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/loader/help.i386#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/loader/loader.rc#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/loader/main.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/loader/version#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/mbr/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/mbr/mbr.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/pxeldr/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/pxeldr/pxeboot.8#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/pxeldr/pxeldr.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/Makefile.inc#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/common/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/common/autoload.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/common/bootinfo.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/common/copy.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/common/devicename.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/common/exec.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/common/libia64.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/efi/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/efi/conf.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/efi/efimd.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/efi/ldscript.ia64#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/efi/main.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/efi/start.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/efi/version#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/acpi_stub.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/conf.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/delay.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/efi_stub.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/exit.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/ldscript.ia64#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/libski.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/main.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/pal_stub.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/sal_stub.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/skiconsole.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/skifs.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/skiload.cmd#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/skimd.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/ssc.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/start.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/time.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/version#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/common/Makefile.inc#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/common/main.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/devicename.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/elf_freebsd.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/libofw.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/ofw_console.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/ofw_copy.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/ofw_disk.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/ofw_memory.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/ofw_module.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/ofw_net.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/ofw_reboot.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/ofw_time.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/openfirm.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/openfirm.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/openfirm_mmu.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/Makefile.inc#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/boot.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/boot0.5.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/disk.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/ldscript#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/putssjis.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/selector.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/start.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/support.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/syscons.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0/boot0.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/README.serial.98#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/asm.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/asm.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/bios.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/boot.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/boot.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/boot2.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/dinode.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/disk.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/fs.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/inode.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/io.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/probe_keyboard.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/quota.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/serial.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/serial_16550.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/serial_8251.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/start.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/sys.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/table.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/Makefile.inc#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/btx/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/btx/btx.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/btxldr/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/btxldr/btxldr.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/lib/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/lib/btxcsu.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/lib/btxsys.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/lib/btxv86.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/lib/btxv86.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/cdboot/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/cdboot/cdboot.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/kgzldr/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/kgzldr/crt.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/bioscd.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/biosdisk.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/biosmem.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/biossmap.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/comconsole.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/i386_module.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/time.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/vidconsole.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/loader/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/loader/conf.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/loader/help.pc98#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/loader/main.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/powerpc/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/powerpc/loader/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/powerpc/loader/conf.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/powerpc/loader/help.ofw#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/powerpc/loader/ldscript.powerpc#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/powerpc/loader/metadata.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/powerpc/loader/start.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/powerpc/loader/version#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/Makefile.inc#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/boot1/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/boot1/_start.s#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/boot1/boot1.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/loader/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/loader/help.sparc64#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/loader/locore.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/loader/main.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/loader/metadata.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/loader/version#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/bsm/audit.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/bsm/audit_internal.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/bsm/audit_kevents.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/bsm/audit_record.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/README.quirks#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_ccb.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_debug.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_periph.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_periph.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_queue.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_queue.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_sim.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_sim.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_xpt.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_xpt.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_xpt_periph.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_xpt_sim.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_all.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_all.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_cd.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_cd.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_ch.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_ch.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_da.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_da.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_dvcfg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_iu.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_low.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_low.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_low_pisa.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_low_pisa.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_message.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_pass.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_pass.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_pt.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_pt.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_sa.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_sa.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_ses.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_ses.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_sg.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_sg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_targ_bh.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_target.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_targetio.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/00READ#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/README#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/TODO#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/cnode.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_fbsd.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_io.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_kernel.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_namecache.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_namecache.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_opstats.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_pioctl.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_psdev.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_psdev.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_subr.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_subr.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_venus.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_venus.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_vfsops.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_vfsops.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_vnops.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_vnops.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/freebsd32.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/freebsd32_misc.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/freebsd32_proto.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/freebsd32_signal.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/freebsd32_syscall.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/freebsd32_syscalls.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/freebsd32_sysent.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/freebsd32_util.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/syscalls.conf#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/syscalls.master#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ia32/ia32_genassym.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ia32/ia32_reg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ia32/ia32_signal.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ia32/ia32_sysvec.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ia32/ia32_util.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linprocfs/linprocfs.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linsysfs/linsysfs.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_emul.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_emul.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_file.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_futex.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_futex.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_getcwd.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_ioctl.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_ioctl.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_ipc.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_ipc.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_mib.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_mib.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_misc.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_misc.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_signal.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_signal.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_socket.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_socket.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_stats.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_sysctl.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_sysproto.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_time.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_uid16.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_util.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_util.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/cfg_var.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/hal_var.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/kern_ndis.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/kern_windrv.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/ndis_var.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/ntoskrnl_var.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/pe_var.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/resource_var.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/subr_hal.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/subr_ndis.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/subr_ntoskrnl.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/subr_pe.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/subr_usbd.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/usbd_var.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/winx32_wrap.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/winx64_wrap.S#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/netbsd/dvcfg.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/netbsd/physio_proc.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_misc.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_policy.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_string.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_zone.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/machine/endian.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/rpc/xdr.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/acl.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/byteorder.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/callb.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/cmn_err.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/cred.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/debug.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/dirent.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/dkio.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/dnlc.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/kcondvar.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/kmem.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/kobj.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/kstat.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/lock.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/misc.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/mntent.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/mnttab.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/mount.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/mutex.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/policy.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/proc.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/random.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/rwlock.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/sdt.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/string.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/sunddi.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/sysmacros.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/systm.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/taskq.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/taskq_impl.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/time.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/types.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/uio.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/varargs.h#1 add >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 7 20:59:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F8B516A46C; Thu, 7 Jun 2007 20:59:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 51ED616A468 for ; Thu, 7 Jun 2007 20:59:43 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 424DD13C457 for ; Thu, 7 Jun 2007 20:59:43 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l57KxhpI001871 for ; Thu, 7 Jun 2007 20:59:43 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l57KxgsE001862 for perforce@freebsd.org; Thu, 7 Jun 2007 20:59:42 GMT (envelope-from ivoras@FreeBSD.org) Date: Thu, 7 Jun 2007 20:59:42 GMT Message-Id: <200706072059.l57KxgsE001862@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 121173 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2007 20:59:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=121173 Change 121173 by ivoras@ivoras_finstall on 2007/06/07 20:59:21 Start working on interface to the SysToolD server. Currently it's used succesfully to display a list of drives to the user. Affected files ... .. //depot/projects/soc2007/ivoras_finstall/installer/basewin.py#3 edit .. //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#8 edit .. //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#8 edit .. //depot/projects/soc2007/ivoras_finstall/installer/glade/ndisks.glade#3 edit .. //depot/projects/soc2007/ivoras_finstall/installer/helpdialog.py#2 edit Differences ... ==== //depot/projects/soc2007/ivoras_finstall/installer/basewin.py#3 (text+ko) ==== @@ -51,5 +51,22 @@ cont.remove(child) + def _show_message(self, text, title, p_buttons=gtk.BUTTONS_OK, p_type=gtk.MESSAGE_INFO): + """Displays a message box""" + dlg = gtk.MessageDialog(self.window, flags=gtk.DIALOG_MODAL, type=p_type, buttons=p_buttons, message_format=text) + dlg.set_title(title) + dlg.run() + dlg.destroy() + + def _make_column(self, name, listid, sort=False): + """Creates a TreeViewColumn named "name" which is connected to "listid" column + of the rows added as a model""" + col = gtk.TreeViewColumn(name) + cell = gtk.CellRendererText() + col.pack_start(cell, True) + col.add_attribute(cell, "text", listid) + if sort: + col.set_sort_column_id(listid) + return col ==== //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#8 (text+ko) ==== @@ -1,5 +1,8 @@ +import sys +import time import logging from types import MethodType +from xmlrpclib import ServerProxy import gtk, gtk.gdk, gtk.glade from basewin import BaseWin @@ -17,6 +20,7 @@ def __init__(self): BaseWin.__init__(self, "mainwin") self.tile_xml = None # will be used for tiles + self.first_focus = True self["img_logo"].set_from_file("img/logo.jpg") # img_logo stretches the window vertically, so calling window.set_position() has no affect self._center_window(self.window) @@ -65,6 +69,37 @@ # buttons, etc. def on_mainwin_delete_event(self, obj, data): gtk.main_quit() + return False + + + def on_mainwin_activate_focus(self, obj, data): + print "activate_focus" + + + def on_mainwin_set_focus(self, obj, data): + """A kludge - hook an event to fire after the GUI is running""" + if self.first_focus: + self.first_focus = False + self.initial_tasks() + + + def initial_tasks(self): + """Perform initial tasks after the GUI is running. For now, + set up connection to the SysToolD server""" + self.server = ServerProxy("http://localhost:1025") + try: + caps = self.server.GetCaps() + except: + time.sleep(5) # retry + try : + caps = self.server.GetCaps() + except: + self._show_message("Cannot contact local SysToolD server.\nShutting down.", "Error", p_type=gtk.MESSAGE_ERROR) + logging.exception("Cannot contact local SysToolD server") + sys.exit(1) + if not "systoold" in caps: + self._show_message("The SysToolD server is bogus.\nShutting down.", "Error", p_type=gtk.MESSAGE_ERROR) + sys.exit(1) def on_button_next_clicked(self, obj): @@ -125,6 +160,21 @@ # Handlers for "ndisks" def ndisks_on_load(self): self._load_label(self["label2"], "ndisks.txt") + drives = self.server.GetDrives() + if len(drives) < 0: + self._show_message("No usable drives detected.\nThis is a fatal error and the Installer cannot continue.", "Error", p_type=gtk.MESSAGE_ERROR) + return + + list = gtk.ListStore(str, str, str) + drive_list = drives.keys() + drive_list.sort() + for dev in drive_list: + list.append([dev, drives[dev]["name"], "%d MB" % drives[dev]["mediasize"]]) + self["disktree"].set_model(list) + self["disktree"].append_column(self._make_column("Device", 0, True)) + self["disktree"].append_column(self._make_column("Description", 1)) + self["disktree"].append_column(self._make_column("Size", 2)) + self["disktree"].set_cursor(0) return True ==== //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#8 (text+ko) ==== @@ -13,9 +13,12 @@ 450 logo.png + + True + - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ==== //depot/projects/soc2007/ivoras_finstall/installer/helpdialog.py#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Jun 7 21:00:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73D0B16A469; Thu, 7 Jun 2007 21:00:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 516A816A400 for ; Thu, 7 Jun 2007 21:00:45 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 29D9713C468 for ; Thu, 7 Jun 2007 21:00:45 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l57L0j3M002915 for ; Thu, 7 Jun 2007 21:00:45 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l57L0iEJ002905 for perforce@freebsd.org; Thu, 7 Jun 2007 21:00:44 GMT (envelope-from ivoras@FreeBSD.org) Date: Thu, 7 Jun 2007 21:00:44 GMT Message-Id: <200706072100.l57L0iEJ002905@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 121174 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2007 21:00:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=121174 Change 121174 by ivoras@ivoras_finstall on 2007/06/07 20:59:45 Start of the script to build the installer ISO Affected files ... .. //depot/projects/soc2007/ivoras_finstall/makeimage/makeimage.py#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 7 21:05:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AB2416A47C; Thu, 7 Jun 2007 21:05:32 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3DB6516A400; Thu, 7 Jun 2007 21:05:32 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id E8C5013C45E; Thu, 7 Jun 2007 21:05:31 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.13.8/8.13.4) with ESMTP id l57L5G2S082716; Thu, 7 Jun 2007 15:05:16 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Thu, 07 Jun 2007 15:05:39 -0600 (MDT) Message-Id: <20070607.150539.420518465.imp@bsdimp.com> To: andrew@freebsd.org From: "M. Warner Losh" In-Reply-To: <200706070959.l579xDrJ050756@repoman.freebsd.org> References: <200706070959.l579xDrJ050756@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (harmony.bsdimp.com [127.0.0.1]); Thu, 07 Jun 2007 15:05:17 -0600 (MDT) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 121139 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2007 21:05:32 -0000 The freebsd's preferred license is a little different than you committed. If it is just the same to you, please consider using the following. If you want to leave it as it is, that's cool too. It is up to you, after all. Warner Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From owner-p4-projects@FreeBSD.ORG Thu Jun 7 22:07:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42C5916A421; Thu, 7 Jun 2007 22:07:24 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 11BBE16A400 for ; Thu, 7 Jun 2007 22:07:24 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 00BF613C45E for ; Thu, 7 Jun 2007 22:07:24 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l57M7N7Z072016 for ; Thu, 7 Jun 2007 22:07:23 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l57M7GRs071897 for perforce@freebsd.org; Thu, 7 Jun 2007 22:07:16 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 7 Jun 2007 22:07:16 GMT Message-Id: <200706072207.l57M7GRs071897@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 121179 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2007 22:07:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=121179 Change 121179 by mjacob@mjexp on 2007/06/07 22:07:14 IFC Affected files ... .. //depot/projects/mjexp/contrib/bind9/lib/isc/arm/include/isc/atomic.h#1 branch .. //depot/projects/mjexp/contrib/nvi/cl/cl_screen.c#2 integrate .. //depot/projects/mjexp/games/fortune/datfiles/fortunes#13 integrate .. //depot/projects/mjexp/lib/bind/config.mk#3 integrate .. //depot/projects/mjexp/lib/libc/net/getaddrinfo.3#2 integrate .. //depot/projects/mjexp/share/man/man4/axe.4#3 integrate .. //depot/projects/mjexp/share/man/man4/wlan.4#2 integrate .. //depot/projects/mjexp/share/man/man9/condvar.9#5 integrate .. //depot/projects/mjexp/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/mjexp/sys/amd64/amd64/genassym.c#7 integrate .. //depot/projects/mjexp/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/mjexp/sys/arm/include/pcpu.h#4 integrate .. //depot/projects/mjexp/sys/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/mjexp/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/mjexp/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/mjexp/sys/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/mjexp/sys/dev/ath/if_ath.c#13 integrate .. //depot/projects/mjexp/sys/dev/ath/if_ath_pci.c#5 integrate .. //depot/projects/mjexp/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/mjexp/sys/dev/ath/if_athrate.h#3 integrate .. //depot/projects/mjexp/sys/dev/ath/if_athvar.h#7 integrate .. //depot/projects/mjexp/sys/dev/bce/if_bce.c#14 integrate .. //depot/projects/mjexp/sys/dev/bce/if_bcereg.h#8 integrate .. //depot/projects/mjexp/sys/dev/de/if_de.c#3 integrate .. //depot/projects/mjexp/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/mjexp/sys/dev/firewire/firewirereg.h#5 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwdev.c#6 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwdma.c#3 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwohci.c#5 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwohci_pci.c#6 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/mjexp/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/mjexp/sys/dev/firewire/if_fwevar.h#2 integrate .. //depot/projects/mjexp/sys/dev/firewire/if_fwip.c#5 integrate .. //depot/projects/mjexp/sys/dev/firewire/if_fwipvar.h#2 integrate .. //depot/projects/mjexp/sys/dev/firewire/sbp.c#8 integrate .. //depot/projects/mjexp/sys/dev/firewire/sbp_targ.c#5 integrate .. //depot/projects/mjexp/sys/dev/mii/brgphy.c#11 integrate .. //depot/projects/mjexp/sys/dev/mii/brgphyreg.h#3 integrate .. //depot/projects/mjexp/sys/dev/mii/ciphy.c#4 integrate .. //depot/projects/mjexp/sys/dev/mii/ciphyreg.h#2 integrate .. //depot/projects/mjexp/sys/dev/mii/miidevs#9 integrate .. //depot/projects/mjexp/sys/dev/mii/rlphy.c#8 integrate .. //depot/projects/mjexp/sys/dev/puc/puc.c#3 integrate .. //depot/projects/mjexp/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/ac97.c#9 integrate .. //depot/projects/mjexp/sys/dev/sound/pcm/ac97_patch.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/ubsa.c#6 integrate .. //depot/projects/mjexp/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/udbp.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/ulpt.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/ums.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/uplcom.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/urio.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/usb.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/usb.h#2 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/mjexp/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/uvscom.c#4 integrate .. //depot/projects/mjexp/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/mjexp/sys/geom/part/g_part.c#5 integrate .. //depot/projects/mjexp/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/mjexp/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/mjexp/sys/i386/i386/genassym.c#5 integrate .. //depot/projects/mjexp/sys/i386/i386/machdep.c#15 integrate .. //depot/projects/mjexp/sys/i386/i386/swtch.s#3 integrate .. //depot/projects/mjexp/sys/ia64/ia64/machdep.c#10 integrate .. //depot/projects/mjexp/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/mjexp/sys/ia64/ia64/pmap.c#10 integrate .. //depot/projects/mjexp/sys/kern/kern_mutex.c#11 integrate .. //depot/projects/mjexp/sys/kern/kern_thr.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_umtx.c#10 integrate .. //depot/projects/mjexp/sys/kern/sched_4bsd.c#11 integrate .. //depot/projects/mjexp/sys/kern/sched_ule.c#16 integrate .. //depot/projects/mjexp/sys/net80211/_ieee80211.h#6 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211.c#7 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_acl.c#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_crypto.c#3 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_crypto.h#3 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_crypto_none.c#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_input.c#7 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_node.c#6 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_proto.c#6 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_var.h#7 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_xauth.c#2 integrate .. //depot/projects/mjexp/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_sysctl.c#6 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.c#14 integrate .. //depot/projects/mjexp/sys/netinet/tcp_syncache.c#12 integrate .. //depot/projects/mjexp/sys/pc98/pc98/machdep.c#14 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/vm_machdep.c#4 integrate .. //depot/projects/mjexp/sys/sparc64/fhc/fhc.c#4 integrate .. //depot/projects/mjexp/sys/sparc64/pci/psycho.c#5 integrate .. //depot/projects/mjexp/sys/sparc64/sbus/sbus.c#5 integrate .. //depot/projects/mjexp/sys/sys/mutex.h#11 integrate .. //depot/projects/mjexp/sys/sys/param.h#19 integrate .. //depot/projects/mjexp/sys/sys/pcpu.h#6 integrate .. //depot/projects/mjexp/sys/sys/proc.h#16 integrate .. //depot/projects/mjexp/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/mjexp/sys/sys/thr.h#3 integrate .. //depot/projects/mjexp/sys/sys/umtx.h#6 integrate .. //depot/projects/mjexp/usr.bin/gzip/gzip.1#4 integrate .. //depot/projects/mjexp/usr.sbin/boot0cfg/boot0cfg.8#3 integrate .. //depot/projects/mjexp/usr.sbin/dconschat/dconschat.c#3 integrate Differences ... ==== //depot/projects/mjexp/contrib/nvi/cl/cl_screen.c#2 (text+ko) ==== @@ -6,7 +6,7 @@ * * See the LICENSE file for redistribution information. * - * $FreeBSD: src/contrib/nvi/cl/cl_screen.c,v 1.2 2001/11/09 02:23:05 rwatson Exp $ + * $FreeBSD: src/contrib/nvi/cl/cl_screen.c,v 1.4 2007/06/06 11:14:30 rafan Exp $ */ #include "config.h" @@ -25,6 +25,7 @@ #include #include #include +#include #include #include ==== //depot/projects/mjexp/games/fortune/datfiles/fortunes#13 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.239 2007/05/31 20:16:46 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.240 2007/06/06 11:12:56 ceri Exp $ % ======================================================================= @@ -27058,7 +27058,7 @@ have let me in on it by now. I contribute enough to the shule. -- Saul Goodman % -If there was in justice in the world, "trust" would be a four-letter word. +If there was any justice in the world, "trust" would be a four-letter word. % If there were a school for, say, sheet metal workers, that after three years left its graduates as unprepared for their careers as does law ==== //depot/projects/mjexp/lib/bind/config.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/config.mk,v 1.18 2007/06/03 16:49:57 dougb Exp $ +# $FreeBSD: src/lib/bind/config.mk,v 1.19 2007/06/05 22:17:16 dougb Exp $ .include @@ -65,8 +65,6 @@ # Use the right version of the atomic.h file from lib/isc .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" ISC_ATOMIC_ARCH= x86_32 -.elif ${MACHINE_ARCH} == "arm" -ISC_ATOMIC_ARCH= noatomic .else ISC_ATOMIC_ARCH= ${MACHINE_ARCH} .endif ==== //depot/projects/mjexp/lib/libc/net/getaddrinfo.3#2 (text+ko) ==== @@ -16,9 +16,9 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.32 2005/06/15 19:04:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.33 2007/06/06 19:24:02 remko Exp $ .\" -.Dd December 20, 2004 +.Dd June 6, 2007 .Dt GETADDRINFO 3 .Os .Sh NAME @@ -119,11 +119,41 @@ .Fa ai_protocol is zero the caller will accept any protocol. .It Fa ai_flags +The .Fa ai_flags -is formed by -.Tn OR Ns 'ing -the following values: +field to which the +.Fa hints +parameter points shall be set to zero +or be the bitwise-inclusive OR of one or more of the values +.Dv AI_ADDRCONFIG , +.Dv AI_ALL , +.Dv AI_CANONNAME , +.Dv AI_NUMERICHOST , +.Dv AI_NUMERICSERV , +.Dv AI_PASSIVE , +and +.Dv AI_V4MAPPED . .Bl -tag -width "AI_CANONNAMEXX" +.It Dv AI_ADDRCONFIG +If the +.Dv AI_ADDRCONFIG +bit is set, IPv4 addresses shall be returned only if +an IPv4 address is configured on the local system, +and IPv6 addresses shall be returned only if +an IPv6 address is configured on the local system. +.It Dv AI_ALL +If the +.Dv AI_ALL +bit is set with the +.Dv AI_V4MAPPED +bit, then +.Fn getaddrinfo +shall return all matching IPv6 and IPv4 addresses. +The +.Dv AI_ALL +bit without the +.Dv AI_V4MAPPED +bit is ignored. .It Dv AI_CANONNAME If the .Dv AI_CANONNAME @@ -142,6 +172,18 @@ .Fa hostname should be treated as a numeric string defining an IPv4 or IPv6 address and no name resolution should be attempted. +.It Dv AI_NUMERICSERV +If the +.Dv AI_NUMERICSERV +bit is set, +then a non-null +.Fa servname +string supplied shall be a numeric port string. +Otherwise, an +.Dv EAI_NONAME +error shall be returned. +This bit shall prevent any type of name resolution service +(for example, NIS+) from being invoked. .It Dv AI_PASSIVE If the .Dv AI_PASSIVE @@ -176,6 +218,25 @@ is the null pointer and .Dv AI_PASSIVE is not set. +.It Dv AI_V4MAPPED +If the +.Dv AI_V4MAPPED +flag is specified along with an +.Fa ai_family +of +.Dv AF_INET6 , +then +.Fn getaddrinfo +shall return IPv4-mapped IPv6 addresses +on finding no matching IPv6 addresses ( +.Fa ai_addrlen +shall be 16). +The +.Dv AI_V4MAPPED +flag shall be ignored unless +.Fa ai_family +equals +.Dv AF_INET6 . .El .El .Pp @@ -428,7 +489,7 @@ The .Fn getaddrinfo function is defined by the -.St -p1003.1g-2000 -draft specification and documented in +.St -p1003.1-2004 +specification and documented in .Dv "RFC 3493" , .Dq Basic Socket Interface Extensions for IPv6 . ==== //depot/projects/mjexp/share/man/man4/axe.4#3 (text+ko) ==== @@ -28,9 +28,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/axe.4,v 1.13 2007/05/12 05:59:15 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/axe.4,v 1.14 2007/06/06 19:27:10 remko Exp $ .\" -.Dd May 12, 2007 +.Dd June 6, 2007 .Dt AXE 4 .Os .Sh NAME @@ -134,7 +134,7 @@ .It Buffalo (Melco Inc.) LUA-U2-KTX .It -D-Link DUBE100 +D-Link DUB-E100, revision A .It LinkSys USB200M .It ==== //depot/projects/mjexp/share/man/man4/wlan.4#2 (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/wlan.4,v 1.10 2005/11/26 00:47:07 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.11 2007/06/06 07:58:03 kevlo Exp $ .\" .Dd November 26, 2005 .Dt WLAN 4 @@ -48,6 +48,7 @@ .Xr ipw 4 , .Xr iwi 4 , .Xr ral 4 , +.Xr rum 4 , .Xr ural 4 , and .Xr wi 4 @@ -125,6 +126,7 @@ .Xr iwi 4 , .Xr netintro 4 , .Xr ral 4 , +.Xr rum 4 , .Xr ural 4 , .Xr wi 4 , .Xr wlan_acl 4 , ==== //depot/projects/mjexp/share/man/man9/condvar.9#5 (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/man9/condvar.9,v 1.19 2007/03/30 18:07:26 julian Exp $ +.\" $FreeBSD: src/share/man/man9/condvar.9,v 1.21 2007/06/05 20:53:18 imp Exp $ .\" -.Dd March 21, 2007 +.Dd June 5, 2007 .Dt CONDVAR 9 .Os .Sh NAME @@ -117,6 +117,12 @@ or .Xr sx 9 lock. +A +.Xr mutex 9 +argument must be initialized with +.Dv MTX_DEF +and not +.Dv MTX_SPIN . A thread must hold .Fa lock before calling ==== //depot/projects/mjexp/sys/amd64/amd64/cpu_switch.S#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.157 2007/06/05 00:16:43 jeff Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.158 2007/06/06 07:35:07 davidxu Exp $ */ #include @@ -203,9 +203,7 @@ movq %rbx, (%rax) movq %rbx, PCPU(RSP0) - movl TD_TID(%rsi), %eax movq %r8, PCPU(CURPCB) - movl %eax, PCPU(CURTID) movq %rsi, PCPU(CURTHREAD) /* into next thread */ testl $PCB_32BIT,PCB_FLAGS(%r8) ==== //depot/projects/mjexp/sys/amd64/amd64/genassym.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.162 2007/06/05 00:13:49 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.163 2007/06/06 07:35:07 davidxu Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -194,7 +194,6 @@ ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp)); ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0)); -ASSYM(PC_CURTID, offsetof(struct pcpu, pc_curtid)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/mjexp/sys/amd64/amd64/machdep.c#14 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.674 2007/06/05 00:00:49 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.675 2007/06/06 07:35:07 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1179,7 +1179,6 @@ PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); - PCPU_SET(curtid, thread0.td_tid); PCPU_SET(tssp, &common_tss[0]); /* ==== //depot/projects/mjexp/sys/arm/include/pcpu.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27 - * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.5 2007/06/04 21:38:45 attilio Exp $ + * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.6 2007/06/06 23:23:47 jeff Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -58,7 +58,7 @@ * with respect to preemption. */ #define PCPU_ADD(member, value) (__pcpu.pc_ ## member += (value)) -#define PCPU_INC(member) PCPU_LAZY_ADD(member, 1) +#define PCPU_INC(member) PCPU_ADD(member, 1) #define PCPU_PTR(member) (&__pcpu.pc_ ## member) #define PCPU_SET(member,value) (__pcpu.pc_ ## member = (value)) ==== //depot/projects/mjexp/sys/dev/ath/ah_osdep.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/ah_osdep.c,v 1.2 2007/04/10 15:48:45 rwatson Exp $ + * $FreeBSD: src/sys/dev/ath/ah_osdep.c,v 1.3 2007/06/06 15:49:15 sam Exp $ */ #include "opt_ah.h" ==== //depot/projects/mjexp/sys/dev/ath/ah_osdep.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/ah_osdep.h,v 1.1 2006/09/18 16:49:14 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ah_osdep.h,v 1.2 2007/06/06 15:49:15 sam Exp $ */ #ifndef _ATH_AH_OSDEP_H_ #define _ATH_AH_OSDEP_H_ ==== //depot/projects/mjexp/sys/dev/ath/ath_rate/onoe/onoe.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -35,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.12 2006/12/13 19:34:35 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.13 2007/06/06 15:49:16 sam Exp $"); /* * Atsushi Onoe's rate control algorithm. ==== //depot/projects/mjexp/sys/dev/ath/ath_rate/onoe/onoe.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -7,19 +7,12 @@ * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer, - without modification. + * without modification. * 2. Redistributions in binary form must reproduce at minimum a disclaimer * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.h,v 1.2 2004/12/31 22:41:45 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.h,v 1.3 2007/06/06 15:49:16 sam Exp $ */ /* ==== //depot/projects/mjexp/sys/dev/ath/if_ath.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -35,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.169 2007/06/03 02:16:48 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.170 2007/06/06 15:49:15 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. ==== //depot/projects/mjexp/sys/dev/ath/if_ath_pci.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -35,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.18 2007/02/23 12:18:33 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.19 2007/06/06 15:49:15 sam Exp $"); /* * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver. ==== //depot/projects/mjexp/sys/dev/ath/if_athioctl.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.17 2006/08/10 16:31:37 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athioctl.h,v 1.18 2007/06/06 15:49:15 sam Exp $ */ /* ==== //depot/projects/mjexp/sys/dev/ath/if_athrate.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2004-2007 Sam Leffler, Errno Consulting * Copyright (c) 2004 Video54 Technologies, Inc. * All rights reserved. * @@ -8,19 +8,12 @@ * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer, - without modification. + * without modification. * 2. Redistributions in binary form must reproduce at minimum a disclaimer * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -34,7 +27,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athrate.h,v 1.5 2006/12/13 19:34:34 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athrate.h,v 1.6 2007/06/06 15:49:15 sam Exp $ */ #ifndef _ATH_RATECTRL_H_ #define _ATH_RATECTRL_H_ ==== //depot/projects/mjexp/sys/dev/ath/if_athvar.h#7 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any * redistribution must be conditioned upon including a substantially * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * * NO WARRANTY * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -33,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.60 2007/03/05 21:56:33 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.61 2007/06/06 15:49:15 sam Exp $ */ /* ==== //depot/projects/mjexp/sys/dev/bce/if_bce.c#14 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.31 2007/05/16 23:34:11 davidch Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.32 2007/06/07 02:23:56 davidch Exp $"); /* * The following controllers are supported by this driver: @@ -109,7 +109,7 @@ /* BCM5708S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM5708S 1000Base-T" }, + "Broadcom NetXtreme II BCM5708 1000Base-SX" }, { 0, 0, 0, 0, NULL } }; @@ -359,25 +359,25 @@ DRIVER_MODULE(bce, pci, bce_driver, bce_devclass, 0, 0); DRIVER_MODULE(miibus, bce, miibus_driver, miibus_devclass, 0, 0); - - + + /****************************************************************************/ /* Tunable device values */ /****************************************************************************/ -static int bce_tso_enable = TRUE; +static int bce_tso_enable = TRUE; static int bce_msi_enable = 1; - -/* Allowable values are TRUE or FALSE */ -TUNABLE_INT("hw.bce.tso_enable", &bce_tso_enable); + +/* Allowable values are TRUE or FALSE */ +TUNABLE_INT("hw.bce.tso_enable", &bce_tso_enable); /* Allowable values are 0 (IRQ only) and 1 (IRQ or MSI) */ TUNABLE_INT("hw.bce.msi_enable", &bce_msi_enable); -SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD, 0, "bce driver parameters"); -SYSCTL_UINT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0, +SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD, 0, "bce driver parameters"); +SYSCTL_UINT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0, "TSO Enable/Disable"); -SYSCTL_UINT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0, +SYSCTL_UINT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0, "MSI | INTx selector"); - + /****************************************************************************/ /* Device probe function. */ /* */ @@ -468,7 +468,7 @@ DBPRINT(sc, BCE_VERBOSE_RESET, "Entering %s()\n", __FUNCTION__); mbuf = device_get_unit(dev); - + /* Set initial device and PHY flags */ sc->bce_flags = 0; sc->bce_phy_flags = 0; @@ -494,19 +494,19 @@ sc->bce_bhandle = rman_get_bushandle(sc->bce_res_mem); sc->bce_vhandle = (vm_offset_t) rman_get_virtual(sc->bce_res_mem); - /* If MSI is enabled in the driver, get the vector count. */ - count = bce_msi_enable ? pci_msi_count(dev) : 0; - + /* If MSI is enabled in the driver, get the vector count. */ + count = bce_msi_enable ? pci_msi_count(dev) : 0; + /* Allocate PCI IRQ resources. */ if (count == 1 && pci_alloc_msi(dev, &count) == 0 && count == 1) { rid = 1; sc->bce_flags |= BCE_USING_MSI_FLAG; DBPRINT(sc, BCE_INFO, "Allocating %d MSI interrupt(s).\n", count); } else { - rid = 0; + rid = 0; DBPRINT(sc, BCE_INFO, "Allocating IRQ interrupt.\n"); } - + sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE); @@ -632,7 +632,7 @@ /* Initialize the controller. */ if (bce_chipinit(sc)) { BCE_PRINTF("%s(%d): Controller initialization failed!\n", - __FILE__, __LINE__); + __FILE__, __LINE__); rc = ENXIO; goto bce_attach_fail; } @@ -684,25 +684,33 @@ sc->bce_stats_ticks = 1000000 & 0xffff00; /* - * The copper based NetXtreme II controllers - * use an integrated PHY at address 1 while - * the SerDes controllers use a PHY at - * address 2. + * The SerDes based NetXtreme II controllers + * that support 2.5Gb operation (currently + * 5708S) use a PHY at address 2, otherwise + * the PHY is present at address 1. */ sc->bce_phy_addr = 1; if (BCE_CHIP_BOND_ID(sc) & BCE_CHIP_BOND_ID_SERDES_BIT) { sc->bce_phy_flags |= BCE_PHY_SERDES_FLAG; sc->bce_flags |= BCE_NO_WOL_FLAG; - if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5708) { + if (BCE_CHIP_NUM(sc) != BCE_CHIP_NUM_5706) { sc->bce_phy_addr = 2; val = REG_RD_IND(sc, sc->bce_shmem_base + BCE_SHARED_HW_CFG_CONFIG); - if (val & BCE_SHARED_HW_CFG_PHY_2_5G) + if (val & BCE_SHARED_HW_CFG_PHY_2_5G) { sc->bce_phy_flags |= BCE_PHY_2_5G_CAPABLE_FLAG; + DBPRINT(sc, BCE_WARN, "Found 2.5Gb capable adapter\n"); + } } } + /* Store config data needed by the PHY driver for backplane applications */ + sc->bce_shared_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base + + BCE_SHARED_HW_CFG_CONFIG); + sc->bce_port_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base + + BCE_SHARED_HW_CFG_CONFIG); + /* Allocate DMA memory resources. */ if (bce_dma_alloc(dev)) { BCE_PRINTF("%s(%d): DMA resource allocation failed!\n", @@ -728,14 +736,14 @@ ifp->if_start = bce_start; ifp->if_init = bce_init; ifp->if_mtu = ETHERMTU; - - if (bce_tso_enable) { - ifp->if_hwassist = BCE_IF_HWASSIST | CSUM_TSO; + + if (bce_tso_enable) { + ifp->if_hwassist = BCE_IF_HWASSIST | CSUM_TSO; ifp->if_capabilities = BCE_IF_CAPABILITIES | IFCAP_TSO4; - } else { - ifp->if_hwassist = BCE_IF_HWASSIST; - ifp->if_capabilities = BCE_IF_CAPABILITIES; - } + } else { + ifp->if_hwassist = BCE_IF_HWASSIST; + ifp->if_capabilities = BCE_IF_CAPABILITIES; + } ifp->if_capenable = ifp->if_capabilities; @@ -747,9 +755,9 @@ ifp->if_snd.ifq_drv_maxlen = USABLE_TX_BD; if (sc->bce_phy_flags & BCE_PHY_2_5G_CAPABLE_FLAG) - ifp->if_baudrate = IF_Gbps(2.5); + ifp->if_baudrate = IF_Mbps(2500ULL); else - ifp->if_baudrate = IF_Gbps(1); + ifp->if_baudrate = IF_Mbps(1000); IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen); IFQ_SET_READY(&ifp->if_snd); @@ -792,7 +800,7 @@ /* Get the firmware running so IPMI still works */ BCE_LOCK(sc); bce_mgmt_init_locked(sc); - BCE_UNLOCK(sc); + BCE_UNLOCK(sc); goto bce_attach_exit; @@ -1047,7 +1055,7 @@ /* Make sure we are accessing the correct PHY address. */ if (phy != sc->bce_phy_addr) { - DBPRINT(sc, BCE_WARN, "Invalid PHY address %d for PHY write!\n", phy); + DBPRINT(sc, BCE_VERBOSE, "Invalid PHY address %d for PHY write!\n", phy); return(0); } @@ -1111,71 +1119,61 @@ { struct bce_softc *sc; struct mii_data *mii; + int val; sc = device_get_softc(dev); mii = device_get_softc(sc->bce_miibus); - DBPRINT(sc, BCE_INFO, "mii_media_active = 0x%08X\n", - mii->mii_media_active); - -#ifdef BCE_DEBUG - /* Decode the interface media flags. */ - BCE_PRINTF("Media: ( "); - switch(IFM_TYPE(mii->mii_media_active)) { - case IFM_ETHER: printf("Ethernet )"); - break; - default: printf("Unknown )"); - } - - printf(" Media Options: ( "); - switch(IFM_SUBTYPE(mii->mii_media_active)) { - case IFM_AUTO: printf("Autoselect )"); break; - case IFM_MANUAL: printf("Manual )"); break; - case IFM_NONE: printf("None )"); break; - case IFM_10_T: printf("10Base-T )"); break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 8 04:28:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 990AA16A46B; Fri, 8 Jun 2007 04:28:32 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 49AB416A468 for ; Fri, 8 Jun 2007 04:28:32 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 393F813C45B for ; Fri, 8 Jun 2007 04:28:32 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l584SWq3036973 for ; Fri, 8 Jun 2007 04:28:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l584SUue036952 for perforce@freebsd.org; Fri, 8 Jun 2007 04:28:30 GMT (envelope-from imp@freebsd.org) Date: Fri, 8 Jun 2007 04:28:30 GMT Message-Id: <200706080428.l584SUue036952@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 121195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jun 2007 04:28:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=121195 Change 121195 by imp@imp_paco-paco on 2007/06/08 04:27:54 IFC @121193 Affected files ... .. //depot/projects/arm/src/lib/libc/net/getaddrinfo.3#2 integrate .. //depot/projects/arm/src/lib/libthr/Makefile#7 integrate .. //depot/projects/arm/src/share/man/man4/axe.4#3 integrate .. //depot/projects/arm/src/sys/arm/arm/busdma_machdep.c#13 integrate .. //depot/projects/arm/src/sys/arm/include/pcpu.h#5 integrate .. //depot/projects/arm/src/sys/dev/an/if_an.c#7 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bce.c#19 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bcereg.h#9 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbus_cis.c#8 integrate .. //depot/projects/arm/src/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/arm/src/sys/dev/dcons/dcons_os.c#8 integrate .. //depot/projects/arm/src/sys/dev/dcons/dcons_os.h#2 integrate .. //depot/projects/arm/src/sys/dev/de/if_de.c#5 integrate .. //depot/projects/arm/src/sys/dev/firewire/firewirereg.h#7 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwohci.c#7 integrate .. //depot/projects/arm/src/sys/dev/firewire/sbp.c#9 integrate .. //depot/projects/arm/src/sys/dev/firewire/sbp_targ.c#7 integrate .. //depot/projects/arm/src/sys/dev/hatm/if_hatm_intr.c#3 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#29 integrate .. //depot/projects/arm/src/sys/dev/mii/brgphy.c#19 integrate .. //depot/projects/arm/src/sys/dev/mii/brgphyreg.h#3 integrate .. //depot/projects/arm/src/sys/dev/mii/miidevs#17 integrate .. //depot/projects/arm/src/sys/dev/pdq/pdq_ifsubr.c#3 integrate .. //depot/projects/arm/src/sys/dev/pdq/pdqreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/puc/puc.c#10 integrate .. //depot/projects/arm/src/sys/dev/puc/pucdata.c#8 integrate .. //depot/projects/arm/src/sys/dev/sbsh/if_sbsh.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/ubsa.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/udbp.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/ufm.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/uftdi.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/uhid.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/ulpt.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/ums.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/uplcom.c#13 integrate .. //depot/projects/arm/src/sys/dev/usb/urio.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/usb.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/usb.h#4 integrate .. //depot/projects/arm/src/sys/dev/usb/uscanner.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/uvscom.c#7 integrate .. //depot/projects/arm/src/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate .. //depot/projects/arm/src/sys/ia64/ia64/machdep.c#15 integrate .. //depot/projects/arm/src/sys/ia64/ia64/pmap.c#14 integrate .. //depot/projects/arm/src/sys/kern/init_main.c#16 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#24 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#19 integrate .. //depot/projects/arm/src/sys/kern/kern_prot.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_thr.c#17 integrate .. //depot/projects/arm/src/sys/netinet/tcp_hostcache.c#5 integrate .. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#22 integrate .. //depot/projects/arm/src/sys/security/audit/audit.c#17 integrate .. //depot/projects/arm/src/sys/security/audit/audit.h#8 integrate .. //depot/projects/arm/src/sys/security/audit/audit_arg.c#12 integrate .. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#13 integrate .. //depot/projects/arm/src/sys/sparc64/fhc/fhc.c#6 integrate .. //depot/projects/arm/src/sys/sparc64/pci/psycho.c#9 integrate .. //depot/projects/arm/src/sys/sparc64/sbus/sbus.c#9 integrate .. //depot/projects/arm/src/sys/sys/param.h#31 integrate .. //depot/projects/arm/src/sys/sys/proc.h#27 integrate .. //depot/projects/arm/src/sys/sys/syscallsubr.h#11 integrate .. //depot/projects/arm/src/sys/sys/thr.h#7 integrate .. //depot/projects/arm/src/sys/sys/ucred.h#4 integrate .. //depot/projects/arm/src/usr.sbin/boot0cfg/boot0cfg.8#3 integrate .. //depot/projects/arm/src/usr.sbin/dconschat/dconschat.c#3 integrate Differences ... ==== //depot/projects/arm/src/lib/libc/net/getaddrinfo.3#2 (text+ko) ==== @@ -16,9 +16,9 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.32 2005/06/15 19:04:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.33 2007/06/06 19:24:02 remko Exp $ .\" -.Dd December 20, 2004 +.Dd June 6, 2007 .Dt GETADDRINFO 3 .Os .Sh NAME @@ -119,11 +119,41 @@ .Fa ai_protocol is zero the caller will accept any protocol. .It Fa ai_flags +The .Fa ai_flags -is formed by -.Tn OR Ns 'ing -the following values: +field to which the +.Fa hints +parameter points shall be set to zero +or be the bitwise-inclusive OR of one or more of the values +.Dv AI_ADDRCONFIG , +.Dv AI_ALL , +.Dv AI_CANONNAME , +.Dv AI_NUMERICHOST , +.Dv AI_NUMERICSERV , +.Dv AI_PASSIVE , +and +.Dv AI_V4MAPPED . .Bl -tag -width "AI_CANONNAMEXX" +.It Dv AI_ADDRCONFIG +If the +.Dv AI_ADDRCONFIG +bit is set, IPv4 addresses shall be returned only if +an IPv4 address is configured on the local system, +and IPv6 addresses shall be returned only if +an IPv6 address is configured on the local system. +.It Dv AI_ALL +If the +.Dv AI_ALL +bit is set with the +.Dv AI_V4MAPPED +bit, then +.Fn getaddrinfo +shall return all matching IPv6 and IPv4 addresses. +The +.Dv AI_ALL +bit without the +.Dv AI_V4MAPPED +bit is ignored. .It Dv AI_CANONNAME If the .Dv AI_CANONNAME @@ -142,6 +172,18 @@ .Fa hostname should be treated as a numeric string defining an IPv4 or IPv6 address and no name resolution should be attempted. +.It Dv AI_NUMERICSERV +If the +.Dv AI_NUMERICSERV +bit is set, +then a non-null +.Fa servname +string supplied shall be a numeric port string. +Otherwise, an +.Dv EAI_NONAME +error shall be returned. +This bit shall prevent any type of name resolution service +(for example, NIS+) from being invoked. .It Dv AI_PASSIVE If the .Dv AI_PASSIVE @@ -176,6 +218,25 @@ is the null pointer and .Dv AI_PASSIVE is not set. +.It Dv AI_V4MAPPED +If the +.Dv AI_V4MAPPED +flag is specified along with an +.Fa ai_family +of +.Dv AF_INET6 , +then +.Fn getaddrinfo +shall return IPv4-mapped IPv6 addresses +on finding no matching IPv6 addresses ( +.Fa ai_addrlen +shall be 16). +The +.Dv AI_V4MAPPED +flag shall be ignored unless +.Fa ai_family +equals +.Dv AF_INET6 . .El .El .Pp @@ -428,7 +489,7 @@ The .Fn getaddrinfo function is defined by the -.St -p1003.1g-2000 -draft specification and documented in +.St -p1003.1-2004 +specification and documented in .Dv "RFC 3493" , .Dq Basic Socket Interface Extensions for IPv6 . ==== //depot/projects/arm/src/lib/libthr/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libthr/Makefile,v 1.25 2007/05/21 02:49:07 deischen Exp $ +# $FreeBSD: src/lib/libthr/Makefile,v 1.26 2007/06/08 02:21:13 davidxu Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -16,6 +16,7 @@ LIB=thr SHLIB_MAJOR= 3 +WARNS?= 2 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include @@ -33,7 +34,7 @@ MAN= libthr.3 # enable extra internal consistancy checks -CFLAGS+=-D_PTHREADS_INVARIANTS -Wall +CFLAGS+=-D_PTHREADS_INVARIANTS #CFLAGS+=-g PRECIOUSLIB= ==== //depot/projects/arm/src/share/man/man4/axe.4#3 (text+ko) ==== @@ -28,9 +28,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/axe.4,v 1.13 2007/05/12 05:59:15 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/axe.4,v 1.14 2007/06/06 19:27:10 remko Exp $ .\" -.Dd May 12, 2007 +.Dd June 6, 2007 .Dt AXE 4 .Os .Sh NAME @@ -134,7 +134,7 @@ .It Buffalo (Melco Inc.) LUA-U2-KTX .It -D-Link DUBE100 +D-Link DUB-E100, revision A .It LinkSys USB200M .It ==== //depot/projects/arm/src/sys/arm/arm/busdma_machdep.c#13 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.31 2007/05/29 06:30:25 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.32 2007/06/07 21:51:09 cognet Exp $"); /* * ARM bus dma support routines @@ -674,8 +674,8 @@ CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, " "alignment= %d", dmat->lowaddr, ptoa((vm_paddr_t)Maxmem), dmat->boundary, dmat->alignment); - CTR3(KTR_BUSDMA, "map= %p, nobouncemap= %p, pagesneeded= %d", - map, &nobounce_dmamap, map->pagesneeded); + CTR2(KTR_BUSDMA, "map= %p, pagesneeded= %d", + map, map->pagesneeded); /* * Count the number of bounce pages * needed in order to complete this transfer @@ -1384,8 +1384,7 @@ struct bounce_page *bpage; KASSERT(dmat->bounce_zone != NULL, ("no bounce zone in dma tag")); - KASSERT(map != NULL && map != &nobounce_dmamap, - ("add_bounce_page: bad map %p", map)); + KASSERT(map != NULL, ("add_bounce_page: bad map %p", map)); bz = dmat->bounce_zone; if (map->pagesneeded == 0) ==== //depot/projects/arm/src/sys/arm/include/pcpu.h#5 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27 - * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.5 2007/06/04 21:38:45 attilio Exp $ + * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.6 2007/06/06 23:23:47 jeff Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -58,7 +58,7 @@ * with respect to preemption. */ #define PCPU_ADD(member, value) (__pcpu.pc_ ## member += (value)) -#define PCPU_INC(member) PCPU_LAZY_ADD(member, 1) +#define PCPU_INC(member) PCPU_ADD(member, 1) #define PCPU_PTR(member) (&__pcpu.pc_ ## member) #define PCPU_SET(member,value) (__pcpu.pc_ ## member = (value)) ==== //depot/projects/arm/src/sys/dev/an/if_an.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.80 2006/11/06 13:41:50 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.81 2007/06/08 01:21:20 mjacob Exp $"); /* * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form. @@ -1478,7 +1478,6 @@ struct an_card_rid_desc an_rid_desc; struct an_command cmd; struct an_reply reply; - char *buf; u_int16_t *ptr; u_int8_t *ptr2; int i, len; @@ -1554,7 +1553,6 @@ return(EIO); } - ptr = (u_int16_t *)buf; if (reply.an_status & AN_CMD_QUAL_MASK) { printf("an%d: failed to write RID 2 %x %x %x %x %x, %d\n", ==== //depot/projects/arm/src/sys/dev/bce/if_bce.c#19 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.31 2007/05/16 23:34:11 davidch Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.32 2007/06/07 02:23:56 davidch Exp $"); /* * The following controllers are supported by this driver: @@ -109,7 +109,7 @@ /* BCM5708S controllers and OEM boards. */ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, PCI_ANY_ID, PCI_ANY_ID, - "Broadcom NetXtreme II BCM5708S 1000Base-T" }, + "Broadcom NetXtreme II BCM5708 1000Base-SX" }, { 0, 0, 0, 0, NULL } }; @@ -359,25 +359,25 @@ DRIVER_MODULE(bce, pci, bce_driver, bce_devclass, 0, 0); DRIVER_MODULE(miibus, bce, miibus_driver, miibus_devclass, 0, 0); - - + + /****************************************************************************/ /* Tunable device values */ /****************************************************************************/ -static int bce_tso_enable = TRUE; +static int bce_tso_enable = TRUE; static int bce_msi_enable = 1; - -/* Allowable values are TRUE or FALSE */ -TUNABLE_INT("hw.bce.tso_enable", &bce_tso_enable); + +/* Allowable values are TRUE or FALSE */ +TUNABLE_INT("hw.bce.tso_enable", &bce_tso_enable); /* Allowable values are 0 (IRQ only) and 1 (IRQ or MSI) */ TUNABLE_INT("hw.bce.msi_enable", &bce_msi_enable); -SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD, 0, "bce driver parameters"); -SYSCTL_UINT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0, +SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD, 0, "bce driver parameters"); +SYSCTL_UINT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0, "TSO Enable/Disable"); -SYSCTL_UINT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0, +SYSCTL_UINT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0, "MSI | INTx selector"); - + /****************************************************************************/ /* Device probe function. */ /* */ @@ -468,7 +468,7 @@ DBPRINT(sc, BCE_VERBOSE_RESET, "Entering %s()\n", __FUNCTION__); mbuf = device_get_unit(dev); - + /* Set initial device and PHY flags */ sc->bce_flags = 0; sc->bce_phy_flags = 0; @@ -494,19 +494,19 @@ sc->bce_bhandle = rman_get_bushandle(sc->bce_res_mem); sc->bce_vhandle = (vm_offset_t) rman_get_virtual(sc->bce_res_mem); - /* If MSI is enabled in the driver, get the vector count. */ - count = bce_msi_enable ? pci_msi_count(dev) : 0; - + /* If MSI is enabled in the driver, get the vector count. */ + count = bce_msi_enable ? pci_msi_count(dev) : 0; + /* Allocate PCI IRQ resources. */ if (count == 1 && pci_alloc_msi(dev, &count) == 0 && count == 1) { rid = 1; sc->bce_flags |= BCE_USING_MSI_FLAG; DBPRINT(sc, BCE_INFO, "Allocating %d MSI interrupt(s).\n", count); } else { - rid = 0; + rid = 0; DBPRINT(sc, BCE_INFO, "Allocating IRQ interrupt.\n"); } - + sc->bce_res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE); @@ -632,7 +632,7 @@ /* Initialize the controller. */ if (bce_chipinit(sc)) { BCE_PRINTF("%s(%d): Controller initialization failed!\n", - __FILE__, __LINE__); + __FILE__, __LINE__); rc = ENXIO; goto bce_attach_fail; } @@ -684,25 +684,33 @@ sc->bce_stats_ticks = 1000000 & 0xffff00; /* - * The copper based NetXtreme II controllers - * use an integrated PHY at address 1 while - * the SerDes controllers use a PHY at - * address 2. + * The SerDes based NetXtreme II controllers + * that support 2.5Gb operation (currently + * 5708S) use a PHY at address 2, otherwise + * the PHY is present at address 1. */ sc->bce_phy_addr = 1; if (BCE_CHIP_BOND_ID(sc) & BCE_CHIP_BOND_ID_SERDES_BIT) { sc->bce_phy_flags |= BCE_PHY_SERDES_FLAG; sc->bce_flags |= BCE_NO_WOL_FLAG; - if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5708) { + if (BCE_CHIP_NUM(sc) != BCE_CHIP_NUM_5706) { sc->bce_phy_addr = 2; val = REG_RD_IND(sc, sc->bce_shmem_base + BCE_SHARED_HW_CFG_CONFIG); - if (val & BCE_SHARED_HW_CFG_PHY_2_5G) + if (val & BCE_SHARED_HW_CFG_PHY_2_5G) { sc->bce_phy_flags |= BCE_PHY_2_5G_CAPABLE_FLAG; + DBPRINT(sc, BCE_WARN, "Found 2.5Gb capable adapter\n"); + } } } + /* Store config data needed by the PHY driver for backplane applications */ + sc->bce_shared_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base + + BCE_SHARED_HW_CFG_CONFIG); + sc->bce_port_hw_cfg = REG_RD_IND(sc, sc->bce_shmem_base + + BCE_SHARED_HW_CFG_CONFIG); + /* Allocate DMA memory resources. */ if (bce_dma_alloc(dev)) { BCE_PRINTF("%s(%d): DMA resource allocation failed!\n", @@ -728,14 +736,14 @@ ifp->if_start = bce_start; ifp->if_init = bce_init; ifp->if_mtu = ETHERMTU; - - if (bce_tso_enable) { - ifp->if_hwassist = BCE_IF_HWASSIST | CSUM_TSO; + + if (bce_tso_enable) { + ifp->if_hwassist = BCE_IF_HWASSIST | CSUM_TSO; ifp->if_capabilities = BCE_IF_CAPABILITIES | IFCAP_TSO4; - } else { - ifp->if_hwassist = BCE_IF_HWASSIST; - ifp->if_capabilities = BCE_IF_CAPABILITIES; - } + } else { + ifp->if_hwassist = BCE_IF_HWASSIST; + ifp->if_capabilities = BCE_IF_CAPABILITIES; + } ifp->if_capenable = ifp->if_capabilities; @@ -747,9 +755,9 @@ ifp->if_snd.ifq_drv_maxlen = USABLE_TX_BD; if (sc->bce_phy_flags & BCE_PHY_2_5G_CAPABLE_FLAG) - ifp->if_baudrate = IF_Gbps(2.5); + ifp->if_baudrate = IF_Mbps(2500ULL); else - ifp->if_baudrate = IF_Gbps(1); + ifp->if_baudrate = IF_Mbps(1000); IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen); IFQ_SET_READY(&ifp->if_snd); @@ -792,7 +800,7 @@ /* Get the firmware running so IPMI still works */ BCE_LOCK(sc); bce_mgmt_init_locked(sc); - BCE_UNLOCK(sc); + BCE_UNLOCK(sc); goto bce_attach_exit; @@ -1047,7 +1055,7 @@ /* Make sure we are accessing the correct PHY address. */ if (phy != sc->bce_phy_addr) { - DBPRINT(sc, BCE_WARN, "Invalid PHY address %d for PHY write!\n", phy); + DBPRINT(sc, BCE_VERBOSE, "Invalid PHY address %d for PHY write!\n", phy); return(0); } @@ -1111,71 +1119,61 @@ { struct bce_softc *sc; struct mii_data *mii; + int val; sc = device_get_softc(dev); mii = device_get_softc(sc->bce_miibus); - DBPRINT(sc, BCE_INFO, "mii_media_active = 0x%08X\n", - mii->mii_media_active); - -#ifdef BCE_DEBUG - /* Decode the interface media flags. */ - BCE_PRINTF("Media: ( "); - switch(IFM_TYPE(mii->mii_media_active)) { - case IFM_ETHER: printf("Ethernet )"); - break; - default: printf("Unknown )"); - } - - printf(" Media Options: ( "); - switch(IFM_SUBTYPE(mii->mii_media_active)) { - case IFM_AUTO: printf("Autoselect )"); break; - case IFM_MANUAL: printf("Manual )"); break; - case IFM_NONE: printf("None )"); break; - case IFM_10_T: printf("10Base-T )"); break; - case IFM_100_TX: printf("100Base-TX )"); break; - case IFM_1000_SX: printf("1000Base-SX )"); break; - case IFM_1000_T: printf("1000Base-T )"); break; - default: printf("Other )"); - } - - printf(" Global Options: ("); - if (mii->mii_media_active & IFM_FDX) - printf(" FullDuplex"); - if (mii->mii_media_active & IFM_HDX) - printf(" HalfDuplex"); - if (mii->mii_media_active & IFM_LOOP) - printf(" Loopback"); - if (mii->mii_media_active & IFM_FLAG0) - printf(" Flag0"); - if (mii->mii_media_active & IFM_FLAG1) - printf(" Flag1"); - if (mii->mii_media_active & IFM_FLAG2) - printf(" Flag2"); - printf(" )\n"); -#endif - - BCE_CLRBIT(sc, BCE_EMAC_MODE, BCE_EMAC_MODE_PORT); + val = REG_RD(sc, BCE_EMAC_MODE); + val &= ~(BCE_EMAC_MODE_PORT | BCE_EMAC_MODE_HALF_DUPLEX | + BCE_EMAC_MODE_MAC_LOOP | BCE_EMAC_MODE_FORCE_LINK | + BCE_EMAC_MODE_25G); /* Set MII or GMII interface based on the speed negotiated by the PHY. */ - if (IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_T || - IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_SX) { - DBPRINT(sc, BCE_INFO, "Setting GMII interface.\n"); - BCE_SETBIT(sc, BCE_EMAC_MODE, BCE_EMAC_MODE_PORT_GMII); - } else { - DBPRINT(sc, BCE_INFO, "Setting MII interface.\n"); - BCE_SETBIT(sc, BCE_EMAC_MODE, BCE_EMAC_MODE_PORT_MII); + switch (IFM_SUBTYPE(mii->mii_media_active)) { + case IFM_10_T: + if (BCE_CHIP_NUM(sc) != BCE_CHIP_NUM_5706) { + DBPRINT(sc, BCE_INFO, "Enabling 10Mb interface.\n"); + val |= BCE_EMAC_MODE_PORT_MII_10; + break; + } + /* fall-through */ + case IFM_100_TX: + DBPRINT(sc, BCE_INFO, "Enabling MII interface.\n"); + val |= BCE_EMAC_MODE_PORT_MII; + break; + case IFM_2500_SX: + DBPRINT(sc, BCE_INFO, "Enabling 2.5G MAC mode.\n"); + val |= BCE_EMAC_MODE_25G; + /* fall-through */ + case IFM_1000_T: + case IFM_1000_SX: + DBPRINT(sc, BCE_INFO, "Enablinb GMII interface.\n"); + val |= BCE_EMAC_MODE_PORT_GMII; + break; + default: + val |= BCE_EMAC_MODE_PORT_GMII; } /* Set half or full duplex based on the duplicity negotiated by the PHY. */ - if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX) { + if ((mii->mii_media_active & IFM_GMASK) == IFM_HDX) { + DBPRINT(sc, BCE_INFO, "Setting Half-Duplex interface.\n"); + val |= BCE_EMAC_MODE_HALF_DUPLEX; + } else DBPRINT(sc, BCE_INFO, "Setting Full-Duplex interface.\n"); - BCE_CLRBIT(sc, BCE_EMAC_MODE, BCE_EMAC_MODE_HALF_DUPLEX); - } else { - DBPRINT(sc, BCE_INFO, "Setting Half-Duplex interface.\n"); - BCE_SETBIT(sc, BCE_EMAC_MODE, BCE_EMAC_MODE_HALF_DUPLEX); - } + + REG_WR(sc, BCE_EMAC_MODE, val); + +#if 0 + /* Todo: Enable this support in brgphy and bge. */ + /* FLAG0 is set if RX is enabled and FLAG1 if TX is enabled */ + if (mii->mii_media_active & IFM_FLAG0) + BCE_SETBIT(sc, BCE_EMAC_RX_MODE, BCE_EMAC_RX_MODE_FLOW_EN); + if (mii->mii_media_active & IFM_FLAG1) + BCE_SETBIT(sc, BCE_EMAC_RX_MODE, BCE_EMAC_TX_MODE_FLOW_EN); +#endif + } @@ -2210,9 +2208,9 @@ { struct bce_softc *sc; int i, error, rc = 0; - bus_addr_t busaddr; - bus_size_t max_size, max_seg_size; - int max_segments; + bus_addr_t busaddr; + bus_size_t max_size, max_seg_size; + int max_segments; sc = device_get_softc(dev); @@ -2404,17 +2402,17 @@ DBPRINT(sc, BCE_INFO, "tx_bd_chain_paddr[%d] = 0x%08X\n", i, (u32) sc->tx_bd_chain_paddr[i]); } - - /* Check the required size before mapping to conserve resources. */ - if (bce_tso_enable) { - max_size = BCE_TSO_MAX_SIZE; - max_segments = BCE_MAX_SEGMENTS; - max_seg_size = BCE_TSO_MAX_SEG_SIZE; - } else { - max_size = MCLBYTES * BCE_MAX_SEGMENTS; - max_segments = BCE_MAX_SEGMENTS; - max_seg_size = MCLBYTES; - } + + /* Check the required size before mapping to conserve resources. */ + if (bce_tso_enable) { + max_size = BCE_TSO_MAX_SIZE; + max_segments = BCE_MAX_SEGMENTS; + max_seg_size = BCE_TSO_MAX_SEG_SIZE; + } else { + max_size = MCLBYTES * BCE_MAX_SEGMENTS; + max_segments = BCE_MAX_SEGMENTS; + max_seg_size = MCLBYTES; + } /* Create a DMA tag for TX mbufs. */ if (bus_dma_tag_create(sc->parent_tag, @@ -2425,7 +2423,7 @@ NULL, NULL, max_size, max_segments, - max_seg_size, + max_seg_size, 0, NULL, NULL, &sc->tx_mbuf_tag)) { @@ -2562,31 +2560,31 @@ dev = sc->bce_dev; bce_dma_free(sc); - - if (sc->bce_intrhand != NULL) { + + if (sc->bce_intrhand != NULL) { DBPRINT(sc, BCE_INFO_RESET, "Removing interrupt handler.\n"); - bus_teardown_intr(dev, sc->bce_res_irq, sc->bce_intrhand); + bus_teardown_intr(dev, sc->bce_res_irq, sc->bce_intrhand); } - if (sc->bce_res_irq != NULL) { + if (sc->bce_res_irq != NULL) { DBPRINT(sc, BCE_INFO_RESET, "Releasing IRQ.\n"); - bus_release_resource(dev, SYS_RES_IRQ, sc->bce_flags & BCE_USING_MSI_FLAG ? 1 : 0, + bus_release_resource(dev, SYS_RES_IRQ, sc->bce_flags & BCE_USING_MSI_FLAG ? 1 : 0, sc->bce_res_irq); } - - if (sc->bce_flags & BCE_USING_MSI_FLAG) { + + if (sc->bce_flags & BCE_USING_MSI_FLAG) { DBPRINT(sc, BCE_INFO_RESET, "Releasing MSI vector.\n"); - pci_release_msi(dev); - } + pci_release_msi(dev); + } - if (sc->bce_res_mem != NULL) { + if (sc->bce_res_mem != NULL) { DBPRINT(sc, BCE_INFO_RESET, "Releasing PCI memory.\n"); - bus_release_resource(dev, SYS_RES_MEMORY, PCIR_BAR(0), sc->bce_res_mem); + bus_release_resource(dev, SYS_RES_MEMORY, PCIR_BAR(0), sc->bce_res_mem); } - if (sc->bce_ifp != NULL) { + if (sc->bce_ifp != NULL) { DBPRINT(sc, BCE_INFO_RESET, "Releasing IF.\n"); - if_free(sc->bce_ifp); + if_free(sc->bce_ifp); } if (mtx_initialized(&sc->bce_mtx)) @@ -3257,9 +3255,9 @@ /* Make sure the interrupt is not active. */ REG_WR(sc, BCE_PCICFG_INT_ACK_CMD, BCE_PCICFG_INT_ACK_CMD_MASK_INT); - /* + /* * Initialize DMA byte/word swapping, configure the number of DMA - * channels and PCI clock compensation delay. + * channels and PCI clock compensation delay. */ val = BCE_DMA_CONFIG_DATA_BYTE_SWAP | BCE_DMA_CONFIG_DATA_WORD_SWAP | @@ -3322,7 +3320,7 @@ val = 0x10000 + (MAX_CID_CNT * MB_KERNEL_CTX_SIZE); REG_WR(sc, BCE_MQ_KNL_BYP_WIND_START, val); REG_WR(sc, BCE_MQ_KNL_WIND_END, val); - + /* Set the page size and clear the RV2P processor stall bits. */ val = (BCM_PAGE_BITS - 8) << 24; REG_WR(sc, BCE_RV2P_CONFIG, val); @@ -3553,10 +3551,10 @@ DBRUNIF((sc->free_rx_bd > USABLE_RX_BD), BCE_PRINTF("%s(%d): Too many free rx_bd (0x%04X > 0x%04X)!\n", __FILE__, __LINE__, sc->free_rx_bd, (u16) USABLE_RX_BD)); - + /* Update some debug statistic counters */ DBRUNIF((sc->free_rx_bd < sc->rx_low_watermark), - sc->rx_low_watermark = sc->free_rx_bd); + sc->rx_low_watermark = sc->free_rx_bd); DBRUNIF((sc->free_rx_bd == 0), sc->rx_empty_count++); /* Setup the rx_bd for the first segment. */ @@ -3621,9 +3619,9 @@ sc->tx_prod = 0; sc->tx_cons = 0; sc->tx_prod_bseq = 0; - sc->used_tx_bd = 0; + sc->used_tx_bd = 0; sc->max_tx_bd = USABLE_TX_BD; - DBRUNIF(1, sc->tx_hi_watermark = USABLE_TX_BD); + DBRUNIF(1, sc->tx_hi_watermark = USABLE_TX_BD); DBRUNIF(1, sc->tx_full_count = 0); /* @@ -3733,9 +3731,9 @@ sc->rx_prod = 0; sc->rx_cons = 0; sc->rx_prod_bseq = 0; - sc->free_rx_bd = USABLE_RX_BD; - sc->max_rx_bd = USABLE_RX_BD; - DBRUNIF(1, sc->rx_low_watermark = USABLE_RX_BD); + sc->free_rx_bd = USABLE_RX_BD; + sc->max_rx_bd = USABLE_RX_BD; + DBRUNIF(1, sc->rx_low_watermark = USABLE_RX_BD); DBRUNIF(1, sc->rx_empty_count = 0); /* Initialize the RX next pointer chain entries. */ @@ -3792,7 +3790,7 @@ } /* Tell the chip about the waiting rx_bd's. */ - REG_WR16(sc, MB_RX_CID_ADDR + BCE_L2CTX_HOST_BDIDX, sc->rx_prod); + REG_WR16(sc, MB_RX_CID_ADDR + BCE_L2CTX_HOST_BDIDX, sc->rx_prod); REG_WR(sc, MB_RX_CID_ADDR + BCE_L2CTX_HOST_BSEQ, sc->rx_prod_bseq); DBRUN(BCE_VERBOSE_RECV, bce_dump_rx_chain(sc, 0, TOTAL_RX_BD)); @@ -3858,7 +3856,7 @@ BCE_UNLOCK(sc); return (0); } - + /****************************************************************************/ /* Set media options. */ @@ -3872,15 +3870,15 @@ struct bce_softc *sc; struct mii_data *mii; struct ifmedia *ifm; - + sc = ifp->if_softc; ifm = &sc->bce_ifmedia; BCE_LOCK_ASSERT(sc); mii = device_get_softc(sc->bce_miibus); - - /* Make sure the MII bus has been enumerated. */ - if (mii) { + + /* Make sure the MII bus has been enumerated. */ + if (mii) { sc->bce_link = 0; if (mii->mii_instance) { struct mii_softc *miisc; @@ -3888,7 +3886,7 @@ LIST_FOREACH(miisc, &mii->mii_phys, mii_list) mii_phy_reset(miisc); } - mii_mediachg(mii); + mii_mediachg(mii); } } @@ -4004,9 +4002,9 @@ bus_space_barrier(sc->bce_btag, sc->bce_bhandle, 0, 0, BUS_SPACE_BARRIER_READ); - /* Update some debug statistics counters */ + /* Update some debug statistics counters */ DBRUNIF((sc->free_rx_bd < sc->rx_low_watermark), - sc->rx_low_watermark = sc->free_rx_bd); + sc->rx_low_watermark = sc->free_rx_bd); DBRUNIF((sc->free_rx_bd == 0), sc->rx_empty_count++); /* Scan through the receive chain as long as there is work to do */ @@ -4016,9 +4014,9 @@ unsigned int len; u32 status; - /* Clear the mbuf pointer. */ - m = NULL; - + /* Clear the mbuf pointer. */ + m = NULL; + /* Convert the producer/consumer indices to an actual rx_bd index. */ sw_chain_cons = RX_CHAIN_IDX(sw_cons); sw_chain_prod = RX_CHAIN_IDX(sw_prod); @@ -4048,11 +4046,11 @@ __FILE__, __LINE__, sw_chain_cons); bce_breakpoint(sc)); - /* - * ToDo: If the received packet is small enough + /* + * ToDo: If the received packet is small enough * to fit into a single, non-M_EXT mbuf, - * allocate a new mbuf here, copy the data to - * that mbuf, and recycle the mapped jumbo frame. + * allocate a new mbuf here, copy the data to + * that mbuf, and recycle the mapped jumbo frame. */ /* Unmap the mbuf from DMA space. */ @@ -4212,30 +4210,30 @@ } sw_cons = NEXT_RX_BD(sw_cons); - - /* If we have a packet, pass it up the stack */ - if (m) { - /* Make sure we don't lose our place when we release the lock. */ - sc->rx_cons = sw_cons; - sc->rx_prod = sw_prod; - sc->rx_prod_bseq = sw_prod_bseq; + + /* If we have a packet, pass it up the stack */ + if (m) { + /* Make sure we don't lose our place when we release the lock. */ + sc->rx_cons = sw_cons; + sc->rx_prod = sw_prod; + sc->rx_prod_bseq = sw_prod_bseq; DBPRINT(sc, BCE_VERBOSE_RECV, "%s(): Passing received frame up.\n", __FUNCTION__); BCE_UNLOCK(sc); (*ifp->if_input)(ifp, m); DBRUNIF(1, sc->rx_mbuf_alloc--); - BCE_LOCK(sc); - - /* Recover our place. */ - sw_cons = sc->rx_cons; - sw_prod = sc->rx_prod; - sw_prod_bseq = sc->rx_prod_bseq; - hw_cons = sc->hw_rx_cons = sblk->status_rx_quick_consumer_index0; - if ((hw_cons & USABLE_RX_BD_PER_PAGE) == USABLE_RX_BD_PER_PAGE) - hw_cons++; - } - + BCE_LOCK(sc); + + /* Recover our place. */ + sw_cons = sc->rx_cons; + sw_prod = sc->rx_prod; + sw_prod_bseq = sc->rx_prod_bseq; + hw_cons = sc->hw_rx_cons = sblk->status_rx_quick_consumer_index0; + if ((hw_cons & USABLE_RX_BD_PER_PAGE) == USABLE_RX_BD_PER_PAGE) + hw_cons++; + } + /* Refresh hw_cons to see if there's new work */ if (sw_cons == hw_cons) { hw_cons = sc->hw_rx_cons = sblk->status_rx_quick_consumer_index0; @@ -4372,7 +4370,7 @@ /* Clear the tx hardware queue full flag. */ if (sc->used_tx_bd < sc->max_tx_bd) { DBRUNIF((ifp->if_drv_flags & IFF_DRV_OACTIVE), - DBPRINT(sc, BCE_WARN_SEND, + DBPRINT(sc, BCE_WARN_SEND, "%s(): Open TX chain! %d/%d (used/total)\n", __FUNCTION__, sc->used_tx_bd, sc->max_tx_bd)); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; @@ -4530,9 +4528,9 @@ return; } - + /****************************************************************************/ -/* Initialize the controller just enough so that any management firmware */ +/* Initialize the controller just enough so that any management firmware */ /* running on the device will continue to operate corectly. */ /* */ /* Returns: */ @@ -4612,9 +4610,9 @@ struct ip *ip; struct tcphdr *th; u16 prod, chain_prod, etype, mss = 0, vlan_tag = 0, flags = 0; - u32 prod_bseq; - int hdr_len = 0, e_hlen = 0, ip_hlen = 0, tcp_hlen = 0, ip_len = 0; - + u32 prod_bseq; + int hdr_len = 0, e_hlen = 0, ip_hlen = 0, tcp_hlen = 0, ip_len = 0; + #ifdef BCE_DEBUG u16 debug_prod; @@ -4627,12 +4625,12 @@ if (m0->m_pkthdr.csum_flags & CSUM_IP) flags |= TX_BD_FLAGS_IP_CKSUM; if (m0->m_pkthdr.csum_flags & (CSUM_TCP | CSUM_UDP)) - flags |= TX_BD_FLAGS_TCP_UDP_CKSUM; - if (m0->m_pkthdr.csum_flags & CSUM_TSO) { - /* For TSO the controller needs two pieces of info, */ - /* the MSS and the IP+TCP options length. */ - mss = htole16(m0->m_pkthdr.tso_segsz); - + flags |= TX_BD_FLAGS_TCP_UDP_CKSUM; + if (m0->m_pkthdr.csum_flags & CSUM_TSO) { + /* For TSO the controller needs two pieces of info, */ + /* the MSS and the IP+TCP options length. */ + mss = htole16(m0->m_pkthdr.tso_segsz); + /* Map the header and find the Ethernet type & header length */ eh = mtod(m0, struct ether_vlan_header *); if (eh->evl_encap_proto == htons(ETHERTYPE_VLAN)) { @@ -4641,55 +4639,55 @@ } else { etype = ntohs(eh->evl_encap_proto); e_hlen = ETHER_HDR_LEN; - } - - /* Check for supported TSO Ethernet types (only IPv4 for now) */ + } + + /* Check for supported TSO Ethernet types (only IPv4 for now) */ switch (etype) { case ETHERTYPE_IP: ip = (struct ip *)(m0->m_data + e_hlen); - - /* TSO only supported for TCP protocol */ + + /* TSO only supported for TCP protocol */ if (ip->ip_p != IPPROTO_TCP) { BCE_PRINTF("%s(%d): TSO enabled for non-TCP frame!.\n", - __FILE__, __LINE__); - goto bce_tx_encap_skip_tso; + __FILE__, __LINE__); + goto bce_tx_encap_skip_tso; } - - /* Get IP header length in bytes (min 20) */ - ip_hlen = ip->ip_hl << 2; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 8 07:24:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFC2816A468; Fri, 8 Jun 2007 07:24:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 88DD116A400 for ; Fri, 8 Jun 2007 07:24:09 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 783DF13C448 for ; Fri, 8 Jun 2007 07:24:09 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l587O9b2014212 for ; Fri, 8 Jun 2007 07:24:09 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l587O9iw014203 for perforce@freebsd.org; Fri, 8 Jun 2007 07:24:09 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Fri, 8 Jun 2007 07:24:09 GMT Message-Id: <200706080724.l587O9iw014203@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 121201 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jun 2007 07:24:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=121201 Change 121201 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/08 07:23:53 Add a pair of pseduo ethernet nodes for mandatory access control tests Idea inspired by Nanjun Li's proposal and Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/conf/files#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_if.c#1 add Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/conf/files#2 (text+ko) ==== @@ -2023,6 +2023,7 @@ security/mac_seeotheruids/mac_seeotheruids.c optional mac_seeotheruids security/mac_stub/mac_stub.c optional mac_stub security/mac_test/mac_test.c optional mac_test +security/mac_test/mac_test_if.c optional mac_test ufs/ffs/ffs_alloc.c optional ffs ufs/ffs/ffs_balloc.c optional ffs ufs/ffs/ffs_inode.c optional ffs ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#2 (text+ko) ==== @@ -75,6 +75,12 @@ SYSCTL_NODE(_security_mac, OID_AUTO, test, CTLFLAG_RW, 0, "TrustedBSD mac_test policy controls"); +int +mac_test_init_if(SYSCTL_HANDLER_ARGS); + +SYSCTL_PROC(_security_mac_test, OID_AUTO, pseudoinit, CTLTYPE_INT | CTLFLAG_RW, 0, 0, + mac_test_init_if, "I", "set to setup the pseudo interfaces for MAC test"); + #define MAGIC_BPF 0xfe1ad1b6 #define MAGIC_DEVFS 0x9ee79c32 #define MAGIC_IFNET 0xc218b120 From owner-p4-projects@FreeBSD.ORG Fri Jun 8 09:06:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62D7C16A421; Fri, 8 Jun 2007 09:06:15 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 3019516A469 for ; Fri, 8 Jun 2007 09:06:15 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1EBD013C465 for ; Fri, 8 Jun 2007 09:06:15 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5896Fhp021851 for ; Fri, 8 Jun 2007 09:06:15 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5896EVe021842 for perforce@freebsd.org; Fri, 8 Jun 2007 09:06:14 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Fri, 8 Jun 2007 09:06:14 GMT Message-Id: <200706080906.l5896EVe021842@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 121204 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jun 2007 09:06:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=121204 Change 121204 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/08 09:05:50 /dev/mactestpipe node for mandatory access control test. This is "stealed" from sys/security/audit/audit_pipe.c by a little more than a string replace :-) Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/conf/files#3 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#3 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_pipe.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_private.h#1 add Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/conf/files#3 (text+ko) ==== @@ -2023,7 +2023,8 @@ security/mac_seeotheruids/mac_seeotheruids.c optional mac_seeotheruids security/mac_stub/mac_stub.c optional mac_stub security/mac_test/mac_test.c optional mac_test -security/mac_test/mac_test_if.c optional mac_test +security/mac_test/mac_test_if.c optional mac_test +security/mac_test/mac_test_pipe.c optional mac_test ufs/ffs/ffs_alloc.c optional ffs ufs/ffs/ffs_balloc.c optional ffs ufs/ffs/ffs_inode.c optional ffs ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#3 (text+ko) ==== @@ -69,6 +69,7 @@ #include #include +#include SYSCTL_DECL(_security_mac); @@ -156,7 +157,8 @@ static void mac_test_init_bpfdesc_label(struct label *label) { - + mactest_pipe_submit("mac_test_init_bpfdesc_label\n", + strlen("mac_test_init_bpfdesc_label\n")); LABEL_INIT(label, MAGIC_BPF); COUNTER_INC(init_bpfdesc_label); } @@ -279,6 +281,8 @@ mac_test_init_socket_label(struct label *label, int flag) { + mactest_pipe_submit("mac_test_init_socket_label\n", + strlen("mac_test_init_socket_label\n")); if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_test_init_socket_label() at %s:%d", __FILE__, From owner-p4-projects@FreeBSD.ORG Fri Jun 8 12:18:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0405C16A46F; Fri, 8 Jun 2007 12:18:15 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C791216A400 for ; Fri, 8 Jun 2007 12:18:14 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B465213C487 for ; Fri, 8 Jun 2007 12:18:14 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l58CIEZd017468 for ; Fri, 8 Jun 2007 12:18:14 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l58CIEfm017456 for perforce@freebsd.org; Fri, 8 Jun 2007 12:18:14 GMT (envelope-from gabor@freebsd.org) Date: Fri, 8 Jun 2007 12:18:14 GMT Message-Id: <200706081218.l58CIEfm017456@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 121210 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jun 2007 12:18:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=121210 Change 121210 by gabor@gabor_server on 2007/06/08 12:18:05 IFC Affected files ... .. //depot/projects/soc2006/gabor_destdir/CHANGES#6 integrate .. //depot/projects/soc2006/gabor_destdir/GIDs#6 integrate .. //depot/projects/soc2006/gabor_destdir/LEGAL#6 integrate .. //depot/projects/soc2006/gabor_destdir/MOVED#7 integrate .. //depot/projects/soc2006/gabor_destdir/Makefile#4 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#5 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gcc.mk#3 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnustep.mk#3 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gstreamer.mk#4 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.java.mk#4 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.kde.mk#5 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#15 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.options.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.subdir.mk#8 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.scons.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#7 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.xorg.mk#1 branch .. //depot/projects/soc2006/gabor_destdir/Templates/BSD.local.dist#1 branch .. //depot/projects/soc2006/gabor_destdir/Tools/make_readmes#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/scripts/addport#2 integrate .. //depot/projects/soc2006/gabor_destdir/Tools/scripts/mergebase.sh#1 branch .. //depot/projects/soc2006/gabor_destdir/UIDs#6 integrate .. //depot/projects/soc2006/gabor_destdir/UPDATING#7 integrate Differences ... ==== //depot/projects/soc2006/gabor_destdir/CHANGES#6 (text+ko) ==== @@ -10,6 +10,28 @@ All ports committers are allowed to commit to this file. +20070524: +AUTHOR: portmgr@FreeBSD.org +The following changes were made to the ports infrastructure: + + * The 'make-deinstall-all' target now checks for moved ports. + + * The installation directories PORTEXAMPLES and PORTDATA are now defined. + + * The USE_MAKESELF knob is added for ports that use the makeself archiver. + + * The description of fetch-list was updated. The targets fetch-required-list, + fetch-url-list, and fetch-urlall-list were added. + + * 'make search' will also now search in ports/MOVED. + + * The default method for 'make update' is now portsnap. Previously, + you had to manually select one of 3 methods: SUP_UPDATE, CVS_UPDATE, + or PORTSNAP_UPDATE. The latter is now obsolete. + + * Several Makevar definitions have been moved to the pre-makefile section: + DATADIR, DOCSDIR, ETCDIR, EXAMPLESDIR, WWWDIR. + 20070403: AUTHOR: portmgr@FreeBSD.org The following changes were made to the ports infrastructure: @@ -47,12 +69,21 @@ added for porter's convenience. They contain the values of their respective non-REL variables, except relative to installation PREFIX. +20070313: +AUTHOR: portmgr@FreeBSD.org +The following changes were made to the ports infrastructure: + + * bsd.ocaml.mk and bsd.xfce.mk were added. + + * The FETCH_CMD was refactored so that ports can override the command, + the arguments, or both. + 20070306: AUTHOR: portmgr@FreeBSD.org The following changes were made to the ports infrastructure: * The remainging vestiges of FreeBSD 4.X support were removed. Any - remaining users of 4.X should have stayed with the RELENG_4_EOL tag. + remaining users of 4.X should have stayed with the RELEASE_4_EOL tag. * It is now possible to include USE_PHP after bsd.port.pre.mk. @@ -1320,4 +1351,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.68 2007/04/02 23:14:45 pav Exp $ +$FreeBSD: ports/CHANGES,v 1.71 2007/06/03 01:01:35 linimon Exp $ ==== //depot/projects/soc2006/gabor_destdir/GIDs#6 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/GIDs,v 1.37 2007/04/11 13:27:34 miwi Exp $ +$FreeBSD: ports/GIDs,v 1.41 2007/05/30 06:11:56 miwi Exp $ # Please keep this file sorted by GID! smmsp:*:25: bind:*:53: @@ -52,6 +52,7 @@ ircproxyd:*:118: mythtv:*:119: pdns:*:120 +otrs:*:121: _ntp:*:123: fetchmail:*:124 postfix:*:125: @@ -84,6 +85,7 @@ smx:*:264: haclient:*:275: mrtg:*:279: +prelude:*:281: _sphinx:*:312: dkfilter:*:325: wildfire:*:340: @@ -92,6 +94,7 @@ drweb:*:426: courier:*:465: _bbstored:*:505: +nullmail:*:522: dkimproxy:*:525: ejabberd:*:544: qtss:*:554: @@ -102,10 +105,11 @@ tacacs:*:559: distcc:*:561: polkit:*:562: +pulse:*:563: +pulse-access:*:564: _xsi:*:600: bnetd:*:700: bopm:*:717: openxpki:*:777: netdisco:*:840: bacula:*:910: -otrs:*:121: ==== //depot/projects/soc2006/gabor_destdir/LEGAL#6 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.534 2007/04/13 15:52:55 miwi Exp $ +# $FreeBSD: ports/LEGAL,v 1.542 2007/06/07 08:59:34 miwi Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -128,6 +128,7 @@ free for commercial use DarwinStreamingSrvr*-Source.tar net/DarwinStreamingServer Server License restrictions See http://www.opensource.apple.com/apsl/ +darwinia-demo games/linux-darwinia-demo Redistribution limited vbsd*e.tar.Z security/vscan Restricted to the license terms set for VirusScan dbvis java/dbvis Redistribution is not permitted @@ -135,6 +136,7 @@ beta status dcl-*-C.tar.gz science/cdcl No commercial use dcl-*.tar.gz science/dcl No commercial use +defcon games/linux-defcon Redistribution limited DFSongSd.ttf chinese/dfsongsd No redistribution or commercial use is allowed dgd/* net/dgd License required for commercial @@ -158,6 +160,7 @@ http://cr.yp.to/softwarelaw.html djbfft-* math/djbfft No license -- see http://cr.yp.to/softwarelaw.html +dlv lang/dlv Not sure if we can redistribute it dn*.tgz emulators/darcnes Commercial use is restricted dnews_* news/dnews Only free for schools and universities, but they have to @@ -377,10 +380,11 @@ lame* audio/lame May be patented lgrind/* print/lgrind Contains non-free code written by Van Jacobson +libamrnb audio/libamrnb No redistribution allowed +libamrwb audio/libamrwb No redistribution allowed libdvdcss-*.tar.bz2 multimedia/libdvdcss CSS code may violate the DMCA libidea-* security/libidea Crypto; export-controlled libots-*.alpha.rpm lang/compaq-cc Distribution not allowed -LimeWireOther.zip net-p2p/limewire No redistribution allowed Linux-ACU-Driver-v* sysutils/linux-acu Redistribution not allowed Linux_MegaCli_* sysutils/linux-megacli Redistribution not allowed rpm/i386/fedora/4/gtk2-* x11-toolkits/linux-gtk2 LGPL binary, no source @@ -433,6 +437,8 @@ NetComponents-* java/netcomponents No redistribution except as part of a substantially different product netshow_linux.gz multimedia/netshow Commercial software +nerolinux-* sysutils/linux-nero Must be downloaded from WWW and + a Serial Number must be bought nntpcache-* news/nntpcache Commercial or government use requires license nsc2ke.* math/nsc2ke No resale, contact author for @@ -596,6 +602,7 @@ original source code ut_linux_mgr_* sysutils/linux-megamgr Redistribution prohibited linux-ut/* games/linux-ut Redistribution limited +uplink-demo games/linux-uplink-demo Redistribution limited ut2004-lnx-* games/linux-ut2004-demo Redistribution limited uzap.tar.gz editors/uzap Restrictive copyright vbsd440e.tar.Z security/vscan Commercial software @@ -675,3 +682,4 @@ lha-1.14i-ac* archivers/lha-ac No Redistribution GotoBLAS* math/gotoblas No Redistribution gamess.*/gamess* science/gamess No Redistribution +vst_sdk2_3.zip audio/ardour Redistribution of the VST PlugIns SDK is not allowed ==== //depot/projects/soc2006/gabor_destdir/MOVED#7 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1348 2007/04/11 11:29:23 sem Exp $ +# $FreeBSD: ports/MOVED,v 1.1386 2007/06/06 14:13:51 naddy Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -22,6 +22,7 @@ # (e.g. upgraded to a later version), don't record it here. # # Port|Moved to|Date|Why +lang/tcl-tk-wrapper||2007-05-31|Replaced by tcl-wrapper and tk-wrapper net/ratoolset|net/irrtoolset|2002-11-16|software was renamed chinese/linux-netscape47-communicator||2002-11-17|security vulnerability chinese/linux-netscape47-navigator||2002-11-17|security vulnerability @@ -941,7 +942,6 @@ textproc/yaxi|textproc/ocaml-yaxi|2004-03-19|port renamed devel/camomile|devel/ocaml-camomile|2004-03-19|port renamed archivers/gshar+gunshar|archivers/sharutils|2004-03-19|port renamed -devel/imake|devel/imake-4|2004-03-19|removed, obsoleted by imake-4 long ago net/arpwatch-devel|net-mgmt/arpwatch-devel|2004-03-20|moved to better fitting category multimedia/ffmpeg045|multimedia/ffmpeg|2004-03-20|latest stable version is better editors/emacs21|editors/emacs|2004-03-20|emacs 21.x moved to default port location @@ -2381,7 +2381,6 @@ emulators/linux_base-fc3||2006-07-04|Has expired: superseeded by linux_base-fc4 port misc/linux-opengroupware||2006-07-04|Has expired net/opengk||2006-07-04|Has expired: Latest version is from 2003-02-03. Use net/gatekeeper instead -security/p5-Crypt-OpenPGP||2006-07-04|Has expired: Crypt-OpenPGP was abandoned in 2002, use security/gnupg instead textproc/sed_inplace||2006-07-04|Has expired: This port is not required anymore textproc/xml4j||2006-07-04|Has expired: it has been replaced by textproc/xerces-j 8 years ago www/sitemapgen|www/google-sitemapgen|2006-07-05|Duplicate port @@ -2913,7 +2912,6 @@ databases/pecl-paradox||2007-04-10|Has expired: Does not compile deskutils/yank||2007-04-10|Has expired: Incomplete pkg-plist emulators/kmamerun||2007-04-10|Has expired: Project was abandoned 4 years ago and expects an old version of XMAME, please use other frontends instead (like gxmame) -graphics/hobbes-icons-xpm||2007-04-10|Has expired: Archaic port japanese/firefox-ja||2007-04-10|Has expired: Incomplete pkg-plist japanese/lookup-xemacs||2007-04-10|Has expired: Does not install lang/linux-hla||2007-04-10|Has expired: Does not compile @@ -2936,3 +2934,133 @@ www/urchin5||2007-04-10|Has expired: Does not install databases/cyrus-smlacapd||2007-04-10|Has expired: this software is obsolete databases/mysql-administrator||2007-04-11|Removed +devel/crossgo32||2007-04-14|Has expired: Archaic port +devel/crossgo32-djgpp2||2007-04-14|Removed, Archaic port +devel/crossgo32-djgpp2-pdcurses||2007-04-14|Removed, Archaic port +www/xsm|www/extsm|2007-04-16|was moved to resolve conflict with x11/xsm import +lang/tk-wrapper|x11-toolkits/tk-wrapper|2007-04-16|Moved to correct category +lang/gcc-objc|lang/gcc41|2007-04-21|Has expired, obsolete +cad/geda-projectmanager||2007-04-23|Has expired: project dead +audio/xmpeg3||2007-04-23|Has expired: does not work +japanese/dvipdfm|print/dvipdfmx|2007-04-24|Obsolete +audio/xmms-real-random||2007-04-24|Removed per maintainer's request, serious multimedia users have surely moved beyond xmms(1) +chinese/mldonkey-core||2007-04-26|Obsoleted by net-p2p/mldonkey version 2.8.5 +graphics/gstreamer-plugins-libcaca80||2007-04-29|Obsoleted, use 0.10.x version instead +devel/make||2007-04-29|Port was only useful on FreeBSD 4.x +multimedia/libdts|multimedia/libdca|2007-05-01|Project renamed +dns/dnscap||2007-05-03|Removed on authors request until it has reached stability +net-im/libgaim|net-im/libpurple|2007-05-03|Project renamed +net-im/gaim-devel|net-im/pidgin|2007-05-03|Project renamed +net-im/gaim-consoleui-devel|net-im/finch|2007-05-03|Project renamed +devel/imake-6|devel/imake|2007-05-19|Remove hardcoded version from portname +x11-fonts/xorg-fonts-encodings|x11-fonts/encodings|2007-05-19|Encoding fonts are now distributed separately +x11/xorg-documents|x11/xorg-docs|2007-05-19|X.org documentation now has its own distfile, rename accordingly +x11/xorg-manpages|||X.org manual pages are now installed with every single port +x11/xorg-clients|x11/xorg-apps|2007-05-19|Rename to new xorg-apps meta-port +x11/libXfont|x11-fonts/libXfont|2007-05-19|Move to the x11-fonts category +x11-servers/xorg-fontserver|x11-fonts/xfs|2007-05-19|Rename to follow X.org name +x11/xlibs|xorg-libraries|2007-05-25|Replaced by x11/xorg-libraries +multimedia/ffmpeg-devel|multimedia/ffmpeg|2007-05-25|Merged multimedia/ffmpeg-devel into multimedia/ffmpeg +devel/wfut||2007-05-27|Obsolete +net-im/gaim-hotkeys|net-im/pidgin-hotkeys|2007-05-28|Project renamed +devel/ruby-inline||2007-05-28|Has expired: New versions only available in rubygems. Use devel/rubygem-inline instead. +devel/tkref||2007-05-28|Has expired: is seriously outdated, take a look at http://www.tcl.tk/doc/ for TCL/TK documentation +net-p2p/amule1||2007-05-28|Has expired: use net-p2p/amule2 if you are running OSVERSION > 500000 +games/marathon-evil||2007-05-28|Has expired: Installed by games/alephone-scenarios with wrapper script +games/marathon2-data||2007-05-28|Has expired: Installed by games/alephone-data with wrapper script +net-im/tik||2007-05-28|Has expired: uses the old and unsupported TOC protocol, use net-im/aim or net-im/gaim instead +audio/gstreamer-plugins-a52dec80|audio/gstreamer-plugins-a52dec|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-artsd80||2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-audiofile80||2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-cdaudio80|audio/gstreamer-plugins-cdaudio|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-cdparanoia80|audio/gstreamer-plugins-cdparanoia|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-esound80|audio/gstreamer-plugins-esound|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-faac80|audio/gstreamer-plugins-faac|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-faad80|audio/gstreamer-plugins-faad|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-flac80|audio/gstreamer-plugins-flac|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-gsm80|audio/gstreamer-plugins-gsm|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-ivorbis80|audio/gstreamer-plugins-ivorbis|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-jack80|audio/gstreamer-plugins-jack|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-ladspa80|audio/gstreamer-plugins-ladspa|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-lame80|audio/gstreamer-plugins-lame|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-mad80|audio/gstreamer-plugins-mad|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-mikmod80||2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-musepack80|audio/gstreamer-plugins-musepack|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-musicbrainz80|audio/gstreamer-plugins-musicbrainz|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-nas80||2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-ogg80|audio/gstreamer-plugins-ogg|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-polyp80||2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-shout280|audio/gstreamer-plugins-shout2|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-shout80||2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-sidplay80|audio/gstreamer-plugins-sidplay|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-smoothwave80||2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-sndfile80||2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-speex80|audio/gstreamer-plugins-speex|2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-plugins-vorbis80|audio/gstreamer-plugins-vorbis|2007-06-01|Gstreamer 0.8 has been removed +devel/gstreamer-plugins-gconf80|devel/gstreamer-plugins-gconf|2007-06-01|Gstreamer 0.8 has been removed +devel/gstreamer-plugins-gnomevfs80|devel/gstreamer-plugins-gnomevfs|2007-06-01|Gstreamer 0.8 has been removed +devel/gstreamer-plugins-sdl80|devel/gstreamer-plugins-sdl|2007-06-01|Gstreamer 0.8 has been removed +graphics/gstreamer-plugins-aalib80|graphics/gstreamer-plugins-aalib|2007-06-01|Gstreamer 0.8 has been removed +graphics/gstreamer-plugins-cairo80|graphics/gstreamer-plugins-cairo|2007-06-01|Gstreamer 0.8 has been removed +graphics/gstreamer-plugins-gdkpixbuf80||2007-06-01|Gstreamer 0.8 has been removed +graphics/gstreamer-plugins-hermes80||2007-06-01|Gstreamer 0.8 has been removed +graphics/gstreamer-plugins-jpeg80|graphics/gstreamer-plugins-jpeg|2007-06-01|Gstreamer 0.8 has been removed +graphics/gstreamer-plugins-libmng80||2007-06-01|Gstreamer 0.8 has been removed +graphics/gstreamer-plugins-libpng80|graphics/gstreamer-plugins-libpng|2007-06-01|Gstreamer 0.8 has been removed +graphics/gstreamer-plugins-libvisual80|graphics/gstreamer-plugins-libvisual|2007-06-01|Gstreamer 0.8 has been removed +graphics/gstreamer-plugins-swfdec80|graphics/gstreamer-plugins-swfdec|2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer-ffmpeg80|multimedia/gstreamer-ffmpeg|2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer-plugins-all80|multimedia/gstreamer-plugins-all|2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer-plugins-core80|multimedia/gstreamer-plugins-core|2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer-plugins-dts80|multimedia/gstreamer-plugins-dts|2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer-plugins-dv80|multimedia/gstreamer-plugins-dv|2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer-plugins-dvd80|multimedia/gstreamer-plugins-dvd|2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer-plugins-libfame80||2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer-plugins-mpeg2dec80|multimedia/gstreamer-plugins-mpeg2dec|2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer-plugins-mplex80||2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer-plugins-theora80|multimedia/gstreamer-plugins-theora|2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer-plugins-x26480||2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer-plugins-xvid80|multimedia/gstreamer-plugins-xvid|2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer-plugins80|multimedia/gstreamer-plugins|2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer80|multimedia/gstreamer|2007-06-01|Gstreamer 0.8 has been removed +multimedia/py-gstreamer80|multimedia/py-gstreamer|2007-06-01|Gstreamer 0.8 has been removed +net/gstreamer-plugins-libmms80|net/gstreamer-plugins-libmms|2007-06-01|Gstreamer 0.8 has been removed +sysutils/gstreamer-plugins-cdio80||2007-06-01|Gstreamer 0.8 has been removed +x11-toolkits/gstreamer-plugins-pango80|x11-toolkits/gstreamer-plugins-pango|2007-06-01|Gstreamer 0.8 has been removed +audio/goobox||2007-06-01|Gstreamer 0.8 has been removed +audio/jamboree||2007-06-01|Gstreamer 0.8 has been removed +audio/klira||2007-06-01|Gstreamer 0.8 has been removed +audio/lindele||2007-06-01|Gstreamer 0.8 has been removed +audio/gstreamer-monkeysaudio||2007-06-01|Gstreamer 0.8 has been removed +audio/tunesbrowser||2007-06-01|Gstreamer 0.8 has been removed +games/gnome-music-quiz||2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer-editor||2007-06-01|Gstreamer 0.8 has been removed +multimedia/gstreamer-pitfdll||2007-06-01|Gstreamer 0.8 has been removed +multimedia/istanbul||2007-06-01|Gstreamer 0.8 has been removed +devel/agenda-libs||2007-06-02|Has expired: Agenda VR3 is dead for long time +devel/agenda-headers||2007-06-02|Has expired: Agenda VR3 is dead for long time +devel/agenda-snow-libs||2007-06-02|Has expired: Agenda VR3 is dead for long time +devel/agenda-static-libs||2007-06-02|Has expired: Agenda VR3 is dead for long time +devel/mipsel-linux-binutils||2007-06-02|Has expired: This is Agenda VR3-specific port, and Agenda VR3 is dead for long time. +devel/mipsel-linux-gcc||2007-06-02|Has expired: This is Agenda VR3-specific port, and Agenda VR3 is dead for long time. +devel/mipsel-linux-kernel-headers||2007-06-02|Has expired: This is Agenda VR3-specific port, and Agenda VR3 is dead for long time. +net/mrtg-ping-probe|net-mgmt/mrtg-ping-probe|2007-06-03|related ports mrtg was moved to net-mgmt from net +japanese/addttfont||2007-06-03|obsolete +japanese/p5-mkres||2007-06-03|obsolete +x11-toolkits/py-wmgeneral||2007-06-04|Renamed to x11-toolkits/py-wmdockapps +misc/gretl|math/gretl|2007-06-04|New category +devel/ups-debug||2007-06-04|Has expired: only runs on FreeBSD 4.X/386 +korean/han||2007-06-04|Has expired: Broken on all supported versions of FreeBSD +net/tspc2||2007-06-04|Has expired: development is discontinued +net-p2p/freenet||2007-06-04|Has expired: Does not work with existing Freenet network +net-p2p/libfreenet||2007-06-04|Has expired: Does not work with existing Freenet network +net-p2p/microdc||2007-06-04|Has expired: microdc is no longer in development. Consider using net-p2p/microdc2 instead +security/op||2007-06-04|Has expired: no longer available from any mastersite +shells/bash2||2007-06-04|Has expired: Old, unmaintained version, use shells/bash instead +sysutils/xperfmon||2007-06-04|Has expired: irrelevant for supported FreeBSD releases +textproc/ruby-html-parser||2007-06-04|Has expired: distfile and homepage disappeared +textproc/ruby-libxslt||2007-06-04|Has expired: Broken on all supported versions of FreeBSD +www/py-htmltestcase||2007-06-04|Has expired: Upstream site disappeared and dependency is set to expire +multimedia/snd-music-duplicates||2007-06-05|Has expired: Development has been ceased, successor is shareware. +audio/freebirth||2007-06-05|Has expired: Doesn't work on FreeBSD 5.0 and higher +net/sixxs-heartbeatd||2007-06-05|obsolete, use net/sixxs-aiccu instead ==== //depot/projects/soc2006/gabor_destdir/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: ports/Makefile,v 1.99 2007/02/26 08:54:07 ru Exp $ +# $FreeBSD: ports/Makefile,v 1.102 2007/05/24 23:58:29 linimon Exp $ # SUBDIR += accessibility @@ -57,6 +57,7 @@ SUBDIR += www SUBDIR += x11 SUBDIR += x11-clocks +SUBDIR += x11-drivers SUBDIR += x11-fm SUBDIR += x11-fonts SUBDIR += x11-servers @@ -97,6 +98,7 @@ if [ "${INDEX_PRISTINE}" != "" ]; then \ export LOCALBASE=/nonexistentlocal; \ export X11BASE=/nonexistentx; \ + export USE_NONDEFAULT_X11BASE=1; \ fi; \ tmpdir=`/usr/bin/mktemp -d -t index` || exit 1; \ trap "rm -rf $${tmpdir}; exit 1" 1 2 3 5 10 13 15; \ @@ -151,14 +153,8 @@ SUPFLAGS+= -h ${SUPHOST} .endif update: -.if defined(PORTSNAP_UPDATE) +.if defined(SUP_UPDATE) && defined(PORTSSUPFILE) @echo "--------------------------------------------------------------" - @echo ">>> Running ${PORTSNAP}" - @echo "--------------------------------------------------------------" - @${PORTSNAP} ${PORTSNAP_FLAGS} fetch - @${PORTSNAP} ${PORTSNAP_FLAGS} update -.elif defined(SUP_UPDATE) && defined(PORTSSUPFILE) - @echo "--------------------------------------------------------------" @echo ">>> Running ${SUP}" @echo "--------------------------------------------------------------" @${SUP} ${SUPFLAGS} ${PORTSSUPFILE} @@ -171,5 +167,17 @@ @${ECHO_MSG} "Error: Please define PORTSSUPFILE before doing make update." @exit 1 .else - @${ECHO_MSG} "Error: Please define either PORTSNAP_UPDATE, SUP_UPDATE, or CVS_UPDATE first." + @echo "--------------------------------------------------------------" + @echo ">>> Running ${PORTSNAP}" + @echo "--------------------------------------------------------------" +.if !exists(${PORTSDIR}/.portsnap.INDEX) + @echo "Error: 'make update' uses portsnap(8) by default and" + @echo "needs ${PORTSDIR} to be created by portsnap on its first run." + @echo "Please run 'portsnap fetch extract' first." + @echo "You can also define SUP_UPDATE and PORTSSUPFILE to use csup(1)" + @echo "or CVS_UPDATE to use cvs(1) for updating." +.else + @${PORTSNAP} ${PORTSNAP_FLAGS} fetch + @${PORTSNAP} ${PORTSNAP_FLAGS} update +.endif .endif ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.emacs.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.62 2007/04/04 07:24:06 clsung Exp $ +# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.65 2007/05/27 17:43:21 anray Exp $ # # bsd.emacs.mk - 19990829 Shigeyuki Fukushima. # @@ -115,7 +115,7 @@ # Emacs-22.x .elif (${EMACS_PORT_NAME} == "emacs22") EMACS_NAME= emacs -EMACS_VER= 22.0.97 +EMACS_VER= 22.0.99 EMACS_MAJOR_VER= 22 EMACS_LIBDIR?= share/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER} @@ -183,7 +183,7 @@ # XEmacs-21 development version .elif (${EMACS_PORT_NAME} == "xemacs-devel") EMACS_NAME= xemacs -EMACS_VER= 21.5-b27 +EMACS_VER= 21.5-b28 EMACS_MAJOR_VER= 21 EMACS_LIBDIR?= lib/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= lib/${EMACS_NAME}-${EMACS_VER} @@ -201,7 +201,7 @@ .elif (${EMACS_PORT_NAME} == "xemacs-devel-mule") || \ (${EMACS_PORT_NAME} == "xemacs-mule-xft") EMACS_NAME= xemacs -EMACS_VER= 21.5-b27 +EMACS_VER= 21.5-b28 EMACS_MAJOR_VER= 21 EMACS_LIBDIR?= lib/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= lib/${EMACS_NAME}-${EMACS_VER} ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gcc.mk#3 (text+ko) ==== @@ -18,7 +18,7 @@ # If you are wondering what your port exactly does, use "make test-gcc" # to see some debugging. # -# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.11 2007/01/29 09:27:04 pav Exp $ +# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.12 2007/05/19 22:06:14 pav Exp $ # GCC_Include_MAINTAINER= gerald@FreeBSD.org @@ -41,10 +41,10 @@ GCCVERSION_029500= 400012 500035 2.95 GCCVERSION_030200= 500039 501103 3.2 GCCVERSION_030301= 501103 502126 3.3 -GCCVERSION_030402= 502126 999999 3.4 +GCCVERSION_030402= 502126 700042 3.4 GCCVERSION_040000= 999999 999999 4.0 GCCVERSION_040100= 999999 999999 4.1 -GCCVERSION_040200= 999999 999999 4.2 +GCCVERSION_040200= 700042 999999 4.2 # # No configurable parts below this. ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnustep.mk#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.42 2007/01/30 04:25:35 kris Exp $ +# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.43 2007/06/04 11:20:29 dinoex Exp $ # # This file contains some variable definitions that are supposed to # make your life easier when dealing with ports related to the GNUstep. @@ -216,7 +216,7 @@ .if !defined(GNUSTEP_WITH_BASE_GCC) .if !defined(GNUSTEP_WITH_GCC32) && !defined(GNUSTEP_WITH_GCC33) && !defined(GNUSTEP_WITH_GCC34) .if !defined(GNUSTEP_WITH_GCC40) && !defined(GNUSTEP_WITH_GCC41) && !defined(GNUSTEP_WITH_GCC42) -GNUSTEP_WITH_GCC41= yes +GNUSTEP_WITH_GCC42= yes .endif .endif ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gstreamer.mk#4 (text+ko) ==== @@ -6,7 +6,7 @@ # Created by: Michael Johnson # Date: 4 Oct 2004 # -# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.33 2007/03/08 14:20:01 ahze Exp $ +# $FreeBSD: ports/Mk/bsd.gstreamer.mk,v 1.38 2007/06/07 16:21:34 ahze Exp $ # $MCom: ports/Mk/bsd.gstreamer.mk,v 1.38 2006/10/10 20:22:01 mezz Exp $ .if !defined(_POSTMKINCLUDED) && !defined(Gstreamer_Pre_Include) @@ -20,8 +20,6 @@ # # For Gstreamer 0.10: # USE_GSTREAMER= lame faac ffmpeg -# For Gstreamer 0.8: -# USE_GSTREAMER80= dvd lame flac # # If you want to use USE_GSTREAMER after # you must follow one of the examples listed below @@ -48,45 +46,30 @@ # GSTREAMER_PORT= ${PORTSDIR}/multimedia/gstreamer-plugins -GSTREAMER80_PORT= ${GSTREAMER_PORT}80 _GST_LIB_BASE= ${LOCALBASE}/lib/gstreamer-${GST_VERSION} -_GST80_LIB_BASE= ${LOCALBASE}/lib/gstreamer-${GST80_VERSION} GST_VERSION= 0.10 GST_MINOR_VERSION= .0 -GST80_VERSION= 0.8 -GST80_MINOR_VERSION= .10 GST_SHLIB_VERSION= 1 -GST80_SHLIB_VERSION= 1 # # These are the current supported gstreamer-plugins modules # -_USE_GSTREAMER_ALL= a52dec aalib annodex bad bz2 cairo cdaudio cdparanoia dts \ +_USE_GSTREAMER10_ALL= a52dec aalib annodex bad bz2 cairo cdaudio cdparanoia dts \ dv dvd esound faac faad ffmpeg flac gconf gnomevfs \ gnonlin good gsm hal ivorbis jack jpeg ladspa lame \ - libcaca libmms libpng libvisual mad mpeg2enc mpeg2dec \ + libcaca libmms libpng libvisual mp3 mpeg2enc mpeg2dec \ musepack neon ogg pango pulse python sdl shout2 sidplay \ spc speex swfdec theora ugly vorbis wavpack xvid -_USE_GSTREAMER80_ALL= a52dec aalib artsd audiofile cairo cdaudio cdio cdparanoia \ - dts dv dvd esound faac faad ffmpeg flac \ - gconf gdkpixbuf gnomevfs gsm hermes ivorbis jack jpeg \ - ladspa lame libcaca libfame libmms libmng \ - libpng libvisual mad mikmod mpeg2dec mpeg2enc mplex \ - musepack musicbrainz nas sdl shout shout2 sidplay \ - smoothwave sndfile speex theora ogg pango polyp \ - python swfdec vorbis x264 xvid + # other plugins -OTHER_GSTREAMER_PLUGINS+= core yes -OTHER_GSTREAMER80_PLUGINS+= ${OTHER_GSTREAMER_PLUGINS} +OTHER_GSTREAMER_PLUGINS+= core yes ${_USE_GSTREAMER10_ALL} fluendo-mp3 mad _USE_GSTREAMER_ALL+= ${OTHER_GSTREAMER_PLUGINS} -_USE_GSTREAMER80_ALL+= ${OTHER_GSTREAMER80_PLUGINS} core_DEPENDS= multimedia/gstreamer-plugins-core yes_DEPENDS= multimedia/gstreamer-plugins yes_NAME= gstreamer-plugins -yes_GST80_PREFIX= # empty -yes_GST_PREFIX= # empty +yes_GST_PREFIX= # empty cdio_DEPENDS= sysutils/gstreamer-plugins-cdio @@ -111,6 +94,8 @@ flac_DEPENDS= audio/gstreamer-plugins-flac +fluendo-mp3_DEPENDS= audio/gstreamer-plugins-fluendo-mp3 + gsm_DEPENDS= audio/gstreamer-plugins-gsm ivorbis_DEPENDS= audio/gstreamer-plugins-ivorbis @@ -127,6 +112,8 @@ mikmod_DEPENDS= audio/gstreamer-plugins-mikmod +mp3_DEPENDS= audio/gstreamer-plugins-mp3 + musepack_DEPENDS= audio/gstreamer-plugins-musepack musicbrainz_DEPENDS= audio/gstreamer-plugins-musicbrainz @@ -194,11 +181,8 @@ bz2_DEPENDS= multimedia/gstreamer-plugins-bz2 ffmpeg_DEPENDS= multimedia/gstreamer-ffmpeg -ffmpeg_GST80_SUFX= 80 -ffmpeg_GST80_PREFIX= gstreamer- ffmpeg_GST_PREFIX= gstreamer- ffmpeg_GST_SUFX= # empty -ffmpeg_GST80_VERSION= 0.8.7 ffmpeg_GST_VERSION= 0.10.0 dts_DEPENDS= multimedia/gstreamer-plugins-dts @@ -225,11 +209,8 @@ python_DEPENDS= multimedia/py-gstreamer python_NAME= gstreamer -python_GST80_SUFX= 80 -python_GST80_PREFIX= ${PYTHON_PKGNAMEPREFIX} python_GST_PREFIX= ${PYTHON_PKGNAMEPREFIX} python_GST_SUFX= # empty -python_GST80_VERSION= 0.8.2 python_GST_VERSION= 0.10.4 theora_DEPENDS= multimedia/gstreamer-plugins-theora @@ -250,18 +231,6 @@ .if defined(_POSTMKINCLUDED) && !defined(Gstreamer_Post_Include) Gstreamer_Post_Include= bsd.gstreamer.mk -.for ext in ${USE_GSTREAMER80} -${ext}_GST80_SUFX?= 80 -${ext}_GST80_PREFIX?= gstreamer-plugins- -${ext}_GST80_VERSION?= ${GST80_VERSION}${GST80_MINOR_VERSION} -${ext}_NAME?= ${ext} -. if ${_USE_GSTREAMER80_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_DEPENDS}${${ext}_GST80_SUFX}) -BUILD_DEPENDS+= ${${ext}_GST80_PREFIX}${${ext}_NAME}${${ext}_GST80_SUFX}>=${${ext}_GST80_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}${${ext}_GST80_SUFX} -RUN_DEPENDS+= ${${ext}_GST80_PREFIX}${${ext}_NAME}${${ext}_GST80_SUFX}>=${${ext}_GST80_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}${${ext}_GST80_SUFX} -. else -IGNORE= cannot install: unknown gstreamer-plugin -- ${ext} -. endif -.endfor .for ext in ${USE_GSTREAMER} ${ext}_GST_PREFIX?= gstreamer-plugins- ${ext}_GST_VERSION?= ${GST_VERSION}${GST_MINOR_VERSION} ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.java.mk#4 (text+ko) ==== @@ -9,7 +9,7 @@ # Please send all suggested changes to the maintainer instead of committing # them to CVS yourself. # -# $FreeBSD: ports/Mk/bsd.java.mk,v 1.77 2007/03/07 07:44:36 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.java.mk,v 1.78 2007/06/06 15:38:54 glewis Exp $ # .if !defined(Java_Include) @@ -187,8 +187,6 @@ VERSION=1.5.0 OS=native VENDOR=bsdjava _JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2_INFO= PORT=java/linux-blackdown-jdk12 HOME=${LOCALBASE}/linux-blackdown-jdk1.2.2 \ VERSION=1.2.2 OS=linux VENDOR=blackdown -_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_3_INFO= PORT=java/linux-blackdown-jdk13 HOME=${LOCALBASE}/linux-blackdown-jdk1.3.1 \ - VERSION=1.3.1 OS=linux VENDOR=blackdown _JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO= PORT=java/linux-blackdown-jdk14 HOME=${LOCALBASE}/linux-blackdown-jdk1.4.2 \ VERSION=1.4.2 OS=linux VENDOR=blackdown _JAVA_PORT_LINUX_SUN_JDK_1_2_INFO= PORT=java/linux-sun-jdk12 HOME=${LOCALBASE}/linux-sun-jdk1.2.2 \ @@ -230,7 +228,6 @@ JAVA_PORT_LINUX_SUN_JDK_1_3 \ JAVA_PORT_LINUX_SUN_JDK_1_2 \ JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4 \ - JAVA_PORT_LINUX_BLACKDOWN_JDK_1_3 \ JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2 _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ ${_JAVA_PREFERRED_PORTS} \ ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.kde.mk#5 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.71 2007/04/12 12:33:34 lofi Exp $ +# $FreeBSD: ports/Mk/bsd.kde.mk,v 1.72 2007/04/19 17:07:59 lofi Exp $ # # Please view me with 4 column tabs! @@ -140,8 +140,8 @@ # Qt 4.x common stuff QT_PREFIX?= ${LOCALBASE} -MOC?= ${QT_PREFIX}/bin/moc4 -UIC?= ${QT_PREFIX}/bin/uic4 +MOC?= ${QT_PREFIX}/bin/moc-qt4 +UIC?= ${QT_PREFIX}/bin/uic-qt4 QMAKE?= ${QT_PREFIX}/bin/qmake-qt4 QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++ ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#15 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.565 2007/04/07 12:51:47 pav Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.568 2007/05/25 00:09:37 linimon Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -94,7 +94,7 @@ # EXTRACT_SUFX - Suffix for archive names # You never have to set both DISTFILES and EXTRACT_SUFX. # Default: .tar.bz2 if USE_BZIP2 is set, .zip if USE_ZIP is -# set, .tar.gz otherwise. +# set, .run if USE_MAKESELF is set, .tar.gz otherwise). # MASTER_SITES - Primary location(s) for distribution files if not found # locally. See bsd.sites.mk for common choices for # MASTER_SITES. @@ -298,6 +298,8 @@ # compression. # USE_ZIP - If set, this port distfile uses zip, not tar w/[bg]zip # for compression. +# USE_MAKESELF - If set, this port distfile uses makeself, not tar w/[bg]zip +# for compression. # USE_DOS2UNIX - If set to "YES", remove the ^M from all files # under ${WRKSRC}. If set to a string, remove in all # files under ${WRKSRC} with one of these names the ^Ms. @@ -373,8 +375,10 @@ # case the linux X libraries are referenced. # # USE_FREETYPE - If set, this port uses the freetype print libraries. -# USE_GL - If set, this port uses libGL (not needed with XFree86 4.x -# which already includes this functionality). +# USE_GL - A list of Mesa or GL related dependencies needed by the port. +# Supported components are: glut, glu, glw, gl and linux. +# If set to "yes", this is equivalent to "glu". Note that +# glut depends on glu, glw and glu depend on gl. # USE_MOTIF - If set, this port uses a Motif toolkit. Implies USE_XPM. # NO_OPENMOTIF - If set, this port uses a custom Motif toolkit # instead of Openmotif. @@ -470,6 +474,10 @@ # USE_LINUX_RPM - Set to yes to pull in variables and targets useful to Linux # RPM ports. # Implies inclusion of bsd.linux-rpm.mk. +# +# USE_XORG - Set to a list of X.org module dependencies. +# Implies inclusion of bsd.xorg.mk. +# # AUTOMATIC_PLIST # - Set to yes to enable automatic packing list generation. # Currently has no effect unless USE_LINUX_RPM is set. @@ -517,7 +525,7 @@ # You rarely need to redefine any of these except WRKSRC and NO_WRKSUBDIR. # # X11BASE - Where X11 ports install things. -# Default: /usr/X11R6 +# Default: ${LOCALBASE} # LOCALBASE - Where non-X11 ports install things. # Default: /usr/local # LINUXBASE - Where Linux ports install things. @@ -644,24 +652,51 @@ # installed (for example because NOPORTDOCS is defined). # Useful for dynamically generated documentation. # +# Set the following to specify all documentation your port installs into +# ${EXAMPLESDIR} +# +# PORTEXAMPLES - A list of files and directories relative to EXAMPLESDIR. +# Shell glob patterns can be used, directories include +# the entire subtree of contained files and directories. +# Should not be set when no examples files are +# installed (for example because NOPORTEXAMPLES is defined). +# Useful for dynamically generated examples. +# +# Set the following to specify all documentation your port installs into +# ${DATADIR} +# +# PORTDATA - A list of files and directories relative to DATADIR. +# Shell glob patterns can be used, directories include +# the entire subtree of contained files and directories. +# Should not be set when no data files are +# installed (for example because NOPORTDATA is defined). +# Useful for dynamically generated data files. +# # Default targets and their behaviors: # -# fetch - Retrieves ${DISTFILES} (and ${PATCHFILES} if defined) -# into ${DISTDIR} as necessary. -# fetch-list - Show list of files that would be retrieved by fetch. +# fetch - Retrieves missing ${DISTFILES} and ${PATCHFILES} for this +# port. +# fetch-list - Show list of commands to retrieve missing ${DISTFILES} and +# ${PATCHFILES} for this port. # fetch-recursive -# - Retrieves ${DISTFILES} (and ${PATCHFILES} if defined), -# for port and dependencies into ${DISTDIR} as necessary. +# - Retrieves missing ${DISTFILES} and ${PATCHFILES} for this +# port and dependencies. # fetch-recursive-list -# - Show list of files that would be retrieved by -# fetch-recursive. +# - Show list of commands to retrieve missing ${DISTFILES} and +# ${PATCHFILES} for this port and dependencies. +# fetch-required +# - Retrieves missing ${DISTFILES} and ${PATCHFILES} for this +# port and dependencies. # fetch-required-list -# - Show list of files that would be retrieved by -# fetch-required. -# fetch-required -# - Retrieves ${DISTFILES} (and ${PATCHFILES} if defined), -# for port and dependencies that are not already installed -# into ${DISTDIR}. +# - Show list of commands to retrieve missing ${DISTFILES} and +# ${PATCHFILES} for this port and dependencies. +# fetch-url-list +# - Show list of URLS to retrieve missing ${DISTFILES} and +# ${PATCHFILES} for this port. +# fetch-urlall-list +# - Show list of URLS to retrieve ${DISTFILES} and +# ${PATCHFILES} for this port. +# # all-depends-list # - Show all directories which are dependencies # for this port. @@ -767,7 +802,8 @@ # For extract: # # EXTRACT_CMD - Command for extracting archive: "bzip2" if USE_BZIP2 -# is set, "unzip" if USE_ZIP is set, "gzip" otherwise. +# is set, "unzip" if USE_ZIP is set, "unmakeself" if +# USE_MAKESELF if set, "gzip" otherwise. # EXTRACT_BEFORE_ARGS # - Arguments to ${EXTRACT_CMD} before filename. # Default: "-dc" @@ -863,8 +899,8 @@ # NO_MTREE - If set, will not invoke mtree from bsd.port.mk from # the "install" target. # MTREE_FILE - The name of the mtree file. -# Default: /etc/mtree/BSD.x11.dist if USE_X_PREFIX is set, -# /etc/mtree/BSD.local.dist otherwise. +# Default: ${PORTSDIR}/Templates/BSD.local.dist or +# /etc/mtree/BSD.usr.dist if ${PREFIX} == "/usr". # PLIST_DIRS - Directories to be added to packing list # PLIST_FILES - Files and symbolic links to be added to packing list # @@ -1276,21 +1312,50 @@ # by individual Makefiles or local system make configuration. PORTSDIR?= /usr/ports LOCALBASE?= /usr/local -X11BASE?= /usr/X11R6 +X11BASE?= ${LOCALBASE} LINUXBASE?= /compat/linux DISTDIR?= ${PORTSDIR}/distfiles _DISTDIR?= ${DISTDIR}/${DIST_SUBDIR} INDEXDIR?= ${PORTSDIR} INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/} +DOCSDIR?= ${TARGETDIR}/share/doc/${PORTNAME} +EXAMPLESDIR?= ${TARGETDIR}/share/examples/${PORTNAME} +DATADIR?= ${TARGETDIR}/share/${PORTNAME} +WWWDIR?= ${TARGETDIR}/www/${PORTNAME} +ETCDIR?= ${TARGETDIR}/etc/${PORTNAME} + .if defined(USE_LINUX_RPM) .include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" .endif +.if ${OSVERSION} >= 502123 +X_WINDOW_SYSTEM ?= xorg +.else +X_WINDOW_SYSTEM ?= xfree86-4 +.endif + +.if ${OSVERSION} < 602000 +.if ${X11BASE} != ${LOCALBASE} && !defined(USE_NONDEFAULT_X11BASE) +.BEGIN: + @${ECHO_MSG} "On FreeBSD before 6.2 ports system unfortunately can not set default X11BASE by itself so please help it a bit by setting X11BASE=\$${LOCALBASE} in make.conf." + @${ECHO_MSG} "On the other hand, if you do wish to use non-default X11BASE, please set variable USE_NONDEFAULT_X11BASE." + @${FALSE} +.endif +.endif + +.if defined(USE_XORG) || defined(XORG_CAT) +. if ${X_WINDOW_SYSTEM} == "xorg" +.include "${PORTSDIR}/Mk/bsd.xorg.mk" +. endif +.endif + .if defined(USE_BZIP2) EXTRACT_SUFX?= .tar.bz2 .elif defined(USE_ZIP) EXTRACT_SUFX?= .zip +.elif defined(USE_MAKESELF) +EXTRACT_SUFX?= .run .else EXTRACT_SUFX?= .tar.gz .endif @@ -1495,7 +1560,7 @@ PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \ - WWWDIR=${WWWDIR} + WWWDIR=${WWWDIR} ETCDIR=${ETCDIR} PLIST_REINPLACE+= dirrmtry stopdaemon PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir %D/\1 2>/dev/null || true! @@ -1522,6 +1587,18 @@ PLIST_SUB+= PORTDOCS="" .endif +.if defined(NOPORTEXAMPLES) +PLIST_SUB+= PORTEXAMPLES="@comment " +.else +PLIST_SUB+= PORTEXAMPLES="" +.endif + +.if defined(NOPORTDATA) +PLIST_SUB+= PORTDATA="@comment " +.else +PLIST_SUB+= PORTDATA="" +.endif + CONFIGURE_SHELL?= ${SH} MAKE_SHELL?= ${SH} @@ -1552,6 +1629,9 @@ .if defined(USE_ZIP) EXTRACT_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip .endif +.if defined(USE_MAKESELF) +EXTRACT_DEPENDS+= unmakeself:${PORTSDIR}/archivers/unmakeself +.endif .if defined(USE_GMAKE) BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake CONFIGURE_ENV+= MAKE=${GMAKE} @@ -1720,22 +1800,22 @@ .endif .if defined(X_WINDOW_SYSTEM) && ${X_WINDOW_SYSTEM:L} == xorg -X_IMAKE_PORT= ${PORTSDIR}/devel/imake-6 +X_IMAKE_PORT= ${PORTSDIR}/devel/imake X_LIBRARIES_PORT= ${PORTSDIR}/x11/xorg-libraries -X_CLIENTS_PORT= ${PORTSDIR}/x11/xorg-clients +X_CLIENTS_PORT= ${PORTSDIR}/x11/xorg-apps X_SERVER_PORT= ${PORTSDIR}/x11-servers/xorg-server -X_FONTSERVER_PORT= ${PORTSDIR}/x11-servers/xorg-fontserver +X_FONTSERVER_PORT= ${PORTSDIR}/x11-fonts/xfs X_PRINTSERVER_PORT= ${PORTSDIR}/x11-servers/xorg-printserver X_VFBSERVER_PORT= ${PORTSDIR}/x11-servers/xorg-vfbserver X_NESTSERVER_PORT= ${PORTSDIR}/x11-servers/xorg-nestserver -X_FONTS_ENCODINGS_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-encodings +X_FONTS_ENCODINGS_PORT= ${PORTSDIR}/x11-fonts/encodings X_FONTS_MISC_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps X_FONTS_100DPI_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-100dpi X_FONTS_75DPI_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-75dpi X_FONTS_CYRILLIC_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-cyrillic X_FONTS_TTF_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-truetype X_FONTS_TYPE1_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-type1 -X_MANUALS_PORT= ${PORTSDIR}/x11/xorg-manpages +X_FONTS_ALIAS_PORT= ${PORTSDIR}/x11-fonts/font-alias .elif defined(X_WINDOW_SYSTEM) && ${X_WINDOW_SYSTEM:L} == xfree86-4 X_IMAKE_PORT= ${PORTSDIR}/devel/imake-4 X_LIBRARIES_PORT= ${PORTSDIR}/x11/XFree86-4-libraries @@ -1752,7 +1832,6 @@ X_FONTS_CYRILLIC_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-fontCyrillic X_FONTS_TTF_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-fontScalable X_FONTS_TYPE1_PORT= ${PORTSDIR}/x11-fonts/XFree86-4-fontScalable -X_MANUALS_PORT= ${PORTSDIR}/x11/XFree86-4-manuals .else IGNORE= cannot install: bad X_WINDOW_SYSTEM setting; valid values are 'xfree86-4' and 'xorg' .endif @@ -1761,19 +1840,63 @@ BUILD_DEPENDS+= imake:${X_IMAKE_PORT} .endif -.if defined(USE_XPM) || defined(USE_GL) +.if defined(PACKAGE_BUILDING) && defined(USE_DISPLAY) +BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \ + ${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \ + ${X11BASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT} +.endif + +.if ${X_WINDOW_SYSTEM:L} == xfree86-4 + +.if defined(USE_XPM) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 8 16:34:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99B0516A421; Fri, 8 Jun 2007 16:34:15 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 2A7D316A46D for ; Fri, 8 Jun 2007 16:34:15 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1B31E13C44B for ; Fri, 8 Jun 2007 16:34:15 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l58GYFfg084679 for ; Fri, 8 Jun 2007 16:34:15 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l58GYEUe084667 for perforce@freebsd.org; Fri, 8 Jun 2007 16:34:14 GMT (envelope-from taleks@FreeBSD.org) Date: Fri, 8 Jun 2007 16:34:14 GMT Message-Id: <200706081634.l58GYEUe084667@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to taleks@FreeBSD.org using -f From: Alexey Tarasov To: Perforce Change Reviews Cc: Subject: PERFORCE change 121227 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jun 2007 16:34:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=121227 Change 121227 by taleks@taleks_th on 2007/06/08 16:33:48 Added pxe_buffer and pxe_dhcp modules. pxe_buffer contains functions to work with cyclic buffers (PXE_BUFFER definition also moved in this module). pxe_dhcp - firest few linres to perform getting of information. that is not available from bootplayer for unknown reasons. pxe_core: moved out print_dhcp_options() to pxe_dhcp. pxe_ip: added simple broadcast ip address sending (need to check working on dhcp client). pxe_sock: made it a little bit more similar to stansart sockets interface, (added pxe_bind() function and pxe_recvfrom()) and socket states now are used not just to differ free/used states. pxe_udp: finally checksum works correctly after adding of two checksumes, pxe_udp_callback() now places data in sockets using pxe_buffer routines and stores pxe_udp_dgram structs in buffer. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/Makefile#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.h#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#13 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#11 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_dhcp.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_dhcp.h#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_ip.c#6 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_ip.h#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#6 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.h#6 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_udp.c#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_udp.h#2 edit Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/Makefile#5 (text+ko) ==== @@ -3,8 +3,8 @@ LIB= pxe_http INTERNALLIB= -SRCS= pxe_conv.c pxe_core.h pxe_isr.S pxe_sock.c pxe_arp.c pxe_ip.c pxe_mutex.c \ - pxe_core.c pxe_icmp.c pxe_mem.c pxe_udp.c pxe_filter.c pxe_dns.c +SRCS= pxe_conv.c pxe_isr.S pxe_mem.c pxe_buffer.c pxe_sock.c pxe_arp.c pxe_ip.c pxe_mutex.c \ + pxe_core.c pxe_icmp.c pxe_udp.c pxe_filter.c pxe_dns.c pxe_dhcp.c CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ -I${.CURDIR}/../../../contrib/dev/acpica \ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#13 (text+ko) ==== @@ -19,7 +19,6 @@ /* NOTE: to think about using of this buffers */ #define PXE_BUFFER_SIZE 0x1000 -#define PXE_TFTP_BUFFER_SIZE 512 static uint8_t scratch_buffer[PXE_BUFFER_SIZE]; static uint8_t data_buffer[PXE_BUFFER_SIZE]; static pxenv_t *pxenv = NULL; /* PXENV+ */ @@ -72,54 +71,6 @@ return (status); } - -void -print_dhcp_options(uint8_t *opts) -{ - uint8_t *p=opts; - uint8_t code = opts[0]; - uint8_t len = 0; - - printf("DHCP options:\n"); - - while (code != 255) { - - ++p; - len = 1 + (*p); - printf("code %d, len %d: ", code, len); - - switch (code) { - case 0: /* pad */ - len = 0; - break; - - case 1: /* netmask */ - printf("netmask: %d.%d.%d.%d\n", *(p+1), *(p+2), *(p+3), *(p+4)); - break; - - case 3: /* routers */ - printf("first router: %d.%d.%d.%d\n", *(p+1), *(p+2), *(p+3), *(p+4)); - break; - - case 5: /* nameserver */ - printf("first nameserver: %d.%d.%d.%d\n", *(p+1), *(p+2), *(p+3), *(p+4)); - break; - - default: - break; - }; - - printf("\n"); - p += len; - code = *p; - len = 0; - - if (p - opts > BOOTP_DHCPVEND) - break; - } -} - - /* * performs UNDI initialization call during pxe_core_init() * out: @@ -170,14 +121,7 @@ pxe = pxe_p; - /* creating 2-linked list of packets */ -/* for (; i < PXE_MAX_PACKETS; ++i) { - core_packets[i].prev = &core_packets[i-1]; - core_packets[i-1].next = &core_packets[i]; - } -*/ /* 1. determine PXE API entry point */ - if(pxenv_p == NULL) return (0); @@ -246,14 +190,20 @@ __pxe_entry_seg = pxe->EntryPointSP.segment; __pxe_entry_off = pxe->EntryPointSP.offset; + /* 2. getting cached info */ gci_p = (t_PXENV_GET_CACHED_INFO *) scratch_buffer; - pxe_memset(gci_p, 0, sizeof(*gci_p)); - gci_p->PacketType = PXENV_PACKET_TYPE_BINL_REPLY; + pxe_memset(gci_p, 0, sizeof(*gci_p)); - if (!pxe_core_call(PXENV_GET_CACHED_INFO)) { - } +/* gci_p->PacketType = PXENV_PACKET_TYPE_BINL_REPLY;*/ +/**/ + gci_p->PacketType = PXENV_PACKET_TYPE_DHCP_ACK; + gci_p->BufferSize = sizeof(BOOTPLAYER); + gci_p->Buffer.segment = VTOPSEG(&bootplayer); + gci_p->Buffer.offset = VTOPOFF(&bootplayer); - if (gci_p->Status != 0) { + if ( (!pxe_core_call(PXENV_GET_CACHED_INFO)) || + (gci_p->Status != 0) ) + { #ifdef PXE_DEBUG printf("pxe_core_init(): error status = 0x%x\n", gci_p->Status); #endif @@ -261,37 +211,13 @@ return (0); } - pxe_memcpy(PTOV((gci_p->Buffer.segment << 4) + gci_p->Buffer.offset), +/* pxe_memcpy(PTOV((gci_p->Buffer.segment << 4) + gci_p->Buffer.offset), &bootplayer, gci_p->BufferSize); - - - /* 2. additional start UNDI */ - - /* 2.1 close connection to network */ -/* - t_PXENV_UNDI_CLOSE *undi_close = - (t_PXENV_UNDI_CLOSE *)scratch_buffer; - - undi_close->Status = 0; - - pxe_core_call(PXENV_UNDI_CLOSE); - delay(10000000); - } */ - /* 2.1. shutdown UNDI */ - -/* t_PXENV_UNDI_SHUTDOWN *undi_shutdown = - (t_PXENV_UNDI_SHUTDOWN *)scratch_buffer; - - undi_shutdown->Status = 0; +#ifdef PXE_DEBUG + printf("pxe_core_init(): copied %d bytes of cached packet. Limit = %d.\n", gci_p->BufferSize, gci_p->BufferLimit); +#endif - pxe_core_call(PXENV_UNDI_SHUTDOWN); -*/ - /* 2.2 init UNDI */ -/* if (!pxe_core_undi_init()) { - return (0); - } -*/ /* 3. install isr */ pxe_core_install_isr(); @@ -313,6 +239,8 @@ printf("my MAC: %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", nic_mac[0], nic_mac[1], nic_mac[2], nic_mac[3], nic_mac[4], nic_mac[5]); + printf("gip ip: 0x%8x\n", bootplayer.gip); + ns_ip.ip = 0x0100a8c0; /* TODO: to determiny nameserver ip*/ pxe_arp_init(); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#11 (text+ko) ==== @@ -118,6 +118,7 @@ /* returns nameserver ip */ uint32_t pxe_get_nsip32(); +/* sets nameserver ip */ void pxe_set_nsip32(uint32_t new_ns); #endif // PXE_CORE_H_INCLUDED ==== //depot/projects/soc2007/taleks-pxe_http/pxe_ip.c#6 (text+ko) ==== @@ -307,15 +307,19 @@ pxe_create_ip_hdr(pack_out->data, dst_ip, protocol, pack_size, 0); /* setting pxe_core packet parameters*/ - pack_out->flags = PXE_SINGLE; + pack_out->flags = (dst_ip != PXE_IP_BCAST) ? PXE_SINGLE : PXE_BCAST; pack_out->protocol = PXE_PROTOCOL_IP; /* find gateway or direct MAC*/ - uint32_t ip_to_send = pxe_ip_route_find(dst_ip); + uint32_t ip_to_send = dst_ip; - pack_out->dest_mac = pxe_arp_ip4mac(ip_to_send); + if (pack_out->flags != PXE_BCAST) { + ip_to_send = pxe_ip_route_find(dst_ip); + pack_out->dest_mac = pxe_arp_ip4mac(ip_to_send); + } - if ( pack_out->dest_mac == NULL) { /* MAC is not found fo destination ip or gateway */ + if ( (pack_out->flags != PXE_BCAST) && (pack_out->dest_mac == NULL) ) { + /* MAC is not found for destination ip or gateway */ #ifdef PXE_DEBUG PXE_IPADDR dst; PXE_IPADDR to; @@ -333,7 +337,7 @@ printf("pxe_ip_send(): failed to send packet.\n"); #endif } else { - status = 1; + status = 1; } } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_ip.h#5 (text+ko) ==== @@ -34,6 +34,9 @@ }; } __packed PXE_IPADDR; +/* often used here broadcast ip */ +#define PXE_IP_BCAST 0xffffffff +/* maximum route table size */ #define PXE_MAX_ROUTES 4 /* routing related structure */ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#6 (text+ko) ==== @@ -1,5 +1,6 @@ +#include "pxe_buffer.h" +#include "pxe_filter.h" #include "pxe_mem.h" -#include "pxe_filter.h" #include "pxe_sock.h" #include "pxe_udp.h" @@ -40,12 +41,6 @@ sock->state = PXE_SOCKET_FREE; -/* NOTE: may be it's not good place for it - if (sock->filter) { - pxe_filter_remove(sock->filter); - sock->filter = NULL; - } -*/ return (1); } @@ -66,32 +61,29 @@ PXE_BUFFER *rbuf = &pxe_sockets[socket].recv_buffer; PXE_BUFFER *sbuf = &pxe_sockets[socket].send_buffer; - sbuf->data = pxe_alloc(PXE_DEFAULT_SEND_BUFSIZE); + if (!pxe_buffer_memalloc(sbuf, PXE_DEFAULT_SEND_BUFSIZE)) { - if (sbuf->data == NULL) { - pxe_socket_free(socket); return (-1); } sbuf->bufsize = PXE_DEFAULT_SEND_BUFSIZE; sbuf->bufleft = PXE_DEFAULT_SEND_BUFSIZE; - sbuf->free_start = sbuf->data; - sbuf->free_end = sbuf->data + sbuf->bufsize; + sbuf->fstart = 0; + sbuf->fend = sbuf->bufsize; - rbuf->data = pxe_alloc(PXE_DEFAULT_RECV_BUFSIZE); - if (rbuf->data == NULL) { + if (!pxe_buffer_memalloc(rbuf, PXE_DEFAULT_RECV_BUFSIZE)) { - pxe_free(rbuf->data); + pxe_buffer_memfree(sbuf); pxe_socket_free(socket); return (-1); } rbuf->bufsize = PXE_DEFAULT_RECV_BUFSIZE; rbuf->bufleft = PXE_DEFAULT_RECV_BUFSIZE; - rbuf->free_start = rbuf->data; - rbuf->free_end = rbuf->data + rbuf->bufsize; + rbuf->fstart = 0; + rbuf->fend = rbuf->bufsize; return (socket); } @@ -124,8 +116,8 @@ #endif } - pxe_free(sock->send_buffer.data); - pxe_free(sock->recv_buffer.data); + pxe_buffer_memfree(&sock->send_buffer); + pxe_buffer_memfree(&sock->recv_buffer); return pxe_socket_free(socket); } @@ -229,84 +221,6 @@ } } -int -pxe_sock_bufspace(int socket) -{ - if ( (socket >= PXE_DEFAULT_SOCKETS) || (socket == -1)) { - return (-1); - } - - return pxe_sockets[socket].recv_buffer.bufleft; -} - -int -pxe_sock_place(int socket, void* data, uint16_t size) -{ -#ifdef PXE_DEBUG - printf("pxe_sock_place(): socket: %d, data: 0x%x, size: %d\n", socket, data, size); -#endif - if ( (socket >= PXE_DEFAULT_SOCKETS) || (socket == -1)) { - return (-1); - } - - PXE_BUFFER *rbuf = &pxe_sockets[socket].recv_buffer; - uint16_t copy_size = size; - - /* there is no enogh space available in recv buffer - * try as much as possible. - */ - if (rbuf->bufleft < size) { - - copy_size = rbuf->bufleft; - - if (copy_size == 0) - return (0); - } - - pxe_memcpy(data, rbuf->free_start, copy_size); - - rbuf->free_start += copy_size; - rbuf->bufleft -= copy_size; - -#ifdef PXE_DEBUG - printf("pxe_sock_place(): left: %d\n", rbuf->bufleft); -#endif - return (copy_size); -} - -int -pxe_sock_get(PXE_SOCKET *sock) -{ - int res = sock - pxe_sockets; - - if (res > PXE_DEFAULT_SOCKETS) - return (-1); - - return (res); -} - -int -pxe_sock_rewind(int socket, uint16_t size) -{ - - if ( (socket >= PXE_DEFAULT_SOCKETS) || (socket == -1)) { - return (-1); - } - - PXE_SOCKET *sock = &pxe_sockets[socket]; - - uint16_t rew_bytes = sock->recv_buffer.free_start - sock->recv_buffer.data; - - /* if data to rewind enough, than rewing size, else only available rew_bytes */ - if (rew_bytes > size) - rew_bytes = size; - - sock->recv_buffer.free_start -= rew_bytes; - sock->recv_buffer.bufleft += rew_bytes; - - return (rew_bytes); -} - /* out: * 0 - no free port * >0 - port number @@ -330,13 +244,35 @@ printf("pxe_sendto(): send buffer too small for %d bytes.\n", size); return (-1); } + + PXE_SOCKET *sock = &pxe_sockets[socket]; + + + if ( sock->state == PXE_SOCKET_BINDED) { + /* if socket binded filter must not be NULL, cause pxe_bind() installs filter */ + if (sock->filter == NULL) { + printf("pxe_sendto(): filter is NULL for binded socket %d.\n", socket); + return (-1); + } + + /* NOTE: is really difference? */ + /* if (filter->protocol == PXE_UDP_PROTOCOL) { + + } else { + + } + */ + + } else { /* not binded, connect */ - if (!pxe_connect(socket, ip, port, PXE_UDP_PROTOCOL)) { - printf("pxe_sendto(): failed to connect.\n"); - return (-1); + /* NOTE: if it's already connected, return error */ + if (!pxe_connect(socket, ip, port, PXE_UDP_PROTOCOL)) { + printf("pxe_sendto(): failed to connect.\n"); + return (-1); + } } - PXE_SOCKET *sock = &pxe_sockets[socket]; + PXE_FILTER_ENTRY *filter = sock->filter; /* for UDP socket, send buffer used only for one dgram */ PXE_UDP_PACKET *udp_pack = (PXE_UDP_PACKET *)sock->send_buffer.data; @@ -344,12 +280,12 @@ /* copy user data */ pxe_memcpy(data, udp_pack + 1, size); - PXE_FILTER_ENTRY *filter = sock->filter; - /* filters are useful for incoming packet, so dst_port - * is local port. + * is local port. It's always set on this step (both for binded and connected sockets). + * for binded sockets pxe_connect() skipped, so we need manually call pxe_next_port() + * to get local port (so, we don't use binded local port, it seems correct behaviour) */ - uint16_t lport = filter->dst_port; + uint16_t lport = (sock->state == PXE_SOCKET_BINDED) ? pxe_next_port() : filter->dst_port; #ifdef PXE_DEBUG printf("pxe_sendto(): %8x:%d -> %8x:%d, size = %d bytes.\n", pxe_get_myip32(), lport, ip, port, size); @@ -359,22 +295,29 @@ printf("pxe_sendto(): failed to send data.\n"); return (-1); } - + + /* NOTE: normally for UDP here must be disconnecting of socket + * pxe_disconnect(socket); + */ return (size); } - - int pxe_connect(int socket, uint32_t ip, uint16_t port, uint8_t proto) { + if ( (socket >= PXE_DEFAULT_SOCKETS) || (socket == -1)) { return (0); } PXE_SOCKET *sock = &pxe_sockets[socket]; + if (sock->state >= PXE_SOCKET_CONNECTED) { + printf("pxe_connect(): socket %d already connected.\n", socket); + return (-1); + } + /* socket was already initalized */ if (sock->filter != NULL) { @@ -399,6 +342,8 @@ } sock->filter = entry; + sock->state = PXE_SOCKET_CONNECTED; + printf("pxe_connect(): socket %d,0x%x:%d -> 0x%x:%d\n", socket, pxe_get_myip32(), lport, ip, port); /* all is ok */ return (1); @@ -408,7 +353,6 @@ * also, need to understand how to update buffer for multiple received dgrams * buffer free space is specified by two pointers (may be better to change to * indexes) free_start and free_end. Cycled buffer. - * That's how i see it (cyclic buffer) */ int pxe_send(int socket, void *buf, size_t buflen) @@ -449,7 +393,60 @@ int pxe_recv(int socket, void *tobuf, size_t buflen) { + /* common part */ + if ( (socket >= PXE_DEFAULT_SOCKETS) || (socket == -1)) { + printf("pxe_recv(): invalid socket %d.\n", socket); + return (-1); + } + + PXE_BUFFER *buffer = &pxe_sockets[socket].recv_buffer; + + size_t usage = buffer->bufsize - buffer->bufleft; + + if ( usage == 0 ) { /* nothing received */ +#ifdef PXE_DEBUG + printf("pxe_recv(): nothing to recv for socket %d.\n", socket); +#endif + return (0); + } + +#ifdef PXE_DEBUG + printf("pxe_recv(): usage = %d, buflen = %d.\n", usage, buflen); +#endif + + /* udp related part, need to move it to separate function */ + PXE_UDP_DGRAM udp_dgram; + + if (sizeof(PXE_UDP_DGRAM) != pxe_buffer_read(buffer, &udp_dgram, sizeof(PXE_UDP_DGRAM))) { +#ifdef PXE_DEBUG + printf("pxe_udp_sock_recv(): failed to read datagram data.\n"); +#endif + return (0); + } + + if (udp_dgram.magic != PXE_MAGIC_DGRAM) { /* sanity check failed */ +#ifdef PXE_DEBUG + printf("pxe_udp_sock_recv(): dgram magic failed.\n"); +#endif + return (0); + } + + uint16_t tocopy = ((uint16_t)buflen < udp_dgram.size) ? (uint16_t)buflen : udp_dgram.size; + + uint16_t result = pxe_buffer_read(buffer, tobuf, tocopy); + + if (result < udp_dgram.size) { /* free truncated dgram part */ + pxe_buffer_read(buffer, NULL, udp_dgram.size - result); + } + + return ((int)result); +} + +int +pxe_recvfrom(int socket, void *tobuf, size_t buflen, uint32_t *src_ip) +{ + /* common part */ if ( (socket >= PXE_DEFAULT_SOCKETS) || (socket == -1)) { printf("pxe_recv(): invalid socket %d.\n", socket); return (-1); @@ -469,10 +466,77 @@ #ifdef PXE_DEBUG printf("pxe_recv(): usage = %d, buflen = %d.\n", usage, buflen); #endif + + /* udp related part, need to move it to separate function */ + PXE_UDP_DGRAM udp_dgram; + + if (sizeof(PXE_UDP_DGRAM) != pxe_buffer_read(buffer, &udp_dgram, sizeof(PXE_UDP_DGRAM))) { +#ifdef PXE_DEBUG + printf("pxe_udp_sock_recv(): failed to read datagram data.\n"); +#endif + return (0); + } + + if (udp_dgram.magic != PXE_MAGIC_DGRAM) {/* sanity check failed */ +#ifdef PXE_DEBUG + printf("pxe_udp_sock_recv(): dgram magic failed.\n"); +#endif + return (0); + } + + uint16_t tocopy = ((uint16_t)buflen < udp_dgram.size) ? (uint16_t)buflen : udp_dgram.size; + + uint16_t result = pxe_buffer_read(buffer, tobuf, tocopy); + + if (result < udp_dgram.size) { /* free truncated dgram part */ + pxe_buffer_read(buffer, NULL, udp_dgram.size - result); + } + + if (src_ip) { + *src_ip = udp_dgram.src_ip; + } + + return ((int)result); +} + +int +pxe_bind(int socket, uint32_t ip, uint16_t lport, uint8_t proto) +{ + if ( (socket >= PXE_DEFAULT_SOCKETS) || (socket == -1)) { + printf("pxe_bind(): invalid socket %d.\n", socket); + return (-1); + } + + PXE_SOCKET *sock = &pxe_sockets[socket]; + + if (sock->state == PXE_SOCKET_CONNECTED) { + printf("pxe_bind(): cannot bind connected socket %d.\n", socket); + return (-1); + } + + /* socket was already initalized */ + if (sock->filter != NULL) { + + pxe_filter_remove(sock->filter); + sock->filter = NULL; + } + + PXE_FILTER_ENTRY *entry = + pxe_filter_add( 0, 0, ip, lport, sock, proto); + - size_t tocopy = (buflen < usage) ? buflen : usage; + if ( entry == NULL ) { + printf("pxe_bind(): failed to add filter.\n"); + return (0); + } - pxe_memcpy(buffer->data, tobuf, tocopy); + /* allow any src_ip:port to our ip:lport */ + pxe_filter_mask(entry, 0, 0, 0xffffffff, 0xffff); + sock->filter = entry; + + /* all is ok */ + + sock->state = PXE_SOCKET_BINDED; - return (tocopy); + return (0); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_sock.h#6 (text+ko) ==== @@ -4,6 +4,7 @@ #include #include +#include "pxe_buffer.h" #include "pxe_filter.h" #include "pxe_ip.h" /* buffer size choosed by default for sending/recieving*/ @@ -17,21 +18,12 @@ /* default count of waiting queue */ #define PXE_DEFAULT_WAITCOUNT 3 /* socket states */ -#define PXE_SOCKET_FREE 0x0 -#define PXE_SOCKET_USED 0x1 +#define PXE_SOCKET_FREE 0x0 /* socket unused and free for allocating */ +#define PXE_SOCKET_USED 0x1 /* socket structure used */ +#define PXE_SOCKET_BINDED 0x2 /* socket binded (set local ip/local port) */ +#define PXE_SOCKET_CONNECTED 0x3 /* socket connected (set remote ip/remote port) */ +#define PXE_SOCKET_ESTABLISHED 0x4 /* connection established, may be bad place for this flag */ -/* pxe_buffer - buffer related information */ -typedef struct pxe_buffer { - - void *data; /* pointer to memory block, used for buffer*/ - void *free_start; - void *free_end; /* pointer to next free byte in memory block*/ - - uint16_t bufsize; /* size of memory block */ - uint16_t bufleft; /* left buffer space */ - -} PXE_BUFFER; - /* socket*/ typedef struct pxe_socket { PXE_BUFFER send_buffer; @@ -58,11 +50,11 @@ /* shows socket usage statistics */ void pxe_sock_stats(); /* returns available space in recv buffer of socket */ -int pxe_sock_bufspace(int socket); +/* int pxe_sock_bufspace(int socket); */ /* places data to buffer */ -int pxe_sock_place(int socket, void* data, uint16_t size); +/* int pxe_sock_place(int socket, void* data, uint16_t size); */ /* removes data from buffer */ -int pxe_sock_rewind(int socket, uint16_t size); +/* int pxe_sock_rewind(int socket, uint16_t size); */ /* removes int socket by pointer to PXE_SOCKET * TODO: think about interfaces between pxe_filter and pxe_sock */ @@ -92,9 +84,16 @@ int pxe_recv(int socket, void *buf, size_t buflen); /* create new socket */ int pxe_socket(); +/* binding */ +int pxe_bind(int socket, uint32_t ip, uint16_t port, uint8_t proto); /* close socket */ int pxe_close(int socket); /* returns next available local port */ uint16_t pxe_next_port(); +/*uint16_t pxe_buffer_write(PXE_BUFFER *buffer, const void* data, uint16_t size); +uint16_t pxe_buffer_free(PXE_BUFFER *buffer, void* to, uint16_t size); +uint16_t pxe_buffer_space(PXE_BUFFER *buffer); +*/ + #endif // PXE_SOCK_H_INCLUDED ==== //depot/projects/soc2007/taleks-pxe_http/pxe_udp.c#3 (text+ko) ==== @@ -50,20 +50,24 @@ if (buf_free < data_size) return (0); - int socket = pxe_sock_get(sock); - - if (socket == -1) { /* it must not ever be, but... */ - - printf("pxe_udp_callback(): internal error, sokcet = -1.\n"); - return (0); - } - - if (0 > pxe_sock_place(socket, pack->data + sizeof(PXE_UDP_PACKET), data_size )) { + PXE_BUFFER* recv_buffer = &sock->recv_buffer; + PXE_UDP_DGRAM udp_dgram; + + if (pxe_buffer_space(recv_buffer) < data_size + sizeof(PXE_UDP_DGRAM)) { + printf("pxe_udp_callback(): not enough space in recv buffer for socket %d\n", sock); + } else { + udp_dgram.magic = PXE_MAGIC_DGRAM; + udp_dgram.src_ip = from.ip; + udp_dgram.src_port = src_port; + udp_dgram.size = data_size; - printf("pxe_udp_callback(): failed to received data for socket %d\n", sock); + /* NOTE: here is assuming that there is no other writings to buffer, + * so, to writes, place data sequentially in bufer. + */ + pxe_buffer_write(recv_buffer, &udp_dgram, sizeof(PXE_UDP_DGRAM)); + pxe_buffer_write(recv_buffer, pack->data + sizeof(PXE_UDP_PACKET), data_size ); } -/* pxe_sock_stats(); */ return (0); } @@ -112,19 +116,28 @@ pseudo_hdr.length = udp_packet->udphdr.length; /* adding pseudo header checksum to checksum of udp header with data - * and made it complimentary + * and make it complimentary */ - udp_packet->udphdr.checksum = - ~( - ( (uint32_t)pxe_ip_checksum(&pseudo_hdr, sizeof(PXE_IP4_PSEUDO_HDR)) + - pxe_ip_checksum(&udp_packet->udphdr, length) - ) & 0x0000ffff - ); + + uint16_t part1 = pxe_ip_checksum(&pseudo_hdr, sizeof(PXE_IP4_PSEUDO_HDR)); + uint16_t part2 = pxe_ip_checksum(&udp_packet->udphdr, length); + + uint32_t tmp_sum = ((uint32_t)part1) + ((uint32_t)part2); + if (tmp_sum & 0xf0000) { /*need carry out */ + tmp_sum -= 0xffff; + } + + udp_packet->udphdr.checksum = ~((uint16_t)(tmp_sum & 0xffff)); + + /* special case */ + if (udp_packet->udphdr.checksum == 0) + udp_packet->udphdr.checksum = 0xffff; + #ifdef PXE_DEBUG_HELL printf("pxe_udp_send(): checksum 0x%4x for %d bytes\n", udp_packet->udphdr.checksum, length); #endif -/* if (!pxe_ip_send(udp_packet, dst_ip, PXE_UDP_PROTOCOL, size + sizeof(PXE_UDP_PACKET), 1)) {*/ + if (!pxe_ip_send(udp_packet, dst_ip, PXE_UDP_PROTOCOL, length + sizeof(PXE_IP_HDR), 1)) { printf("pxe_udp_send(): failed to send udp packet to 0x%x\n", dst_ip); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_udp.h#2 (text+ko) ==== @@ -44,11 +44,7 @@ uint32_t magic; /* magic for debug purposes */ uint32_t src_ip; /* ip of dgram sender */ - uint32_t dst_ip; /* destination ip */ uint16_t src_port; /* source port */ - uint16_t dst_port; /* destination port */ - - uint16_t prev_off; /* offset to previous pxe_udp_dgram */ uint16_t size; /* size of datagram */ } PXE_UDP_DGRAM; From owner-p4-projects@FreeBSD.ORG Fri Jun 8 17:53:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85DEC16A41F; Fri, 8 Jun 2007 17:53:05 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 148B816A46B; Fri, 8 Jun 2007 17:53:05 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.freebsd.org (Postfix) with ESMTP id B630A13C45E; Fri, 8 Jun 2007 17:53:04 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.8/8.13.8) with ESMTP id l58HqrOn058477; Fri, 8 Jun 2007 13:52:59 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: attilio@freebsd.org Date: Fri, 8 Jun 2007 13:51:52 -0400 User-Agent: KMail/1.9.6 References: <200706021756.l52Huq9A049371@repoman.freebsd.org> <86myzeq67f.wl%rpaulo@fnop.net> <4666B730.9080908@FreeBSD.org> In-Reply-To: <4666B730.9080908@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200706081351.54281.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Fri, 08 Jun 2007 13:52:59 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/3380/Fri Jun 8 08:34:26 2007 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Rui Paulo , Perforce Change Reviews , Rui Paulo Subject: Re: PERFORCE change 120788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jun 2007 17:53:05 -0000 On Wednesday 06 June 2007 09:31:28 am Attilio Rao wrote: > Rui Paulo wrote: > > > > If I'm not doing something wrong, I need to use spin locks on my > > interrupt handler, or else witness_checkorder will complain with > > "blockable sleep lock". > > > > Note that I'm using FILTERs. > > So you are doing this in the wrong way. > In order to use correctly filters, please note that the support for them > is compile time choosen, so you need to wrapper all filter specific > parts using INTR_FILTER compat macro. Actually, if you only use a filter and not an ithread handler, you can do that now w/o needing to have any #ifdef INTR_FILTER stuff. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Fri Jun 8 18:00:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96B9B16A41F; Fri, 8 Jun 2007 18:00:21 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 47AA616A46C for ; Fri, 8 Jun 2007 18:00:21 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from ik-out-1112.google.com (ik-out-1112.google.com [66.249.90.180]) by mx1.freebsd.org (Postfix) with ESMTP id AE40413C457 for ; Fri, 8 Jun 2007 18:00:20 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: by ik-out-1112.google.com with SMTP id c21so929605ika for ; Fri, 08 Jun 2007 11:00:19 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=ZeX2L3OG8zNkcWUZ+HF+hEHgbl8HzbP+Zr2ckRKKwV62lFb7tW0TvNcnVtbnu5XCkXtj32owKrQfJ/OSiDH0QMv5HhNJZBRqMy4fZzbqzzQoJFc7WQ8RCTEqp5kc8eHEUn/BAM4fVLUrqoH77Cde7relgKBVBikG/uHLRVe8Pd4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=c5k5nDuCU4PYw1kiz0///AiEnp3WvjXDGIe386Sv8YCrRUfPQkAU+4Ci6TY9qWaSQ0lE+RugjGLfORNAyswj2m5kaxDFF2/Rb/HaLpDi6ogd/U5xIM4UQdEJ5V+SLzlDMc3aiXxBu+IV3kyQU7PhW9YfOVHAjES5nw8b2SgzO+Q= Received: by 10.78.160.4 with SMTP id i4mr1365113hue.1181325618988; Fri, 08 Jun 2007 11:00:18 -0700 (PDT) Received: by 10.78.120.9 with HTTP; Fri, 8 Jun 2007 11:00:18 -0700 (PDT) Message-ID: <3bbf2fe10706081100k4f1457f2g6a714d8c897dc395@mail.gmail.com> Date: Fri, 8 Jun 2007 20:00:18 +0200 From: "Attilio Rao" Sender: asmrookie@gmail.com To: "John Baldwin" In-Reply-To: <200706081351.54281.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200706021756.l52Huq9A049371@repoman.freebsd.org> <86myzeq67f.wl%rpaulo@fnop.net> <4666B730.9080908@FreeBSD.org> <200706081351.54281.jhb@freebsd.org> X-Google-Sender-Auth: 0034c0b62844ce08 Cc: Rui Paulo , Perforce Change Reviews , Rui Paulo Subject: Re: PERFORCE change 120788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jun 2007 18:00:21 -0000 2007/6/8, John Baldwin : > On Wednesday 06 June 2007 09:31:28 am Attilio Rao wrote: > > Rui Paulo wrote: > > > > > > If I'm not doing something wrong, I need to use spin locks on my > > > interrupt handler, or else witness_checkorder will complain with > > > "blockable sleep lock". > > > > > > Note that I'm using FILTERs. > > > > So you are doing this in the wrong way. > > In order to use correctly filters, please note that the support for them > > is compile time choosen, so you need to wrapper all filter specific > > parts using INTR_FILTER compat macro. > > Actually, if you only use a filter and not an ithread handler, you can do that > now w/o needing to have any #ifdef INTR_FILTER stuff. In the case your kernel doesn't use filters (!INTR_FILTER) and you pass a filter, it is automatically mapped to work as a fast handler? Attilio -- Peace can only be achieved by understanding - A. Einstein From owner-p4-projects@FreeBSD.ORG Fri Jun 8 18:28:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DD3D16A46F; Fri, 8 Jun 2007 18:28:43 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4511516A41F; Fri, 8 Jun 2007 18:28:43 +0000 (UTC) (envelope-from arr@watson.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by mx1.freebsd.org (Postfix) with ESMTP id ED4BC13C483; Fri, 8 Jun 2007 18:28:42 +0000 (UTC) (envelope-from arr@watson.org) Received: from fledge.watson.org (localhost.watson.org [127.0.0.1]) by fledge.watson.org (8.13.8/8.13.8) with ESMTP id l58I4EM0016412; Fri, 8 Jun 2007 14:04:15 -0400 (EDT) (envelope-from arr@watson.org) Received: from localhost (arr@localhost) by fledge.watson.org (8.13.8/8.13.8/Submit) with ESMTP id l58I4E2m016409; Fri, 8 Jun 2007 14:04:14 -0400 (EDT) (envelope-from arr@watson.org) X-Authentication-Warning: fledge.watson.org: arr owned process doing -bs Date: Fri, 8 Jun 2007 14:04:14 -0400 (EDT) From: "Andrew R. Reiter" To: Attilio Rao In-Reply-To: <3bbf2fe10706081100k4f1457f2g6a714d8c897dc395@mail.gmail.com> Message-ID: <20070608140348.A14510@fledge.watson.org> References: <200706021756.l52Huq9A049371@repoman.freebsd.org> <86myzeq67f.wl%rpaulo@fnop.net> <4666B730.9080908@FreeBSD.org> <200706081351.54281.jhb@freebsd.org> <3bbf2fe10706081100k4f1457f2g6a714d8c897dc395@mail.gmail.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (fledge.watson.org [127.0.0.1]); Fri, 08 Jun 2007 19:04:15 +0100 (BST) Cc: Rui Paulo , Perforce Change Reviews , Rui Paulo , John Baldwin Subject: Re: PERFORCE change 120788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jun 2007 18:28:43 -0000 On Fri, 8 Jun 2007, Attilio Rao wrote: > 2007/6/8, John Baldwin : >> On Wednesday 06 June 2007 09:31:28 am Attilio Rao wrote: >> > Rui Paulo wrote: >> > > >> > > If I'm not doing something wrong, I need to use spin locks on my >> > > interrupt handler, or else witness_checkorder will complain with >> > > "blockable sleep lock". >> > > >> > > Note that I'm using FILTERs. >> > >> > So you are doing this in the wrong way. >> > In order to use correctly filters, please note that the support for them >> > is compile time choosen, so you need to wrapper all filter specific >> > parts using INTR_FILTER compat macro. >> >> Actually, if you only use a filter and not an ithread handler, you can do >> that >> now w/o needing to have any #ifdef INTR_FILTER stuff. > > In the case your kernel doesn't use filters (!INTR_FILTER) and you > pass a filter, it is automatically mapped to work as a fast handler? > > Attilio > When this conversation is completed, can this be documented? From owner-p4-projects@FreeBSD.ORG Fri Jun 8 19:26:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 299C516A477; Fri, 8 Jun 2007 19:26:24 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D929A16A46B; Fri, 8 Jun 2007 19:26:23 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.freebsd.org (Postfix) with ESMTP id 70B3013C4C5; Fri, 8 Jun 2007 19:26:23 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.8/8.13.8) with ESMTP id l58JQIkT059115; Fri, 8 Jun 2007 15:26:18 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: "Attilio Rao" Date: Fri, 8 Jun 2007 15:25:36 -0400 User-Agent: KMail/1.9.6 References: <200706021756.l52Huq9A049371@repoman.freebsd.org> <200706081351.54281.jhb@freebsd.org> <3bbf2fe10706081100k4f1457f2g6a714d8c897dc395@mail.gmail.com> In-Reply-To: <3bbf2fe10706081100k4f1457f2g6a714d8c897dc395@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200706081525.38380.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Fri, 08 Jun 2007 15:26:19 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/3380/Fri Jun 8 08:34:26 2007 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Rui Paulo , Perforce Change Reviews , Rui Paulo Subject: Re: PERFORCE change 120788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jun 2007 19:26:24 -0000 On Friday 08 June 2007 02:00:18 pm Attilio Rao wrote: > 2007/6/8, John Baldwin : > > On Wednesday 06 June 2007 09:31:28 am Attilio Rao wrote: > > > Rui Paulo wrote: > > > > > > > > If I'm not doing something wrong, I need to use spin locks on my > > > > interrupt handler, or else witness_checkorder will complain with > > > > "blockable sleep lock". > > > > > > > > Note that I'm using FILTERs. > > > > > > So you are doing this in the wrong way. > > > In order to use correctly filters, please note that the support for them > > > is compile time choosen, so you need to wrapper all filter specific > > > parts using INTR_FILTER compat macro. > > > > Actually, if you only use a filter and not an ithread handler, you can do that > > now w/o needing to have any #ifdef INTR_FILTER stuff. > > In the case your kernel doesn't use filters (!INTR_FILTER) and you > pass a filter, it is automatically mapped to work as a fast handler? Yes. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Fri Jun 8 23:08:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 143A416A469; Fri, 8 Jun 2007 23:08:45 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 DD2A016A41F for ; Fri, 8 Jun 2007 23:08:44 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CA15813C448 for ; Fri, 8 Jun 2007 23:08:44 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l58N8iWq078164 for ; Fri, 8 Jun 2007 23:08:44 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l58N8it8078161 for perforce@freebsd.org; Fri, 8 Jun 2007 23:08:44 GMT (envelope-from andrew@freebsd.org) Date: Fri, 8 Jun 2007 23:08:44 GMT Message-Id: <200706082308.l58N8it8078161@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 121238 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jun 2007 23:08:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=121238 Change 121238 by andrew@andrew_hermies on 2007/06/08 23:08:18 Fix the license on all files to be the correct 2-clause version Pointed out by: joel, imp Affected files ... .. //depot/projects/soc2007/andrew-update/backend/facund-be.c#7 edit .. //depot/projects/soc2007/andrew-update/frontend/facund.py#4 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/__init__.py#3 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/gui/__init__.py#3 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/gui/computer_model.py#3 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/gui/main_window.py#3 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#3 edit .. //depot/projects/soc2007/andrew-update/lib/facund_connection.c#2 edit .. //depot/projects/soc2007/andrew-update/lib/facund_connection.h#2 edit .. //depot/projects/soc2007/andrew-update/lib/facund_private.h#2 edit .. //depot/projects/soc2007/andrew-update/lib/facund_server.c#2 edit Differences ... ==== //depot/projects/soc2007/andrew-update/backend/facund-be.c#7 (text+ko) ==== @@ -1,29 +1,27 @@ -/* - * Copyright (C) 2007, Andrew Turner, All rights reserved. +/*- + * Copyright (c) 2007 Andrew Turner + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name(s) of the author(s) may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * */ ==== //depot/projects/soc2007/andrew-update/frontend/facund.py#4 (text+ko) ==== @@ -1,29 +1,28 @@ #!/usr/local/bin/python -# Copyright (C) 2007, Andrew Turner, All rights reserved. +# +# Copyright (c) 2007 Andrew Turner +# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer -# in this position and unchanged. +# notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# 3. The name(s) of the author(s) may not be used to endorse or promote -# products derived from this software without specific prior written -# permission. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. # import socket ==== //depot/projects/soc2007/andrew-update/frontend/facund/__init__.py#3 (text+ko) ==== @@ -1,28 +1,27 @@ -# Copyright (C) 2007, Andrew Turner, All rights reserved. +# +# Copyright (c) 2007 Andrew Turner +# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer -# in this position and unchanged. +# notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# 3. The name(s) of the author(s) may not be used to endorse or promote -# products derived from this software without specific prior written -# permission. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. # __all__ = ["gui", "network"] ==== //depot/projects/soc2007/andrew-update/frontend/facund/gui/__init__.py#3 (text+ko) ==== @@ -1,28 +1,27 @@ -# Copyright (C) 2007, Andrew Turner, All rights reserved. +# +# Copyright (c) 2007 Andrew Turner +# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer -# in this position and unchanged. +# notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# 3. The name(s) of the author(s) may not be used to endorse or promote -# products derived from this software without specific prior written -# permission. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. # from computer_model import ComputerTreeModel ==== //depot/projects/soc2007/andrew-update/frontend/facund/gui/computer_model.py#3 (text+ko) ==== @@ -1,28 +1,27 @@ -# Copyright (C) 2007, Andrew Turner, All rights reserved. +# +# Copyright (c) 2007 Andrew Turner +# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer -# in this position and unchanged. +# notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# 3. The name(s) of the author(s) may not be used to endorse or promote -# products derived from this software without specific prior written -# permission. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. # import gtk ==== //depot/projects/soc2007/andrew-update/frontend/facund/gui/main_window.py#3 (text+ko) ==== @@ -1,28 +1,27 @@ -# Copyright (C) 2007, Andrew Turner, All rights reserved. +# +# Copyright (c) 2007 Andrew Turner +# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer -# in this position and unchanged. +# notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# 3. The name(s) of the author(s) may not be used to endorse or promote -# products derived from this software without specific prior written -# permission. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. # import gtk ==== //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#3 (text+ko) ==== @@ -1,28 +1,27 @@ -# Copyright (C) 2007, Andrew Turner, All rights reserved. +# +# Copyright (c) 2007 Andrew Turner +# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer -# in this position and unchanged. +# notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# 3. The name(s) of the author(s) may not be used to endorse or promote -# products derived from this software without specific prior written -# permission. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. # import xml.sax.handler ==== //depot/projects/soc2007/andrew-update/lib/facund_connection.c#2 (text+ko) ==== @@ -1,29 +1,27 @@ -/* - * Copyright (C) 2007, Andrew Turner, All rights reserved. +/*- + * Copyright (c) 2007 Andrew Turner + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name(s) of the author(s) may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * */ ==== //depot/projects/soc2007/andrew-update/lib/facund_connection.h#2 (text+ko) ==== @@ -1,29 +1,27 @@ -/* - * Copyright (C) 2007, Andrew Turner, All rights reserved. +/*- + * Copyright (c) 2007 Andrew Turner + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name(s) of the author(s) may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * */ ==== //depot/projects/soc2007/andrew-update/lib/facund_private.h#2 (text+ko) ==== @@ -1,29 +1,27 @@ -/* - * Copyright (C) 2007, Andrew Turner, All rights reserved. +/*- + * Copyright (c) 2007 Andrew Turner + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name(s) of the author(s) may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * */ ==== //depot/projects/soc2007/andrew-update/lib/facund_server.c#2 (text+ko) ==== @@ -1,29 +1,27 @@ -/* - * Copyright (C) 2007, Andrew Turner, All rights reserved. +/*- + * Copyright (c) 2007 Andrew Turner + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name(s) of the author(s) may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * */ From owner-p4-projects@FreeBSD.ORG Sat Jun 9 02:50:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48AFE16A47D; Sat, 9 Jun 2007 02:50:15 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 16BE216A468 for ; Sat, 9 Jun 2007 02:50:15 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 02FA813C48C for ; Sat, 9 Jun 2007 02:50:15 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l592oEq5025933 for ; Sat, 9 Jun 2007 02:50:14 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l592oELI025924 for perforce@freebsd.org; Sat, 9 Jun 2007 02:50:14 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 9 Jun 2007 02:50:14 GMT Message-Id: <200706090250.l592oELI025924@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 121243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 02:50:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=121243 Change 121243 by thompsa@thompsa_heff on 2007/06/09 02:49:56 Use our own callout instead of if_watchdog. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#41 edit .. //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#16 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#41 (text+ko) ==== @@ -152,7 +152,7 @@ static int iwi_tx_start(struct ifnet *, struct mbuf *, struct ieee80211_node *, int); static void iwi_start(struct ifnet *); -static void iwi_watchdog(struct ifnet *); +static void iwi_watchdog(void *); static int iwi_ioctl(struct ifnet *, u_long, caddr_t); static void iwi_stop_master(struct iwi_softc *); static int iwi_reset(struct iwi_softc *); @@ -282,6 +282,7 @@ TASK_INIT(&sc->sc_downtask, 0, iwi_down, sc); TASK_INIT(&sc->sc_restarttask, 0, iwi_restart, sc); TASK_INIT(&sc->sc_opstask, 0, iwi_ops, sc); + callout_init_mtx(&sc->sc_wdtimer, &sc->sc_mtx, 0); if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) { device_printf(dev, "chip is in D%d power mode " @@ -356,7 +357,6 @@ ifp->if_init = iwi_init; ifp->if_ioctl = iwi_ioctl; ifp->if_start = iwi_start; - ifp->if_watchdog = iwi_watchdog; IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; IFQ_SET_READY(&ifp->if_snd); @@ -458,6 +458,8 @@ bpfdetach(ifp); ieee80211_ifdetach(ic); } + + callout_drain(&sc->sc_wdtimer); iwi_put_firmware(sc); iwi_release_fw_dma(sc); @@ -1954,19 +1956,18 @@ } sc->sc_tx_timer = 5; - ifp->if_timer = 1; } IWI_UNLOCK(sc); } static void -iwi_watchdog(struct ifnet *ifp) +iwi_watchdog(void *arg) { - struct iwi_softc *sc = ifp->if_softc; - IWI_LOCK_DECL; + struct iwi_softc *sc = arg; + struct ifnet *ifp = sc->sc_ifp; - IWI_LOCK(sc); + IWI_LOCK_CHECK(sc); if (sc->sc_tx_timer > 0) { if (--sc->sc_tx_timer == 0) { @@ -1997,12 +1998,9 @@ } } } - if (sc->sc_tx_timer || sc->sc_rfkill_timer || sc->sc_scan_timer) - ifp->if_timer = 1; - else - ifp->if_timer = 0; - IWI_UNLOCK(sc); + if (ifp->if_drv_flags & IFF_DRV_RUNNING) + callout_reset(&sc->sc_wdtimer, hz, iwi_watchdog, sc); } static int @@ -2801,7 +2799,6 @@ #endif sc->flags |= IWI_FLAG_SCANNING; sc->sc_scan_timer = 3; - sc->sc_ifp->if_timer = 1; return (iwi_cmd(sc, IWI_CMD_SCAN_EXT, &scan, sizeof scan)); } @@ -3181,6 +3178,7 @@ } else ieee80211_new_state(ic, IEEE80211_S_RUN, -1); + callout_reset(&sc->sc_wdtimer, hz, iwi_watchdog, sc); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; @@ -3206,6 +3204,7 @@ sc->sc_blinking = 0; } + callout_stop(&sc->sc_wdtimer); iwi_stop_master(sc); CSR_WRITE_4(sc, IWI_CSR_RST, IWI_RST_SOFT_RESET); @@ -3218,7 +3217,6 @@ iwi_reset_tx_ring(sc, &sc->txq[3]); iwi_reset_rx_ring(sc, &sc->rxq); - ifp->if_timer = 0; ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); sc->sc_tx_timer = 0; @@ -3267,7 +3265,6 @@ device_printf(sc->sc_dev, "radio turned off\n"); iwi_stop(sc); sc->sc_rfkill_timer = 2; - sc->sc_ifp->if_timer = 1; } static int ==== //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#16 (text+ko) ==== @@ -203,6 +203,7 @@ u_int8_t sc_txrix; u_int16_t sc_ledoff; /* off time for current blink */ struct callout sc_ledtimer; /* led off timer */ + struct callout sc_wdtimer; /* watchdog timer */ int sc_tx_timer; int sc_rfkill_timer;/* poll for rfkill change */ From owner-p4-projects@FreeBSD.ORG Sat Jun 9 02:57:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CCE616A46B; Sat, 9 Jun 2007 02:57:24 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 6FD5516A41F for ; Sat, 9 Jun 2007 02:57:24 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5BEBE13C45D for ; Sat, 9 Jun 2007 02:57:24 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l592vOw4032374 for ; Sat, 9 Jun 2007 02:57:24 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l592vNRA032365 for perforce@freebsd.org; Sat, 9 Jun 2007 02:57:23 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 9 Jun 2007 02:57:23 GMT Message-Id: <200706090257.l592vNRA032365@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 121244 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 02:57:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=121244 Change 121244 by thompsa@thompsa_heff on 2007/06/09 02:56:50 Use a proper mtx_assert instead of a debug printf and improve the locking. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#42 edit .. //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#17 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#42 (text+ko) ==== @@ -452,9 +452,12 @@ struct iwi_softc *sc = device_get_softc(dev); struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = ic->ic_ifp; + IWI_LOCK_DECL; if (ifp != NULL) { + IWI_LOCK(sc); iwi_stop(sc); + IWI_UNLOCK(sc); bpfdetach(ifp); ieee80211_ifdetach(ic); } @@ -794,8 +797,11 @@ iwi_shutdown(device_t dev) { struct iwi_softc *sc = device_get_softc(dev); + IWI_LOCK_DECL; + IWI_LOCK(sc); iwi_stop(sc); + IWI_UNLOCK(sc); iwi_put_firmware(sc); /* ??? XXX */ return 0; @@ -805,8 +811,11 @@ iwi_suspend(device_t dev) { struct iwi_softc *sc = device_get_softc(dev); + IWI_LOCK_DECL; + IWI_LOCK(sc); iwi_stop(sc); + IWI_UNLOCK(sc); return 0; } @@ -938,7 +947,7 @@ struct iwi_softc *sc = ifp->if_softc; int error = 0; - IWI_LOCK_CHECK(sc); + IWI_LOCK_ASSERT(sc); DPRINTF(("%s: %s -> %s flags 0x%x\n", __func__, ieee80211_state_name[ic->ic_state], ieee80211_state_name[nstate], sc->flags)); @@ -1661,7 +1670,7 @@ { struct iwi_cmd_desc *desc; - IWI_LOCK_CHECK(sc); + IWI_LOCK_ASSERT(sc); if (sc->flags & IWI_FLAG_BUSY) { device_printf(sc->sc_dev, "%s: cmd %d not sent, busy\n", @@ -1725,7 +1734,7 @@ int error, nsegs, hdrlen, i; int ismcast, flags, xflags, staid; - IWI_LOCK_CHECK(sc); + IWI_LOCK_ASSERT(sc); wh = mtod(m0, const struct ieee80211_frame *); /* NB: only data frames use this path */ hdrlen = ieee80211_hdrsize(wh); @@ -1967,7 +1976,7 @@ struct iwi_softc *sc = arg; struct ifnet *ifp = sc->sc_ifp; - IWI_LOCK_CHECK(sc); + IWI_LOCK_ASSERT(sc); if (sc->sc_tx_timer > 0) { if (--sc->sc_tx_timer == 0) { @@ -2062,8 +2071,6 @@ uint32_t tmp; int ntries; - IWI_LOCK_CHECK(sc); - /* disable interrupts */ CSR_WRITE_4(sc, IWI_CSR_INTR_MASK, 0); @@ -2330,7 +2337,7 @@ size_t size = fw->size; int i, ntries, error; - IWI_LOCK_CHECK(sc); + IWI_LOCK_ASSERT(sc); error = 0; CSR_WRITE_4(sc, IWI_CSR_RST, CSR_READ_4(sc, IWI_CSR_RST) | IWI_RST_STOP_MASTER); @@ -2403,7 +2410,7 @@ uint32_t sentinel, ctl, src, dst, sum, len, mlen, tmp; int ntries, error; - IWI_LOCK_CHECK(sc); + IWI_LOCK_ASSERT(sc); /* copy firmware image to DMA memory */ memcpy(sc->fw_virtaddr, fw->data, fw->size); @@ -2545,7 +2552,7 @@ struct iwi_txpower power; uint32_t data; int error, i; - IWI_LOCK_CHECK(sc); + IWI_LOCK_ASSERT(sc); IEEE80211_ADDR_COPY(ic->ic_myaddr, IF_LLADDR(ifp)); DPRINTF(("Setting MAC address to %6D\n", ic->ic_myaddr, ":")); @@ -2694,7 +2701,7 @@ struct iwi_scan_ext scan; int error = 0; - IWI_LOCK_CHECK(sc); + IWI_LOCK_ASSERT(sc); if (sc->flags & IWI_FLAG_SCANNING) { /* * This should not happen as we only trigger scan_next after @@ -2828,10 +2835,9 @@ int error; IWI_LOCK_DECL; - IWI_LOCK_CHECK(sc); + IWI_LOCK_ASSERT(sc); error = 0; - IWI_LOCK(sc); if (IEEE80211_IS_CHAN_2GHZ(ic->ic_curchan)) { memset(&config, 0, sizeof config); config.bluetooth_coexistence = sc->bluetooth; @@ -3079,7 +3085,7 @@ int i; IWI_LOCK_DECL; - IWI_LOCK_CHECK(sc); + IWI_LOCK_ASSERT(sc); if (sc->flags & IWI_FLAG_FW_LOADING) { device_printf(sc->sc_dev, "%s: already loading\n", __func__); return; /* XXX: condvar? */ @@ -3198,7 +3204,7 @@ struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = ic->ic_ifp; - IWI_LOCK_CHECK(sc); /* XXX: pretty sure this triggers */ + IWI_LOCK_ASSERT(sc); if (sc->sc_softled) { callout_stop(&sc->sc_ledtimer); sc->sc_blinking = 0; @@ -3261,10 +3267,13 @@ iwi_radio_off(void *arg, int pending) { struct iwi_softc *sc = arg; + IWI_LOCK_DECL; device_printf(sc->sc_dev, "radio turned off\n"); + IWI_LOCK(sc); iwi_stop(sc); sc->sc_rfkill_timer = 2; + IWI_UNLOCK(sc); } static int ==== //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#17 (text+ko) ==== @@ -246,10 +246,7 @@ MTX_NETWORK_LOCK, MTX_DEF) #define IWI_LOCK_DESTROY(sc) mtx_destroy(&(sc)->sc_mtx) #define IWI_LOCK_DECL int __waslocked = 0 -#define IWI_LOCK_CHECK(sc) do { \ - if (!mtx_owned(&(sc)->sc_mtx)) \ - DPRINTF(("%s iwi_lock not held\n", __func__)); \ -} while (0) +#define IWI_LOCK_ASSERT(sc) mtx_assert(&(sc)->sc_mtx, MA_OWNED) #define IWI_LOCK(sc) do { \ if (!(__waslocked = mtx_owned(&(sc)->sc_mtx))) \ mtx_lock(&(sc)->sc_mtx); \ From owner-p4-projects@FreeBSD.ORG Sat Jun 9 03:04:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C967616A468; Sat, 9 Jun 2007 03:04:33 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A3C0716A421 for ; Sat, 9 Jun 2007 03:04:33 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8F91713C46A for ; Sat, 9 Jun 2007 03:04:33 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5934Xje040202 for ; Sat, 9 Jun 2007 03:04:33 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5934XhZ040192 for perforce@freebsd.org; Sat, 9 Jun 2007 03:04:33 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 9 Jun 2007 03:04:33 GMT Message-Id: <200706090304.l5934XhZ040192@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 121245 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 03:04:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=121245 Change 121245 by thompsa@thompsa_heff on 2007/06/09 03:04:23 Improve check for disassociate. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#43 edit .. //depot/projects/wifi/sys/dev/iwi/if_iwireg.h#11 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#43 (text+ko) ==== @@ -1471,10 +1471,19 @@ ieee80211_new_state(ic, IEEE80211_S_RUN, -1); break; - case IWI_ASSOC_FAIL: - DPRINTFN(2, ("Association failed\n")); + case IWI_ASSOC_INIT: + switch (ic->ic_state) { + case IEEE80211_S_ASSOC: + DPRINTFN(2, ("Association failed\n")); + ieee80211_new_state(ic, + IEEE80211_S_SCAN, -1); + break; + + case IEEE80211_S_RUN: + DPRINTFN(2, ("Disassociated\n")); + break; + } sc->flags &= ~IWI_FLAG_ASSOCIATED; - ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); break; default: ==== //depot/projects/wifi/sys/dev/iwi/if_iwireg.h#11 (text+ko) ==== @@ -213,7 +213,7 @@ /* structure for notification IWI_NOTIF_TYPE_ASSOCIATION */ struct iwi_notif_association { uint8_t state; -#define IWI_ASSOC_FAIL 0 +#define IWI_ASSOC_INIT 0 #define IWI_ASSOC_SUCCESS 12 uint8_t pad[11]; } __packed; From owner-p4-projects@FreeBSD.ORG Sat Jun 9 07:46:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08ABE16A468; Sat, 9 Jun 2007 07:46:21 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B1F9216A421 for ; Sat, 9 Jun 2007 07:46:20 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9D3AD13C44B for ; Sat, 9 Jun 2007 07:46:20 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l597kK7p014318 for ; Sat, 9 Jun 2007 07:46:20 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l597kKv2014292 for perforce@freebsd.org; Sat, 9 Jun 2007 07:46:20 GMT (envelope-from andrew@freebsd.org) Date: Sat, 9 Jun 2007 07:46:20 GMT Message-Id: <200706090746.l597kKv2014292@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 121251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 07:46:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=121251 Change 121251 by andrew@andrew_hermies on 2007/06/09 07:45:46 - Listen for a close of element signal from libbsdxml - Send a server close message when the connection is being closed by the client - Comment out the returning the send data element Affected files ... .. //depot/projects/soc2007/andrew-update/lib/facund_server.c#3 edit Differences ... ==== //depot/projects/soc2007/andrew-update/lib/facund_server.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ #define BUF_SIZE 128 static void facund_server_start_tag(void *, const XML_Char *, const XML_Char**); +static void facund_server_end_tag(void *, const XML_Char *); /* * Waits for a client to connect and send the start message @@ -54,6 +55,7 @@ XML_SetUserData(conn->parser, conn); XML_SetStartElementHandler(conn->parser, facund_server_start_tag); + XML_SetEndElementHandler(conn->parser, facund_server_end_tag); str = ""; facund_send(conn, str, strlen(str)); @@ -106,11 +108,29 @@ const XML_Char **attrs __unused) { struct facund_conn *conn; + //char str[1024]; + + printf("> %s\n", name); + conn = data; + + //snprintf(str, 1024, "", name); + //facund_send(conn, str, strlen(str)); +} + +static void +facund_server_end_tag(void *data, const XML_Char *name) +{ + struct facund_conn *conn; char str[1024]; - printf("> %s\n", name); + printf("< %s\n", name); conn = data; - snprintf(str, 1024, "", name); - facund_send(conn, str, strlen(str)); + if (strcmp(name, "facund-client") == 0) { + snprintf(str, 1024, ""); + facund_send(conn, str, strlen(str)); + } else { + snprintf(str, 1024, "", name); + facund_send(conn, str, strlen(str)); + } } From owner-p4-projects@FreeBSD.ORG Sat Jun 9 07:54:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 994D616A46E; Sat, 9 Jun 2007 07:54:31 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 565E916A468 for ; Sat, 9 Jun 2007 07:54:31 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4020813C4B7 for ; Sat, 9 Jun 2007 07:54:31 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l597sVVJ022232 for ; Sat, 9 Jun 2007 07:54:31 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l597sU1B022220 for perforce@freebsd.org; Sat, 9 Jun 2007 07:54:30 GMT (envelope-from andrew@freebsd.org) Date: Sat, 9 Jun 2007 07:54:30 GMT Message-Id: <200706090754.l597sU1B022220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 121252 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 07:54:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=121252 Change 121252 by andrew@andrew_hermies on 2007/06/09 07:53:40 - Add the facund.Computer class to allow communication between the UI and the network - Add a Connect and Disconnect button below the computer list - Add the local computer to the display - Fix facund.network.Connection to close the connection properly The front and back ends can now communicate with each other when the connect button is clicked. The only messages passed however are connection start and stop. Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund-fe.glade#2 edit .. //depot/projects/soc2007/andrew-update/frontend/facund.py#5 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/__init__.py#4 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/computer.py#1 add .. //depot/projects/soc2007/andrew-update/frontend/facund/gui/computer_model.py#4 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/gui/main_window.py#4 edit .. //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#4 edit Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund-fe.glade#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -180,11 +180,53 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Connect + + + 5 + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Disconnect + + + 5 + 1 + + + + + False + 10 + 1 + + False @@ -204,6 +246,8 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + ==== //depot/projects/soc2007/andrew-update/frontend/facund.py#5 (text+ko) ==== @@ -27,7 +27,7 @@ import socket -import facund.gui, facund.network +import facund, facund.gui, facund.network #try: @@ -39,6 +39,9 @@ if __name__ == "__main__": model = facund.gui.ComputerTreeModel() + localComputer = facund.Computer("Fake disconnected computer", '/tmp/facund') + model.addComputer(localComputer) + mainWindow = facund.gui.MainWindow('facund-fe.glade') mainWindow.setComputerTreeModel(model) ==== //depot/projects/soc2007/andrew-update/frontend/facund/__init__.py#4 (text+ko) ==== @@ -24,4 +24,6 @@ # SUCH DAMAGE. # +from computer import Computer + __all__ = ["gui", "network"] ==== //depot/projects/soc2007/andrew-update/frontend/facund/gui/computer_model.py#4 (text+ko) ==== @@ -33,23 +33,31 @@ def __init__(self): gtk.TreeStore.__init__(self, gobject.TYPE_STRING) - self.addComputer("Test") - #self.removeComputer("Test") + self.__computers = {} - def addComputer(self, computer, base_dirs = None): + def addComputer(self, computer): '''Adds a computer to the computer tree view''' - if base_dirs is None: - base_dirs = ["Foo", "Bar"] + + computer_name = computer.getName() + if self.__computers.has_key(computer_name): + # TODO: This should either raise an exception or just replace the item and update the tree view + return + self.__computers[computer_name] = computer # Add the computer iter = self.append(None) - self.set(iter, 0, computer) + self.set(iter, 0, computer_name) # Add the children - for dir in base_dirs: + for dir in computer.getDirs(): child_iter = self.append(iter) self.set(child_iter, 0, dir) + def getComputer(self, position): + '''Returns the computer at the given position in the tree''' + name = self[position][0] + return self.__computers[name] + def removeComputer(self, computer): '''Removes a computer from the computer tree. TODO: Implement''' iter = self.get_iter_from_string(computer) ==== //depot/projects/soc2007/andrew-update/frontend/facund/gui/main_window.py#4 (text+ko) ==== @@ -34,20 +34,64 @@ def __init__(self, glade_file): gtk.gdk.threads_init() - self.xml = gtk.glade.XML(glade_file) - self.widget = self.xml.get_widget('facundWindow') - self.widget.connect('destroy', lambda *w: gtk.main_quit()) + + self.__xml = gtk.glade.XML(glade_file) + self.__widget = self.__xml.get_widget('facundWindow') + self.__widget.connect('destroy', lambda *w: gtk.main_quit()) def setComputerTreeModel(self, model): '''Sets the model to use to for the computer tree''' - treeView = self.xml.get_widget('computerView') + self.__computerTreeModel = model + treeView = self.__xml.get_widget('computerView') treeView.set_model(model) cell = gtk.CellRendererText() column = gtk.TreeViewColumn("Computer", cell, text=0) treeView.append_column(column) + treeView.connect('cursor-changed', self.onSelectComputer) + + # Add signal handlers to connect/disconnect + connectedButton = self.__xml.get_widget('connectButton') + connectedButton.connect('clicked', self.onConnectClick) + disconnectedButton = self.__xml.get_widget('disconnectButton') + disconnectedButton.connect('clicked', self.onDisconnectClick) + + def setConnected(self, connected): + connectedButton = self.__xml.get_widget('connectButton') + disconnectedButton = self.__xml.get_widget('disconnectButton') + + connectedButton.set_sensitive(not connected) + disconnectedButton.set_sensitive(connected) + + def __getCurrentComputer(self, treeView): + '''Finds the currently selected computer''' + cursor = treeView.get_cursor() + position = cursor[0][0] + computer = self.__computerTreeModel.getComputer(position) + return computer + + def onConnectClick(self, widget): + '''Signal handler for the connect button''' + treeView = self.__xml.get_widget('computerView') + computer = self.__getCurrentComputer(treeView) + computer.connect() + self.setConnected(computer.getConnectionStatus()) + + def onDisconnectClick(self, widget): + '''Signal handler for the connect button''' + treeView = self.__xml.get_widget('computerView') + computer = self.__getCurrentComputer(treeView) + computer.disconnect() + self.setConnected(computer.getConnectionStatus()) + + def onSelectComputer(self, widget): + '''Signal handler for when the selected item is changed''' + computer = self.__getCurrentComputer(widget) + # Marke the computer as (dis)connected + self.setConnected(computer.getConnectionStatus()) + def run(self): '''Displays the main window. Does't return''' - self.widget.show() + self.__widget.show() gtk.main() ==== //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#4 (text+ko) ==== @@ -34,18 +34,25 @@ self.bufSize = 1024 self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) self.socket.connect(server) - self.socket.send("") + self.socket.send("") self.parser = xml.sax.make_parser() self.parser.setContentHandler(self) - # Mark the class as ready and able to have __del__ called + self.canClose = False + # Mark the class as ready and able to disconnect self.isReady = True - def __del__(self): + def disconnect(self): if self.isReady: + self.isReady = False + # Send a connection close + self.socket.send("") + + # Wait for the server to close the connection + while not self.canClose: + self.interact() self.parser.close() - self.socket.send("") def interact(self): '''Reads data from the connection and passes it to the @@ -56,3 +63,9 @@ def startElement(self, name, attributes): print "> " + name + def endElement(self, name): + print "< " + name + # The server send a close message + if name == "facund-server": + self.canClose = True + From owner-p4-projects@FreeBSD.ORG Sat Jun 9 08:22:06 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2B6316A46E; Sat, 9 Jun 2007 08:22:05 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 986D116A46C for ; Sat, 9 Jun 2007 08:22:05 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7E20213C455 for ; Sat, 9 Jun 2007 08:22:05 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l598M54Q050529 for ; Sat, 9 Jun 2007 08:22:05 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l598M56n050523 for perforce@freebsd.org; Sat, 9 Jun 2007 08:22:05 GMT (envelope-from andrew@freebsd.org) Date: Sat, 9 Jun 2007 08:22:05 GMT Message-Id: <200706090822.l598M56n050523@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 121254 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 08:22:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=121254 Change 121254 by andrew@andrew_hermies on 2007/06/09 08:21:35 Corret the name of the local computer Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund.py#6 edit Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund.py#6 (text+ko) ==== @@ -39,7 +39,7 @@ if __name__ == "__main__": model = facund.gui.ComputerTreeModel() - localComputer = facund.Computer("Fake disconnected computer", '/tmp/facund') + localComputer = facund.Computer("Local computer", '/tmp/facund') model.addComputer(localComputer) mainWindow = facund.gui.MainWindow('facund-fe.glade') From owner-p4-projects@FreeBSD.ORG Sat Jun 9 09:36:39 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0CE016A46C; Sat, 9 Jun 2007 09:36:38 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 465E216A400 for ; Sat, 9 Jun 2007 09:36:38 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3401A13C45D for ; Sat, 9 Jun 2007 09:36:38 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l599acaC029735 for ; Sat, 9 Jun 2007 09:36:38 GMT (envelope-from smilicic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l599abks029718 for perforce@freebsd.org; Sat, 9 Jun 2007 09:36:37 GMT (envelope-from smilicic@FreeBSD.org) Date: Sat, 9 Jun 2007 09:36:37 GMT Message-Id: <200706090936.l599abks029718@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to smilicic@FreeBSD.org using -f From: Sonja Milicic To: Perforce Change Reviews Cc: Subject: PERFORCE change 121257 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 09:36:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=121257 Change 121257 by smilicic@tanarri_marilith on 2007/06/09 09:36:25 File operations, library, start of geom module Affected files ... .. //depot/projects/soc2007/smilicic_glog/sbin/geom/Makefile#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/Makefile.inc#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/Makefile#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/Makefile.inc#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/cache/Makefile#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/cache/geom_cache.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/concat/Makefile#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/concat/gconcat.8#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/concat/geom_concat.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/eli/Makefile#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/eli/geli.8#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/eli/geom_eli.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/journal/Makefile#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/journal/geom_journal.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/journal/geom_journal.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/journal/geom_journal_ufs.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/journal/gjournal.8#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/label/Makefile#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/label/geom_label.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/label/glabel.8#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/mirror/Makefile#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/mirror/geom_mirror.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/mirror/gmirror.8#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/multipath/Makefile#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/multipath/geom_multipath.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/multipath/gmultipath.8#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/nop/Makefile#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/nop/geom_nop.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/nop/gnop.8#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/raid3/Makefile#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/raid3/geom_raid3.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/raid3/graid3.8#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/shsec/Makefile#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/shsec/geom_shsec.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/shsec/gshsec.8#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/stripe/Makefile#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/stripe/geom_stripe.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/class/stripe/gstripe.8#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/core/Makefile#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/core/geom.8#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/core/geom.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/core/geom.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/misc/subr.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sbin/geom/misc/subr.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/bde/g_bde.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/bde/g_bde.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/bde/g_bde_crypt.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/bde/g_bde_lock.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/bde/g_bde_work.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/cache/g_cache.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/cache/g_cache.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/concat/g_concat.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/concat/g_concat.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/eli/g_eli.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/eli/g_eli.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/eli/g_eli_crypto.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/eli/g_eli_ctl.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/eli/g_eli_integrity.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/eli/g_eli_key.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/eli/g_eli_privacy.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/eli/pkcs5v2.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/eli/pkcs5v2.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/gate/g_gate.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/gate/g_gate.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_aes.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_bsd.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_bsd_enc.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_ccd.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_ctl.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_ctl.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_dev.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_disk.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_disk.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_dump.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_event.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_fox.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_int.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_io.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_kern.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_mbr.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_mbr_enc.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_pc98.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_pc98_enc.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_slice.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_slice.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_subr.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_sunlabel.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_sunlabel_enc.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_vfs.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_vfs.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/geom_vol_ffs.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/journal/g_journal.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/journal/g_journal.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/journal/g_journal_ufs.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/label/g_label.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/label/g_label.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/label/g_label_ext2fs.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/label/g_label_iso9660.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/label/g_label_msdosfs.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/label/g_label_ntfs.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/label/g_label_reiserfs.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/label/g_label_ufs.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/g_log_fileops.c#3 delete .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/geom_log_so.c#1 add .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog.c#1 add .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog.h#1 add .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog_fileops.c#1 add .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog_fileops.h#1 add .. //depot/projects/soc2007/smilicic_glog/sys/geom/mirror/g_mirror.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/mirror/g_mirror.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/mirror/g_mirror_ctl.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/multipath/g_multipath.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/multipath/g_multipath.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/nop/g_nop.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/nop/g_nop.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/notes#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/part/g_part.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/part/g_part.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/part/g_part_apm.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/part/g_part_gpt.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/part/g_part_if.m#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/raid3/g_raid3.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/raid3/g_raid3.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/raid3/g_raid3_ctl.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/shsec/g_shsec.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/shsec/g_shsec.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/stripe/g_stripe.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/stripe/g_stripe.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/uzip/g_uzip.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum_drive.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum_init.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum_list.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum_move.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum_plex.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum_raid5.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum_raid5.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum_rename.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum_rm.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum_share.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum_share.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum_state.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum_subr.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum_var.h#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/vinum/geom_vinum_volume.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/geom/zero/g_zero.c#1 branch .. //depot/projects/soc2007/smilicic_glog/sys/glog/glog_fileops.c#1 add .. //depot/projects/soc2007/smilicic_gsafetynet/glog_fileops.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jun 9 09:59:09 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B28116A469; Sat, 9 Jun 2007 09:59:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 ED3EC16A41F for ; Sat, 9 Jun 2007 09:59:08 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DDADC13C484 for ; Sat, 9 Jun 2007 09:59:08 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l599x8Bo051281 for ; Sat, 9 Jun 2007 09:59:08 GMT (envelope-from smilicic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l599x8Cj051260 for perforce@freebsd.org; Sat, 9 Jun 2007 09:59:08 GMT (envelope-from smilicic@FreeBSD.org) Date: Sat, 9 Jun 2007 09:59:08 GMT Message-Id: <200706090959.l599x8Cj051260@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to smilicic@FreeBSD.org using -f From: Sonja Milicic To: Perforce Change Reviews Cc: Subject: PERFORCE change 121261 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 09:59:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=121261 Change 121261 by smilicic@tanarri_marilith on 2007/06/09 09:58:18 Removed a few leftover debugging comments Affected files ... .. //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog.c#2 edit Differences ... ==== //depot/projects/soc2007/smilicic_glog/sys/geom/log/glog.c#2 (text+ko) ==== @@ -221,11 +221,8 @@ case GCTL_START: num_arg = gctl_get_paraml(req, "nargs", sizeof(*num_arg)); if (*num_arg == 2) { - printf("Citam prvi arg..."); prov = gctl_get_asciiparam(req, "arg0"); - printf("Citam drugi arg..."); file = gctl_get_asciiparam(req, "arg1"); - printf("Pokusavam stvoriti geom"); err = g_log_create_geom(prov, file, mp); if (err != NULL) gctl_error(req, "Error creating geom: %s", err); From owner-p4-projects@FreeBSD.ORG Sat Jun 9 10:01:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8454416A46F; Sat, 9 Jun 2007 10:01:22 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C94C516A468 for ; Sat, 9 Jun 2007 10:01:21 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B64B013C45E for ; Sat, 9 Jun 2007 10:01:21 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59A1LRq053311 for ; Sat, 9 Jun 2007 10:01:21 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59A1L9Z053296 for perforce@freebsd.org; Sat, 9 Jun 2007 10:01:21 GMT (envelope-from gabor@freebsd.org) Date: Sat, 9 Jun 2007 10:01:21 GMT Message-Id: <200706091001.l59A1L9Z053296@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 121262 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 10:01:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=121262 Change 121262 by gabor@gabor_server on 2007/06/09 10:01:20 s/TARGETDIR/PREFIX/ update after IFC. Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#16 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#16 (text+ko) ==== @@ -1319,11 +1319,11 @@ INDEXDIR?= ${PORTSDIR} INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/} -DOCSDIR?= ${TARGETDIR}/share/doc/${PORTNAME} -EXAMPLESDIR?= ${TARGETDIR}/share/examples/${PORTNAME} -DATADIR?= ${TARGETDIR}/share/${PORTNAME} -WWWDIR?= ${TARGETDIR}/www/${PORTNAME} -ETCDIR?= ${TARGETDIR}/etc/${PORTNAME} +DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME} +EXAMPLESDIR?= ${PREFIX}/share/examples/${PORTNAME} +DATADIR?= ${PREFIX}/share/${PORTNAME} +WWWDIR?= ${PREFIX}/www/${PORTNAME} +ETCDIR?= ${PREFIX}/etc/${PORTNAME} .if defined(USE_LINUX_RPM) .include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" @@ -2950,11 +2950,11 @@ INFO_PATH?= info .endif -DOCSDIR_REL?= ${DOCSDIR:S,^${TARGETDIR}/,,} -EXAMPLESDIR_REL?= ${EXAMPLESDIR:S,^${TARGETDIR}/,,} -DATADIR_REL?= ${DATADIR:S,^${TARGETDIR}/,,} -WWWDIR_REL?= ${WWWDIR:S,^${TARGETDIR}/,,} -ETCDIR_REL?= ${ETCDIR:S,^${TARGETDIR}/,,} +DOCSDIR_REL?= ${DOCSDIR:S,^${PREFIX}/,,} +EXAMPLESDIR_REL?= ${EXAMPLESDIR:S,^${PREFIX}/,,} +DATADIR_REL?= ${DATADIR:S,^${PREFIX}/,,} +WWWDIR_REL?= ${WWWDIR:S,^${PREFIX}/,,} +ETCDIR_REL?= ${ETCDIR:S,^${PREFIX}/,,} PLIST_SUB+= DOCSDIR="${DOCSDIR_REL}" \ EXAMPLESDIR="${EXAMPLESDIR_REL}" \ @@ -3808,7 +3808,7 @@ exit 1; \ else \ ${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \ - if [ ${PREFIX} = ${LOCALBASE_REL} ]; then \ + if [ ${PREFIX} = ${LOCALBASE} ]; then \ cd ${PREFIX}/share/nls; \ ${LN} -shf C POSIX; \ ${LN} -shf C en_US.US-ASCII; \ From owner-p4-projects@FreeBSD.ORG Sat Jun 9 10:31:59 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1B3316A46E; Sat, 9 Jun 2007 10:31:59 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 4BE1516A46C for ; Sat, 9 Jun 2007 10:31:59 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3BABA13C447 for ; Sat, 9 Jun 2007 10:31:59 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59AVx3K085173 for ; Sat, 9 Jun 2007 10:31:59 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59AVwnR085161 for perforce@freebsd.org; Sat, 9 Jun 2007 10:31:58 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 9 Jun 2007 10:31:58 GMT Message-Id: <200706091031.l59AVwnR085161@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 121263 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 10:32:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=121263 Change 121263 by rdivacky@rdivacky_witten on 2007/06/09 10:31:25 Change all the non-at syscalls that have *at counterparts to the consistent model of having: kern_foo() { return kern_fooat(...., AT_FDCWD); } and kern_fooat() being the complete syscall thus eliminating the need for kern_common_foo() stuff. Suggested by: "Eric Lemar" Requested by: des Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#17 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#17 (text+ko) ==== @@ -88,27 +88,6 @@ static int kern_get_at(struct thread *td, int dirfd, struct vnode **dir_vn); static int vn_access(struct vnode *vp, int user_flags, struct ucred *cred, struct thread *td); -static int kern_common_open(struct thread *td, int flags, int mode, - struct nameidata *nd); -static int kern_common_access(struct thread *td, int flags, - struct nameidata *nd); -static int kern_common_stat(struct thread *td, struct stat *sbp, - struct nameidata *nd); -static int kern_common_lstat(struct thread *td, struct stat *sbp, - struct nameidata *nd); -static int kern_common_chown(struct thread *td, int uid, int gid, - struct nameidata *nd); -static int kern_common_lchown(struct thread *td, int uid, int gid, - struct nameidata *nd); -static int kern_common_chmod(struct thread *td, int mode, struct nameidata *nd); -static int kern_common_readlink(struct thread *td, char *buf, - enum uio_seg bufseg, int count, struct nameidata *nd); -static int kern_common_link(struct thread *td, struct nameidata *ndp, - struct nameidata *ndl); -static int kern_common_utimes(struct thread *td, char *path, enum uio_seg pathseg, - struct timeval *tptr, enum uio_seg tptrseg, struct nameidata *nd); -static int kern_common_rename(struct thread *td, char *from, char *to, - enum uio_seg pathseg, struct nameidata *fromnd, struct nameidata *tond); /* * The module initialization routine for POSIX asynchronous I/O will @@ -980,13 +959,7 @@ kern_open(struct thread *td, char *path, enum uio_seg pathseg, int flags, int mode) { - struct nameidata nd; - - AUDIT_ARG(fflags, flags); - AUDIT_ARG(mode, mode); - NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td); - - return kern_common_open(td, flags, mode, &nd); + return kern_openat(td, path, pathseg, flags, mode, AT_FDCWD); } static int @@ -1013,29 +986,8 @@ kern_openat(struct thread *td, char *path, enum uio_seg pathseg, int flags, int mode, int dirfd) { - int error; struct nameidata nd; struct vnode *dir_vn; - - AUDIT_ARG(fflags, flags); - AUDIT_ARG(mode, mode); - /* XXX: audit dirfd */ - - error = kern_get_at(td, dirfd, &dir_vn); - if (error) - return (error); - - NDINIT_AT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); - - error = kern_common_open(td, flags, mode, &nd); - if (dir_vn) - vrele(dir_vn); - return (error); -} - -static int -kern_common_open(struct thread *td, int flags, int mode, struct nameidata *nd) -{ struct proc *p = td->td_proc; struct filedesc *fdp = p->p_fd; struct file *fp; @@ -1048,18 +1000,30 @@ struct flock lf; int vfslocked; - if ((flags & O_ACCMODE) == O_ACCMODE) - return (EINVAL); + AUDIT_ARG(fflags, flags); + AUDIT_ARG(mode, mode); + /* XXX: audit dirfd */ + + error = kern_get_at(td, dirfd, &dir_vn); + if (error) + return (error); + + NDINIT_AT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + + if ((flags & O_ACCMODE) == O_ACCMODE) { + error = EINVAL; + goto out; + } flags = FFLAGS(flags); error = falloc(td, &nfp, &indx); if (error) - return (error); + goto out; /* An extra reference on `nfp' has been held for us by falloc(). */ fp = nfp; cmode = ((mode &~ fdp->fd_cmask) & ALLPERMS) &~ S_ISTXT; td->td_dupfd = -1; /* XXX check for fdopen */ - error = vn_open(nd, &flags, cmode, fp); + error = vn_open(&nd, &flags, cmode, fp); if (error) { /* * If the vn_open replaced the method vector, something @@ -1069,7 +1033,8 @@ if (error == ENXIO && fp->f_ops != &badfileops) { fdrop(fp, td); td->td_retval[0] = indx; - return (0); + error = 0; + goto out; } /* @@ -1083,7 +1048,8 @@ dupfdopen(td, fdp, indx, td->td_dupfd, flags, error)) == 0) { td->td_retval[0] = indx; fdrop(fp, td); - return (0); + error = 0; + goto out; } /* * Clean up the descriptor, but only if another thread hadn't @@ -1094,12 +1060,12 @@ if (error == ERESTART) error = EINTR; - return (error); + goto out; } td->td_dupfd = 0; - vfslocked = NDHASGIANT(nd); - NDFREE(nd, NDF_ONLY_PNBUF); - vp = nd->ni_vp; + vfslocked = NDHASGIANT(&nd); + NDFREE(&nd, NDF_ONLY_PNBUF); + vp = nd.ni_vp; FILE_LOCK(fp); fp->f_vnode = vp; @@ -1154,10 +1120,16 @@ fdrop(fp, td); td->td_retval[0] = indx; return (0); +out: + if (dir_vn) + vrele(dir_vn); + return (error); bad: VFS_UNLOCK_GIANT(vfslocked); fdclose(fdp, fp, indx, td); fdrop(fp, td); + if (dir_vn) + vrele(dir_vn); return (error); } @@ -1505,14 +1477,7 @@ int kern_link(struct thread *td, char *path, char *link, enum uio_seg segflg) { - struct nameidata ndp, ndl; - - bwillwrite(); - NDINIT(&ndp, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, segflg, path, td); - NDINIT(&ndl, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE2, - segflg, link, td); - - return kern_common_link(td, &ndp, &ndl); + return kern_linkat(td, path, link, segflg, AT_FDCWD, AT_FDCWD); } int @@ -1522,6 +1487,10 @@ struct nameidata ndp, ndl; int error; struct vnode *pdir_vn, *ldir_vn; + struct vnode *vp; + struct mount *mp; + int vfslocked; + int lvfslocked; error = kern_get_at(td, olddirfd, &pdir_vn); if (error) @@ -1536,69 +1505,59 @@ NDINIT_AT(&ndl, CREATE, LOCKPARENT | SAVENAME| MPSAFE | AUDITVNODE1, segflg, link, td, ldir_vn); - error = kern_common_link(td, &ndp, &ndl); - if (pdir_vn) - vrele(pdir_vn); - if (ldir_vn) - vrele(ldir_vn); - return (error); -} - -static int -kern_common_link(struct thread *td, struct nameidata *ndp, struct nameidata *ndl) -{ - struct vnode *vp; - struct mount *mp; - int vfslocked; - int lvfslocked; - int error; - bwillwrite(); - if ((error = namei(ndp)) != 0) - return (error); - vfslocked = NDHASGIANT(ndp); - NDFREE(ndp, NDF_ONLY_PNBUF); - vp = ndp->ni_vp; + if ((error = namei(&ndp)) != 0) + goto out; + vfslocked = NDHASGIANT(&ndp); + NDFREE(&ndp, NDF_ONLY_PNBUF); + vp = ndp.ni_vp; if (vp->v_type == VDIR) { vrele(vp); VFS_UNLOCK_GIANT(vfslocked); - return (EPERM); /* POSIX */ + error = EPERM; /* POSIX */ + goto out; } if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) { vrele(vp); VFS_UNLOCK_GIANT(vfslocked); - return (error); + goto out; } - if ((error = namei(ndl)) == 0) { - lvfslocked = NDHASGIANT(ndl); - if (ndl->ni_vp != NULL) { - if (ndl->ni_dvp == ndl->ni_vp) - vrele(ndl->ni_dvp); + if ((error = namei(&ndl)) == 0) { + lvfslocked = NDHASGIANT(&ndl); + if (ndl.ni_vp != NULL) { + if (ndl.ni_dvp == ndl.ni_vp) + vrele(ndl.ni_dvp); else - vput(ndl->ni_dvp); - vrele(ndl->ni_vp); + vput(ndl.ni_dvp); + vrele(ndl.ni_vp); error = EEXIST; } else if ((error = vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td)) == 0) { - VOP_LEASE(ndl->ni_dvp, td, td->td_ucred, LEASE_WRITE); + VOP_LEASE(ndl.ni_dvp, td, td->td_ucred, LEASE_WRITE); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); error = can_hardlink(vp, td, td->td_ucred); if (error == 0) #ifdef MAC error = mac_check_vnode_link(td->td_ucred, - ndl->ni_dvp, vp, &(ndl->ni_cnd)); + ndl.ni_dvp, vp, &ndl.ni_cnd); if (error == 0) #endif - error = VOP_LINK(ndl->ni_dvp, vp, &(ndl->ni_cnd)); + error = VOP_LINK(ndl.ni_dvp, vp, &ndl.ni_cnd); VOP_UNLOCK(vp, 0, td); - vput(ndl->ni_dvp); + vput(ndl.ni_dvp); } - NDFREE(ndl, NDF_ONLY_PNBUF); + NDFREE(&ndl, NDF_ONLY_PNBUF); VFS_UNLOCK_GIANT(lvfslocked); } vrele(vp); vn_finished_write(mp); VFS_UNLOCK_GIANT(vfslocked); + +out: + if (pdir_vn) + vrele(pdir_vn); + if (ldir_vn) + vrele(ldir_vn); return (error); } @@ -2046,12 +2005,7 @@ int kern_access(struct thread *td, char *path, enum uio_seg pathseg, int flags) { - struct nameidata nd; - - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, - pathseg, path, td); - - return kern_common_access(td, flags, &nd); + return kern_accessat(td, path, pathseg, flags, AT_FDCWD); } int @@ -2060,6 +2014,9 @@ int error; struct nameidata nd; struct vnode *dir_vn; + struct ucred *cred, *tmpcred; + struct vnode *vp; + int vfslocked; error = kern_get_at(td, dirfd, &dir_vn); if (error) @@ -2068,20 +2025,6 @@ NDINIT_AT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); - error = kern_common_access(td, flags, &nd); - if (dir_vn) - vrele(dir_vn); - return (error); -} - -static int -kern_common_access(struct thread *td, int flags, struct nameidata *nd) -{ - struct ucred *cred, *tmpcred; - struct vnode *vp; - int vfslocked; - int error; - /* * Create and modify a temporary credential instead of one that * is potentially shared. This could also mess up socket @@ -2092,18 +2035,20 @@ tmpcred->cr_uid = cred->cr_ruid; tmpcred->cr_groups[0] = cred->cr_rgid; td->td_ucred = tmpcred; - if ((error = namei(nd)) != 0) - goto out1; - vfslocked = NDHASGIANT(nd); - vp = nd->ni_vp; + if ((error = namei(&nd)) != 0) + goto out; + vfslocked = NDHASGIANT(&nd); + vp = nd.ni_vp; error = vn_access(vp, flags, tmpcred, td); - NDFREE(nd, NDF_ONLY_PNBUF); + NDFREE(&nd, NDF_ONLY_PNBUF); vput(vp); VFS_UNLOCK_GIANT(vfslocked); -out1: +out: td->td_ucred = cred; crfree(tmpcred); + if (dir_vn) + vrele(dir_vn); return (error); } @@ -2267,21 +2212,16 @@ int kern_stat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { - struct nameidata nd; - - NDINIT(&nd, LOOKUP, - FOLLOW | LOCKSHARED | LOCKLEAF | MPSAFE | AUDITVNODE1, - pathseg, path, td); - - return kern_common_stat(td, sbp, &nd); + return kern_statat(td, path, pathseg, sbp, AT_FDCWD); } int kern_statat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp, int dirfd) { - int error; struct nameidata nd; struct vnode *dir_vn; + struct stat sb; + int error, vfslocked; error = kern_get_at(td, dirfd, &dir_vn); if (error) @@ -2290,33 +2230,27 @@ NDINIT_AT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); - error = kern_common_stat(td, sbp, &nd); - if (dir_vn) - vrele(dir_vn); - return (error); -} - -static int -kern_common_stat(struct thread *td, struct stat *sbp, struct nameidata *nd) -{ - struct stat sb; - int error, vfslocked; - - if ((error = namei(nd)) != 0) - return (error); - vfslocked = NDHASGIANT(nd); - error = vn_stat(nd->ni_vp, &sb, td->td_ucred, NOCRED, td); - NDFREE(nd, NDF_ONLY_PNBUF); - vput(nd->ni_vp); + if ((error = namei(&nd)) != 0) + goto out; + vfslocked = NDHASGIANT(&nd); + error = vn_stat(nd.ni_vp, &sb, td->td_ucred, NOCRED, td); + NDFREE(&nd, NDF_ONLY_PNBUF); + vput(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); /* dont bother with the path as this is hopefully going away soon */ if (mtx_owned(&Giant)) printf("stat(%d):\n", vfslocked); if (error) - return (error); + goto out; *sbp = sb; - return (0); + + error = 0; +out: + if (dir_vn) + vrele(dir_vn); + return (error); } + /* * Get file status; this version does not follow links. */ @@ -2346,21 +2280,17 @@ int kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { - struct nameidata nd; - - NDINIT(&nd, LOOKUP, - NOFOLLOW | LOCKLEAF | LOCKSHARED | MPSAFE | AUDITVNODE1, - pathseg, path, td); - - return kern_common_lstat(td, sbp, &nd); + return kern_lstatat(td, path, pathseg, sbp, AT_FDCWD); } int kern_lstatat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp, int dirfd) { - int error; struct nameidata nd; struct vnode *dir_vn; + struct vnode *vp; + struct stat sb; + int error, vfslocked; error = kern_get_at(td, dirfd, &dir_vn); if (error) @@ -2369,31 +2299,22 @@ NDINIT_AT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | LOCKSHARED | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); - error = kern_common_lstat(td, sbp, &nd); - if (dir_vn) - vrele(dir_vn); - return (error); -} - -static int -kern_common_lstat(struct thread *td, struct stat *sbp, struct nameidata *nd) -{ - struct vnode *vp; - struct stat sb; - int error, vfslocked; - - if ((error = namei(nd)) != 0) - return (error); - vfslocked = NDHASGIANT(nd); - vp = nd->ni_vp; + if ((error = namei(&nd)) != 0) + goto out; + vfslocked = NDHASGIANT(&nd); + vp = nd.ni_vp; error = vn_stat(vp, &sb, td->td_ucred, NOCRED, td); - NDFREE(nd, NDF_ONLY_PNBUF); + NDFREE(&nd, NDF_ONLY_PNBUF); vput(vp); VFS_UNLOCK_GIANT(vfslocked); if (error) - return (error); + goto out; *sbp = sb; - return (0); + error = 0; +out: + if (dir_vn) + vrele(dir_vn); + return (error); } /* @@ -2550,20 +2471,19 @@ kern_readlink(struct thread *td, char *path, enum uio_seg pathseg, char *buf, enum uio_seg bufseg, int count) { - struct nameidata nd; - NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, - pathseg, path, td); - - return kern_common_readlink(td, buf, bufseg, count, &nd); + return kern_readlinkat(td, path, pathseg, buf, bufseg, count, AT_FDCWD); } int kern_readlinkat(struct thread *td, char *path, enum uio_seg pathseg, char *buf, enum uio_seg bufseg, int count, int dirfd) { - int error; struct nameidata nd; struct vnode *dir_vn; + struct vnode *vp; + struct iovec aiov; + struct uio auio; + int error, vfslocked; error = kern_get_at(td, dirfd, &dir_vn); if (error) @@ -2572,33 +2492,17 @@ NDINIT_AT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); - error = kern_common_readlink(td, buf, bufseg, count, &nd); - if (dir_vn) - vrele(dir_vn); - return (error); -} - -static int -kern_common_readlink(struct thread *td, char *buf, enum uio_seg bufseg, int count, - struct nameidata *nd) -{ - struct vnode *vp; - struct iovec aiov; - struct uio auio; - int error; - int vfslocked; - - if ((error = namei(nd)) != 0) - return (error); - NDFREE(nd, NDF_ONLY_PNBUF); - vfslocked = NDHASGIANT(nd); - vp = nd->ni_vp; + if ((error = namei(&nd)) != 0) + goto out; + NDFREE(&nd, NDF_ONLY_PNBUF); + vfslocked = NDHASGIANT(&nd); + vp = nd.ni_vp; #ifdef MAC error = mac_check_vnode_readlink(td->td_ucred, vp); if (error) { vput(vp); VFS_UNLOCK_GIANT(vfslocked); - return (error); + goto out; } #endif if (vp->v_type != VLNK) @@ -2618,6 +2522,9 @@ vput(vp); VFS_UNLOCK_GIANT(vfslocked); td->td_retval[0] = count - auio.uio_resid; +out: + if (dir_vn) + vrele(dir_vn); return (error); } @@ -2816,19 +2723,15 @@ int kern_chmod(struct thread *td, char *path, enum uio_seg pathseg, int mode) { - struct nameidata nd; - AUDIT_ARG(mode, mode); - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); - - return kern_common_chmod(td, mode, &nd); + return kern_chmodat(td, path, pathseg, mode, AT_FDCWD); } int kern_chmodat(struct thread *td, char *path, enum uio_seg pathseg, int mode, int dirfd) { - int error; struct nameidata nd; struct vnode *dir_vn; + int error, vfslocked; error = kern_get_at(td, dirfd, &dir_vn); if (error) @@ -2836,28 +2739,19 @@ NDINIT_AT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); - error = kern_common_chmod(td, mode, &nd); + if ((error = namei(&nd)) != 0) + goto out; + vfslocked = NDHASGIANT(&nd); + NDFREE(&nd, NDF_ONLY_PNBUF); + error = setfmode(td, nd.ni_vp, mode); + vrele(nd.ni_vp); + VFS_UNLOCK_GIANT(vfslocked); +out: if (dir_vn) vrele(dir_vn); return (error); } -static int -kern_common_chmod(struct thread *td, int mode, struct nameidata *nd) -{ - int error; - int vfslocked; - - if ((error = namei(nd)) != 0) - return (error); - vfslocked = NDHASGIANT(nd); - NDFREE(nd, NDF_ONLY_PNBUF); - error = setfmode(td, nd->ni_vp, mode); - vrele(nd->ni_vp); - VFS_UNLOCK_GIANT(vfslocked); - return (error); -} - /* * Change mode of a file given path name (don't follow links.) */ @@ -2988,21 +2882,16 @@ kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid) { - struct nameidata nd; - - AUDIT_ARG(owner, uid, gid); - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); - - return kern_common_chown(td, uid, gid, &nd); + return kern_chownat(td, path, pathseg, uid, gid, AT_FDCWD); } int kern_chownat(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid, int dirfd) { - int error; struct nameidata nd; struct vnode *dir_vn; + int error, vfslocked; error = kern_get_at(td, dirfd, &dir_vn); if (error) @@ -3010,28 +2899,19 @@ NDINIT_AT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); - error = kern_common_chown(td, uid, gid, &nd); + if ((error = namei(&nd)) != 0) + goto out; + vfslocked = NDHASGIANT(&nd); + NDFREE(&nd, NDF_ONLY_PNBUF); + error = setfown(td, nd.ni_vp, uid, gid); + vrele(nd.ni_vp); + VFS_UNLOCK_GIANT(vfslocked); +out: if (dir_vn) vrele(dir_vn); return (error); } -static int -kern_common_chown(struct thread *td, int uid, int gid, struct nameidata *nd) -{ - int error; - int vfslocked; - - if ((error = namei(nd)) != 0) - return (error); - vfslocked = NDHASGIANT(nd); - NDFREE(nd, NDF_ONLY_PNBUF); - error = setfown(td, nd->ni_vp, uid, gid); - vrele(nd->ni_vp); - VFS_UNLOCK_GIANT(vfslocked); - return (error); -} - /* * Set ownership given a path name, do not cross symlinks. */ @@ -3059,21 +2939,16 @@ kern_lchown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid) { - struct nameidata nd; - - AUDIT_ARG(owner, uid, gid); - NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); - - return kern_common_lchown(td, uid, gid, &nd); + return kern_lchownat(td, path, pathseg, uid, gid, AT_FDCWD); } int kern_lchownat(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid, int dirfd) { - int error; struct nameidata nd; struct vnode *dir_vn; + int error, vfslocked; error = kern_get_at(td, dirfd, &dir_vn); if (error) @@ -3081,27 +2956,17 @@ NDINIT_AT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); - error = kern_common_chown(td, uid, gid, &nd); + if ((error = namei(&nd)) != 0) + goto out; + vfslocked = NDHASGIANT(&nd); + NDFREE(&nd, NDF_ONLY_PNBUF); + error = setfown(td, nd.ni_vp, uid, gid); + vrele(nd.ni_vp); + VFS_UNLOCK_GIANT(vfslocked); +out: if (dir_vn) vrele(dir_vn); return (error); - -} - -static int -kern_common_lchown(struct thread *td, int uid, int gid, struct nameidata *nd) -{ - int error; - int vfslocked; - - if ((error = namei(nd)) != 0) - return (error); - vfslocked = NDHASGIANT(nd); - NDFREE(nd, NDF_ONLY_PNBUF); - error = setfown(td, nd->ni_vp, uid, gid); - vrele(nd->ni_vp); - VFS_UNLOCK_GIANT(vfslocked); - return (error); } /* @@ -3247,20 +3112,17 @@ kern_utimes(struct thread *td, char *path, enum uio_seg pathseg, struct timeval *tptr, enum uio_seg tptrseg) { - struct nameidata nd; - - NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, td); - - return kern_common_utimes(td, path, pathseg, tptr, tptrseg, &nd); + return kern_utimesat(td, path, pathseg, tptr, tptrseg, AT_FDCWD); } int kern_utimesat(struct thread *td, char *path, enum uio_seg pathseg, struct timeval *tptr, enum uio_seg tptrseg, int dirfd) { - int error; struct nameidata nd; struct vnode *dir_vn; + struct timespec ts[2]; + int error, vfslocked; error = kern_get_at(td, dirfd, &dir_vn); if (error) @@ -3268,32 +3130,21 @@ NDINIT_AT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); - error = kern_common_utimes(td, path, pathseg, tptr, tptrseg, &nd); + if ((error = getutimes(tptr, tptrseg, ts)) != 0) + goto out; + if ((error = namei(&nd)) != 0) + goto out; + vfslocked = NDHASGIANT(&nd); + NDFREE(&nd, NDF_ONLY_PNBUF); + error = setutimes(td, nd.ni_vp, ts, 2, tptr == NULL); + vrele(nd.ni_vp); + VFS_UNLOCK_GIANT(vfslocked); +out: if (dir_vn) vrele(dir_vn); return (error); } -static int -kern_common_utimes(struct thread *td, char *path, enum uio_seg pathseg, - struct timeval *tptr, enum uio_seg tptrseg, struct nameidata *nd) -{ - struct timespec ts[2]; - int error; - int vfslocked; - - if ((error = getutimes(tptr, tptrseg, ts)) != 0) - return (error); - if ((error = namei(nd)) != 0) - return (error); - vfslocked = NDHASGIANT(nd); - NDFREE(nd, NDF_ONLY_PNBUF); - error = setutimes(td, nd->ni_vp, ts, 2, tptr == NULL); - vrele(nd->ni_vp); - VFS_UNLOCK_GIANT(vfslocked); - return (error); -} - /* * Set the access and modification times of a file. */ @@ -3641,19 +3492,7 @@ int kern_rename(struct thread *td, char *from, char *to, enum uio_seg pathseg) { - struct nameidata fromnd, tond; - -#ifdef MAC - NDINIT(&fromnd, DELETE, LOCKPARENT | LOCKLEAF | SAVESTART | MPSAFE | - AUDITVNODE1, pathseg, from, td); -#else - NDINIT(&fromnd, DELETE, WANTPARENT | SAVESTART | MPSAFE | - AUDITVNODE1, pathseg, from, td); -#endif - NDINIT(&tond, RENAME, LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | - MPSAFE | AUDITVNODE2, pathseg, to, td); - - return kern_common_rename(td, from, to, pathseg, &fromnd, &tond); + return kern_renameat(td, from, to, pathseg, AT_FDCWD, AT_FDCWD); } int @@ -3661,6 +3500,10 @@ { struct nameidata fromnd, tond; struct vnode *fdir_vn, *tdir_vn; + struct mount *mp = NULL; + struct vnode *tvp, *fvp, *tdvp; + int tvfslocked; + int fvfslocked; int error; error = kern_get_at(td, fdirfd, &fdir_vn); @@ -3680,62 +3523,42 @@ NDINIT_AT(&tond, RENAME, LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | MPSAFE | AUDITVNODE2, pathseg, to, td, tdir_vn); - error = kern_common_rename(td, from, to, pathseg, &fromnd, &tond); - - if (fdir_vn) - vrele(fdir_vn); - if (tdir_vn) - vrele(tdir_vn); - - return (error); -} - -static int -kern_common_rename(struct thread *td, char *from, char *to, enum uio_seg pathseg, - struct nameidata *fromnd, struct nameidata *tond) -{ - struct mount *mp = NULL; - struct vnode *tvp, *fvp, *tdvp; - int tvfslocked; - int fvfslocked; - int error; - bwillwrite(); - if ((error = namei(fromnd)) != 0) - return (error); - fvfslocked = NDHASGIANT(fromnd); + if ((error = namei(&fromnd)) != 0) + goto out2; + fvfslocked = NDHASGIANT(&fromnd); tvfslocked = 0; #ifdef MAC - error = mac_check_vnode_rename_from(td->td_ucred, fromnd->ni_dvp, - fromnd->ni_vp, &(fromnd->ni_cnd)); - VOP_UNLOCK(fromnd->ni_dvp, 0, td); - if (fromnd->ni_dvp != fromnd->ni_vp) - VOP_UNLOCK(fromnd->ni_vp, 0, td); + error = mac_check_vnode_rename_from(td->td_ucred, fromnd.ni_dvp, + fromnd.ni_vp, &fromnd.ni_cnd); + VOP_UNLOCK(fromnd.ni_dvp, 0, td); + if (fromnd.ni_dvp != fromnd.ni_vp) + VOP_UNLOCK(fromnd.ni_vp, 0, td); #endif - fvp = fromnd->ni_vp; + fvp = fromnd.ni_vp; if (error == 0) error = vn_start_write(fvp, &mp, V_WAIT | PCATCH); if (error != 0) { - NDFREE(fromnd, NDF_ONLY_PNBUF); - vrele(fromnd->ni_dvp); + NDFREE(&fromnd, NDF_ONLY_PNBUF); + vrele(fromnd.ni_dvp); vrele(fvp); goto out1; } - if (fromnd->ni_vp->v_type == VDIR) - tond->ni_cnd.cn_flags |= WILLBEDIR; - if ((error = namei(tond)) != 0) { + if (fromnd.ni_vp->v_type == VDIR) + tond.ni_cnd.cn_flags |= WILLBEDIR; + if ((error = namei(&tond)) != 0) { /* Translate error code for rename("dir1", "dir2/."). */ if (error == EISDIR && fvp->v_type == VDIR) error = EINVAL; - NDFREE(fromnd, NDF_ONLY_PNBUF); - vrele(fromnd->ni_dvp); + NDFREE(&fromnd, NDF_ONLY_PNBUF); + vrele(fromnd.ni_dvp); vrele(fvp); vn_finished_write(mp); goto out1; } - tvfslocked = NDHASGIANT(tond); - tdvp = tond->ni_dvp; - tvp = tond->ni_vp; + tvfslocked = NDHASGIANT(&tond); + tdvp = tond.ni_dvp; + tvp = tond.ni_vp; if (tvp != NULL) { if (fvp->v_type == VDIR && tvp->v_type != VDIR) { error = ENOTDIR; @@ -3756,42 +3579,48 @@ #ifdef MAC else error = mac_check_vnode_rename_to(td->td_ucred, tdvp, - tond->ni_vp, fromnd->ni_dvp == tdvp, &(tond->ni_cnd)); + tond.ni_vp, fromnd.ni_dvp == tdvp, &tond.ni_cnd); #endif out: if (!error) { VOP_LEASE(tdvp, td, td->td_ucred, LEASE_WRITE); - if (fromnd->ni_dvp != tdvp) { - VOP_LEASE(fromnd->ni_dvp, td, td->td_ucred, LEASE_WRITE); + if (fromnd.ni_dvp != tdvp) { + VOP_LEASE(fromnd.ni_dvp, td, td->td_ucred, LEASE_WRITE); } if (tvp) { VOP_LEASE(tvp, td, td->td_ucred, LEASE_WRITE); } - error = VOP_RENAME(fromnd->ni_dvp, fromnd->ni_vp, &(fromnd->ni_cnd), - tond->ni_dvp, tond->ni_vp, &(tond->ni_cnd)); - NDFREE(fromnd, NDF_ONLY_PNBUF); - NDFREE(tond, NDF_ONLY_PNBUF); + error = VOP_RENAME(fromnd.ni_dvp, fromnd.ni_vp, &fromnd.ni_cnd, + tond.ni_dvp, tond.ni_vp, &tond.ni_cnd); + NDFREE(&fromnd, NDF_ONLY_PNBUF); + NDFREE(&tond, NDF_ONLY_PNBUF); } else { - NDFREE(fromnd, NDF_ONLY_PNBUF); - NDFREE(tond, NDF_ONLY_PNBUF); + NDFREE(&fromnd, NDF_ONLY_PNBUF); + NDFREE(&tond, NDF_ONLY_PNBUF); if (tvp) vput(tvp); if (tdvp == tvp) vrele(tdvp); else vput(tdvp); - vrele(fromnd->ni_dvp); + vrele(fromnd.ni_dvp); vrele(fvp); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 9 12:30:26 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCADB16A46D; Sat, 9 Jun 2007 12:30:25 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8B3C816A400 for ; Sat, 9 Jun 2007 12:30:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7C52313C455 for ; Sat, 9 Jun 2007 12:30:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59CUPrP097604 for ; Sat, 9 Jun 2007 12:30:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59CTrwM097105 for perforce@freebsd.org; Sat, 9 Jun 2007 12:29:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Jun 2007 12:29:53 GMT Message-Id: <200706091229.l59CTrwM097105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 121265 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 12:30:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=121265 Change 121265 by rwatson@rwatson_zoo on 2007/06/09 12:29:01 Integrate TrustedBSD base branch from FreeBSD CVS: - BIND9.4.1 - ipfilter 4.1.23 - less 403 - !sched_core - Per-process audit state moved to struct ucred; AUDIT in GENERIC. - Sundry fixing etc. Affected files ... .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#25 integrate .. //depot/projects/trustedbsd/base/bin/date/date.1#15 integrate .. //depot/projects/trustedbsd/base/cddl/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/base/cddl/lib/libzpool/Makefile#4 integrate .. //depot/projects/trustedbsd/base/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/trustedbsd/base/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/CHANGES#8 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/COPYRIGHT#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FAQ#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FAQ.xml#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FREEBSD-Upgrade#7 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/README#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/README.idnkit#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/acconfig.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/check-tool.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dighost.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/include/dig/dig.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssectool.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/aclconf.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/client.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/config.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/control.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/controlconf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/aclconf.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/client.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/config.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/control.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/globals.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/logconf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/lwresd.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/server.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/sortlist.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/tkeyconf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/tsigconf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/zoneconf.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/log.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/logconf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwdgabn.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwdgrbn.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/main.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.5#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.docbook#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.docbook#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/query.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/server.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/sortlist.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/tkeyconf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/tsigconf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/unix/include/named/os.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/unix/os.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/update.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/xfrout.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/zoneconf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc-confgen.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc-confgen.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc-confgen.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc-confgen.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.conf.5#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.conf.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.conf.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/configure.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM-book.xml#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch01.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch02.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch03.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch04.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch05.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch06.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch07.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch08.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch09.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.html#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/README-SGML#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/dnssec#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/migration#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/migration-4to9#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/options#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/rfc-compliance#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/roadmap#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/sdb#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/index#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc4193.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc4255.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc4343.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc4367.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc4431.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/api#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/daemon.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/ftruncate.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/mktemp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/putenv.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/readv.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/setenv.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/setitimer.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/strdup.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/strpbrk.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/strsep.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/utimes.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/writev.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/configure#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/configure.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/dst_api.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/dst_internal.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/hmac_link.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/md5.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/md5_dgst.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/md5_locl.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/support.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/arpa/inet.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/fd_setsize.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/hesiod.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/irp.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/irs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/ctl.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/dst.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/eventlib.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/heap.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/list.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/logging.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/memcluster.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/tree.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/netdb.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/netgroup.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/res_update.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/resolv.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_addr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_data.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_makeaddr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_net_ntop.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_neta.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_netof.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_ntop.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_pton.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/nsap_addr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_gr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_ho.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_nw.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_p.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_pr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_pw.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_sv.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gai_strerror.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_gr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_ho.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_ng.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_nw.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_p.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_pr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_pw.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_sv.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getaddrinfo.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getgrent.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getgrent_r.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gethostent.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gethostent_r.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getnameinfo.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getnetent.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getnetent_r.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getnetgrent_r.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getprotoent.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getprotoent_r.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getpwent.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getpwent_r.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getservent.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getservent_r.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/hesiod.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/hesiod_p.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_gr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_ho.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_ng.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_nw.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_p.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_pr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_pw.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_sv.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irpmarshall.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irs_data.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irs_data.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irs_p.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_gr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_ho.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_ng.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_nw.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_p.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_pr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_pw.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_sv.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis_gr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis_ho.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis_ng.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis_nw.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis_p.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis_pr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis_pw.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis_sv.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nul_ng.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/pathnames.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/util.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/assertions.mdoc#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/base64.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ctl_p.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ctl_p.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ev_connects.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ev_files.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ev_streams.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ev_timers.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ev_waits.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/eventlib.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/eventlib_p.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/heap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/heap.mdoc#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/hex.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/logging.mdoc#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/logging_p.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/memcluster.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/movefile.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/tree.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/tree.mdoc#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/make/includes.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/make/rules.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_date.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_name.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_netint.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_parse.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_print.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_sign.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_ttl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_verify.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/port_before.h.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/herror.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_comp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_data.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_debug.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_debug.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_findzonecut.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_init.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_mkupdate.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_mkupdate.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_private.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_query.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_send.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_sendsigned.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_update.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/api#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/check.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/getaddresses.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/include/bind9/check.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/version.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/acache.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/acl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/adb.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/api#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/byaddr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/cache.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/callbacks.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/compress.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/db.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dbiterator.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dbtable.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/diff.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dispatch.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dlz.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dnssec.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/ds.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dst_api.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dst_internal.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dst_lib.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dst_openssl.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dst_result.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/forward.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/gen-unix.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/gen.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/gssapi_link.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/gssapictx.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/hmac_link.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/acache.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/acl.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/cache.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/compress.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/diff.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/dlz.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/events.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/forward.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/keytable.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/log.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/master.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/masterdump.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/message.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/name.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/order.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/peer.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rbt.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rdataset.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/request.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/resolver.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/result.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/sdlz.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/time.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/tsig.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/types.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/validator.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/version.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/view.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/xfrin.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/zone.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dst/result.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/journal.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/key.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/keytable.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/lib.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/log.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/lookup.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/masterdump.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/message.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/name.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/ncache.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/nsec.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/openssl_link.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/openssldh_link.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/openssldsa_link.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/opensslrsa_link.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/order.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/peer.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/portlist.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rbt.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rbtdb.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rbtdb.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rbtdb64.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rbtdb64.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rcode.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/ds_43.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/rt_21.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/spf_99.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/spf_99.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdatalist.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdataset.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/resolver.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/result.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/sdlz.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/soa.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/ssu.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/stats.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/tcpmsg.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/time.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/timer.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/tkey.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/tsig.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/ttl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/validator.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/version.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/xfrin.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/zone.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/zonekey.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/zt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/api#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/arm/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/base64.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/bitstring.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/buffer.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/bufferlist.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/commandline.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/entropy.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/error.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/event.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/fsaccess.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/hash.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/heap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/hex.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/hmacmd5.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/hmacsha.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/app.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/error.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/event.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/file.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/heap.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/hmacsha.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/list.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/log.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/mem.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/netaddr.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/os.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/parseint.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/print.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/quota.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/random.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/ratelimiter.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/refcount.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/region.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/result.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/resultclass.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/rwlock.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/serial.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/sha1.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/sha2.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/sockaddr.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/stdio.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/stdlib.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/symtab.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/task.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/taskpool.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/util.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/version.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/inet_aton.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/inet_ntop.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/inet_pton.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/lex.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/lfsr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/lib.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/log.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/md5.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/mem.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/mips/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/mutexblock.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/netaddr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/netscope.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/nls/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/nls/msgcat.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/nothreads/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/nothreads/condition.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/nothreads/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/nothreads/include/isc/condition.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/nothreads/include/isc/once.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/nothreads/include/isc/thread.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/nothreads/mutex.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/nothreads/thread.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/ondestroy.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/parseint.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/print.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/pthreads/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/pthreads/condition.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/pthreads/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/pthreads/include/isc/condition.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/pthreads/include/isc/once.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/pthreads/include/isc/thread.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/pthreads/mutex.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/pthreads/thread.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/quota.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/random.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/ratelimiter.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/refcount.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/region.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/result.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/rwlock.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/serial.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/sha1.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/sha2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/sockaddr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/string.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/strtoul.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/symtab.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/task.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/task_p.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/taskpool.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/timer.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/timer_p.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/app.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/dir.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/entropy.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/errno2result.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/errno2result.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/file.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/fsaccess.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/include/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/include/isc/dir.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/include/isc/int.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/include/isc/keyboard.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/include/isc/netdb.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/include/isc/offset.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/include/isc/stat.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/include/isc/stdtime.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/include/isc/strerror.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/include/isc/syslog.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/include/isc/time.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/interfaceiter.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/ipv6.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/keyboard.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/net.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/os.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/resource.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/socket.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/stdio.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/stdtime.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/strerror.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/syslog.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/version.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/alist.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/api#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/base64.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/cc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/ccmsg.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/include/isccc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/include/isccc/alist.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/include/isccc/base64.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/include/isccc/cc.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/include/isccc/ccmsg.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/include/isccc/events.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/include/isccc/lib.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/include/isccc/result.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/include/isccc/sexpr.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/include/isccc/symtab.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/include/isccc/symtype.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/include/isccc/types.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/include/isccc/util.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/include/isccc/version.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/lib.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/result.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/sexpr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/symtab.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccc/version.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/aclconf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/api#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/include/isccfg/log.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/include/isccfg/version.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/log.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/namedconf.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/parser.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/version.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/api#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/assert_p.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/context.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/context_p.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/gai_strerror.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/getaddrinfo.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/gethost.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/getipnode.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/getnameinfo.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/getrrset.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/herror.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/lwres/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/lwres/context.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/lwres/int.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/lwres/ipv6.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/lwres/lang.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/lwres/list.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/lwres/lwpacket.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/lwres/lwres.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/lwres/netdb.h.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/lwres/platform.h.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/lwres/result.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/lwres/stdlib.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/lwres/version.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/lwbuffer.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/lwconfig.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/lwinetaton.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/lwinetntop.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/lwinetpton.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/lwpacket.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/lwres_gabn.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/lwres_grbn.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/lwres_noop.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/lwresutil.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_buffer.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_buffer.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_config.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_config.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_config.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_context.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_context.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_context.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gabn.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gabn.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gethostent.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gethostent.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getipnode.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getipnode.html#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 9 12:49:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A51916A473; Sat, 9 Jun 2007 12:49:51 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3FB4F16A46E for ; Sat, 9 Jun 2007 12:49:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 30BE013C45E for ; Sat, 9 Jun 2007 12:49:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59Cnpfk024784 for ; Sat, 9 Jun 2007 12:49:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59CnoKI024762 for perforce@freebsd.org; Sat, 9 Jun 2007 12:49:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Jun 2007 12:49:50 GMT Message-Id: <200706091249.l59CnoKI024762@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 121267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 12:49:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=121267 Change 121267 by rwatson@rwatson_zoo on 2007/06/09 12:49:37 - AUDIT in GENERIC - Remove lots of FreeBSD 5.x ifdef cruft - Calendar regressiontests (?) Affected files ... .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#34 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#88 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#84 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/fil.c#20 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nve/if_nve.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_axe.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_cdce.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_cdcereg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_cue.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_kue.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_rue.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_udav.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uark.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ubsa.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ubser.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ucycom.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/udbp.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ufm.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ufoma.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uftdi.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ugen.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhid.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhub.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ukbd.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ulpt.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#51 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umct.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umodem.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ums.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/urio.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvisor.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvscom.c#24 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#66 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC#43 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#67 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#54 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_hostcache.c#12 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#54 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/conf/GENERIC#38 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#61 integrate .. //depot/projects/trustedbsd/base/sys/sun4v/conf/GENERIC#6 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/calendar.calibrate#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.a2.out#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.a3.out#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.a4.out#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.b2.out#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.b3.out#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.b4.out#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.s1.out#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.s3.out#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.sh#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.w0-1.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.w0-2.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.w0-3.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.w0-4.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.w0-5.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.w0-6.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.w0-7.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.wn-1.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.wn-2.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.wn-3.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.wn-4.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.wn-5.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.wn-6.out#1 branch .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/calendar/regress.wn-7.out#1 branch .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendar.h#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.all#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.dutch#1 branch .. //depot/projects/trustedbsd/base/usr.bin/calendar/day.c#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/io.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpcbind/rpcbind.c#12 integrate Differences ... ==== //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#34 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.478 2007/05/28 14:38:42 simokawa Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.479 2007/06/08 20:29:05 rwatson Exp $ cpu HAMMER ident GENERIC @@ -60,6 +60,7 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev options ADAPTIVE_GIANT # Giant mutex is adaptive. options STOP_NMI # Stop CPUS using NMI instead of IPI +options AUDIT # Security event auditing # Debugging for use in -current options KDB # Enable kernel debugger support. ==== //depot/projects/trustedbsd/base/sys/conf/NOTES#88 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1428 2007/06/05 00:12:36 jeff Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1429 2007/06/08 21:36:52 attilio Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -226,11 +226,6 @@ # and WITNESS options. options MUTEX_NOINLINE -# MUTEX_WAKE_ALL changes the mutex unlock algorithm to wake all waiters -# when a contested mutex is released rather than just awaking the highest -# priority waiter. -options MUTEX_WAKE_ALL - # RWLOCK_NOINLINE forces rwlock operations to call functions to perform each # operation rather than inlining the simple cases. This can be used to # shrink the size of the kernel text segment. Note that this behavior is ==== //depot/projects/trustedbsd/base/sys/conf/options#84 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.590 2007/06/05 00:12:36 jeff Exp $ +# $FreeBSD: src/sys/conf/options,v 1.591 2007/06/08 21:36:52 attilio Exp $ # # On the handling of kernel options # @@ -123,7 +123,6 @@ MFI_DECODE_LOG opt_mfi.h MPROF_BUFFERS opt_mprof.h MPROF_HASH_SIZE opt_mprof.h -MUTEX_WAKE_ALL NO_ADAPTIVE_MUTEXES opt_adaptive_mutexes.h NO_ADAPTIVE_RWLOCKS NSWBUF_MIN opt_swap.h ==== //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/fil.c#20 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.51 2007/06/04 02:54:35 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.52 2007/06/09 09:28:36 darrenr Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -155,7 +155,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.51 2007/06/04 02:54:35 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.52 2007/06/09 09:28:36 darrenr Exp $"; /* static const char rcsid[] = "@(#)$Id: fil.c,v 2.243.2.78 2006/03/29 11:19:54 darrenr Exp $"; */ #endif @@ -766,6 +766,7 @@ * source of the original packet then this packet is * not correct. */ + icmp6 = fin->fin_dp; ip6 = (ip6_t *)((char *)icmp6 + ICMPERR_ICMPHLEN); if (IP6_NEQ(&fin->fin_fi.fi_dst, (i6addr_t *)&ip6->ip6_src)) ==== //depot/projects/trustedbsd/base/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 (text+ko) ==== @@ -1,3 +1,31 @@ +/*- + * Copyright (c) 2007 Marcel Moolenaar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (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/contrib/opensolaris/common/atomic/ia64/atomic.S,v 1.2 2007/06/08 16:20:03 marcel Exp $ + */ + #include .text ==== //depot/projects/trustedbsd/base/sys/dev/nve/if_nve.c#12 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nve/if_nve.c,v 1.26 2007/05/07 09:45:31 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nve/if_nve.c,v 1.27 2007/06/08 22:00:56 dwhite Exp $"); #include #include @@ -1040,7 +1040,7 @@ default: /* Everything else we forward to generic ether ioctl */ - error = ether_ioctl(ifp, (int)command, data); + error = ether_ioctl(ifp, command, data); break; } ==== //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#16 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.29 2007/05/31 18:43:33 ariff Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.31 2007/06/09 11:07:07 ru Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -523,13 +523,14 @@ USB_ATTACH_START(uaudio, sc, uaa); usb_interface_descriptor_t *id; usb_config_descriptor_t *cdesc; +#if !defined(__FreeBSD__) char devinfo[1024]; +#endif usbd_status err; int i, j, found; #if defined(__FreeBSD__) - usbd_devinfo(uaa->device, 0, devinfo); - USB_ATTACH_SETUP; + sc->sc_dev = self; #else usbd_devinfo(uaa->device, 0, devinfo, sizeof(devinfo)); printf(": %s\n", devinfo); ==== //depot/projects/trustedbsd/base/sys/dev/usb/if_axe.c#27 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.44 2007/05/12 05:56:10 brueffer Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.45 2007/06/09 06:31:07 imp Exp $"); /* * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the @@ -407,14 +407,12 @@ USB_ATTACH(axe) { USB_ATTACH_START(axe, sc, uaa); - char devinfo[1024]; u_char eaddr[ETHER_ADDR_LEN]; struct ifnet *ifp; usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed; int i; - bzero(sc, sizeof(struct axe_softc)); sc->axe_udev = uaa->device; sc->axe_dev = self; sc->axe_unit = device_get_unit(self); @@ -436,10 +434,6 @@ id = usbd_get_interface_descriptor(sc->axe_iface); - usbd_devinfo(uaa->device, 0, devinfo); - device_set_desc_copy(self, devinfo); - printf("%s: %s\n", device_get_nameunit(self), devinfo); - /* Find endpoints. */ for (i = 0; i < id->bNumEndpoints; i++) { ed = usbd_interface2endpoint_descriptor(sc->axe_iface, i); ==== //depot/projects/trustedbsd/base/sys/dev/usb/if_cdce.c#9 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.16 2006/10/07 17:35:37 flz Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.17 2007/06/09 06:31:07 imp Exp $"); #include #include @@ -146,12 +146,7 @@ const usb_cdc_ethernet_descriptor_t *ue; char eaddr_str[USB_MAX_STRING_LEN]; - bzero(sc, sizeof(struct cdce_softc)); sc->cdce_dev = self; - usbd_devinfo(dev, 0, sc->devinfo); - device_set_desc_copy(self, sc->devinfo); - printf("%s: %s\n", device_get_nameunit(sc->cdce_dev), sc->devinfo); - sc->cdce_udev = uaa->device; sc->cdce_unit = device_get_unit(self); ==== //depot/projects/trustedbsd/base/sys/dev/usb/if_cdcereg.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * 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/usb/if_cdcereg.h,v 1.6 2005/09/26 05:29:46 sobomax Exp $ + * $FreeBSD: src/sys/dev/usb/if_cdcereg.h,v 1.7 2007/06/09 06:31:07 imp Exp $ */ #ifndef _USB_IF_CDCEREG_H_ @@ -66,8 +66,6 @@ struct mtx cdce_mtx; struct usb_qdat q; - - char devinfo[1024]; }; /* We are still under Giant */ ==== //depot/projects/trustedbsd/base/sys/dev/usb/if_cue.c#26 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.64 2007/05/12 05:53:52 brueffer Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.65 2007/06/09 06:31:07 imp Exp $"); /* * CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate @@ -431,14 +431,12 @@ USB_ATTACH(cue) { USB_ATTACH_START(cue, sc, uaa); - char devinfo[1024]; u_char eaddr[ETHER_ADDR_LEN]; struct ifnet *ifp; usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed; int i; - bzero(sc, sizeof(struct cue_softc)); sc->cue_dev = self; sc->cue_iface = uaa->iface; sc->cue_udev = uaa->device; @@ -452,10 +450,6 @@ id = usbd_get_interface_descriptor(uaa->iface); - usbd_devinfo(uaa->device, 0, devinfo); - device_set_desc_copy(self, devinfo); - printf("%s: %s\n", device_get_nameunit(self), devinfo); - /* Find endpoints. */ for (i = 0; i < id->bNumEndpoints; i++) { ed = usbd_interface2endpoint_descriptor(uaa->iface, i); ==== //depot/projects/trustedbsd/base/sys/dev/usb/if_kue.c#25 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.73 2007/05/12 05:56:58 brueffer Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.74 2007/06/09 06:31:07 imp Exp $"); /* * Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver. @@ -405,14 +405,12 @@ USB_ATTACH(kue) { USB_ATTACH_START(kue, sc, uaa); - char devinfo[1024]; struct ifnet *ifp; usbd_status err; usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed; int i; - bzero(sc, sizeof(struct kue_softc)); sc->kue_dev = self; sc->kue_iface = uaa->iface; sc->kue_udev = uaa->device; @@ -420,10 +418,6 @@ id = usbd_get_interface_descriptor(uaa->iface); - usbd_devinfo(uaa->device, 0, devinfo); - device_set_desc_copy(self, devinfo); - printf("%s: %s\n", device_get_nameunit(self), devinfo); - /* Find endpoints. */ for (i = 0; i < id->bNumEndpoints; i++) { ed = usbd_interface2endpoint_descriptor(uaa->iface, i); ==== //depot/projects/trustedbsd/base/sys/dev/usb/if_rue.c#22 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.31 2007/05/12 05:53:53 brueffer Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.32 2007/06/09 06:31:07 imp Exp $"); /* * RealTek RTL8150 USB to fast ethernet controller driver. @@ -575,7 +575,6 @@ USB_ATTACH(rue) { USB_ATTACH_START(rue, sc, uaa); - char *devinfo; u_char eaddr[ETHER_ADDR_LEN]; struct ifnet *ifp; usbd_interface_handle iface; @@ -585,11 +584,6 @@ int i; struct rue_type *t; - devinfo = malloc(1024, M_USBDEV, M_WAITOK); - - bzero(sc, sizeof (struct rue_softc)); - usbd_devinfo(uaa->device, 0, devinfo); - sc->rue_dev = self; sc->rue_udev = uaa->device; sc->rue_unit = device_get_unit(self); @@ -621,10 +615,6 @@ id = usbd_get_interface_descriptor(sc->rue_iface); - usbd_devinfo(uaa->device, 0, devinfo); - device_set_desc_copy(self, devinfo); - printf("%s: %s\n", device_get_nameunit(self), devinfo); - /* Find endpoints */ for (i = 0; i < id->bNumEndpoints; i++) { ed = usbd_interface2endpoint_descriptor(iface, i); @@ -692,7 +682,6 @@ sc->rue_dying = 0; RUE_UNLOCK(sc); - free(devinfo, M_USBDEV); USB_ATTACH_SUCCESS_RETURN; error2: @@ -701,7 +690,6 @@ RUE_UNLOCK(sc); mtx_destroy(&sc->rue_mtx); error: - free(devinfo, M_USBDEV); USB_ATTACH_ERROR_RETURN; } ==== //depot/projects/trustedbsd/base/sys/dev/usb/if_rum.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.3 2007/05/06 21:06:08 des Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.4 2007/06/09 06:31:07 imp Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.3 2007/05/06 21:06:08 des Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.4 2007/06/09 06:31:07 imp Exp $"); /*- * Ralink Technology RT2501USB/RT2601USB chipset driver @@ -374,14 +374,11 @@ usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed; usbd_status error; - char devinfo[1024]; int i, ntries, size; uint32_t tmp; sc->sc_udev = uaa->device; - - usbd_devinfo(sc->sc_udev, 0, devinfo); - USB_ATTACH_SETUP; + sc->sc_dev = self; if (usbd_set_config_no(sc->sc_udev, RT2573_CONFIG_NO, 0) != 0) { printf("%s: could not set configuration no\n", ==== //depot/projects/trustedbsd/base/sys/dev/usb/if_udav.c#15 (text+ko) ==== @@ -1,6 +1,6 @@ /* $NetBSD: if_udav.c,v 1.2 2003/09/04 15:17:38 tsutsui Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ -/* $FreeBSD: src/sys/dev/usb/if_udav.c,v 1.25 2007/05/12 05:53:53 brueffer Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_udav.c,v 1.26 2007/06/09 06:31:07 imp Exp $ */ /*- * Copyright (c) 2003 * Shingo WATANABE . All rights reserved. @@ -45,7 +45,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.25 2007/05/12 05:53:53 brueffer Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.26 2007/06/09 06:31:07 imp Exp $"); #include "opt_inet.h" #if defined(__NetBSD__) @@ -284,7 +284,6 @@ usbd_status err; usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed; - char devinfo[1024]; const char *devname ; struct ifnet *ifp; #if defined(__NetBSD__) @@ -296,13 +295,8 @@ int s; #endif - bzero(sc, sizeof(struct udav_softc)); - - usbd_devinfo(dev, 0, devinfo); - USB_ATTACH_SETUP; - devname = device_get_nameunit(sc->sc_dev); - printf("%s: %s\n", devname, devinfo); - + sc->sc_dev = self; + devname = device_get_nameunit(self); /* Move the device into the configured state. */ err = usbd_set_config_no(dev, UDAV_CONFIG_NO, 1); if (err) { ==== //depot/projects/trustedbsd/base/sys/dev/usb/if_ural.c#21 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.54 2007/05/29 20:05:13 imp Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.55 2007/06/09 06:31:07 imp Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.54 2007/05/29 20:05:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.55 2007/06/09 06:31:07 imp Exp $"); /*- * Ralink Technology RT2500USB chipset driver @@ -357,13 +357,10 @@ usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed; usbd_status error; - char devinfo[1024]; int i; sc->sc_udev = uaa->device; - - usbd_devinfo(sc->sc_udev, 0, devinfo); - USB_ATTACH_SETUP; + sc->sc_dev = self; if (usbd_set_config_no(sc->sc_udev, RAL_CONFIG_NO, 0) != 0) { printf("%s: could not set configuration no\n", ==== //depot/projects/trustedbsd/base/sys/dev/usb/uark.c#2 (text+ko) ==== @@ -15,7 +15,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/usb/uark.c,v 1.1 2006/11/15 09:13:24 maxim Exp $ + * $FreeBSD: src/sys/dev/usb/uark.c,v 1.2 2007/06/09 06:39:43 imp Exp $ */ #include #include @@ -131,14 +131,10 @@ usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed; usbd_status error; - char *devinfo; const char *devname; int i; struct ucom_softc *ucom = &sc->sc_ucom; - devinfo = malloc(1024, M_USBDEV, M_WAITOK); - - bzero(ucom, sizeof(struct ucom_softc)); ucom->sc_dev = self; ucom->sc_udev = dev; @@ -162,9 +158,6 @@ } else iface = uaa->iface; - usbd_devinfo(dev, 0, devinfo); - printf("%s: %s\n", devname, devinfo); - id = usbd_get_interface_descriptor(iface); ucom->sc_iface = iface; @@ -197,15 +190,11 @@ DPRINTF(("uark: in=0x%x out=0x%x\n", ucom->sc_bulkin_no, ucom->sc_bulkout_no)); ucom_attach(&sc->sc_ucom); - free(devinfo, M_USBDEV); - USB_ATTACH_SUCCESS_RETURN; bad: DPRINTF(("uftdi_attach: ATTACH ERROR\n")); ucom->sc_dying = 1; - free(devinfo, M_USBDEV); - USB_ATTACH_ERROR_RETURN; } ==== //depot/projects/trustedbsd/base/sys/dev/usb/ubsa.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.24 2007/06/07 09:29:36 brueffer Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.25 2007/06/09 06:39:43 imp Exp $"); /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. @@ -283,17 +283,13 @@ usb_config_descriptor_t *cdesc; usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed; - char *devinfo; const char *devname; usbd_status err; int i; dev = uaa->device; - devinfo = malloc(1024, M_USBDEV, M_WAITOK); ucom = &sc->sc_ucom; - bzero(sc, sizeof (struct ubsa_softc)); - /* * initialize rts, dtr variables to something * different from boolean 0, 1 @@ -301,17 +297,12 @@ sc->sc_dtr = -1; sc->sc_rts = -1; - usbd_devinfo(dev, 0, devinfo); - /* USB_ATTACH_SETUP; */ ucom->sc_dev = self; - device_set_desc_copy(self, devinfo); - /* USB_ATTACH_SETUP; */ ucom->sc_udev = dev; ucom->sc_iface = uaa->iface; devname = device_get_nameunit(ucom->sc_dev); - printf("%s: %s\n", devname, devinfo); DPRINTF(("ubsa attach: sc = %p\n", sc)); @@ -414,12 +405,9 @@ TASK_INIT(&sc->sc_task, 0, ubsa_notify, sc); ucom_attach(ucom); - - free(devinfo, M_USBDEV); USB_ATTACH_SUCCESS_RETURN; error: - free(devinfo, M_USBDEV); USB_ATTACH_ERROR_RETURN; } ==== //depot/projects/trustedbsd/base/sys/dev/usb/ubser.c#10 (text+ko) ==== @@ -70,7 +70,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ubser.c,v 1.21 2007/04/01 13:46:39 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ubser.c,v 1.22 2007/06/09 06:39:43 imp Exp $"); /* * BWCT serial adapter driver @@ -225,7 +225,6 @@ usb_endpoint_descriptor_t *ed; usb_interface_descriptor_t *id; usb_device_request_t req; - char *devinfo; struct tty *tp; usbd_status err; int i; @@ -233,9 +232,7 @@ uint8_t epcount; struct ubser_port *pp; - devinfo = malloc(1024, M_USBDEV, M_WAITOK); - usbd_devinfo(udev, 0, devinfo); - USB_ATTACH_SETUP; + sc->sc_dev = self; DPRINTFN(10,("\nubser_attach: sc=%p\n", sc)); @@ -376,8 +373,6 @@ } ubserstartread(sc); - - free(devinfo, M_USBDEV); USB_ATTACH_SUCCESS_RETURN; fail_4: @@ -413,8 +408,6 @@ } DPRINTF(("ubser_attach: ATTACH ERROR\n")); - free(devinfo, M_USBDEV); - USB_ATTACH_ERROR_RETURN; } ==== //depot/projects/trustedbsd/base/sys/dev/usb/ucycom.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/ucycom.c,v 1.4 2005/10/16 20:22:56 phk Exp $ + * $FreeBSD: src/sys/dev/usb/ucycom.c,v 1.5 2007/06/09 06:39:43 imp Exp $ */ /* @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ucycom.c,v 1.4 2005/10/16 20:22:56 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ucycom.c,v 1.5 2007/06/09 06:39:43 imp Exp $"); #include #include @@ -177,7 +177,6 @@ struct ucycom_softc *sc; struct ucycom_device *ud; usb_endpoint_descriptor_t *ued; - char *devinfo; void *urd; int error, urdlen; @@ -188,14 +187,6 @@ sc->sc_dev = dev; sc->sc_usbdev = uaa->device; - /* get device description */ - /* XXX usb_devinfo() has little or no overflow protection */ - devinfo = malloc(1024, M_USBDEV, M_WAITOK); - usbd_devinfo(sc->sc_usbdev, 0, devinfo); - device_set_desc_copy(dev, devinfo); - device_printf(dev, "%s\n", devinfo); - free(devinfo, M_USBDEV); - /* get chip model */ for (ud = ucycom_devices; ud->model != 0; ++ud) if (ud->vendor == uaa->vendor && ud->product == uaa->product) ==== //depot/projects/trustedbsd/base/sys/dev/usb/udbp.c#16 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/udbp.c,v 1.32 2007/06/07 09:29:37 brueffer Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/udbp.c,v 1.33 2007/06/09 06:39:43 imp Exp $"); /* Driver for arbitrary double bulk pipe devices. * The driver assumes that there will be the same driver on the other side. @@ -255,7 +255,6 @@ usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed, *ed_bulkin = NULL, *ed_bulkout = NULL; usbd_status err; - char devinfo[1024]; int i; static int ngudbp_done_init=0; @@ -263,8 +262,7 @@ /* fetch the interface handle for the first interface */ (void) usbd_device2interface_handle(uaa->device, 0, &iface); id = usbd_get_interface_descriptor(iface); - usbd_devinfo(uaa->device, USBD_SHOW_INTERFACE_CLASS, devinfo); - USB_ATTACH_SETUP; + sc->sc_dev = self; /* Find the two first bulk endpoints */ for (i = 0 ; i < id->bNumEndpoints; i++) { ==== //depot/projects/trustedbsd/base/sys/dev/usb/ufm.c#19 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2001 M. Warner Losh + * Copyright (c) 2001-2007 M. Warner Losh * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,21 +29,16 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ufm.c,v 1.26 2007/06/07 09:29:37 brueffer Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ufm.c,v 1.27 2007/06/09 06:40:17 imp Exp $"); #include #include #include #include -#if defined(__NetBSD__) -#include -#include -#elif defined(__FreeBSD__) #include #include #include -#endif #include #include #include @@ -73,13 +68,6 @@ #define DPRINTFN(n,x) #endif -#if defined(__NetBSD__) || defined(__OpenBSD__) -int ufmopen(dev_t, int, int, usb_proc_ptr); -int ufmclose(dev_t, int, int, usb_proc_ptr); -int ufmioctl(dev_t, u_long, caddr_t, int, usb_proc_ptr); - -cdev_decl(ufm); -#elif defined(__FreeBSD__) d_open_t ufmopen; d_close_t ufmclose; d_ioctl_t ufmioctl; @@ -92,7 +80,6 @@ .d_ioctl = ufmioctl, .d_name = "ufm", }; -#endif /*defined(__FreeBSD__)*/ #define FM_CMD0 0x00 #define FM_CMD_SET_FREQ 0x01 @@ -108,9 +95,6 @@ int sc_freq; int sc_refcnt; -#if defined(__NetBSD__) || defined(__OpenBSD__) - u_char sc_dying; -#endif }; #define UFMUNIT(n) (minor(n)) @@ -139,46 +123,22 @@ USB_ATTACH(ufm) { USB_ATTACH_START(ufm, sc, uaa); - char devinfo[1024]; usb_endpoint_descriptor_t *edesc; usbd_device_handle udev; usbd_interface_handle iface; u_int8_t epcount; -#if defined(__NetBSD__) || defined(__OpenBSD__) - u_int8_t niface; -#endif usbd_status r; char * ermsg = ""; DPRINTFN(10,("ufm_attach: sc=%p\n", sc)); - usbd_devinfo(uaa->device, 0, devinfo); - USB_ATTACH_SETUP; - + sc->sc_dev = self; sc->sc_udev = udev = uaa->device; -#if defined(__FreeBSD__) if ((!uaa->device) || (!uaa->iface)) { ermsg = "device or iface"; goto nobulk; } sc->sc_iface = iface = uaa->iface; -#elif defined(__NetBSD__) || defined(__OpenBSD__) - if (!udev) { - ermsg = "device"; - goto nobulk; - } - r = usbd_interface_count(udev, &niface); - if (r) { - ermsg = "iface"; - goto nobulk; - } - r = usbd_device2interface_handle(udev, 0, &iface); - if (r) { - ermsg = "iface"; - goto nobulk; - } - sc->sc_iface = iface; -#endif sc->sc_opened = 0; sc->sc_refcnt = 0; @@ -195,18 +155,11 @@ } sc->sc_epaddr = edesc->bEndpointAddress; -#if defined(__FreeBSD__) /* XXX no error trapping, no storing of struct cdev **/ (void) make_dev(&ufm_cdevsw, device_get_unit(self), UID_ROOT, GID_OPERATOR, 0644, "ufm%d", device_get_unit(self)); -#elif defined(__NetBSD__) || defined(__OpenBSD__) - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, - USBDEV(sc->sc_dev)); -#endif - DPRINTFN(10, ("ufm_attach: %p\n", sc->sc_udev)); - USB_ATTACH_SUCCESS_RETURN; nobulk: @@ -392,75 +345,10 @@ return error; } - -#if defined(__NetBSD__) || defined(__OpenBSD__) -int -ufm_activate(device_t self, enum devact act) -{ - struct ufm_softc *sc = (struct ufm_softc *)self; - - switch (act) { - case DVACT_ACTIVATE: - return (EOPNOTSUPP); - break; - - case DVACT_DEACTIVATE: - sc->sc_dying = 1; - break; - } - return (0); -} - -USB_DETACH(ufm) -{ - USB_DETACH_START(ufm, sc); - struct ufm_endpoint *sce; - int i, dir; - int s; -#if defined(__NetBSD__) || defined(__OpenBSD__) - int maj, mn; - - DPRINTF(("ufm_detach: sc=%p flags=%d\n", sc, flags)); -#elif defined(__FreeBSD__) - DPRINTF(("ufm_detach: sc=%p\n", sc)); -#endif - - sc->sc_dying = 1; - - s = splusb(); - if (--sc->sc_refcnt >= 0) { - /* Wait for processes to go away. */ - usb_detach_wait(USBDEV(sc->sc_dev)); - } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 9 15:27:04 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9364F16A469; Sat, 9 Jun 2007 15:27:04 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 360FF16A41F for ; Sat, 9 Jun 2007 15:27:04 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2C0AD13C447 for ; Sat, 9 Jun 2007 15:27:04 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59FR4ui071310 for ; Sat, 9 Jun 2007 15:27:04 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59FR37f071304 for perforce@freebsd.org; Sat, 9 Jun 2007 15:27:03 GMT (envelope-from bushman@freebsd.org) Date: Sat, 9 Jun 2007 15:27:03 GMT Message-Id: <200706091527.l59FR37f071304@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 121273 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 15:27:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=121273 Change 121273 by bushman@bushman_sh on 2007/06/09 15:26:49 test-gethostby.c updated to properly test getipnodebyname() flags combinations. New test cases added to test-gethostby.t Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-gethostby.c#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-gethostby.t#4 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-gethostby.c#5 (text+ko) ==== @@ -58,6 +58,7 @@ static int use_ipnode_functions = 0; static int use_ipv6_mapping = 0; +static int ipnode_flags = 0; static int debug = 0; static int af_type = AF_INET; static enum test_methods method = TEST_BUILD_SNAPSHOT; @@ -103,17 +104,11 @@ struct hostent *he; int error; - if (use_ipnode_functions == 0) { - if (use_ipv6_mapping != 0) - af = AF_INET; - + if (use_ipnode_functions == 0) he = gethostbyname2(name, af); - } else { + else { error = 0; - if (use_ipv6_mapping != 0) - af = AF_INET6; - he = getipnodebyname(name, af, use_ipv6_mapping == 0 ? AI_ALL : - AI_ALL | AI_V4MAPPED, &error); + he = getipnodebyname(name, af, ipnode_flags, &error); if (he == NULL); errno = error; } @@ -127,17 +122,11 @@ struct hostent *he; int error; - if (use_ipnode_functions == 0) { - if (use_ipv6_mapping != 0) - af = AF_INET; - + if (use_ipnode_functions == 0) he = gethostbyaddr(addr, len, af); - } else { + else { error = 0; - if (use_ipv6_mapping != 0) - af = AF_INET6; - he = getipnodebyaddr(addr, len, use_ipv6_mapping == 0 ? AI_ALL : - AI_ALL | AI_V4MAPPED, &error); + he = getipnodebyaddr(addr, len, af, &error); if (he == NULL) errno = error; } @@ -238,7 +227,8 @@ static int compare_hostent(struct hostent *ht1, struct hostent *ht2, void *mdata) { - char **c1, **c2; + char **c1, **c2, **ct, **cb; + int b; if (ht1 == ht2) return 0; @@ -262,12 +252,39 @@ goto errfin; if ((c1 != NULL) && (c2 != NULL)) { - for (;*c1 && *c2; ++c1, ++c2) - if (strcmp(*c1, *c2) != 0) + cb = c1; + for (;*c1; ++c1) { + b = 0; + for (ct = c2; *ct; ++ct) { + if (strcmp(*c1, *ct) == 0) { + b = 1; + break; + } + } + if (b == 0) { + if (debug) + printf("h1 aliases item can't be "\ + "found in h2 aliases\n"); + goto errfin; + } + } + + c1 = cb; + for (;*c2; ++c2) { + b = 0; + for (ct = c1; *ct; ++ct) { + if (strcmp(*c2, *ct) == 0) { + b = 1; + break; + } + } + if (b == 0) { + if (debug) + printf("h2 aliases item can't be "\ + " found in h1 aliases\n"); goto errfin; - - if ((*c1 != NULL) || (*c2 != NULL)) - goto errfin; + } + } } c1 = ht1->h_addr_list; @@ -278,12 +295,39 @@ goto errfin; if ((c1 != NULL) && (c2 != NULL)) { - for (;*c1 && *c2; ++c1, ++c2) - if (memcmp(*c1, *c2, ht1->h_length) != 0) + cb = c1; + for (;*c1; ++c1) { + b = 0; + for (ct = c2; *ct; ++ct) { + if (memcmp(*c1, *ct, ht1->h_length) == 0) { + b = 1; + break; + } + } + if (b == 0) { + if (debug) + printf("h1 addresses item can't be "\ + "found in h2 addresses\n"); + goto errfin; + } + } + + c1 = cb; + for (;*c2; ++c2) { + b = 0; + for (ct = c1; *ct; ++ct) { + if (memcmp(*c2, *ct, ht1->h_length) == 0) { + b = 1; + break; + } + } + if (b == 0) { + if (debug) + printf("h2 addresses item can't be "\ + "found in h1 addresses\n"); goto errfin; - - if ((*c1 != NULL) || (*c2 != NULL)) - goto errfin; + } + } } return 0; @@ -588,8 +632,8 @@ ts = (char *)malloc(ht->h_length); assert(ts != NULL); memset(ts, 0, ht->h_length); - rv = hostent_read_snapshot_addr( - s, ts, ht->h_length); + rv = hostent_read_snapshot_addr(s,\ + (unsigned char *)ts, ht->h_length); sl_add(sl2, ts); if (rv != 0) goto fin; @@ -598,8 +642,8 @@ ts = (char *)malloc(ht->h_length); assert(ts != NULL); memset(ts, 0, ht->h_length); - rv = hostent_read_snapshot_addr( - s, ts, ht->h_length); + rv = hostent_read_snapshot_addr(s,\ + (unsigned char *)ts, ht->h_length); sl_add(sl2, ts); if (rv != 0) goto fin; @@ -869,7 +913,7 @@ usage(void) { (void)fprintf(stderr, - "Usage: %s -na2i [-o] [-d] [-m46] [-s ] -f \n", + "Usage: %s -na2i [-o] [-d] [-46] [-mAcM] [-C] [-s ] -f \n", getprogname()); exit(1); } @@ -888,39 +932,29 @@ snapshot_file = NULL; hostlist_file = NULL; - while ((c = getopt(argc, argv, "m46na2idos:f:")) != -1) + while ((c = getopt(argc, argv, "nad2iod46mAcMs:f:")) != -1) switch (c) { case '4': + af_type = AF_INET; + break; case '6': + af_type = AF_INET6; + break; + case 'M': + af_type = AF_INET6; + use_ipv6_mapping = 1; + ipnode_flags |= AI_V4MAPPED_CFG; + break; case 'm': - statp = __res_state(); - if ((statp == NULL) || - ((statp->options & RES_INIT) == 0 && - res_ninit(statp) == -1)) { - if (debug) - printf("error: can't init res_state\n"); - - free(snapshot_file); - free(hostlist_file); - return (-1); - } - - switch (c) { - case '4': - af_type = AF_INET; - statp->options &= ~RES_USE_INET6; - break; - case '6': - af_type = AF_INET6; - statp->options &= ~RES_USE_INET6; - break; - case 'm': - statp->options |= RES_USE_INET6; - use_ipv6_mapping = 1; - break; - default: - break; - }; + af_type = AF_INET6; + use_ipv6_mapping = 1; + ipnode_flags |= AI_V4MAPPED; + break; + case 'c': + ipnode_flags |= AI_ADDRCONFIG; + break; + case 'A': + ipnode_flags |= AI_ALL; break; case 'o': use_ipnode_functions = 1; @@ -949,7 +983,25 @@ default: usage(); } + + if (use_ipnode_functions == 0) { + statp = __res_state(); + if ((statp == NULL) || ((statp->options & RES_INIT) == 0 && + res_ninit(statp) == -1)) { + if (debug) + printf("error: can't init res_state\n"); + + free(snapshot_file); + free(hostlist_file); + return (-1); + } + if (use_ipv6_mapping == 0) + statp->options &= ~RES_USE_INET6; + else + statp->options |= RES_USE_INET6; + } + TEST_DATA_INIT(hostent, &td, clone_hostent, free_hostent); TEST_DATA_INIT(hostent, &td_addr, clone_hostent, free_hostent); TEST_DATA_INIT(hostent, &td_snap, clone_hostent, free_hostent); @@ -1047,5 +1099,7 @@ TEST_DATA_DESTROY(hostent, &td); free(hostlist_file); free(snapshot_file); + return (rv); } + ==== //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/nss/test-gethostby.t#4 (text+ko) ==== @@ -18,7 +18,7 @@ make $executable 2>&1 > /dev/null -echo 1..32 +echo 1..46 #Tests for gethostby***() functions #IPv4-driven testing do_test 1 'gethostbyname2() (IPv4)' '-4 -n -f mach' @@ -49,7 +49,7 @@ '-m -a -s snapshot_htaddr6map -f mach' #Tests for getipnodeby***() functions -#IPv4-driven testing +#IPv4-driven testing, flags are 0 do_test 17 'getipnodebyname() (IPv4)' '-o -4 -n -f mach' do_test 18 'getipnodebyaddr() (IPv4)' '-o -4 -a -f mach' do_test 19 'getipnodebyname()-getaddrinfo() (IPv4)' '-o -4 -2 -f mach' @@ -59,7 +59,7 @@ do_test 22 'getipnodebyname() snapshot (IPv4)'\ '-o -4 -a -s snapshot_ipnodeaddr4 -f mach' -#IPv6-driven testing +#IPv6-driven testing, flags are 0 do_test 23 'getipnodebyname() (IPv6)' '-o -6 -n -f mach' do_test 24 'getipnodebyaddr() (IPv6)' '-o -6 -a -f mach' do_test 25 'getipnodebyname()-getaddrinfo() (IPv6)' '-o -6 -2 -f mach' @@ -69,10 +69,45 @@ do_test 28 'getipnodebyaddr() snapshot (IPv6)'\ '-o -6 -a -s snapshot_ipnodeaddr6 -f mach' -#Mapped IPv6-driven testing (getaddrinfo() equality test is useless here) -do_test 29 'getipnodebyname() (IPv6)' '-o -m -n -f mach' -do_test 30 'getipnodebyaddr() (IPv6)' '-o -m -a -f mach' -do_test 31 'getipnodebyname() snapshot (IPv6)'\ - '-o -m -n -s snapshot_ipnodename6map -f mach' -do_test 32 'getipnodebyaddr() snapshot (IPv6)'\ - '-o -m -a -s snapshot_ipnodeaddr6map -f mach' +#Mapped IPv6-driven testing, flags are AI_V4MAPPED +do_test 29 'getipnodebyname() (IPv6, AI_V4MAPPED)' '-o -m -n -f mach' +do_test 30 'getipnodebyaddr() (IPv6, AI_V4MAPPED)' '-o -m -a -f mach' +do_test 31 'getipnodebyname() snapshot (IPv6, AI_V4MAPPED)'\ + '-o -m -n -s snapshot_ipnodename6_AI_V4MAPPED -f mach' +do_test 32 'getipnodebyaddr() snapshot (IPv6, AI_V4MAPPED)'\ + '-o -m -a -s snapshot_ipnodeaddr6_AI_V4MAPPED -f mach' + +#Mapped IPv6-driven testing, flags are AI_V4MAPPED_CFG +do_test 33 'getipnodebyname() (IPv6, AI_V4MAPPED_CFG)' '-o -M -n -f mach' +do_test 34 'getipnodebyaddr() (IPv6, AI_V4MAPPED_CFG)' '-o -M -a -f mach' +do_test 35 'getipnodebyname() snapshot (IPv6, AI_V4MAPPED_CFG)'\ + '-o -M -n -s snapshot_ipnodename6_AI_V4MAPPED_CFG -f mach' +do_test 36 'getipnodebyaddr() snapshot (IPv6, AI_V4MAPPED_CFG)'\ + '-o -M -a -s snapshot_ipnodeaddr6_AI_V4MAPPED_CFG -f mach' + +#Mapped IPv6-driven testing, flags are AI_V4MAPPED_CFG | AI_ALL +do_test 37 'getipnodebyname() (IPv6, AI_V4MAPPED_CFG | AI_ALL)'\ + '-o -MA -n -f mach' +do_test 38 'getipnodebyaddr() (IPv6, AI_V4MAPPED_CFG | AI_ALL)'\ + '-o -MA -a -f mach' +do_test 39 'getipnodebyname() snapshot (IPv6, AI_V4MAPPED_CFG | AI_ALL)'\ + '-o -MA -n -s snapshot_ipnodename6_AI_V4MAPPED_CFG_AI_ALL -f mach' +do_test 40 'getipnodebyaddr() snapshot (IPv6, AI_V4MAPPED_CFG | AI_ALL)'\ + '-o -MA -a -s snapshot_ipnodeaddr6_AI_V4MAPPED_CFG_AI_ALL -f mach' + +#Mapped IPv6-driven testing, flags are AI_V4MAPPED_CFG | AI_ADDRCONFIG +do_test 41 'getipnodebyname() (IPv6, AI_V4MAPPED_CFG | AI_ADDRCONFIG)'\ + '-o -Mc -n -f mach' +do_test 42 'getipnodebyname() snapshot (IPv6, AI_V4MAPPED_CFG | AI_ADDRCONFIG)'\ + '-o -Mc -n -s snapshot_ipnodename6_AI_V4MAPPED_CFG_AI_ADDRCONFIG -f mach' + +#IPv4-driven testing, flags are AI_ADDRCONFIG +do_test 43 'getipnodebyname() (IPv4, AI_ADDRCONFIG)' '-o -4c -n -f mach' +do_test 44 'getipnodebyname() snapshot (IPv4, AI_ADDRCONFIG)'\ + '-o -4c -n -s snapshot_ipnodename4_AI_ADDRCONFIG -f mach' + +#IPv6-driven testing, flags are AI_ADDRCONFIG +do_test 45 'getipnodebyname() (IPv6, AI_ADDRCONFIG)' '-o -6c -n -f mach' +do_test 46 'getipnodebyname() snapshot (IPv6, AI_ADDRCONFIG)'\ + '-o -6c -n -s snapshot_ipnodename6_AI_ADDRCONFIG -f mach' + From owner-p4-projects@FreeBSD.ORG Sat Jun 9 16:44:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DD6916A46B; Sat, 9 Jun 2007 16:44:49 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 663B116A468 for ; Sat, 9 Jun 2007 16:44:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 59C7713C45B for ; Sat, 9 Jun 2007 16:44:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59Gint8039071 for ; Sat, 9 Jun 2007 16:44:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59Gik2I039018 for perforce@freebsd.org; Sat, 9 Jun 2007 16:44:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Jun 2007 16:44:46 GMT Message-Id: <200706091644.l59Gik2I039018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 121277 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 16:44:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=121277 Change 121277 by rwatson@rwatson_zoo on 2007/06/09 16:44:03 Integrate TrustedBSD audit3 branch. Affected files ... .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/genassym.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/io_apic.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/trustedbsd/priv/sys/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/arm/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/trustedbsd/priv/sys/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/trustedbsd/priv/sys/conf/NOTES#15 integrate .. //depot/projects/trustedbsd/priv/sys/conf/options#12 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/atomic/i386/atomic.S#3 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/uts/common/sys/atomic.h#2 delete .. //depot/projects/trustedbsd/priv/sys/dev/an/if_an.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath_pci.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_athrate.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/ath/if_athvar.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bce.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dcons/dcons_os.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/dcons/dcons_os.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/de/if_de.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/firewirereg.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwdev.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwdma.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwohci.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/if_fwevar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/if_fwip.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/if_fwipvar.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/sbp.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/firewire/sbp_targ.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/brgphy.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/brgphyreg.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/ciphy.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/ciphyreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/miidevs#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mii/rlphy.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mmc/mmc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/mxge/if_mxge.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/dev/nve/if_nve.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pdq/pdq_ifsubr.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/pdq/pdqreg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/puc/puc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sbsh/if_sbsh.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97_patch.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/sound/usb/uaudio.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_cdce.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_cdcereg.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_cue.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_kue.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_rue.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_udav.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/if_ural.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uark.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ubsa.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ubser.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ucycom.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/udbp.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ufm.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ufoma.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uhid.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uhub.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ukbd.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ulpt.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/umass.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/umct.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/umodem.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/ums.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uplcom.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/urio.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usb.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdevs#11 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uvisor.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/dev/usb/uvscom.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/geom/part/g_part.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/geom/part/g_part_apm.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/i386/conf/GENERIC#10 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/genassym.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/io_apic.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/machdep.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/i386/i386/swtch.s#3 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/conf/GENERIC#6 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/machdep.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/ia64/ia64/pmap.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/init_main.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_exit.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_fork.c#12 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_prot.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_thr.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/kern/kern_umtx.c#13 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/trustedbsd/priv/sys/kern/sched_ule.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/kern/vfs_bio.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/modules/zfs/Makefile#4 integrate .. //depot/projects/trustedbsd/priv/sys/net/if_fwsubr.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/net/pfil.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/_ieee80211.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_acl.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_crypto.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_crypto.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_crypto_none.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_input.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_proto.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_xauth.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/ip_carp.c#6 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_asconf.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.c#12 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctp_timer.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.c#10 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_hostcache.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/netinet/tcp_syncache.c#11 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/priv/sys/pc98/pc98/machdep.c#9 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/vm_machdep.c#5 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit.c#14 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit.h#7 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_arg.c#8 integrate .. //depot/projects/trustedbsd/priv/sys/security/audit/audit_syscalls.c#12 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/fhc/fhc.c#3 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/trustedbsd/priv/sys/sun4v/conf/GENERIC#6 integrate .. //depot/projects/trustedbsd/priv/sys/sys/mutex.h#6 integrate .. //depot/projects/trustedbsd/priv/sys/sys/param.h#11 integrate .. //depot/projects/trustedbsd/priv/sys/sys/pcpu.h#5 integrate .. //depot/projects/trustedbsd/priv/sys/sys/proc.h#10 integrate .. //depot/projects/trustedbsd/priv/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/thr.h#4 integrate .. //depot/projects/trustedbsd/priv/sys/sys/ucred.h#3 integrate .. //depot/projects/trustedbsd/priv/sys/sys/umtx.h#6 integrate Differences ... ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/cpu_switch.S#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.157 2007/06/05 00:16:43 jeff Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.158 2007/06/06 07:35:07 davidxu Exp $ */ #include @@ -203,9 +203,7 @@ movq %rbx, (%rax) movq %rbx, PCPU(RSP0) - movl TD_TID(%rsi), %eax movq %r8, PCPU(CURPCB) - movl %eax, PCPU(CURTID) movq %rsi, PCPU(CURTHREAD) /* into next thread */ testl $PCB_32BIT,PCB_FLAGS(%r8) ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/genassym.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.162 2007/06/05 00:13:49 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.163 2007/06/06 07:35:07 davidxu Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -194,7 +194,6 @@ ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp)); ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0)); -ASSYM(PC_CURTID, offsetof(struct pcpu, pc_curtid)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/io_apic.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.30 2007/05/08 21:29:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.31 2007/06/05 18:57:48 jhb Exp $"); #include "opt_isa.h" @@ -492,7 +492,7 @@ intbase = next_ioapic_base; printf("ioapic%u: Assuming intbase of %d\n", io->io_id, intbase); - } else if (intbase != next_ioapic_base) + } else if (intbase != next_ioapic_base && bootverbose) printf("ioapic%u: WARNING: intbase %d != expected base %d\n", io->io_id, intbase, next_ioapic_base); io->io_intbase = intbase; ==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#10 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.674 2007/06/05 00:00:49 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.675 2007/06/06 07:35:07 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1179,7 +1179,6 @@ PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); - PCPU_SET(curtid, thread0.td_tid); PCPU_SET(tssp, &common_tss[0]); /* ==== //depot/projects/trustedbsd/priv/sys/amd64/conf/GENERIC#10 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.478 2007/05/28 14:38:42 simokawa Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.479 2007/06/08 20:29:05 rwatson Exp $ cpu HAMMER ident GENERIC @@ -60,6 +60,7 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev options ADAPTIVE_GIANT # Giant mutex is adaptive. options STOP_NMI # Stop CPUS using NMI instead of IPI +options AUDIT # Security event auditing # Debugging for use in -current options KDB # Enable kernel debugger support. ==== //depot/projects/trustedbsd/priv/sys/arm/arm/busdma_machdep.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.31 2007/05/29 06:30:25 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.32 2007/06/07 21:51:09 cognet Exp $"); /* * ARM bus dma support routines @@ -674,8 +674,8 @@ CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, " "alignment= %d", dmat->lowaddr, ptoa((vm_paddr_t)Maxmem), dmat->boundary, dmat->alignment); - CTR3(KTR_BUSDMA, "map= %p, nobouncemap= %p, pagesneeded= %d", - map, &nobounce_dmamap, map->pagesneeded); + CTR2(KTR_BUSDMA, "map= %p, pagesneeded= %d", + map, map->pagesneeded); /* * Count the number of bounce pages * needed in order to complete this transfer @@ -1384,8 +1384,7 @@ struct bounce_page *bpage; KASSERT(dmat->bounce_zone != NULL, ("no bounce zone in dma tag")); - KASSERT(map != NULL && map != &nobounce_dmamap, - ("add_bounce_page: bad map %p", map)); + KASSERT(map != NULL, ("add_bounce_page: bad map %p", map)); bz = dmat->bounce_zone; if (map->pagesneeded == 0) ==== //depot/projects/trustedbsd/priv/sys/arm/include/pcpu.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/include/globaldata.h,v 1.27 2001/04/27 - * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.5 2007/06/04 21:38:45 attilio Exp $ + * $FreeBSD: src/sys/arm/include/pcpu.h,v 1.6 2007/06/06 23:23:47 jeff Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -58,7 +58,7 @@ * with respect to preemption. */ #define PCPU_ADD(member, value) (__pcpu.pc_ ## member += (value)) -#define PCPU_INC(member) PCPU_LAZY_ADD(member, 1) +#define PCPU_INC(member) PCPU_ADD(member, 1) #define PCPU_PTR(member) (&__pcpu.pc_ ## member) #define PCPU_SET(member,value) (__pcpu.pc_ ## member = (value)) ==== //depot/projects/trustedbsd/priv/sys/conf/NOTES#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1428 2007/06/05 00:12:36 jeff Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1429 2007/06/08 21:36:52 attilio Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -226,11 +226,6 @@ # and WITNESS options. options MUTEX_NOINLINE -# MUTEX_WAKE_ALL changes the mutex unlock algorithm to wake all waiters -# when a contested mutex is released rather than just awaking the highest -# priority waiter. -options MUTEX_WAKE_ALL - # RWLOCK_NOINLINE forces rwlock operations to call functions to perform each # operation rather than inlining the simple cases. This can be used to # shrink the size of the kernel text segment. Note that this behavior is ==== //depot/projects/trustedbsd/priv/sys/conf/options#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.590 2007/06/05 00:12:36 jeff Exp $ +# $FreeBSD: src/sys/conf/options,v 1.591 2007/06/08 21:36:52 attilio Exp $ # # On the handling of kernel options # @@ -124,7 +124,6 @@ MFI_DECODE_LOG opt_mfi.h MPROF_BUFFERS opt_mprof.h MPROF_HASH_SIZE opt_mprof.h -MUTEX_WAKE_ALL NO_ADAPTIVE_MUTEXES opt_adaptive_mutexes.h NO_ADAPTIVE_RWLOCKS NSWBUF_MIN opt_swap.h ==== //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/fil.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.51 2007/06/04 02:54:35 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.52 2007/06/09 09:28:36 darrenr Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -155,7 +155,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.51 2007/06/04 02:54:35 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.52 2007/06/09 09:28:36 darrenr Exp $"; /* static const char rcsid[] = "@(#)$Id: fil.c,v 2.243.2.78 2006/03/29 11:19:54 darrenr Exp $"; */ #endif @@ -766,6 +766,7 @@ * source of the original packet then this packet is * not correct. */ + icmp6 = fin->fin_dp; ip6 = (ip6_t *)((char *)icmp6 + ICMPERR_ICMPHLEN); if (IP6_NEQ(&fin->fin_fi.fi_dst, (i6addr_t *)&ip6->ip6_src)) ==== //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#3 (text+ko) ==== @@ -31,296 +31,7 @@ #define _ASM #include -#if defined(_KERNEL) - /* - * Legacy kernel interfaces; they will go away (eventually). - */ - ANSI_PRAGMA_WEAK2(cas8,atomic_cas_8,function) - ANSI_PRAGMA_WEAK2(cas32,atomic_cas_32,function) - ANSI_PRAGMA_WEAK2(cas64,atomic_cas_64,function) - ANSI_PRAGMA_WEAK2(caslong,atomic_cas_ulong,function) - ANSI_PRAGMA_WEAK2(casptr,atomic_cas_ptr,function) - ANSI_PRAGMA_WEAK2(atomic_and_long,atomic_and_ulong,function) - ANSI_PRAGMA_WEAK2(atomic_or_long,atomic_or_ulong,function) -#endif - - ENTRY(atomic_inc_8) - ALTENTRY(atomic_inc_uchar) - lock - incb (%rdi) - ret - SET_SIZE(atomic_inc_uchar) - SET_SIZE(atomic_inc_8) - - ENTRY(atomic_inc_16) - ALTENTRY(atomic_inc_ushort) - lock - incw (%rdi) - ret - SET_SIZE(atomic_inc_ushort) - SET_SIZE(atomic_inc_16) - - ENTRY(atomic_inc_32) - ALTENTRY(atomic_inc_uint) - lock - incl (%rdi) - ret - SET_SIZE(atomic_inc_uint) - SET_SIZE(atomic_inc_32) - - ENTRY(atomic_inc_64) - ALTENTRY(atomic_inc_ulong) - lock - incq (%rdi) - ret - SET_SIZE(atomic_inc_ulong) - SET_SIZE(atomic_inc_64) - - ENTRY(atomic_inc_8_nv) - ALTENTRY(atomic_inc_uchar_nv) - movb (%rdi), %al // %al = old value -1: - leaq 1(%rax), %rcx // %cl = new value - lock - cmpxchgb %cl, (%rdi) // try to stick it in - jne 1b - movzbl %cl, %eax // return new value - ret - SET_SIZE(atomic_inc_uchar_nv) - SET_SIZE(atomic_inc_8_nv) - - ENTRY(atomic_inc_16_nv) - ALTENTRY(atomic_inc_ushort_nv) - movw (%rdi), %ax // %ax = old value -1: - leaq 1(%rax), %rcx // %cx = new value - lock - cmpxchgw %cx, (%rdi) // try to stick it in - jne 1b - movzwl %cx, %eax // return new value - ret - SET_SIZE(atomic_inc_ushort_nv) - SET_SIZE(atomic_inc_16_nv) - - ENTRY(atomic_inc_32_nv) - ALTENTRY(atomic_inc_uint_nv) - movl (%rdi), %eax // %eax = old value -1: - leaq 1(%rax), %rcx // %ecx = new value - lock - cmpxchgl %ecx, (%rdi) // try to stick it in - jne 1b - movl %ecx, %eax // return new value - ret - SET_SIZE(atomic_inc_uint_nv) - SET_SIZE(atomic_inc_32_nv) - - ENTRY(atomic_inc_64_nv) - ALTENTRY(atomic_inc_ulong_nv) - movq (%rdi), %rax // %rax = old value -1: - leaq 1(%rax), %rcx // %rcx = new value - lock - cmpxchgq %rcx, (%rdi) // try to stick it in - jne 1b - movq %rcx, %rax // return new value - ret - SET_SIZE(atomic_inc_ulong_nv) - SET_SIZE(atomic_inc_64_nv) - - ENTRY(atomic_dec_8) - ALTENTRY(atomic_dec_uchar) - lock - decb (%rdi) - ret - SET_SIZE(atomic_dec_uchar) - SET_SIZE(atomic_dec_8) - - ENTRY(atomic_dec_16) - ALTENTRY(atomic_dec_ushort) - lock - decw (%rdi) - ret - SET_SIZE(atomic_dec_ushort) - SET_SIZE(atomic_dec_16) - - ENTRY(atomic_dec_32) - ALTENTRY(atomic_dec_uint) - lock - decl (%rdi) - ret - SET_SIZE(atomic_dec_uint) - SET_SIZE(atomic_dec_32) - - ENTRY(atomic_dec_64) - ALTENTRY(atomic_dec_ulong) - lock - decq (%rdi) - ret - SET_SIZE(atomic_dec_ulong) - SET_SIZE(atomic_dec_64) - - ENTRY(atomic_dec_8_nv) - ALTENTRY(atomic_dec_uchar_nv) - movb (%rdi), %al // %al = old value -1: - leaq -1(%rax), %rcx // %cl = new value - lock - cmpxchgb %cl, (%rdi) // try to stick it in - jne 1b - movzbl %cl, %eax // return new value - ret - SET_SIZE(atomic_dec_uchar_nv) - SET_SIZE(atomic_dec_8_nv) - - ENTRY(atomic_dec_16_nv) - ALTENTRY(atomic_dec_ushort_nv) - movw (%rdi), %ax // %ax = old value -1: - leaq -1(%rax), %rcx // %cx = new value - lock - cmpxchgw %cx, (%rdi) // try to stick it in - jne 1b - movzwl %cx, %eax // return new value - ret - SET_SIZE(atomic_dec_ushort_nv) - SET_SIZE(atomic_dec_16_nv) - - ENTRY(atomic_dec_32_nv) - ALTENTRY(atomic_dec_uint_nv) - movl (%rdi), %eax // %eax = old value -1: - leaq -1(%rax), %rcx // %ecx = new value - lock - cmpxchgl %ecx, (%rdi) // try to stick it in - jne 1b - movl %ecx, %eax // return new value - ret - SET_SIZE(atomic_dec_uint_nv) - SET_SIZE(atomic_dec_32_nv) - - ENTRY(atomic_dec_64_nv) - ALTENTRY(atomic_dec_ulong_nv) - movq (%rdi), %rax // %rax = old value -1: - leaq -1(%rax), %rcx // %rcx = new value - lock - cmpxchgq %rcx, (%rdi) // try to stick it in - jne 1b - movq %rcx, %rax // return new value - ret - SET_SIZE(atomic_dec_ulong_nv) - SET_SIZE(atomic_dec_64_nv) - - ENTRY(atomic_or_8) - ALTENTRY(atomic_or_uchar) - lock - orb %sil, (%rdi) - ret - SET_SIZE(atomic_or_uchar) - SET_SIZE(atomic_or_8) - - ENTRY(atomic_or_16) - ALTENTRY(atomic_or_ushort) - lock - orw %si, (%rdi) - ret - SET_SIZE(atomic_or_ushort) - SET_SIZE(atomic_or_16) - - ENTRY(atomic_or_32) - ALTENTRY(atomic_or_uint) - lock - orl %esi, (%rdi) - ret - SET_SIZE(atomic_or_uint) - SET_SIZE(atomic_or_32) - - ENTRY(atomic_or_64) - ALTENTRY(atomic_or_ulong) - lock - orq %rsi, (%rdi) - ret - SET_SIZE(atomic_or_ulong) - SET_SIZE(atomic_or_64) - - ENTRY(atomic_and_8) - ALTENTRY(atomic_and_uchar) - lock - andb %sil, (%rdi) - ret - SET_SIZE(atomic_and_uchar) - SET_SIZE(atomic_and_8) - - ENTRY(atomic_and_16) - ALTENTRY(atomic_and_ushort) - lock - andw %si, (%rdi) - ret - SET_SIZE(atomic_and_ushort) - SET_SIZE(atomic_and_16) - - ENTRY(atomic_and_32) - ALTENTRY(atomic_and_uint) - lock - andl %esi, (%rdi) - ret - SET_SIZE(atomic_and_uint) - SET_SIZE(atomic_and_32) - - ENTRY(atomic_and_64) - ALTENTRY(atomic_and_ulong) - lock - andq %rsi, (%rdi) - ret - SET_SIZE(atomic_and_ulong) - SET_SIZE(atomic_and_64) - - ENTRY(atomic_add_8_nv) - ALTENTRY(atomic_add_char_nv) - movb (%rdi), %al // %al = old value -1: - movb %sil, %cl - addb %al, %cl // %cl = new value - lock - cmpxchgb %cl, (%rdi) // try to stick it in - jne 1b - movzbl %cl, %eax // return new value - ret - SET_SIZE(atomic_add_char_nv) - SET_SIZE(atomic_add_8_nv) - - ENTRY(atomic_add_16_nv) - ALTENTRY(atomic_add_short_nv) - movw (%rdi), %ax // %ax = old value -1: - movw %si, %cx - addw %ax, %cx // %cx = new value - lock - cmpxchgw %cx, (%rdi) // try to stick it in - jne 1b - movzwl %cx, %eax // return new value - ret - SET_SIZE(atomic_add_short_nv) - SET_SIZE(atomic_add_16_nv) - - ENTRY(atomic_add_32_nv) - ALTENTRY(atomic_add_int_nv) - movl (%rdi), %eax -1: - movl %esi, %ecx - addl %eax, %ecx - lock - cmpxchgl %ecx, (%rdi) - jne 1b - movl %ecx, %eax - ret - SET_SIZE(atomic_add_int_nv) - SET_SIZE(atomic_add_32_nv) - ENTRY(atomic_add_64_nv) - ALTENTRY(atomic_add_ptr_nv) - ALTENTRY(atomic_add_long_nv) movq (%rdi), %rax 1: movq %rsi, %rcx @@ -330,68 +41,9 @@ jne 1b movq %rcx, %rax ret - SET_SIZE(atomic_add_long_nv) - SET_SIZE(atomic_add_ptr_nv) SET_SIZE(atomic_add_64_nv) - ENTRY(atomic_and_8_nv) - ALTENTRY(atomic_and_uchar_nv) - movb (%rdi), %al // %al = old value -1: - movb %sil, %cl - andb %al, %cl // %cl = new value - lock - cmpxchgb %cl, (%rdi) // try to stick it in - jne 1b - movzbl %cl, %eax // return new value - ret - SET_SIZE(atomic_and_uchar_nv) - SET_SIZE(atomic_and_8_nv) - - ENTRY(atomic_and_16_nv) - ALTENTRY(atomic_and_ushort_nv) - movw (%rdi), %ax // %ax = old value -1: - movw %si, %cx - andw %ax, %cx // %cx = new value - lock - cmpxchgw %cx, (%rdi) // try to stick it in - jne 1b - movzwl %cx, %eax // return new value - ret - SET_SIZE(atomic_and_ushort_nv) - SET_SIZE(atomic_and_16_nv) - - ENTRY(atomic_and_32_nv) - ALTENTRY(atomic_and_uint_nv) - movl (%rdi), %eax -1: - movl %esi, %ecx - andl %eax, %ecx - lock - cmpxchgl %ecx, (%rdi) - jne 1b - movl %ecx, %eax - ret - SET_SIZE(atomic_and_uint_nv) - SET_SIZE(atomic_and_32_nv) - - ENTRY(atomic_and_64_nv) - ALTENTRY(atomic_and_ulong_nv) - movq (%rdi), %rax -1: - movq %rsi, %rcx - andq %rax, %rcx - lock - cmpxchgq %rcx, (%rdi) - jne 1b - movq %rcx, %rax - ret - SET_SIZE(atomic_and_ulong_nv) - SET_SIZE(atomic_and_64_nv) - ENTRY(atomic_or_8_nv) - ALTENTRY(atomic_or_uchar_nv) movb (%rdi), %al // %al = old value 1: movb %sil, %cl @@ -401,160 +53,16 @@ jne 1b movzbl %cl, %eax // return new value ret - SET_SIZE(atomic_and_uchar_nv) - SET_SIZE(atomic_and_8_nv) + SET_SIZE(atomic_or_8_nv) - ENTRY(atomic_or_16_nv) - ALTENTRY(atomic_or_ushort_nv) - movw (%rdi), %ax // %ax = old value -1: - movw %si, %cx - orw %ax, %cx // %cx = new value - lock - cmpxchgw %cx, (%rdi) // try to stick it in - jne 1b - movzwl %cx, %eax // return new value - ret - SET_SIZE(atomic_or_ushort_nv) - SET_SIZE(atomic_or_16_nv) - - ENTRY(atomic_or_32_nv) - ALTENTRY(atomic_or_uint_nv) - movl (%rdi), %eax -1: - movl %esi, %ecx - orl %eax, %ecx - lock - cmpxchgl %ecx, (%rdi) - jne 1b - movl %ecx, %eax - ret - SET_SIZE(atomic_or_uint_nv) - SET_SIZE(atomic_or_32_nv) - - ENTRY(atomic_or_64_nv) - ALTENTRY(atomic_or_ulong_nv) - movq (%rdi), %rax -1: - movq %rsi, %rcx - orq %rax, %rcx - lock - cmpxchgq %rcx, (%rdi) - jne 1b - movq %rcx, %rax - ret - SET_SIZE(atomic_or_ulong_nv) - SET_SIZE(atomic_or_64_nv) - - ENTRY(atomic_cas_8) - ALTENTRY(atomic_cas_uchar) - movzbl %sil, %eax - lock - cmpxchgb %dl, (%rdi) - ret - SET_SIZE(atomic_cas_uchar) - SET_SIZE(atomic_cas_8) - - ENTRY(atomic_cas_16) - ALTENTRY(atomic_cas_ushort) - movzwl %si, %eax - lock - cmpxchgw %dx, (%rdi) - ret - SET_SIZE(atomic_cas_ushort) - SET_SIZE(atomic_cas_16) - - ENTRY(atomic_cas_32) - ALTENTRY(atomic_cas_uint) - movl %esi, %eax - lock - cmpxchgl %edx, (%rdi) - ret - SET_SIZE(atomic_cas_uint) - SET_SIZE(atomic_cas_32) - ENTRY(atomic_cas_64) - ALTENTRY(atomic_cas_ulong) - ALTENTRY(atomic_cas_ptr) movq %rsi, %rax lock cmpxchgq %rdx, (%rdi) ret - SET_SIZE(atomic_cas_ptr) - SET_SIZE(atomic_cas_ulong) SET_SIZE(atomic_cas_64) - ENTRY(atomic_swap_8) - ALTENTRY(atomic_swap_uchar) - movzbl %sil, %eax - lock - xchgb %al, (%rdi) - ret - SET_SIZE(atomic_swap_uchar) - SET_SIZE(atomic_swap_8) - - ENTRY(atomic_swap_16) - ALTENTRY(atomic_swap_ushort) - movzwl %si, %eax - lock - xchgw %ax, (%rdi) - ret - SET_SIZE(atomic_swap_ushort) - SET_SIZE(atomic_swap_16) - - ENTRY(atomic_swap_32) - ALTENTRY(atomic_swap_uint) - movl %esi, %eax - lock - xchgl %eax, (%rdi) - ret - SET_SIZE(atomic_swap_uint) - SET_SIZE(atomic_swap_32) - - ENTRY(atomic_swap_64) - ALTENTRY(atomic_swap_ulong) - ALTENTRY(atomic_swap_ptr) - movq %rsi, %rax - lock - xchgq %rax, (%rdi) - ret - SET_SIZE(atomic_swap_ptr) - SET_SIZE(atomic_swap_ulong) - SET_SIZE(atomic_swap_64) - - ENTRY(atomic_set_long_excl) - xorl %eax, %eax - lock - btsq %rsi, (%rdi) - jnc 1f - decl %eax // return -1 -1: - ret - SET_SIZE(atomic_set_long_excl) - - ENTRY(atomic_clear_long_excl) - xorl %eax, %eax - lock - btrq %rsi, (%rdi) - jc 1f - decl %eax // return -1 -1: - ret - SET_SIZE(atomic_clear_long_excl) - - ENTRY(membar_enter) - ALTENTRY(membar_exit) - mfence - ret - SET_SIZE(membar_exit) - SET_SIZE(membar_enter) - ENTRY(membar_producer) sfence ret SET_SIZE(membar_producer) - - ENTRY(membar_consumer) - lfence - ret - SET_SIZE(membar_consumer) ==== //depot/projects/trustedbsd/priv/sys/contrib/opensolaris/common/atomic/i386/atomic.S#3 (text+ko) ==== @@ -31,327 +31,6 @@ #define _ASM #include -#if defined(_KERNEL) - /* - * Legacy kernel interfaces; they will go away (eventually). - */ - ANSI_PRAGMA_WEAK2(cas8,atomic_cas_8,function) - ANSI_PRAGMA_WEAK2(cas32,atomic_cas_32,function) - ANSI_PRAGMA_WEAK2(cas64,atomic_cas_64,function) - ANSI_PRAGMA_WEAK2(caslong,atomic_cas_ulong,function) - ANSI_PRAGMA_WEAK2(casptr,atomic_cas_ptr,function) - ANSI_PRAGMA_WEAK2(atomic_and_long,atomic_and_ulong,function) - ANSI_PRAGMA_WEAK2(atomic_or_long,atomic_or_ulong,function) -#endif - - ENTRY(atomic_inc_8) - ALTENTRY(atomic_inc_uchar) - movl 4(%esp), %eax - lock - incb (%eax) - ret - SET_SIZE(atomic_inc_uchar) - SET_SIZE(atomic_inc_8) - - ENTRY(atomic_inc_16) - ALTENTRY(atomic_inc_ushort) - movl 4(%esp), %eax - lock - incw (%eax) - ret - SET_SIZE(atomic_inc_ushort) - SET_SIZE(atomic_inc_16) - - ENTRY(atomic_inc_32) - ALTENTRY(atomic_inc_uint) - ALTENTRY(atomic_inc_ulong) - movl 4(%esp), %eax - lock - incl (%eax) - ret - SET_SIZE(atomic_inc_ulong) - SET_SIZE(atomic_inc_uint) - SET_SIZE(atomic_inc_32) - - ENTRY(atomic_inc_8_nv) - ALTENTRY(atomic_inc_uchar_nv) - movl 4(%esp), %edx // %edx = target address - movb (%edx), %al // %al = old value -1: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 9 17:57:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BA8416A46B; Sat, 9 Jun 2007 17:57:20 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A6AED16A41F for ; Sat, 9 Jun 2007 17:57:19 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 96D1313C4C3 for ; Sat, 9 Jun 2007 17:57:19 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59HvJcV008490 for ; Sat, 9 Jun 2007 17:57:19 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59HvHf2008469 for perforce@freebsd.org; Sat, 9 Jun 2007 17:57:17 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 9 Jun 2007 17:57:17 GMT Message-Id: <200706091757.l59HvHf2008469@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 121279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 17:57:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=121279 Change 121279 by mjacob@mjexp on 2007/06/09 17:56:50 IFC Affected files ... .. //depot/projects/mjexp/sys/amd64/conf/GENERIC#11 integrate .. //depot/projects/mjexp/sys/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/mjexp/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/mjexp/sys/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/mjexp/sys/conf/NOTES#23 integrate .. //depot/projects/mjexp/sys/conf/options#21 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#3 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/common/atomic/i386/atomic.S#3 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/sys/atomic.h#2 delete .. //depot/projects/mjexp/sys/dev/an/if_an.c#3 integrate .. //depot/projects/mjexp/sys/dev/bge/if_bge.c#18 edit .. //depot/projects/mjexp/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/mjexp/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/mjexp/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/mjexp/sys/dev/dcons/dcons_os.c#5 integrate .. //depot/projects/mjexp/sys/dev/dcons/dcons_os.h#2 integrate .. //depot/projects/mjexp/sys/dev/firewire/firewire.c#8 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwohci.c#6 integrate .. //depot/projects/mjexp/sys/dev/firewire/sbp_targ.c#6 integrate .. //depot/projects/mjexp/sys/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#29 integrate .. //depot/projects/mjexp/sys/dev/mii/brgphy.c#12 integrate .. //depot/projects/mjexp/sys/dev/nve/if_nve.c#4 integrate .. //depot/projects/mjexp/sys/dev/pdq/pdq_ifsubr.c#2 integrate .. //depot/projects/mjexp/sys/dev/pdq/pdqreg.h#2 integrate .. //depot/projects/mjexp/sys/dev/sbsh/if_sbsh.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/usb/uaudio.c#8 integrate .. //depot/projects/mjexp/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/mjexp/sys/dev/usb/if_cdce.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/if_cdcereg.h#2 integrate .. //depot/projects/mjexp/sys/dev/usb/if_cue.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/if_kue.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/if_rue.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/if_udav.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/if_ural.c#11 integrate .. //depot/projects/mjexp/sys/dev/usb/uark.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/ubsa.c#7 integrate .. //depot/projects/mjexp/sys/dev/usb/ubser.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/ucycom.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/udbp.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/ufm.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/uftdi.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/uhid.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/uhub.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/ukbd.c#6 integrate .. //depot/projects/mjexp/sys/dev/usb/ulpt.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/umass.c#8 integrate .. //depot/projects/mjexp/sys/dev/usb/umct.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/ums.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/uplcom.c#6 integrate .. //depot/projects/mjexp/sys/dev/usb/urio.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/uvscom.c#5 integrate .. //depot/projects/mjexp/sys/i386/conf/GENERIC#9 integrate .. //depot/projects/mjexp/sys/ia64/conf/GENERIC#6 integrate .. //depot/projects/mjexp/sys/ia64/ia64/machdep.c#11 integrate .. //depot/projects/mjexp/sys/kern/init_main.c#12 integrate .. //depot/projects/mjexp/sys/kern/kern_exit.c#9 integrate .. //depot/projects/mjexp/sys/kern/kern_fork.c#13 integrate .. //depot/projects/mjexp/sys/kern/kern_mutex.c#12 integrate .. //depot/projects/mjexp/sys/kern/kern_prot.c#7 integrate .. //depot/projects/mjexp/sys/kern/vfs_bio.c#13 integrate .. //depot/projects/mjexp/sys/modules/zfs/Makefile#5 integrate .. //depot/projects/mjexp/sys/net/pfil.h#2 integrate .. //depot/projects/mjexp/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/mjexp/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_asconf.c#11 integrate .. //depot/projects/mjexp/sys/netinet/sctp_auth.c#10 integrate .. //depot/projects/mjexp/sys/netinet/sctp_auth.h#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_input.c#14 integrate .. //depot/projects/mjexp/sys/netinet/sctp_output.c#16 integrate .. //depot/projects/mjexp/sys/netinet/sctp_pcb.c#15 integrate .. //depot/projects/mjexp/sys/netinet/sctp_timer.h#4 integrate .. //depot/projects/mjexp/sys/netinet/sctp_uio.h#14 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.c#15 integrate .. //depot/projects/mjexp/sys/netinet/tcp_hostcache.c#5 integrate .. //depot/projects/mjexp/sys/pc98/conf/GENERIC#8 integrate .. //depot/projects/mjexp/sys/powerpc/conf/GENERIC#7 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/mjexp/sys/security/audit/audit.c#10 integrate .. //depot/projects/mjexp/sys/security/audit/audit.h#5 integrate .. //depot/projects/mjexp/sys/security/audit/audit_arg.c#8 integrate .. //depot/projects/mjexp/sys/security/audit/audit_syscalls.c#9 integrate .. //depot/projects/mjexp/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/mjexp/sys/sun4v/conf/GENERIC#6 integrate .. //depot/projects/mjexp/sys/sys/proc.h#17 integrate .. //depot/projects/mjexp/sys/sys/ucred.h#3 integrate Differences ... ==== //depot/projects/mjexp/sys/amd64/conf/GENERIC#11 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.478 2007/05/28 14:38:42 simokawa Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.479 2007/06/08 20:29:05 rwatson Exp $ cpu HAMMER ident GENERIC @@ -60,6 +60,7 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev options ADAPTIVE_GIANT # Giant mutex is adaptive. options STOP_NMI # Stop CPUS using NMI instead of IPI +options AUDIT # Security event auditing # Debugging for use in -current options KDB # Enable kernel debugger support. ==== //depot/projects/mjexp/sys/arm/arm/busdma_machdep.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.31 2007/05/29 06:30:25 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.32 2007/06/07 21:51:09 cognet Exp $"); /* * ARM bus dma support routines @@ -674,8 +674,8 @@ CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, " "alignment= %d", dmat->lowaddr, ptoa((vm_paddr_t)Maxmem), dmat->boundary, dmat->alignment); - CTR3(KTR_BUSDMA, "map= %p, nobouncemap= %p, pagesneeded= %d", - map, &nobounce_dmamap, map->pagesneeded); + CTR2(KTR_BUSDMA, "map= %p, pagesneeded= %d", + map, map->pagesneeded); /* * Count the number of bounce pages * needed in order to complete this transfer @@ -1384,8 +1384,7 @@ struct bounce_page *bpage; KASSERT(dmat->bounce_zone != NULL, ("no bounce zone in dma tag")); - KASSERT(map != NULL && map != &nobounce_dmamap, - ("add_bounce_page: bad map %p", map)); + KASSERT(map != NULL, ("add_bounce_page: bad map %p", map)); bz = dmat->bounce_zone; if (map->pagesneeded == 0) ==== //depot/projects/mjexp/sys/conf/NOTES#23 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1428 2007/06/05 00:12:36 jeff Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1429 2007/06/08 21:36:52 attilio Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -226,11 +226,6 @@ # and WITNESS options. options MUTEX_NOINLINE -# MUTEX_WAKE_ALL changes the mutex unlock algorithm to wake all waiters -# when a contested mutex is released rather than just awaking the highest -# priority waiter. -options MUTEX_WAKE_ALL - # RWLOCK_NOINLINE forces rwlock operations to call functions to perform each # operation rather than inlining the simple cases. This can be used to # shrink the size of the kernel text segment. Note that this behavior is ==== //depot/projects/mjexp/sys/conf/options#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.590 2007/06/05 00:12:36 jeff Exp $ +# $FreeBSD: src/sys/conf/options,v 1.591 2007/06/08 21:36:52 attilio Exp $ # # On the handling of kernel options # @@ -123,7 +123,6 @@ MFI_DECODE_LOG opt_mfi.h MPROF_BUFFERS opt_mprof.h MPROF_HASH_SIZE opt_mprof.h -MUTEX_WAKE_ALL NO_ADAPTIVE_MUTEXES opt_adaptive_mutexes.h NO_ADAPTIVE_RWLOCKS NSWBUF_MIN opt_swap.h ==== //depot/projects/mjexp/sys/contrib/ipfilter/netinet/fil.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.51 2007/06/04 02:54:35 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.52 2007/06/09 09:28:36 darrenr Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -155,7 +155,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.51 2007/06/04 02:54:35 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.52 2007/06/09 09:28:36 darrenr Exp $"; /* static const char rcsid[] = "@(#)$Id: fil.c,v 2.243.2.78 2006/03/29 11:19:54 darrenr Exp $"; */ #endif @@ -766,6 +766,7 @@ * source of the original packet then this packet is * not correct. */ + icmp6 = fin->fin_dp; ip6 = (ip6_t *)((char *)icmp6 + ICMPERR_ICMPHLEN); if (IP6_NEQ(&fin->fin_fi.fi_dst, (i6addr_t *)&ip6->ip6_src)) ==== //depot/projects/mjexp/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#3 (text+ko) ==== @@ -31,296 +31,7 @@ #define _ASM #include -#if defined(_KERNEL) - /* - * Legacy kernel interfaces; they will go away (eventually). - */ - ANSI_PRAGMA_WEAK2(cas8,atomic_cas_8,function) - ANSI_PRAGMA_WEAK2(cas32,atomic_cas_32,function) - ANSI_PRAGMA_WEAK2(cas64,atomic_cas_64,function) - ANSI_PRAGMA_WEAK2(caslong,atomic_cas_ulong,function) - ANSI_PRAGMA_WEAK2(casptr,atomic_cas_ptr,function) - ANSI_PRAGMA_WEAK2(atomic_and_long,atomic_and_ulong,function) - ANSI_PRAGMA_WEAK2(atomic_or_long,atomic_or_ulong,function) -#endif - - ENTRY(atomic_inc_8) - ALTENTRY(atomic_inc_uchar) - lock - incb (%rdi) - ret - SET_SIZE(atomic_inc_uchar) - SET_SIZE(atomic_inc_8) - - ENTRY(atomic_inc_16) - ALTENTRY(atomic_inc_ushort) - lock - incw (%rdi) - ret - SET_SIZE(atomic_inc_ushort) - SET_SIZE(atomic_inc_16) - - ENTRY(atomic_inc_32) - ALTENTRY(atomic_inc_uint) - lock - incl (%rdi) - ret - SET_SIZE(atomic_inc_uint) - SET_SIZE(atomic_inc_32) - - ENTRY(atomic_inc_64) - ALTENTRY(atomic_inc_ulong) - lock - incq (%rdi) - ret - SET_SIZE(atomic_inc_ulong) - SET_SIZE(atomic_inc_64) - - ENTRY(atomic_inc_8_nv) - ALTENTRY(atomic_inc_uchar_nv) - movb (%rdi), %al // %al = old value -1: - leaq 1(%rax), %rcx // %cl = new value - lock - cmpxchgb %cl, (%rdi) // try to stick it in - jne 1b - movzbl %cl, %eax // return new value - ret - SET_SIZE(atomic_inc_uchar_nv) - SET_SIZE(atomic_inc_8_nv) - - ENTRY(atomic_inc_16_nv) - ALTENTRY(atomic_inc_ushort_nv) - movw (%rdi), %ax // %ax = old value -1: - leaq 1(%rax), %rcx // %cx = new value - lock - cmpxchgw %cx, (%rdi) // try to stick it in - jne 1b - movzwl %cx, %eax // return new value - ret - SET_SIZE(atomic_inc_ushort_nv) - SET_SIZE(atomic_inc_16_nv) - - ENTRY(atomic_inc_32_nv) - ALTENTRY(atomic_inc_uint_nv) - movl (%rdi), %eax // %eax = old value -1: - leaq 1(%rax), %rcx // %ecx = new value - lock - cmpxchgl %ecx, (%rdi) // try to stick it in - jne 1b - movl %ecx, %eax // return new value - ret - SET_SIZE(atomic_inc_uint_nv) - SET_SIZE(atomic_inc_32_nv) - - ENTRY(atomic_inc_64_nv) - ALTENTRY(atomic_inc_ulong_nv) - movq (%rdi), %rax // %rax = old value -1: - leaq 1(%rax), %rcx // %rcx = new value - lock - cmpxchgq %rcx, (%rdi) // try to stick it in - jne 1b - movq %rcx, %rax // return new value - ret - SET_SIZE(atomic_inc_ulong_nv) - SET_SIZE(atomic_inc_64_nv) - - ENTRY(atomic_dec_8) - ALTENTRY(atomic_dec_uchar) - lock - decb (%rdi) - ret - SET_SIZE(atomic_dec_uchar) - SET_SIZE(atomic_dec_8) - - ENTRY(atomic_dec_16) - ALTENTRY(atomic_dec_ushort) - lock - decw (%rdi) - ret - SET_SIZE(atomic_dec_ushort) - SET_SIZE(atomic_dec_16) - - ENTRY(atomic_dec_32) - ALTENTRY(atomic_dec_uint) - lock - decl (%rdi) - ret - SET_SIZE(atomic_dec_uint) - SET_SIZE(atomic_dec_32) - - ENTRY(atomic_dec_64) - ALTENTRY(atomic_dec_ulong) - lock - decq (%rdi) - ret - SET_SIZE(atomic_dec_ulong) - SET_SIZE(atomic_dec_64) - - ENTRY(atomic_dec_8_nv) - ALTENTRY(atomic_dec_uchar_nv) - movb (%rdi), %al // %al = old value -1: - leaq -1(%rax), %rcx // %cl = new value - lock - cmpxchgb %cl, (%rdi) // try to stick it in - jne 1b - movzbl %cl, %eax // return new value - ret - SET_SIZE(atomic_dec_uchar_nv) - SET_SIZE(atomic_dec_8_nv) - - ENTRY(atomic_dec_16_nv) - ALTENTRY(atomic_dec_ushort_nv) - movw (%rdi), %ax // %ax = old value -1: - leaq -1(%rax), %rcx // %cx = new value - lock - cmpxchgw %cx, (%rdi) // try to stick it in - jne 1b - movzwl %cx, %eax // return new value - ret - SET_SIZE(atomic_dec_ushort_nv) - SET_SIZE(atomic_dec_16_nv) - - ENTRY(atomic_dec_32_nv) - ALTENTRY(atomic_dec_uint_nv) - movl (%rdi), %eax // %eax = old value -1: - leaq -1(%rax), %rcx // %ecx = new value - lock - cmpxchgl %ecx, (%rdi) // try to stick it in - jne 1b - movl %ecx, %eax // return new value - ret - SET_SIZE(atomic_dec_uint_nv) - SET_SIZE(atomic_dec_32_nv) - - ENTRY(atomic_dec_64_nv) - ALTENTRY(atomic_dec_ulong_nv) - movq (%rdi), %rax // %rax = old value -1: - leaq -1(%rax), %rcx // %rcx = new value - lock - cmpxchgq %rcx, (%rdi) // try to stick it in - jne 1b - movq %rcx, %rax // return new value - ret - SET_SIZE(atomic_dec_ulong_nv) - SET_SIZE(atomic_dec_64_nv) - - ENTRY(atomic_or_8) - ALTENTRY(atomic_or_uchar) - lock - orb %sil, (%rdi) - ret - SET_SIZE(atomic_or_uchar) - SET_SIZE(atomic_or_8) - - ENTRY(atomic_or_16) - ALTENTRY(atomic_or_ushort) - lock - orw %si, (%rdi) - ret - SET_SIZE(atomic_or_ushort) - SET_SIZE(atomic_or_16) - - ENTRY(atomic_or_32) - ALTENTRY(atomic_or_uint) - lock - orl %esi, (%rdi) - ret - SET_SIZE(atomic_or_uint) - SET_SIZE(atomic_or_32) - - ENTRY(atomic_or_64) - ALTENTRY(atomic_or_ulong) - lock - orq %rsi, (%rdi) - ret - SET_SIZE(atomic_or_ulong) - SET_SIZE(atomic_or_64) - - ENTRY(atomic_and_8) - ALTENTRY(atomic_and_uchar) - lock - andb %sil, (%rdi) - ret - SET_SIZE(atomic_and_uchar) - SET_SIZE(atomic_and_8) - - ENTRY(atomic_and_16) - ALTENTRY(atomic_and_ushort) - lock - andw %si, (%rdi) - ret - SET_SIZE(atomic_and_ushort) - SET_SIZE(atomic_and_16) - - ENTRY(atomic_and_32) - ALTENTRY(atomic_and_uint) - lock - andl %esi, (%rdi) - ret - SET_SIZE(atomic_and_uint) - SET_SIZE(atomic_and_32) - - ENTRY(atomic_and_64) - ALTENTRY(atomic_and_ulong) - lock - andq %rsi, (%rdi) - ret - SET_SIZE(atomic_and_ulong) - SET_SIZE(atomic_and_64) - - ENTRY(atomic_add_8_nv) - ALTENTRY(atomic_add_char_nv) - movb (%rdi), %al // %al = old value -1: - movb %sil, %cl - addb %al, %cl // %cl = new value - lock - cmpxchgb %cl, (%rdi) // try to stick it in - jne 1b - movzbl %cl, %eax // return new value - ret - SET_SIZE(atomic_add_char_nv) - SET_SIZE(atomic_add_8_nv) - - ENTRY(atomic_add_16_nv) - ALTENTRY(atomic_add_short_nv) - movw (%rdi), %ax // %ax = old value -1: - movw %si, %cx - addw %ax, %cx // %cx = new value - lock - cmpxchgw %cx, (%rdi) // try to stick it in - jne 1b - movzwl %cx, %eax // return new value - ret - SET_SIZE(atomic_add_short_nv) - SET_SIZE(atomic_add_16_nv) - - ENTRY(atomic_add_32_nv) - ALTENTRY(atomic_add_int_nv) - movl (%rdi), %eax -1: - movl %esi, %ecx - addl %eax, %ecx - lock - cmpxchgl %ecx, (%rdi) - jne 1b - movl %ecx, %eax - ret - SET_SIZE(atomic_add_int_nv) - SET_SIZE(atomic_add_32_nv) - ENTRY(atomic_add_64_nv) - ALTENTRY(atomic_add_ptr_nv) - ALTENTRY(atomic_add_long_nv) movq (%rdi), %rax 1: movq %rsi, %rcx @@ -330,68 +41,9 @@ jne 1b movq %rcx, %rax ret - SET_SIZE(atomic_add_long_nv) - SET_SIZE(atomic_add_ptr_nv) SET_SIZE(atomic_add_64_nv) - ENTRY(atomic_and_8_nv) - ALTENTRY(atomic_and_uchar_nv) - movb (%rdi), %al // %al = old value -1: - movb %sil, %cl - andb %al, %cl // %cl = new value - lock - cmpxchgb %cl, (%rdi) // try to stick it in - jne 1b - movzbl %cl, %eax // return new value - ret - SET_SIZE(atomic_and_uchar_nv) - SET_SIZE(atomic_and_8_nv) - - ENTRY(atomic_and_16_nv) - ALTENTRY(atomic_and_ushort_nv) - movw (%rdi), %ax // %ax = old value -1: - movw %si, %cx - andw %ax, %cx // %cx = new value - lock - cmpxchgw %cx, (%rdi) // try to stick it in - jne 1b - movzwl %cx, %eax // return new value - ret - SET_SIZE(atomic_and_ushort_nv) - SET_SIZE(atomic_and_16_nv) - - ENTRY(atomic_and_32_nv) - ALTENTRY(atomic_and_uint_nv) - movl (%rdi), %eax -1: - movl %esi, %ecx - andl %eax, %ecx - lock - cmpxchgl %ecx, (%rdi) - jne 1b - movl %ecx, %eax - ret - SET_SIZE(atomic_and_uint_nv) - SET_SIZE(atomic_and_32_nv) - - ENTRY(atomic_and_64_nv) - ALTENTRY(atomic_and_ulong_nv) - movq (%rdi), %rax -1: - movq %rsi, %rcx - andq %rax, %rcx - lock - cmpxchgq %rcx, (%rdi) - jne 1b - movq %rcx, %rax - ret - SET_SIZE(atomic_and_ulong_nv) - SET_SIZE(atomic_and_64_nv) - ENTRY(atomic_or_8_nv) - ALTENTRY(atomic_or_uchar_nv) movb (%rdi), %al // %al = old value 1: movb %sil, %cl @@ -401,160 +53,16 @@ jne 1b movzbl %cl, %eax // return new value ret - SET_SIZE(atomic_and_uchar_nv) - SET_SIZE(atomic_and_8_nv) + SET_SIZE(atomic_or_8_nv) - ENTRY(atomic_or_16_nv) - ALTENTRY(atomic_or_ushort_nv) - movw (%rdi), %ax // %ax = old value -1: - movw %si, %cx - orw %ax, %cx // %cx = new value - lock - cmpxchgw %cx, (%rdi) // try to stick it in - jne 1b - movzwl %cx, %eax // return new value - ret - SET_SIZE(atomic_or_ushort_nv) - SET_SIZE(atomic_or_16_nv) - - ENTRY(atomic_or_32_nv) - ALTENTRY(atomic_or_uint_nv) - movl (%rdi), %eax -1: - movl %esi, %ecx - orl %eax, %ecx - lock - cmpxchgl %ecx, (%rdi) - jne 1b - movl %ecx, %eax - ret - SET_SIZE(atomic_or_uint_nv) - SET_SIZE(atomic_or_32_nv) - - ENTRY(atomic_or_64_nv) - ALTENTRY(atomic_or_ulong_nv) - movq (%rdi), %rax -1: - movq %rsi, %rcx - orq %rax, %rcx - lock - cmpxchgq %rcx, (%rdi) - jne 1b - movq %rcx, %rax - ret - SET_SIZE(atomic_or_ulong_nv) - SET_SIZE(atomic_or_64_nv) - - ENTRY(atomic_cas_8) - ALTENTRY(atomic_cas_uchar) - movzbl %sil, %eax - lock - cmpxchgb %dl, (%rdi) - ret - SET_SIZE(atomic_cas_uchar) - SET_SIZE(atomic_cas_8) - - ENTRY(atomic_cas_16) - ALTENTRY(atomic_cas_ushort) - movzwl %si, %eax - lock - cmpxchgw %dx, (%rdi) - ret - SET_SIZE(atomic_cas_ushort) - SET_SIZE(atomic_cas_16) - - ENTRY(atomic_cas_32) - ALTENTRY(atomic_cas_uint) - movl %esi, %eax - lock - cmpxchgl %edx, (%rdi) - ret - SET_SIZE(atomic_cas_uint) - SET_SIZE(atomic_cas_32) - ENTRY(atomic_cas_64) - ALTENTRY(atomic_cas_ulong) - ALTENTRY(atomic_cas_ptr) movq %rsi, %rax lock cmpxchgq %rdx, (%rdi) ret - SET_SIZE(atomic_cas_ptr) - SET_SIZE(atomic_cas_ulong) SET_SIZE(atomic_cas_64) - ENTRY(atomic_swap_8) - ALTENTRY(atomic_swap_uchar) - movzbl %sil, %eax - lock - xchgb %al, (%rdi) - ret - SET_SIZE(atomic_swap_uchar) - SET_SIZE(atomic_swap_8) - - ENTRY(atomic_swap_16) - ALTENTRY(atomic_swap_ushort) - movzwl %si, %eax - lock - xchgw %ax, (%rdi) - ret - SET_SIZE(atomic_swap_ushort) - SET_SIZE(atomic_swap_16) - - ENTRY(atomic_swap_32) - ALTENTRY(atomic_swap_uint) - movl %esi, %eax - lock - xchgl %eax, (%rdi) - ret - SET_SIZE(atomic_swap_uint) - SET_SIZE(atomic_swap_32) - - ENTRY(atomic_swap_64) - ALTENTRY(atomic_swap_ulong) - ALTENTRY(atomic_swap_ptr) - movq %rsi, %rax - lock - xchgq %rax, (%rdi) - ret - SET_SIZE(atomic_swap_ptr) - SET_SIZE(atomic_swap_ulong) - SET_SIZE(atomic_swap_64) - - ENTRY(atomic_set_long_excl) - xorl %eax, %eax - lock - btsq %rsi, (%rdi) - jnc 1f - decl %eax // return -1 -1: - ret - SET_SIZE(atomic_set_long_excl) - - ENTRY(atomic_clear_long_excl) - xorl %eax, %eax - lock - btrq %rsi, (%rdi) - jc 1f - decl %eax // return -1 -1: - ret - SET_SIZE(atomic_clear_long_excl) - - ENTRY(membar_enter) - ALTENTRY(membar_exit) - mfence - ret - SET_SIZE(membar_exit) - SET_SIZE(membar_enter) - ENTRY(membar_producer) sfence ret SET_SIZE(membar_producer) - - ENTRY(membar_consumer) - lfence - ret - SET_SIZE(membar_consumer) ==== //depot/projects/mjexp/sys/contrib/opensolaris/common/atomic/i386/atomic.S#3 (text+ko) ==== @@ -31,327 +31,6 @@ #define _ASM #include -#if defined(_KERNEL) - /* - * Legacy kernel interfaces; they will go away (eventually). - */ - ANSI_PRAGMA_WEAK2(cas8,atomic_cas_8,function) - ANSI_PRAGMA_WEAK2(cas32,atomic_cas_32,function) - ANSI_PRAGMA_WEAK2(cas64,atomic_cas_64,function) - ANSI_PRAGMA_WEAK2(caslong,atomic_cas_ulong,function) - ANSI_PRAGMA_WEAK2(casptr,atomic_cas_ptr,function) - ANSI_PRAGMA_WEAK2(atomic_and_long,atomic_and_ulong,function) - ANSI_PRAGMA_WEAK2(atomic_or_long,atomic_or_ulong,function) -#endif - - ENTRY(atomic_inc_8) - ALTENTRY(atomic_inc_uchar) - movl 4(%esp), %eax - lock - incb (%eax) - ret - SET_SIZE(atomic_inc_uchar) - SET_SIZE(atomic_inc_8) - - ENTRY(atomic_inc_16) - ALTENTRY(atomic_inc_ushort) - movl 4(%esp), %eax - lock - incw (%eax) - ret - SET_SIZE(atomic_inc_ushort) - SET_SIZE(atomic_inc_16) - - ENTRY(atomic_inc_32) - ALTENTRY(atomic_inc_uint) - ALTENTRY(atomic_inc_ulong) - movl 4(%esp), %eax - lock - incl (%eax) - ret - SET_SIZE(atomic_inc_ulong) - SET_SIZE(atomic_inc_uint) - SET_SIZE(atomic_inc_32) - - ENTRY(atomic_inc_8_nv) - ALTENTRY(atomic_inc_uchar_nv) - movl 4(%esp), %edx // %edx = target address - movb (%edx), %al // %al = old value -1: - leal 1(%eax), %ecx // %cl = new value - lock - cmpxchgb %cl, (%edx) // try to stick it in - jne 1b - movzbl %cl, %eax // return new value - ret - SET_SIZE(atomic_inc_uchar_nv) - SET_SIZE(atomic_inc_8_nv) - - ENTRY(atomic_inc_16_nv) - ALTENTRY(atomic_inc_ushort_nv) - movl 4(%esp), %edx // %edx = target address - movw (%edx), %ax // %ax = old value -1: - leal 1(%eax), %ecx // %cx = new value - lock - cmpxchgw %cx, (%edx) // try to stick it in - jne 1b - movzwl %cx, %eax // return new value - ret - SET_SIZE(atomic_inc_ushort_nv) - SET_SIZE(atomic_inc_16_nv) - - ENTRY(atomic_inc_32_nv) - ALTENTRY(atomic_inc_uint_nv) - ALTENTRY(atomic_inc_ulong_nv) - movl 4(%esp), %edx // %edx = target address - movl (%edx), %eax // %eax = old value -1: - leal 1(%eax), %ecx // %ecx = new value - lock - cmpxchgl %ecx, (%edx) // try to stick it in - jne 1b - movl %ecx, %eax // return new value - ret - SET_SIZE(atomic_inc_ulong_nv) - SET_SIZE(atomic_inc_uint_nv) - SET_SIZE(atomic_inc_32_nv) - - ENTRY(atomic_inc_64) - ALTENTRY(atomic_inc_64_nv) - pushl %edi - pushl %ebx - movl 12(%esp), %edi // %edi = target address - movl (%edi), %eax - movl 4(%edi), %edx // %edx:%eax = old value -1: - xorl %ebx, %ebx - xorl %ecx, %ecx - incl %ebx // %ecx:%ebx = 1 - addl %eax, %ebx - adcl %edx, %ecx // add in the carry from inc - lock - cmpxchg8b (%edi) // try to stick it in - jne 1b - movl %ebx, %eax - movl %ecx, %edx // return new value - popl %ebx - popl %edi - ret - SET_SIZE(atomic_inc_64_nv) - SET_SIZE(atomic_inc_64) - - ENTRY(atomic_dec_8) - ALTENTRY(atomic_dec_uchar) - movl 4(%esp), %eax - lock - decb (%eax) - ret - SET_SIZE(atomic_dec_uchar) - SET_SIZE(atomic_dec_8) - - ENTRY(atomic_dec_16) - ALTENTRY(atomic_dec_ushort) - movl 4(%esp), %eax - lock - decw (%eax) - ret - SET_SIZE(atomic_dec_ushort) - SET_SIZE(atomic_dec_16) - - ENTRY(atomic_dec_32) - ALTENTRY(atomic_dec_uint) - ALTENTRY(atomic_dec_ulong) - movl 4(%esp), %eax - lock - decl (%eax) - ret - SET_SIZE(atomic_dec_ulong) - SET_SIZE(atomic_dec_uint) - SET_SIZE(atomic_dec_32) - - ENTRY(atomic_dec_8_nv) - ALTENTRY(atomic_dec_uchar_nv) - movl 4(%esp), %edx // %edx = target address - movb (%edx), %al // %al = old value -1: - leal -1(%eax), %ecx // %cl = new value - lock - cmpxchgb %cl, (%edx) // try to stick it in - jne 1b - movzbl %cl, %eax // return new value - ret - SET_SIZE(atomic_dec_uchar_nv) - SET_SIZE(atomic_dec_8_nv) - - ENTRY(atomic_dec_16_nv) - ALTENTRY(atomic_dec_ushort_nv) - movl 4(%esp), %edx // %edx = target address - movw (%edx), %ax // %ax = old value -1: - leal -1(%eax), %ecx // %cx = new value - lock - cmpxchgw %cx, (%edx) // try to stick it in - jne 1b - movzwl %cx, %eax // return new value - ret - SET_SIZE(atomic_dec_ushort_nv) - SET_SIZE(atomic_dec_16_nv) - - ENTRY(atomic_dec_32_nv) - ALTENTRY(atomic_dec_uint_nv) - ALTENTRY(atomic_dec_ulong_nv) - movl 4(%esp), %edx // %edx = target address - movl (%edx), %eax // %eax = old value -1: - leal -1(%eax), %ecx // %ecx = new value - lock - cmpxchgl %ecx, (%edx) // try to stick it in - jne 1b - movl %ecx, %eax // return new value - ret - SET_SIZE(atomic_dec_ulong_nv) - SET_SIZE(atomic_dec_uint_nv) - SET_SIZE(atomic_dec_32_nv) - - ENTRY(atomic_dec_64) - ALTENTRY(atomic_dec_64_nv) - pushl %edi - pushl %ebx - movl 12(%esp), %edi // %edi = target address - movl (%edi), %eax - movl 4(%edi), %edx // %edx:%eax = old value -1: - xorl %ebx, %ebx - xorl %ecx, %ecx - not %ecx - not %ebx // %ecx:%ebx = -1 - addl %eax, %ebx - adcl %edx, %ecx // add in the carry from inc - lock - cmpxchg8b (%edi) // try to stick it in - jne 1b - movl %ebx, %eax - movl %ecx, %edx // return new value - popl %ebx - popl %edi - ret - SET_SIZE(atomic_dec_64_nv) - SET_SIZE(atomic_dec_64) - - ENTRY(atomic_or_8) - ALTENTRY(atomic_or_uchar) - movl 4(%esp), %eax - movb 8(%esp), %cl - lock - orb %cl, (%eax) - ret - SET_SIZE(atomic_or_uchar) - SET_SIZE(atomic_or_8) - - ENTRY(atomic_or_16) - ALTENTRY(atomic_or_ushort) - movl 4(%esp), %eax - movw 8(%esp), %cx - lock - orw %cx, (%eax) - ret - SET_SIZE(atomic_or_ushort) - SET_SIZE(atomic_or_16) - - ENTRY(atomic_or_32) - ALTENTRY(atomic_or_uint) - ALTENTRY(atomic_or_ulong) - movl 4(%esp), %eax - movl 8(%esp), %ecx - lock - orl %ecx, (%eax) - ret - SET_SIZE(atomic_or_ulong) - SET_SIZE(atomic_or_uint) - SET_SIZE(atomic_or_32) - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 9 19:43:35 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15A8616A46E; Sat, 9 Jun 2007 19:43:35 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 98BC416A46D for ; Sat, 9 Jun 2007 19:43:34 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8AA0F13C458 for ; Sat, 9 Jun 2007 19:43:34 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59JhYJO009586 for ; Sat, 9 Jun 2007 19:43:34 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59JhYxc009577 for perforce@freebsd.org; Sat, 9 Jun 2007 19:43:34 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 9 Jun 2007 19:43:34 GMT Message-Id: <200706091943.l59JhYxc009577@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 121287 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 19:43:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=121287 Change 121287 by thompsa@thompsa_heff on 2007/06/09 19:42:34 Move setwme and disassoc into the command queue. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#44 edit .. //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#18 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#44 (text+ko) ==== @@ -138,7 +138,7 @@ static void iwi_media_status(struct ifnet *, struct ifmediareq *); static int iwi_newstate(struct ieee80211com *, enum ieee80211_state, int); static void iwi_wme_init(struct iwi_softc *); -static void iwi_wme_setparams(void *, int); +static int iwi_wme_setparams(struct iwi_softc *); static int iwi_wme_update(struct ieee80211com *); static uint16_t iwi_read_prom_word(struct iwi_softc *, uint8_t); static void iwi_frame_intr(struct iwi_softc *, struct iwi_rx_data *, int, @@ -172,11 +172,11 @@ #endif static void iwi_scan_mindwell(struct ieee80211com *); static void iwi_assoc(struct ieee80211com *ic); +static void iwi_disassoc(struct ieee80211com *); static void iwi_ops(void *, int); static int iwi_scan_cmd(struct iwi_softc *, int); static int iwi_auth_and_assoc(struct iwi_softc *); static int iwi_disassociate(struct iwi_softc *, int quiet); -static void iwi_down(void *, int); static void iwi_init(void *); static void iwi_init_locked(void *, int); static void iwi_stop(void *); @@ -278,8 +278,6 @@ #endif TASK_INIT(&sc->sc_radiontask, 0, iwi_radio_on, sc); TASK_INIT(&sc->sc_radiofftask, 0, iwi_radio_off, sc); - TASK_INIT(&sc->sc_setwmetask, 0, iwi_wme_setparams, sc); - TASK_INIT(&sc->sc_downtask, 0, iwi_down, sc); TASK_INIT(&sc->sc_restarttask, 0, iwi_restart, sc); TASK_INIT(&sc->sc_opstask, 0, iwi_ops, sc); callout_init_mtx(&sc->sc_wdtimer, &sc->sc_mtx, 0); @@ -978,7 +976,7 @@ */ if (ic->ic_state == IEEE80211_S_RUN && (sc->flags & IWI_FLAG_FW_INITED)) - taskqueue_enqueue(sc->sc_tq, &sc->sc_downtask); + iwi_disassoc(ic); if (ic->ic_state == IEEE80211_S_SCAN && (sc->flags & IWI_FLAG_SCANNING)) ieee80211_cancel_scan(ic); @@ -1046,7 +1044,7 @@ } static int -iwi_wme_setparams_locked(struct iwi_softc *sc) +iwi_wme_setparams(struct iwi_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; const struct wmeParams *wmep; @@ -1065,17 +1063,6 @@ DPRINTF(("Setting WME parameters\n")); return iwi_cmd(sc, IWI_CMD_SET_WME_PARAMS, sc->wme, sizeof sc->wme); } - -static void -iwi_wme_setparams(void *arg, int npending) -{ - struct iwi_softc *sc = arg; - IWI_LOCK_DECL; - - IWI_LOCK(sc); - (void) iwi_wme_setparams_locked(sc); - IWI_UNLOCK(sc); -} #undef IWI_USEC #undef IWI_EXP2 @@ -1092,9 +1079,7 @@ * will get sent down to the adapter as part of the * work iwi_auth_and_assoc does. */ - if (ic->ic_state == IEEE80211_S_RUN) - taskqueue_enqueue(sc->sc_tq, &sc->sc_setwmetask); - return 0; + return (iwi_scan_cmd(sc, IWI_SET_WME)); } static int @@ -2899,7 +2884,7 @@ if ((ic->ic_flags & IEEE80211_F_WME) && ni->ni_wme_ie != NULL) { /* NB: don't treat WME setup as failure */ - if (iwi_wme_setparams_locked(sc) == 0 && iwi_wme_setie(sc) == 0) + if (iwi_wme_setparams(sc) == 0 && iwi_wme_setie(sc) == 0) assoc->policy |= htole16(IWI_POLICY_WME); /* XXX complain on failure? */ } @@ -3003,17 +2988,6 @@ } static void -iwi_down(void *arg, int npending) -{ - struct iwi_softc *sc = arg; - IWI_LOCK_DECL; - - IWI_LOCK(sc); - iwi_disassociate(sc, 0); - IWI_UNLOCK(sc); -} - -static void iwi_init(void *priv) { struct iwi_softc *sc = priv; @@ -3556,6 +3530,13 @@ case IWI_ASSOC: iwi_auth_and_assoc(sc); break; + case IWI_DISASSOC: + iwi_disassociate(sc, 0); + break; + case IWI_SET_WME: + if (ic->ic_state == IEEE80211_S_RUN) + (void) iwi_wme_setparams(sc); + break; case IWI_SCAN_START: sc->flags |= IWI_FLAG_CHANNEL_SCAN; break; @@ -3664,3 +3645,12 @@ iwi_scan_cmd(sc, IWI_ASSOC); } + +static void +iwi_disassoc(struct ieee80211com *ic) +{ + struct ifnet *ifp = ic->ic_ifp; + struct iwi_softc *sc = ifp->if_softc; + + iwi_scan_cmd(sc, IWI_DISASSOC); +} ==== //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#18 (text+ko) ==== @@ -185,8 +185,6 @@ struct task sc_radiontask; /* radio on processing */ struct task sc_radiofftask; /* radio off processing */ - struct task sc_setwmetask; /* set wme params processing */ - struct task sc_downtask; /* disassociate processing */ struct task sc_restarttask; /* restart adapter processing */ struct task sc_opstask; /* scan / auth processing */ @@ -209,12 +207,14 @@ int sc_rfkill_timer;/* poll for rfkill change */ int sc_scan_timer; /* scan request timeout */ -#define IWI_SCAN_START (1 << 0) +#define IWI_SCAN_START (1 << 0) #define IWI_SET_CHANNEL (1 << 1) -#define IWI_SCAN_END (1 << 2) -#define IWI_ASSOC (1 << 3) -#define IWI_SCAN_CURCHAN (1 << 4) -#define IWI_SCAN_ALLCHAN (1 << 5) +#define IWI_SCAN_END (1 << 2) +#define IWI_ASSOC (1 << 3) +#define IWI_DISASSOC (1 << 4) +#define IWI_SCAN_CURCHAN (1 << 5) +#define IWI_SCAN_ALLCHAN (1 << 6) +#define IWI_SET_WME (1 << 7) #define IWI_SCAN_OPS 5 int sc_scanop[IWI_SCAN_OPS]; int sc_scan_cur; /* current queued scan task */ From owner-p4-projects@FreeBSD.ORG Sat Jun 9 19:49:42 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FE4D16A46E; Sat, 9 Jun 2007 19:49:42 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 479D116A46C for ; Sat, 9 Jun 2007 19:49:42 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3960713C469 for ; Sat, 9 Jun 2007 19:49:42 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59JngsJ014524 for ; Sat, 9 Jun 2007 19:49:42 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59JngJE014515 for perforce@freebsd.org; Sat, 9 Jun 2007 19:49:42 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 9 Jun 2007 19:49:42 GMT Message-Id: <200706091949.l59JngJE014515@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 121288 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 19:49:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=121288 Change 121288 by thompsa@thompsa_heff on 2007/06/09 19:48:50 Remove the scan naming for the command queue, its generic now. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#45 edit .. //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#19 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#45 (text+ko) ==== @@ -174,7 +174,7 @@ static void iwi_assoc(struct ieee80211com *ic); static void iwi_disassoc(struct ieee80211com *); static void iwi_ops(void *, int); -static int iwi_scan_cmd(struct iwi_softc *, int); +static int iwi_queue_cmd(struct iwi_softc *, int); static int iwi_auth_and_assoc(struct iwi_softc *); static int iwi_disassociate(struct iwi_softc *, int quiet); static void iwi_init(void *); @@ -261,7 +261,7 @@ sc->sc_dev = dev; IWI_LOCK_INIT(sc); - IWI_SCAN_LOCK_INIT(sc); + IWI_CMD_LOCK_INIT(sc); sc->sc_unr = new_unrhdr(1, IWI_MAX_IBSSNODE-1, &sc->sc_mtx); @@ -488,7 +488,7 @@ delete_unrhdr(sc->sc_unr); IWI_LOCK_DESTROY(sc); - IWI_SCAN_LOCK_DESTROY(sc); + IWI_CMD_LOCK_DESTROY(sc); return 0; } @@ -1079,7 +1079,7 @@ * will get sent down to the adapter as part of the * work iwi_auth_and_assoc does. */ - return (iwi_scan_cmd(sc, IWI_SET_WME)); + return (iwi_queue_cmd(sc, IWI_SET_WME)); } static int @@ -3510,16 +3510,16 @@ int cmd; again: - IWI_SCAN_LOCK(sc); - cmd = sc->sc_scanop[sc->sc_scan_cur]; + IWI_CMD_LOCK(sc); + cmd = sc->sc_cmd[sc->sc_cmd_cur]; if (cmd == 0) { /* No more commands to process */ - IWI_SCAN_UNLOCK(sc); + IWI_CMD_UNLOCK(sc); return; } - sc->sc_scanop[sc->sc_scan_cur] = 0; /* free the slot */ - sc->sc_scan_cur = (sc->sc_scan_cur + 1) % IWI_SCAN_OPS; - IWI_SCAN_UNLOCK(sc); + sc->sc_cmd[sc->sc_cmd_cur] = 0; /* free the slot */ + sc->sc_cmd_cur = (sc->sc_cmd_cur + 1) % IWI_CMD_MAXOPS; + IWI_CMD_UNLOCK(sc); IWI_LOCK(sc); while ((ic->ic_state != IEEE80211_S_INIT) && (sc->flags & IWI_FLAG_BUSY)) { @@ -3566,19 +3566,19 @@ } static int -iwi_scan_cmd(struct iwi_softc *sc, int cmd) +iwi_queue_cmd(struct iwi_softc *sc, int cmd) { - IWI_SCAN_LOCK(sc); - if (sc->sc_scanop[sc->sc_scan_next] != 0) { - IWI_SCAN_UNLOCK(sc); - DPRINTF(("%s: scan command %d dropped\n", __func__, cmd)); + IWI_CMD_LOCK(sc); + if (sc->sc_cmd[sc->sc_cmd_next] != 0) { + IWI_CMD_UNLOCK(sc); + DPRINTF(("%s: command %d dropped\n", __func__, cmd)); return (EBUSY); } - sc->sc_scanop[sc->sc_scan_next] = cmd; - sc->sc_scan_next = (sc->sc_scan_next + 1) % IWI_SCAN_OPS; + sc->sc_cmd[sc->sc_cmd_next] = cmd; + sc->sc_cmd_next = (sc->sc_cmd_next + 1) % IWI_CMD_MAXOPS; taskqueue_enqueue(sc->sc_tq, &sc->sc_opstask); - IWI_SCAN_UNLOCK(sc); + IWI_CMD_UNLOCK(sc); return (0); } @@ -3588,7 +3588,7 @@ struct ifnet *ifp = ic->ic_ifp; struct iwi_softc *sc = ifp->if_softc; - iwi_scan_cmd(sc, IWI_SCAN_START); + iwi_queue_cmd(sc, IWI_SCAN_START); } static void @@ -3607,7 +3607,7 @@ struct iwi_softc *sc = ifp->if_softc; sc->sc_maxdwell = maxdwell; - iwi_scan_cmd(sc, IWI_SCAN_CURCHAN); + iwi_queue_cmd(sc, IWI_SCAN_CURCHAN); } #if 0 @@ -3618,7 +3618,7 @@ struct iwi_softc *sc = ifp->if_softc; sc->sc_maxdwell = maxdwell; - iwi_scan_cmd(sc, IWI_SCAN_ALLCHAN); + iwi_queue_cmd(sc, IWI_SCAN_ALLCHAN); } #endif @@ -3634,7 +3634,7 @@ struct ifnet *ifp = ic->ic_ifp; struct iwi_softc *sc = ifp->if_softc; - iwi_scan_cmd(sc, IWI_SCAN_END); + iwi_queue_cmd(sc, IWI_SCAN_END); } static void @@ -3643,7 +3643,7 @@ struct ifnet *ifp = ic->ic_ifp; struct iwi_softc *sc = ifp->if_softc; - iwi_scan_cmd(sc, IWI_ASSOC); + iwi_queue_cmd(sc, IWI_ASSOC); } static void @@ -3652,5 +3652,5 @@ struct ifnet *ifp = ic->ic_ifp; struct iwi_softc *sc = ifp->if_softc; - iwi_scan_cmd(sc, IWI_DISASSOC); + iwi_queue_cmd(sc, IWI_DISASSOC); } ==== //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#19 (text+ko) ==== @@ -123,8 +123,8 @@ device_t sc_dev; struct mtx sc_mtx; - struct mtx sc_scanlock; - char sc_scanname[12]; /* e.g. "iwi0_scan" */ + struct mtx sc_cmdlock; + char sc_cmdname[12]; /* e.g. "iwi0_cmd" */ uint8_t sc_mcast[IEEE80211_ADDR_LEN]; struct unrhdr *sc_unr; struct taskqueue *sc_tq; /* private task queue */ @@ -215,10 +215,10 @@ #define IWI_SCAN_CURCHAN (1 << 5) #define IWI_SCAN_ALLCHAN (1 << 6) #define IWI_SET_WME (1 << 7) -#define IWI_SCAN_OPS 5 - int sc_scanop[IWI_SCAN_OPS]; - int sc_scan_cur; /* current queued scan task */ - int sc_scan_next; /* last queued scan task */ +#define IWI_CMD_MAXOPS 10 + int sc_cmd[IWI_CMD_MAXOPS]; + int sc_cmd_cur; /* current queued scan task */ + int sc_cmd_next; /* last queued scan task */ unsigned long sc_maxdwell; /* max dwell time for curchan */ struct bpf_if *sc_drvbpf; @@ -255,11 +255,11 @@ if (!__waslocked) \ mtx_unlock(&(sc)->sc_mtx); \ } while (0) -#define IWI_SCAN_LOCK_INIT(sc) do { \ - snprintf((sc)->sc_scanname, sizeof((sc)->sc_scanname), "%s_scan", \ +#define IWI_CMD_LOCK_INIT(sc) do { \ + snprintf((sc)->sc_cmdname, sizeof((sc)->sc_cmdname), "%s_cmd", \ device_get_nameunit((sc)->sc_dev)); \ - mtx_init(&(sc)->sc_scanlock, (sc)->sc_scanname, NULL, MTX_DEF); \ + mtx_init(&(sc)->sc_cmdlock, (sc)->sc_cmdname, NULL, MTX_DEF); \ } while (0) -#define IWI_SCAN_LOCK_DESTROY(sc) mtx_destroy(&(sc)->sc_scanlock) -#define IWI_SCAN_LOCK(sc) mtx_lock(&(sc)->sc_scanlock) -#define IWI_SCAN_UNLOCK(sc) mtx_unlock(&(sc)->sc_scanlock) +#define IWI_CMD_LOCK_DESTROY(sc) mtx_destroy(&(sc)->sc_cmdlock) +#define IWI_CMD_LOCK(sc) mtx_lock(&(sc)->sc_cmdlock) +#define IWI_CMD_UNLOCK(sc) mtx_unlock(&(sc)->sc_cmdlock) From owner-p4-projects@FreeBSD.ORG Sat Jun 9 19:58:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F1E716A468; Sat, 9 Jun 2007 19:58:03 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C409216A400 for ; Sat, 9 Jun 2007 19:58:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B36EE13C447 for ; Sat, 9 Jun 2007 19:58:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59Jw2YW020547 for ; Sat, 9 Jun 2007 19:58:02 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59JuQTG019812 for perforce@freebsd.org; Sat, 9 Jun 2007 19:56:26 GMT (envelope-from sam@freebsd.org) Date: Sat, 9 Jun 2007 19:56:26 GMT Message-Id: <200706091956.l59JuQTG019812@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 121290 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 19:58:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=121290 Change 121290 by sam@sam_ebb on 2007/06/09 19:55:15 IFC @ 121282 Affected files ... .. //depot/projects/crypto/sys/Makefile#2 integrate .. //depot/projects/crypto/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/crypto/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/crypto/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/crypto/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/crypto/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/crypto/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/crypto/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/crypto/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/crypto/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/crypto/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/crypto/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/crypto/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/crypto/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/crypto/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/crypto/sys/amd64/amd64/mptable.c#3 integrate .. //depot/projects/crypto/sys/amd64/amd64/mptable_pci.c#3 integrate .. //depot/projects/crypto/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/crypto/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/crypto/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/crypto/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/crypto/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/crypto/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/crypto/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/crypto/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/crypto/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/crypto/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/crypto/sys/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/crypto/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/crypto/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/crypto/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/crypto/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/crypto/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/crypto/sys/amd64/include/pcpu.h#3 integrate .. //depot/projects/crypto/sys/amd64/include/segments.h#2 integrate .. //depot/projects/crypto/sys/amd64/include/smp.h#3 integrate .. //depot/projects/crypto/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/crypto/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/crypto/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/crypto/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/crypto/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/crypto/sys/amd64/linux32/linux32_dummy.c#3 integrate .. //depot/projects/crypto/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/crypto/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/crypto/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/crypto/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/crypto/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/crypto/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/crypto/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/crypto/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/crypto/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/crypto/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/crypto/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/crypto/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/crypto/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/crypto/sys/arm/arm/intr.c#3 integrate .. //depot/projects/crypto/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/crypto/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/crypto/sys/arm/arm/trap.c#3 integrate .. //depot/projects/crypto/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/crypto/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/crypto/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/crypto/sys/arm/at91/at91_twi.c#4 integrate .. //depot/projects/crypto/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/crypto/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/crypto/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/crypto/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/crypto/sys/arm/conf/AVILA#3 integrate .. //depot/projects/crypto/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/crypto/sys/arm/conf/KB920X#2 integrate .. //depot/projects/crypto/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/crypto/sys/arm/include/asm.h#2 integrate .. //depot/projects/crypto/sys/arm/include/bootconfig.h#2 integrate .. //depot/projects/crypto/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/crypto/sys/arm/include/pcpu.h#3 integrate .. //depot/projects/crypto/sys/arm/include/pmap.h#3 integrate .. //depot/projects/crypto/sys/arm/include/profile.h#2 integrate .. //depot/projects/crypto/sys/arm/include/undefined.h#2 integrate .. //depot/projects/crypto/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/crypto/sys/arm/sa11x0/uart_cpu_sa1110.c#2 integrate .. //depot/projects/crypto/sys/arm/sa11x0/uart_dev_sa1110.c#3 integrate .. //depot/projects/crypto/sys/arm/xscale/i80321/ep80219_machdep.c#3 integrate .. //depot/projects/crypto/sys/arm/xscale/i80321/i80321_wdog.c#3 integrate .. //depot/projects/crypto/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/crypto/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 integrate .. //depot/projects/crypto/sys/arm/xscale/ixp425/avila_ata.c#3 integrate .. //depot/projects/crypto/sys/arm/xscale/ixp425/avila_machdep.c#4 integrate .. //depot/projects/crypto/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/crypto/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/crypto/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/crypto/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/crypto/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/crypto/sys/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/crypto/sys/arm/xscale/ixp425/uart_bus_ixp425.c#2 integrate .. //depot/projects/crypto/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 integrate .. //depot/projects/crypto/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/crypto/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 integrate .. //depot/projects/crypto/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#3 integrate .. //depot/projects/crypto/sys/boot/arm/at91/libat91/emac.c#3 integrate .. //depot/projects/crypto/sys/boot/arm/at91/libat91/getc.c#2 integrate .. //depot/projects/crypto/sys/boot/arm/at91/libat91/memcmp.c#2 integrate .. //depot/projects/crypto/sys/boot/arm/at91/libat91/sd-card.c#2 integrate .. //depot/projects/crypto/sys/boot/arm/at91/libat91/spi_flash.c#3 integrate .. //depot/projects/crypto/sys/boot/arm/at91/libat91/strlen.c#2 integrate .. //depot/projects/crypto/sys/boot/common/loader.8#4 integrate .. //depot/projects/crypto/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/crypto/sys/boot/ficl/float.c#2 integrate .. //depot/projects/crypto/sys/boot/ficl/softwords/fileaccess.fr#2 integrate .. //depot/projects/crypto/sys/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/crypto/sys/boot/ficl/softwords/oo.fr#2 integrate .. //depot/projects/crypto/sys/boot/ficl/softwords/prefix.fr#2 integrate .. //depot/projects/crypto/sys/boot/ficl/softwords/softcore.awk#2 integrate .. //depot/projects/crypto/sys/boot/ficl/tools.c#2 integrate .. //depot/projects/crypto/sys/boot/ficl/unix.c#2 integrate .. //depot/projects/crypto/sys/boot/ficl/vm.c#2 integrate .. //depot/projects/crypto/sys/boot/ficl/words.c#2 integrate .. //depot/projects/crypto/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/crypto/sys/boot/i386/Makefile#2 integrate .. //depot/projects/crypto/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/crypto/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/crypto/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/crypto/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/crypto/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/crypto/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/crypto/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/crypto/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/crypto/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/crypto/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/crypto/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/crypto/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/crypto/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/crypto/sys/boot/ia64/common/exec.c#2 integrate .. //depot/projects/crypto/sys/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/crypto/sys/boot/pc98/boot0.5/Makefile#2 integrate .. //depot/projects/crypto/sys/boot/pc98/boot0.5/boot.s#2 integrate .. //depot/projects/crypto/sys/boot/pc98/boot0.5/boot0.5.s#2 integrate .. //depot/projects/crypto/sys/boot/pc98/boot0.5/disk.s#2 integrate .. //depot/projects/crypto/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/crypto/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/crypto/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/crypto/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/crypto/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/crypto/sys/bsm/audit.h#3 integrate .. //depot/projects/crypto/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/crypto/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/crypto/sys/bsm/audit_record.h#3 integrate .. //depot/projects/crypto/sys/cam/README.quirks#1 branch .. //depot/projects/crypto/sys/cam/cam.c#2 integrate .. //depot/projects/crypto/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/crypto/sys/cam/cam_periph.c#3 integrate .. //depot/projects/crypto/sys/cam/cam_periph.h#2 integrate .. //depot/projects/crypto/sys/cam/cam_sim.c#2 integrate .. //depot/projects/crypto/sys/cam/cam_sim.h#2 integrate .. //depot/projects/crypto/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/crypto/sys/cam/cam_xpt.h#4 integrate .. //depot/projects/crypto/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/crypto/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/crypto/sys/cam/scsi/scsi_targ_bh.c#3 integrate .. //depot/projects/crypto/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/crypto/sys/coda/coda_vnops.c#3 integrate .. //depot/projects/crypto/sys/coda/coda_vnops.h#2 integrate .. //depot/projects/crypto/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/crypto/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/crypto/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/crypto/sys/compat/linux/linux_emul.c#3 integrate .. //depot/projects/crypto/sys/compat/linux/linux_emul.h#3 integrate .. //depot/projects/crypto/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/crypto/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/crypto/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/crypto/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/crypto/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/crypto/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/crypto/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/crypto/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/crypto/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/crypto/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/crypto/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/crypto/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/crypto/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/crypto/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/crypto/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/crypto/sys/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/crypto/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/crypto/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/crypto/sys/conf/Makefile.arm#2 integrate .. //depot/projects/crypto/sys/conf/Makefile.i386#2 integrate .. //depot/projects/crypto/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/crypto/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/crypto/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/crypto/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/crypto/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/crypto/sys/conf/NOTES#4 integrate .. //depot/projects/crypto/sys/conf/files#8 integrate .. //depot/projects/crypto/sys/conf/files.amd64#3 integrate .. //depot/projects/crypto/sys/conf/files.i386#3 integrate .. //depot/projects/crypto/sys/conf/files.ia64#2 integrate .. //depot/projects/crypto/sys/conf/files.pc98#3 integrate .. //depot/projects/crypto/sys/conf/files.powerpc#3 integrate .. //depot/projects/crypto/sys/conf/kern.mk#2 integrate .. //depot/projects/crypto/sys/conf/kern.post.mk#3 integrate .. //depot/projects/crypto/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/crypto/sys/conf/kmod.mk#4 integrate .. //depot/projects/crypto/sys/conf/options#6 integrate .. //depot/projects/crypto/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/CHANGES.txt#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acconfig.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acdebug.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acdispat.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acevents.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acexcep.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acglobal.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/achware.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acinterp.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/aclocal.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acmacros.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acnames.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acnamesp.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acobject.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acopcode.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acoutput.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acparser.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acpixf.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acstruct.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/actypes.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/acutils.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/aecommon.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/aeexec.c#2 delete .. //depot/projects/crypto/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/common/adfile.c#1 branch .. //depot/projects/crypto/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/common/adwalk.c#1 branch .. //depot/projects/crypto/sys/contrib/dev/acpica/common/dmrestag.c#1 branch .. //depot/projects/crypto/sys/contrib/dev/acpica/common/dmtable.c#1 branch .. //depot/projects/crypto/sys/contrib/dev/acpica/common/dmtbdump.c#1 branch .. //depot/projects/crypto/sys/contrib/dev/acpica/common/dmtbinfo.c#1 branch .. //depot/projects/crypto/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dbcmds.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dbdisply.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dbexec.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dbinput.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dbutils.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dsmethod.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dsmthdat.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dsopcode.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dsutils.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dswexec.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dswload.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/dswstate.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/evevent.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/evgpe.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/evgpeblk.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/evmisc.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/evregion.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/evrgnini.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/evxface.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/evxfevnt.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/evxfregn.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exconfig.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exconvrt.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exdump.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exfldio.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exmisc.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exmutex.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exoparg1.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exoparg2.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exprep.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exregion.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exresolv.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exresop.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exstore.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exsystem.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/exutils.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/hwgpe.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/hwregs.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/hwsleep.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/hwtimer.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/nsaccess.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/nsalloc.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/nsdump.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/nseval.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/nsinit.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/nsload.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/nsnames.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/nsparse.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/nssearch.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/nsutils.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/nswalk.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/nsxfname.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/psloop.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/psopcode.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/psparse.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/psutils.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/psxface.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/rscalc.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/rsinfo.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/rsutils.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/rsxface.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/tbconvrt.c#2 delete .. //depot/projects/crypto/sys/contrib/dev/acpica/tbfadt.c#1 branch .. //depot/projects/crypto/sys/contrib/dev/acpica/tbfind.c#1 branch .. //depot/projects/crypto/sys/contrib/dev/acpica/tbget.c#2 delete .. //depot/projects/crypto/sys/contrib/dev/acpica/tbgetall.c#2 delete .. //depot/projects/crypto/sys/contrib/dev/acpica/tbinstal.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/tbrsdt.c#2 delete .. //depot/projects/crypto/sys/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/tbxfroot.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/utalloc.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/utcache.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/utcopy.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/utdelete.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/uteval.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/utglobal.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/utmisc.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/utmutex.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/utobject.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/utresrc.c#1 branch .. //depot/projects/crypto/sys/contrib/dev/acpica/utstate.c#2 integrate .. //depot/projects/crypto/sys/contrib/dev/acpica/uttrack.c#1 branch .. //depot/projects/crypto/sys/contrib/dev/acpica/utxface.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/crypto/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/crypto/sys/contrib/opensolaris/common/acl/acl_common.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/common/acl/acl_common.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/common/avl/avl.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/common/nvpair/nvpair.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/Makefile.files#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/gfs.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/os/callb.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/os/list.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/os/taskq.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/avl.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/callb.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/compress.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/cred.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/debug.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/dkio.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/errorq.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/gfs.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/list.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/note.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/processor.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/procset.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/sdt.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/synch.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/vfs.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/vmem.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/sys/zmod.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/trees.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch .. //depot/projects/crypto/sys/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch .. //depot/projects/crypto/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/crypto/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/crypto/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/crypto/sys/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/crypto/sys/crypto/camellia/camellia.c#1 branch .. //depot/projects/crypto/sys/crypto/camellia/camellia.h#1 branch .. //depot/projects/crypto/sys/crypto/via/padlock.c#5 integrate .. //depot/projects/crypto/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/crypto/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/crypto/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/crypto/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/crypto/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/crypto/sys/dev/acpica/Osd/OsdDebug.c#3 integrate .. //depot/projects/crypto/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/crypto/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/crypto/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/crypto/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/crypto/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi_throttle.c#3 integrate .. //depot/projects/crypto/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/crypto/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/crypto/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/crypto/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/crypto/sys/dev/aha/aha.c#3 integrate .. //depot/projects/crypto/sys/dev/ahb/ahb.c#3 integrate .. //depot/projects/crypto/sys/dev/aic/aic.c#2 integrate .. //depot/projects/crypto/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/crypto/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/crypto/sys/dev/aic7xxx/aic79xx.h#3 integrate .. //depot/projects/crypto/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/crypto/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/crypto/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate .. //depot/projects/crypto/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/crypto/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/crypto/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate .. //depot/projects/crypto/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/crypto/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/crypto/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/crypto/sys/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/crypto/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/crypto/sys/dev/amd/amd.c#3 integrate .. //depot/projects/crypto/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/crypto/sys/dev/an/if_an.c#2 integrate .. //depot/projects/crypto/sys/dev/ar/if_ar.c#3 integrate .. //depot/projects/crypto/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/crypto/sys/dev/asr/asr.c#3 integrate .. //depot/projects/crypto/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/crypto/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/crypto/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/crypto/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/crypto/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/crypto/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/crypto/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/crypto/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/crypto/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/crypto/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/crypto/sys/dev/ath/ath_rate/onoe/onoe.h#2 integrate .. //depot/projects/crypto/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/crypto/sys/dev/ath/if_ath_pci.c#4 integrate .. //depot/projects/crypto/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/crypto/sys/dev/ath/if_athrate.h#3 integrate .. //depot/projects/crypto/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/crypto/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/crypto/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/crypto/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/crypto/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/crypto/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/crypto/sys/dev/buslogic/bt.c#3 integrate .. //depot/projects/crypto/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/crypto/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/crypto/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/crypto/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/crypto/sys/dev/ciss/cissvar.h#2 integrate .. //depot/projects/crypto/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/crypto/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/crypto/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/crypto/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/crypto/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/common/cxgb_ctl_defs.h#1 branch .. //depot/projects/crypto/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/common/jhash.h#1 branch .. //depot/projects/crypto/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/cxgb_include.h#1 branch .. //depot/projects/crypto/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/cxgb_l2t.c#1 branch .. //depot/projects/crypto/sys/dev/cxgb/cxgb_l2t.h#1 branch .. //depot/projects/crypto/sys/dev/cxgb/cxgb_lro.c#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/cxgb_offload.c#1 branch .. //depot/projects/crypto/sys/dev/cxgb/cxgb_offload.h#1 branch .. //depot/projects/crypto/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/crypto/sys/dev/cxgb/sys/mbufq.h#1 branch .. //depot/projects/crypto/sys/dev/cxgb/sys/mvec.h#1 branch .. //depot/projects/crypto/sys/dev/cxgb/sys/uipc_mvec.c#1 branch .. //depot/projects/crypto/sys/dev/cxgb/t3fw-3.2.bin.gz.uu#2 delete .. //depot/projects/crypto/sys/dev/cxgb/t3fw-4.0.0.bin.gz.uu#1 branch .. //depot/projects/crypto/sys/dev/cxgb/ulp/toecore/toedev.h#1 branch .. //depot/projects/crypto/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/crypto/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/crypto/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/crypto/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/crypto/sys/dev/dcons/dcons_os.h#2 integrate .. //depot/projects/crypto/sys/dev/de/if_de.c#3 integrate .. //depot/projects/crypto/sys/dev/de/if_devar.h#2 integrate .. //depot/projects/crypto/sys/dev/dpt/dpt_scsi.c#3 integrate .. //depot/projects/crypto/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/crypto/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/crypto/sys/dev/em/LICENSE#2 integrate .. //depot/projects/crypto/sys/dev/em/README#2 integrate .. //depot/projects/crypto/sys/dev/em/e1000_80003es2lan.c#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_80003es2lan.h#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_82540.c#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_82541.c#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_82541.h#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_82542.c#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_82543.c#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_82543.h#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_82571.c#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_82571.h#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_82575.c#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_82575.h#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_api.c#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_api.h#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_defines.h#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_hw.h#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_ich8lan.c#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_ich8lan.h#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_mac.c#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_mac.h#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_manage.c#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_manage.h#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_nvm.c#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_nvm.h#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_osdep.h#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_phy.c#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_phy.h#1 branch .. //depot/projects/crypto/sys/dev/em/e1000_regs.h#1 branch .. //depot/projects/crypto/sys/dev/em/if_em.c#3 integrate .. //depot/projects/crypto/sys/dev/em/if_em.h#2 integrate .. //depot/projects/crypto/sys/dev/em/if_em_hw.c#2 delete .. //depot/projects/crypto/sys/dev/em/if_em_hw.h#2 delete .. //depot/projects/crypto/sys/dev/em/if_em_osdep.h#2 delete .. //depot/projects/crypto/sys/dev/en/midway.c#3 integrate .. //depot/projects/crypto/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/crypto/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/crypto/sys/dev/exca/exca.c#3 integrate .. //depot/projects/crypto/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/crypto/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/crypto/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/crypto/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/crypto/sys/dev/firewire/fwdma.c#2 integrate .. //depot/projects/crypto/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/crypto/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/crypto/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/crypto/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/crypto/sys/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/crypto/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/crypto/sys/dev/firewire/if_fwevar.h#2 integrate .. //depot/projects/crypto/sys/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/crypto/sys/dev/firewire/if_fwipvar.h#2 integrate .. //depot/projects/crypto/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/crypto/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/crypto/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/crypto/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/crypto/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/crypto/sys/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/crypto/sys/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/crypto/sys/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/crypto/sys/dev/hifn/hifn7751.c#12 integrate .. //depot/projects/crypto/sys/dev/hifn/hifn7751reg.h#4 integrate .. //depot/projects/crypto/sys/dev/hifn/hifn7751var.h#4 integrate .. //depot/projects/crypto/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/crypto/sys/dev/hptiop/hptiop.c#1 branch .. //depot/projects/crypto/sys/dev/hptiop/hptiop.h#1 branch .. //depot/projects/crypto/sys/dev/hptmv/entry.c#3 integrate .. //depot/projects/crypto/sys/dev/hptmv/ioctl.c#3 integrate .. //depot/projects/crypto/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/crypto/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/crypto/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/crypto/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/crypto/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/crypto/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/crypto/sys/dev/iicbus/icee.c#1 branch .. //depot/projects/crypto/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/crypto/sys/dev/iicbus/iicbb.c#3 integrate .. //depot/projects/crypto/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/crypto/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/crypto/sys/dev/iicbus/iiconf.c#3 integrate .. //depot/projects/crypto/sys/dev/iir/iir.c#2 integrate .. //depot/projects/crypto/sys/dev/ipmi/ipmi.c#4 integrate .. //depot/projects/crypto/sys/dev/ipmi/ipmi_pci.c#2 integrate .. //depot/projects/crypto/sys/dev/ipmi/ipmi_smbios.c#2 integrate .. //depot/projects/crypto/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/crypto/sys/dev/isp/isp.c#4 integrate .. //depot/projects/crypto/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/crypto/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/crypto/sys/dev/isp/isp_library.c#3 integrate .. //depot/projects/crypto/sys/dev/isp/isp_library.h#3 integrate .. //depot/projects/crypto/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/crypto/sys/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/crypto/sys/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/crypto/sys/dev/isp/ispvar.h#4 integrate .. //depot/projects/crypto/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/crypto/sys/dev/led/led.c#2 integrate .. //depot/projects/crypto/sys/dev/led/led.h#2 integrate .. //depot/projects/crypto/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/crypto/sys/dev/md/md.c#3 integrate .. //depot/projects/crypto/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/crypto/sys/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/crypto/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/crypto/sys/dev/mfi/mfi_ioctl.h#3 integrate .. //depot/projects/crypto/sys/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/crypto/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/crypto/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/crypto/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/crypto/sys/dev/mii/brgphyreg.h#3 integrate .. //depot/projects/crypto/sys/dev/mii/ciphy.c#3 integrate .. //depot/projects/crypto/sys/dev/mii/ciphyreg.h#2 integrate .. //depot/projects/crypto/sys/dev/mii/mii.c#3 integrate .. //depot/projects/crypto/sys/dev/mii/miidevs#4 integrate .. //depot/projects/crypto/sys/dev/mii/rlphy.c#4 integrate .. //depot/projects/crypto/sys/dev/mk48txx/mk48txx.c#3 integrate .. //depot/projects/crypto/sys/dev/mly/mly.c#3 integrate .. //depot/projects/crypto/sys/dev/mmc/bridge.h#2 integrate .. //depot/projects/crypto/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/crypto/sys/dev/mmc/mmcbr_if.m#2 integrate .. //depot/projects/crypto/sys/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/crypto/sys/dev/mmc/mmcbus_if.m#2 integrate .. //depot/projects/crypto/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/crypto/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/crypto/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/crypto/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/crypto/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/crypto/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/crypto/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/crypto/sys/dev/mpt/mpilib/mpi_log_fc.h#2 delete .. //depot/projects/crypto/sys/dev/mpt/mpilib/mpi_log_sas.h#2 delete .. //depot/projects/crypto/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/crypto/sys/dev/mpt/mpilib/mpi_sas.h#2 integrate .. //depot/projects/crypto/sys/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/crypto/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/crypto/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/crypto/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/crypto/sys/dev/mpt/mpt_cam.h#3 integrate .. //depot/projects/crypto/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/crypto/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/crypto/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/crypto/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/crypto/sys/dev/mxge/eth_z8e.dat.gz.uu#3 integrate .. //depot/projects/crypto/sys/dev/mxge/ethp_z8e.dat.gz.uu#3 integrate .. //depot/projects/crypto/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/crypto/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/crypto/sys/dev/mxge/mxge_lro.c#1 branch .. //depot/projects/crypto/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/crypto/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/crypto/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/crypto/sys/dev/pccard/pccardvarp.h#3 integrate .. //depot/projects/crypto/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/crypto/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/crypto/sys/dev/pccbb/pccbbvar.h#3 integrate .. //depot/projects/crypto/sys/dev/pcf/envctrl.c#3 integrate .. //depot/projects/crypto/sys/dev/pcf/pcf_ebus.c#3 integrate .. //depot/projects/crypto/sys/dev/pcf/pcf_isa.c#3 integrate .. //depot/projects/crypto/sys/dev/pci/pci.c#3 integrate .. //depot/projects/crypto/sys/dev/pci/pci_if.m#3 integrate .. //depot/projects/crypto/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/crypto/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/crypto/sys/dev/pci/pcib_if.m#3 integrate .. //depot/projects/crypto/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/crypto/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/crypto/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/crypto/sys/dev/pdq/pdq_ifsubr.c#2 integrate .. //depot/projects/crypto/sys/dev/pdq/pdqreg.h#2 integrate .. //depot/projects/crypto/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/crypto/sys/dev/ppc/ppc.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 9 20:01:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9D6216A468; Sat, 9 Jun 2007 20:01:07 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 628F516A41F for ; Sat, 9 Jun 2007 20:01:07 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 536F913C48A for ; Sat, 9 Jun 2007 20:01:07 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59K17pP021420 for ; Sat, 9 Jun 2007 20:01:07 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59K17Xq021397 for perforce@freebsd.org; Sat, 9 Jun 2007 20:01:07 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 9 Jun 2007 20:01:07 GMT Message-Id: <200706092001.l59K17Xq021397@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 121291 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 20:01:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=121291 Change 121291 by thompsa@thompsa_heff on 2007/06/09 20:00:59 Track the firmware state. Some actions take several commands (assoc) or persist after the firmware acks the command (scan). If other commands get interleaved then the firmware will die. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#46 edit .. //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#20 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#46 (text+ko) ==== @@ -978,7 +978,7 @@ (sc->flags & IWI_FLAG_FW_INITED)) iwi_disassoc(ic); if (ic->ic_state == IEEE80211_S_SCAN && - (sc->flags & IWI_FLAG_SCANNING)) + (sc->fw_state == IWI_FW_SCANNING)) ieee80211_cancel_scan(ic); break; case IEEE80211_S_ASSOC: @@ -1389,7 +1389,7 @@ ieee80211_ieee2mhz(chan->nchan, 0), chan->nchan)); /* Reset the timer, the scan is still going */ - sc->sc_scan_timer = 3; + sc->sc_state_timer = 3; break; case IWI_NOTIF_TYPE_SCAN_COMPLETE: @@ -1398,8 +1398,7 @@ DPRINTFN(2, ("Scan completed (%u, %u)\n", scan->nchan, scan->status)); - sc->sc_scan_timer = 0; - sc->flags &= ~IWI_FLAG_SCANNING; + IWI_STATE_END(sc, IWI_FW_SCANNING); if (scan->status == IWI_SCAN_COMPLETED) ieee80211_scan_next(ic); @@ -1419,6 +1418,7 @@ case IWI_AUTH_FAIL: DPRINTFN(2, ("Authentication failed\n")); sc->flags &= ~IWI_FLAG_ASSOCIATED; + IWI_STATE_END(sc, IWI_FW_ASSOCIATING); /* XXX */ break; @@ -1430,6 +1430,7 @@ case IWI_AUTH_SEQ1_FAIL: DPRINTFN(2, ("Initial authentication handshake failed; " "you probably need shared key\n")); + IWI_STATE_END(sc, IWI_FW_ASSOCIATING); /* XXX retry shared key when in auto */ break; @@ -1450,6 +1451,7 @@ case IWI_ASSOC_SUCCESS: DPRINTFN(2, ("Association succeeded\n")); sc->flags |= IWI_FLAG_ASSOCIATED; + IWI_STATE_END(sc, IWI_FW_ASSOCIATING); iwi_checkforqos(sc, (const struct ieee80211_frame *)(assoc+1), le16toh(notif->len) - sizeof(*assoc)); @@ -1457,15 +1459,18 @@ break; case IWI_ASSOC_INIT: - switch (ic->ic_state) { - case IEEE80211_S_ASSOC: + switch (sc->fw_state) { + case IWI_FW_ASSOCIATING: DPRINTFN(2, ("Association failed\n")); + IWI_STATE_END(sc, IWI_FW_ASSOCIATING); ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); break; - case IEEE80211_S_RUN: - DPRINTFN(2, ("Disassociated\n")); + case IWI_FW_DISASSOCIATING: + DPRINTFN(2, ("Dissassociated\n")); + IWI_STATE_END(sc, + IWI_FW_DISASSOCIATING); break; } sc->flags &= ~IWI_FLAG_ASSOCIATED; @@ -1620,6 +1625,7 @@ taskqueue_enqueue(sc->sc_tq, &sc->sc_restarttask); sc->flags &= ~IWI_FLAG_BUSY; + sc->sc_busy_timer = 0; wakeup(sc); } @@ -1633,6 +1639,7 @@ if (r & IWI_INTR_CMD_DONE) { sc->flags &= ~IWI_FLAG_BUSY; + sc->sc_busy_timer = 0; wakeup(sc); } @@ -1672,6 +1679,7 @@ return EAGAIN; } sc->flags |= IWI_FLAG_BUSY; + sc->sc_busy_timer = 2; desc = &sc->cmdq.desc[sc->cmdq.cur]; @@ -1992,13 +2000,20 @@ sc->sc_rfkill_timer = 2; } } - if (sc->sc_scan_timer > 0) { - if (--sc->sc_scan_timer == 0) { - if (sc->flags & IWI_FLAG_SCANNING) { - if_printf(ifp, "scan stuck\n"); + if (sc->sc_state_timer > 0) { + if (--sc->sc_state_timer == 0) { + if_printf(ifp, "firmware stuck in state %d, resetting\n", + sc->fw_state); + taskqueue_enqueue(sc->sc_tq, &sc->sc_restarttask); + if (sc->fw_state == IWI_FW_SCANNING) ieee80211_cancel_scan(&sc->sc_ic); - taskqueue_enqueue(sc->sc_tq, &sc->sc_restarttask); - } + sc->sc_state_timer = 3; + } + } + if (sc->sc_busy_timer > 0) { + if (--sc->sc_busy_timer == 0) { + if_printf(ifp, "firmware command timeout, resetting\n"); + taskqueue_enqueue(sc->sc_tq, &sc->sc_restarttask); } } @@ -2696,7 +2711,7 @@ int error = 0; IWI_LOCK_ASSERT(sc); - if (sc->flags & IWI_FLAG_SCANNING) { + if (sc->fw_state == IWI_FW_SCANNING) { /* * This should not happen as we only trigger scan_next after * completion @@ -2704,6 +2719,7 @@ DPRINTF(("%s: called too early - still scanning\n", __func__)); return (EBUSY); } + IWI_STATE_BEGIN(sc, IWI_FW_SCANNING); ic = &sc->sc_ic; ss = ic->ic_scan; @@ -2798,8 +2814,6 @@ } while (i < IWI_SCAN_CHANNELS); } #endif - sc->flags |= IWI_FLAG_SCANNING; - sc->sc_scan_timer = 3; return (iwi_cmd(sc, IWI_CMD_SCAN_EXT, &scan, sizeof scan)); } @@ -2830,7 +2844,13 @@ IWI_LOCK_DECL; IWI_LOCK_ASSERT(sc); - + + if (sc->flags & IWI_FLAG_ASSOCIATED) { + DPRINTF(("Already associated\n")); + return (-1); + } + + IWI_STATE_BEGIN(sc, IWI_FW_ASSOCIATING); error = 0; if (IEEE80211_IS_CHAN_2GHZ(ic->ic_curchan)) { memset(&config, 0, sizeof config); @@ -2967,9 +2987,10 @@ le16toh(assoc->intval))); error = iwi_cmd(sc, IWI_CMD_ASSOCIATE, assoc, sizeof *assoc); done: - IWI_UNLOCK(sc); + if (error) + IWI_STATE_END(sc, IWI_FW_ASSOCIATING); - return (error); + return (error); } static int @@ -2977,6 +2998,13 @@ { struct iwi_associate *assoc = &sc->assoc; + if ((sc->flags & IWI_FLAG_ASSOCIATED) == 0) { + DPRINTF(("Not associated\n")); + return (-1); + } + + IWI_STATE_BEGIN(sc, IWI_FW_DISASSOCIATING); + if (quiet) assoc->type = IWI_HC_DISASSOC_QUIET; else @@ -3069,20 +3097,19 @@ IWI_LOCK_DECL; IWI_LOCK_ASSERT(sc); - if (sc->flags & IWI_FLAG_FW_LOADING) { + if (sc->fw_state == IWI_FW_LOADING) { device_printf(sc->sc_dev, "%s: already loading\n", __func__); return; /* XXX: condvar? */ } iwi_stop(sc); + IWI_STATE_BEGIN(sc, IWI_FW_LOADING); if (iwi_reset(sc) != 0) { device_printf(sc->sc_dev, "could not reset adapter\n"); goto fail; } - sc->flags |= IWI_FLAG_FW_LOADING; - IWI_UNLOCK(sc); if (iwi_get_firmware(sc)) { IWI_LOCK(sc); @@ -3171,11 +3198,11 @@ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; - sc->flags &= ~IWI_FLAG_FW_LOADING; + IWI_STATE_END(sc, IWI_FW_LOADING); return; fail: ifp->if_flags &= ~IFF_UP; - sc->flags &= ~IWI_FLAG_FW_LOADING; + IWI_STATE_END(sc, IWI_FW_LOADING); iwi_stop(sc); iwi_put_firmware(sc); } @@ -3210,8 +3237,11 @@ sc->sc_tx_timer = 0; sc->sc_rfkill_timer = 0; - sc->sc_scan_timer = 0; - sc->flags &= ~(IWI_FLAG_BUSY | IWI_FLAG_SCANNING | IWI_FLAG_ASSOCIATED); + sc->sc_state_timer = 0; + sc->sc_busy_timer = 0; + sc->flags &= ~(IWI_FLAG_BUSY | IWI_FLAG_ASSOCIATED); + sc->fw_state = IWI_FW_IDLE; + wakeup(sc); ieee80211_new_state(ic, IEEE80211_S_INIT, -1); } @@ -3522,10 +3552,13 @@ IWI_CMD_UNLOCK(sc); IWI_LOCK(sc); - while ((ic->ic_state != IEEE80211_S_INIT) && (sc->flags & IWI_FLAG_BUSY)) { + while (sc->fw_state != IWI_FW_IDLE || (sc->flags & IWI_FLAG_BUSY)) { msleep(sc, &sc->sc_mtx, 0, "iwicmd", hz/10); } + if (!(sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING)) + goto done; + switch (cmd) { case IWI_ASSOC: iwi_auth_and_assoc(sc); @@ -3543,7 +3576,7 @@ case IWI_SCAN_END: sc->flags &= ~IWI_FLAG_CHANNEL_SCAN; /* NB: make sure we're still scanning */ - if (sc->flags & IWI_FLAG_SCANNING) + if (sc->fw_state == IWI_FW_SCANNING) iwi_cmd(sc, IWI_CMD_ABORT_SCAN, NULL, 0); break; case IWI_SCAN_CURCHAN: @@ -3596,7 +3629,7 @@ { struct ifnet *ifp = ic->ic_ifp; struct iwi_softc *sc = ifp->if_softc; - if (!(sc->flags & (IWI_FLAG_SCANNING | IWI_FLAG_CHANNEL_SCAN))) + if (sc->fw_state == IWI_FW_IDLE) iwi_setcurchan(sc, ic->ic_curchan->ic_ieee); } ==== //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#20 (text+ko) ==== @@ -134,11 +134,15 @@ uint32_t flags; #define IWI_FLAG_FW_INITED (1 << 0) -#define IWI_FLAG_SCANNING (1 << 1) -#define IWI_FLAG_FW_LOADING (1 << 2) #define IWI_FLAG_BUSY (1 << 3) /* busy sending a command */ #define IWI_FLAG_ASSOCIATED (1 << 4) /* currently associated */ #define IWI_FLAG_CHANNEL_SCAN (1 << 5) + uint32_t fw_state; +#define IWI_FW_IDLE 0 +#define IWI_FW_LOADING 1 +#define IWI_FW_ASSOCIATING 2 +#define IWI_FW_DISASSOCIATING 3 +#define IWI_FW_SCANNING 4 struct iwi_cmd_ring cmdq; struct iwi_tx_ring txq[WME_NUM_AC]; struct iwi_rx_ring rxq; @@ -205,7 +209,8 @@ int sc_tx_timer; int sc_rfkill_timer;/* poll for rfkill change */ - int sc_scan_timer; /* scan request timeout */ + int sc_state_timer; /* firmware state timer */ + int sc_busy_timer; /* firmware cmd timer */ #define IWI_SCAN_START (1 << 0) #define IWI_SET_CHANNEL (1 << 1) @@ -237,6 +242,24 @@ int sc_txtap_len; }; +#define IWI_STATE_BEGIN(_sc, _state) do { \ + KASSERT(_sc->fw_state == IWI_FW_IDLE, \ + ("iwi firmware not idle")); \ + _sc->fw_state = _state; \ + _sc->sc_state_timer = 5; \ + DPRINTF(("enter FW state %d\n", _state)); \ +} while (0) + +#define IWI_STATE_END(_sc, _state) do { \ + if (_sc->fw_state == _state) \ + DPRINTF(("exit FW state %d\n", _state)); \ + else \ + DPRINTF(("expected FW state %d, got %d\n", \ + _state, _sc->fw_state)); \ + _sc->fw_state = IWI_FW_IDLE; \ + wakeup(_sc); \ + _sc->sc_state_timer = 0; \ +} while (0) /* * NB.: This models the only instance of async locking in iwi_init_locked * and must be kept in sync. From owner-p4-projects@FreeBSD.ORG Sat Jun 9 20:12:23 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5DE016A46D; Sat, 9 Jun 2007 20:12:22 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5FC6F16A469 for ; Sat, 9 Jun 2007 20:12:22 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 46B0813C46E for ; Sat, 9 Jun 2007 20:12:22 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59KCMFm033756 for ; Sat, 9 Jun 2007 20:12:22 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59KCL7C033740 for perforce@freebsd.org; Sat, 9 Jun 2007 20:12:21 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 9 Jun 2007 20:12:21 GMT Message-Id: <200706092012.l59KCL7C033740@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 121293 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 20:12:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=121293 Change 121293 by thompsa@thompsa_heff on 2007/06/09 20:11:40 Move the scan abort code into its own taskqueue, it needs to be able to reset scan even if iwi_ops is blocked on a state. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#47 edit .. //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#21 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#47 (text+ko) ==== @@ -165,6 +165,7 @@ static int iwi_scanchan(struct iwi_softc *, unsigned long, int); static void iwi_scan_start(struct ieee80211com *); static void iwi_scan_end(struct ieee80211com *); +static void iwi_scanabort(void *, int); static void iwi_set_channel(struct ieee80211com *); static void iwi_scan_curchan(struct ieee80211com *, unsigned long maxdwell); #if 0 @@ -280,6 +281,7 @@ TASK_INIT(&sc->sc_radiofftask, 0, iwi_radio_off, sc); TASK_INIT(&sc->sc_restarttask, 0, iwi_restart, sc); TASK_INIT(&sc->sc_opstask, 0, iwi_ops, sc); + TASK_INIT(&sc->sc_scanaborttask, 0, iwi_scanabort, sc); callout_init_mtx(&sc->sc_wdtimer, &sc->sc_mtx, 0); if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) { @@ -2818,6 +2820,20 @@ return (iwi_cmd(sc, IWI_CMD_SCAN_EXT, &scan, sizeof scan)); } +static void +iwi_scanabort(void *arg, int npending) +{ + struct iwi_softc *sc = arg; + IWI_LOCK_DECL; + + IWI_LOCK(sc); + sc->flags &= ~IWI_FLAG_CHANNEL_SCAN; + /* NB: make sure we're still scanning */ + if (sc->fw_state == IWI_FW_SCANNING) + iwi_cmd(sc, IWI_CMD_ABORT_SCAN, NULL, 0); + IWI_UNLOCK(sc); +} + static int iwi_set_sensitivity(struct iwi_softc *sc, int8_t rssi_dbm) { @@ -3573,12 +3589,6 @@ case IWI_SCAN_START: sc->flags |= IWI_FLAG_CHANNEL_SCAN; break; - case IWI_SCAN_END: - sc->flags &= ~IWI_FLAG_CHANNEL_SCAN; - /* NB: make sure we're still scanning */ - if (sc->fw_state == IWI_FW_SCANNING) - iwi_cmd(sc, IWI_CMD_ABORT_SCAN, NULL, 0); - break; case IWI_SCAN_CURCHAN: case IWI_SCAN_ALLCHAN: if (!(sc->flags & IWI_FLAG_CHANNEL_SCAN)) { @@ -3667,7 +3677,7 @@ struct ifnet *ifp = ic->ic_ifp; struct iwi_softc *sc = ifp->if_softc; - iwi_queue_cmd(sc, IWI_SCAN_END); + taskqueue_enqueue(sc->sc_tq, &sc->sc_scanaborttask); } static void ==== //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#21 (text+ko) ==== @@ -189,6 +189,7 @@ struct task sc_radiontask; /* radio on processing */ struct task sc_radiofftask; /* radio off processing */ + struct task sc_scanaborttask; /* cancel active scan */ struct task sc_restarttask; /* restart adapter processing */ struct task sc_opstask; /* scan / auth processing */ From owner-p4-projects@FreeBSD.ORG Sat Jun 9 20:36:00 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15D8B16A498; Sat, 9 Jun 2007 20:36:00 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 CEAFC16A492 for ; Sat, 9 Jun 2007 20:35:59 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A84F313C44C for ; Sat, 9 Jun 2007 20:35:59 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59KZxlm056709 for ; Sat, 9 Jun 2007 20:35:59 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59KZxqu056702 for perforce@freebsd.org; Sat, 9 Jun 2007 20:35:59 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 9 Jun 2007 20:35:59 GMT Message-Id: <200706092035.l59KZxqu056702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 121297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 20:36:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=121297 Change 121297 by thompsa@thompsa_heff on 2007/06/09 20:35:04 Remove unused variable. Affected files ... .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#48 edit Differences ... ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#48 (text+ko) ==== @@ -2857,8 +2857,7 @@ struct iwi_rateset rs; uint16_t capinfo; int error; - IWI_LOCK_DECL; - + IWI_LOCK_ASSERT(sc); if (sc->flags & IWI_FLAG_ASSOCIATED) { From owner-p4-projects@FreeBSD.ORG Sat Jun 9 22:02:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A723B16A41F; Sat, 9 Jun 2007 22:02:49 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 49ACC16A469 for ; Sat, 9 Jun 2007 22:02:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 22D9913C45B for ; Sat, 9 Jun 2007 22:02:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59M2nMV047948 for ; Sat, 9 Jun 2007 22:02:49 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59M2mkr047944 for perforce@freebsd.org; Sat, 9 Jun 2007 22:02:48 GMT (envelope-from marcel@freebsd.org) Date: Sat, 9 Jun 2007 22:02:48 GMT Message-Id: <200706092202.l59M2mkr047944@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 121303 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 22:02:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=121303 Change 121303 by marcel@marcel_xcllnt on 2007/06/09 22:02:09 Revert call to syncicache. We have a generic way in -CURRENT now. Affected files ... .. //depot/projects/e500/sys/gdb/gdb_packet.c#3 edit Differences ... ==== //depot/projects/e500/sys/gdb/gdb_packet.c#3 (text+ko) ==== @@ -148,9 +148,6 @@ gdb_rxp += 2; } } -#ifdef __powerpc__ - __syncicache(addr, size); -#endif (void)kdb_jmpbuf(prev); return ((ret == 0) ? 1 : 0); } From owner-p4-projects@FreeBSD.ORG Sat Jun 9 22:49:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5182E16A469; Sat, 9 Jun 2007 22:49:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E9AB316A41F for ; Sat, 9 Jun 2007 22:49:09 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D80B413C458 for ; Sat, 9 Jun 2007 22:49:09 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59Mn9Pw086067 for ; Sat, 9 Jun 2007 22:49:09 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59MltQ5084983 for perforce@freebsd.org; Sat, 9 Jun 2007 22:47:55 GMT (envelope-from marcel@freebsd.org) Date: Sat, 9 Jun 2007 22:47:55 GMT Message-Id: <200706092247.l59MltQ5084983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 121305 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 22:49:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=121305 Change 121305 by marcel@marcel_xcllnt on 2007/06/09 22:47:17 IFC @121302 Affected files ... .. //depot/projects/e500/ObsoleteFiles.inc#3 integrate .. //depot/projects/e500/bin/date/date.1#2 integrate .. //depot/projects/e500/cddl/lib/Makefile#2 integrate .. //depot/projects/e500/cddl/lib/libzpool/Makefile#2 integrate .. //depot/projects/e500/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/e500/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/e500/contrib/bind9/CHANGES#2 integrate .. //depot/projects/e500/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/e500/contrib/bind9/FAQ#2 integrate .. //depot/projects/e500/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/e500/contrib/bind9/FREEBSD-Upgrade#2 integrate .. //depot/projects/e500/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/README#2 integrate .. //depot/projects/e500/contrib/bind9/README.idnkit#1 branch .. //depot/projects/e500/contrib/bind9/acconfig.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/e500/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/e500/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/e500/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/aclconf.c#2 delete .. //depot/projects/e500/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/aclconf.h#2 delete .. //depot/projects/e500/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/e500/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/e500/contrib/bind9/configure.in#2 integrate .. //depot/projects/e500/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/README-SGML#2 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/e500/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/e500/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/e500/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/e500/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/e500/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/e500/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/e500/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/e500/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/e500/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/e500/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/e500/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#2 delete .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#2 delete .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#2 delete .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#2 delete .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 integrate .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#2 delete .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#2 delete .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#2 delete .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#2 delete .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#2 delete .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#2 delete .. //depot/projects/e500/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/doc/misc/dnssec#2 integrate .. //depot/projects/e500/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/e500/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/e500/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/e500/contrib/bind9/doc/misc/migration-4to9#2 integrate .. //depot/projects/e500/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/e500/contrib/bind9/doc/misc/rfc-compliance#2 integrate .. //depot/projects/e500/contrib/bind9/doc/misc/roadmap#2 integrate .. //depot/projects/e500/contrib/bind9/doc/misc/sdb#2 integrate .. //depot/projects/e500/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/e500/contrib/bind9/doc/rfc/rfc4193.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/rfc/rfc4255.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/rfc/rfc4343.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/rfc/rfc4367.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/rfc/rfc4431.txt#1 branch .. //depot/projects/e500/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/daemon.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/ftruncate.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/mktemp.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/putenv.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/readv.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/setenv.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/setitimer.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/strdup.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/strpbrk.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/strsep.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/utimes.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/bsd/writev.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/dst/dst_internal.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/dst/md5_locl.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/arpa/inet.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/fd_setsize.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/hesiod.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/irp.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/irs.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/isc/ctl.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/isc/dst.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/isc/heap.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/isc/logging.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/isc/memcluster.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/isc/tree.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/netgroup.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/res_update.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/inet/inet_addr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/inet/inet_data.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/inet/inet_makeaddr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/inet/inet_neta.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/inet/inet_netof.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/dns_gr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/dns_nw.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/dns_p.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/dns_pr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/dns_pw.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/dns_sv.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/gen.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/gen_gr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/gen_ng.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/gen_nw.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/gen_p.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/gen_pr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/gen_pw.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/gen_sv.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/getgrent.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/getgrent_r.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/getnetent.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/getprotoent.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/getpwent.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/getpwent_r.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/getservent.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/hesiod_p.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/irp_gr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/irp_ho.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/irp_ng.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/irp_p.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/irp_pr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/irp_pw.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/irp_sv.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/irs_data.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/irs_p.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/lcl.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/lcl_gr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/lcl_ng.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/lcl_nw.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/lcl_p.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/lcl_pw.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/lcl_sv.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/nis.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/nis_gr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/nis_ho.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/nis_ng.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/nis_nw.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/nis_p.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/nis_pr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/nis_pw.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/nis_sv.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/nul_ng.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/pathnames.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/util.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/assertions.mdoc#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/base64.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/ctl_p.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/ctl_p.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/ev_streams.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/ev_timers.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/ev_waits.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/eventlib.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/eventlib_p.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/heap.mdoc#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/logging.mdoc#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/logging_p.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/memcluster.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/movefile.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/tree.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/tree.mdoc#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/make/includes.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/make/rules.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/nameser/ns_date.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/nameser/ns_name.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/nameser/ns_netint.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/nameser/ns_print.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/herror.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/res_data.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/res_debug.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/res_mkupdate.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/res_private.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/res_query.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/res_update.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind9/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind9/version.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/acache.c#1 branch .. //depot/projects/e500/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/byaddr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/callbacks.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/db.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/dbiterator.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/dbtable.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/diff.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/dlz.c#1 branch .. //depot/projects/e500/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/ds.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/dst_internal.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/dst_lib.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/dst_openssl.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/dst_result.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/gssapi_link.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/gssapictx.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/hmac_link.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/acache.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/diff.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/dlz.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/events.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/log.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/master.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/order.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/request.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/result.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/sdlz.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/time.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/tsig.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/version.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/view.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dst/result.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/lib.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/log.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/ncache.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/nsec.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/order.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rbtdb.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rbtdb64.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rbtdb64.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rcode.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#1 branch .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#1 branch .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/spf_99.c#1 branch .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/spf_99.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdatalist.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/result.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/sdlz.c#1 branch .. //depot/projects/e500/contrib/bind9/lib/dns/soa.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/ssu.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/stats.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/time.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/timer.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/ttl.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/version.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/zonekey.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/zt.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/arm/include/isc/atomic.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/base64.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/bitstring.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/buffer.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/bufferlist.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/commandline.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/entropy.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/error.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/event.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/fsaccess.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/hex.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/hmacsha.c#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/include/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/app.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/error.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/event.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/file.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/hmacsha.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/log.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/os.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/parseint.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/random.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/ratelimiter.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/refcount.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/region.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/result.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/resultclass.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/rwlock.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/serial.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/sha1.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/sha2.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/stdio.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/stdlib.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/task.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/taskpool.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/util.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/version.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/inet_aton.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/inet_ntop.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/lib.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/md5.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/mips/include/isc/atomic.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/mutexblock.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/netaddr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/nls/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/nothreads/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/nothreads/include/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/nothreads/include/isc/condition.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/nothreads/include/isc/once.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/nothreads/include/isc/thread.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/nothreads/thread.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/ondestroy.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/parseint.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/pthreads/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/pthreads/condition.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/pthreads/include/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/pthreads/include/isc/condition.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/pthreads/include/isc/once.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/pthreads/include/isc/thread.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/pthreads/thread.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/random.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/ratelimiter.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/refcount.c#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/region.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/serial.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/sha1.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/sha2.c#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/string.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/strtoul.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/symtab.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/task.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/task_p.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/timer_p.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/app.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/dir.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/errno2result.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/errno2result.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/file.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/include/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/include/isc/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/include/isc/dir.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/include/isc/int.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/include/isc/keyboard.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/include/isc/netdb.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/include/isc/offset.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/include/isc/stat.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/include/isc/stdtime.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/include/isc/strerror.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/include/isc/syslog.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/include/isc/time.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/interfaceiter.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/keyboard.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/resource.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/stdio.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/strerror.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/syslog.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/version.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/isccc/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/alist.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/base64.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/cc.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/ccmsg.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/include/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/include/isccc/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/include/isccc/alist.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/include/isccc/base64.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/include/isccc/cc.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/include/isccc/ccmsg.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/include/isccc/events.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/include/isccc/lib.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/include/isccc/result.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/include/isccc/sexpr.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/include/isccc/symtab.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/include/isccc/symtype.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/include/isccc/types.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/include/isccc/util.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/include/isccc/version.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/lib.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/result.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/sexpr.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/symtab.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccc/version.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccfg/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccfg/aclconf.c#1 branch .. //depot/projects/e500/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccfg/include/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h#1 branch .. //depot/projects/e500/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccfg/include/isccfg/log.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccfg/include/isccfg/version.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccfg/log.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isccfg/version.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/assert_p.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/context.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/context_p.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/gethost.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/getnameinfo.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/getrrset.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/herror.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/include/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/include/lwres/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/include/lwres/context.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/include/lwres/int.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/include/lwres/ipv6.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/include/lwres/lang.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/include/lwres/list.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/include/lwres/lwpacket.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/include/lwres/lwres.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/include/lwres/netdb.h.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/include/lwres/result.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/include/lwres/stdlib.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/include/lwres/version.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/lwbuffer.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/lwinetaton.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/lwpacket.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/lwres_gabn.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/lwres_grbn.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/lwres_noop.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/lwresutil.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/Makefile.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 9 23:17:29 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FD7316A468; Sat, 9 Jun 2007 23:17:29 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 40E7216A41F for ; Sat, 9 Jun 2007 23:17:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2DFA313C44B for ; Sat, 9 Jun 2007 23:17:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59NHTQE014113 for ; Sat, 9 Jun 2007 23:17:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59NGiMi013531 for perforce@freebsd.org; Sat, 9 Jun 2007 23:16:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Jun 2007 23:16:44 GMT Message-Id: <200706092316.l59NGiMi013531@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 121307 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 23:17:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=121307 Change 121307 by rwatson@rwatson_zoo on 2007/06/09 23:16:36 Integrate TrustedBSD audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#17 integrate .. //depot/projects/trustedbsd/audit3/bin/date/date.1#5 integrate .. //depot/projects/trustedbsd/audit3/cddl/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/cddl/lib/libzpool/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/CHANGES#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/COPYRIGHT#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/FAQ#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/FAQ.xml#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/FREEBSD-Upgrade#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/README#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/README.idnkit#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/acconfig.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/check-tool.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkconf.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkconf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkconf.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkconf.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkzone.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkzone.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkzone.docbook#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkzone.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/dig.1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/dig.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/dig.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/dig.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/dighost.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/host.1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/host.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/host.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/host.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/include/dig/dig.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/nslookup.1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/nslookup.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/nslookup.docbook#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/nslookup.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-keygen.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-keygen.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-signzone.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-signzone.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-signzone.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssectool.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/aclconf.c#4 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/client.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/config.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/control.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/controlconf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/aclconf.h#3 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/client.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/config.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/control.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/globals.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/logconf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/lwresd.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/server.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/sortlist.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/tkeyconf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/tsigconf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/zoneconf.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/log.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/logconf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwdgabn.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwdgrbn.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwresd.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwresd.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwresd.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/main.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.conf.5#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.conf.docbook#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.conf.html#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.docbook#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/query.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/server.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/sortlist.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/tkeyconf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/tsigconf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/unix/include/named/os.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/unix/os.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/update.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/xfrout.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/zoneconf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/nsupdate/nsupdate.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/nsupdate/nsupdate.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/nsupdate/nsupdate.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/nsupdate/nsupdate.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc-confgen.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc-confgen.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc-confgen.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc-confgen.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.8#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.conf.5#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.conf.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.conf.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/configure.in#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM-book.xml#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch01.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch02.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch03.html#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch04.html#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch05.html#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch06.html#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch07.html#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch08.html#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch09.html#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.html#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/README-SGML#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/misc/dnssec#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/misc/migration#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/misc/migration-4to9#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/misc/options#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/misc/rfc-compliance#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/misc/roadmap#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/misc/sdb#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/rfc/index#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/rfc/rfc4193.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/rfc/rfc4255.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/rfc/rfc4343.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/rfc/rfc4367.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/rfc/rfc4431.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/Makefile.in#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/api#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/daemon.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/ftruncate.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/mktemp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/putenv.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/readv.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/setenv.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/setitimer.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/strdup.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/strpbrk.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/strsep.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/utimes.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/bsd/writev.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/configure#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/configure.in#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/dst/dst_api.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/dst/dst_internal.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/dst/hmac_link.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/dst/md5.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/dst/md5_dgst.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/dst/md5_locl.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/dst/support.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/arpa/inet.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/fd_setsize.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/hesiod.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/irp.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/irs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/isc/ctl.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/isc/dst.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/isc/eventlib.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/isc/heap.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/isc/list.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/isc/logging.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/isc/memcluster.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/isc/tree.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/netdb.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/netgroup.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/res_update.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/resolv.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_addr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_data.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_makeaddr.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_net_ntop.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_neta.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_netof.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_ntop.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_pton.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/nsap_addr.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/dns.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/dns_gr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/dns_ho.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/dns_nw.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/dns_p.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/dns_pr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/dns_pw.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/dns_sv.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/gai_strerror.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/gen.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/gen_gr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/gen_ho.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/gen_ng.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/gen_nw.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/gen_p.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/gen_pr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/gen_pw.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/gen_sv.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getaddrinfo.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getgrent.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getgrent_r.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/gethostent.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/gethostent_r.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getnameinfo.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getnetent.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getnetent_r.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getnetgrent_r.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getprotoent.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getprotoent_r.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getpwent.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getpwent_r.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getservent.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getservent_r.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/hesiod.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/hesiod_p.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irp_gr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irp_ho.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irp_ng.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irp_nw.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irp_p.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irp_pr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irp_pw.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irp_sv.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irpmarshall.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irs_data.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irs_data.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/irs_p.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/lcl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/lcl_gr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/lcl_ho.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/lcl_ng.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/lcl_nw.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/lcl_p.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/lcl_pr.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/lcl_pw.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/lcl_sv.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/nis.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/nis_gr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/nis_ho.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/nis_ng.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/nis_nw.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/nis_p.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/nis_pr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/nis_pw.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/nis_sv.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/nul_ng.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/pathnames.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/util.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/assertions.mdoc#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/base64.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/ctl_p.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/ctl_p.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/ev_connects.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/ev_files.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/ev_streams.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/ev_timers.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/ev_waits.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/eventlib.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/eventlib_p.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/heap.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/heap.mdoc#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/hex.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/logging.mdoc#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/logging_p.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/memcluster.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/movefile.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/tree.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/tree.mdoc#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/make/includes.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/make/rules.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/nameser/ns_date.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/nameser/ns_name.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/nameser/ns_netint.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/nameser/ns_parse.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/nameser/ns_print.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/nameser/ns_sign.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/nameser/ns_ttl.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/nameser/ns_verify.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/port_before.h.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/herror.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_comp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_data.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_debug.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_debug.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_findzonecut.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_init.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_mkupdate.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_mkupdate.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_private.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_query.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_send.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_sendsigned.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_update.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind9/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind9/api#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind9/check.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind9/getaddresses.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind9/include/bind9/check.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind9/version.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/acache.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/acl.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/adb.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/api#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/byaddr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/cache.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/callbacks.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/compress.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/db.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/dbiterator.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/dbtable.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/diff.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/dispatch.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/dlz.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/dnssec.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/ds.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/dst_api.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/dst_internal.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/dst_lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/dst_openssl.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/dst_result.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/forward.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/gen-unix.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/gen.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/gssapi_link.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/gssapictx.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/hmac_link.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/acache.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/acl.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/cache.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/compress.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/diff.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/dlz.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/events.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/forward.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/keytable.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/log.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/master.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/masterdump.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/message.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/name.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/order.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/peer.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/rbt.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/rdataset.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/request.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/resolver.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/result.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/sdlz.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/time.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/tsig.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/types.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/validator.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/version.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/view.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/xfrin.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/zone.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dst/result.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/journal.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/key.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/keytable.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/log.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/lookup.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/masterdump.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/message.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/name.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/ncache.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/nsec.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/openssl_link.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/openssldh_link.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/openssldsa_link.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/opensslrsa_link.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/order.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/peer.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/portlist.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rbt.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rbtdb.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rbtdb.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rbtdb64.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rbtdb64.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rcode.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/ds_43.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/rt_21.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/spf_99.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/spf_99.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdatalist.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdataset.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/resolver.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/result.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/sdlz.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/soa.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/ssu.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/stats.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/tcpmsg.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/time.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/timer.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/tkey.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/tsig.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/ttl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/validator.c#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/version.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/xfrin.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/zone.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/zonekey.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/zt.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/api#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/arm/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/base64.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/bitstring.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/buffer.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/bufferlist.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/commandline.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/entropy.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/error.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/event.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/fsaccess.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/hash.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/heap.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/hex.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/hmacmd5.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/hmacsha.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/app.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/error.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/event.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/file.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/heap.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/hmacsha.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/list.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/log.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/mem.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/netaddr.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/os.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/parseint.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/print.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/quota.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/random.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/ratelimiter.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/refcount.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/region.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/result.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/resultclass.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/rwlock.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/serial.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/sha1.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/sha2.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/sockaddr.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/stdio.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/stdlib.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/symtab.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/task.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/taskpool.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/util.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/version.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/inet_aton.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/inet_ntop.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/inet_pton.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/lex.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/lfsr.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/log.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/md5.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/mem.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/mips/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/mutexblock.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/netaddr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/netscope.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/nls/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/nls/msgcat.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/nothreads/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/nothreads/condition.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/nothreads/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/nothreads/include/isc/condition.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/nothreads/include/isc/once.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/nothreads/include/isc/thread.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/nothreads/mutex.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/nothreads/thread.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/ondestroy.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/parseint.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/print.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/pthreads/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/pthreads/condition.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/pthreads/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/pthreads/include/isc/condition.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/pthreads/include/isc/once.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/pthreads/include/isc/thread.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/pthreads/mutex.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/pthreads/thread.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/quota.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/random.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/ratelimiter.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/refcount.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/region.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/result.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/rwlock.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/serial.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/sha1.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/sha2.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/sockaddr.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/string.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/strtoul.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/symtab.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/task.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/task_p.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/taskpool.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/timer.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/timer_p.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/app.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/dir.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/entropy.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/errno2result.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/errno2result.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/file.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/fsaccess.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/include/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/include/isc/dir.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/include/isc/int.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/include/isc/keyboard.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/include/isc/netdb.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/include/isc/offset.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/include/isc/stat.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/include/isc/stdtime.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/include/isc/strerror.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/include/isc/syslog.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/include/isc/time.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/interfaceiter.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/ipv6.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/keyboard.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/net.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/os.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/resource.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/socket.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/stdio.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/stdtime.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/strerror.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/syslog.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/version.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/alist.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/api#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/base64.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/cc.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/ccmsg.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/include/isccc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/include/isccc/alist.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/include/isccc/base64.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/include/isccc/cc.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/include/isccc/ccmsg.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/include/isccc/events.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/include/isccc/lib.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/include/isccc/result.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/include/isccc/sexpr.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/include/isccc/symtab.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/include/isccc/symtype.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/include/isccc/types.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/include/isccc/util.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/include/isccc/version.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/lib.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/result.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/sexpr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/symtab.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccc/version.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/aclconf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/api#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/include/isccfg/log.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/include/isccfg/version.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/log.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/namedconf.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/parser.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/version.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/api#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/assert_p.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/context.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/context_p.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/gai_strerror.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/getaddrinfo.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/gethost.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/getipnode.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/getnameinfo.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/getrrset.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/herror.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/lwres/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/lwres/context.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/lwres/int.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/lwres/ipv6.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/lwres/lang.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/lwres/list.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/lwres/lwpacket.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/lwres/lwres.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/lwres/netdb.h.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/lwres/platform.h.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/lwres/result.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/lwres/stdlib.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/lwres/version.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/lwbuffer.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/lwconfig.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/lwinetaton.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/lwinetntop.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/lwinetpton.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/lwpacket.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/lwres_gabn.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/lwres_grbn.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/lwres_noop.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/lwresutil.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_buffer.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_buffer.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_config.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_config.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_config.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_context.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_context.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_context.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gabn.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gabn.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gethostent.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gethostent.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getipnode.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getipnode.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gnba.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gnba.html#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 9 23:19:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2ED016A469; Sat, 9 Jun 2007 23:19:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 7376616A421 for ; Sat, 9 Jun 2007 23:19:32 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6356C13C44C for ; Sat, 9 Jun 2007 23:19:32 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59NJWDD015875 for ; Sat, 9 Jun 2007 23:19:32 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59NJWIW015863 for perforce@freebsd.org; Sat, 9 Jun 2007 23:19:32 GMT (envelope-from ivoras@FreeBSD.org) Date: Sat, 9 Jun 2007 23:19:32 GMT Message-Id: <200706092319.l59NJWIW015863@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 121308 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 23:19:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=121308 Change 121308 by ivoras@ivoras_finstall on 2007/06/09 23:18:36 Implemented GetDrivePartitions function and supporting infrastructure Affected files ... .. //depot/projects/soc2007/ivoras_finstall/pybackend/conffile.py#3 edit .. //depot/projects/soc2007/ivoras_finstall/pybackend/freebsd.py#4 edit .. //depot/projects/soc2007/ivoras_finstall/pybackend/globals.py#4 edit .. //depot/projects/soc2007/ivoras_finstall/pybackend/systoold.py#5 edit .. //depot/projects/soc2007/ivoras_finstall/pybackend/systoolengine.py#5 edit .. //depot/projects/soc2007/ivoras_finstall/pybackend/testtool/st.py#3 edit .. //depot/projects/soc2007/ivoras_finstall/pybackend/xmldict.py#4 edit Differences ... ==== //depot/projects/soc2007/ivoras_finstall/pybackend/conffile.py#3 (text+ko) ==== ==== //depot/projects/soc2007/ivoras_finstall/pybackend/freebsd.py#4 (text+ko) ==== @@ -27,9 +27,11 @@ cmd_sysctl = "/sbin/sysctl" cmd_geom = "/sbin/geom" cmd_mount = "/sbin/mount" +cmd_file = "/usr/bin/file -s" file_dmesg = "/var/run/dmesg.boot" + def get_sysctl(name): global cmd_sysctl str = os.popen("%s -b %s" % (cmd_sysctl, name)).read().strip() @@ -37,16 +39,47 @@ str = str[:-1] return str + def get_cmd_output(name): return os.popen(name).read().strip() + def get_dmesg(): global file_dmesg return [x.strip() for x in file(file_dmesg, "r").readlines()] + def get_geom_xml(): return xmldict.buildxmldict(get_sysctl("kern.geom.confxml")) + +def guess_fs_type(dev): + """Try to guess what file system is on the given device.""" + global cmd_file + if not dev.startswith("/dev/"): + dev = "/dev/%s" % dev + guess = get_cmd_output("%s %s" % (cmd_file, dev)) + if guess.find("FAT (32 bit)") != -1: + return "FAT32" + elif guess.find("FAT") != -1: + return "FAT" + elif guess.find("NTFS") != -1: + return "NTFS" + elif guess.find("ext2") != -1: + return "ext2" + elif guess.find("ext3") != -1: + return "ext3" + elif guess.find("XFS") != -1: + return "XFS" + elif guess.find("ReiserFS") != -1: + return "ReiserFS" + elif guess.find("Unix Fast File system v2") != -1: + return "UFS2" + elif guess.find("Unix Fast File system") != -1: + return "UFS" + return "(unknown)" + + if __name__ == "__main__": xml = get_geom_xml() for cls in xml["mesh"]["class"]: ==== //depot/projects/soc2007/ivoras_finstall/pybackend/globals.py#4 (text+ko) ==== @@ -34,12 +34,12 @@ # "rcconf" : Low-level functions that alter /etc/rc.conf: # GetConf, SetConf # "disk" : Low-level drive & file system functions: -# GetDrives, GetMountPoints, Mount +# GetDrives, GetDrivePartitions, GetMountPoints, Mount # These functions are implemented in systoolengine.py server_caps = ["systoold", "rcconf", "disk"] # debug level. 0 = no debug -debug_level = 0 +debug_level = 1 # if exit_syslogd becomes True, the TCP accept loop will exit exit_systoold = False ==== //depot/projects/soc2007/ivoras_finstall/pybackend/systoold.py#5 (text+ko) ==== @@ -28,11 +28,13 @@ import os,sys from getopt import getopt, GetoptError from select import select +import logging from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler import globals from systoolengine import SysToolEngine +logging.basicConfig(level=logging.DEBUG) bind_port = 1025 bind_host = "localhost" @@ -75,6 +77,7 @@ server.register_function(ToUpper) server.register_instance(engine) +logging.info("SysToolD started") while not globals.exit_systoold: try: r,w,e = select([server.fileno()], [], [], 100) ==== //depot/projects/soc2007/ivoras_finstall/pybackend/systoolengine.py#5 (text+ko) ==== @@ -22,12 +22,35 @@ # SysToolD Engine import os, sys +import re +import logging import globals import freebsd from conffile import ConfFile +def logexception(func): + """Method call decorator that routes exceptions to the logger + before passing them on""" + def call(*args, **kwds): + try: + return func(*args, **kwds) + except: + logging.exception("Exception!") + raise + return call + + +def tolist(e): + """Coalesce argument to list (if the argument is not list, + wrap it in a list of one element).""" + if type(e) == type([]): + return e + else: + return [e] + + class SysToolEngine: @@ -73,11 +96,21 @@ return True + @logexception def GetDrives(self): - """Returns an array of drives the kernel knows about. + """Returns information on drives the kernel knows about. Examines "kern.drives" sysctl. This is NOT the list of valid GEOM leaves which can be mounted, but a list of - found hardware.""" + found hardware. + RETURN VALUE: + The return value is a dictionary with device names + as keys and another dictionary as values. + { + "ad0" : { + "name": "ACME MegaDrive" + "mediasize": 300000 # (MB) + } + }""" drive_list = freebsd.get_sysctl("kern.disks").split(" ") dmesg = freebsd.get_dmesg() drive_dict = {} @@ -100,13 +133,85 @@ geomxml = freebsd.get_geom_xml() for cls in geomxml["mesh"]["class"]: if cls["name"].data == "DISK": - for geom in cls["geom"]: + for geom in tolist(cls["geom"]): dev_name = geom["name"].data if dev_name in drive_dict: drive_dict[dev_name]["mediasize"] = int(geom["provider"]["mediasize"].data) / (1024*1024) # in MB, since XML-RPC doesn't have int64 + # do some prettyfying of device name strings + for drvid in drive_dict: + m = re.match(r"(^\d+MB)\s*(.+)", drive_dict[drvid]["name"]) + if m != None: + drive_dict[drvid]["name"] = m.group(2) return drive_dict + @logexception + def GetDrivePartitions(self, drive): + """Returns a list of leaf partitions created on the drive. + ARGUMENTS: + drive : The drive to inspect + RETURN VALUE: + The return value is a list of dictionaries.""" + parts = {} + used_parts = [] + geomxml = freebsd.get_geom_xml() + num_msdos_parts = 1 + # enumerate MSDOS partitions + for cls in geomxml["mesh"]["class"]: + if cls["name"].data == "MBR": + for geom in tolist(cls["geom"]): + if geom["name"].data == drive: + for prov in tolist(geom["provider"]): + part = { + "name" : prov["name"].data, + "mediasize" : int(prov["mediasize"].data) / (1024*1024), + "sectorsize" : int(prov["sectorsize"].data), + "type" : "MBR" + } + parts[part["name"]] = part + num_msdos_parts += 1 + # process BSDlabels, both dedicated and inside MSDOS partitions + for cls in geomxml["mesh"]["class"]: + if cls["name"].data == "BSD": + for geom in tolist(cls["geom"]): + if geom["name"].data == drive: + # "raw" BSD partitions directly on the drive + # this is not exactly possible if the drive also has MSDOS partitions on it :) + if num_msdos_parts != 0: + logging.error("The impossible has happened: drive has both MSDOS and BSD partitions directly on it") + continue + for prov in tolist(gerom["provider"]): + part = { + "name" : prov["name"].data, + "mediasize" : int(prov["mediasize"].data) / (1024*1024), + "sectorsize" : int(prov["sectorsize"].data), + "type" : "BSD" + } + parts[part["name"]] = part + if geom["name"].data in parts: + # bsdlabel hosted inside MSDOS partition + used_parts.append(geom["name"].data) + for prov in tolist(geom["provider"]): + part = { + "name" : prov["name"].data, + "mediasize" : int(prov["mediasize"].data) / (1024*1024), + "sectorsize" : int(prov["sectorsize"].data), + "type" : "BSD" + } + parts[part["name"]] = part + # TODO: also process GPT records + # Remove partitions that have been used to host other partitions from the list + for part in used_parts: + del parts[part] + # Try to divine file system types for the partitions + for part in parts: + parts[part]["fs_type"] = freebsd.guess_fs_type(part) + + return parts + + + + def GetMountPoints(self): """Returns a list of dictionaries containing information about currently mounted file systems""" ==== //depot/projects/soc2007/ivoras_finstall/pybackend/testtool/st.py#3 (text+ko) ==== @@ -31,4 +31,12 @@ print "This is a bogus server" sys.exit(1) -print server.GetDrives() +print "Connection ok" + +drives = server.GetDrives() +for drive in drives: + print drive + print server.GetDrivePartitions(drive) + +print server.GetMountPoints() + ==== //depot/projects/soc2007/ivoras_finstall/pybackend/xmldict.py#4 (text+ko) ==== @@ -121,7 +121,7 @@ if type(self.data) == type(''): self.data = self.data.decode(fromencoding, 'replace') for a in self.attrs: - if type(self.attrs[a] == type('')): + if type(self.attrs[a]) == type(''): self.attrs[a] = self.attrs[a].decode(fromencoding, 'replace') if recurse: for k in self.d: From owner-p4-projects@FreeBSD.ORG Sat Jun 9 23:36:30 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC07816A46B; Sat, 9 Jun 2007 23:36:29 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 94D9316A41F for ; Sat, 9 Jun 2007 23:36:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 83C8F13C45A for ; Sat, 9 Jun 2007 23:36:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59NaTIe032805 for ; Sat, 9 Jun 2007 23:36:29 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59NZqmg032242 for perforce@freebsd.org; Sat, 9 Jun 2007 23:35:52 GMT (envelope-from sam@freebsd.org) Date: Sat, 9 Jun 2007 23:35:52 GMT Message-Id: <200706092335.l59NZqmg032242@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 121309 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2007 23:36:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=121309 Change 121309 by sam@sam_laptop on 2007/06/09 23:34:57 IFC Affected files ... .. //depot/projects/wifi/ObsoleteFiles.inc#17 integrate .. //depot/projects/wifi/bin/date/date.1#6 integrate .. //depot/projects/wifi/cddl/lib/Makefile#3 integrate .. //depot/projects/wifi/cddl/lib/libzpool/Makefile#3 integrate .. //depot/projects/wifi/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/wifi/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/wifi/contrib/bind9/CHANGES#6 integrate .. //depot/projects/wifi/contrib/bind9/COPYRIGHT#4 integrate .. //depot/projects/wifi/contrib/bind9/FAQ#6 integrate .. //depot/projects/wifi/contrib/bind9/FAQ.xml#4 integrate .. //depot/projects/wifi/contrib/bind9/FREEBSD-Upgrade#7 integrate .. //depot/projects/wifi/contrib/bind9/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/bind9/README#6 integrate .. //depot/projects/wifi/contrib/bind9/README.idnkit#1 branch .. //depot/projects/wifi/contrib/bind9/acconfig.h#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/check-tool.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkconf.8#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkconf.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkconf.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkconf.html#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkzone.8#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkzone.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkzone.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkzone.html#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dig.1#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dig.c#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dig.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dig.html#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dighost.c#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/host.1#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/host.c#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/host.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/host.html#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/include/dig/dig.h#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/nslookup.1#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/nslookup.c#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/nslookup.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/nslookup.html#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-keygen.8#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-keygen.html#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signzone.8#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signzone.c#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signzone.html#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssectool.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/aclconf.c#4 delete .. //depot/projects/wifi/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/client.c#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/config.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/control.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/controlconf.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/aclconf.h#3 delete .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/client.h#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/config.h#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/control.h#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/globals.h#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/logconf.h#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/lwresd.h#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/server.h#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/sortlist.h#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/tkeyconf.h#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/tsigconf.h#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/zoneconf.h#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/log.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/logconf.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwdgabn.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwdgrbn.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwresd.8#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwresd.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwresd.html#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/main.c#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.8#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.conf.5#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.conf.docbook#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.conf.html#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.html#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/query.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/server.c#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/sortlist.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/tkeyconf.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/tsigconf.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/unix/include/named/os.h#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/unix/os.c#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/update.c#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/xfrout.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/zoneconf.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/nsupdate/nsupdate.8#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/nsupdate/nsupdate.c#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/nsupdate/nsupdate.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/nsupdate/nsupdate.html#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc-confgen.8#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc-confgen.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc-confgen.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc-confgen.html#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.8#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.c#5 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.conf.5#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.conf.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.conf.html#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.html#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/wifi/contrib/bind9/configure.in#5 integrate .. //depot/projects/wifi/contrib/bind9/doc/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM-book.xml#5 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch01.html#4 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch02.html#4 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch03.html#5 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch04.html#5 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch05.html#5 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch06.html#5 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch07.html#5 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch08.html#5 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch09.html#5 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.html#5 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.pdf#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/README-SGML#2 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/wifi/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/wifi/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/wifi/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/wifi/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/wifi/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/wifi/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/wifi/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/wifi/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/wifi/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/wifi/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/wifi/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 integrate .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#2 delete .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/doc/misc/dnssec#2 integrate .. //depot/projects/wifi/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/wifi/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/wifi/contrib/bind9/doc/misc/migration#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/misc/migration-4to9#2 integrate .. //depot/projects/wifi/contrib/bind9/doc/misc/options#4 integrate .. //depot/projects/wifi/contrib/bind9/doc/misc/rfc-compliance#2 integrate .. //depot/projects/wifi/contrib/bind9/doc/misc/roadmap#2 integrate .. //depot/projects/wifi/contrib/bind9/doc/misc/sdb#2 integrate .. //depot/projects/wifi/contrib/bind9/doc/rfc/index#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc4193.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc4255.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc4343.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc4367.txt#1 branch .. //depot/projects/wifi/contrib/bind9/doc/rfc/rfc4431.txt#1 branch .. //depot/projects/wifi/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/Makefile.in#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/api#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/daemon.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/ftruncate.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/mktemp.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/putenv.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/readv.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/setenv.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/setitimer.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/strdup.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/strpbrk.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/strsep.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/utimes.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/bsd/writev.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/configure#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/configure.in#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/dst_api.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/dst_internal.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/hmac_link.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/md5.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/md5_dgst.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/md5_locl.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/support.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/arpa/inet.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/fd_setsize.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/hesiod.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/irp.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/irs.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/isc/ctl.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/isc/dst.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/isc/eventlib.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/isc/heap.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/isc/list.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/isc/logging.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/isc/memcluster.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/isc/tree.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/netdb.h#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/netgroup.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/res_update.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/resolv.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_addr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_data.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_makeaddr.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_net_ntop.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_neta.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_netof.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_ntop.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_pton.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/nsap_addr.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/dns.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/dns_gr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/dns_ho.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/dns_nw.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/dns_p.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/dns_pr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/dns_pw.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/dns_sv.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gai_strerror.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gen.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gen_gr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gen_ho.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gen_ng.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gen_nw.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gen_p.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gen_pr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gen_pw.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gen_sv.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getaddrinfo.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getgrent.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getgrent_r.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gethostent.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gethostent_r.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getnameinfo.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getnetent.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getnetent_r.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getnetgrent_r.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getprotoent.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getprotoent_r.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getpwent.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getpwent_r.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getservent.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getservent_r.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/hesiod.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/hesiod_p.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irp.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irp_gr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irp_ho.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irp_ng.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irp_nw.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irp_p.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irp_pr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irp_pw.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irp_sv.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irpmarshall.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irs_data.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irs_data.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irs_p.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/lcl.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/lcl_gr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/lcl_ho.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/lcl_ng.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/lcl_nw.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/lcl_p.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/lcl_pr.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/lcl_pw.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/lcl_sv.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/nis.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/nis_gr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/nis_ho.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/nis_ng.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/nis_nw.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/nis_p.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/nis_pr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/nis_pw.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/nis_sv.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/nul_ng.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/pathnames.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/util.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/assertions.mdoc#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/base64.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/ctl_p.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/ctl_p.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/ev_connects.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/ev_files.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/ev_streams.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/ev_timers.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/ev_waits.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/eventlib.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/eventlib_p.h#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/heap.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/heap.mdoc#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/hex.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/logging.mdoc#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/logging_p.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/memcluster.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/movefile.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/tree.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/tree.mdoc#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/make/includes.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/make/rules.in#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/nameser/ns_date.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/nameser/ns_name.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/nameser/ns_netint.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/nameser/ns_parse.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/nameser/ns_print.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/nameser/ns_sign.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/nameser/ns_ttl.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/nameser/ns_verify.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/port_before.h.in#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/herror.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_comp.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_data.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_debug.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_debug.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_findzonecut.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_init.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_mkupdate.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_mkupdate.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_private.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_query.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_send.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_sendsigned.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_update.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/api#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/check.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/getaddresses.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/include/bind9/check.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/version.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/Makefile.in#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/acache.c#1 branch .. //depot/projects/wifi/contrib/bind9/lib/dns/acl.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/adb.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/api#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/byaddr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/cache.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/callbacks.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/compress.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/db.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/dbiterator.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/dbtable.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/diff.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/dispatch.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/dlz.c#1 branch .. //depot/projects/wifi/contrib/bind9/lib/dns/dnssec.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/ds.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/dst_api.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/dst_internal.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/dst_lib.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/dst_openssl.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/dst_result.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/forward.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/gen-unix.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/gen.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/gssapi_link.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/gssapictx.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/hmac_link.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/acache.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/acl.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/cache.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/compress.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/diff.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/dlz.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/events.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/forward.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/keytable.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/log.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/master.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/masterdump.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/message.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/name.h#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/order.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/peer.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/rbt.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/rdataset.h#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/request.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/resolver.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/result.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/sdlz.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/time.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/tsig.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/types.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/validator.h#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/version.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/view.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/xfrin.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/zone.h#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dst/result.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/journal.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/key.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/keytable.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/lib.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/log.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/lookup.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/masterdump.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/message.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/name.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/ncache.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/nsec.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/openssl_link.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/openssldh_link.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/openssldsa_link.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/opensslrsa_link.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/order.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/peer.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/portlist.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rbt.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rbtdb.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rbtdb.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rbtdb64.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rbtdb64.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rcode.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#1 branch .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/ds_43.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#1 branch .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/rt_21.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/spf_99.c#1 branch .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/spf_99.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdatalist.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdataset.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/resolver.c#7 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/result.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/sdlz.c#1 branch .. //depot/projects/wifi/contrib/bind9/lib/dns/soa.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/ssu.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/stats.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/tcpmsg.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/time.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/timer.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/tkey.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/tsig.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/ttl.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/validator.c#6 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/version.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/xfrin.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/zone.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/zonekey.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/zt.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/api#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/arm/include/isc/atomic.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/base64.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/bitstring.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/buffer.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/bufferlist.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/commandline.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/entropy.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/error.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/event.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/fsaccess.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/hash.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/heap.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/hex.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/hmacmd5.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/hmacsha.c#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/include/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/app.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/error.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/event.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/file.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/heap.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/hmacsha.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/list.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/log.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/mem.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/netaddr.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/os.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/parseint.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/print.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/quota.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/random.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/ratelimiter.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/refcount.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/region.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/result.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/resultclass.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/rwlock.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/serial.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/sha1.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/sha2.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/sockaddr.h#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/stdio.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/stdlib.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/symtab.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/task.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/taskpool.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/util.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/version.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/inet_aton.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/inet_ntop.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/inet_pton.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/lex.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/lfsr.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/lib.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/log.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/md5.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/mem.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/mips/include/isc/atomic.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/mutexblock.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/netaddr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/netscope.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/nls/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/nls/msgcat.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/nothreads/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/nothreads/condition.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/nothreads/include/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/nothreads/include/isc/condition.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/nothreads/include/isc/mutex.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/nothreads/include/isc/once.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/nothreads/include/isc/thread.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/nothreads/mutex.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/nothreads/thread.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/ondestroy.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/parseint.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/print.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/pthreads/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/pthreads/condition.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/pthreads/include/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/pthreads/include/isc/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/pthreads/include/isc/condition.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/pthreads/include/isc/mutex.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/pthreads/include/isc/once.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/pthreads/include/isc/thread.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/pthreads/mutex.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/pthreads/thread.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/quota.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/random.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/ratelimiter.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/refcount.c#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/region.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/result.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/rwlock.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/serial.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/sha1.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/sha2.c#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/sockaddr.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/string.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/strtoul.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/symtab.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/task.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/task_p.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/taskpool.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/timer.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/timer_p.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/app.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/dir.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/entropy.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/errno2result.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/errno2result.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/file.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/fsaccess.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/include/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/include/isc/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/include/isc/dir.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/include/isc/int.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/include/isc/keyboard.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/include/isc/net.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/include/isc/netdb.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/include/isc/offset.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/include/isc/stat.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/include/isc/stdtime.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/include/isc/strerror.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/include/isc/syslog.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/include/isc/time.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/interfaceiter.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/ipv6.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/keyboard.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/net.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/os.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/resource.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/socket.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/stdio.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/stdtime.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/strerror.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/syslog.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/time.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/version.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/x86_32/include/isc/atomic.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isc/x86_64/include/isc/atomic.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isccc/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/alist.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/api#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/base64.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/cc.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/ccmsg.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/include/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/include/isccc/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/include/isccc/alist.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/include/isccc/base64.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/include/isccc/cc.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/include/isccc/ccmsg.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/include/isccc/events.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/include/isccc/lib.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/include/isccc/result.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/include/isccc/sexpr.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/include/isccc/symtab.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/include/isccc/symtype.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/include/isccc/types.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/include/isccc/util.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/include/isccc/version.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/lib.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/result.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/sexpr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/symtab.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/version.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/aclconf.c#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isccfg/api#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/include/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/include/isccfg/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/include/isccfg/log.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/include/isccfg/namedconf.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/include/isccfg/version.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/log.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/namedconf.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/parser.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/version.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/api#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/assert_p.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/context.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/context_p.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/gai_strerror.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/getaddrinfo.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/gethost.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/getipnode.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/getnameinfo.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/getrrset.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/herror.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/lwres/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/lwres/context.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/lwres/int.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/lwres/ipv6.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/lwres/lang.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/lwres/list.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/lwres/lwbuffer.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/lwres/lwpacket.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/lwres/lwres.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/lwres/netdb.h.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/lwres/platform.h.in#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/lwres/result.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/lwres/stdlib.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/include/lwres/version.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/lwbuffer.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/lwconfig.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/lwinetaton.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/lwinetntop.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/lwinetpton.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/lwpacket.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/lwres_gabn.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/lwres_grbn.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/lwres_noop.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/lwresutil.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres.3#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres.html#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_buffer.3#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_buffer.html#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_config.3#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_config.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_config.html#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_context.3#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_context.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_context.html#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gabn.3#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gabn.html#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gethostent.3#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gethostent.html#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getipnode.3#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getipnode.html#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gnba.3#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gnba.html#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<<