From owner-p4-projects@FreeBSD.ORG Sun Mar 9 04:32:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48EBA1065675; Sun, 9 Mar 2008 04:32:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B148C1065671 for ; Sun, 9 Mar 2008 04:32:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A0EFD8FC19 for ; Sun, 9 Mar 2008 04:32:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m294W02u030601 for ; Sun, 9 Mar 2008 04:32:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m294W0r6030597 for perforce@freebsd.org; Sun, 9 Mar 2008 04:32:00 GMT (envelope-from jb@freebsd.org) Date: Sun, 9 Mar 2008 04:32:00 GMT Message-Id: <200803090432.m294W0r6030597@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 137202 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, 09 Mar 2008 04:32:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=137202 Change 137202 by jb@jb_freebsd8 on 2008/03/09 04:31:24 Fix a mis-merge. Affected files ... .. //depot/projects/dtrace/src/sys/sys/proc.h#36 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/proc.h#36 (text+ko) ==== @@ -163,6 +163,8 @@ struct trapframe; struct turnstile; struct mqueue_notifier; +struct kdtrace_proc; +struct kdtrace_thread; struct cpuset; /* @@ -302,6 +304,8 @@ struct kaudit_record *td_ar; /* (k) Active audit record, if any. */ int td_syscalls; /* per-thread syscall count (used by NFS :)) */ struct lpohead td_lprof[2]; /* (a) lock profiling objects. */ + struct kdtrace_thread *td_dtrace; /* (*) DTrace-specific data. */ + int td_errno; /* Error returned by last syscall. */ }; struct mtx *thread_lock_block(struct thread *); @@ -600,6 +604,7 @@ struct p_sched *p_sched; /* (*) Scheduler-specific data. */ STAILQ_HEAD(, ktr_request) p_ktr; /* (o) KTR event queue. */ LIST_HEAD(, mqueue_notifier) p_mqnotifier; /* (c) mqueue notifiers.*/ + struct kdtrace_proc *p_dtrace; /* (*) DTrace-specific data. */ }; #define p_session p_pgrp->pg_session From owner-p4-projects@FreeBSD.ORG Sun Mar 9 09:04:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CC791065672; Sun, 9 Mar 2008 09:04:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C6D6106566B for ; Sun, 9 Mar 2008 09:04:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 480308FC1F for ; Sun, 9 Mar 2008 09:04:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2994xTh072377 for ; Sun, 9 Mar 2008 09:04:59 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2994x1S072375 for perforce@freebsd.org; Sun, 9 Mar 2008 09:04:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 9 Mar 2008 09:04:59 GMT Message-Id: <200803090904.m2994x1S072375@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 137211 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, 09 Mar 2008 09:05:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=137211 Change 137211 by hselasky@hselasky_laptop001 on 2008/03/09 09:04:40 EHCI bugfix from Ivan Voras. See "usb/120017: CS5536 (AMD Geode) USB 2.0 quirk". PR: usb/120017 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#30 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#30 (text+ko) ==== @@ -150,6 +150,9 @@ if (device_id == 0x10227463) return "AMD 8111 USB 2.0 controller"; + if (device_id == 0x20951022) + return ("AMD CS5536 (Geode) USB 2.0 controller"); + if (device_id == 0x43451002) return "ATI SB200 USB 2.0 controller"; if (device_id == 0x43731002) @@ -235,9 +238,14 @@ case PCI_USBREV_PRE_1_0: case PCI_USBREV_1_0: case PCI_USBREV_1_1: - sc->sc_bus.usbrev = USBREV_UNKNOWN; - device_printf(self, "pre-2.0 USB rev\n"); - return (ENXIO); + /* + * NOTE: some EHCI USB controllers have the wrong USB + * revision number. It appears those controllers are + * fully compliant so we just ignore this value in + * some common cases. + */ + device_printf(self, "pre-2.0 USB revision (ignored)\n"); + /* fallthrough */ case PCI_USBREV_2_0: sc->sc_bus.usbrev = USBREV_2_0; break; From owner-p4-projects@FreeBSD.ORG Sun Mar 9 10:40:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01E071065675; Sun, 9 Mar 2008 10:40:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3D4B1065671 for ; Sun, 9 Mar 2008 10:40:38 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 92FA58FC18 for ; Sun, 9 Mar 2008 10:40:38 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m29AecrQ076553 for ; Sun, 9 Mar 2008 10:40:38 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29AecPQ076551 for perforce@freebsd.org; Sun, 9 Mar 2008 10:40:38 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 9 Mar 2008 10:40:38 GMT Message-Id: <200803091040.m29AecPQ076551@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 137213 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, 09 Mar 2008 10:40:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=137213 Change 137213 by sephe@sephe_zealot:sam_wifi on 2008/03/09 10:39:49 Only one TX sequence is needed for non-QOS frames, mgmt frames and mcast(addr1) QOS data frames. Pointed-out-by: sam Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2560.c#36 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#92 edit .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#81 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#67 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2560.c#36 (text) ==== @@ -1334,11 +1334,11 @@ ieee80211_beacon_update(data->ni, &sc->sc_bo, data->m, 1); - /* 2560 needs software to setup seuqence */ + /* 2560 needs software to setup beacon's sequence */ wh = mtod(data->m, struct ieee80211_frame *); *(uint16_t *)wh->i_seq = - htole16(ic->ic_txseqs[IEEE80211_NONQOS_TID] << IEEE80211_SEQ_SEQ_SHIFT); - ic->ic_txseqs[IEEE80211_NONQOS_TID]++; + htole16(ic->ic_txseq << IEEE80211_SEQ_SEQ_SHIFT); + ic->ic_txseq++; if (bpf_peers_present(ic->ic_rawbpf)) bpf_mtap(ic->ic_rawbpf, data->m); ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#92 (text+ko) ==== @@ -575,10 +575,11 @@ si->isi_txpower = ni->ni_txpower; si->isi_vlan = ni->ni_vlan; if (ni->ni_flags & IEEE80211_NODE_QOS) { - memcpy(si->isi_txseqs, ic->ic_txseqs, sizeof(ic->ic_txseqs)); memcpy(si->isi_rxseqs, ni->ni_rxseqs, sizeof(ni->ni_rxseqs)); + memcpy(si->isi_txseqs, ni->ni_txseqs, sizeof(ni->ni_txseqs)); + si->isi_txseqs[IEEE80211_NONQOS_TID] = ic->ic_txseq; } else { - si->isi_txseqs[0] = ic->ic_txseqs[IEEE80211_NONQOS_TID]; + si->isi_txseqs[0] = ic->ic_txseq; si->isi_rxseqs[0] = ni->ni_rxseqs[IEEE80211_NONQOS_TID]; } /* NB: leave all cases in case we relax ni_associd == 0 check */ ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#81 (text+ko) ==== @@ -141,8 +141,8 @@ *(uint16_t *)&wh->i_dur[0] = 0; /* NB: use non-QoS tid */ *(uint16_t *)&wh->i_seq[0] = - htole16(ic->ic_txseqs[IEEE80211_NONQOS_TID] << IEEE80211_SEQ_SEQ_SHIFT); - ic->ic_txseqs[IEEE80211_NONQOS_TID]++; + htole16(ic->ic_txseq << IEEE80211_SEQ_SEQ_SHIFT); + ic->ic_txseq++; #undef WH4 } @@ -770,6 +770,7 @@ if (addqos) { struct ieee80211_qosframe *qwh = (struct ieee80211_qosframe *) wh; + uint16_t txseq; int ac, tid; ac = M_WME_GETAC(m); @@ -810,13 +811,17 @@ qwh->i_qos[1] = 0; qwh->i_fc[0] |= IEEE80211_FC0_SUBTYPE_QOS; + if (IEEE80211_IS_MULTICAST(wh->i_addr1)) + txseq = ic->ic_txseq++; + else + txseq = ni->ni_txseqs[tid]++; + *(uint16_t *)wh->i_seq = - htole16(ic->ic_txseqs[tid] << IEEE80211_SEQ_SEQ_SHIFT); - ic->ic_txseqs[tid]++; + htole16(txseq << IEEE80211_SEQ_SEQ_SHIFT); } else { *(uint16_t *)wh->i_seq = - htole16(ic->ic_txseqs[IEEE80211_NONQOS_TID] << IEEE80211_SEQ_SEQ_SHIFT); - ic->ic_txseqs[IEEE80211_NONQOS_TID]++; + htole16(ic->ic_txseq << IEEE80211_SEQ_SEQ_SHIFT); + ic->ic_txseq++; } /* check if xmit fragmentation is required */ txfrag = (m->m_pkthdr.len > ic->ic_fragthreshold && ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#67 (text+ko) ==== @@ -222,8 +222,7 @@ int ic_inact_auth; /* auth but not assoc setting */ int ic_inact_run; /* authorized setting */ int ic_inact_probe; /* inactive probe time */ - /* tx seq per-tid */ - uint16_t ic_txseqs[IEEE80211_TID_SIZE]; + uint16_t ic_txseq; /* global tx seq */ /* * Cipher state/configuration. From owner-p4-projects@FreeBSD.ORG Sun Mar 9 16:57:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C75A1065675; Sun, 9 Mar 2008 16:57:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4C381065670 for ; Sun, 9 Mar 2008 16:57:16 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C7A8B8FC16 for ; Sun, 9 Mar 2008 16:57:16 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m29GvGmm041613 for ; Sun, 9 Mar 2008 16:57:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29GvGkW041611 for perforce@freebsd.org; Sun, 9 Mar 2008 16:57:16 GMT (envelope-from sam@freebsd.org) Date: Sun, 9 Mar 2008 16:57:16 GMT Message-Id: <200803091657.m29GvGkW041611@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 137233 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, 09 Mar 2008 16:57:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=137233 Change 137233 by sam@sam_ebb on 2008/03/09 16:56:47 IFC @ 137232 Affected files ... .. //depot/projects/vap/Makefile.inc1#7 integrate .. //depot/projects/vap/ObsoleteFiles.inc#6 integrate .. //depot/projects/vap/UPDATING#5 integrate .. //depot/projects/vap/bin/chflags/chflags.1#3 integrate .. //depot/projects/vap/bin/chflags/chflags.c#3 integrate .. //depot/projects/vap/bin/realpath/realpath.1#3 integrate .. //depot/projects/vap/bin/realpath/realpath.c#3 integrate .. //depot/projects/vap/contrib/bsnmp/snmpd/main.c#3 integrate .. //depot/projects/vap/etc/Makefile#3 integrate .. //depot/projects/vap/etc/ddb.conf#1 branch .. //depot/projects/vap/etc/defaults/rc.conf#5 integrate .. //depot/projects/vap/etc/rc.d/Makefile#4 integrate .. //depot/projects/vap/etc/rc.d/ddb#1 branch .. //depot/projects/vap/etc/rc.d/mountcritlocal#4 integrate .. //depot/projects/vap/etc/rc.d/mountlate#3 integrate .. //depot/projects/vap/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/vap/gnu/usr.bin/binutils/ar/Makefile#4 integrate .. //depot/projects/vap/gnu/usr.bin/binutils/ranlib/Makefile#4 integrate .. //depot/projects/vap/include/pthread_np.h#6 integrate .. //depot/projects/vap/lib/libc/posix1e/mac.c#3 integrate .. //depot/projects/vap/lib/libc/posix1e/mac_exec.c#3 integrate .. //depot/projects/vap/lib/libc/posix1e/mac_get.c#3 integrate .. //depot/projects/vap/lib/libc/posix1e/mac_set.c#3 integrate .. //depot/projects/vap/lib/libc/stdlib/malloc.c#5 integrate .. //depot/projects/vap/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/vap/lib/libc/sys/fcntl.2#3 integrate .. //depot/projects/vap/lib/libelf/elf_update.c#3 integrate .. //depot/projects/vap/lib/libelf/gelf_rel.c#3 integrate .. //depot/projects/vap/lib/libelf/gelf_rela.c#3 integrate .. //depot/projects/vap/lib/libthr/pthread.map#6 integrate .. //depot/projects/vap/lib/libthr/thread/Makefile.inc#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_affinity.c#1 branch .. //depot/projects/vap/lib/libthr/thread/thr_attr.c#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_create.c#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_exit.c#4 integrate .. //depot/projects/vap/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_private.h#4 integrate .. //depot/projects/vap/lib/libthr/thread/thr_sig.c#3 integrate .. //depot/projects/vap/lib/libutil/humanize_number.c#3 integrate .. //depot/projects/vap/lib/msun/Makefile#6 integrate .. //depot/projects/vap/lib/msun/Symbol.map#6 integrate .. //depot/projects/vap/lib/msun/amd64/Makefile.inc#5 integrate .. //depot/projects/vap/lib/msun/amd64/e_sqrtl.S#1 branch .. //depot/projects/vap/lib/msun/i387/Makefile.inc#4 integrate .. //depot/projects/vap/lib/msun/i387/e_sqrtl.S#1 branch .. //depot/projects/vap/lib/msun/ld128/s_nanl.c#2 integrate .. //depot/projects/vap/lib/msun/man/sqrt.3#4 integrate .. //depot/projects/vap/lib/msun/src/e_sqrt.c#3 integrate .. //depot/projects/vap/lib/msun/src/e_sqrtl.c#1 branch .. //depot/projects/vap/lib/msun/src/math.h#6 integrate .. //depot/projects/vap/rescue/rescue/Makefile#3 integrate .. //depot/projects/vap/sbin/ddb/ddb.8#2 integrate .. //depot/projects/vap/sbin/ddb/ddb.c#2 integrate .. //depot/projects/vap/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/vap/sbin/geom/Makefile#3 integrate .. //depot/projects/vap/sbin/geom/class/label/geom_label.c#3 integrate .. //depot/projects/vap/sbin/geom/class/multipath/gmultipath.8#3 integrate .. //depot/projects/vap/sbin/geom/core/geom.8#4 integrate .. //depot/projects/vap/sbin/geom/core/geom.c#4 integrate .. //depot/projects/vap/sbin/ifconfig/ifconfig.8#8 integrate .. //depot/projects/vap/sbin/newfs/mkfs.c#4 integrate .. //depot/projects/vap/secure/usr.bin/ssh/Makefile#3 integrate .. //depot/projects/vap/secure/usr.sbin/sshd/Makefile#3 integrate .. //depot/projects/vap/share/man/man3/Makefile#3 integrate .. //depot/projects/vap/share/man/man4/Makefile#7 integrate .. //depot/projects/vap/share/man/man4/cmx.4#1 branch .. //depot/projects/vap/share/man/man4/ddb.4#4 integrate .. //depot/projects/vap/share/man/man4/fwohci.4#3 integrate .. //depot/projects/vap/share/man/man4/ng_nat.4#3 integrate .. //depot/projects/vap/share/man/man4/uchcom.4#1 branch .. //depot/projects/vap/share/man/man4/ucom.4#3 integrate .. //depot/projects/vap/share/man/man4/ucycom.4#3 integrate .. //depot/projects/vap/share/man/man4/uslcom.4#1 branch .. //depot/projects/vap/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/vap/share/man/man9/DEVICE_PROBE.9#3 integrate .. //depot/projects/vap/share/man/man9/Makefile#6 integrate .. //depot/projects/vap/share/man/man9/bus_space.9#3 integrate .. //depot/projects/vap/share/man/man9/lock.9#7 integrate .. //depot/projects/vap/share/misc/committers-ports.dot#5 integrate .. //depot/projects/vap/share/mk/bsd.cpu.mk#4 integrate .. //depot/projects/vap/share/mk/sys.mk#3 integrate .. //depot/projects/vap/share/zoneinfo/leapseconds#4 integrate .. //depot/projects/vap/share/zoneinfo/southamerica#4 integrate .. //depot/projects/vap/sys/amd64/amd64/identcpu.c#8 integrate .. //depot/projects/vap/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/vap/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/vap/sys/amd64/include/pmap.h#6 integrate .. //depot/projects/vap/sys/amd64/include/smp.h#6 integrate .. //depot/projects/vap/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/vap/sys/arm/arm/uio_machdep.c#3 integrate .. //depot/projects/vap/sys/arm/conf/AVILA#4 integrate .. //depot/projects/vap/sys/arm/include/pmap.h#7 integrate .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_iic.c#3 integrate .. //depot/projects/vap/sys/boot/i386/pxeldr/pxeldr.S#5 integrate .. //depot/projects/vap/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/vap/sys/conf/NOTES#10 integrate .. //depot/projects/vap/sys/conf/files.powerpc#9 integrate .. //depot/projects/vap/sys/conf/kmod.mk#6 integrate .. //depot/projects/vap/sys/conf/options.powerpc#5 integrate .. //depot/projects/vap/sys/ddb/db_command.c#8 integrate .. //depot/projects/vap/sys/ddb/db_examine.c#5 integrate .. //depot/projects/vap/sys/ddb/db_input.c#4 integrate .. //depot/projects/vap/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/vap/sys/dev/agp/agp_nvidia.c#3 integrate .. //depot/projects/vap/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/vap/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/vap/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/vap/sys/dev/bge/if_bgereg.h#8 integrate .. //depot/projects/vap/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/vap/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/vap/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/vap/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/vap/sys/dev/em/LICENSE#5 integrate .. //depot/projects/vap/sys/dev/em/e1000_80003es2lan.c#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_80003es2lan.h#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_82540.c#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_82541.c#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_82541.h#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_82542.c#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_82543.c#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_82543.h#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_82571.c#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_82571.h#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_82575.c#3 delete .. //depot/projects/vap/sys/dev/em/e1000_82575.h#3 delete .. //depot/projects/vap/sys/dev/em/e1000_api.c#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_api.h#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_defines.h#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_hw.h#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_ich8lan.c#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_ich8lan.h#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_mac.c#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_mac.h#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_manage.c#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_manage.h#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_nvm.c#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_nvm.h#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_osdep.h#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_phy.c#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_phy.h#3 integrate .. //depot/projects/vap/sys/dev/em/e1000_regs.h#3 integrate .. //depot/projects/vap/sys/dev/em/if_em.c#6 integrate .. //depot/projects/vap/sys/dev/em/if_em.h#5 integrate .. //depot/projects/vap/sys/dev/hptrr/hptrr_os_bsd.c#3 integrate .. //depot/projects/vap/sys/dev/hptrr/hptrr_osm_bsd.c#4 integrate .. //depot/projects/vap/sys/dev/hptrr/ldm.h#3 integrate .. //depot/projects/vap/sys/dev/hptrr/osm.h#3 integrate .. //depot/projects/vap/sys/dev/ic/quicc.h#1 branch .. //depot/projects/vap/sys/dev/igb/e1000_82575.c#1 branch .. //depot/projects/vap/sys/dev/igb/e1000_82575.h#1 branch .. //depot/projects/vap/sys/dev/igb/e1000_api.c#1 branch .. //depot/projects/vap/sys/dev/igb/e1000_api.h#1 branch .. //depot/projects/vap/sys/dev/igb/e1000_defines.h#1 branch .. //depot/projects/vap/sys/dev/igb/e1000_hw.h#1 branch .. //depot/projects/vap/sys/dev/igb/e1000_mac.c#1 branch .. //depot/projects/vap/sys/dev/igb/e1000_mac.h#1 branch .. //depot/projects/vap/sys/dev/igb/e1000_manage.c#1 branch .. //depot/projects/vap/sys/dev/igb/e1000_manage.h#1 branch .. //depot/projects/vap/sys/dev/igb/e1000_nvm.c#1 branch .. //depot/projects/vap/sys/dev/igb/e1000_nvm.h#1 branch .. //depot/projects/vap/sys/dev/igb/e1000_osdep.h#1 branch .. //depot/projects/vap/sys/dev/igb/e1000_phy.c#1 branch .. //depot/projects/vap/sys/dev/igb/e1000_phy.h#1 branch .. //depot/projects/vap/sys/dev/igb/e1000_regs.h#1 branch .. //depot/projects/vap/sys/dev/igb/if_igb.c#1 branch .. //depot/projects/vap/sys/dev/igb/if_igb.h#1 branch .. //depot/projects/vap/sys/dev/lge/if_lge.c#7 integrate .. //depot/projects/vap/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/vap/sys/dev/mii/ciphy.c#5 integrate .. //depot/projects/vap/sys/dev/mii/miidevs#6 integrate .. //depot/projects/vap/sys/dev/mii/rgephy.c#5 integrate .. //depot/projects/vap/sys/dev/msk/if_msk.c#7 integrate .. //depot/projects/vap/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/vap/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/vap/sys/dev/nfe/if_nfevar.h#3 integrate .. //depot/projects/vap/sys/dev/pccard/pccarddevs#6 integrate .. //depot/projects/vap/sys/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/vap/sys/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/vap/sys/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/vap/sys/dev/quicc/quicc_core.c#1 branch .. //depot/projects/vap/sys/dev/re/if_re.c#8 integrate .. //depot/projects/vap/sys/dev/scc/scc_bfe.h#3 integrate .. //depot/projects/vap/sys/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/vap/sys/dev/scc/scc_bus.h#3 integrate .. //depot/projects/vap/sys/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/vap/sys/dev/tsec/if_tsec.c#1 branch .. //depot/projects/vap/sys/dev/tsec/if_tsec.h#1 branch .. //depot/projects/vap/sys/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/vap/sys/dev/uart/uart.h#5 integrate .. //depot/projects/vap/sys/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/vap/sys/dev/uart/uart_bus_scc.c#3 integrate .. //depot/projects/vap/sys/dev/uart/uart_cpu_powerpc.c#4 integrate .. //depot/projects/vap/sys/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/vap/sys/dev/usb/ehci.c#9 integrate .. //depot/projects/vap/sys/dev/usb/if_axe.c#6 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/vap/sys/dev/usb/uslcom.c#1 branch .. //depot/projects/vap/sys/fs/nwfs/nwfs_node.c#9 integrate .. //depot/projects/vap/sys/fs/nwfs/nwfs_subr.c#5 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs.h#3 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_node.c#9 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_vfsops.c#7 integrate .. //depot/projects/vap/sys/geom/part/g_part_mbr.c#4 integrate .. //depot/projects/vap/sys/geom/part/g_part_vtoc8.c#1 branch .. //depot/projects/vap/sys/i386/conf/GENERIC#10 integrate .. //depot/projects/vap/sys/i386/cpufreq/est.c#6 integrate .. //depot/projects/vap/sys/i386/i386/identcpu.c#8 integrate .. //depot/projects/vap/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/vap/sys/i386/include/_types.h#6 integrate .. //depot/projects/vap/sys/i386/include/float.h#3 integrate .. //depot/projects/vap/sys/i386/include/smp.h#6 integrate .. //depot/projects/vap/sys/ia64/ia64/mp_machdep.c#6 integrate .. //depot/projects/vap/sys/kern/init_main.c#7 integrate .. //depot/projects/vap/sys/kern/init_sysent.c#9 integrate .. //depot/projects/vap/sys/kern/kern_cpuset.c#1 branch .. //depot/projects/vap/sys/kern/kern_descrip.c#10 integrate .. //depot/projects/vap/sys/kern/kern_lock.c#10 integrate .. //depot/projects/vap/sys/kern/kern_priv.c#3 integrate .. //depot/projects/vap/sys/kern/kern_shutdown.c#9 integrate .. //depot/projects/vap/sys/kern/kern_sig.c#7 integrate .. //depot/projects/vap/sys/kern/kern_thread.c#7 integrate .. //depot/projects/vap/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/vap/sys/kern/sched_ule.c#8 integrate .. //depot/projects/vap/sys/kern/subr_bus.c#8 integrate .. //depot/projects/vap/sys/kern/subr_smp.c#7 integrate .. //depot/projects/vap/sys/kern/subr_witness.c#7 integrate .. //depot/projects/vap/sys/kern/syscalls.c#9 integrate .. //depot/projects/vap/sys/kern/syscalls.master#9 integrate .. //depot/projects/vap/sys/kern/systrace_args.c#6 integrate .. //depot/projects/vap/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/vap/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/vap/sys/modules/Makefile#15 integrate .. //depot/projects/vap/sys/modules/cmx/Makefile#1 branch .. //depot/projects/vap/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/vap/sys/modules/em/Makefile#5 integrate .. //depot/projects/vap/sys/modules/geom/Makefile#6 integrate .. //depot/projects/vap/sys/modules/geom/geom_apple/Makefile#3 delete .. //depot/projects/vap/sys/modules/geom/geom_gpt/Makefile#3 delete .. //depot/projects/vap/sys/modules/geom/geom_part/Makefile#1 branch .. //depot/projects/vap/sys/modules/igb/Makefile#1 branch .. //depot/projects/vap/sys/modules/ipfw_nat/Makefile#1 branch .. //depot/projects/vap/sys/modules/uslcom/Makefile#1 branch .. //depot/projects/vap/sys/modules/zfs/Makefile#4 integrate .. //depot/projects/vap/sys/net/if.c#7 integrate .. //depot/projects/vap/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/vap/sys/net/if_gif.c#6 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/vap/sys/netgraph/ng_ksocket.c#6 integrate .. //depot/projects/vap/sys/netgraph/ng_l2tp.c#6 integrate .. //depot/projects/vap/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/vap/sys/netgraph/ng_nat.h#3 integrate .. //depot/projects/vap/sys/netgraph/ng_pppoe.c#9 integrate .. //depot/projects/vap/sys/netinet/in.h#6 integrate .. //depot/projects/vap/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/vap/sys/netinet/ip_fw.h#7 integrate .. //depot/projects/vap/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/vap/sys/netinet/ip_fw_nat.c#1 branch .. //depot/projects/vap/sys/netinet/ip_fw_pfil.c#6 integrate .. //depot/projects/vap/sys/netinet/libalias/alias.c#5 integrate .. //depot/projects/vap/sys/netinet/libalias/alias_db.c#5 integrate .. //depot/projects/vap/sys/netinet/libalias/alias_ftp.c#5 integrate .. //depot/projects/vap/sys/netinet/libalias/alias_irc.c#5 integrate .. //depot/projects/vap/sys/netinet/libalias/alias_local.h#5 integrate .. //depot/projects/vap/sys/netinet/libalias/alias_proxy.c#5 integrate .. //depot/projects/vap/sys/netinet/libalias/alias_smedia.c#5 integrate .. //depot/projects/vap/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/vap/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/vap/sys/netipsec/key.c#5 integrate .. //depot/projects/vap/sys/netipsec/key_debug.c#5 integrate .. //depot/projects/vap/sys/netncp/ncp_conn.h#3 integrate .. //depot/projects/vap/sys/netsmb/smb_conn.h#3 integrate .. //depot/projects/vap/sys/nfs4client/nfs4_idmap.c#4 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/vap/sys/nfsserver/nfs_serv.c#7 integrate .. //depot/projects/vap/sys/pci/if_rl.c#6 integrate .. //depot/projects/vap/sys/pci/if_rlreg.h#7 integrate .. //depot/projects/vap/sys/powerpc/aim/locore.S#3 integrate .. //depot/projects/vap/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/vap/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/vap/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/vap/sys/powerpc/aim/trap_subr.S#2 integrate .. //depot/projects/vap/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/vap/sys/powerpc/booke/clock.c#1 branch .. //depot/projects/vap/sys/powerpc/booke/copyinout.c#1 branch .. //depot/projects/vap/sys/powerpc/booke/interrupt.c#1 branch .. //depot/projects/vap/sys/powerpc/booke/locore.S#1 branch .. //depot/projects/vap/sys/powerpc/booke/machdep.c#1 branch .. //depot/projects/vap/sys/powerpc/booke/pmap.c#1 branch .. //depot/projects/vap/sys/powerpc/booke/support.S#1 branch .. //depot/projects/vap/sys/powerpc/booke/swtch.S#1 branch .. //depot/projects/vap/sys/powerpc/booke/trap.c#1 branch .. //depot/projects/vap/sys/powerpc/booke/trap_subr.S#1 branch .. //depot/projects/vap/sys/powerpc/booke/uio_machdep.c#1 branch .. //depot/projects/vap/sys/powerpc/booke/vm_machdep.c#1 branch .. //depot/projects/vap/sys/powerpc/conf/MPC85XX#1 branch .. //depot/projects/vap/sys/powerpc/conf/NOTES#6 integrate .. //depot/projects/vap/sys/powerpc/include/frame.h#5 integrate .. //depot/projects/vap/sys/powerpc/include/hid.h#5 integrate .. //depot/projects/vap/sys/powerpc/include/intr_machdep.h#6 integrate .. //depot/projects/vap/sys/powerpc/include/kdb.h#5 integrate .. //depot/projects/vap/sys/powerpc/include/md_var.h#5 integrate .. //depot/projects/vap/sys/powerpc/include/mmuvar.h#3 integrate .. //depot/projects/vap/sys/powerpc/include/ocpbus.h#1 branch .. //depot/projects/vap/sys/powerpc/include/openpicvar.h#6 integrate .. //depot/projects/vap/sys/powerpc/include/pcb.h#5 integrate .. //depot/projects/vap/sys/powerpc/include/pcpu.h#5 integrate .. //depot/projects/vap/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/vap/sys/powerpc/include/psl.h#3 integrate .. //depot/projects/vap/sys/powerpc/include/pte.h#5 integrate .. //depot/projects/vap/sys/powerpc/include/sf_buf.h#3 integrate .. //depot/projects/vap/sys/powerpc/include/spr.h#5 integrate .. //depot/projects/vap/sys/powerpc/include/tlb.h#1 branch .. //depot/projects/vap/sys/powerpc/include/trap.h#5 integrate .. //depot/projects/vap/sys/powerpc/include/trap_aim.h#1 branch .. //depot/projects/vap/sys/powerpc/include/trap_booke.h#1 branch .. //depot/projects/vap/sys/powerpc/include/vmparam.h#6 integrate .. //depot/projects/vap/sys/powerpc/mpc85xx/nexus.c#1 branch .. //depot/projects/vap/sys/powerpc/mpc85xx/ocpbus.c#1 branch .. //depot/projects/vap/sys/powerpc/mpc85xx/ocpbus.h#1 branch .. //depot/projects/vap/sys/powerpc/mpc85xx/opic.c#1 branch .. //depot/projects/vap/sys/powerpc/mpc85xx/pci_ocp.c#1 branch .. //depot/projects/vap/sys/powerpc/powermac/openpic_macio.c#6 integrate .. //depot/projects/vap/sys/powerpc/powerpc/autoconf.c#6 integrate .. //depot/projects/vap/sys/powerpc/powerpc/cpu.c#7 integrate .. //depot/projects/vap/sys/powerpc/powerpc/db_trace.c#6 integrate .. //depot/projects/vap/sys/powerpc/powerpc/gdb_machdep.c#3 integrate .. //depot/projects/vap/sys/powerpc/powerpc/genassym.c#6 integrate .. //depot/projects/vap/sys/powerpc/powerpc/intr_machdep.c#6 integrate .. //depot/projects/vap/sys/powerpc/powerpc/mp_machdep.c#5 integrate .. //depot/projects/vap/sys/powerpc/powerpc/openpic.c#6 integrate .. //depot/projects/vap/sys/powerpc/powerpc/pic_if.m#6 integrate .. //depot/projects/vap/sys/powerpc/psim/openpic_iobus.c#6 integrate .. //depot/projects/vap/sys/security/audit/audit.c#6 integrate .. //depot/projects/vap/sys/security/audit/audit_bsm_klib.c#5 integrate .. //depot/projects/vap/sys/security/audit/audit_private.h#4 integrate .. //depot/projects/vap/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/vap/sys/security/audit/audit_trigger.c#3 integrate .. //depot/projects/vap/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/vap/sys/sparc64/include/tlb.h#3 integrate .. //depot/projects/vap/sys/sparc64/sparc64/cache.c#3 integrate .. //depot/projects/vap/sys/sparc64/sparc64/cheetah.c#3 integrate .. //depot/projects/vap/sys/sparc64/sparc64/mp_machdep.c#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/vap/sys/sparc64/sparc64/spitfire.c#3 integrate .. //depot/projects/vap/sys/sparc64/sparc64/tlb.c#3 integrate .. //depot/projects/vap/sys/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/vap/sys/sys/_types.h#6 integrate .. //depot/projects/vap/sys/sys/buf.h#10 integrate .. //depot/projects/vap/sys/sys/bufobj.h#6 integrate .. //depot/projects/vap/sys/sys/bus.h#7 integrate .. //depot/projects/vap/sys/sys/cpuset.h#1 branch .. //depot/projects/vap/sys/sys/fcntl.h#4 integrate .. //depot/projects/vap/sys/sys/lockmgr.h#10 integrate .. //depot/projects/vap/sys/sys/mount.h#6 integrate .. //depot/projects/vap/sys/sys/param.h#11 integrate .. //depot/projects/vap/sys/sys/pcpu.h#7 integrate .. //depot/projects/vap/sys/sys/proc.h#9 integrate .. //depot/projects/vap/sys/sys/sched.h#6 integrate .. //depot/projects/vap/sys/sys/smp.h#6 integrate .. //depot/projects/vap/sys/sys/syscall.h#9 integrate .. //depot/projects/vap/sys/sys/syscall.mk#9 integrate .. //depot/projects/vap/sys/sys/sysproto.h#9 integrate .. //depot/projects/vap/sys/sys/types.h#6 integrate .. //depot/projects/vap/sys/sys/vnode.h#8 integrate .. //depot/projects/vap/sys/sys/vtoc.h#1 branch .. //depot/projects/vap/sys/ufs/ffs/ffs_vfsops.c#9 integrate .. //depot/projects/vap/sys/ufs/ufs/extattr.h#6 integrate .. //depot/projects/vap/sys/ufs/ufs/ufs_extattr.c#8 integrate .. //depot/projects/vap/sys/vm/vm_fault.c#7 integrate .. //depot/projects/vap/sys/vm/vm_map.h#5 integrate .. //depot/projects/vap/tools/build/mk/OptionalObsoleteFiles.inc#5 integrate .. //depot/projects/vap/tools/regression/environ/envctl.c#3 integrate .. //depot/projects/vap/tools/regression/file/dup/dup.c#3 integrate .. //depot/projects/vap/tools/regression/lib/msun/test-trig.c#2 integrate .. //depot/projects/vap/tools/tools/tinybsd/tinybsd#3 integrate .. //depot/projects/vap/usr.bin/Makefile#5 integrate .. //depot/projects/vap/usr.bin/ar/write.c#2 integrate .. //depot/projects/vap/usr.bin/calendar/calendars/calendar.freebsd#6 integrate .. //depot/projects/vap/usr.bin/chat/chat.c#3 integrate .. //depot/projects/vap/usr.bin/cpuset/Makefile#1 branch .. //depot/projects/vap/usr.bin/cpuset/cpuset.1#1 branch .. //depot/projects/vap/usr.bin/cpuset/cpuset.c#1 branch .. //depot/projects/vap/usr.bin/find/find.1#4 integrate .. //depot/projects/vap/usr.bin/find/main.c#3 integrate .. //depot/projects/vap/usr.bin/gzip/gzip.c#3 integrate .. //depot/projects/vap/usr.bin/make/Makefile#3 integrate .. //depot/projects/vap/usr.bin/make/Makefile.dist#4 integrate .. //depot/projects/vap/usr.bin/make/arch.c#3 integrate .. //depot/projects/vap/usr.bin/make/job.c#3 integrate .. //depot/projects/vap/usr.bin/make/main.c#3 integrate .. //depot/projects/vap/usr.bin/make/make.1#3 integrate .. //depot/projects/vap/usr.bin/unifdef/unifdef.c#4 integrate .. //depot/projects/vap/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#3 integrate .. //depot/projects/vap/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#3 integrate .. //depot/projects/vap/usr.sbin/fwcontrol/fwcontrol.8#3 integrate .. //depot/projects/vap/usr.sbin/fwcontrol/fwcontrol.c#3 integrate .. //depot/projects/vap/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/vap/usr.sbin/moused/Makefile#3 integrate .. //depot/projects/vap/usr.sbin/moused/moused.c#3 integrate Differences ... ==== //depot/projects/vap/Makefile.inc1#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.600 2008/02/25 16:29:54 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -203,6 +203,9 @@ GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac +.if ${OSRELDATE} < 700044 +CROSSENV+= AR=gnu-ar RANLIB=gnu-ranlib +.endif # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -972,10 +975,6 @@ .endif .endif -.if make(cross-tools) && ${BOOTSTRAPPING} < 700044 -.MAKEFLAGS+= -D_WITH_GNUAR -.endif - cross-tools: .for _tool in \ gnu/usr.bin/binutils \ ==== //depot/projects/vap/ObsoleteFiles.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -32,6 +32,11 @@ OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libkse.a +OLD_FILES+=usr/lib32/libkse_p.a +OLD_FILES+=usr/lib32/libkse_pic.a +.endif .endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h @@ -134,6 +139,12 @@ OLD_DIRS+=usr/include/netatm/uni OLD_DIRS+=usr/include/netatm OLD_DIRS+=usr/share/examples/atm +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libatm.a +OLD_FILES+=usr/lib32/libatm.so +OLD_LIBS+=usr/lib32/libatm.so.5 +OLD_FILES+=usr/lib32/libatm_p.a +.endif # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -224,6 +235,42 @@ OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libalias.so.5 +OLD_LIBS+=usr/lib32/libbsnmp.so.3 +OLD_LIBS+=usr/lib32/libdialog.so.5 +OLD_LIBS+=usr/lib32/libgnuregex.so.3 +OLD_LIBS+=usr/lib32/libhistory.so.6 +OLD_LIBS+=usr/lib32/libncurses.so.6 +OLD_LIBS+=usr/lib32/libncursesw.so.6 +OLD_LIBS+=usr/lib32/libpam.so.3 +OLD_LIBS+=usr/lib32/libreadline.so.6 +OLD_LIBS+=usr/lib32/libssh.so.3 +OLD_LIBS+=usr/lib32/pam_chroot.so.3 +OLD_LIBS+=usr/lib32/pam_deny.so.3 +OLD_LIBS+=usr/lib32/pam_echo.so.3 +OLD_LIBS+=usr/lib32/pam_exec.so.3 +OLD_LIBS+=usr/lib32/pam_ftpusers.so.3 +OLD_LIBS+=usr/lib32/pam_group.so.3 +OLD_LIBS+=usr/lib32/pam_guest.so.3 +OLD_LIBS+=usr/lib32/pam_krb5.so.3 +OLD_LIBS+=usr/lib32/pam_ksu.so.3 +OLD_LIBS+=usr/lib32/pam_lastlog.so.3 +OLD_LIBS+=usr/lib32/pam_login_access.so.3 +OLD_LIBS+=usr/lib32/pam_nologin.so.3 +OLD_LIBS+=usr/lib32/pam_opie.so.3 +OLD_LIBS+=usr/lib32/pam_opieaccess.so.3 +OLD_LIBS+=usr/lib32/pam_passwdqc.so.3 +OLD_LIBS+=usr/lib32/pam_permit.so.3 +OLD_LIBS+=usr/lib32/pam_radius.so.3 +OLD_LIBS+=usr/lib32/pam_rhosts.so.3 +OLD_LIBS+=usr/lib32/pam_rootok.so.3 +OLD_LIBS+=usr/lib32/pam_securetty.so.3 +OLD_LIBS+=usr/lib32/pam_self.so.3 +OLD_LIBS+=usr/lib32/pam_ssh.so.3 +OLD_LIBS+=usr/lib32/pam_tacplus.so.3 +OLD_LIBS+=usr/lib32/pam_unix.so.3 +.endif # 20070613: IPX over IP tunnel removal OLD_FILES+=usr/include/netipx/ipx_ip.h # 20070605: sched_core removal @@ -603,6 +650,9 @@ OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=usr/lib/libarchive.so.3 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libarchive.so.3 +.endif # 20070301: remove addr2ascii and ascii2addr OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz ==== //depot/projects/vap/UPDATING#5 (text+ko) ==== @@ -22,6 +22,20 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080301: + The layout of struct vmspace has changed. This affects libkvm + and any executables that link against libkvm and use the + kvm_getprocs() function. In particular, but not exclusively, + it affects ps(1), fstat(1), pkill(1), systat(1), top(1) and w(1). + The effects are minimal, but it's advisable to upgrade world + nonetheless. + +20080229: + The latest em driver no longer has support in it for the + 82575 adapter, this is now moved to the igb driver. The + split was done to make new features that are incompatible + with older hardware easier to do. + 20080220: The new geom_lvm(4) geom class has been renamed to geom_linux_lvm(4), likewise the kernel option is now GEOM_LINUX_LVM. @@ -983,4 +997,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.520 2008/02/20 07:50:12 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ ==== //depot/projects/vap/bin/chflags/chflags.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.30 2008/03/09 12:10:24 rwatson Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -40,7 +40,7 @@ .Nd change file flags .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl fhv .Oo .Fl R .Op Fl H | Fl L | Fl P @@ -57,6 +57,12 @@ .Pp The options are as follows: .Bl -tag -width indent +.It Fl f +Do not display a diagnostic message if +.Nm +could not modify the flags for +.Va file , +nor modify the exit status to reflect such failures. .It Fl H If the .Fl R @@ -79,6 +85,14 @@ .It Fl R Change the file flags for the file hierarchies rooted in the files instead of just the files themselves. +.It Fl v +Cause +.Nm +to be verbose, showing filenames as the flags are modified. +If the +.Fl v +option is specified more than once, the old and new flags of the file +will also be printed, in octal notation. .El .Pp The flags are specified as an octal number or a comma separated list ==== //depot/projects/vap/bin/chflags/chflags.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.24 2008/03/09 12:10:24 rwatson Exp $"); #include #include @@ -60,14 +60,15 @@ { FTS *ftsp; FTSENT *p; - u_long clear, set; + u_long clear, newflags, set; long val; - int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval; + int Hflag, Lflag, Rflag, fflag, hflag, vflag; + int ch, fts_options, oct, rval; char *flags, *ep; int (*change_flags)(const char *, unsigned long); - Hflag = Lflag = Rflag = hflag = 0; - while ((ch = getopt(argc, argv, "HLPRh")) != -1) + Hflag = Lflag = Rflag = fflag = hflag = vflag = 0; + while ((ch = getopt(argc, argv, "HLPRfhv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -83,9 +84,15 @@ case 'R': Rflag = 1; break; + case 'f': + fflag = 1; + break; case 'h': hflag = 1; break; + case 'v': + vflag++; + break; case '?': default: usage(); @@ -166,18 +173,23 @@ default: break; } - if (oct) { - if (!(*change_flags)(p->fts_accpath, set)) - continue; - } else { - p->fts_statp->st_flags |= set; - p->fts_statp->st_flags &= clear; - if (!(*change_flags)(p->fts_accpath, - (u_long)p->fts_statp->st_flags)) - continue; + if (oct) + newflags = set; + else + newflags = (p->fts_statp->st_flags | set) & clear; + if (newflags == p->fts_statp->st_flags) + continue; + if ((*change_flags)(p->fts_accpath, newflags) && !fflag) { + warn("%s", p->fts_path); + rval = 1; + } else if (vflag) { + (void)printf("%s", p->fts_path); + if (vflag > 1) + (void)printf(": 0%lo -> 0%lo", + (u_long)p->fts_statp->st_flags, + newflags); + (void)printf("\n"); } - warn("%s", p->fts_path); - rval = 1; } if (errno) err(1, "fts_read"); @@ -188,6 +200,6 @@ usage(void) { (void)fprintf(stderr, - "usage: chflags [-h] [-R [-H | -L | -P]] flags file ...\n"); + "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n"); exit(1); } ==== //depot/projects/vap/bin/realpath/realpath.1#3 (text+ko) ==== @@ -31,7 +31,7 @@ .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp -.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.11 2008/03/09 12:46:39 rwatson Exp $ .\" .Dd November 24, 2000 .Dt REALPATH 1 @@ -41,7 +41,9 @@ .Nd return resolved physical path .Sh SYNOPSIS .Nm +.Op Fl q .Ar path +.Op Ar ... .Sh DESCRIPTION The .Nm @@ -55,6 +57,12 @@ .Pa /../ in .Ar path . +.Pp +If +.Fl q +is specified, warnings will not be printed when +.Xr realpath 3 +fails. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO ==== //depot/projects/vap/bin/realpath/realpath.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6 2004/04/06 20:06:50 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.7 2008/03/09 12:46:39 rwatson Exp $"); #include @@ -44,20 +44,39 @@ { char buf[PATH_MAX]; char *p; + int ch, i, qflag, rval; - if (argc == 2) { - if ((p = realpath(argv[1], buf)) == NULL) - err(1, "%s", buf); - } else + qflag = 0; + while ((ch = getopt(argc, argv, "q")) != -1) { + switch (ch) { + case 'q': + qflag = 1; + break; + case '?': + default: + usage(); + } + } + argc -= optind; + argv += optind; + if (argc < 1) usage(); - (void)printf("%s\n", p); - exit(0); + rval = 0; + for (i = 0; i < argc; i++) { + if ((p = realpath(argv[i], buf)) == NULL) { + if (!qflag) + warn("%s", argv[i]); + rval = 1; + } else + (void)printf("%s\n", p); + } + exit(rval); } static void usage(void) { - (void)fprintf(stderr, "usage: realpath path\n"); + (void)fprintf(stderr, "usage: realpath [-q] path [...]\n"); exit(1); } ==== //depot/projects/vap/contrib/bsnmp/snmpd/main.c#3 (text+ko) ==== @@ -2242,6 +2242,8 @@ return (m); err: + if ((m->flags & LM_ONSTARTLIST) != 0) + TAILQ_REMOVE(&modules_start, m, start); if (m->handle) dlclose(m->handle); free(m->path); ==== //depot/projects/vap/etc/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.365 2007/11/11 01:16:51 mlaier Exp $ +# $FreeBSD: src/etc/Makefile,v 1.366 2008/03/05 18:32:58 brooks Exp $ .include @@ -9,7 +9,7 @@ BIN1= amd.map apmd.conf auth.conf \ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ - dhclient.conf disktab fbtab freebsd-update.conf \ + ddb.conf dhclient.conf disktab fbtab freebsd-update.conf \ ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf libalias.conf login.access login.conf mac.conf motd \ ==== //depot/projects/vap/etc/defaults/rc.conf#5 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.326 2008/01/27 15:15:11 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -33,6 +33,8 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). +ddb_enable="NO" # Set to YES to load ddb scripts at boot. +ddb_config="/etc/ddb.conf" # ddb(8) config file. devd_enable="YES" # Run devd, to trigger programs on device tree changes. devd_flags="" # Additional flags for devd(8). kldxref_enable="NO" # Build linker.hints files with kldxref(8). @@ -249,7 +251,7 @@ rwhod_enable="NO" # Run the rwho daemon (or NO). rwhod_flags="" # Flags for rwhod rarpd_enable="NO" # Run rarpd (or NO). -rarpd_flags="" # Flags to rarpd. +rarpd_flags="-a" # Flags to rarpd. bootparamd_enable="NO" # Run bootparamd (or NO). bootparamd_flags="" # Flags to bootparamd pppoed_enable="NO" # Run the PPP over Ethernet daemon. ==== //depot/projects/vap/etc/rc.d/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.88 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ .include @@ -7,7 +7,7 @@ apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ccd cleanvar cleartmp cron \ - devd devfs dhclient \ + ddb devd devfs dhclient \ dmesg dumpon \ early.sh encswap \ fsck ftp-proxy ftpd \ ==== //depot/projects/vap/etc/rc.d/mountcritlocal#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.15 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.16 2008/03/06 14:39:33 mtm Exp $ # # PROVIDE: mountcritlocal @@ -15,6 +15,8 @@ mountcritlocal_start() { + local err + # Set up the list of network filesystem types for which mounting # should be delayed until after network initialization. case ${extra_netfs_types} in @@ -34,9 +36,10 @@ done mount_excludes=${mount_excludes%,} mount -a -t ${mount_excludes} + err=$? echo '.' - case $? in + case ${err} in 0) ;; *) ==== //depot/projects/vap/etc/rc.d/mountlate#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.2 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.3 2008/03/06 14:39:33 mtm Exp $ # # PROVIDE: mountlate @@ -16,12 +16,15 @@ mountlate_start() { + local err + # Mount "late" filesystems. echo -n 'Mounting late file systems:' mount -a -l + err=$? echo '.' - case $? in + case ${err} in 0) ;; *) ==== //depot/projects/vap/games/fortune/datfiles/fortunes#5 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.257 2008/02/28 15:16:24 yar Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.258 2008/03/03 10:06:52 dds Exp $ % ======================================================================= || || @@ -49242,7 +49242,7 @@ admit it, I tell him, `Forget it'. If they bring a car back late we overlook it. If they've had a crash and it doesn't involve another vehicle we might overlook that too." - "Where's the ashtray?" asked on Los Angeles wife, as she settled + "Where's the ashtray?" asked one Los Angeles wife, as she settled into the ripped interior. "Honey," said her husband, "the whole car's the ash tray." -- Stephen Pile, "The Book of Heroic Failures" ==== //depot/projects/vap/gnu/usr.bin/binutils/ar/Makefile#4 (text+ko) ==== @@ -1,16 +1,14 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.17 2008/02/25 16:16:16 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.18 2008/03/02 11:10:46 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc -.if !defined(_WITH_GNUAR) PROGNAME= gnu-ar MAN= gnu-ar.1 gnu-ar.1: ar.1 cat ${.ALLSRC} > ${.TARGET} CLEANFILES+= gnu-ar.1 -.endif PROG= ar SRCS= ar.c not-ranlib.c ==== //depot/projects/vap/gnu/usr.bin/binutils/ranlib/Makefile#4 (text+ko) ==== @@ -1,16 +1,14 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.18 2008/02/25 16:16:16 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ranlib/Makefile,v 1.19 2008/03/02 11:10:46 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc -.if !defined(_WITH_GNUAR) PROGNAME= gnu-ranlib MAN= gnu-ranlib.1 gnu-ranlib.1: ranlib.1 cat ${.ALLSRC} > ${.TARGET} CLEANFILES+= gnu-ranlib.1 -.endif PROG= ranlib SRCS= ar.c is-ranlib.c ==== //depot/projects/vap/include/pthread_np.h#6 (text+ko) ==== @@ -26,11 +26,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread_np.h,v 1.20 2008/02/06 19:34:31 des Exp $ + * $FreeBSD: src/include/pthread_np.h,v 1.21 2008/03/03 08:28:13 davidxu Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 9 16:59:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77ED51065673; Sun, 9 Mar 2008 16:59:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C65A106566B for ; Sun, 9 Mar 2008 16:59:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 013D08FC18 for ; Sun, 9 Mar 2008 16:59:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m29GxICp041663 for ; Sun, 9 Mar 2008 16:59:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29GxIfs041661 for perforce@freebsd.org; Sun, 9 Mar 2008 16:59:18 GMT (envelope-from sam@freebsd.org) Date: Sun, 9 Mar 2008 16:59:18 GMT Message-Id: <200803091659.m29GxIfs041661@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 137234 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, 09 Mar 2008 16:59:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=137234 Change 137234 by sam@sam_ebb on 2008/03/09 16:58:33 IFC Affected files ... .. //depot/projects/vap/sys/conf/files#22 edit .. //depot/projects/vap/sys/conf/options#13 edit Differences ... ==== //depot/projects/vap/sys/conf/files#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1270 2008/02/26 03:02:20 kmacy Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1278 2008/03/06 08:09:44 rink Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -511,6 +511,8 @@ dev/cardbus/cardbus_device.c optional cardbus dev/ciss/ciss.c optional ciss dev/cm/smc90cx6.c optional cm +dev/cmx/cmx.c optional cmx +dev/cmx/cmx_pccard.c optional cmx pccard dev/cnw/if_cnw.c optional cnw pccard dev/cpufreq/ichss.c optional cpufreq dev/cs/if_cs.c optional cs @@ -625,8 +627,6 @@ compile-with "${NORMAL_C} -I$S/dev/em" dev/em/e1000_82571.c optional em \ compile-with "${NORMAL_C} -I$S/dev/em" -dev/em/e1000_82575.c optional em \ - compile-with "${NORMAL_C} -I$S/dev/em" dev/em/e1000_api.c optional em \ compile-with "${NORMAL_C} -I$S/dev/em" dev/em/e1000_ich8lan.c optional em \ @@ -711,6 +711,20 @@ dev/ieee488/pcii.c optional pcii dev/ieee488/tnt4882.c optional tnt4882 dev/ieee488/upd7210.c optional pcii | tnt4882 +dev/igb/if_igb.c optional igb \ + compile-with "${NORMAL_C} -I$S/dev/igb" +dev/igb/e1000_82575.c optional igb \ + compile-with "${NORMAL_C} -I$S/dev/igb" +dev/igb/e1000_api.c optional igb \ + compile-with "${NORMAL_C} -I$S/dev/igb" +dev/igb/e1000_mac.c optional igb \ + compile-with "${NORMAL_C} -I$S/dev/igb" +dev/igb/e1000_manage.c optional igb \ + compile-with "${NORMAL_C} -I$S/dev/igb" +dev/igb/e1000_nvm.c optional igb \ + compile-with "${NORMAL_C} -I$S/dev/igb" +dev/igb/e1000_phy.c optional igb \ + compile-with "${NORMAL_C} -I$S/dev/igb" dev/iicbus/ad7418.c optional ad7418 dev/iicbus/ds1672.c optional ds1672 dev/iicbus/icee.c optional icee @@ -919,6 +933,7 @@ dev/puc/puc_pccard.c optional puc pccard dev/puc/puc_pci.c optional puc pci dev/puc/pucdata.c optional puc pci +dev/quicc/quicc_core.c optional quicc dev/ral/rt2560.c optional ral dev/ral/rt2661.c optional ral dev/ral/if_ral_pci.c optional ral pci @@ -939,8 +954,10 @@ dev/sbsh/if_sbsh.c optional sbsh dev/scc/scc_if.m optional scc dev/scc/scc_bfe_ebus.c optional scc ebus +dev/scc/scc_bfe_quicc.c optional scc quicc dev/scc/scc_bfe_sbus.c optional scc fhc | scc sbus dev/scc/scc_core.c optional scc +dev/scc/scc_dev_quicc.c optional scc quicc dev/scc/scc_dev_sab82532.c optional scc dev/scc/scc_dev_z8530.c optional scc dev/scd/scd.c optional scd isa @@ -1103,6 +1120,7 @@ dev/uart/uart_core.c optional uart dev/uart/uart_dbg.c optional uart gdb dev/uart/uart_dev_ns8250.c optional uart uart_ns8250 +dev/uart/uart_dev_quicc.c optional uart quicc dev/uart/uart_dev_sab82532.c optional uart uart_sab82532 dev/uart/uart_dev_sab82532.c optional uart scc dev/uart/uart_dev_z8530.c optional uart uart_z8530 @@ -1162,6 +1180,7 @@ dev/usb/usbdi.c optional usb dev/usb/usbdi_util.c optional usb dev/usb/uscanner.c optional uscanner +dev/usb/uslcom.c optional uslcom dev/usb/uvisor.c optional uvisor dev/usb/uvscom.c optional uvscom dev/utopia/idtphy.c optional utopia @@ -1316,6 +1335,7 @@ geom/part/g_part_bsd.c optional geom_part_bsd geom/part/g_part_gpt.c optional geom_part_gpt geom/part/g_part_mbr.c optional geom_part_mbr +geom/part/g_part_vtoc8.c optional geom_part_vtoc8 geom/raid3/g_raid3.c optional geom_raid3 geom/raid3/g_raid3_ctl.c optional geom_raid3 geom/shsec/g_shsec.c optional geom_shsec @@ -1433,6 +1453,7 @@ kern/kern_condvar.c standard kern/kern_conf.c standard kern/kern_cpu.c standard +kern/kern_cpuset.c standard kern/kern_context.c standard kern/kern_descrip.c standard kern/kern_environment.c standard @@ -1888,6 +1909,7 @@ netinet/ip_fw2.c optional ipfirewall \ compile-with "${NORMAL_C} -I$S/contrib/pf" netinet/ip_fw_pfil.c optional ipfirewall +netinet/ip_fw_nat.c optional ipfirewall_nat netinet/ip_icmp.c optional inet netinet/ip_input.c optional inet netinet/ip_ipsec.c optional ipsec ==== //depot/projects/vap/sys/conf/options#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.618 2008/02/20 07:50:13 thompsa Exp $ +# $FreeBSD: src/sys/conf/options,v 1.619 2008/03/02 00:52:49 marcel Exp $ # # On the handling of kernel options # @@ -94,6 +94,7 @@ GEOM_PART_BSD opt_geom.h GEOM_PART_GPT opt_geom.h GEOM_PART_MBR opt_geom.h +GEOM_PART_VTOC8 opt_geom.h GEOM_PC98 opt_geom.h GEOM_RAID3 opt_geom.h GEOM_SHSEC opt_geom.h From owner-p4-projects@FreeBSD.ORG Sun Mar 9 18:17:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 349281065672; Sun, 9 Mar 2008 18:17:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E69CB1065670 for ; Sun, 9 Mar 2008 18:17:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C72C88FC16 for ; Sun, 9 Mar 2008 18:17: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.14.1/8.14.1) with ESMTP id m29IHpb6057945 for ; Sun, 9 Mar 2008 18:17:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29IHhxo057917 for perforce@freebsd.org; Sun, 9 Mar 2008 18:17:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 9 Mar 2008 18:17:43 GMT Message-Id: <200803091817.m29IHhxo057917@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 137238 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, 09 Mar 2008 18:17:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=137238 Change 137238 by rwatson@rwatson_cinnamon on 2008/03/09 18:17:26 Integrate zero-copy BPF branch. Affected files ... .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-802_11.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/acpica/madt.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#14 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC#12 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/NOTES#10 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/proc.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/smp.h#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/specialreg.h#6 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_machdep.c#7 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/genassym.c#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/locore.S#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/pmap.c#11 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/swtch.S#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/AVILA#6 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/_bus.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/asmacros.h#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/atomic.h#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/pmap.h#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/sysarch.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425.c#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/ofw/libofw/ofw_console.c#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/powerpc/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/powerpc/ofw/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/powerpc/ofw/conf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/zcopybpf/src/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/zcopybpf/src/sys/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/zcopybpf/src/sys/boot/powerpc/uboot/version#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/common/main.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/console.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/copy.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/disk.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/glue.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/module.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/net.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/time.c#1 branch .. //depot/projects/zcopybpf/src/sys/cam/cam_periph.c#5 integrate .. //depot/projects/zcopybpf/src/sys/cam/cam_xpt.c#10 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_futex.c#5 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/zcopybpf/src/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.arm#5 integrate .. //depot/projects/zcopybpf/src/sys/conf/NOTES#17 integrate .. //depot/projects/zcopybpf/src/sys/conf/files#19 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.amd64#8 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.i386#9 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.powerpc#8 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.sparc64#5 integrate .. //depot/projects/zcopybpf/src/sys/conf/kern.post.mk#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/zcopybpf/src/sys/conf/kmod.mk#7 integrate .. //depot/projects/zcopybpf/src/sys/conf/ldscript.powerpc#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/options#15 integrate .. //depot/projects/zcopybpf/src/sys/conf/options.powerpc#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_command.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_examine.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_input.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ddb/db_textdump.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi.c#9 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_thermal.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/aic7xxx/aic79xx_osm.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/amr/amrreg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/atkbdc/psm.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/bce/if_bce.c#9 integrate .. //depot/projects/zcopybpf/src/sys/dev/bce/if_bcefw.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/zcopybpf/src/sys/dev/bge/if_bgereg.h#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/ciss/ciss.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/coretemp/coretemp.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_firmware_exports.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_mc5.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_regs.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_tcb.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_vsc8211.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_adapter.h#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_ioctl.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_l2t.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_l2t.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_offload.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_osdep.h#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_sge.c#10 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/mbufq.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/mvec.h#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/uipc_mvec.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/zcopybpf/src/sys/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/zcopybpf/src/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/t3cdev.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#2 delete .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#2 delete .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/LICENSE#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_80003es2lan.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_80003es2lan.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82540.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82541.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82541.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82542.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82543.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82543.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82571.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82571.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82575.c#4 delete .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82575.h#4 delete .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_api.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_api.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_defines.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_hw.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_ich8lan.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_ich8lan.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_mac.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_mac.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_manage.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_manage.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_nvm.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_nvm.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_osdep.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_phy.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_phy.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_regs.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/if_em.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/if_em.h#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/hatm/if_hatm_intr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptiop/hptiop.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptrr/array.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptrr/him.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptrr/himfuncs.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptrr/hptintf.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptrr/hptrr_config.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptrr/hptrr_config.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptrr/hptrr_os_bsd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptrr/ldm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptrr/list.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptrr/os_bsd.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptrr/osm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ic/quicc.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_82575.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_82575.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_api.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_api.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_defines.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_hw.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_mac.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_mac.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_manage.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_manage.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_nvm.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_nvm.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_osdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_phy.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_phy.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/e1000_regs.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/if_igb.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/igb/if_igb.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/iscsi/initiator/isc_soc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/lge/if_lge.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/md/md.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfi.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfireg.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/brgphy.c#9 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/ciphy.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/miidevs#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/msk/if_msk.c#10 integrate .. //depot/projects/zcopybpf/src/sys/dev/msk/if_mskreg.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/if_mxge.c#11 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/if_mxge_var.h#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/mxge_lro.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nfe/if_nfe.c#10 integrate .. //depot/projects/zcopybpf/src/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/nfe/if_nfevar.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci.c#11 integrate .. //depot/projects/zcopybpf/src/sys/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/quicc/quicc_core.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/ral/rt2560.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/ral/rt2560reg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ral/rt2560var.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/re/if_re.c#11 integrate .. //depot/projects/zcopybpf/src/sys/dev/rr232x/LICENSE#2 delete .. //depot/projects/zcopybpf/src/sys/dev/rr232x/README#2 delete .. //depot/projects/zcopybpf/src/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/zcopybpf/src/sys/dev/rr232x/array.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/rr232x/him.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/rr232x/himfuncs.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/rr232x/hptintf.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/zcopybpf/src/sys/dev/rr232x/ldm.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/rr232x/list.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/rr232x/os_bsd.c#2 delete .. //depot/projects/zcopybpf/src/sys/dev/rr232x/os_bsd.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/rr232x/osm.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/rr232x/osm_bsd.c#5 delete .. //depot/projects/zcopybpf/src/sys/dev/rr232x/rr232x_config.c#2 delete .. //depot/projects/zcopybpf/src/sys/dev/rr232x/rr232x_config.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/scc/scc_bfe.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/scc/scc_bus.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/sk/if_sk.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/sk/if_skreg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/syscons/syscons.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ti/if_ti.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/tsec/if_tsec.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/tsec/if_tsec.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/twe/twe.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_bus_scc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_cpu_powerpc.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_axe.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/umass.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdi.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uslcom.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/wpi/if_wpi.c#5 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/TODO#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/cnode.h#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_io.h#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_kernel.h#2 delete .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_namecache.c#2 delete .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_namecache.h#3 delete .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_opstats.h#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_pioctl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_psdev.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_psdev.h#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_subr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_subr.h#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_vfsops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_vfsops.h#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_vnops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/coda/coda_vnops.h#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/zcopybpf/src/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate .. //depot/projects/zcopybpf/src/sys/fs/ntfs/ntfs_subr.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/nullfs/null_vfsops.c#6 integrate .. //depot/projects/zcopybpf/src/sys/fs/nullfs/null_vnops.c#7 integrate .. //depot/projects/zcopybpf/src/sys/fs/nwfs/nwfs_node.c#5 integrate .. //depot/projects/zcopybpf/src/sys/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/pseudofs/pseudofs_vncache.c#6 integrate .. //depot/projects/zcopybpf/src/sys/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/smbfs/smbfs_node.c#6 integrate .. //depot/projects/zcopybpf/src/sys/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs_subr.c#5 integrate .. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/fs/unionfs/union_vfsops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/zcopybpf/src/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_disk.c#4 integrate .. //depot/projects/zcopybpf/src/sys/geom/linux_lvm/g_linux_lvm.c#1 branch .. //depot/projects/zcopybpf/src/sys/geom/linux_lvm/g_linux_lvm.h#1 branch .. //depot/projects/zcopybpf/src/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part_vtoc8.c#1 branch .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate .. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/acpica/madt.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/GENERIC#12 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/NOTES#10 integrate .. //depot/projects/zcopybpf/src/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/busdma_machdep.c#6 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/geode.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/minidump_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/mp_machdep.c#9 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/_types.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/float.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/proc.h#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/smp.h#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_machdep.c#7 integrate .. //depot/projects/zcopybpf/src/sys/ia64/conf/GENERIC#8 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/locore.S#3 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/machdep.c#8 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/pmap.c#8 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/md_var.h#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/init_main.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/init_sysent.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_cpuset.c#1 branch .. //depot/projects/zcopybpf/src/sys/kern/kern_descrip.c#12 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_exit.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_ktrace.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_lock.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mbuf.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mib.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_module.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mutex.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_priv.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_rwlock.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_shutdown.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sig.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_tc.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_thread.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_timeout.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_4bsd.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_ule.c#15 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_bus.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_lock.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_smp.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_witness.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/syscalls.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/syscalls.master#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/systrace_args.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/sysv_shm.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_sockbuf.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_syscalls.c#13 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_aio.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_bio.c#11 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_default.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_lookup.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_mount.c#14 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_syscalls.c#11 integrate .. //depot/projects/zcopybpf/src/sys/kern/vnode_if.src#5 integrate .. //depot/projects/zcopybpf/src/sys/libkern/cmpdi2.c#1 branch .. //depot/projects/zcopybpf/src/sys/libkern/quad.h#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/Makefile#13 integrate .. //depot/projects/zcopybpf/src/sys/modules/cmx/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/coda/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/modules/coda5/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/modules/cxgb/Makefile#7 integrate .. //depot/projects/zcopybpf/src/sys/modules/cxgb/cxgb/Makefile#4 integrate .. //depot/projects/zcopybpf/src/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/cxgb/tom/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/modules/em/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/modules/geom/Makefile#4 integrate .. //depot/projects/zcopybpf/src/sys/modules/geom/geom_apple/Makefile#2 delete .. //depot/projects/zcopybpf/src/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/geom/geom_gpt/Makefile#2 delete .. //depot/projects/zcopybpf/src/sys/modules/geom/geom_linux_lvm/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/geom/geom_part/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/igb/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/ipfw_nat/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/rr232x/Makefile#2 delete .. //depot/projects/zcopybpf/src/sys/modules/sound/driver/emu10kx/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/modules/uslcom/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/zfs/Makefile#6 integrate .. //depot/projects/zcopybpf/src/sys/net/bpf.c#43 integrate .. //depot/projects/zcopybpf/src/sys/net/if.c#9 integrate .. //depot/projects/zcopybpf/src/sys/net/if_ethersubr.c#11 integrate .. //depot/projects/zcopybpf/src/sys/net/if_gif.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/route.c#6 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_ht.c#6 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_ht.h#4 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_input.c#7 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_scan_sta.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/netflow/netflow.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/netflow/ng_netflow.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/netgraph.h#5 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_bpf.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_ksocket.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_l2tp.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_nat.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_ppp.c#8 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_pppoe.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_carp.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_dummynet.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_fw_nat.c#1 branch .. //depot/projects/zcopybpf/src/sys/netinet/ip_fw_pfil.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_id.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_output.c#8 integrate .. //depot/projects/zcopybpf/src/sys/netinet/libalias/alias.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/libalias/alias_ftp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/libalias/alias_irc.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/libalias/alias_proxy.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/libalias/alias_smedia.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_auth.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_bsd_addr.c#8 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_indata.c#12 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_input.c#11 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_output.c#12 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_pcb.c#11 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_peeloff.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctputil.c#13 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_output.c#11 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_var.h#11 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_output.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/ipsec6.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/key.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/key_debug.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netncp/ncp_conn.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netncp/ncp_conn.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netsmb/smb_conn.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netsmb/smb_conn.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netsmb/smb_iod.c#3 integrate .. //depot/projects/zcopybpf/src/sys/nfs4client/nfs4_idmap.c#3 integrate .. //depot/projects/zcopybpf/src/sys/nfs4client/nfs4_vfsops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/nfs4client/nfs4_vnops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_bio.c#5 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_node.c#4 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_subs.c#6 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfsnode.h#3 integrate .. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_serv.c#7 integrate .. //depot/projects/zcopybpf/src/sys/pc98/cbus/sio.c#6 integrate .. //depot/projects/zcopybpf/src/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_rl.c#5 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_rlreg.h#7 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_wb.c#4 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/aim/ofw_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/aim/trap_subr.S#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/booke/clock.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/booke/copyinout.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/booke/interrupt.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/booke/locore.S#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/booke/machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/booke/pmap.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/booke/support.S#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/booke/swtch.S#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/booke/trap.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/booke/trap_subr.S#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/booke/uio_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/booke/vm_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/conf/GENERIC#10 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/conf/MPC85XX#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/conf/NOTES#6 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/fpu/fpu_add.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/fpu/fpu_arith.h#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/fpu/fpu_compare.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/fpu/fpu_div.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/fpu/fpu_emu.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/fpu/fpu_emu.h#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/fpu/fpu_explode.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/fpu/fpu_extern.h#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/fpu/fpu_implode.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/fpu/fpu_instr.h#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/fpu/fpu_mul.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/fpu/fpu_sqrt.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/fpu/fpu_subr.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/include/bootinfo.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/float.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/frame.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/hid.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/intr_machdep.h#4 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/kdb.h#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/md_var.h#5 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/metadata.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/mmuvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/ocpbus.h#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/include/openpicreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/openpicvar.h#4 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/pcpu.h#4 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/psl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/pte.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/sf_buf.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/spr.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/tlb.h#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/include/trap.h#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/trap_aim.h#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/include/trap_booke.h#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/include/vmparam.h#6 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/mpc85xx/nexus.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/mpc85xx/ocpbus.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/mpc85xx/ocpbus.h#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/mpc85xx/opic.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/mpc85xx/pci_ocp.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/powermac/hrowpic.c#4 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powermac/openpic_macio.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/autoconf.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/db_trace.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/gdb_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/intr_machdep.c#6 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/openpic.c#4 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/pic_if.m#4 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit.c#7 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_arg.c#6 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_bsm_klib.c#6 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_private.h#4 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_syscalls.c#8 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_trigger.c#3 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/zcopybpf/src/sys/security/mac_mls/mac_mls.c#7 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/include/md_var.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/include/tlb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/ata_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/iommu.c#4 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/_types.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/buf.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/bufobj.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/bus.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/conf.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/cpuset.h#1 branch .. //depot/projects/zcopybpf/src/sys/sys/fcntl.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/ipc.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/ktrace.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/lock.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/lockmgr.h#7 integrate .. //depot/projects/zcopybpf/src/sys/sys/mbuf.h#10 integrate .. //depot/projects/zcopybpf/src/sys/sys/module.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/mount.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/param.h#14 integrate .. //depot/projects/zcopybpf/src/sys/sys/pcpu.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/priv.h#10 integrate .. //depot/projects/zcopybpf/src/sys/sys/proc.h#12 integrate .. //depot/projects/zcopybpf/src/sys/sys/rwlock.h#7 integrate .. //depot/projects/zcopybpf/src/sys/sys/sched.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/shm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/smp.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/socket.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/socketvar.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/syscall.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/syscall.mk#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/syscallsubr.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/sysproto.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/types.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/user.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/vnode.h#7 integrate .. //depot/projects/zcopybpf/src/sys/sys/vtoc.h#1 branch .. //depot/projects/zcopybpf/src/sys/tools/embed_mfs.sh#1 branch .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_rawread.c#4 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_softdep.c#10 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ufs/extattr.h#3 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ufs/ufs_extattr.c#5 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_fault.c#7 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_map.h#4 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_object.c#10 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/netstat.h#6 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/route.c#6 integrate Differences ... ==== //depot/projects/zcopybpf/src/contrib/tcpdump/print-802_11.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.3 2007/10/16 02:31:47 mlaier Exp $ */ +/* $FreeBSD: src/contrib/tcpdump/print-802_11.c,v 1.4 2008/02/25 01:28:14 sam Exp $ */ /* * Copyright (c) 2001 * Fortress Technologies, Inc. All rights reserved. @@ -1186,9 +1186,9 @@ break; case IEEE80211_RADIOTAP_RATE: if (u.u8 & 0x80) + PRINT_HT_RATE("", u.u8, " Mb/s "); + else PRINT_RATE("", u.u8, " Mb/s "); - else - PRINT_HT_RATE("", u.u8, " Mb/s "); break; case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: printf("%ddB signal ", u.i8); ==== //depot/projects/zcopybpf/src/sys/amd64/acpica/madt.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.24 2007/05/08 22:01:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.25 2008/01/31 16:51:42 jhb Exp $"); #include #include @@ -109,9 +109,11 @@ /* * Code to abuse the crashdump map to map in the tables for the early * probe. We cheat and make the following assumptions about how we - * use this KVA: page 0 is used to map in the first page of each table - * found via the RSDT or XSDT and pages 1 to n are used to map in the - * RSDT or XSDT. The offset is in pages; the length is in bytes. + * use this KVA: pages 0 and 1 are used to map in the header of each + * table found via the RSDT or XSDT and pages 2 to n are used to map + * in the RSDT or XSDT. We have to use 2 pages for the table headers + * in case a header spans a page boundary. The offset is in pages; + * the length is in bytes. */ static void * madt_map(vm_paddr_t pa, int offset, vm_offset_t length) @@ -232,7 +234,7 @@ printf("MADT: RSDP failed extended checksum\n"); return (ENXIO); } - xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, + xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 2, ACPI_SIG_XSDT); if (xsdt == NULL) { if (bootverbose) @@ -246,7 +248,7 @@ break; madt_unmap_table(xsdt); } else { - rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, + rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 2, ACPI_SIG_RSDT); if (rsdt == NULL) { if (bootverbose) ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/busdma_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.84 2007/11/27 17:28:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.85 2008/02/12 16:24:30 scottl Exp $"); #include #include @@ -598,14 +598,14 @@ * Count the number of bounce pages * needed in order to complete this transfer */ - vaddr = trunc_page((vm_offset_t)buf); + vaddr = (vm_offset_t)buf; vendaddr = (vm_offset_t)buf + buflen; while (vaddr < vendaddr) { paddr = pmap_kextract(vaddr); if (run_filter(dmat, paddr) != 0) map->pagesneeded++; - vaddr += PAGE_SIZE; + vaddr += (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK)); } CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded); } ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/dump_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.12 2006/04/21 04:24:50 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); #include #include @@ -140,7 +140,7 @@ ptr += len; sz -= len; if (fragsz == DEV_BSIZE) { - error = di->dumper(di->priv, buffer, 0, dumplo, + error = dump_write(di, buffer, 0, dumplo, DEV_BSIZE); if (error) return error; @@ -160,7 +160,7 @@ if (fragsz == 0) return (0); - error = di->dumper(di->priv, buffer, 0, dumplo, DEV_BSIZE); + error = dump_write(di, buffer, 0, dumplo, DEV_BSIZE); dumplo += DEV_BSIZE; fragsz = 0; return (error); @@ -177,6 +177,7 @@ uint64_t pgs; size_t counter, sz, chunk; int i, c, error, twiddle; + u_int maxdumppgs; error = 0; /* catch case in which chunk size is 0 */ counter = 0; /* Update twiddle every 16MB */ @@ -184,13 +185,16 @@ va = 0; pgs = mdp->md_size / PAGE_SIZE; pa = mdp->md_start; + maxdumppgs = di->maxiosize / PAGE_SIZE; + if (maxdumppgs == 0) /* seatbelt */ + maxdumppgs = 1; printf(" chunk %d: %ldMB (%ld pages)", seqnr, PG2MB(pgs), pgs); while (pgs) { chunk = pgs; - if (chunk > MAXDUMPPGS) - chunk = MAXDUMPPGS; + if (chunk > maxdumppgs) + chunk = maxdumppgs; sz = chunk << PAGE_SHIFT; counter += sz; if (counter >> 24) { @@ -201,7 +205,7 @@ a = pa + i * PAGE_SIZE; va = pmap_kenter_temporary(trunc_page(a), i); } - error = di->dumper(di->priv, va, 0, dumplo, sz); + error = dump_write(di, va, 0, dumplo, sz); if (error) break; dumplo += sz; @@ -327,7 +331,7 @@ ehdr.e_phnum); /* Dump leader */ - error = di->dumper(di->priv, &kdh, 0, dumplo, sizeof(kdh)); + error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh)); if (error) goto fail; dumplo += sizeof(kdh); @@ -358,12 +362,12 @@ goto fail; /* Dump trailer */ - error = di->dumper(di->priv, &kdh, 0, dumplo, sizeof(kdh)); + error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh)); if (error) goto fail; /* Signal completion, signoff and exit stage left. */ - di->dumper(di->priv, NULL, 0, 0, 0); + dump_write(di, NULL, 0, 0, 0); printf("\nDump complete\n"); return; ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/identcpu.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.155 2007/12/08 21:13:01 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.158 2008/03/02 07:58:40 jeff Exp $"); #include "opt_cpu.h" @@ -97,6 +97,10 @@ { "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */ }; +int cpu_cores; +int cpu_logical; + + extern int pq_l2size; extern int pq_l2nways; @@ -223,7 +227,7 @@ "\020" "\001SSE3" /* SSE3 */ "\002" - "\003RSVD2" /* "Reserved" bit 2 */ + "\003DTES64" /* 64-bit Debug Trace */ "\004MON" /* MONITOR/MWAIT Instructions */ "\005DS_CPL" /* CPL Qualified Debug Store */ "\006VMX" /* Virtual Machine Extensions */ @@ -240,11 +244,11 @@ "\021" "\022" "\023DCA" /* Direct Cache Access */ - "\024" - "\025" - "\026" + "\024SSE4.1" + "\025SSE4.2" + "\026x2APIC" /* xAPIC Extensions */ "\027" - "\030" + "\030POPCNT" "\031" "\032" "\033" @@ -360,11 +364,13 @@ if ((regs[0] & 0x1f) != 0) cmp = ((regs[0] >> 26) & 0x3f) + 1; } + cpu_cores = cmp; + cpu_logical = htt / cmp; if (cmp > 1) printf("\n Cores per package: %d", cmp); if ((htt / cmp) > 1) printf("\n Logical CPUs per core: %d", - htt / cmp); + cpu_logical); } } /* Avoid ugly blank lines: only print newline when we have to. */ ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/minidump_machdep.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.2 2006/12/05 11:31:33 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.4 2008/02/15 06:26:25 scottl Exp $"); #include #include @@ -111,7 +111,7 @@ if (fragsz == 0) return (0); - error = di->dumper(di->priv, dump_va, 0, dumplo, fragsz); + error = dump_write(di, dump_va, 0, dumplo, fragsz); dumplo += fragsz; fragsz = 0; return (error); @@ -122,7 +122,11 @@ { size_t len; int error, i, c; + u_int maxdumpsz; + maxdumpsz = di->maxiosize; + if (maxdumpsz == 0) /* seatbelt */ + maxdumpsz = PAGE_SIZE; error = 0; if ((sz % PAGE_SIZE) != 0) { printf("size not page aligned\n"); @@ -143,7 +147,7 @@ return (error); } while (sz) { - len = (MAXDUMPPGS * PAGE_SIZE) - fragsz; + len = maxdumpsz - fragsz; if (len > sz) len = sz; counter += len; @@ -153,7 +157,7 @@ counter &= (1<<24) - 1; } if (ptr) { - error = di->dumper(di->priv, ptr, 0, dumplo, len); + error = dump_write(di, ptr, 0, dumplo, len); if (error) return (error); dumplo += len; @@ -165,7 +169,7 @@ fragsz += len; pa += len; sz -= len; - if (fragsz == (MAXDUMPPGS * PAGE_SIZE)) { + if (fragsz == maxdumpsz) { error = blk_flush(di); if (error) return (error); @@ -284,7 +288,7 @@ printf("Dumping %llu MB:", (long long)dumpsize >> 20); /* Dump leader */ - error = di->dumper(di->priv, &kdh, 0, dumplo, sizeof(kdh)); + error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh)); if (error) goto fail; dumplo += sizeof(kdh); @@ -375,13 +379,13 @@ goto fail; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 9 18:39:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFC251065673; Sun, 9 Mar 2008 18:39:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7ED411065670 for ; Sun, 9 Mar 2008 18:39:14 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 612C98FC27 for ; Sun, 9 Mar 2008 18:39:14 +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.14.1/8.14.1) with ESMTP id m29IdEV3058854 for ; Sun, 9 Mar 2008 18:39:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29IdEgK058852 for perforce@freebsd.org; Sun, 9 Mar 2008 18:39:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 9 Mar 2008 18:39:14 GMT Message-Id: <200803091839.m29IdEgK058852@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 137242 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, 09 Mar 2008 18:39:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=137242 Change 137242 by rwatson@rwatson_cinnamon on 2008/03/09 18:38:47 Very slight further integration. Affected files ... .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gem.c#8 integrate Differences ... ==== //depot/projects/zcopybpf/src/sys/dev/gem/if_gem.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.47 2008/01/17 23:37:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.48 2008/03/09 17:55:19 marius Exp $"); /* * Driver for Apple GMAC, Sun ERI and Sun GEM Ethernet controllers @@ -327,11 +327,11 @@ * allocated. */ - /* Get RX FIFO size */ + /* Get RX FIFO size. */ sc->sc_rxfifosize = 64 * bus_read_4(sc->sc_res[0], GEM_RX_FIFO_SIZE); - /* Get TX FIFO size */ + /* Get TX FIFO size. */ v = bus_read_4(sc->sc_res[0], GEM_TX_FIFO_SIZE); device_printf(sc->sc_dev, "%ukB RX FIFO, %ukB TX FIFO\n", sc->sc_rxfifosize / 1024, v / 16); @@ -598,7 +598,7 @@ bus_read_4(sc->sc_res[0], GEM_MAC_LATE_COLL_CNT); /* - * then clear the hardware counters. + * Then clear the hardware counters. */ bus_write_4(sc->sc_res[0], GEM_MAC_NORM_COLL_CNT, 0); bus_write_4(sc->sc_res[0], GEM_MAC_FIRST_COLL_CNT, 0); @@ -724,7 +724,7 @@ if (!gem_bitwait(sc, GEM_RX_CONFIG, GEM_RX_CONFIG_RXDMA_EN, 0)) device_printf(sc->sc_dev, "cannot disable RX DMA\n"); - /* Finally, reset the ERX */ + /* Finally, reset the ERX. */ bus_write_4(sc->sc_res[0], GEM_RESET, GEM_RESET_RX); bus_barrier(sc->sc_res[0], GEM_RESET, 4, BUS_SPACE_BARRIER_WRITE); if (!gem_bitwait(sc, GEM_RESET, GEM_RESET_RX | GEM_RESET_TX, 0)) { @@ -794,7 +794,7 @@ if (!gem_bitwait(sc, GEM_TX_CONFIG, GEM_TX_CONFIG_TXDMA_EN, 0)) device_printf(sc->sc_dev, "cannot disable TX DMA\n"); - /* Finally, reset the ETX */ + /* Finally, reset the ETX. */ bus_write_4(sc->sc_res[0], GEM_RESET, GEM_RESET_TX); bus_barrier(sc->sc_res[0], GEM_RESET, 4, BUS_SPACE_BARRIER_WRITE); if (!gem_bitwait(sc, GEM_RESET, GEM_RESET_RX | GEM_RESET_TX, 0)) { @@ -817,9 +817,6 @@ return (gem_bitwait(sc, GEM_MAC_RX_CONFIG, GEM_MAC_RX_ENABLE, 0)); } -/* - * disable transmitter. - */ static int gem_disable_tx(struct gem_softc *sc) { @@ -1090,6 +1087,9 @@ } } else if (error != 0) return (error); + /* If nsegs is wrong then the stack is corrupt. */ + KASSERT(nsegs <= GEM_NTXSEGS, + ("%s: too many DMA segments (%d)", __func__, nsegs)); if (nsegs == 0) { m_freem(*m_head); *m_head = NULL; @@ -1602,7 +1602,6 @@ error = bus_dmamap_load_mbuf_sg(sc->sc_rdmatag, rxs->rxs_dmamap, m, segs, &nsegs, BUS_DMA_NOWAIT); - KASSERT(nsegs == 1, ("Too many segments returned!")); if (error != 0) { device_printf(sc->sc_dev, "cannot load RS DMA map %d, error = %d\n", idx, error); @@ -1610,6 +1609,8 @@ return (error); } /* If nsegs is wrong then the stack is corrupt. */ + KASSERT(nsegs == 1, + ("%s: too many DMA segments (%d)", __func__, nsegs)); rxs->rxs_mbuf = m; rxs->rxs_paddr = segs[0].ds_addr; @@ -1752,7 +1753,7 @@ gem_mifinit(struct gem_softc *sc) { - /* Configure the MIF in frame mode */ + /* Configure the MIF in frame mode. */ bus_write_4(sc->sc_res[0], GEM_MIF_CONFIG, bus_read_4(sc->sc_res[0], GEM_MIF_CONFIG) & ~GEM_MIF_CONFIG_BB_ENA); } From owner-p4-projects@FreeBSD.ORG Sun Mar 9 18:47:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B20BC1065671; Sun, 9 Mar 2008 18:47:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7101E106566C for ; Sun, 9 Mar 2008 18:47:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 52F4E8FC14 for ; Sun, 9 Mar 2008 18:47:23 +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.14.1/8.14.1) with ESMTP id m29IlNq0059195 for ; Sun, 9 Mar 2008 18:47:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29IlM1G059193 for perforce@freebsd.org; Sun, 9 Mar 2008 18:47:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 9 Mar 2008 18:47:22 GMT Message-Id: <200803091847.m29IlM1G059193@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 137243 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, 09 Mar 2008 18:47:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=137243 Change 137243 by rwatson@rwatson_cinnamon on 2008/03/09 18:46:30 Minor wording tweaks. Affected files ... .. //depot/projects/zcopybpf/src/share/man/man4/bpf.4#9 edit Differences ... ==== //depot/projects/zcopybpf/src/share/man/man4/bpf.4#9 (text+ko) ==== @@ -141,8 +141,8 @@ .Nm devices may also operate in the .Dv BPF_BUFMODE_ZEROCOPY -mode, in which packet data is written directly into user memory buffers by -the kernel, avoiding both system call and copying overhead. +mode, in which packet data is written directly into two user memory buffers +by the kernel, avoiding both system call and copying overhead. Buffers are of fixed (and equal) size, page-aligned, and an even multiple of the page size. The maximum zero-copy buffer size is returned by the @@ -170,8 +170,7 @@ .Vt bz_bufb is a pointer to the second buffer. .Nm -will then cycle between the two buffers starting with -.Vt bz_bufa. +will then cycle between the two buffers as they fill and are acknowledged. .Pp Each buffer begins with a fixed-length header to hold synchronization and data length information for the buffer: @@ -185,7 +184,8 @@ .Ed .Pp The header structure of each buffer, including all padding, should be zeroed -before it is passed to the ioctl. +before it is configured using +.Dv BIOCSETZBUF . Remaining space in the buffer will be used by the kernel to store packet data, laid out in the same format as with buffered read mode. .Pp @@ -247,8 +247,8 @@ ioctl. This allows the user process to retrieve data in a partially filled buffer before the buffer is full, such as following a timeout; the process must -check for buffer ownership using the header generation numbers, as the buffer -will not be assigned if no data was present. +recheck for buffer ownership using the header generation numbers, as the +buffer will not be assigned to userspace if no data was present. .Pp As in the buffered read mode, .Xr kqueue 2 , @@ -264,7 +264,9 @@ The user processes must acknowledge the current buffer in order to be notified that the next buffer is ready for processing. Programs should not rely on this as an invariant, as it may change in future -versions. +versions; in particular, they must maintain their own notion of which buffer +is "next" so that if both buffers are owned by userspace, it can process them +in the correct order. .Sh IOCTLS The .Xr ioctl 2 From owner-p4-projects@FreeBSD.ORG Sun Mar 9 19:49:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B30A81065674; Sun, 9 Mar 2008 19:49:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72E5E106566B for ; Sun, 9 Mar 2008 19:49:34 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 55FD68FC13 for ; Sun, 9 Mar 2008 19:49:34 +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.14.1/8.14.1) with ESMTP id m29JnYmO063119 for ; Sun, 9 Mar 2008 19:49:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29JnXaR063117 for perforce@freebsd.org; Sun, 9 Mar 2008 19:49:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 9 Mar 2008 19:49:33 GMT Message-Id: <200803091949.m29JnXaR063117@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 137248 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, 09 Mar 2008 19:49:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=137248 Change 137248 by rwatson@rwatson_cinnamon on 2008/03/09 19:49:00 Relative include of p4 tree's sys won't be required once merging is done. Affected files ... .. //depot/projects/zcopybpf/src/lib/libpcap/Makefile#6 edit Differences ... ==== //depot/projects/zcopybpf/src/lib/libpcap/Makefile#6 (text+ko) ==== @@ -16,7 +16,6 @@ YFLAGS+=-p pcapyy LFLAGS+=-Ppcapyy -CFLAGS+=-I../../sys CFLAGS+=-DHAVE_CONFIG_H -Dyylval=pcapyylval -I${.CURDIR} -I. CFLAGS+=-D_U_="__attribute__((unused))" CFLAGS+=-DHAVE_SNPRINTF -DHAVE_VSNPRINTF From owner-p4-projects@FreeBSD.ORG Sun Mar 9 19:53:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B3F91065672; Sun, 9 Mar 2008 19:53:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8905C1065670 for ; Sun, 9 Mar 2008 19:53:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C8E48FC12 for ; Sun, 9 Mar 2008 19:53:38 +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.14.1/8.14.1) with ESMTP id m29JrcXv063264 for ; Sun, 9 Mar 2008 19:53:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29JrcdX063262 for perforce@freebsd.org; Sun, 9 Mar 2008 19:53:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 9 Mar 2008 19:53:38 GMT Message-Id: <200803091953.m29JrcdX063262@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 137249 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, 09 Mar 2008 19:53:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=137249 Change 137249 by rwatson@rwatson_cinnamon on 2008/03/09 19:53:07 Remove two over-zealous comments. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#44 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#44 (text+ko) ==== @@ -1234,9 +1234,6 @@ * definition of commitment, for now, is whether or not a * buffer has been allocated or an interface attached, since * that's the point where things get tricky. - * - * XXXRW: This will need some refinement. Is checking both - * for buffers and interface binding redundant? */ switch (*(u_int *)addr) { case BPF_BUFMODE_BUFFER: @@ -1376,8 +1373,6 @@ * using zero-copy, then the user process must have registered * buffers by the time we get here. If not, return an error. * - * XXXRW: Could this be better abstracted? - * * XXXRW: There are locking issues here with multi-threaded use: what * if two threads try to set the interface at once? */ From owner-p4-projects@FreeBSD.ORG Sun Mar 9 19:56:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 212F61065673; Sun, 9 Mar 2008 19:56:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4E391065670 for ; Sun, 9 Mar 2008 19:56:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B86578FC14 for ; Sun, 9 Mar 2008 19:56:43 +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.14.1/8.14.1) with ESMTP id m29JuhMs063397 for ; Sun, 9 Mar 2008 19:56:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29JuhlM063392 for perforce@freebsd.org; Sun, 9 Mar 2008 19:56:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 9 Mar 2008 19:56:43 GMT Message-Id: <200803091956.m29JuhlM063392@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 137250 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, 09 Mar 2008 19:56:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=137250 Change 137250 by rwatson@rwatson_cinnamon on 2008/03/09 19:55:49 Don't expose selection of a "default" via bpf.h where userspace or other parts might find it -- selection of a default for new BPF devices is in the kernel BPF implementation when the new device is created. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#45 edit .. //depot/projects/zcopybpf/src/sys/net/bpf.h#23 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#45 (text+ko) ==== @@ -562,7 +562,7 @@ * particular buffer method. */ bpf_buffer_init(d); - d->bd_bufmode = BPF_BUFMODE_DEFAULT; + d->bd_bufmode = BPF_BUFMODE_BUFFER; d->bd_sig = SIGIO; d->bd_direction = BPF_D_INOUT; d->bd_pid = td->td_proc->p_pid; ==== //depot/projects/zcopybpf/src/sys/net/bpf.h#23 (text+ko) ==== @@ -103,8 +103,6 @@ #define BPF_BUFMODE_BUFFER 1 /* Kernel buffers with read(). */ #define BPF_BUFMODE_ZBUF 2 /* Zero-copy buffers. */ -#define BPF_BUFMODE_DEFAULT BPF_BUFMODE_BUFFER /* Default. */ - /*- * Struct used by BIOCSETZBUF, BIOCROTZBUF: describes up to two zero-copy * buffer as used by BPF. From owner-p4-projects@FreeBSD.ORG Sun Mar 9 19:57:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AAA41065675; Sun, 9 Mar 2008 19:57:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A5DF1065671 for ; Sun, 9 Mar 2008 19:57:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E21C78FC18 for ; Sun, 9 Mar 2008 19:57:44 +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.14.1/8.14.1) with ESMTP id m29JviRq063456 for ; Sun, 9 Mar 2008 19:57:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29Jvino063454 for perforce@freebsd.org; Sun, 9 Mar 2008 19:57:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 9 Mar 2008 19:57:44 GMT Message-Id: <200803091957.m29Jvino063454@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 137251 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, 09 Mar 2008 19:57:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=137251 Change 137251 by rwatson@rwatson_cinnamon on 2008/03/09 19:56:56 Further re-sort ioctls to make it clear new zero-copy ioctls aren't yet obsolete. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.h#24 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.h#24 (text+ko) ==== @@ -136,9 +136,6 @@ #define BIOCGDLTLIST _IOWR('B',121, struct bpf_dltlist) #define BIOCLOCK _IO('B', 122) #define BIOCSETWF _IOW('B',123, struct bpf_program) -/* Obsolete */ -#define BIOCGSEESENT BIOCGDIRECTION -#define BIOCSSEESENT BIOCSDIRECTION #define BIOCFEEDBACK _IOW('B',124, u_int) #define BIOCGETBUFMODE _IOR('B',125, u_int) #define BIOCSETBUFMODE _IOW('B',126, u_int) @@ -146,6 +143,10 @@ #define BIOCROTZBUF _IOR('B',128, struct bpf_zbuf) #define BIOCSETZBUF _IOW('B',129, struct bpf_zbuf) +/* Obsolete */ +#define BIOCGSEESENT BIOCGDIRECTION +#define BIOCSSEESENT BIOCSDIRECTION + /* Packet directions */ enum bpf_direction { BPF_D_IN, /* See incoming packets */ From owner-p4-projects@FreeBSD.ORG Sun Mar 9 19:58:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DA071065674; Sun, 9 Mar 2008 19:58:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5CDE11065672 for ; Sun, 9 Mar 2008 19:58:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 408F78FC12 for ; Sun, 9 Mar 2008 19:58:46 +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.14.1/8.14.1) with ESMTP id m29JwkW1063480 for ; Sun, 9 Mar 2008 19:58:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29Jwkn2063478 for perforce@freebsd.org; Sun, 9 Mar 2008 19:58:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 9 Mar 2008 19:58:46 GMT Message-Id: <200803091958.m29Jwkn2063478@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 137253 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, 09 Mar 2008 19:58:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=137253 Change 137253 by rwatson@rwatson_cinnamon on 2008/03/09 19:58:30 Add a note of caution on memory ordering, etc, to bpf.h when describing the shared memory header. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.h#25 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.h#25 (text+ko) ==== @@ -177,7 +177,10 @@ /* * When using zero-copy BPF buffers, a shared memory header is present * allowing the kernel BPF implementation and user process to synchronize - * without using system calls. This structure defines that header. + * without using system calls. This structure defines that header. When + * accessing these fields, appropriate atomic operation and memory barriers + * are required in order not to see stale or out-of-order data; see bpf(4) + * for reference code to access these fields from userspace. * * The layout of this structure is critical, and must not be changed; if must * fit in a single page on all architectures. From owner-p4-projects@FreeBSD.ORG Sun Mar 9 20:32:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1681A1065672; Sun, 9 Mar 2008 20:32:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA5F3106566C for ; Sun, 9 Mar 2008 20:32:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B086B8FC12 for ; Sun, 9 Mar 2008 20:32:21 +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.14.1/8.14.1) with ESMTP id m29KWLaR065957 for ; Sun, 9 Mar 2008 20:32:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29KWL2t065955 for perforce@freebsd.org; Sun, 9 Mar 2008 20:32:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 9 Mar 2008 20:32:21 GMT Message-Id: <200803092032.m29KWL2t065955@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 137257 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, 09 Mar 2008 20:32:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=137257 Change 137257 by rwatson@rwatson_cinnamon on 2008/03/09 20:31:29 Reword, more awkwardly but more accurately. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpfdesc.h#8 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpfdesc.h#8 (text+ko) ==== @@ -52,7 +52,7 @@ struct bpf_d { LIST_ENTRY(bpf_d) bd_next; /* Linked list of descriptors */ /* - * Buffer slots: two memory clusters buffer the incoming packets. + * Buffer slots: two memory buffers buffer the incoming packets. * The model has three slots. Sbuf is always occupied. * sbuf (store) - Receive interrupt puts packets here. * hbuf (hold) - When sbuf is full, put buffer here and From owner-p4-projects@FreeBSD.ORG Sun Mar 9 20:32:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 144DD10656F7; Sun, 9 Mar 2008 20:32:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC9121065670 for ; Sun, 9 Mar 2008 20:32:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D38328FC13 for ; Sun, 9 Mar 2008 20:32:21 +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.14.1/8.14.1) with ESMTP id m29KWLic065962 for ; Sun, 9 Mar 2008 20:32:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29KWLxf065960 for perforce@freebsd.org; Sun, 9 Mar 2008 20:32:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 9 Mar 2008 20:32:21 GMT Message-Id: <200803092032.m29KWLxf065960@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 137258 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, 09 Mar 2008 20:32:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=137258 Change 137258 by rwatson@rwatson_cinnamon on 2008/03/09 20:31:58 Revert branch-local change that isn't part of the BPF zero-copy commit candidate patch. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/if_tap.c#5 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/if_tap.c#5 (text+ko) ==== @@ -735,10 +735,6 @@ tapp->baudrate = ifp->if_baudrate; break; - case TAPGETUNIT: - *(u_int *)data = dev2unit(dev); - break; - case TAPSDEBUG: tapdebug = *(int *)data; break; From owner-p4-projects@FreeBSD.ORG Sun Mar 9 20:32:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39E561065719; Sun, 9 Mar 2008 20:32:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C3C21065673 for ; Sun, 9 Mar 2008 20:32:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 028958FC14 for ; Sun, 9 Mar 2008 20:32:22 +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.14.1/8.14.1) with ESMTP id m29KWL7B065967 for ; Sun, 9 Mar 2008 20:32:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29KWLeJ065965 for perforce@freebsd.org; Sun, 9 Mar 2008 20:32:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 9 Mar 2008 20:32:21 GMT Message-Id: <200803092032.m29KWLeJ065965@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 137259 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, 09 Mar 2008 20:32:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=137259 Change 137259 by rwatson@rwatson_cinnamon on 2008/03/09 20:32:18 Remove another branch-local change. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/if_tap.h#3 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/if_tap.h#3 (text+ko) ==== @@ -55,7 +55,6 @@ #define TAPGDEBUG _IOR('t', 89, int) #define TAPSIFINFO _IOW('t', 91, struct tapinfo) #define TAPGIFINFO _IOR('t', 92, struct tapinfo) -#define TAPGETUNIT _IOR('t', 93, u_int) /* VMware ioctl's */ #define VMIO_SIOCSIFFLAGS _IOWINT('V', 0) From owner-p4-projects@FreeBSD.ORG Sun Mar 9 20:36:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3D841065672; Sun, 9 Mar 2008 20:36:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 924C3106566B for ; Sun, 9 Mar 2008 20:36:26 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5ED2A8FC15 for ; Sun, 9 Mar 2008 20:36:26 +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.14.1/8.14.1) with ESMTP id m29KaQlp066171 for ; Sun, 9 Mar 2008 20:36:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29KaQkr066169 for perforce@freebsd.org; Sun, 9 Mar 2008 20:36:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 9 Mar 2008 20:36:26 GMT Message-Id: <200803092036.m29KaQkr066169@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 137261 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, 09 Mar 2008 20:36:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=137261 Change 137261 by rwatson@rwatson_cinnamon on 2008/03/09 20:35:52 Won't need this once merged. Affected files ... .. //depot/projects/zcopybpf/src/usr.sbin/netstat/Makefile#5 edit Differences ... ==== //depot/projects/zcopybpf/src/usr.sbin/netstat/Makefile#5 (text+ko) ==== @@ -10,7 +10,6 @@ WARNS?= 3 CFLAGS+=-fno-strict-aliasing -CFLAGS+=-I../../sys CFLAGS+=-DIPSEC CFLAGS+=-DSCTP From owner-p4-projects@FreeBSD.ORG Sun Mar 9 21:20:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B0821065677; Sun, 9 Mar 2008 21:20:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29DC31065672 for ; Sun, 9 Mar 2008 21:20:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 147278FC27 for ; Sun, 9 Mar 2008 21:20:12 +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.14.1/8.14.1) with ESMTP id m29LKBGc078106 for ; Sun, 9 Mar 2008 21:20:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29LKBVV078104 for perforce@freebsd.org; Sun, 9 Mar 2008 21:20:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 9 Mar 2008 21:20:11 GMT Message-Id: <200803092120.m29LKBVV078104@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 137265 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, 09 Mar 2008 21:20:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=137265 Change 137265 by rwatson@rwatson_cinnamon on 2008/03/09 21:20:06 Integrate zero-copy BPF to loop back bpf_filter.c style changes. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf_filter.c#6 integrate Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf_filter.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/bpf_filter.c,v 1.29 2007/12/25 13:24:02 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/net/bpf_filter.c,v 1.30 2008/03/09 21:13:43 rwatson Exp $"); #include @@ -186,13 +186,13 @@ while (1) { ++pc; switch (pc->code) { - default: #ifdef _KERNEL return 0; #else abort(); #endif + case BPF_RET|BPF_K: return ((u_int)pc->k); From owner-p4-projects@FreeBSD.ORG Sun Mar 9 21:21:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91AB01065671; Sun, 9 Mar 2008 21:21:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 513A9106566B for ; Sun, 9 Mar 2008 21:21:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3C4FC8FC12 for ; Sun, 9 Mar 2008 21:21:13 +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.14.1/8.14.1) with ESMTP id m29LLDiD078174 for ; Sun, 9 Mar 2008 21:21:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29LLDF8078172 for perforce@freebsd.org; Sun, 9 Mar 2008 21:21:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 9 Mar 2008 21:21:13 GMT Message-Id: <200803092121.m29LLDF8078172@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 137266 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, 09 Mar 2008 21:21:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=137266 Change 137266 by rwatson@rwatson_cinnamon on 2008/03/09 21:20:50 Revert two minor local style changes in the branch that weren't merged to CVS. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf_filter.c#7 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf_filter.c#7 (text+ko) ==== @@ -115,12 +115,14 @@ ((u_int32_t)np[0] << 16) | ((u_int32_t)np[1] << 8) | (u_int32_t)np[2]; + case 2: return ((u_int32_t)cp[0] << 24) | ((u_int32_t)cp[1] << 16) | ((u_int32_t)np[0] << 8) | (u_int32_t)np[1]; + default: return ((u_int32_t)cp[0] << 24) | From owner-p4-projects@FreeBSD.ORG Sun Mar 9 21:55:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1827F1065677; Sun, 9 Mar 2008 21:55:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C73911065674 for ; Sun, 9 Mar 2008 21:55:50 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B48F58FC20 for ; Sun, 9 Mar 2008 21:55:50 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m29LtoYI079533 for ; Sun, 9 Mar 2008 21:55:50 GMT (envelope-from marius@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29Ltn7X079531 for perforce@freebsd.org; Sun, 9 Mar 2008 21:55:49 GMT (envelope-from marius@freebsd.org) Date: Sun, 9 Mar 2008 21:55:49 GMT Message-Id: <200803092155.m29Ltn7X079531@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marius@freebsd.org using -f From: Marius Strobl To: Perforce Change Reviews Cc: Subject: PERFORCE change 137268 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, 09 Mar 2008 21:55:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=137268 Change 137268 by marius@flak on 2008/03/09 21:55:08 IFC @137264 Affected files ... .. //depot/projects/usiii/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/usiii/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/usiii/amd64/amd64/pmap.c#4 integrate .. //depot/projects/usiii/amd64/conf/GENERIC#6 integrate .. //depot/projects/usiii/amd64/include/pmap.h#3 integrate .. //depot/projects/usiii/amd64/include/smp.h#3 integrate .. //depot/projects/usiii/arm/arm/pmap.c#5 integrate .. //depot/projects/usiii/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/usiii/arm/conf/AVILA#4 integrate .. //depot/projects/usiii/arm/include/pmap.h#3 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/usiii/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/usiii/compat/linux/linux_futex.c#2 integrate .. //depot/projects/usiii/conf/NOTES#7 integrate .. //depot/projects/usiii/conf/files#6 integrate .. //depot/projects/usiii/conf/files.powerpc#5 integrate .. //depot/projects/usiii/conf/kmod.mk#3 integrate .. //depot/projects/usiii/conf/options#6 integrate .. //depot/projects/usiii/conf/options.powerpc#4 integrate .. //depot/projects/usiii/ddb/db_command.c#3 integrate .. //depot/projects/usiii/ddb/db_examine.c#3 integrate .. //depot/projects/usiii/ddb/db_input.c#3 integrate .. //depot/projects/usiii/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/usiii/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/usiii/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/usiii/dev/ata/ata-pci.h#4 integrate .. //depot/projects/usiii/dev/bge/if_bge.c#6 integrate .. //depot/projects/usiii/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/usiii/dev/cmx/cmx.c#1 branch .. //depot/projects/usiii/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/usiii/dev/cmx/cmxreg.h#1 branch .. //depot/projects/usiii/dev/cmx/cmxvar.h#1 branch .. //depot/projects/usiii/dev/gem/if_gem.c#6 integrate .. //depot/projects/usiii/dev/hptrr/hptrr_os_bsd.c#3 integrate .. //depot/projects/usiii/dev/hptrr/hptrr_osm_bsd.c#3 integrate .. //depot/projects/usiii/dev/hptrr/ldm.h#3 integrate .. //depot/projects/usiii/dev/hptrr/osm.h#3 integrate .. //depot/projects/usiii/dev/ic/quicc.h#1 branch .. //depot/projects/usiii/dev/igb/if_igb.c#2 integrate .. //depot/projects/usiii/dev/lge/if_lge.c#4 integrate .. //depot/projects/usiii/dev/mii/brgphy.c#3 integrate .. //depot/projects/usiii/dev/mii/ciphy.c#2 integrate .. //depot/projects/usiii/dev/mii/miidevs#4 integrate .. //depot/projects/usiii/dev/mii/rgephy.c#3 integrate .. //depot/projects/usiii/dev/msk/if_msk.c#5 integrate .. //depot/projects/usiii/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/usiii/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/usiii/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/usiii/dev/pccard/pccarddevs#3 integrate .. //depot/projects/usiii/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/usiii/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/usiii/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/usiii/dev/quicc/quicc_core.c#1 branch .. //depot/projects/usiii/dev/re/if_re.c#4 integrate .. //depot/projects/usiii/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/usiii/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/usiii/dev/scc/scc_bus.h#2 integrate .. //depot/projects/usiii/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/usiii/dev/tsec/if_tsec.c#1 branch .. //depot/projects/usiii/dev/tsec/if_tsec.h#1 branch .. //depot/projects/usiii/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/usiii/dev/uart/uart.h#2 integrate .. //depot/projects/usiii/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/usiii/dev/uart/uart_bus_scc.c#2 integrate .. //depot/projects/usiii/dev/uart/uart_cpu_powerpc.c#3 integrate .. //depot/projects/usiii/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/usiii/dev/usb/ehci.c#4 integrate .. //depot/projects/usiii/dev/usb/if_axe.c#4 integrate .. //depot/projects/usiii/dev/usb/usbdevs#6 integrate .. //depot/projects/usiii/dev/usb/uslcom.c#1 branch .. //depot/projects/usiii/fs/nwfs/nwfs_node.c#4 integrate .. //depot/projects/usiii/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/usiii/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/usiii/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/usiii/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/projects/usiii/geom/part/g_part_vtoc8.c#1 branch .. //depot/projects/usiii/i386/conf/GENERIC#6 integrate .. //depot/projects/usiii/i386/cpufreq/est.c#3 integrate .. //depot/projects/usiii/i386/i386/identcpu.c#3 integrate .. //depot/projects/usiii/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/usiii/i386/include/_types.h#2 integrate .. //depot/projects/usiii/i386/include/float.h#2 integrate .. //depot/projects/usiii/i386/include/smp.h#3 integrate .. //depot/projects/usiii/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/usiii/kern/init_main.c#5 integrate .. //depot/projects/usiii/kern/init_sysent.c#4 integrate .. //depot/projects/usiii/kern/kern_cpuset.c#1 branch .. //depot/projects/usiii/kern/kern_descrip.c#5 integrate .. //depot/projects/usiii/kern/kern_lock.c#5 integrate .. //depot/projects/usiii/kern/kern_priv.c#2 integrate .. //depot/projects/usiii/kern/kern_shutdown.c#4 integrate .. //depot/projects/usiii/kern/kern_sig.c#4 integrate .. //depot/projects/usiii/kern/kern_thread.c#5 integrate .. //depot/projects/usiii/kern/sched_4bsd.c#5 integrate .. //depot/projects/usiii/kern/sched_ule.c#6 integrate .. //depot/projects/usiii/kern/subr_bus.c#4 integrate .. //depot/projects/usiii/kern/subr_smp.c#5 integrate .. //depot/projects/usiii/kern/subr_witness.c#5 integrate .. //depot/projects/usiii/kern/syscalls.c#4 integrate .. //depot/projects/usiii/kern/syscalls.master#5 integrate .. //depot/projects/usiii/kern/systrace_args.c#4 integrate .. //depot/projects/usiii/kern/vfs_bio.c#6 integrate .. //depot/projects/usiii/kern/vfs_subr.c#6 integrate .. //depot/projects/usiii/modules/Makefile#7 integrate .. //depot/projects/usiii/modules/cmx/Makefile#1 branch .. //depot/projects/usiii/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/usiii/modules/geom/Makefile#4 integrate .. //depot/projects/usiii/modules/geom/geom_apple/Makefile#2 delete .. //depot/projects/usiii/modules/geom/geom_gpt/Makefile#2 delete .. //depot/projects/usiii/modules/geom/geom_part/Makefile#1 branch .. //depot/projects/usiii/modules/uslcom/Makefile#1 branch .. //depot/projects/usiii/modules/zfs/Makefile#4 integrate .. //depot/projects/usiii/net/bpf_filter.c#4 integrate .. //depot/projects/usiii/net/if.c#3 integrate .. //depot/projects/usiii/net/if_ethersubr.c#4 integrate .. //depot/projects/usiii/net/if_gif.c#3 integrate .. //depot/projects/usiii/netgraph/ng_base.c#5 integrate .. //depot/projects/usiii/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/usiii/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/usiii/netgraph/ng_nat.c#2 integrate .. //depot/projects/usiii/netgraph/ng_nat.h#2 integrate .. //depot/projects/usiii/netgraph/ng_pppoe.c#6 integrate .. //depot/projects/usiii/netinet/in.h#2 integrate .. //depot/projects/usiii/netinet/in_pcb.c#4 integrate .. //depot/projects/usiii/netinet/ip_fw_nat.c#2 integrate .. //depot/projects/usiii/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/usiii/netinet/libalias/alias.c#2 integrate .. //depot/projects/usiii/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/usiii/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/usiii/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/usiii/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/usiii/netinet/libalias/alias_proxy.c#2 integrate .. //depot/projects/usiii/netinet/libalias/alias_smedia.c#2 integrate .. //depot/projects/usiii/netinet/tcp_input.c#4 integrate .. //depot/projects/usiii/netinet/tcp_output.c#3 integrate .. //depot/projects/usiii/netipsec/key.c#2 integrate .. //depot/projects/usiii/netipsec/key_debug.c#2 integrate .. //depot/projects/usiii/netncp/ncp_conn.h#2 integrate .. //depot/projects/usiii/netsmb/smb_conn.h#2 integrate .. //depot/projects/usiii/nfs4client/nfs4_idmap.c#3 integrate .. //depot/projects/usiii/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/usiii/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/usiii/pci/if_rl.c#3 integrate .. //depot/projects/usiii/pci/if_rlreg.h#4 integrate .. //depot/projects/usiii/powerpc/aim/locore.S#3 integrate .. //depot/projects/usiii/powerpc/aim/machdep.c#3 integrate .. //depot/projects/usiii/powerpc/aim/swtch.S#2 integrate .. //depot/projects/usiii/powerpc/aim/trap.c#2 integrate .. //depot/projects/usiii/powerpc/aim/trap_subr.S#2 integrate .. //depot/projects/usiii/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/usiii/powerpc/booke/clock.c#1 branch .. //depot/projects/usiii/powerpc/booke/copyinout.c#1 branch .. //depot/projects/usiii/powerpc/booke/interrupt.c#1 branch .. //depot/projects/usiii/powerpc/booke/locore.S#1 branch .. //depot/projects/usiii/powerpc/booke/machdep.c#1 branch .. //depot/projects/usiii/powerpc/booke/pmap.c#1 branch .. //depot/projects/usiii/powerpc/booke/support.S#1 branch .. //depot/projects/usiii/powerpc/booke/swtch.S#1 branch .. //depot/projects/usiii/powerpc/booke/trap.c#1 branch .. //depot/projects/usiii/powerpc/booke/trap_subr.S#1 branch .. //depot/projects/usiii/powerpc/booke/uio_machdep.c#1 branch .. //depot/projects/usiii/powerpc/booke/vm_machdep.c#1 branch .. //depot/projects/usiii/powerpc/conf/MPC85XX#1 branch .. //depot/projects/usiii/powerpc/conf/NOTES#6 integrate .. //depot/projects/usiii/powerpc/include/frame.h#2 integrate .. //depot/projects/usiii/powerpc/include/hid.h#3 integrate .. //depot/projects/usiii/powerpc/include/intr_machdep.h#3 integrate .. //depot/projects/usiii/powerpc/include/kdb.h#2 integrate .. //depot/projects/usiii/powerpc/include/md_var.h#3 integrate .. //depot/projects/usiii/powerpc/include/mmuvar.h#2 integrate .. //depot/projects/usiii/powerpc/include/ocpbus.h#1 branch .. //depot/projects/usiii/powerpc/include/openpicvar.h#3 integrate .. //depot/projects/usiii/powerpc/include/pcb.h#2 integrate .. //depot/projects/usiii/powerpc/include/pcpu.h#2 integrate .. //depot/projects/usiii/powerpc/include/pmap.h#2 integrate .. //depot/projects/usiii/powerpc/include/psl.h#2 integrate .. //depot/projects/usiii/powerpc/include/pte.h#2 integrate .. //depot/projects/usiii/powerpc/include/sf_buf.h#2 integrate .. //depot/projects/usiii/powerpc/include/spr.h#3 integrate .. //depot/projects/usiii/powerpc/include/tlb.h#1 branch .. //depot/projects/usiii/powerpc/include/trap.h#2 integrate .. //depot/projects/usiii/powerpc/include/trap_aim.h#1 branch .. //depot/projects/usiii/powerpc/include/trap_booke.h#1 branch .. //depot/projects/usiii/powerpc/include/vmparam.h#4 integrate .. //depot/projects/usiii/powerpc/mpc85xx/nexus.c#1 branch .. //depot/projects/usiii/powerpc/mpc85xx/ocpbus.c#1 branch .. //depot/projects/usiii/powerpc/mpc85xx/ocpbus.h#1 branch .. //depot/projects/usiii/powerpc/mpc85xx/opic.c#1 branch .. //depot/projects/usiii/powerpc/mpc85xx/pci_ocp.c#1 branch .. //depot/projects/usiii/powerpc/powermac/openpic_macio.c#3 integrate .. //depot/projects/usiii/powerpc/powerpc/autoconf.c#2 integrate .. //depot/projects/usiii/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/usiii/powerpc/powerpc/db_trace.c#3 integrate .. //depot/projects/usiii/powerpc/powerpc/gdb_machdep.c#2 integrate .. //depot/projects/usiii/powerpc/powerpc/genassym.c#4 integrate .. //depot/projects/usiii/powerpc/powerpc/intr_machdep.c#4 integrate .. //depot/projects/usiii/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/usiii/powerpc/powerpc/openpic.c#3 integrate .. //depot/projects/usiii/powerpc/powerpc/pic_if.m#3 integrate .. //depot/projects/usiii/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/usiii/security/audit/audit.c#5 integrate .. //depot/projects/usiii/security/audit/audit_bsm_klib.c#5 integrate .. //depot/projects/usiii/security/audit/audit_private.h#3 integrate .. //depot/projects/usiii/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/usiii/security/audit/audit_trigger.c#2 integrate .. //depot/projects/usiii/security/audit/audit_worker.c#5 integrate .. //depot/projects/usiii/sparc64/include/tlb.h#3 integrate .. //depot/projects/usiii/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/usiii/sparc64/sparc64/cheetah.c#3 integrate .. //depot/projects/usiii/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/usiii/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/usiii/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/usiii/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/usiii/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/usiii/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/usiii/sys/_types.h#2 integrate .. //depot/projects/usiii/sys/buf.h#4 integrate .. //depot/projects/usiii/sys/bufobj.h#2 integrate .. //depot/projects/usiii/sys/bus.h#3 integrate .. //depot/projects/usiii/sys/cpuset.h#1 branch .. //depot/projects/usiii/sys/fcntl.h#3 integrate .. //depot/projects/usiii/sys/lockmgr.h#5 integrate .. //depot/projects/usiii/sys/mount.h#3 integrate .. //depot/projects/usiii/sys/param.h#6 integrate .. //depot/projects/usiii/sys/pcpu.h#4 integrate .. //depot/projects/usiii/sys/proc.h#6 integrate .. //depot/projects/usiii/sys/sched.h#2 integrate .. //depot/projects/usiii/sys/smp.h#3 integrate .. //depot/projects/usiii/sys/syscall.h#4 integrate .. //depot/projects/usiii/sys/syscall.mk#4 integrate .. //depot/projects/usiii/sys/sysproto.h#4 integrate .. //depot/projects/usiii/sys/types.h#3 integrate .. //depot/projects/usiii/sys/vnode.h#5 integrate .. //depot/projects/usiii/sys/vtoc.h#1 branch .. //depot/projects/usiii/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/usiii/ufs/ufs/extattr.h#2 integrate .. //depot/projects/usiii/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/usiii/vm/vm_fault.c#5 integrate .. //depot/projects/usiii/vm/vm_map.h#3 integrate Differences ... ==== //depot/projects/usiii/amd64/amd64/identcpu.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.157 2008/02/02 23:17:27 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.158 2008/03/02 07:58:40 jeff Exp $"); #include "opt_cpu.h" @@ -97,6 +97,10 @@ { "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */ }; +int cpu_cores; +int cpu_logical; + + extern int pq_l2size; extern int pq_l2nways; @@ -360,11 +364,13 @@ if ((regs[0] & 0x1f) != 0) cmp = ((regs[0] >> 26) & 0x3f) + 1; } + cpu_cores = cmp; + cpu_logical = htt / cmp; if (cmp > 1) printf("\n Cores per package: %d", cmp); if ((htt / cmp) > 1) printf("\n Logical CPUs per core: %d", - htt / cmp); + cpu_logical); } } /* Avoid ugly blank lines: only print newline when we have to. */ ==== //depot/projects/usiii/amd64/amd64/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.287 2007/08/02 21:17:58 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.288 2008/03/02 07:58:40 jeff Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -83,12 +83,6 @@ extern struct pcpu __pcpu[]; -/* - * CPU topology map datastructures for HTT. - */ -static struct cpu_group mp_groups[MAXCPU]; -static struct cpu_top mp_top; - /* AP uses this during bootstrap. Do not staticize. */ char *bootSTK; static int bootAP; @@ -182,40 +176,38 @@ mem_range_softc.mr_op->initAP(&mem_range_softc); } -void -mp_topology(void) +struct cpu_group * +cpu_topo(void) { - struct cpu_group *group; - int apic_id; - int groups; - int cpu; - - /* Build the smp_topology map. */ - /* Nothing to do if there is no HTT support. */ - if (hyperthreading_cpus <= 1) - return; - group = &mp_groups[0]; - groups = 1; - for (cpu = 0, apic_id = 0; apic_id <= MAX_APIC_ID; apic_id++) { - if (!cpu_info[apic_id].cpu_present) - continue; - /* - * If the current group has members and we're not a logical - * cpu, create a new group. - */ - if (group->cg_count != 0 && - (apic_id % hyperthreading_cpus) == 0) { - group++; - groups++; - } - group->cg_count++; - group->cg_mask |= 1 << cpu; - cpu++; + if (cpu_cores == 0) + cpu_cores = 1; + if (cpu_logical == 0) + cpu_logical = 1; + if (mp_ncpus % (cpu_cores * cpu_logical) != 0) { + printf("WARNING: Non-uniform processors.\n"); + printf("WARNING: Using suboptimal topology.\n"); + return (smp_topo_none()); } - - mp_top.ct_count = groups; - mp_top.ct_group = mp_groups; - smp_topology = &mp_top; + /* + * No multi-core or hyper-threaded. + */ + if (cpu_logical * cpu_cores == 1) + return (smp_topo_none()); + /* + * Only HTT no multi-core. + */ + if (cpu_logical > 1 && cpu_cores == 1) + return (smp_topo_1level(CG_SHARE_L1, cpu_logical, CG_FLAG_HTT)); + /* + * Only multi-core no HTT. + */ + if (cpu_cores > 1 && cpu_logical == 1) + return (smp_topo_1level(CG_SHARE_NONE, cpu_cores, 0)); + /* + * Both HTT and multi-core. + */ + return (smp_topo_2level(CG_SHARE_NONE, cpu_cores, + CG_SHARE_L1, cpu_logical, CG_FLAG_HTT)); } /* @@ -409,9 +401,6 @@ } set_interrupt_apic_ids(); - - /* Last, setup the cpu topology now that we have probed CPUs */ - mp_topology(); } ==== //depot/projects/usiii/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -7,7 +7,7 @@ * All rights reserved. * Copyright (c) 2003 Peter Wemm * All rights reserved. - * Copyright (c) 2005 Alan L. Cox + * Copyright (c) 2005-2008 Alan L. Cox * All rights reserved. * * This code is derived from software contributed to Berkeley by @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.605 2008/01/17 18:25:51 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.606 2008/03/04 18:50:15 alc Exp $"); /* * Manages physical address maps. @@ -107,10 +107,12 @@ #include "opt_msgbuf.h" #include "opt_pmap.h" +#include "opt_vm.h" #include #include #include +#include #include #include #include @@ -134,6 +136,7 @@ #include #include #include +#include #include #include @@ -162,6 +165,9 @@ #define PV_STAT(x) do { } while (0) #endif +#define pa_index(pa) ((pa) >> PDRSHIFT) +#define pa_to_pvh(pa) (&pv_table[pa_index(pa)]) + struct pmap kernel_pmap_store; vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ @@ -173,6 +179,12 @@ vm_offset_t kernel_vm_end; pt_entry_t pg_nx; +SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters"); + +static int pg_ps_enabled; +SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RD, &pg_ps_enabled, 0, + "Are large page mappings enabled?"); + static u_int64_t KPTphys; /* phys addr of kernel level 1 */ static u_int64_t KPDphys; /* phys addr of kernel level 2 */ u_int64_t KPDPphys; /* phys addr of kernel level 3 */ @@ -185,6 +197,7 @@ * Data for the pv entry allocation mechanism */ static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; +static struct md_page *pv_table; static int shpgperproc = PMAP_SHPGPERPROC; /* @@ -201,11 +214,29 @@ static void free_pv_entry(pmap_t pmap, pv_entry_t pv); static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); +static void pmap_pv_demote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa); +static boolean_t pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, vm_page_t m); +static void pmap_pv_promote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa); +static void pmap_pvh_free(struct md_page *pvh, pmap_t pmap, vm_offset_t va); +static pv_entry_t pmap_pvh_remove(struct md_page *pvh, pmap_t pmap, + vm_offset_t va); +static boolean_t pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); +static boolean_t pmap_enter_pde(pmap_t pmap, vm_offset_t va, vm_page_t m, + vm_prot_t prot); static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte); +static void pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte); +static boolean_t pmap_is_modified_pvh(struct md_page *pvh); +static vm_page_t pmap_lookup_pt_page(pmap_t pmap, vm_offset_t va); +static void pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); +static boolean_t pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva, + vm_prot_t prot); +static int pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva, + vm_page_t *free); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva, pd_entry_t ptepde, vm_page_t *free); +static void pmap_remove_pt_page(pmap_t pmap, vm_page_t mpte); static void pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde, vm_page_t *free); static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, @@ -361,21 +392,6 @@ } -static __inline pt_entry_t * -pmap_pte_pde(pmap_t pmap, vm_offset_t va, pd_entry_t *ptepde) -{ - pd_entry_t *pde; - - pde = pmap_pde(pmap, va); - if (pde == NULL || (*pde & PG_V) == 0) - return NULL; - *ptepde = *pde; - if ((*pde & PG_PS) != 0) /* compat with i386 pmap_pte() */ - return ((pt_entry_t *)pde); - return (pmap_pde_to_pte(pde, va)); -} - - PMAP_INLINE pt_entry_t * vtopte(vm_offset_t va) { @@ -521,6 +537,7 @@ */ PMAP_LOCK_INIT(kernel_pmap); kernel_pmap->pm_pml4 = (pdp_entry_t *) (KERNBASE + KPML4phys); + kernel_pmap->pm_root = NULL; kernel_pmap->pm_active = -1; /* don't allow deactivation */ TAILQ_INIT(&kernel_pmap->pm_pvchunk); nkpt = NKPT; @@ -620,8 +637,28 @@ void pmap_init(void) { + pd_entry_t *pd; + vm_page_t mpte; + vm_size_t s; + int i, pv_npg; /* + * Initialize the vm page array entries for the kernel pmap's + * page table pages. + */ + pd = pmap_pde(kernel_pmap, VM_MIN_KERNEL_ADDRESS); + for (i = 0; i < nkpt; i++) { + if ((pd[i] & (PG_PS | PG_V)) == (PG_PS | PG_V)) + continue; + mpte = PHYS_TO_VM_PAGE(pd[i] & PG_FRAME); + KASSERT(mpte >= vm_page_array && + mpte < &vm_page_array[vm_page_array_size], + ("pmap_init: page table page is out of range")); + mpte->pindex = pmap_pde_pindex(VM_MIN_KERNEL_ADDRESS) + i; + mpte->phys_addr = pd[i] & PG_FRAME; + } + + /* * Initialize the address space (zone) for the pv entries. Set a * high water mark so that the system can recover from excessive * numbers of pv entries. @@ -630,9 +667,28 @@ 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); + + /* + * Are large page mappings enabled? + */ + TUNABLE_INT_FETCH("vm.pmap.pg_ps_enabled", &pg_ps_enabled); + + /* + * Calculate the size of the pv head table for superpages. + */ + for (i = 0; phys_avail[i + 1]; i += 2); + pv_npg = round_2mpage(phys_avail[(i - 2) + 1]) / NBPDR; + + /* + * Allocate memory for the pv head table for superpages. + */ + s = (vm_size_t)(pv_npg * sizeof(struct md_page)); + s = round_page(s); + pv_table = (struct md_page *)kmem_alloc(kernel_map, s); + for (i = 0; i < pv_npg; i++) + TAILQ_INIT(&pv_table[i].pv_list); } -SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters"); static int pmap_pventry_proc(SYSCTL_HANDLER_ARGS) { @@ -663,6 +719,25 @@ SYSCTL_PROC(_vm_pmap, OID_AUTO, shpgperproc, CTLTYPE_INT|CTLFLAG_RW, &shpgperproc, 0, pmap_shpgperproc_proc, "IU", "Page share factor per proc"); +SYSCTL_NODE(_vm_pmap, OID_AUTO, pde, CTLFLAG_RD, 0, + "2MB page mapping counters"); + +static u_long pmap_pde_demotions; +SYSCTL_ULONG(_vm_pmap_pde, OID_AUTO, demotions, CTLFLAG_RD, + &pmap_pde_demotions, 0, "2MB page demotions"); + +static u_long pmap_pde_mappings; +SYSCTL_ULONG(_vm_pmap_pde, OID_AUTO, mappings, CTLFLAG_RD, + &pmap_pde_mappings, 0, "2MB page mappings"); + +static u_long pmap_pde_p_failures; +SYSCTL_ULONG(_vm_pmap_pde, OID_AUTO, p_failures, CTLFLAG_RD, + &pmap_pde_p_failures, 0, "2MB page promotion failures"); + +static u_long pmap_pde_promotions; +SYSCTL_ULONG(_vm_pmap_pde, OID_AUTO, promotions, CTLFLAG_RD, + &pmap_pde_promotions, 0, "2MB page promotions"); + /*************************************************** * Low level helper routines..... @@ -1097,8 +1172,105 @@ while (free != NULL) { m = free; free = m->right; - vm_page_free_zero(m); + /* Preserve the page's PG_ZERO setting. */ + vm_page_free_toq(m); + } +} + +/* + * Schedule the specified unused page table page to be freed. Specifically, + * add the page to the specified list of pages that will be released to the + * physical memory manager after the TLB has been updated. + */ +static __inline void +pmap_add_delayed_free_list(vm_page_t m, vm_page_t *free, boolean_t set_PG_ZERO) +{ + + if (set_PG_ZERO) + m->flags |= PG_ZERO; + else + m->flags &= ~PG_ZERO; + m->right = *free; + *free = m; +} + +/* + * Inserts the specified page table page into the specified pmap's collection + * of idle page table pages. Each of a pmap's page table pages is responsible + * for mapping a distinct range of virtual addresses. The pmap's collection is + * ordered by this virtual address range. + */ +static void +pmap_insert_pt_page(pmap_t pmap, vm_page_t mpte) +{ + vm_page_t root; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + root = pmap->pm_root; + if (root == NULL) { + mpte->left = NULL; + mpte->right = NULL; + } else { + root = vm_page_splay(mpte->pindex, root); + if (mpte->pindex < root->pindex) { + mpte->left = root->left; + mpte->right = root; + root->left = NULL; + } else if (mpte->pindex == root->pindex) + panic("pmap_insert_pt_page: pindex already inserted"); + else { + mpte->right = root->right; + mpte->left = root; + root->right = NULL; + } + } + pmap->pm_root = mpte; +} + +/* + * Looks for a page table page mapping the specified virtual address in the + * specified pmap's collection of idle page table pages. Returns NULL if there + * is no page table page corresponding to the specified virtual address. + */ +static vm_page_t +pmap_lookup_pt_page(pmap_t pmap, vm_offset_t va) +{ + vm_page_t mpte; + vm_pindex_t pindex = pmap_pde_pindex(va); + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + if ((mpte = pmap->pm_root) != NULL && mpte->pindex != pindex) { + mpte = vm_page_splay(pindex, mpte); + if ((pmap->pm_root = mpte)->pindex != pindex) + mpte = NULL; + } + return (mpte); +} + +/* + * Removes the specified page table page from the specified pmap's collection + * of idle page table pages. The specified page table page must be a member of + * the pmap's collection. + */ +static void +pmap_remove_pt_page(pmap_t pmap, vm_page_t mpte) +{ + vm_page_t root; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + if (mpte != pmap->pm_root) { + root = vm_page_splay(mpte->pindex, pmap->pm_root); + KASSERT(mpte == root, + ("pmap_remove_pt_page: mpte %p is missing from pmap %p", + mpte, pmap)); + } + if (mpte->left == NULL) + root = mpte->right; + else { + root = vm_page_splay(mpte->pindex, mpte->left); + root->right = mpte->right; } + pmap->pm_root = root; } /* @@ -1177,8 +1349,7 @@ * Put page on a list so that it is released after * *ALL* TLB shootdown is done */ - m->right = *free; - *free = m; + pmap_add_delayed_free_list(m, free, TRUE); return 1; } @@ -1205,6 +1376,7 @@ PMAP_LOCK_INIT(pmap); pmap->pm_pml4 = (pml4_entry_t *)(KERNBASE + KPML4phys); + pmap->pm_root = NULL; pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvchunk); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); @@ -1241,6 +1413,7 @@ /* install self-referential address mapping entry(s) */ pmap->pm_pml4[PML4PML4I] = VM_PAGE_TO_PHYS(pml4pg) | PG_V | PG_RW | PG_A | PG_M; + pmap->pm_root = NULL; pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvchunk); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); @@ -1416,7 +1589,7 @@ { vm_pindex_t ptepindex; pd_entry_t *pd; - vm_page_t m, free; + vm_page_t m; KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT || (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK, @@ -1437,13 +1610,13 @@ * normal 4K page. */ if (pd != NULL && (*pd & (PG_PS | PG_V)) == (PG_PS | PG_V)) { - *pd = 0; - pd = NULL; - pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE; - free = NULL; - pmap_unuse_pt(pmap, va, *pmap_pdpe(pmap, va), &free); - pmap_invalidate_all(kernel_pmap); - pmap_free_zero_pages(free); + if (!pmap_demote_pde(pmap, pd, va)) { + /* + * Invalidation of the 2MB page mapping may have caused + * the deallocation of the underlying PD page. + */ + pd = NULL; + } } /* @@ -1483,6 +1656,8 @@ KASSERT(pmap->pm_stats.resident_count == 0, ("pmap_release: pmap resident count %ld != 0", pmap->pm_stats.resident_count)); + KASSERT(pmap->pm_root == NULL, + ("pmap_release: pmap has reserved page table page(s)")); m = PHYS_TO_VM_PAGE(pmap->pm_pml4[PML4PML4I] & PG_FRAME); @@ -1649,11 +1824,16 @@ * drastic measures to free some pages so we can allocate * another pv entry chunk. This is normally called to * unmap inactive pages, and if necessary, active pages. + * + * We do not, however, unmap 2mpages because subsequent accesses will + * allocate per-page pv entries until repromotion occurs, thereby + * exacerbating the shortage of free pv entries. */ static void pmap_collect(pmap_t locked_pmap, struct vpgqueues *vpq) { - pd_entry_t ptepde; + struct md_page *pvh; + pd_entry_t *pde; pmap_t pmap; pt_entry_t *pte, tpte; pv_entry_t next_pv, pv; @@ -1672,10 +1852,10 @@ else if (pmap != locked_pmap && !PMAP_TRYLOCK(pmap)) continue; pmap->pm_stats.resident_count--; - pte = pmap_pte_pde(pmap, va, &ptepde); - if (pte == NULL) { - panic("null pte in pmap_collect"); - } + pde = pmap_pde(pmap, va); + KASSERT((*pde & PG_PS) == 0, ("pmap_collect: found" + " a 2mpage in page %p's pv list", m)); + pte = pmap_pde_to_pte(pde, va); tpte = pte_load_clear(pte); KASSERT((tpte & PG_W) == 0, ("pmap_collect: wired pte %#lx", tpte)); @@ -1688,12 +1868,15 @@ vm_page_dirty(m); } free = NULL; - pmap_unuse_pt(pmap, va, ptepde, &free); + pmap_unuse_pt(pmap, va, *pde, &free); pmap_invalidate_page(pmap, va); pmap_free_zero_pages(free); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_EMPTY(&m->md.pv_list)) - vm_page_flag_clear(m, PG_WRITEABLE); + if (TAILQ_EMPTY(&m->md.pv_list)) { + pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); + if (TAILQ_EMPTY(&pvh->pv_list)) + vm_page_flag_clear(m, PG_WRITEABLE); + } free_pv_entry(pmap, pv); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); @@ -1828,24 +2011,133 @@ return (pv); } -static void -pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va) +/* + * First find and then remove the pv entry for the specified pmap and virtual + * address from the specified pv list. Returns the pv entry if found and NULL + * otherwise. This operation can be performed on pv lists for either 4KB or + * 2MB page mappings. + */ +static __inline pv_entry_t +pmap_pvh_remove(struct md_page *pvh, pmap_t pmap, vm_offset_t va) { pv_entry_t pv; - PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); - TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - if (pmap == PV_PMAP(pv) && va == pv->pv_va) + TAILQ_FOREACH(pv, &pvh->pv_list, pv_list) { + if (pmap == PV_PMAP(pv) && va == pv->pv_va) { + TAILQ_REMOVE(&pvh->pv_list, pv, pv_list); break; + } } - KASSERT(pv != NULL, ("pmap_remove_entry: pv not found")); - TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_EMPTY(&m->md.pv_list)) - vm_page_flag_clear(m, PG_WRITEABLE); + return (pv); +} + +/* + * After demotion from a 2MB page mapping to 512 4KB page mappings, + * destroy the pv entry for the 2MB page mapping and reinstantiate the pv + * entries for each of the 4KB page mappings. + */ +static void +pmap_pv_demote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa) +{ + struct md_page *pvh; + pv_entry_t pv; + vm_offset_t va_last; + vm_page_t m; + + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + KASSERT((pa & PDRMASK) == 0, + ("pmap_pv_demote_pde: pa is not 2mpage aligned")); + + /* + * Transfer the 2mpage's pv entry for this mapping to the first + * page's pv list. + */ + pvh = pa_to_pvh(pa); + va = trunc_2mpage(va); + pv = pmap_pvh_remove(pvh, pmap, va); + KASSERT(pv != NULL, ("pmap_pv_demote_pde: pv not found")); + m = PHYS_TO_VM_PAGE(pa); + TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); + /* Instantiate the remaining NPTEPG - 1 pv entries. */ + va_last = va + NBPDR - PAGE_SIZE; + do { + m++; + KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) == 0, + ("pmap_pv_demote_pde: page %p is not managed", m)); + va += PAGE_SIZE; + pmap_insert_entry(pmap, va, m); + } while (va < va_last); +} + +/* + * After promotion from 512 4KB page mappings to a single 2MB page mapping, + * replace the many pv entries for the 4KB page mappings by a single pv entry + * for the 2MB page mapping. + */ +static void +pmap_pv_promote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa) +{ + struct md_page *pvh; + pv_entry_t pv; + vm_offset_t va_last; + vm_page_t m; + + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + KASSERT((pa & PDRMASK) == 0, + ("pmap_pv_promote_pde: pa is not 2mpage aligned")); + + /* + * Transfer the first page's pv entry for this mapping to the + * 2mpage's pv list. Aside from avoiding the cost of a call + * to get_pv_entry(), a transfer avoids the possibility that + * get_pv_entry() calls pmap_collect() and that pmap_collect() + * removes one of the mappings that is being promoted. + */ + m = PHYS_TO_VM_PAGE(pa); + va = trunc_2mpage(va); + pv = pmap_pvh_remove(&m->md, pmap, va); + KASSERT(pv != NULL, ("pmap_pv_promote_pde: pv not found")); + pvh = pa_to_pvh(pa); + TAILQ_INSERT_TAIL(&pvh->pv_list, pv, pv_list); + /* Free the remaining NPTEPG - 1 pv entries. */ + va_last = va + NBPDR - PAGE_SIZE; + do { + m++; + va += PAGE_SIZE; + pmap_pvh_free(&m->md, pmap, va); + } while (va < va_last); +} + +/* + * First find and then destroy the pv entry for the specified pmap and virtual + * address. This operation can be performed on pv lists for either 4KB or 2MB + * page mappings. + */ +static void +pmap_pvh_free(struct md_page *pvh, pmap_t pmap, vm_offset_t va) +{ + pv_entry_t pv; + + pv = pmap_pvh_remove(pvh, pmap, va); + KASSERT(pv != NULL, ("pmap_pvh_free: pv not found")); free_pv_entry(pmap, pv); } +static void +pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va) +{ + struct md_page *pvh; + + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + pmap_pvh_free(&m->md, pmap, va); + if (TAILQ_EMPTY(&m->md.pv_list)) { + pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); + if (TAILQ_EMPTY(&pvh->pv_list)) + vm_page_flag_clear(m, PG_WRITEABLE); + } +} + /* * Create a pv entry for page at pa for * (pmap, va). @@ -1882,6 +2174,174 @@ } /* + * Create the pv entry for a 2MB page mapping. + */ +static boolean_t +pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, vm_page_t m) +{ + struct md_page *pvh; + pv_entry_t pv; + + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + if (pv_entry_count < pv_entry_high_water && + (pv = get_pv_entry(pmap, TRUE)) != NULL) { + pv->pv_va = va; + pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); + TAILQ_INSERT_TAIL(&pvh->pv_list, pv, pv_list); + return (TRUE); + } else + return (FALSE); +} + +/* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 9 22:00:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 408C11065671; Sun, 9 Mar 2008 22:00:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2DE8106566C for ; Sun, 9 Mar 2008 22:00:56 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E063B8FC12 for ; Sun, 9 Mar 2008 22:00:56 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m29M0u0T079713 for ; Sun, 9 Mar 2008 22:00:56 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29M0tSt079707 for perforce@freebsd.org; Sun, 9 Mar 2008 22:00:55 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 9 Mar 2008 22:00:55 GMT Message-Id: <200803092200.m29M0tSt079707@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 137269 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, 09 Mar 2008 22:00:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=137269 Change 137269 by kmacy@pandemonium:kmacy:xen31 on 2008/03/09 22:00:27 IFC 137263 Affected files ... .. //depot/projects/xen31/Makefile.inc1#6 integrate .. //depot/projects/xen31/ObsoleteFiles.inc#11 integrate .. //depot/projects/xen31/UPDATING#6 integrate .. //depot/projects/xen31/bin/chflags/chflags.1#2 integrate .. //depot/projects/xen31/bin/chflags/chflags.c#2 integrate .. //depot/projects/xen31/bin/realpath/realpath.1#2 integrate .. //depot/projects/xen31/bin/realpath/realpath.c#2 integrate .. //depot/projects/xen31/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/xen31/etc/Makefile#3 integrate .. //depot/projects/xen31/etc/ddb.conf#1 branch .. //depot/projects/xen31/etc/defaults/rc.conf#4 integrate .. //depot/projects/xen31/etc/rc.d/Makefile#4 integrate .. //depot/projects/xen31/etc/rc.d/ddb#1 branch .. //depot/projects/xen31/etc/rc.d/mountcritlocal#3 integrate .. //depot/projects/xen31/etc/rc.d/mountlate#2 integrate .. //depot/projects/xen31/games/fortune/datfiles/fortunes#9 integrate .. //depot/projects/xen31/gnu/usr.bin/binutils/ar/Makefile#3 integrate .. //depot/projects/xen31/gnu/usr.bin/binutils/ranlib/Makefile#3 integrate .. //depot/projects/xen31/include/pthread_np.h#5 integrate .. //depot/projects/xen31/lib/libc/posix1e/mac.c#2 integrate .. //depot/projects/xen31/lib/libc/posix1e/mac_exec.c#2 integrate .. //depot/projects/xen31/lib/libc/posix1e/mac_get.c#2 integrate .. //depot/projects/xen31/lib/libc/posix1e/mac_set.c#2 integrate .. //depot/projects/xen31/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/xen31/lib/libc/sys/Symbol.map#2 integrate .. //depot/projects/xen31/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/xen31/lib/libc/sys/mq_close.2#3 integrate .. //depot/projects/xen31/lib/libc/sys/mq_getattr.2#3 integrate .. //depot/projects/xen31/lib/libc/sys/mq_notify.2#3 integrate .. //depot/projects/xen31/lib/libc/sys/mq_open.2#3 integrate .. //depot/projects/xen31/lib/libc/sys/mq_receive.2#3 integrate .. //depot/projects/xen31/lib/libc/sys/mq_send.2#3 integrate .. //depot/projects/xen31/lib/libc/sys/mq_setattr.2#3 integrate .. //depot/projects/xen31/lib/libelf/elf_update.c#2 integrate .. //depot/projects/xen31/lib/libelf/gelf_rel.c#2 integrate .. //depot/projects/xen31/lib/libelf/gelf_rela.c#2 integrate .. //depot/projects/xen31/lib/libthr/pthread.map#6 integrate .. //depot/projects/xen31/lib/libthr/thread/Makefile.inc#2 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_affinity.c#1 branch .. //depot/projects/xen31/lib/libthr/thread/thr_attr.c#2 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_exit.c#3 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_private.h#5 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_sig.c#3 integrate .. //depot/projects/xen31/lib/libutil/humanize_number.c#2 integrate .. //depot/projects/xen31/lib/msun/Makefile#6 integrate .. //depot/projects/xen31/lib/msun/Symbol.map#7 integrate .. //depot/projects/xen31/lib/msun/amd64/Makefile.inc#5 integrate .. //depot/projects/xen31/lib/msun/amd64/e_sqrtl.S#1 branch .. //depot/projects/xen31/lib/msun/i387/Makefile.inc#4 integrate .. //depot/projects/xen31/lib/msun/i387/e_sqrtl.S#1 branch .. //depot/projects/xen31/lib/msun/ld128/s_nanl.c#3 integrate .. //depot/projects/xen31/lib/msun/man/sqrt.3#3 integrate .. //depot/projects/xen31/lib/msun/src/e_sqrt.c#2 integrate .. //depot/projects/xen31/lib/msun/src/e_sqrtl.c#1 branch .. //depot/projects/xen31/lib/msun/src/math.h#7 integrate .. //depot/projects/xen31/rescue/rescue/Makefile#4 integrate .. //depot/projects/xen31/sbin/ddb/ddb.8#2 integrate .. //depot/projects/xen31/sbin/ddb/ddb.c#2 integrate .. //depot/projects/xen31/sbin/fsck_ffs/main.c#2 integrate .. //depot/projects/xen31/sbin/geom/Makefile#3 integrate .. //depot/projects/xen31/sbin/geom/class/label/geom_label.c#2 integrate .. //depot/projects/xen31/sbin/geom/class/multipath/gmultipath.8#2 integrate .. //depot/projects/xen31/sbin/geom/core/geom.8#3 integrate .. //depot/projects/xen31/sbin/geom/core/geom.c#4 integrate .. //depot/projects/xen31/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/xen31/sbin/newfs/mkfs.c#3 integrate .. //depot/projects/xen31/secure/usr.bin/ssh/Makefile#2 integrate .. //depot/projects/xen31/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/xen31/share/man/man3/Makefile#2 integrate .. //depot/projects/xen31/share/man/man4/Makefile#8 integrate .. //depot/projects/xen31/share/man/man4/cmx.4#1 branch .. //depot/projects/xen31/share/man/man4/ddb.4#3 integrate .. //depot/projects/xen31/share/man/man4/fwohci.4#2 integrate .. //depot/projects/xen31/share/man/man4/ng_nat.4#2 integrate .. //depot/projects/xen31/share/man/man4/uchcom.4#1 branch .. //depot/projects/xen31/share/man/man4/ucom.4#2 integrate .. //depot/projects/xen31/share/man/man4/ucycom.4#2 integrate .. //depot/projects/xen31/share/man/man4/uslcom.4#1 branch .. //depot/projects/xen31/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/xen31/share/man/man9/DEVICE_PROBE.9#2 integrate .. //depot/projects/xen31/share/man/man9/Makefile#8 integrate .. //depot/projects/xen31/share/man/man9/bus_space.9#2 integrate .. //depot/projects/xen31/share/man/man9/lock.9#6 integrate .. //depot/projects/xen31/share/misc/committers-ports.dot#5 integrate .. //depot/projects/xen31/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/xen31/share/mk/sys.mk#5 integrate .. //depot/projects/xen31/share/zoneinfo/leapseconds#3 integrate .. //depot/projects/xen31/share/zoneinfo/southamerica#4 integrate .. //depot/projects/xen31/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/xen31/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/xen31/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/xen31/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/xen31/sys/amd64/include/smp.h#2 integrate .. //depot/projects/xen31/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/xen31/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/xen31/sys/arm/conf/AVILA#3 integrate .. //depot/projects/xen31/sys/arm/include/pmap.h#3 integrate .. //depot/projects/xen31/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/xen31/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/xen31/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/xen31/sys/boot/pc98/libpc98/biosdisk.c#4 integrate .. //depot/projects/xen31/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/xen31/sys/conf/NOTES#12 integrate .. //depot/projects/xen31/sys/conf/files#18 integrate .. //depot/projects/xen31/sys/conf/files.powerpc#8 integrate .. //depot/projects/xen31/sys/conf/kmod.mk#4 integrate .. //depot/projects/xen31/sys/conf/options#10 integrate .. //depot/projects/xen31/sys/conf/options.powerpc#4 integrate .. //depot/projects/xen31/sys/ddb/db_command.c#3 integrate .. //depot/projects/xen31/sys/ddb/db_examine.c#3 integrate .. //depot/projects/xen31/sys/ddb/db_input.c#3 integrate .. //depot/projects/xen31/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/xen31/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/xen31/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/xen31/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/xen31/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/xen31/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/xen31/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/xen31/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/xen31/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/xen31/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/xen31/sys/dev/em/LICENSE#2 integrate .. //depot/projects/xen31/sys/dev/em/e1000_80003es2lan.c#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_80003es2lan.h#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_82540.c#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_82541.c#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_82541.h#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_82542.c#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_82543.c#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_82543.h#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_82571.c#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_82571.h#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_82575.c#3 delete .. //depot/projects/xen31/sys/dev/em/e1000_82575.h#3 delete .. //depot/projects/xen31/sys/dev/em/e1000_api.c#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_api.h#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_defines.h#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_hw.h#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_ich8lan.c#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_ich8lan.h#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_mac.c#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_mac.h#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_manage.c#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_manage.h#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_nvm.c#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_nvm.h#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_osdep.h#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_phy.c#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_phy.h#3 integrate .. //depot/projects/xen31/sys/dev/em/e1000_regs.h#3 integrate .. //depot/projects/xen31/sys/dev/em/if_em.c#3 integrate .. //depot/projects/xen31/sys/dev/em/if_em.h#3 integrate .. //depot/projects/xen31/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/xen31/sys/dev/hptrr/hptrr_os_bsd.c#3 integrate .. //depot/projects/xen31/sys/dev/hptrr/hptrr_osm_bsd.c#4 integrate .. //depot/projects/xen31/sys/dev/hptrr/ldm.h#3 integrate .. //depot/projects/xen31/sys/dev/hptrr/osm.h#3 integrate .. //depot/projects/xen31/sys/dev/ic/quicc.h#1 branch .. //depot/projects/xen31/sys/dev/igb/e1000_82575.c#1 branch .. //depot/projects/xen31/sys/dev/igb/e1000_82575.h#1 branch .. //depot/projects/xen31/sys/dev/igb/e1000_api.c#1 branch .. //depot/projects/xen31/sys/dev/igb/e1000_api.h#1 branch .. //depot/projects/xen31/sys/dev/igb/e1000_defines.h#1 branch .. //depot/projects/xen31/sys/dev/igb/e1000_hw.h#1 branch .. //depot/projects/xen31/sys/dev/igb/e1000_mac.c#1 branch .. //depot/projects/xen31/sys/dev/igb/e1000_mac.h#1 branch .. //depot/projects/xen31/sys/dev/igb/e1000_manage.c#1 branch .. //depot/projects/xen31/sys/dev/igb/e1000_manage.h#1 branch .. //depot/projects/xen31/sys/dev/igb/e1000_nvm.c#1 branch .. //depot/projects/xen31/sys/dev/igb/e1000_nvm.h#1 branch .. //depot/projects/xen31/sys/dev/igb/e1000_osdep.h#1 branch .. //depot/projects/xen31/sys/dev/igb/e1000_phy.c#1 branch .. //depot/projects/xen31/sys/dev/igb/e1000_phy.h#1 branch .. //depot/projects/xen31/sys/dev/igb/e1000_regs.h#1 branch .. //depot/projects/xen31/sys/dev/igb/if_igb.c#1 branch .. //depot/projects/xen31/sys/dev/igb/if_igb.h#1 branch .. //depot/projects/xen31/sys/dev/lge/if_lge.c#4 integrate .. //depot/projects/xen31/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/xen31/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/xen31/sys/dev/mii/miidevs#4 integrate .. //depot/projects/xen31/sys/dev/mii/rgephy.c#4 integrate .. //depot/projects/xen31/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/xen31/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/xen31/sys/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/xen31/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/xen31/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/xen31/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/xen31/sys/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/xen31/sys/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/xen31/sys/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/xen31/sys/dev/quicc/quicc_core.c#1 branch .. //depot/projects/xen31/sys/dev/re/if_re.c#9 integrate .. //depot/projects/xen31/sys/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/xen31/sys/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/xen31/sys/dev/scc/scc_bus.h#2 integrate .. //depot/projects/xen31/sys/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/xen31/sys/dev/tsec/if_tsec.c#1 branch .. //depot/projects/xen31/sys/dev/tsec/if_tsec.h#1 branch .. //depot/projects/xen31/sys/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/xen31/sys/dev/uart/uart.h#2 integrate .. //depot/projects/xen31/sys/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/xen31/sys/dev/uart/uart_bus_scc.c#2 integrate .. //depot/projects/xen31/sys/dev/uart/uart_cpu_powerpc.c#3 integrate .. //depot/projects/xen31/sys/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/xen31/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/xen31/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/xen31/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/xen31/sys/dev/usb/uslcom.c#1 branch .. //depot/projects/xen31/sys/fs/nwfs/nwfs_node.c#5 integrate .. //depot/projects/xen31/sys/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/xen31/sys/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/xen31/sys/fs/smbfs/smbfs_node.c#5 integrate .. //depot/projects/xen31/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/xen31/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/xen31/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/xen31/sys/geom/part/g_part_vtoc8.c#1 branch .. //depot/projects/xen31/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/xen31/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/xen31/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/xen31/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/xen31/sys/i386/include/_types.h#2 integrate .. //depot/projects/xen31/sys/i386/include/float.h#2 integrate .. //depot/projects/xen31/sys/i386/include/smp.h#2 integrate .. //depot/projects/xen31/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/xen31/sys/kern/init_main.c#9 integrate .. //depot/projects/xen31/sys/kern/init_sysent.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_cpuset.c#1 branch .. //depot/projects/xen31/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/xen31/sys/kern/kern_lock.c#8 integrate .. //depot/projects/xen31/sys/kern/kern_priv.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/xen31/sys/kern/kern_sig.c#7 integrate .. //depot/projects/xen31/sys/kern/kern_thread.c#7 integrate .. //depot/projects/xen31/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/xen31/sys/kern/sched_ule.c#9 integrate .. //depot/projects/xen31/sys/kern/subr_bus.c#5 integrate .. //depot/projects/xen31/sys/kern/subr_smp.c#4 integrate .. //depot/projects/xen31/sys/kern/subr_witness.c#4 integrate .. //depot/projects/xen31/sys/kern/syscalls.c#4 integrate .. //depot/projects/xen31/sys/kern/syscalls.master#4 integrate .. //depot/projects/xen31/sys/kern/systrace_args.c#4 integrate .. //depot/projects/xen31/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/xen31/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/xen31/sys/modules/Makefile#6 integrate .. //depot/projects/xen31/sys/modules/cmx/Makefile#1 branch .. //depot/projects/xen31/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/xen31/sys/modules/em/Makefile#2 integrate .. //depot/projects/xen31/sys/modules/geom/Makefile#5 integrate .. //depot/projects/xen31/sys/modules/geom/geom_apple/Makefile#2 delete .. //depot/projects/xen31/sys/modules/geom/geom_gpt/Makefile#2 delete .. //depot/projects/xen31/sys/modules/geom/geom_part/Makefile#1 branch .. //depot/projects/xen31/sys/modules/igb/Makefile#1 branch .. //depot/projects/xen31/sys/modules/ipfw_nat/Makefile#1 branch .. //depot/projects/xen31/sys/modules/uslcom/Makefile#1 branch .. //depot/projects/xen31/sys/modules/zfs/Makefile#4 integrate .. //depot/projects/xen31/sys/net/bpf_filter.c#3 integrate .. //depot/projects/xen31/sys/net/if.c#3 integrate .. //depot/projects/xen31/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/xen31/sys/net/if_gif.c#3 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_scan_sta.c#4 integrate .. //depot/projects/xen31/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/xen31/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/xen31/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/xen31/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/xen31/sys/netgraph/ng_nat.h#2 integrate .. //depot/projects/xen31/sys/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/xen31/sys/netinet/in.h#2 integrate .. //depot/projects/xen31/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/xen31/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/xen31/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/xen31/sys/netinet/ip_fw_nat.c#1 branch .. //depot/projects/xen31/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/xen31/sys/netinet/libalias/alias.c#2 integrate .. //depot/projects/xen31/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/xen31/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/xen31/sys/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/xen31/sys/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/xen31/sys/netinet/libalias/alias_proxy.c#2 integrate .. //depot/projects/xen31/sys/netinet/libalias/alias_smedia.c#2 integrate .. //depot/projects/xen31/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/xen31/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/xen31/sys/netipsec/key.c#2 integrate .. //depot/projects/xen31/sys/netipsec/key_debug.c#2 integrate .. //depot/projects/xen31/sys/netncp/ncp_conn.h#2 integrate .. //depot/projects/xen31/sys/netsmb/smb_conn.h#2 integrate .. //depot/projects/xen31/sys/nfs4client/nfs4_idmap.c#3 integrate .. //depot/projects/xen31/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/xen31/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/xen31/sys/pc98/cbus/sio.c#3 integrate .. //depot/projects/xen31/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/xen31/sys/pci/if_rl.c#3 integrate .. //depot/projects/xen31/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/xen31/sys/powerpc/aim/locore.S#3 integrate .. //depot/projects/xen31/sys/powerpc/aim/machdep.c#4 integrate .. //depot/projects/xen31/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/xen31/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/xen31/sys/powerpc/aim/trap_subr.S#2 integrate .. //depot/projects/xen31/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/xen31/sys/powerpc/booke/clock.c#1 branch .. //depot/projects/xen31/sys/powerpc/booke/copyinout.c#1 branch .. //depot/projects/xen31/sys/powerpc/booke/interrupt.c#1 branch .. //depot/projects/xen31/sys/powerpc/booke/locore.S#1 branch .. //depot/projects/xen31/sys/powerpc/booke/machdep.c#1 branch .. //depot/projects/xen31/sys/powerpc/booke/pmap.c#1 branch .. //depot/projects/xen31/sys/powerpc/booke/support.S#1 branch .. //depot/projects/xen31/sys/powerpc/booke/swtch.S#1 branch .. //depot/projects/xen31/sys/powerpc/booke/trap.c#1 branch .. //depot/projects/xen31/sys/powerpc/booke/trap_subr.S#1 branch .. //depot/projects/xen31/sys/powerpc/booke/uio_machdep.c#1 branch .. //depot/projects/xen31/sys/powerpc/booke/vm_machdep.c#1 branch .. //depot/projects/xen31/sys/powerpc/conf/MPC85XX#1 branch .. //depot/projects/xen31/sys/powerpc/conf/NOTES#6 integrate .. //depot/projects/xen31/sys/powerpc/include/frame.h#2 integrate .. //depot/projects/xen31/sys/powerpc/include/hid.h#3 integrate .. //depot/projects/xen31/sys/powerpc/include/intr_machdep.h#3 integrate .. //depot/projects/xen31/sys/powerpc/include/kdb.h#2 integrate .. //depot/projects/xen31/sys/powerpc/include/md_var.h#3 integrate .. //depot/projects/xen31/sys/powerpc/include/mmuvar.h#2 integrate .. //depot/projects/xen31/sys/powerpc/include/ocpbus.h#1 branch .. //depot/projects/xen31/sys/powerpc/include/openpicvar.h#3 integrate .. //depot/projects/xen31/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/xen31/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/xen31/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/xen31/sys/powerpc/include/psl.h#2 integrate .. //depot/projects/xen31/sys/powerpc/include/pte.h#2 integrate .. //depot/projects/xen31/sys/powerpc/include/sf_buf.h#2 integrate .. //depot/projects/xen31/sys/powerpc/include/spr.h#3 integrate .. //depot/projects/xen31/sys/powerpc/include/tlb.h#1 branch .. //depot/projects/xen31/sys/powerpc/include/trap.h#2 integrate .. //depot/projects/xen31/sys/powerpc/include/trap_aim.h#1 branch .. //depot/projects/xen31/sys/powerpc/include/trap_booke.h#1 branch .. //depot/projects/xen31/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/xen31/sys/powerpc/mpc85xx/nexus.c#1 branch .. //depot/projects/xen31/sys/powerpc/mpc85xx/ocpbus.c#1 branch .. //depot/projects/xen31/sys/powerpc/mpc85xx/ocpbus.h#1 branch .. //depot/projects/xen31/sys/powerpc/mpc85xx/opic.c#1 branch .. //depot/projects/xen31/sys/powerpc/mpc85xx/pci_ocp.c#1 branch .. //depot/projects/xen31/sys/powerpc/powermac/openpic_macio.c#3 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/autoconf.c#2 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/db_trace.c#3 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/gdb_machdep.c#2 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/genassym.c#4 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/intr_machdep.c#4 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/openpic.c#3 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/pic_if.m#3 integrate .. //depot/projects/xen31/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/xen31/sys/security/audit/audit.c#7 integrate .. //depot/projects/xen31/sys/security/audit/audit_bsm_klib.c#5 integrate .. //depot/projects/xen31/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/xen31/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/xen31/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/xen31/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/xen31/sys/sparc64/include/tlb.h#2 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/xen31/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/xen31/sys/sys/_types.h#2 integrate .. //depot/projects/xen31/sys/sys/buf.h#5 integrate .. //depot/projects/xen31/sys/sys/bufobj.h#2 integrate .. //depot/projects/xen31/sys/sys/bus.h#3 integrate .. //depot/projects/xen31/sys/sys/cpuset.h#1 branch .. //depot/projects/xen31/sys/sys/fcntl.h#3 integrate .. //depot/projects/xen31/sys/sys/lockmgr.h#7 integrate .. //depot/projects/xen31/sys/sys/mount.h#2 integrate .. //depot/projects/xen31/sys/sys/param.h#14 integrate .. //depot/projects/xen31/sys/sys/pcpu.h#5 integrate .. //depot/projects/xen31/sys/sys/proc.h#9 integrate .. //depot/projects/xen31/sys/sys/sched.h#2 integrate .. //depot/projects/xen31/sys/sys/smp.h#3 integrate .. //depot/projects/xen31/sys/sys/syscall.h#4 integrate .. //depot/projects/xen31/sys/sys/syscall.mk#4 integrate .. //depot/projects/xen31/sys/sys/sysproto.h#4 integrate .. //depot/projects/xen31/sys/sys/types.h#3 integrate .. //depot/projects/xen31/sys/sys/vnode.h#4 integrate .. //depot/projects/xen31/sys/sys/vtoc.h#1 branch .. //depot/projects/xen31/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/xen31/sys/ufs/ufs/extattr.h#2 integrate .. //depot/projects/xen31/sys/ufs/ufs/ufs_extattr.c#4 integrate .. //depot/projects/xen31/sys/vm/vm_fault.c#4 integrate .. //depot/projects/xen31/sys/vm/vm_map.h#3 integrate .. //depot/projects/xen31/tools/build/mk/OptionalObsoleteFiles.inc#3 integrate .. //depot/projects/xen31/tools/regression/environ/envctl.c#2 integrate .. //depot/projects/xen31/tools/regression/file/dup/dup.c#2 integrate .. //depot/projects/xen31/tools/regression/lib/msun/test-trig.c#2 integrate .. //depot/projects/xen31/tools/tools/tinybsd/tinybsd#2 integrate .. //depot/projects/xen31/usr.bin/Makefile#5 integrate .. //depot/projects/xen31/usr.bin/ar/write.c#2 integrate .. //depot/projects/xen31/usr.bin/calendar/calendars/calendar.freebsd#7 integrate .. //depot/projects/xen31/usr.bin/chat/chat.c#2 integrate .. //depot/projects/xen31/usr.bin/cpuset/Makefile#1 branch .. //depot/projects/xen31/usr.bin/cpuset/cpuset.1#1 branch .. //depot/projects/xen31/usr.bin/cpuset/cpuset.c#1 branch .. //depot/projects/xen31/usr.bin/find/find.1#3 integrate .. //depot/projects/xen31/usr.bin/find/main.c#2 integrate .. //depot/projects/xen31/usr.bin/gzip/gzip.c#2 integrate .. //depot/projects/xen31/usr.bin/make/Makefile#2 integrate .. //depot/projects/xen31/usr.bin/make/Makefile.dist#3 integrate .. //depot/projects/xen31/usr.bin/make/arch.c#2 integrate .. //depot/projects/xen31/usr.bin/make/job.c#2 integrate .. //depot/projects/xen31/usr.bin/make/main.c#3 integrate .. //depot/projects/xen31/usr.bin/make/make.1#3 integrate .. //depot/projects/xen31/usr.bin/unifdef/unifdef.c#2 integrate .. //depot/projects/xen31/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#2 integrate .. //depot/projects/xen31/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#2 integrate .. //depot/projects/xen31/usr.sbin/fifolog/Makefile#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/Makefile.inc#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/fifolog_create/Makefile#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/flint.lnt#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/lib/Makefile#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/lib/fifolog.h#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/lib/fifolog_create.c#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/lib/fifolog_int.c#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/lib/fifolog_write.h#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/lib/getdate.y#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/lib/libfifolog.h#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch .. //depot/projects/xen31/usr.sbin/fifolog/lib/miniobj.h#1 branch .. //depot/projects/xen31/usr.sbin/fwcontrol/fwcontrol.8#3 integrate .. //depot/projects/xen31/usr.sbin/fwcontrol/fwcontrol.c#2 integrate .. //depot/projects/xen31/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/xen31/usr.sbin/moused/Makefile#2 integrate .. //depot/projects/xen31/usr.sbin/moused/moused.c#2 integrate Differences ... ==== //depot/projects/xen31/Makefile.inc1#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.600 2008/02/25 16:29:54 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -203,6 +203,9 @@ GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac +.if ${OSRELDATE} < 700044 +CROSSENV+= AR=gnu-ar RANLIB=gnu-ranlib +.endif # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -972,10 +975,6 @@ .endif .endif -.if make(cross-tools) && ${BOOTSTRAPPING} < 700044 -.MAKEFLAGS+= -D_WITH_GNUAR -.endif - cross-tools: .for _tool in \ gnu/usr.bin/binutils \ ==== //depot/projects/xen31/ObsoleteFiles.inc#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -32,6 +32,11 @@ OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libkse.a +OLD_FILES+=usr/lib32/libkse_p.a +OLD_FILES+=usr/lib32/libkse_pic.a +.endif .endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h @@ -134,6 +139,12 @@ OLD_DIRS+=usr/include/netatm/uni OLD_DIRS+=usr/include/netatm OLD_DIRS+=usr/share/examples/atm +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libatm.a +OLD_FILES+=usr/lib32/libatm.so +OLD_LIBS+=usr/lib32/libatm.so.5 +OLD_FILES+=usr/lib32/libatm_p.a +.endif # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -224,6 +235,42 @@ OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libalias.so.5 +OLD_LIBS+=usr/lib32/libbsnmp.so.3 +OLD_LIBS+=usr/lib32/libdialog.so.5 +OLD_LIBS+=usr/lib32/libgnuregex.so.3 +OLD_LIBS+=usr/lib32/libhistory.so.6 +OLD_LIBS+=usr/lib32/libncurses.so.6 +OLD_LIBS+=usr/lib32/libncursesw.so.6 +OLD_LIBS+=usr/lib32/libpam.so.3 +OLD_LIBS+=usr/lib32/libreadline.so.6 +OLD_LIBS+=usr/lib32/libssh.so.3 +OLD_LIBS+=usr/lib32/pam_chroot.so.3 +OLD_LIBS+=usr/lib32/pam_deny.so.3 +OLD_LIBS+=usr/lib32/pam_echo.so.3 +OLD_LIBS+=usr/lib32/pam_exec.so.3 +OLD_LIBS+=usr/lib32/pam_ftpusers.so.3 +OLD_LIBS+=usr/lib32/pam_group.so.3 +OLD_LIBS+=usr/lib32/pam_guest.so.3 +OLD_LIBS+=usr/lib32/pam_krb5.so.3 +OLD_LIBS+=usr/lib32/pam_ksu.so.3 +OLD_LIBS+=usr/lib32/pam_lastlog.so.3 +OLD_LIBS+=usr/lib32/pam_login_access.so.3 +OLD_LIBS+=usr/lib32/pam_nologin.so.3 +OLD_LIBS+=usr/lib32/pam_opie.so.3 +OLD_LIBS+=usr/lib32/pam_opieaccess.so.3 +OLD_LIBS+=usr/lib32/pam_passwdqc.so.3 +OLD_LIBS+=usr/lib32/pam_permit.so.3 +OLD_LIBS+=usr/lib32/pam_radius.so.3 +OLD_LIBS+=usr/lib32/pam_rhosts.so.3 +OLD_LIBS+=usr/lib32/pam_rootok.so.3 +OLD_LIBS+=usr/lib32/pam_securetty.so.3 +OLD_LIBS+=usr/lib32/pam_self.so.3 +OLD_LIBS+=usr/lib32/pam_ssh.so.3 +OLD_LIBS+=usr/lib32/pam_tacplus.so.3 +OLD_LIBS+=usr/lib32/pam_unix.so.3 +.endif # 20070613: IPX over IP tunnel removal OLD_FILES+=usr/include/netipx/ipx_ip.h # 20070605: sched_core removal @@ -603,6 +650,9 @@ OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=usr/lib/libarchive.so.3 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libarchive.so.3 +.endif # 20070301: remove addr2ascii and ascii2addr OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz ==== //depot/projects/xen31/UPDATING#6 (text+ko) ==== @@ -22,6 +22,20 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080301: + The layout of struct vmspace has changed. This affects libkvm + and any executables that link against libkvm and use the + kvm_getprocs() function. In particular, but not exclusively, + it affects ps(1), fstat(1), pkill(1), systat(1), top(1) and w(1). + The effects are minimal, but it's advisable to upgrade world + nonetheless. + +20080229: + The latest em driver no longer has support in it for the + 82575 adapter, this is now moved to the igb driver. The + split was done to make new features that are incompatible + with older hardware easier to do. + 20080220: The new geom_lvm(4) geom class has been renamed to geom_linux_lvm(4), likewise the kernel option is now GEOM_LINUX_LVM. @@ -983,4 +997,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.520 2008/02/20 07:50:12 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ ==== //depot/projects/xen31/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.29 2007/05/28 04:23:09 pjd Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.30 2008/03/09 12:10:24 rwatson Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -40,7 +40,7 @@ .Nd change file flags .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl fhv .Oo .Fl R .Op Fl H | Fl L | Fl P @@ -57,6 +57,12 @@ .Pp The options are as follows: .Bl -tag -width indent +.It Fl f +Do not display a diagnostic message if +.Nm +could not modify the flags for +.Va file , +nor modify the exit status to reflect such failures. .It Fl H If the .Fl R @@ -79,6 +85,14 @@ .It Fl R Change the file flags for the file hierarchies rooted in the files instead of just the files themselves. +.It Fl v +Cause +.Nm +to be verbose, showing filenames as the flags are modified. +If the +.Fl v +option is specified more than once, the old and new flags of the file +will also be printed, in octal notation. .El .Pp The flags are specified as an octal number or a comma separated list ==== //depot/projects/xen31/bin/chflags/chflags.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.24 2008/03/09 12:10:24 rwatson Exp $"); #include #include @@ -60,14 +60,15 @@ { FTS *ftsp; FTSENT *p; - u_long clear, set; + u_long clear, newflags, set; long val; - int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval; + int Hflag, Lflag, Rflag, fflag, hflag, vflag; + int ch, fts_options, oct, rval; char *flags, *ep; int (*change_flags)(const char *, unsigned long); - Hflag = Lflag = Rflag = hflag = 0; - while ((ch = getopt(argc, argv, "HLPRh")) != -1) + Hflag = Lflag = Rflag = fflag = hflag = vflag = 0; + while ((ch = getopt(argc, argv, "HLPRfhv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -83,9 +84,15 @@ case 'R': Rflag = 1; break; + case 'f': + fflag = 1; + break; case 'h': hflag = 1; break; + case 'v': + vflag++; + break; case '?': default: usage(); @@ -166,18 +173,23 @@ default: break; } - if (oct) { - if (!(*change_flags)(p->fts_accpath, set)) - continue; - } else { - p->fts_statp->st_flags |= set; - p->fts_statp->st_flags &= clear; - if (!(*change_flags)(p->fts_accpath, - (u_long)p->fts_statp->st_flags)) - continue; + if (oct) + newflags = set; + else + newflags = (p->fts_statp->st_flags | set) & clear; + if (newflags == p->fts_statp->st_flags) + continue; + if ((*change_flags)(p->fts_accpath, newflags) && !fflag) { + warn("%s", p->fts_path); + rval = 1; + } else if (vflag) { + (void)printf("%s", p->fts_path); + if (vflag > 1) + (void)printf(": 0%lo -> 0%lo", + (u_long)p->fts_statp->st_flags, + newflags); + (void)printf("\n"); } - warn("%s", p->fts_path); - rval = 1; } if (errno) err(1, "fts_read"); @@ -188,6 +200,6 @@ usage(void) { (void)fprintf(stderr, - "usage: chflags [-h] [-R [-H | -L | -P]] flags file ...\n"); + "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n"); exit(1); } ==== //depot/projects/xen31/bin/realpath/realpath.1#2 (text+ko) ==== @@ -31,7 +31,7 @@ .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp -.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.11 2008/03/09 12:46:39 rwatson Exp $ .\" .Dd November 24, 2000 .Dt REALPATH 1 @@ -41,7 +41,9 @@ .Nd return resolved physical path .Sh SYNOPSIS .Nm +.Op Fl q .Ar path +.Op Ar ... .Sh DESCRIPTION The .Nm @@ -55,6 +57,12 @@ .Pa /../ in .Ar path . +.Pp +If +.Fl q +is specified, warnings will not be printed when +.Xr realpath 3 +fails. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO ==== //depot/projects/xen31/bin/realpath/realpath.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6 2004/04/06 20:06:50 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.7 2008/03/09 12:46:39 rwatson Exp $"); #include @@ -44,20 +44,39 @@ { char buf[PATH_MAX]; char *p; + int ch, i, qflag, rval; - if (argc == 2) { - if ((p = realpath(argv[1], buf)) == NULL) - err(1, "%s", buf); - } else + qflag = 0; + while ((ch = getopt(argc, argv, "q")) != -1) { + switch (ch) { + case 'q': + qflag = 1; + break; + case '?': + default: + usage(); + } + } + argc -= optind; + argv += optind; + if (argc < 1) usage(); - (void)printf("%s\n", p); - exit(0); + rval = 0; + for (i = 0; i < argc; i++) { + if ((p = realpath(argv[i], buf)) == NULL) { + if (!qflag) + warn("%s", argv[i]); + rval = 1; + } else + (void)printf("%s\n", p); + } + exit(rval); } static void usage(void) { - (void)fprintf(stderr, "usage: realpath path\n"); + (void)fprintf(stderr, "usage: realpath [-q] path [...]\n"); exit(1); } ==== //depot/projects/xen31/contrib/bsnmp/snmpd/main.c#2 (text+ko) ==== @@ -2242,6 +2242,8 @@ return (m); err: + if ((m->flags & LM_ONSTARTLIST) != 0) + TAILQ_REMOVE(&modules_start, m, start); if (m->handle) dlclose(m->handle); free(m->path); ==== //depot/projects/xen31/etc/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.365 2007/11/11 01:16:51 mlaier Exp $ +# $FreeBSD: src/etc/Makefile,v 1.366 2008/03/05 18:32:58 brooks Exp $ .include @@ -9,7 +9,7 @@ BIN1= amd.map apmd.conf auth.conf \ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ - dhclient.conf disktab fbtab freebsd-update.conf \ + ddb.conf dhclient.conf disktab fbtab freebsd-update.conf \ ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf libalias.conf login.access login.conf mac.conf motd \ ==== //depot/projects/xen31/etc/defaults/rc.conf#4 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.326 2008/01/27 15:15:11 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -33,6 +33,8 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). +ddb_enable="NO" # Set to YES to load ddb scripts at boot. +ddb_config="/etc/ddb.conf" # ddb(8) config file. devd_enable="YES" # Run devd, to trigger programs on device tree changes. devd_flags="" # Additional flags for devd(8). kldxref_enable="NO" # Build linker.hints files with kldxref(8). @@ -249,7 +251,7 @@ rwhod_enable="NO" # Run the rwho daemon (or NO). rwhod_flags="" # Flags for rwhod rarpd_enable="NO" # Run rarpd (or NO). -rarpd_flags="" # Flags to rarpd. +rarpd_flags="-a" # Flags to rarpd. bootparamd_enable="NO" # Run bootparamd (or NO). bootparamd_flags="" # Flags to bootparamd pppoed_enable="NO" # Run the PPP over Ethernet daemon. ==== //depot/projects/xen31/etc/rc.d/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.88 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ .include @@ -7,7 +7,7 @@ apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ccd cleanvar cleartmp cron \ - devd devfs dhclient \ + ddb devd devfs dhclient \ dmesg dumpon \ early.sh encswap \ fsck ftp-proxy ftpd \ ==== //depot/projects/xen31/etc/rc.d/mountcritlocal#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.15 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.16 2008/03/06 14:39:33 mtm Exp $ # # PROVIDE: mountcritlocal @@ -15,6 +15,8 @@ mountcritlocal_start() { + local err + # Set up the list of network filesystem types for which mounting # should be delayed until after network initialization. case ${extra_netfs_types} in @@ -34,9 +36,10 @@ done mount_excludes=${mount_excludes%,} mount -a -t ${mount_excludes} + err=$? echo '.' - case $? in + case ${err} in 0) ;; *) ==== //depot/projects/xen31/etc/rc.d/mountlate#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.2 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.3 2008/03/06 14:39:33 mtm Exp $ # # PROVIDE: mountlate @@ -16,12 +16,15 @@ mountlate_start() { + local err + # Mount "late" filesystems. echo -n 'Mounting late file systems:' mount -a -l + err=$? echo '.' - case $? in + case ${err} in 0) ;; *) ==== //depot/projects/xen31/games/fortune/datfiles/fortunes#9 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.257 2008/02/28 15:16:24 yar Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.258 2008/03/03 10:06:52 dds Exp $ % ======================================================================= || || @@ -49242,7 +49242,7 @@ admit it, I tell him, `Forget it'. If they bring a car back late we overlook it. If they've had a crash and it doesn't involve another vehicle we might overlook that too." - "Where's the ashtray?" asked on Los Angeles wife, as she settled + "Where's the ashtray?" asked one Los Angeles wife, as she settled into the ripped interior. "Honey," said her husband, "the whole car's the ash tray." -- Stephen Pile, "The Book of Heroic Failures" ==== //depot/projects/xen31/gnu/usr.bin/binutils/ar/Makefile#3 (text+ko) ==== @@ -1,16 +1,14 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.17 2008/02/25 16:16:16 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ar/Makefile,v 1.18 2008/03/02 11:10:46 ru Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 9 22:17:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60DE21065672; Sun, 9 Mar 2008 22:17:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20964106566C for ; Sun, 9 Mar 2008 22:17:14 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 119768FC1A for ; Sun, 9 Mar 2008 22:17:14 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m29MHDmc086345 for ; Sun, 9 Mar 2008 22:17:13 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29MHDOS086343 for perforce@freebsd.org; Sun, 9 Mar 2008 22:17:13 GMT (envelope-from csjp@freebsd.org) Date: Sun, 9 Mar 2008 22:17:13 GMT Message-Id: <200803092217.m29MHDOS086343@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 137272 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, 09 Mar 2008 22:17:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=137272 Change 137272 by csjp@ibm01 on 2008/03/09 22:16:33 Make sure we disable zerocopy by default for now. This is in preparation for the merge into HEAD. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#46 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#46 (text+ko) ==== @@ -132,7 +132,7 @@ static int bpf_maxinsns = BPF_MAXINSNS; SYSCTL_INT(_net_bpf, OID_AUTO, maxinsns, CTLFLAG_RW, &bpf_maxinsns, 0, "Maximum bpf program instructions"); -static int bpf_zerocopy_enable = 1; +static int bpf_zerocopy_enable = 0; SYSCTL_INT(_net_bpf, OID_AUTO, zerocopy_enable, CTLFLAG_RW, &bpf_zerocopy_enable, 0, "Enable new zero-copy BPF buffer sessions"); SYSCTL_NODE(_net_bpf, OID_AUTO, stats, CTLFLAG_RW, From owner-p4-projects@FreeBSD.ORG Sun Mar 9 22:20:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF4A010656DF; Sun, 9 Mar 2008 22:20:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD18D10656D1 for ; Sun, 9 Mar 2008 22:20:17 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9DE398FC18 for ; Sun, 9 Mar 2008 22:20:17 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m29MKHnV087668 for ; Sun, 9 Mar 2008 22:20:17 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m29MKHUr087666 for perforce@freebsd.org; Sun, 9 Mar 2008 22:20:17 GMT (envelope-from csjp@freebsd.org) Date: Sun, 9 Mar 2008 22:20:17 GMT Message-Id: <200803092220.m29MKHUr087666@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 137274 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, 09 Mar 2008 22:20:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=137274 Change 137274 by csjp@ibm01 on 2008/03/09 22:19:22 Remove comment. We no longer require system calls on wakeup unless we have timed out. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#47 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#47 (text+ko) ==== @@ -1744,11 +1744,6 @@ (*cpfn)(d, d->bd_sbuf, curlen + hdrlen, pkt, hdr.bh_caplen); d->bd_slen = curlen + totlen; - /* - * XXXCSJP we could probably save a syscall per wakeup if we check the - * d->bd_immediate flag, hold buffer status and rotate the buffers - * before the wakeup. - */ if (do_wakeup) bpf_wakeup(d); } From owner-p4-projects@FreeBSD.ORG Mon Mar 10 03:19:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 391481065670; Mon, 10 Mar 2008 03:19:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EBFB71065673 for ; Mon, 10 Mar 2008 03:19:47 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E9F0E8FC1E for ; Mon, 10 Mar 2008 03:19:47 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2A3Jluw019155 for ; Mon, 10 Mar 2008 03:19:47 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2A3JlOD019153 for perforce@freebsd.org; Mon, 10 Mar 2008 03:19:47 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 10 Mar 2008 03:19:47 GMT Message-Id: <200803100319.m2A3JlOD019153@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 137288 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, 10 Mar 2008 03:19:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=137288 Change 137288 by swise@swise:vic10:iwarp on 2008/03/10 03:19:01 move back to MTX_DEF locking. This gets us part-way there. WITNESS still complains about locking heiarchy and other issues. Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#12 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_addr.c#7 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_cache.c#4 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_cma.c#12 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_device.c#6 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_iwcm.c#10 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#7 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#3 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.h#3 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.h#2 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#4 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 edit .. //depot/projects/iwarp/sys/kern/subr_blist.c#2 edit .. //depot/projects/iwarp/sys/modules/cxgb/iw_cxgb/Makefile#4 edit .. //depot/projects/iwarp/sys/sys/blist.h#2 edit .. //depot/projects/iwarp/sys/sys/linux_compat.h#12 edit .. //depot/projects/iwarp/sys/sys/linux_pci.h#4 edit .. //depot/projects/iwarp/sys/vm/swap_pager.c#5 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#12 (text+ko) ==== @@ -214,16 +214,16 @@ static void krping_wait(struct krping_cb *cb, int state) { - mtx_lock_spin(&cb->lock); + mtx_lock(&cb->lock); while (cb->state < state) { - msleep_spin(cb, &cb->lock, "krping", hz); + msleep(cb, &cb->lock, 0, "krping", hz); if (SIGPENDING(curthread)) { cb->state = ERROR; DEBUG_LOG(PFX "interrupt!\n"); break; } } - mtx_unlock_spin(&cb->lock); + mtx_unlock(&cb->lock); } static int krping_cma_event_handler(struct rdma_cm_id *cma_id, @@ -235,7 +235,7 @@ DEBUG_LOG(PFX "cma_event type %d cma_id %p (%s)\n", event->event, cma_id, (cma_id == cb->cm_id) ? "parent" : "child"); - mtx_lock_spin(&cb->lock); + mtx_lock(&cb->lock); switch (event->event) { case RDMA_CM_EVENT_ADDR_RESOLVED: cb->state = ADDR_RESOLVED; @@ -293,7 +293,7 @@ wakeup(cb); break; } - mtx_unlock_spin(&cb->lock); + mtx_unlock(&cb->lock); return 0; } @@ -343,11 +343,11 @@ struct ib_recv_wr *bad_wr; int ret; - mtx_lock_spin(&cb->lock); + mtx_lock(&cb->lock); BUG_ON(cb->cq != cq); if (cb->state == ERROR) { DEBUG_LOG(PFX "cq completion in ERROR state\n"); - mtx_unlock_spin(&cb->lock); + mtx_unlock(&cb->lock); return; } if (!cb->wlat && !cb->rlat && !cb->bw) @@ -414,12 +414,12 @@ DEBUG_LOG(PFX "poll error %d\n", ret); goto error; } - mtx_unlock_spin(&cb->lock); + mtx_unlock(&cb->lock); return; error: cb->state = ERROR; wakeup(cb); - mtx_unlock_spin(&cb->lock); + mtx_unlock(&cb->lock); } static int krping_accept(struct krping_cb *cb) @@ -1719,7 +1719,7 @@ cb->state = IDLE; cb->size = 64; cb->txdepth = RPING_SQ_DEPTH; - mtx_init(&cb->lock, "krping mtx", NULL, MTX_DUPOK|MTX_SPIN); + mtx_init(&cb->lock, "krping mtx", NULL, MTX_DUPOK|MTX_DEF); while ((op = krping_getopt("krping", &cmd, krping_opts, NULL, &optarg, &optint)) != 0) { ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_addr.c#7 (text+ko) ==== @@ -89,7 +89,7 @@ static void addr_timeout(void *arg) { - taskqueue_enqueue(addr_taskq, &addr_task); + taskqueue_enqueue_fast(addr_taskq, &addr_task); } void rdma_addr_register_client(struct rdma_addr_client *client) @@ -134,22 +134,13 @@ int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr) { - int ret; - struct route iproute; - struct sockaddr_in *dst = (struct sockaddr_in *)&iproute.ro_dst; + struct ifaddr *ifa; - bzero(&iproute, sizeof iproute); - dst->sin_family = AF_INET; - dst->sin_len = sizeof dst; - dst->sin_addr.s_addr = ((struct sockaddr_in *)addr)->sin_addr.s_addr; - - rtalloc(&iproute); - if (iproute.ro_rt == NULL); + printf("addr->sa_len %d sa_family %d\n", addr->sa_len, addr->sa_family); + ifa = ifa_ifwithaddr(addr); + if (!ifa) return (EADDRNOTAVAIL); - - ret = rdma_copy_addr(dev_addr, iproute.ro_rt->rt_ifp, NULL); - RTFREE(iproute.ro_rt); - return ret; + return rdma_copy_addr(dev_addr, ifa->ifa_ifp, NULL); } EXPORT_SYMBOL(rdma_translate_ip); @@ -286,7 +277,7 @@ struct addr_req *req; int ret = 0; - req = malloc(sizeof *req, M_DEVBUF, M_WAITOK); + req = malloc(sizeof *req, M_DEVBUF, M_NOWAIT); if (!req) return (ENOMEM); memset(req, 0, sizeof *req); @@ -355,7 +346,7 @@ struct sockaddr *sa) { callout_stop(&addr_ch); - taskqueue_enqueue(addr_taskq, &addr_task); + taskqueue_enqueue_fast(addr_taskq, &addr_task); } static int addr_init(void) @@ -363,7 +354,7 @@ TAILQ_INIT(&req_list); mtx_init(&lock, "rdma_addr req_list lock", NULL, MTX_DEF); - addr_taskq = taskqueue_create("rdma_addr_taskq", M_WAITOK, + addr_taskq = taskqueue_create_fast("rdma_addr_taskq", M_NOWAIT, taskqueue_thread_enqueue, &addr_taskq); if (addr_taskq == NULL) { printf("failed to allocate rdma_addr taskqueue\n"); ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_cache.c#4 (text+ko) ==== @@ -96,7 +96,7 @@ if (port_num < start_port(device) || port_num > end_port(device)) return -EINVAL; - mtx_lock_spin(&device->cache.lock); + mtx_lock(&device->cache.lock); cache = device->cache.gid_cache[port_num - start_port(device)]; @@ -105,7 +105,7 @@ else *gid = cache->table[index]; - mtx_unlock_spin(&device->cache.lock); + mtx_unlock(&device->cache.lock); return ret; } @@ -124,7 +124,7 @@ if (index) *index = -1; - mtx_lock_spin(&device->cache.lock); + mtx_lock(&device->cache.lock); for (p = 0; p <= end_port(device) - start_port(device); ++p) { cache = device->cache.gid_cache[p]; @@ -139,7 +139,7 @@ } } found: - mtx_unlock_spin(&device->cache.lock); + mtx_unlock(&device->cache.lock); return ret; } @@ -156,7 +156,7 @@ if (port_num < start_port(device) || port_num > end_port(device)) return -EINVAL; - mtx_lock_spin(&device->cache.lock); + mtx_lock(&device->cache.lock); cache = device->cache.pkey_cache[port_num - start_port(device)]; @@ -165,7 +165,7 @@ else *pkey = cache->table[index]; - mtx_unlock_spin(&device->cache.lock); + mtx_unlock(&device->cache.lock); return ret; } @@ -183,7 +183,7 @@ if (port_num < start_port(device) || port_num > end_port(device)) return -EINVAL; - mtx_lock_spin(&device->cache.lock); + mtx_lock(&device->cache.lock); cache = device->cache.pkey_cache[port_num - start_port(device)]; @@ -196,7 +196,7 @@ break; } - mtx_unlock_spin(&device->cache.lock); + mtx_unlock(&device->cache.lock); return ret; } @@ -211,9 +211,9 @@ if (port_num < start_port(device) || port_num > end_port(device)) return -EINVAL; - mtx_lock_spin(&device->cache.lock); + mtx_lock(&device->cache.lock); *lmc = device->cache.lmc_cache[port_num - start_port(device)]; - mtx_unlock_spin(&device->cache.lock); + mtx_unlock(&device->cache.lock); return ret; } @@ -228,7 +228,7 @@ int i; int ret; - tprops = malloc(sizeof *tprops, M_DEVBUF, M_WAITOK); + tprops = malloc(sizeof *tprops, M_DEVBUF, M_NOWAIT); if (!tprops) return; @@ -240,14 +240,14 @@ } pkey_cache = malloc(sizeof *pkey_cache + tprops->pkey_tbl_len * - sizeof *pkey_cache->table, M_DEVBUF, M_WAITOK); + sizeof *pkey_cache->table, M_DEVBUF, M_NOWAIT); if (!pkey_cache) goto err; pkey_cache->table_len = tprops->pkey_tbl_len; gid_cache = malloc(sizeof *gid_cache + tprops->gid_tbl_len * - sizeof *gid_cache->table, M_DEVBUF, M_WAITOK); + sizeof *gid_cache->table, M_DEVBUF, M_NOWAIT); if (!gid_cache) goto err; @@ -271,7 +271,7 @@ } } - mtx_lock_spin(&device->cache.lock); + mtx_lock(&device->cache.lock); old_pkey_cache = device->cache.pkey_cache[port - start_port(device)]; old_gid_cache = device->cache.gid_cache [port - start_port(device)]; @@ -281,7 +281,7 @@ device->cache.lmc_cache[port - start_port(device)] = tprops->lmc; - mtx_unlock_spin(&device->cache.lock); + mtx_unlock(&device->cache.lock); free(old_pkey_cache, M_DEVBUF); free(old_gid_cache, M_DEVBUF); @@ -313,7 +313,7 @@ event->event == IB_EVENT_PKEY_CHANGE || event->event == IB_EVENT_SM_CHANGE || event->event == IB_EVENT_CLIENT_REREGISTER) { - work = malloc(sizeof *work, M_DEVBUF, M_WAITOK); + work = malloc(sizeof *work, M_DEVBUF, M_NOWAIT); if (work) { TASK_INIT(&work->task, 0, ib_cache_task, work); work->device = event->device; @@ -328,21 +328,21 @@ int p; mtx_init(&device->cache.lock, "ib device cache", NULL, - MTX_DUPOK|MTX_SPIN); + MTX_DUPOK|MTX_DEF); device->cache.pkey_cache = malloc(sizeof *device->cache.pkey_cache * (end_port(device) - start_port(device) + 1), M_DEVBUF, - M_WAITOK); + M_NOWAIT); device->cache.gid_cache = malloc(sizeof *device->cache.gid_cache * (end_port(device) - start_port(device) + 1), M_DEVBUF, - M_WAITOK); + M_NOWAIT); device->cache.lmc_cache = malloc(sizeof *device->cache.lmc_cache * (end_port(device) - start_port(device) + 1), - M_DEVBUF, M_WAITOK); + M_DEVBUF, M_NOWAIT); if (!device->cache.pkey_cache || !device->cache.gid_cache || !device->cache.lmc_cache) { ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_cma.c#12 (text+ko) ==== @@ -217,9 +217,9 @@ { int ret; - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); ret = (id_priv->state == comp); - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); return ret; } @@ -228,10 +228,10 @@ { int ret; - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); if ((ret = (id_priv->state == comp))) id_priv->state = exch; - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); return ret; } @@ -240,10 +240,10 @@ { enum cma_state old; - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); old = id_priv->state; id_priv->state = exch; - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); return old; } @@ -280,9 +280,9 @@ static void cma_attach_to_dev(struct rdma_id_private *id_priv, struct cma_device *cma_dev) { - mtx_lock_spin(&cma_dev->lock); + mtx_lock(&cma_dev->lock); cma_dev->refcount++; - mtx_unlock_spin(&cma_dev->lock); + mtx_unlock(&cma_dev->lock); id_priv->cma_dev = cma_dev; id_priv->id.device = cma_dev->device; LIST_INSERT_HEAD(&cma_dev->id_list, id_priv, list); @@ -290,10 +290,10 @@ static inline void cma_deref_dev(struct cma_device *cma_dev) { - mtx_lock_spin(&cma_dev->lock); + mtx_lock(&cma_dev->lock); if (--cma_dev->refcount == 0) cv_broadcast(&cma_dev->comp); - mtx_unlock_spin(&cma_dev->lock); + mtx_unlock(&cma_dev->lock); } static void cma_detach_from_dev(struct rdma_id_private *id_priv) @@ -367,11 +367,11 @@ static void cma_deref_id(struct rdma_id_private *id_priv) { - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); if (--id_priv->refcount == 0) { cv_broadcast(&id_priv->comp); } - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); } static int cma_disable_remove(struct rdma_id_private *id_priv, @@ -379,22 +379,22 @@ { int ret; - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); if (id_priv->state == state) { id_priv->dev_remove++; ret = 0; } else ret = EINVAL; - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); return ret; } static void cma_enable_remove(struct rdma_id_private *id_priv) { - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); if (--id_priv->dev_remove == 0) cv_broadcast(&id_priv->wait_remove); - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); } static int cma_has_cm_dev(struct rdma_id_private *id_priv) @@ -407,7 +407,7 @@ { struct rdma_id_private *id_priv; - id_priv = malloc(sizeof *id_priv, M_DEVBUF, M_WAITOK); + id_priv = malloc(sizeof *id_priv, M_DEVBUF, M_NOWAIT); if (!id_priv) return ERR_PTR(-ENOMEM); bzero(id_priv, sizeof *id_priv); @@ -416,7 +416,7 @@ id_priv->id.context = context; id_priv->id.event_handler = event_handler; id_priv->id.ps = ps; - mtx_init(&id_priv->lock, "rdma_cm_id_priv", NULL, MTX_DUPOK|MTX_SPIN); + mtx_init(&id_priv->lock, "rdma_cm_id_priv", NULL, MTX_DUPOK|MTX_DEF); cv_init(&id_priv->comp, "rdma_cm_id_priv"); id_priv->refcount = 1; cv_init(&id_priv->wait_remove, "id priv wait remove"); @@ -786,10 +786,10 @@ LIST_REMOVE(id_priv, listen_entry); cma_deref_id(id_priv); - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); if (id_priv->refcount) cv_wait(&id_priv->comp, &id_priv->lock); - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); free(id_priv, M_DEVBUF); } @@ -895,11 +895,11 @@ mtx_unlock(&lock); cma_release_port(id_priv); cma_deref_id(id_priv); - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); BUG_ON(id_priv->refcount < 0); if (id_priv->refcount) cv_wait(&id_priv->comp, &id_priv->lock); - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); free(id_priv->id.route.path_rec, M_DEVBUF); free(id_priv, M_DEVBUF); } @@ -1051,7 +1051,7 @@ rt = &id->route; rt->num_paths = ib_event->param.req_rcvd.alternate_path ? 2 : 1; rt->path_rec = malloc(sizeof *rt->path_rec * rt->num_paths, - M_DEVBUF, M_WAITOK); + M_DEVBUF, M_NOWAIT); if (!rt->path_rec) goto destroy_id; @@ -1153,9 +1153,9 @@ goto out; } - mtx_lock_spin(&conn_id->lock); + mtx_lock(&conn_id->lock); conn_id->dev_remove++; - mtx_unlock_spin(&conn_id->lock); + mtx_unlock(&conn_id->lock); mtx_lock(&lock); ret = cma_acquire_dev(conn_id); mtx_unlock(&lock); @@ -1325,9 +1325,9 @@ goto out; } conn_id = container_of(new_cm_id, struct rdma_id_private, id); - mtx_lock_spin(&conn_id->lock); + mtx_lock(&conn_id->lock); ++conn_id->dev_remove; - mtx_unlock_spin(&conn_id->lock); + mtx_unlock(&conn_id->lock); conn_id->state = CMA_CONNECT; port = iw_event->local_addr.sin_port; @@ -1566,7 +1566,7 @@ work->event.status = status; } - taskqueue_enqueue(cma_wq, &work->task); + taskqueue_enqueue_fast(cma_wq, &work->task); } static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms, @@ -1587,7 +1587,7 @@ IB_SA_PATH_REC_DGID | IB_SA_PATH_REC_SGID | IB_SA_PATH_REC_PKEY | IB_SA_PATH_REC_NUMB_PATH | IB_SA_PATH_REC_REVERSIBLE, - timeout_ms, M_WAITOK, + timeout_ms, M_NOWAIT, cma_query_handler, work, &id_priv->query); return (id_priv->query_id < 0) ? id_priv->query_id : 0; @@ -1600,9 +1600,9 @@ struct rdma_id_private *id_priv = work->id; int destroy = 0; - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); ++id_priv->dev_remove; - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); if (!cma_comp_exch(id_priv, work->old_state, work->new_state)) goto out; @@ -1625,7 +1625,7 @@ struct cma_work *work; int ret; - work = malloc(sizeof *work, M_DEVBUF, M_WAITOK); + work = malloc(sizeof *work, M_DEVBUF, M_NOWAIT); if (!work) return (ENOMEM); bzero(work, sizeof *work); @@ -1636,7 +1636,7 @@ work->new_state = CMA_ROUTE_RESOLVED; work->event.event = RDMA_CM_EVENT_ROUTE_RESOLVED; - route->path_rec = malloc(sizeof *route->path_rec, M_DEVBUF, M_WAITOK); + route->path_rec = malloc(sizeof *route->path_rec, M_DEVBUF, M_NOWAIT); if (!route->path_rec) { ret = ENOMEM; goto err1; @@ -1665,7 +1665,7 @@ if (!cma_comp_exch(id_priv, CMA_ADDR_RESOLVED, CMA_ROUTE_RESOLVED)) return (EINVAL); - id->route.path_rec = malloc(sizeof *path_rec * num_paths, M_DEVBUF, M_WAITOK); + id->route.path_rec = malloc(sizeof *path_rec * num_paths, M_DEVBUF, M_NOWAIT); if (!id->route.path_rec) { ret = ENOMEM; goto err; @@ -1684,7 +1684,7 @@ { struct cma_work *work; - work = malloc(sizeof *work, M_DEVBUF, M_WAITOK); + work = malloc(sizeof *work, M_DEVBUF, M_NOWAIT); if (!work) return (ENOMEM); bzero(work, sizeof *work); @@ -1694,7 +1694,7 @@ work->old_state = CMA_ROUTE_QUERY; work->new_state = CMA_ROUTE_RESOLVED; work->event.event = RDMA_CM_EVENT_ROUTE_RESOLVED; - taskqueue_enqueue(cma_wq, &work->task); + taskqueue_enqueue_fast(cma_wq, &work->task); return 0; } @@ -1707,9 +1707,9 @@ if (!cma_comp_exch(id_priv, CMA_ADDR_RESOLVED, CMA_ROUTE_QUERY)) return (EINVAL); - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); id_priv->refcount++; - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); #ifdef IB_SUPPORTED switch (rdma_node_get_transport(id->device->node_type)) { case RDMA_TRANSPORT_IB: @@ -1784,9 +1784,9 @@ struct rdma_cm_event event; memset(&event, 0, sizeof event); - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); ++id_priv->dev_remove; - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); /* * Grab mutex to block rdma_destroy_id() from removing the device while @@ -1832,7 +1832,7 @@ union ib_gid gid; int ret; - work = malloc(sizeof *work, M_DEVBUF, M_WAITOK); + work = malloc(sizeof *work, M_DEVBUF, M_NOWAIT); if (!work) return (ENOMEM); bzero(work, sizeof *work); @@ -1858,7 +1858,7 @@ work->old_state = CMA_ADDR_QUERY; work->new_state = CMA_ADDR_RESOLVED; work->event.event = RDMA_CM_EVENT_ADDR_RESOLVED; - taskqueue_enqueue(cma_wq, &work->task); + taskqueue_enqueue_fast(cma_wq, &work->task); return 0; err: free(work, M_DEVBUF); @@ -1890,9 +1890,9 @@ if (!cma_comp_exch(id_priv, CMA_ADDR_BOUND, CMA_ADDR_QUERY)) return (EINVAL); - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); id_priv->refcount++; - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); memcpy(&id->route.addr.dst_addr, dst_addr, ip_addr_size(dst_addr)); if (cma_any_addr(dst_addr)) ret = cma_resolve_loopback(id_priv); @@ -1928,14 +1928,14 @@ struct rdma_bind_list *bind_list; int port, ret; - bind_list = malloc(sizeof *bind_list, M_DEVBUF, M_WAITOK); + bind_list = malloc(sizeof *bind_list, M_DEVBUF, M_NOWAIT); if (!bind_list) return (ENOMEM); bzero(bind_list, sizeof *bind_list); do { ret = idr_get_new_above(ps, bind_list, snum, &port); - } while ((ret == EAGAIN) && idr_pre_get(ps, M_WAITOK)); + } while ((ret == EAGAIN) && idr_pre_get(ps, M_NOWAIT)); if (ret) goto err1; @@ -1961,7 +1961,7 @@ struct rdma_bind_list *bind_list; int port, ret; - bind_list = malloc(sizeof *bind_list, M_DEVBUF, M_WAITOK); + bind_list = malloc(sizeof *bind_list, M_DEVBUF, M_NOWAIT); if (!bind_list) return (ENOMEM); bzero(bind_list, sizeof *bind_list); @@ -1969,7 +1969,7 @@ retry: do { ret = idr_get_new_above(ps, bind_list, next_port, &port); - } while ((ret == EAGAIN) && idr_pre_get(ps, M_WAITOK)); + } while ((ret == EAGAIN) && idr_pre_get(ps, M_NOWAIT)); if (ret) goto err1; @@ -2749,7 +2749,7 @@ mc->multicast.ib = ib_sa_join_multicast(&sa_client, id_priv->id.device, id_priv->id.port_num, &rec, - comp_mask, M_WAITOK, + comp_mask, M_NOWAIT, cma_ib_mc_handler, mc); if (IS_ERR(mc->multicast.ib)) return PTR_ERR(mc->multicast.ib); @@ -2769,7 +2769,7 @@ !cma_comp(id_priv, CMA_ADDR_RESOLVED)) return (EINVAL); - mc = malloc(sizeof *mc, M_DEVBUF, M_WAITOK); + mc = malloc(sizeof *mc, M_DEVBUF, M_NOWAIT); if (!mc) return (ENOMEM); @@ -2777,9 +2777,9 @@ mc->context = context; mc->id_priv = id_priv; - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); LIST_INSERT_HEAD(&id_priv->mc_list, mc, list); - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); switch (rdma_node_get_transport(id->device->node_type)) { case RDMA_TRANSPORT_IB: @@ -2791,9 +2791,9 @@ } if (ret) { - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); list_del(&mc->list); - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); free(mc, M_DEVBUF); } return ret; @@ -2806,11 +2806,11 @@ struct cma_multicast *mc; id_priv = container_of(id, struct rdma_id_private, id); - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); LIST_FOREACH(mc, &id_priv->mc_list, list) { if (!memcmp(&mc->addr, addr, ip_addr_size(addr))) { list_del(&mc->list); - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); if (id->qp) ib_detach_mcast(id->qp, @@ -2821,7 +2821,7 @@ return; } } - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); } EXPORT_SYMBOL(rdma_leave_multicast); #endif @@ -2831,14 +2831,14 @@ struct cma_device *cma_dev; struct rdma_id_private *id_priv; - cma_dev = malloc(sizeof *cma_dev, M_DEVBUF, M_WAITOK|M_ZERO); + cma_dev = malloc(sizeof *cma_dev, M_DEVBUF, M_NOWAIT|M_ZERO); if (!cma_dev) return; cma_dev->device = device; cv_init(&cma_dev->comp, "cma_device"); - mtx_init(&cma_dev->lock, "cma_device", NULL, MTX_DUPOK|MTX_SPIN); + mtx_init(&cma_dev->lock, "cma_device", NULL, MTX_DUPOK|MTX_DEF); cma_dev->refcount = 1; LIST_INIT(&cma_dev->id_list); ib_set_client_data(device, &cma_client, cma_dev); @@ -2861,11 +2861,11 @@ return 0; cma_cancel_operation(id_priv, state); - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); BUG_ON(id_priv->dev_remove < 0); if (id_priv->dev_remove) cv_wait(&id_priv->wait_remove, &id_priv->lock); - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); /* Check for destruction from another callback. */ if (!cma_comp(id_priv, CMA_DEVICE_REMOVAL)) @@ -2891,9 +2891,9 @@ } LIST_REMOVE(id_priv, list); - mtx_lock_spin(&id_priv->lock); + mtx_lock(&id_priv->lock); id_priv->refcount++; - mtx_unlock_spin(&id_priv->lock); + mtx_unlock(&id_priv->lock); mtx_unlock(&lock); ret = cma_remove_id_dev(id_priv); @@ -2906,11 +2906,11 @@ mtx_unlock(&lock); cma_deref_dev(cma_dev); - mtx_lock_spin(&cma_dev->lock); + mtx_lock(&cma_dev->lock); BUG_ON(cma_dev->refcount < 0); if (cma_dev->refcount) cv_wait(&cma_dev->comp, &cma_dev->lock); - mtx_unlock_spin(&cma_dev->lock); + mtx_unlock(&cma_dev->lock); } static void cma_remove_one(struct ib_device *device) @@ -2941,7 +2941,7 @@ next_port = ((unsigned int) next_port % (ipport_lastauto - ipport_firstauto)) + ipport_firstauto; - cma_wq = taskqueue_create("rdma_cm", M_WAITOK, taskqueue_thread_enqueue, + cma_wq = taskqueue_create_fast("rdma_cm", M_NOWAIT, taskqueue_thread_enqueue, &cma_wq); if (!cma_wq) ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_device.c#6 (text+ko) ==== @@ -135,7 +135,7 @@ struct ib_device *device; int i; - inuse = malloc(PAGE_SIZE, M_DEVBUF, M_WAITOK); + inuse = malloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT); if (!inuse) return (ENOMEM); @@ -188,7 +188,7 @@ BUG_ON(size < sizeof (struct ib_device)); - dev = malloc(size, M_DEVBUF, M_WAITOK); + dev = malloc(size, M_DEVBUF, M_NOWAIT); if (dev) bzero(dev, size); return dev; @@ -219,7 +219,7 @@ { struct ib_client_data *context; - context = malloc(sizeof *context, M_DEVBUF, M_WAITOK); + context = malloc(sizeof *context, M_DEVBUF, M_NOWAIT); if (!context) { log(LOG_WARNING, "Couldn't allocate client context for %s/%s\n", device->name, client->name); @@ -229,9 +229,9 @@ context->client = client; context->data = NULL; - mtx_lock_spin(&device->client_data_lock); + mtx_lock(&device->client_data_lock); TAILQ_INSERT_TAIL(&device->client_data_list, context, list); - mtx_unlock_spin(&device->client_data_lock); + mtx_unlock(&device->client_data_lock); return 0; } @@ -242,16 +242,16 @@ int num_ports, ret = ENOMEM; u8 port_index; - tprops = malloc(sizeof *tprops, M_DEVBUF, M_WAITOK); + tprops = malloc(sizeof *tprops, M_DEVBUF, M_NOWAIT); if (!tprops) goto out; num_ports = end_port(device) - start_port(device) + 1; device->pkey_tbl_len = malloc(sizeof *device->pkey_tbl_len * num_ports, - M_DEVBUF, M_WAITOK); + M_DEVBUF, M_NOWAIT); device->gid_tbl_len = malloc(sizeof *device->gid_tbl_len * num_ports, - M_DEVBUF, M_WAITOK); + M_DEVBUF, M_NOWAIT); if (!device->pkey_tbl_len || !device->gid_tbl_len) goto err; @@ -303,8 +303,10 @@ TAILQ_INIT(&device->event_handler_list); TAILQ_INIT(&device->client_data_list); - mtx_init(&device->event_handler_lock, "ib event handler", NULL, MTX_DUPOK|MTX_SPIN); - mtx_init(&device->client_data_lock, "ib client data", NULL, MTX_DUPOK|MTX_SPIN); + mtx_init(&device->event_handler_lock, "ib event handler", NULL, + MTX_DUPOK|MTX_DEF); + mtx_init(&device->client_data_lock, "ib client data", NULL, + MTX_DUPOK|MTX_DEF); ret = read_port_table_lengths(device); if (ret) { @@ -366,10 +368,10 @@ mtx_unlock(&device_mutex); - mtx_lock_spin(&device->client_data_lock); + mtx_lock(&device->client_data_lock); TAILQ_FOREACH_SAFE(context, &device->client_data_list, list, tmp) free(context, M_DEVBUF); - mtx_unlock_spin(&device->client_data_lock); + mtx_unlock(&device->client_data_lock); device->reg_state = IB_DEV_UNREGISTERED; } @@ -424,14 +426,14 @@ if (client->remove) client->remove(device); - mtx_lock_spin(&device->client_data_lock); + mtx_lock(&device->client_data_lock); TAILQ_FOREACH_SAFE(context, &device->client_data_list, list,tmp) if (context->client == client) { TAILQ_REMOVE(&device->client_data_list, context, list); free(context, M_DEVBUF); } - mtx_unlock_spin(&device->client_data_lock); + mtx_unlock(&device->client_data_lock); } TAILQ_REMOVE(&client_list, client, list); @@ -452,13 +454,13 @@ struct ib_client_data *context; void *ret = NULL; - mtx_lock_spin(&device->client_data_lock); + mtx_lock(&device->client_data_lock); TAILQ_FOREACH(context, &device->client_data_list, list) if (context->client == client) { ret = context->data; break; } - mtx_unlock_spin(&device->client_data_lock); + mtx_unlock(&device->client_data_lock); return ret; } @@ -478,7 +480,7 @@ { struct ib_client_data *context; - mtx_lock_spin(&device->client_data_lock); + mtx_lock(&device->client_data_lock); TAILQ_FOREACH(context, &device->client_data_list, list) if (context->client == client) { context->data = data; @@ -489,7 +491,7 @@ device->name, client->name); out: - mtx_unlock_spin(&device->client_data_lock); + mtx_unlock(&device->client_data_lock); } EXPORT_SYMBOL(ib_set_client_data); @@ -504,10 +506,10 @@ */ int ib_register_event_handler (struct ib_event_handler *event_handler) { - mtx_lock_spin(&event_handler->device->event_handler_lock); + mtx_lock(&event_handler->device->event_handler_lock); TAILQ_INSERT_TAIL(&event_handler->device->event_handler_list, event_handler, list); - mtx_unlock_spin(&event_handler->device->event_handler_lock); + mtx_unlock(&event_handler->device->event_handler_lock); return 0; } @@ -522,10 +524,10 @@ */ int ib_unregister_event_handler(struct ib_event_handler *event_handler) { - mtx_lock_spin(&event_handler->device->event_handler_lock); + mtx_lock(&event_handler->device->event_handler_lock); TAILQ_REMOVE(&event_handler->device->event_handler_list, event_handler, list); - mtx_unlock_spin(&event_handler->device->event_handler_lock); + mtx_unlock(&event_handler->device->event_handler_lock); return 0; } @@ -543,12 +545,12 @@ { struct ib_event_handler *handler; - mtx_lock_spin(&event->device->event_handler_lock); + mtx_lock(&event->device->event_handler_lock); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 10 04:50:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E54B11065674; Mon, 10 Mar 2008 04:50:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4F961065671 for ; Mon, 10 Mar 2008 04:50:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A7EDD8FC16 for ; Mon, 10 Mar 2008 04:50:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2A4oMQF032248 for ; Mon, 10 Mar 2008 04:50:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2A4oKUl032246 for perforce@freebsd.org; Mon, 10 Mar 2008 04:50:20 GMT (envelope-from sam@freebsd.org) Date: Mon, 10 Mar 2008 04:50:20 GMT Message-Id: <200803100450.m2A4oKUl032246@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 137289 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, 10 Mar 2008 04:50:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=137289 Change 137289 by sam@sam_ebb on 2008/03/10 04:49:41 o install new flags when checking the scan cache so the caller can specify things like NOPICK o dispatch a scan done event when a scan request is satisfied by a cache hit (for user apps that specify IEEE80211_IOC_SCAN_CHECK) Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_scan.c#16 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_scan.c#16 (text+ko) ==== @@ -586,6 +586,8 @@ */ SCAN_PRIVATE(ss)->ss_iflags |= ISCAN_DISCARD; ic->ic_flags |= IEEE80211_F_SCAN; + /* NB: need to use supplied flags in check below */ + ss->ss_flags = flags & 0xff; checkscanlist = 1; } } @@ -594,6 +596,7 @@ if (ss->ss_ops->scan_end(ss, vap)) { /* found an ap, just clear the flag */ ic->ic_flags &= ~IEEE80211_F_SCAN; + ieee80211_notify_scan_done(vap); return 1; } /* no ap, clear the flag before starting a scan */ From owner-p4-projects@FreeBSD.ORG Mon Mar 10 05:24:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89FB51065676; Mon, 10 Mar 2008 05:24:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 484661065673 for ; Mon, 10 Mar 2008 05:24:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4BABD8FC3C for ; Mon, 10 Mar 2008 05:24:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2A5OwrQ034520 for ; Mon, 10 Mar 2008 05:24:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2A5OwoA034518 for perforce@freebsd.org; Mon, 10 Mar 2008 05:24:58 GMT (envelope-from sam@freebsd.org) Date: Mon, 10 Mar 2008 05:24:58 GMT Message-Id: <200803100524.m2A5OwoA034518@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 137290 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, 10 Mar 2008 05:24:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=137290 Change 137290 by sam@sam_ebb on 2008/03/10 05:24:20 Add IEEE80211_SCAN_NOJOIN and the equivalent ioctl flag for scan requests that want to check the scan cache for a hit before deciding whether or not to kick off a scan. This will be used to short-circuit scans done after a deauth or similar. While here correct previous addition of IEEE80211_IOC_SCAN_CHECK to not overlap with IEEE80211_SCAN_NOSSID (move the latter since it's used internally). Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#39 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#15 edit .. //depot/projects/vap/sys/net80211/ieee80211_scan.c#17 edit .. //depot/projects/vap/sys/net80211/ieee80211_scan.h#12 edit .. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#20 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#39 (text+ko) ==== @@ -2345,7 +2345,8 @@ (IEEE80211_IOC_SCAN_NOPICK | IEEE80211_IOC_SCAN_ACTIVE | \ IEEE80211_IOC_SCAN_PICK1ST | IEEE80211_IOC_SCAN_BGSCAN | \ IEEE80211_IOC_SCAN_ONCE | IEEE80211_IOC_SCAN_NOBCAST | \ - IEEE80211_IOC_SCAN_FLUSH | IEEE80211_IOC_SCAN_CHECK) + IEEE80211_IOC_SCAN_NOJOIN | IEEE80211_IOC_SCAN_FLUSH | \ + IEEE80211_IOC_SCAN_CHECK) struct ieee80211com *ic = vap->iv_ic; struct ieee80211_scan_req sr; /* XXX off stack? */ int error, i; ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#15 (text+ko) ==== @@ -646,6 +646,7 @@ #define IEEE80211_IOC_SCAN_BGSCAN 0x00008 /* bg scan, exit ps at end */ #define IEEE80211_IOC_SCAN_ONCE 0x00010 /* do one complete pass */ #define IEEE80211_IOC_SCAN_NOBCAST 0x00020 /* don't send bcast probe req */ +#define IEEE80211_IOC_SCAN_NOJOIN 0x00040 /* no auto-sequencing */ #define IEEE80211_IOC_SCAN_FLUSH 0x10000 /* flush scan cache first */ #define IEEE80211_IOC_SCAN_CHECK 0x20000 /* check scan cache first */ u_int sr_duration; /* duration (ms) */ ==== //depot/projects/vap/sys/net80211/ieee80211_scan.c#17 (text+ko) ==== @@ -469,13 +469,14 @@ "%s: scan inhibited by pending channel change\n", __func__); } else if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, - "%s: %s scan, duration %u mindwell %u maxdwell %u, desired mode %s, %s%s%s%s%s\n" + "%s: %s scan, duration %u mindwell %u maxdwell %u, desired mode %s, %s%s%s%s%s%s\n" , __func__ , flags & IEEE80211_SCAN_ACTIVE ? "active" : "passive" , duration, mindwell, maxdwell , ieee80211_phymode_name[vap->iv_des_mode] , flags & IEEE80211_SCAN_FLUSH ? "flush" : "append" , flags & IEEE80211_SCAN_NOPICK ? ", nopick" : "" + , flags & IEEE80211_SCAN_NOJOIN ? ", nojoin" : "" , flags & IEEE80211_SCAN_NOBCAST ? ", nobcast" : "" , flags & IEEE80211_SCAN_PICK1ST ? ", pick1st" : "" , flags & IEEE80211_SCAN_ONCE ? ", once" : "" @@ -549,11 +550,12 @@ IEEE80211_LOCK(ic); IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, - "%s: %s scan, %s%s%s%s\n" + "%s: %s scan, %s%s%s%s%s\n" , __func__ , flags & IEEE80211_SCAN_ACTIVE ? "active" : "passive" , flags & IEEE80211_SCAN_FLUSH ? "flush" : "append" , flags & IEEE80211_SCAN_NOPICK ? ", nopick" : "" + , flags & IEEE80211_SCAN_NOJOIN ? ", nojoin" : "" , flags & IEEE80211_SCAN_PICK1ST ? ", pick1st" : "" , flags & IEEE80211_SCAN_ONCE ? ", once" : "" ); ==== //depot/projects/vap/sys/net80211/ieee80211_scan.h#12 (text+ko) ==== @@ -99,6 +99,7 @@ #define IEEE80211_SCAN_BGSCAN 0x0008 /* bg scan, exit ps at end */ #define IEEE80211_SCAN_ONCE 0x0010 /* do one complete pass */ #define IEEE80211_SCAN_NOBCAST 0x0020 /* no broadcast probe req */ +#define IEEE80211_SCAN_NOJOIN 0x0040 /* no auto-sequencing */ #define IEEE80211_SCAN_GOTPICK 0x1000 /* got candidate, can stop */ uint8_t ss_nssid; /* # ssid's to probe/match */ struct ieee80211_scan_ssid ss_ssid[IEEE80211_SCAN_MAX_SSID]; @@ -117,8 +118,8 @@ * ss_flags. It might be better to split this stuff out into * a separate variable to avoid confusion. */ -#define IEEE80211_SCAN_FLUSH 0x10000 /* flush candidate table */ -#define IEEE80211_SCAN_NOSSID 0x20000 /* don't update ssid list */ +#define IEEE80211_SCAN_FLUSH 0x00010000 /* flush candidate table */ +#define IEEE80211_SCAN_NOSSID 0x80000000 /* don't update ssid list */ struct ieee80211com; void ieee80211_scan_attach(struct ieee80211com *); ==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#20 (text+ko) ==== @@ -1036,6 +1036,8 @@ if (TAILQ_FIRST(&st->st_entry) == NULL) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, "%s: no scan candidate\n", __func__); + if (ss->ss_flags & IEEE80211_SCAN_NOJOIN) + return 0; notfound: /* * If nothing suitable was found decrement @@ -1049,6 +1051,8 @@ return 0; /* restart scan */ } selbs = select_bss(ss, vap, IEEE80211_MSG_SCAN); + if (ss->ss_flags & IEEE80211_SCAN_NOJOIN) + return (selbs != NULL); if (selbs == NULL || !ieee80211_sta_join(vap, &selbs->base)) goto notfound; return 1; /* terminate scan */ @@ -1374,6 +1378,8 @@ if (TAILQ_FIRST(&st->st_entry) == NULL) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, "%s: no scan candidate\n", __func__); + if (ss->ss_flags & IEEE80211_SCAN_NOJOIN) + return 0; notfound: if (vap->iv_des_nssid) { /* @@ -1405,6 +1411,8 @@ return 0; /* restart scan */ } selbs = select_bss(ss, vap, IEEE80211_MSG_SCAN); + if (ss->ss_flags & IEEE80211_SCAN_NOJOIN) + return (selbs != NULL); if (selbs == NULL || !ieee80211_sta_join(vap, &selbs->base)) goto notfound; return 1; /* terminate scan */ @@ -1570,7 +1578,7 @@ } } ap_reset_promisc(ic); - if (ss->ss_flags & IEEE80211_SCAN_NOPICK) { + if (ss->ss_flags & (IEEE80211_SCAN_NOPICK | IEEE80211_SCAN_NOJOIN)) { /* * Manual/background scan, don't select+join the * bss, just return. The scanning framework will From owner-p4-projects@FreeBSD.ORG Mon Mar 10 05:31:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6C301065678; Mon, 10 Mar 2008 05:31:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 863DB1065671 for ; Mon, 10 Mar 2008 05:31:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8A1D58FC14 for ; Mon, 10 Mar 2008 05:31:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2A5V49J034771 for ; Mon, 10 Mar 2008 05:31:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2A5V4EX034769 for perforce@freebsd.org; Mon, 10 Mar 2008 05:31:04 GMT (envelope-from sam@freebsd.org) Date: Mon, 10 Mar 2008 05:31:04 GMT Message-Id: <200803100531.m2A5V4EX034769@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 137291 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, 10 Mar 2008 05:31:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=137291 Change 137291 by sam@sam_ebb on 2008/03/10 05:30:25 Optimize re-association to the same ap (e.g. after a deauth due to inactivity). Track the ssid of the last ap we associated to and if a scan request is made supply this ssid and request the scan cache be checked before kicking off a full scan. If the cache valid setting is raised to keep the contents valid from background scans then we'll hit in the cache and immediately reassociate w/o a scan. Clear the ssid on deauth/disasoc and after we use this trick so we don't get into a loop. Affected files ... .. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#6 edit Differences ... ==== //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#6 (text+ko) ==== @@ -43,6 +43,8 @@ int prev_roaming; /* roaming state to restore on deinit */ int prev_privacy; /* privacy state to restore on deinit */ int prev_wpa; /* wpa state to restore on deinit */ + uint8_t lastssid[IEEE80211_NWID_LEN]; + int lastssid_len; }; static int @@ -360,6 +362,8 @@ struct wpa_driver_bsd_data *drv = priv; struct ieee80211req_mlme mlme; + drv->lastssid_len = 0; + wpa_printf(MSG_DEBUG, "%s", __func__); memset(&mlme, 0, sizeof(mlme)); mlme.im_op = IEEE80211_MLME_DEAUTH; @@ -374,6 +378,8 @@ struct wpa_driver_bsd_data *drv = priv; struct ieee80211req_mlme mlme; + drv->lastssid_len = 0; + wpa_printf(MSG_DEBUG, "%s", __func__); memset(&mlme, 0, sizeof(mlme)); mlme.im_op = IEEE80211_MLME_DISASSOC; @@ -426,6 +432,8 @@ memcpy(mlme.im_macaddr, params->bssid, IEEE80211_ADDR_LEN); if (set80211var(drv, IEEE80211_IOC_MLME, &mlme, sizeof(mlme)) < 0) return -1; + memcpy(drv->lastssid, params->ssid, params->ssid_len); + drv->lastssid_len = params->ssid_len; return 0; } @@ -471,18 +479,35 @@ memset(&sr, 0, sizeof(sr)); sr.sr_flags = IEEE80211_IOC_SCAN_ACTIVE | IEEE80211_IOC_SCAN_ONCE - | IEEE80211_IOC_SCAN_NOPICK - /* - * NB: caller specifies bcast ssid, so suppress - * net80211's normal handling - */ - | IEEE80211_IOC_SCAN_NOBCAST ; sr.sr_duration = IEEE80211_IOC_SCAN_FOREVER; - sr.sr_nssid = 1; - /* XXX ssid_len must be <= IEEE80211_NWID_LEN */ - memcpy(sr.sr_ssid[0].ssid, ssid, ssid_len); - sr.sr_ssid[0].len = ssid_len; + if (ssid_len != 0) { + /* XXX ssid_len must be <= IEEE80211_NWID_LEN */ + memcpy(sr.sr_ssid[sr.sr_nssid].ssid, ssid, ssid_len); + sr.sr_ssid[sr.sr_nssid].len = ssid_len; + sr.sr_nssid++; + } + if (drv->lastssid_len != 0 && + (drv->lastssid_len != ssid_len || + memcmp(drv->lastssid, ssid, ssid_len) != 0)) { + /* + * If we are scanning because we received a deauth + * and the scan cache is warm then we'll find the + * ap there and short circuit a full-blown scan. + */ + memcpy(sr.sr_ssid[sr.sr_nssid].ssid, drv->lastssid, + drv->lastssid_len); + sr.sr_ssid[sr.sr_nssid].len = drv->lastssid_len; + sr.sr_nssid++; + /* NB: clear so we don't retry w/o associating first */ + drv->lastssid_len = 0; + } + if (sr.sr_nssid != 0) { /* NB: check scan cache first */ + sr.sr_flags |= IEEE80211_IOC_SCAN_CHECK + | IEEE80211_IOC_SCAN_NOJOIN + ; + } else + sr.sr_flags |= IEEE80211_IOC_SCAN_NOPICK; /* NB: net80211 delivers a scan complete event so no need to poll */ return set80211var(drv, IEEE80211_IOC_SCAN_REQ, &sr, sizeof(sr)); From owner-p4-projects@FreeBSD.ORG Mon Mar 10 09:32:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38721106566B; Mon, 10 Mar 2008 09:32:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ECD77106566C for ; Mon, 10 Mar 2008 09:32:24 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 001568FC13 for ; Mon, 10 Mar 2008 09:32:24 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2A9WO9Q068542 for ; Mon, 10 Mar 2008 09:32:24 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2A9WOw0068540 for perforce@freebsd.org; Mon, 10 Mar 2008 09:32:24 GMT (envelope-from rrs@cisco.com) Date: Mon, 10 Mar 2008 09:32:24 GMT Message-Id: <200803100932.m2A9WOw0068540@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 137297 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, 10 Mar 2008 09:32:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=137297 Change 137297 by rrs@rrs-mips2-jnpr on 2008/03/10 09:32:06 Add an additional item ;-) Affected files ... .. //depot/projects/mips2-jnpr/src/sys/TODO#19 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/TODO#19 (text+ko) ==== @@ -64,6 +64,13 @@ this bit set. o Need to fix whatever is causing the ssh-keygen to die. o Printf of floating point is not working right. +o Just hit a cache-error (parity error). We need to enhance + the code not to panic but to pull all COP_0 registers + (cavium as cache error sel0 and 1) and then call a + machdep function. The function "could" return the panic + address by default but also have specific actions, such + as flushing the icache and dcache, incrementing a count + and only panic'ing if we are over a threshold. From owner-p4-projects@FreeBSD.ORG Mon Mar 10 16:11:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63E501065676; Mon, 10 Mar 2008 16:11:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2381C106566B for ; Mon, 10 Mar 2008 16:11:28 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 230EE8FC1D for ; Mon, 10 Mar 2008 16:11:28 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AGBSCJ008795 for ; Mon, 10 Mar 2008 16:11:28 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AGBREp008793 for perforce@freebsd.org; Mon, 10 Mar 2008 16:11:27 GMT (envelope-from piso@freebsd.org) Date: Mon, 10 Mar 2008 16:11:27 GMT Message-Id: <200803101611.m2AGBREp008793@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 137323 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, 10 Mar 2008 16:11:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=137323 Change 137323 by piso@piso_ferret on 2008/03/10 16:10:28 -Don't pass the entire pkt to FragmentIn() & FragmentOut() -Remove some stale comments Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#67 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#67 (text+ko) ==== @@ -642,8 +642,6 @@ return (iresult); } - -// XXX ip free static int ProtoAliasIn(struct libalias *la, struct in_addr ip_src, struct in_addr *ip_dst, u_char ip_p, u_short *ip_sum) @@ -677,7 +675,6 @@ return (PKT_ALIAS_IGNORED); } -// XXX ip free static int ProtoAliasOut(struct libalias *la, struct in_addr *ip_src, struct in_addr ip_dst, u_char ip_p, u_short *ip_sum, int create) @@ -1094,41 +1091,42 @@ */ /* Local prototypes */ -static int FragmentIn(struct libalias *, struct ip *); -static int FragmentOut(struct libalias *, struct ip *); +static int FragmentIn(struct libalias *la, struct in_addr ip_src, + struct in_addr *ip_dst, u_char ip_p, u_short *ip_sum); +static int FragmentOut(struct libalias *, struct in_addr *ip_src, + u_short *ip_sum); -// XXX ip free static int -FragmentIn(struct libalias *la, struct ip *pip) +FragmentIn(struct libalias *la, struct in_addr ip_src, struct in_addr *ip_dst, + u_char ip_id, u_short *ip_sum) { struct alias_link *lnk; LIBALIAS_LOCK_ASSERT(la); - lnk = FindFragmentIn2(la, pip->ip_src, pip->ip_dst, pip->ip_id); + lnk = FindFragmentIn2(la, ip_src, *ip_dst, ip_id); if (lnk != NULL) { struct in_addr original_address; GetFragmentAddr(lnk, &original_address); - DifferentialChecksum(&pip->ip_sum, - &original_address, &pip->ip_dst, 2); - pip->ip_dst = original_address; + DifferentialChecksum(ip_sum, + &original_address, ip_dst, 2); + *ip_dst = original_address; return (PKT_ALIAS_OK); } return (PKT_ALIAS_UNRESOLVED_FRAGMENT); } -// XXX ip free static int -FragmentOut(struct libalias *la, struct ip *pip) +FragmentOut(struct libalias *la, struct in_addr *ip_src, u_short *ip_sum) { struct in_addr alias_address; LIBALIAS_LOCK_ASSERT(la); - alias_address = FindAliasAddress(la, pip->ip_src); - DifferentialChecksum(&pip->ip_sum, - &alias_address, &pip->ip_src, 2); - pip->ip_src = alias_address; + alias_address = FindAliasAddress(la, *ip_src); + DifferentialChecksum(ip_sum, + &alias_address, ip_src, 2); + *ip_src = alias_address; return (PKT_ALIAS_OK); } @@ -1310,7 +1308,8 @@ } } } else { - iresult = FragmentIn(la, pip); + iresult = FragmentIn(la, pip->ip_src, &pip->ip_dst, pip->ip_id, + &pip->ip_sum); } getout: @@ -1441,7 +1440,7 @@ break; } } else { - iresult = FragmentOut(la, pip); + iresult = FragmentOut(la, &pip->ip_src, &pip->ip_sum); } SetDefaultAliasAddress(la, addr_save); From owner-p4-projects@FreeBSD.ORG Mon Mar 10 16:12:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A37851065674; Mon, 10 Mar 2008 16:12:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 630301065672 for ; Mon, 10 Mar 2008 16:12:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 611438FC22 for ; Mon, 10 Mar 2008 16:12:29 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AGCTb6008912 for ; Mon, 10 Mar 2008 16:12:29 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AGCT0j008910 for perforce@freebsd.org; Mon, 10 Mar 2008 16:12:29 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Mar 2008 16:12:29 GMT Message-Id: <200803101612.m2AGCT0j008910@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 137324 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, 10 Mar 2008 16:12:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=137324 Change 137324 by imp@imp_paco-paco on 2008/03/10 16:11:44 IFC @137323 Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/conf/MALTA#3 edit .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_entry.3#15 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_read.3#30 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_util.3#8 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_write.3#18 integrate .. //depot/user/imp/freebsd-imp/lib/libarchive/archive_write_disk.3#2 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/conf/MALTA#3 (text+ko) ==== @@ -64,6 +64,8 @@ device genclock device loop device ether +device le +device miibus device md device mem device uart ==== //depot/user/imp/freebsd-imp/lib/libarchive/archive_entry.3#15 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.15 2007/07/15 19:10:34 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.16 2008/03/10 14:44:40 jkoshy Exp $ .\" .Dd December 15, 2003 .Dt archive_entry 3 @@ -101,17 +101,47 @@ .Sh SYNOPSIS .In archive_entry.h .Ft void -.Fn archive_entry_acl_add_entry "struct archive_entry *" "int type" "int permset" "int tag" "int qual" "const char *name" +.Fo archive_entry_acl_add_entry +.Fa "struct archive_entry *" +.Fa "int type" +.Fa "int permset" +.Fa "int tag" +.Fa "int qual" +.Fa "const char *name" +.Fc .Ft void -.Fn archive_entry_acl_add_entry_w "struct archive_entry *" "int type" "int permset" "int tag" "int qual" "const wchar_t *name" +.Fo archive_entry_acl_add_entry_w +.Fa "struct archive_entry *" +.Fa "int type" +.Fa "int permset" +.Fa "int tag" +.Fa "int qual" +.Fa "const wchar_t *name" +.Fc .Ft void .Fn archive_entry_acl_clear "struct archive_entry *" .Ft int .Fn archive_entry_acl_count "struct archive_entry *" "int type" .Ft int -.Fn archive_entry_acl_next "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const char **name" +.Fo archive_entry_acl_next +.Fa "struct archive_entry *" +.Fa "int want_type" +.Fa "int *type" +.Fa "int *permset" +.Fa "int *tag" +.Fa "int *qual" +.Fa "const char **name" +.Fc .Ft int -.Fn archive_entry_acl_next_w "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const wchar_t **name" +.Fo archive_entry_acl_next_w +.Fa "struct archive_entry *" +.Fa "int want_type" +.Fa "int *type" +.Fa "int *permset" +.Fa "int *tag" +.Fa "int *qual" +.Fa "const wchar_t **name" +.Fc .Ft int .Fn archive_entry_acl_reset "struct archive_entry *" "int want_type" .Ft const wchar_t * @@ -155,7 +185,11 @@ .Ft mode_t .Fn archive_entry_filetype "struct archive_entry *" .Ft void -.Fn archive_entry_fflags "struct archive_entry *" "unsigned long *set" "unsigned long *clear" +.Fo archive_entry_fflags +.Fa "struct archive_entry *" +.Fa "unsigned long *set" +.Fa "unsigned long *clear" +.Fc .Ft const char * .Fn archive_entry_fflags_text "struct archive_entry *" .Ft void @@ -195,7 +229,11 @@ .Ft void .Fn archive_entry_set_filetype "struct archive_entry *" "unsigned int" .Ft void -.Fn archive_entry_set_fflags "struct archive_entry *" "unsigned long set" "unsigned long clear" +.Fo archive_entry_set_fflags +.Fa "struct archive_entry *" +.Fa "unsigned long set" +.Fa "unsigned long clear" +.Fc .Ft void .Fn archive_entry_set_gid "struct archive_entry *" "gid_t" .Ft void ==== //depot/user/imp/freebsd-imp/lib/libarchive/archive_read.3#30 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.35 2007/09/19 16:37:45 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.36 2008/03/10 14:45:29 jkoshy Exp $ .\" .Dd August 19, 2006 .Dt archive_read 3 @@ -75,7 +75,10 @@ .Ft int .Fn archive_read_support_compression_none "struct archive *" .Ft int -.Fn archive_read_support_compression_program "struct archive *" "const char *cmd" +.Fo archive_read_support_compression_program +.Fa "struct archive *" +.Fa "const char *cmd" +.Fc .Ft int .Fn archive_read_support_format_all "struct archive *" .Ft int @@ -89,15 +92,32 @@ .Ft int .Fn archive_read_support_format_zip "struct archive *" .Ft int -.Fn archive_read_open "struct archive *" "void *client_data" "archive_open_callback *" "archive_read_callback *" "archive_close_callback *" +.Fo archive_read_open +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "archive_open_callback *" +.Fa "archive_read_callback *" +.Fa "archive_close_callback *" +.Fc .Ft int -.Fn archive_read_open2 "struct archive *" "void *client_data" "archive_open_callback *" "archive_read_callback *" "archive_skip_callback *" "archive_close_callback *" +.Fo archive_read_open2 +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "archive_open_callback *" +.Fa "archive_read_callback *" +.Fa "archive_skip_callback *" +.Fa "archive_close_callback *" +.Fc .Ft int .Fn archive_read_open_FILE "struct archive *" "FILE *file" .Ft int .Fn archive_read_open_fd "struct archive *" "int fd" "size_t block_size" .Ft int -.Fn archive_read_open_filename "struct archive *" "const char *filename" "size_t block_size" +.Fo archive_read_open_filename +.Fa "struct archive *" +.Fa "const char *filename" +.Fa "size_t block_size" +.Fc .Ft int .Fn archive_read_open_memory "struct archive *" "void *buff" "size_t size" .Ft int @@ -105,7 +125,12 @@ .Ft ssize_t .Fn archive_read_data "struct archive *" "void *buff" "size_t len" .Ft int -.Fn archive_read_data_block "struct archive *" "const void **buff" "size_t *len" "off_t *offset" +.Fo archive_read_data_block +.Fa "struct archive *" +.Fa "const void **buff" +.Fa "size_t *len" +.Fa "off_t *offset" +.Fc .Ft int .Fn archive_read_data_skip "struct archive *" .\" #if ARCHIVE_API_VERSION < 3 @@ -115,9 +140,17 @@ .Ft int .Fn archive_read_data_into_fd "struct archive *" "int fd" .Ft int -.Fn archive_read_extract "struct archive *" "struct archive_entry *" "int flags" +.Fo archive_read_extract +.Fa "struct archive *" +.Fa "struct archive_entry *" +.Fa "int flags" +.Fc .Ft void -.Fn archive_read_extract_set_progress_callback "struct archive *" "void (*func)(void *)" "void *user_data" +.Fo archive_read_extract_set_progress_callback +.Fa "struct archive *" +.Fa "void (*func)(void *)" +.Fa "void *user_data" +.Fc .Ft int .Fn archive_read_close "struct archive *" .Ft int @@ -136,7 +169,13 @@ Allocates and initializes a .Tn struct archive object suitable for reading from an archive. -.It Fn archive_read_support_compression_all , Fn archive_read_support_compression_bzip2 , Fn archive_read_support_compression_compress , Fn archive_read_support_compression_gzip , Fn archive_read_support_compression_none +.It Xo +.Fn archive_read_support_compression_all , +.Fn archive_read_support_compression_bzip2 , +.Fn archive_read_support_compression_compress , +.Fn archive_read_support_compression_gzip , +.Fn archive_read_support_compression_none +.Xc Enables auto-detection code and decompression support for the specified compression. Note that @@ -150,7 +189,14 @@ Note that this disables automatic detection of the compression format, so it makes no sense to specify this in conjunction with any other decompression option. -.It Fn archive_read_support_format_all , Fn archive_read_support_format_cpio , Fn archive_read_support_format_empty , Fn archive_read_support_format_iso9660 , Fn archive_read_support_format_tar, Fn archive_read_support_format_zip +.It Xo +.Fn archive_read_support_format_all , +.Fn archive_read_support_format_cpio , +.Fn archive_read_support_format_empty , +.Fn archive_read_support_format_iso9660 , +.Fn archive_read_support_format_tar , +.Fn archive_read_support_format_zip +.Xc Enables support---including auto-detection code---for the specified archive format. For example, @@ -311,14 +357,26 @@ .Bl -item -offset indent .It .Ft typedef ssize_t -.Fn archive_read_callback "struct archive *" "void *client_data" "const void **buffer" +.Fo archive_read_callback +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "const void **buffer" +.Fc .It .\" #if ARCHIVE_API_VERSION < 2 .Ft typedef int -.Fn archive_skip_callback "struct archive *" "void *client_data" "size_t request" +.Fo archive_skip_callback +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "size_t request" +.Fc .\" #else .\" .Ft typedef off_t -.\" .Fn archive_skip_callback "struct archive *" "void *client_data" "off_t request" +.\" .Fo archive_skip_callback +.\" .Fa "struct archive *" +.\" .Fa "void *client_data" +.\" .Fa "off_t request" +.\" .Fc .\" #endif .It .Ft typedef int ==== //depot/user/imp/freebsd-imp/lib/libarchive/archive_util.3#8 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_util.3,v 1.7 2007/05/29 01:00:19 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_util.3,v 1.8 2008/03/10 14:44:40 jkoshy Exp $ .\" .Dd January 8, 2005 .Dt archive_util 3 @@ -57,7 +57,12 @@ .Ft const char * .Fn archive_format_name "struct archive *" .Ft void -.Fn archive_set_error "struct archive *" "int error_code" "const char *fmt" "..." +.Fo archive_set_error +.Fa "struct archive *" +.Fa "int error_code" +.Fa "const char *fmt" +.Fa "..." +.Fc .Sh DESCRIPTION These functions provide access to various information about the .Tn struct archive ==== //depot/user/imp/freebsd-imp/lib/libarchive/archive_write.3#18 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.22 2007/05/29 01:00:19 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.23 2008/03/10 14:44:41 jkoshy Exp $ .\" .Dd August 19, 2006 .Dt archive_write 3 @@ -70,7 +70,10 @@ .Ft int .Fn archive_write_set_compression_none "struct archive *" .Ft int -.Fn archive_write_set_compression_program "struct archive *" "const char * cmd" +.Fo archive_write_set_compression_program +.Fa "struct archive *" +.Fa "const char * cmd" +.Fc .Ft int .Fn archive_write_set_format_cpio "struct archive *" .Ft int @@ -84,7 +87,13 @@ .Ft int .Fn archive_write_set_format_ustar "struct archive *" .Ft int -.Fn archive_write_open "struct archive *" "void *client_data" "archive_open_callback *" "archive_write_callback *" "archive_close_callback *" +.Fo archive_write_open +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "archive_open_callback *" +.Fa "archive_write_callback *" +.Fa "archive_close_callback *" +.Fc .Ft int .Fn archive_write_open_fd "struct archive *" "int fd" .Ft int @@ -92,7 +101,12 @@ .Ft int .Fn archive_write_open_filename "struct archive *" "const char *filename" .Ft int -.Fn archive_write_open_memory "struct archive *" "void *buffer" "size_t bufferSize" "size_t *outUsed" +.Fo archive_write_open_memory +.Fa "struct archive *" +.Fa "void *buffer" +.Fa "size_t bufferSize" +.Fa "size_t *outUsed" +.Fc .Ft int .Fn archive_write_header "struct archive *" "struct archive_entry *" .Ft ssize_t @@ -150,7 +164,14 @@ .It Fn archive_write_get_bytes_in_last_block Retrieve the currently-set value for last block size. A value of -1 here indicates that the library should use default values. -.It Fn archive_write_set_format_cpio , Fn archive_write_set_format_pax , Fn archive_write_set_format_pax_restricted , Fn archive_write_set_format_shar , Fn archive_write_set_format_shar_binary , Fn archive_write_set_format_ustar +.It Xo +.Fn archive_write_set_format_cpio , +.Fn archive_write_set_format_pax , +.Fn archive_write_set_format_pax_restricted , +.Fn archive_write_set_format_shar , +.Fn archive_write_set_format_shar_binary , +.Fn archive_write_set_format_ustar +.Xc Sets the format that will be used for the archive. The library can write POSIX octet-oriented cpio format archives, @@ -174,7 +195,11 @@ is the library default; this is the same as pax format, but suppresses the pax extended header for most normal files. In most cases, this will result in ordinary ustar archives. -.It Fn archive_write_set_compression_bzip2 , Fn archive_write_set_compression_gzip , Fn archive_write_set_compression_none +.It Xo +.Fn archive_write_set_compression_bzip2 , +.Fn archive_write_set_compression_gzip , +.Fn archive_write_set_compression_none +.Xc The resulting archive will be compressed as specified. Note that the compressed output is always properly blocked. .It Fn archive_write_set_compression_program @@ -310,7 +335,12 @@ .Bl -item -offset indent .It .Ft typedef ssize_t -.Fn archive_write_callback "struct archive *" "void *client_data" "void *buffer" "size_t length" +.Fo archive_write_callback +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "void *buffer" +.Fa "size_t length" +.Fc .El .Pp The write callback is invoked whenever the library ==== //depot/user/imp/freebsd-imp/lib/libarchive/archive_write_disk.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_write_disk.3,v 1.1 2007/03/03 07:37:36 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_write_disk.3,v 1.2 2008/03/10 14:44:41 jkoshy Exp $ .\" .Dd March 2, 2007 .Dt archive_write_disk 3 @@ -49,11 +49,21 @@ .Ft int .Fn archive_write_disk_set_skip_file "struct archive *" "dev_t" "ino_t" .Ft int -.Fn archive_write_disk_set_group_lookup "struct archive *" "void *" "gid_t (*)(void *, const char *gname, gid_t gid)" "void (*cleanup)(void *)" +.Fo archive_write_disk_set_group_lookup +.Fa "struct archive *" +.Fa "void *" +.Fa "gid_t (*)(void *, const char *gname, gid_t gid)" +.Fa "void (*cleanup)(void *)" +.Fc .Ft int .Fn archive_write_disk_set_standard_lookup "struct archive *" .Ft int -.Fn archive_write_disk_set_user_lookup "struct archive *" "void *" "uid_t (*)(void *, const char *uname, uid_t uid)" "void (*cleanup)(void *)" +.Fo archive_write_disk_set_user_lookup +.Fa "struct archive *" +.Fa "void *" +.Fa "uid_t (*)(void *, const char *uname, uid_t uid)" +.Fa "void (*cleanup)(void *)" +.Fc .Ft int .Fn archive_write_header "struct archive *" "struct archive_entry *" .Ft ssize_t @@ -160,7 +170,10 @@ .Pa .. always cause an error, regardless of this flag. .El -.It Fn archive_write_disk_set_group_lookup , Fn archive_write_disk_set_user_lookup +.It Xo +.Fn archive_write_disk_set_group_lookup , +.Fn archive_write_disk_set_user_lookup +.Xc The .Tn struct archive_entry objects contain both names and ids that can be used to identify users From owner-p4-projects@FreeBSD.ORG Mon Mar 10 16:54:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C23E1065674; Mon, 10 Mar 2008 16:54:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EECDC1065672 for ; Mon, 10 Mar 2008 16:54:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EAF628FC26 for ; Mon, 10 Mar 2008 16:54:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AGsCPo019289 for ; Mon, 10 Mar 2008 16:54:12 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AGsCOF019287 for perforce@freebsd.org; Mon, 10 Mar 2008 16:54:12 GMT (envelope-from sam@freebsd.org) Date: Mon, 10 Mar 2008 16:54:12 GMT Message-Id: <200803101654.m2AGsCOF019287@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 137326 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, 10 Mar 2008 16:54:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=137326 Change 137326 by sam@sam_ebb on 2008/03/10 16:53:47 fix mlme debug msg for assoc request; we cannot take the mac address from the bss node, it's not set yet Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#40 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#40 (text+ko) ==== @@ -1184,7 +1184,8 @@ }; static void -mlmedebug(struct ieee80211_node *ni, int op, int reason) +mlmedebug(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN], + int op, int reason) { #ifdef IEEE80211_DEBUG static const struct { @@ -1203,22 +1204,21 @@ { IEEE80211_MSG_IOCTL | IEEE80211_MSG_STATE | IEEE80211_MSG_AUTH, "unauthorize" }, }; - struct ieee80211vap *vap = ni->ni_vap; if (op == IEEE80211_MLME_AUTH) { - IEEE80211_NOTE(vap, IEEE80211_MSG_IOCTL | IEEE80211_MSG_STATE | - IEEE80211_MSG_AUTH, ni, + IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_IOCTL | + IEEE80211_MSG_STATE | IEEE80211_MSG_AUTH, mac, "station authenticate %s via MLME (reason %d)", reason == IEEE80211_STATUS_SUCCESS ? "ACCEPT" : "REJECT", reason); } else if (!(IEEE80211_MLME_ASSOC <= op && op <= IEEE80211_MLME_AUTH)) { - IEEE80211_NOTE(vap, IEEE80211_MSG_ANY, ni, + IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ANY, mac, "unknown MLME request %d (reason %d)", op, reason); } else if (reason == IEEE80211_STATUS_SUCCESS) { - IEEE80211_NOTE(vap, ops[op].mask, ni, + IEEE80211_NOTE_MAC(vap, ops[op].mask, mac, "station %s via MLME", ops[op].opstr); } else { - IEEE80211_NOTE(vap, ops[op].mask, ni, + IEEE80211_NOTE_MAC(vap, ops[op].mask, mac, "station %s via MLME (reason %d)", ops[op].opstr, reason); } #endif /* IEEE80211_DEBUG */ @@ -1239,7 +1239,7 @@ */ if (ni->ni_associd == 0) return; - mlmedebug(ni, mop->op, mop->reason); + mlmedebug(vap, ni->ni_macaddr, mop->op, mop->reason); if (mop->op == IEEE80211_MLME_DEAUTH) { IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_DEAUTH, mop->reason); @@ -1265,7 +1265,7 @@ case IEEE80211_MLME_DEAUTH: switch (vap->iv_opmode) { case IEEE80211_M_STA: - mlmedebug(vap->iv_bss, op, reason); + mlmedebug(vap, vap->iv_bss->ni_macaddr, op, reason); /* XXX not quite right */ ieee80211_new_state(vap, IEEE80211_S_INIT, reason); break; @@ -1299,7 +1299,7 @@ break; } #endif - mlmedebug(vap->iv_bss, op, reason); + mlmedebug(vap, vap->iv_bss->ni_macaddr, op, reason); ni = ieee80211_ref_node(vap->iv_bss); IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_DEAUTH, reason); @@ -1319,7 +1319,7 @@ } ni = ieee80211_find_vap_node(&ic->ic_sta, vap, mac); if (ni != NULL) { - mlmedebug(ni, op, reason); + mlmedebug(vap, mac, op, reason); if (op == IEEE80211_MLME_AUTHORIZE) ieee80211_node_authorize(ni); else @@ -1335,7 +1335,7 @@ } ni = ieee80211_find_vap_node(&ic->ic_sta, vap, mac); if (ni != NULL) { - mlmedebug(ni, op, reason); + mlmedebug(vap, mac, op, reason); if (reason == IEEE80211_STATUS_SUCCESS) { IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH, 2); @@ -1409,7 +1409,7 @@ ieee80211_scan_iterate(vap, mlmelookup, &lookup); if (lookup.se == NULL) return ENOENT; - mlmedebug(vap->iv_bss, IEEE80211_MLME_ASSOC, 0); + mlmedebug(vap, mac, IEEE80211_MLME_ASSOC, 0); if (!ieee80211_sta_join(vap, lookup.se)) return EIO; /* XXX unique but could be better */ return 0; From owner-p4-projects@FreeBSD.ORG Mon Mar 10 16:58:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C22671065675; Mon, 10 Mar 2008 16:58:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 814351065676 for ; Mon, 10 Mar 2008 16:58:18 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 639E78FC1F for ; Mon, 10 Mar 2008 16:58:18 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AGwIkV019449 for ; Mon, 10 Mar 2008 16:58:18 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AGwIVw019447 for perforce@freebsd.org; Mon, 10 Mar 2008 16:58:18 GMT (envelope-from rrs@cisco.com) Date: Mon, 10 Mar 2008 16:58:18 GMT Message-Id: <200803101658.m2AGwIVw019447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 137327 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, 10 Mar 2008 16:58:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=137327 Change 137327 by rrs@rrs-mips2-jnpr on 2008/03/10 16:57:26 Fix math variables for mips. Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libc/mips/_fpmath.h#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/_fpmath.h#2 (text+ko) ==== @@ -45,8 +45,9 @@ #define LDBL_NBIT 0 #define mask_nbit_l(u) ((void)0) +#define LDBL_IMPLICIT_NBIT -#define LDBL_MANH_SIZE 32 +#define LDBL_MANH_SIZE 20 #define LDBL_MANL_SIZE 32 #define LDBL_TO_ARRAY32(u, a) do { \ From owner-p4-projects@FreeBSD.ORG Mon Mar 10 16:58:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D6C21065720; Mon, 10 Mar 2008 16:58:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD89B1065670 for ; Mon, 10 Mar 2008 16:58:18 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A9AA88FC23 for ; Mon, 10 Mar 2008 16:58:18 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AGwI8F019459 for ; Mon, 10 Mar 2008 16:58:18 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AGwIfl019457 for perforce@freebsd.org; Mon, 10 Mar 2008 16:58:18 GMT (envelope-from rrs@cisco.com) Date: Mon, 10 Mar 2008 16:58:18 GMT Message-Id: <200803101658.m2AGwIfl019457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 137329 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, 10 Mar 2008 16:58:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=137329 Change 137329 by rrs@rrs-mips2-jnpr on 2008/03/10 16:58:03 Fix math variables for mips (note still may have a problem with little endian versions). Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libc/mips/arith.h#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/arith.h#2 (text+ko) ==== @@ -10,7 +10,20 @@ * generated by running contrib/gdtoa/arithchk.c on the target * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ -/* TODO: check these values */ +#include + +#if BYTE_ORDER == BIG_ENDIAN +#define IEEE_MC68k +#define Arith_Kind_ASL 2 +#define Double_Align +#else +/* TODO: Generate these values on a LE machine */ +/* Current values were stolen from ia64 except the + * Xpointer define. + */ #define IEEE_8087 #define Arith_Kind_ASL 1 -#define Sudden_Underflow +#define Long int +#define Intcast (int)(long) +#define Double_Align +#endif From owner-p4-projects@FreeBSD.ORG Mon Mar 10 16:59:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 259791065672; Mon, 10 Mar 2008 16:59:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D8DE81065671 for ; Mon, 10 Mar 2008 16:59:19 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D52698FC16 for ; Mon, 10 Mar 2008 16:59:19 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AGxJYZ019482 for ; Mon, 10 Mar 2008 16:59:19 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AGxJj7019480 for perforce@freebsd.org; Mon, 10 Mar 2008 16:59:19 GMT (envelope-from rrs@cisco.com) Date: Mon, 10 Mar 2008 16:59:19 GMT Message-Id: <200803101659.m2AGxJj7019480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 137330 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, 10 Mar 2008 16:59:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=137330 Change 137330 by rrs@rrs-mips2-jnpr on 2008/03/10 16:58:34 Fix the math variables... there still may be issues with the Little endian versions. Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gd_qnan.h#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gd_qnan.h#2 (text+ko) ==== @@ -1,12 +1,48 @@ -/* $NetBSD: gd_qnan.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */ +/* + * MD header for contrib/gdtoa + * + * This file can be generated by compiling and running contrib/gdtoa/qnan.c + * on the target architecture after arith.h has been generated. + * + * $FreeBSD: src/lib/libc/mips/gd_qnan.h,v $ + */ + #include -#define f_QNAN 0x7fa00000 #if BYTE_ORDER == BIG_ENDIAN -#define d_QNAN0 0x7ff40000 +/* These values were gained on a running + * Octeon in Big Endian order. They were gotten + * by running ./qnan after arithchk was ran and + * got us the proper values for arith.h. + */ +#define f_QNAN 0x7f900000 +#define d_QNAN0 0x7ff80000 #define d_QNAN1 0x0 +#define ld_QNAN0 0x7ff80000 +#define ld_QNAN1 0x0 +#define ld_QNAN2 0x0 +#define ld_QNAN3 0x0 +#define ldus_QNAN0 0x7ff8 +#define ldus_QNAN1 0x0 +#define ldus_QNAN2 0x0 +#define ldus_QNAN3 0x0 +#define ldus_QNAN4 0x0 #else +/* FIX FIX, need to run this on a Little Endian + * machine and get the proper values, these here + * were stolen fromn i386/gd_qnan.h + */ +#define f_QNAN 0x7fc00000 #define d_QNAN0 0x0 -#define d_QNAN1 0x7ff40000 +#define d_QNAN1 0x7ff80000 +#define ld_QNAN0 0x0 +#define ld_QNAN1 0xc0000000 +#define ld_QNAN2 0x7fff +#define ld_QNAN3 0x0 +#define ldus_QNAN0 0x0 +#define ldus_QNAN1 0x0 +#define ldus_QNAN2 0x0 +#define ldus_QNAN3 0xc000 +#define ldus_QNAN4 0x7fff #endif From owner-p4-projects@FreeBSD.ORG Mon Mar 10 17:32:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF84D1065671; Mon, 10 Mar 2008 17:32:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CAEA106566B for ; Mon, 10 Mar 2008 17:32:55 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 902E98FC36 for ; Mon, 10 Mar 2008 17:32:55 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AHWt3k022150 for ; Mon, 10 Mar 2008 17:32:55 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AHWsUR022148 for perforce@freebsd.org; Mon, 10 Mar 2008 17:32:54 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Mar 2008 17:32:54 GMT Message-Id: <200803101732.m2AHWsUR022148@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 137332 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, 10 Mar 2008 17:32:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=137332 Change 137332 by imp@imp_paco-paco on 2008/03/10 17:32:45 IFC @137323 Affected files ... .. //depot/projects/arm/src/Makefile.inc1#35 integrate .. //depot/projects/arm/src/ObsoleteFiles.inc#32 integrate .. //depot/projects/arm/src/UPDATING#24 integrate .. //depot/projects/arm/src/bin/chflags/chflags.1#3 integrate .. //depot/projects/arm/src/bin/chflags/chflags.c#2 integrate .. //depot/projects/arm/src/bin/realpath/realpath.1#2 integrate .. //depot/projects/arm/src/bin/realpath/realpath.c#2 integrate .. //depot/projects/arm/src/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/arm/src/etc/Makefile#9 integrate .. //depot/projects/arm/src/etc/ddb.conf#1 branch .. //depot/projects/arm/src/etc/defaults/rc.conf#21 integrate .. //depot/projects/arm/src/etc/rc.d/Makefile#14 integrate .. //depot/projects/arm/src/etc/rc.d/ddb#1 branch .. //depot/projects/arm/src/etc/rc.d/mountcritlocal#4 integrate .. //depot/projects/arm/src/etc/rc.d/mountlate#3 integrate .. //depot/projects/arm/src/games/fortune/datfiles/fortunes#17 integrate .. //depot/projects/arm/src/gnu/usr.bin/binutils/ar/Makefile#4 integrate .. //depot/projects/arm/src/gnu/usr.bin/binutils/ranlib/Makefile#4 integrate .. //depot/projects/arm/src/include/pthread_np.h#3 integrate .. //depot/projects/arm/src/include/unistd.h#4 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry.3#6 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read.3#12 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_zip.c#11 integrate .. //depot/projects/arm/src/lib/libarchive/archive_util.3#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write.3#9 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write_disk.c#11 integrate .. //depot/projects/arm/src/lib/libc/gen/sysconf.c#5 integrate .. //depot/projects/arm/src/lib/libc/posix1e/mac.c#2 integrate .. //depot/projects/arm/src/lib/libc/posix1e/mac_exec.c#2 integrate .. //depot/projects/arm/src/lib/libc/posix1e/mac_get.c#2 integrate .. //depot/projects/arm/src/lib/libc/posix1e/mac_set.c#2 integrate .. //depot/projects/arm/src/lib/libc/stdio/fdopen.c#3 integrate .. //depot/projects/arm/src/lib/libc/stdio/fopen.c#3 integrate .. //depot/projects/arm/src/lib/libc/stdio/freopen.c#4 integrate .. //depot/projects/arm/src/lib/libc/stdlib/getenv.c#6 integrate .. //depot/projects/arm/src/lib/libc/stdlib/malloc.c#14 integrate .. //depot/projects/arm/src/lib/libc/sys/Makefile.inc#9 integrate .. //depot/projects/arm/src/lib/libc/sys/Symbol.map#6 integrate .. //depot/projects/arm/src/lib/libc/sys/fcntl.2#3 integrate .. //depot/projects/arm/src/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/mq_close.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/mq_getattr.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/mq_notify.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/mq_open.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/mq_receive.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/mq_send.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/mq_setattr.2#4 integrate .. //depot/projects/arm/src/lib/libc/sys/readlink.2#4 integrate .. //depot/projects/arm/src/lib/libelf/elf_update.c#4 integrate .. //depot/projects/arm/src/lib/libelf/gelf_rel.c#2 integrate .. //depot/projects/arm/src/lib/libelf/gelf_rela.c#2 integrate .. //depot/projects/arm/src/lib/libthr/pthread.map#6 integrate .. //depot/projects/arm/src/lib/libthr/thread/Makefile.inc#2 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_affinity.c#1 branch .. //depot/projects/arm/src/lib/libthr/thread/thr_attr.c#3 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_create.c#6 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_exit.c#5 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_init.c#11 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_private.h#11 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_sig.c#6 integrate .. //depot/projects/arm/src/lib/libutil/humanize_number.c#2 integrate .. //depot/projects/arm/src/lib/msun/Makefile#7 integrate .. //depot/projects/arm/src/lib/msun/Symbol.map#5 integrate .. //depot/projects/arm/src/lib/msun/amd64/Makefile.inc#3 integrate .. //depot/projects/arm/src/lib/msun/amd64/e_sqrtl.S#1 branch .. //depot/projects/arm/src/lib/msun/i387/Makefile.inc#3 integrate .. //depot/projects/arm/src/lib/msun/i387/e_sqrtl.S#1 branch .. //depot/projects/arm/src/lib/msun/ld128/s_nanl.c#2 integrate .. //depot/projects/arm/src/lib/msun/man/sqrt.3#4 integrate .. //depot/projects/arm/src/lib/msun/src/e_rem_pio2.c#4 integrate .. //depot/projects/arm/src/lib/msun/src/e_rem_pio2f.c#4 integrate .. //depot/projects/arm/src/lib/msun/src/e_sqrt.c#2 integrate .. //depot/projects/arm/src/lib/msun/src/e_sqrtl.c#1 branch .. //depot/projects/arm/src/lib/msun/src/math.h#4 integrate .. //depot/projects/arm/src/rescue/rescue/Makefile#9 integrate .. //depot/projects/arm/src/sbin/ddb/ddb.8#2 integrate .. //depot/projects/arm/src/sbin/ddb/ddb.c#2 integrate .. //depot/projects/arm/src/sbin/fsck_ffs/main.c#5 integrate .. //depot/projects/arm/src/sbin/geom/Makefile#3 integrate .. //depot/projects/arm/src/sbin/geom/class/label/geom_label.c#4 integrate .. //depot/projects/arm/src/sbin/geom/class/multipath/gmultipath.8#3 integrate .. //depot/projects/arm/src/sbin/geom/core/geom.8#4 integrate .. //depot/projects/arm/src/sbin/geom/core/geom.c#7 integrate .. //depot/projects/arm/src/sbin/ifconfig/ifconfig.8#19 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw.8#14 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw2.c#15 integrate .. //depot/projects/arm/src/sbin/newfs/mkfs.c#5 integrate .. //depot/projects/arm/src/secure/usr.bin/ssh/Makefile#2 integrate .. //depot/projects/arm/src/secure/usr.sbin/sshd/Makefile#3 integrate .. //depot/projects/arm/src/share/man/man3/Makefile#4 integrate .. //depot/projects/arm/src/share/man/man4/Makefile#22 integrate .. //depot/projects/arm/src/share/man/man4/cmx.4#1 branch .. //depot/projects/arm/src/share/man/man4/ddb.4#8 integrate .. //depot/projects/arm/src/share/man/man4/fwohci.4#3 integrate .. //depot/projects/arm/src/share/man/man4/ng_nat.4#3 integrate .. //depot/projects/arm/src/share/man/man4/uchcom.4#1 branch .. //depot/projects/arm/src/share/man/man4/ucom.4#4 integrate .. //depot/projects/arm/src/share/man/man4/ucycom.4#3 integrate .. //depot/projects/arm/src/share/man/man4/uscanner.4#6 integrate .. //depot/projects/arm/src/share/man/man4/uslcom.4#1 branch .. //depot/projects/arm/src/share/man/man5/rc.conf.5#17 integrate .. //depot/projects/arm/src/share/man/man9/DEVICE_PROBE.9#2 integrate .. //depot/projects/arm/src/share/man/man9/Makefile#17 integrate .. //depot/projects/arm/src/share/man/man9/bus_space.9#3 integrate .. //depot/projects/arm/src/share/man/man9/insmntque.9#1 branch .. //depot/projects/arm/src/share/man/man9/lock.9#8 integrate .. //depot/projects/arm/src/share/man/man9/vfs_mountedfrom.9#1 branch .. //depot/projects/arm/src/share/man/man9/vgone.9#2 integrate .. //depot/projects/arm/src/share/man/man9/vhold.9#3 integrate .. //depot/projects/arm/src/share/man/man9/vput.9#2 integrate .. //depot/projects/arm/src/share/man/man9/vref.9#2 integrate .. //depot/projects/arm/src/share/man/man9/vrefcnt.9#1 branch .. //depot/projects/arm/src/share/man/man9/vrele.9#2 integrate .. //depot/projects/arm/src/share/misc/bsd-family-tree#11 integrate .. //depot/projects/arm/src/share/misc/committers-doc.dot#5 integrate .. //depot/projects/arm/src/share/misc/committers-ports.dot#10 integrate .. //depot/projects/arm/src/share/mk/bsd.cpu.mk#9 integrate .. //depot/projects/arm/src/share/mk/sys.mk#6 integrate .. //depot/projects/arm/src/share/zoneinfo/leapseconds#7 integrate .. //depot/projects/arm/src/share/zoneinfo/southamerica#6 integrate .. //depot/projects/arm/src/sys/amd64/amd64/identcpu.c#14 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#19 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#38 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#28 integrate .. //depot/projects/arm/src/sys/amd64/include/pmap.h#13 integrate .. //depot/projects/arm/src/sys/amd64/include/smp.h#10 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#38 integrate .. //depot/projects/arm/src/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/arm/src/sys/arm/conf/AVILA#17 integrate .. //depot/projects/arm/src/sys/arm/include/pmap.h#18 integrate .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_iic.c#6 integrate .. //depot/projects/arm/src/sys/boot/i386/boot2/boot2.c#6 integrate .. //depot/projects/arm/src/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/arm/src/sys/boot/i386/btx/btx/btx.S#4 integrate .. //depot/projects/arm/src/sys/boot/i386/gptboot/gptboot.c#3 integrate .. //depot/projects/arm/src/sys/boot/i386/libi386/biosdisk.c#7 integrate .. //depot/projects/arm/src/sys/boot/i386/pxeldr/pxeldr.S#4 integrate .. //depot/projects/arm/src/sys/boot/pc98/btx/btx/Makefile#3 integrate .. //depot/projects/arm/src/sys/boot/pc98/btx/btx/btx.S#4 integrate .. //depot/projects/arm/src/sys/boot/pc98/libpc98/Makefile#5 integrate .. //depot/projects/arm/src/sys/boot/pc98/libpc98/biosdisk.c#6 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.c#26 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_futex.c#8 integrate .. //depot/projects/arm/src/sys/conf/NOTES#58 integrate .. //depot/projects/arm/src/sys/conf/files#83 integrate .. //depot/projects/arm/src/sys/conf/files.powerpc#19 integrate .. //depot/projects/arm/src/sys/conf/kmod.mk#20 integrate .. //depot/projects/arm/src/sys/conf/ldscript.powerpc#2 integrate .. //depot/projects/arm/src/sys/conf/options#53 integrate .. //depot/projects/arm/src/sys/conf/options.powerpc#3 integrate .. //depot/projects/arm/src/sys/ddb/db_command.c#11 integrate .. //depot/projects/arm/src/sys/ddb/db_examine.c#4 integrate .. //depot/projects/arm/src/sys/ddb/db_input.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_cpu.c#9 integrate .. //depot/projects/arm/src/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#42 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#26 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#36 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bgereg.h#26 integrate .. //depot/projects/arm/src/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/arm/src/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/arm/src/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/arm/src/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/arm/src/sys/dev/cxgb/bin2h.pl#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_main.c#12 integrate .. //depot/projects/arm/src/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/arm/src/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/arm/src/sys/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/arm/src/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/arm/src/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/arm/src/sys/dev/drm/drm_pciids.h#7 integrate .. //depot/projects/arm/src/sys/dev/em/LICENSE#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_80003es2lan.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_80003es2lan.h#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82540.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82541.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82541.h#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82542.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82543.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82543.h#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82571.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82571.h#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82575.c#4 delete .. //depot/projects/arm/src/sys/dev/em/e1000_82575.h#4 delete .. //depot/projects/arm/src/sys/dev/em/e1000_api.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_api.h#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_defines.h#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_hw.h#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_ich8lan.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_ich8lan.h#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_mac.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_mac.h#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_manage.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_manage.h#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_nvm.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_nvm.h#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_osdep.h#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_phy.c#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_phy.h#4 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_regs.h#4 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#44 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.h#19 integrate .. //depot/projects/arm/src/sys/dev/gem/if_gem.c#13 integrate .. //depot/projects/arm/src/sys/dev/hptrr/hptrr_os_bsd.c#2 integrate .. //depot/projects/arm/src/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/arm/src/sys/dev/hptrr/ldm.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptrr/osm.h#2 integrate .. //depot/projects/arm/src/sys/dev/ic/quicc.h#1 branch .. //depot/projects/arm/src/sys/dev/igb/e1000_82575.c#1 branch .. //depot/projects/arm/src/sys/dev/igb/e1000_82575.h#1 branch .. //depot/projects/arm/src/sys/dev/igb/e1000_api.c#1 branch .. //depot/projects/arm/src/sys/dev/igb/e1000_api.h#1 branch .. //depot/projects/arm/src/sys/dev/igb/e1000_defines.h#1 branch .. //depot/projects/arm/src/sys/dev/igb/e1000_hw.h#1 branch .. //depot/projects/arm/src/sys/dev/igb/e1000_mac.c#1 branch .. //depot/projects/arm/src/sys/dev/igb/e1000_mac.h#1 branch .. //depot/projects/arm/src/sys/dev/igb/e1000_manage.c#1 branch .. //depot/projects/arm/src/sys/dev/igb/e1000_manage.h#1 branch .. //depot/projects/arm/src/sys/dev/igb/e1000_nvm.c#1 branch .. //depot/projects/arm/src/sys/dev/igb/e1000_nvm.h#1 branch .. //depot/projects/arm/src/sys/dev/igb/e1000_osdep.h#1 branch .. //depot/projects/arm/src/sys/dev/igb/e1000_phy.c#1 branch .. //depot/projects/arm/src/sys/dev/igb/e1000_phy.h#1 branch .. //depot/projects/arm/src/sys/dev/igb/e1000_regs.h#1 branch .. //depot/projects/arm/src/sys/dev/igb/if_igb.c#1 branch .. //depot/projects/arm/src/sys/dev/igb/if_igb.h#1 branch .. //depot/projects/arm/src/sys/dev/lge/if_lge.c#10 integrate .. //depot/projects/arm/src/sys/dev/md/md.c#12 integrate .. //depot/projects/arm/src/sys/dev/mii/brgphy.c#21 integrate .. //depot/projects/arm/src/sys/dev/mii/ciphy.c#7 integrate .. //depot/projects/arm/src/sys/dev/mii/miidevs#20 integrate .. //depot/projects/arm/src/sys/dev/mii/rgephy.c#10 integrate .. //depot/projects/arm/src/sys/dev/msk/if_msk.c#10 integrate .. //depot/projects/arm/src/sys/dev/msk/if_mskreg.h#5 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfe.c#14 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfereg.h#7 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfevar.h#6 integrate .. //depot/projects/arm/src/sys/dev/pccard/pccarddevs#9 integrate .. //depot/projects/arm/src/sys/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/arm/src/sys/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/arm/src/sys/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/arm/src/sys/dev/quicc/quicc_core.c#1 branch .. //depot/projects/arm/src/sys/dev/re/if_re.c#30 integrate .. //depot/projects/arm/src/sys/dev/scc/scc_bfe.h#4 integrate .. //depot/projects/arm/src/sys/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/arm/src/sys/dev/scc/scc_bus.h#2 integrate .. //depot/projects/arm/src/sys/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/arm/src/sys/dev/tsec/if_tsec.c#1 branch .. //depot/projects/arm/src/sys/dev/tsec/if_tsec.h#1 branch .. //depot/projects/arm/src/sys/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/arm/src/sys/dev/uart/uart.h#4 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/arm/src/sys/dev/uart/uart_bus_scc.c#2 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_cpu_powerpc.c#5 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/arm/src/sys/dev/usb/ehci.c#18 integrate .. //depot/projects/arm/src/sys/dev/usb/if_axe.c#17 integrate .. //depot/projects/arm/src/sys/dev/usb/ubsa.c#10 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#41 integrate .. //depot/projects/arm/src/sys/dev/usb/uscanner.c#13 integrate .. //depot/projects/arm/src/sys/dev/usb/uslcom.c#1 branch .. //depot/projects/arm/src/sys/fs/nwfs/nwfs_node.c#8 integrate .. //depot/projects/arm/src/sys/fs/nwfs/nwfs_subr.c#5 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_node.c#10 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_vfsops.c#9 integrate .. //depot/projects/arm/src/sys/gdb/gdb_main.c#5 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_vtoc8.c#1 branch .. //depot/projects/arm/src/sys/i386/conf/GENERIC#28 integrate .. //depot/projects/arm/src/sys/i386/cpufreq/est.c#5 integrate .. //depot/projects/arm/src/sys/i386/i386/identcpu.c#25 integrate .. //depot/projects/arm/src/sys/i386/i386/mp_machdep.c#20 integrate .. //depot/projects/arm/src/sys/i386/include/_types.h#8 integrate .. //depot/projects/arm/src/sys/i386/include/float.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/smp.h#10 integrate .. //depot/projects/arm/src/sys/ia64/ia64/mp_machdep.c#11 integrate .. //depot/projects/arm/src/sys/kern/init_main.c#21 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#24 integrate .. //depot/projects/arm/src/sys/kern/kern_cpuset.c#1 branch .. //depot/projects/arm/src/sys/kern/kern_descrip.c#27 integrate .. //depot/projects/arm/src/sys/kern/kern_lock.c#15 integrate .. //depot/projects/arm/src/sys/kern/kern_priv.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_shutdown.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#27 integrate .. //depot/projects/arm/src/sys/kern/kern_synch.c#25 integrate .. //depot/projects/arm/src/sys/kern/kern_thread.c#23 integrate .. //depot/projects/arm/src/sys/kern/sched_4bsd.c#24 integrate .. //depot/projects/arm/src/sys/kern/sched_ule.c#30 integrate .. //depot/projects/arm/src/sys/kern/subr_bus.c#24 integrate .. //depot/projects/arm/src/sys/kern/subr_smp.c#8 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#23 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#24 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#27 integrate .. //depot/projects/arm/src/sys/kern/systrace_args.c#12 integrate .. //depot/projects/arm/src/sys/kern/vfs_bio.c#25 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#41 integrate .. //depot/projects/arm/src/sys/modules/Makefile#53 integrate .. //depot/projects/arm/src/sys/modules/cmx/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/em/Makefile#5 integrate .. //depot/projects/arm/src/sys/modules/geom/Makefile#7 integrate .. //depot/projects/arm/src/sys/modules/geom/geom_apple/Makefile#2 delete .. //depot/projects/arm/src/sys/modules/geom/geom_gpt/Makefile#2 delete .. //depot/projects/arm/src/sys/modules/geom/geom_part/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/igb/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/ipfw_nat/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/uslcom/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/zfs/Makefile#6 integrate .. //depot/projects/arm/src/sys/net/bpf_filter.c#8 integrate .. //depot/projects/arm/src/sys/net/if.c#24 integrate .. //depot/projects/arm/src/sys/net/if_ethersubr.c#30 integrate .. //depot/projects/arm/src/sys/net/if_gif.c#13 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_scan_sta.c#5 integrate .. //depot/projects/arm/src/sys/netgraph/ng_base.c#16 integrate .. //depot/projects/arm/src/sys/netgraph/ng_ksocket.c#7 integrate .. //depot/projects/arm/src/sys/netgraph/ng_l2tp.c#6 integrate .. //depot/projects/arm/src/sys/netgraph/ng_nat.c#6 integrate .. //depot/projects/arm/src/sys/netgraph/ng_nat.h#3 integrate .. //depot/projects/arm/src/sys/netgraph/ng_pppoe.c#10 integrate .. //depot/projects/arm/src/sys/netinet/in.h#10 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#26 integrate .. //depot/projects/arm/src/sys/netinet/ip_dummynet.c#16 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw.h#12 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#41 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw_nat.c#1 branch .. //depot/projects/arm/src/sys/netinet/ip_fw_pfil.c#10 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias.c#5 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias_db.c#5 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias_ftp.c#4 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias_irc.c#4 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias_local.h#4 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias_proxy.c#6 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias_smedia.c#4 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#39 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#24 integrate .. //depot/projects/arm/src/sys/netipsec/key.c#7 integrate .. //depot/projects/arm/src/sys/netipsec/key_debug.c#4 integrate .. //depot/projects/arm/src/sys/netncp/ncp_conn.h#2 integrate .. //depot/projects/arm/src/sys/netsmb/smb_conn.h#2 integrate .. //depot/projects/arm/src/sys/nfs4client/nfs4_idmap.c#3 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#19 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#18 integrate .. //depot/projects/arm/src/sys/pc98/cbus/sio.c#10 integrate .. //depot/projects/arm/src/sys/pc98/conf/GENERIC#17 integrate .. //depot/projects/arm/src/sys/pc98/pc98/machdep.c#20 integrate .. //depot/projects/arm/src/sys/pci/if_rl.c#12 integrate .. //depot/projects/arm/src/sys/pci/if_rlreg.h#14 integrate .. //depot/projects/arm/src/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/arm/src/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/arm/src/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/aim/trap_subr.S#2 integrate .. //depot/projects/arm/src/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/booke/clock.c#1 branch .. //depot/projects/arm/src/sys/powerpc/booke/copyinout.c#1 branch .. //depot/projects/arm/src/sys/powerpc/booke/interrupt.c#1 branch .. //depot/projects/arm/src/sys/powerpc/booke/locore.S#1 branch .. //depot/projects/arm/src/sys/powerpc/booke/machdep.c#1 branch .. //depot/projects/arm/src/sys/powerpc/booke/pmap.c#1 branch .. //depot/projects/arm/src/sys/powerpc/booke/support.S#1 branch .. //depot/projects/arm/src/sys/powerpc/booke/swtch.S#1 branch .. //depot/projects/arm/src/sys/powerpc/booke/trap.c#1 branch .. //depot/projects/arm/src/sys/powerpc/booke/trap_subr.S#1 branch .. //depot/projects/arm/src/sys/powerpc/booke/uio_machdep.c#1 branch .. //depot/projects/arm/src/sys/powerpc/booke/vm_machdep.c#1 branch .. //depot/projects/arm/src/sys/powerpc/conf/MPC85XX#1 branch .. //depot/projects/arm/src/sys/powerpc/conf/NOTES#10 integrate .. //depot/projects/arm/src/sys/powerpc/include/frame.h#4 integrate .. //depot/projects/arm/src/sys/powerpc/include/hid.h#3 integrate .. //depot/projects/arm/src/sys/powerpc/include/intr_machdep.h#7 integrate .. //depot/projects/arm/src/sys/powerpc/include/kdb.h#3 integrate .. //depot/projects/arm/src/sys/powerpc/include/md_var.h#6 integrate .. //depot/projects/arm/src/sys/powerpc/include/mmuvar.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/ocpbus.h#1 branch .. //depot/projects/arm/src/sys/powerpc/include/openpicvar.h#5 integrate .. //depot/projects/arm/src/sys/powerpc/include/pcb.h#3 integrate .. //depot/projects/arm/src/sys/powerpc/include/pcpu.h#4 integrate .. //depot/projects/arm/src/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/arm/src/sys/powerpc/include/psl.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/pte.h#3 integrate .. //depot/projects/arm/src/sys/powerpc/include/sf_buf.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/spr.h#3 integrate .. //depot/projects/arm/src/sys/powerpc/include/tlb.h#1 branch .. //depot/projects/arm/src/sys/powerpc/include/trap.h#3 integrate .. //depot/projects/arm/src/sys/powerpc/include/trap_aim.h#1 branch .. //depot/projects/arm/src/sys/powerpc/include/trap_booke.h#1 branch .. //depot/projects/arm/src/sys/powerpc/include/vmparam.h#8 integrate .. //depot/projects/arm/src/sys/powerpc/mpc85xx/nexus.c#1 branch .. //depot/projects/arm/src/sys/powerpc/mpc85xx/ocpbus.c#1 branch .. //depot/projects/arm/src/sys/powerpc/mpc85xx/ocpbus.h#1 branch .. //depot/projects/arm/src/sys/powerpc/mpc85xx/opic.c#1 branch .. //depot/projects/arm/src/sys/powerpc/mpc85xx/pci_ocp.c#1 branch .. //depot/projects/arm/src/sys/powerpc/powermac/openpic_macio.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/autoconf.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/cpu.c#5 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/db_trace.c#6 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/gdb_machdep.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/genassym.c#6 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/intr_machdep.c#10 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/mp_machdep.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/openpic.c#6 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/pic_if.m#5 integrate .. //depot/projects/arm/src/sys/powerpc/psim/openpic_iobus.c#4 integrate .. //depot/projects/arm/src/sys/security/audit/audit.c#23 integrate .. //depot/projects/arm/src/sys/security/audit/audit_bsm_klib.c#10 integrate .. //depot/projects/arm/src/sys/security/audit/audit_private.h#12 integrate .. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#18 integrate .. //depot/projects/arm/src/sys/security/audit/audit_trigger.c#6 integrate .. //depot/projects/arm/src/sys/security/audit/audit_worker.c#8 integrate .. //depot/projects/arm/src/sys/sparc64/include/tlb.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/iommu.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/mp_machdep.c#8 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/pmap.c#18 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/arm/src/sys/sun4v/sun4v/mp_machdep.c#7 integrate .. //depot/projects/arm/src/sys/sys/_types.h#5 integrate .. //depot/projects/arm/src/sys/sys/buf.h#10 integrate .. //depot/projects/arm/src/sys/sys/bufobj.h#7 integrate .. //depot/projects/arm/src/sys/sys/bus.h#12 integrate .. //depot/projects/arm/src/sys/sys/cpuset.h#1 branch .. //depot/projects/arm/src/sys/sys/fcntl.h#3 integrate .. //depot/projects/arm/src/sys/sys/lockmgr.h#10 integrate .. //depot/projects/arm/src/sys/sys/mount.h#21 integrate .. //depot/projects/arm/src/sys/sys/param.h#40 integrate .. //depot/projects/arm/src/sys/sys/pcpu.h#10 integrate .. //depot/projects/arm/src/sys/sys/proc.h#33 integrate .. //depot/projects/arm/src/sys/sys/sched.h#12 integrate .. //depot/projects/arm/src/sys/sys/smp.h#4 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#24 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#24 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#25 integrate .. //depot/projects/arm/src/sys/sys/types.h#6 integrate .. //depot/projects/arm/src/sys/sys/vnode.h#22 integrate .. //depot/projects/arm/src/sys/sys/vtoc.h#1 branch .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#29 integrate .. //depot/projects/arm/src/sys/ufs/ufs/extattr.h#3 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_extattr.c#7 integrate .. //depot/projects/arm/src/sys/vm/vm_fault.c#25 integrate .. //depot/projects/arm/src/sys/vm/vm_map.h#6 integrate .. //depot/projects/arm/src/sys/vm/vm_object.c#27 integrate .. //depot/projects/arm/src/tools/build/mk/OptionalObsoleteFiles.inc#11 integrate .. //depot/projects/arm/src/tools/regression/environ/envctl.c#2 integrate .. //depot/projects/arm/src/tools/regression/file/dup/dup.c#2 integrate .. //depot/projects/arm/src/tools/regression/lib/msun/test-trig.c#2 integrate .. //depot/projects/arm/src/tools/tools/tinybsd/tinybsd#5 integrate .. //depot/projects/arm/src/usr.bin/Makefile#9 integrate .. //depot/projects/arm/src/usr.bin/ar/write.c#3 integrate .. //depot/projects/arm/src/usr.bin/awk/Makefile#5 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.freebsd#20 integrate .. //depot/projects/arm/src/usr.bin/chat/chat.c#2 integrate .. //depot/projects/arm/src/usr.bin/cpuset/Makefile#1 branch .. //depot/projects/arm/src/usr.bin/cpuset/cpuset.1#1 branch .. //depot/projects/arm/src/usr.bin/cpuset/cpuset.c#1 branch .. //depot/projects/arm/src/usr.bin/find/find.1#8 integrate .. //depot/projects/arm/src/usr.bin/find/main.c#2 integrate .. //depot/projects/arm/src/usr.bin/gzip/gzip.c#4 integrate .. //depot/projects/arm/src/usr.bin/make/Makefile#2 integrate .. //depot/projects/arm/src/usr.bin/make/Makefile.dist#3 integrate .. //depot/projects/arm/src/usr.bin/make/arch.c#2 integrate .. //depot/projects/arm/src/usr.bin/make/job.c#3 integrate .. //depot/projects/arm/src/usr.bin/make/main.c#7 integrate .. //depot/projects/arm/src/usr.bin/make/make.1#6 integrate .. //depot/projects/arm/src/usr.bin/unifdef/unifdef.c#2 integrate .. //depot/projects/arm/src/usr.sbin/Makefile#18 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#4 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#3 integrate .. //depot/projects/arm/src/usr.sbin/fifolog/Makefile#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/Makefile.inc#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/fifolog_create/Makefile#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/flint.lnt#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/lib/Makefile#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/lib/fifolog.h#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/lib/fifolog_create.c#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/lib/fifolog_int.c#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/lib/fifolog_write.h#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/lib/getdate.y#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/lib/libfifolog.h#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch .. //depot/projects/arm/src/usr.sbin/fifolog/lib/miniobj.h#1 branch .. //depot/projects/arm/src/usr.sbin/fwcontrol/fwcontrol.8#5 integrate .. //depot/projects/arm/src/usr.sbin/fwcontrol/fwcontrol.c#3 integrate .. //depot/projects/arm/src/usr.sbin/mountd/mountd.c#9 integrate .. //depot/projects/arm/src/usr.sbin/moused/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/moused/moused.c#4 integrate Differences ... ==== //depot/projects/arm/src/Makefile.inc1#35 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.600 2008/02/25 16:29:54 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -203,6 +203,9 @@ GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac +.if ${OSRELDATE} < 700044 +CROSSENV+= AR=gnu-ar RANLIB=gnu-ranlib +.endif # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -974,10 +977,6 @@ .endif .endif -.if make(cross-tools) && ${BOOTSTRAPPING} < 700044 -.MAKEFLAGS+= -D_WITH_GNUAR -.endif - cross-tools: .for _tool in \ gnu/usr.bin/binutils \ ==== //depot/projects/arm/src/ObsoleteFiles.inc#32 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -32,6 +32,11 @@ OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libkse.a +OLD_FILES+=usr/lib32/libkse_p.a +OLD_FILES+=usr/lib32/libkse_pic.a +.endif .endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h @@ -134,6 +139,12 @@ OLD_DIRS+=usr/include/netatm/uni OLD_DIRS+=usr/include/netatm OLD_DIRS+=usr/share/examples/atm +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libatm.a +OLD_FILES+=usr/lib32/libatm.so +OLD_LIBS+=usr/lib32/libatm.so.5 +OLD_FILES+=usr/lib32/libatm_p.a +.endif # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -224,6 +235,42 @@ OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libalias.so.5 +OLD_LIBS+=usr/lib32/libbsnmp.so.3 +OLD_LIBS+=usr/lib32/libdialog.so.5 +OLD_LIBS+=usr/lib32/libgnuregex.so.3 +OLD_LIBS+=usr/lib32/libhistory.so.6 +OLD_LIBS+=usr/lib32/libncurses.so.6 +OLD_LIBS+=usr/lib32/libncursesw.so.6 +OLD_LIBS+=usr/lib32/libpam.so.3 +OLD_LIBS+=usr/lib32/libreadline.so.6 +OLD_LIBS+=usr/lib32/libssh.so.3 +OLD_LIBS+=usr/lib32/pam_chroot.so.3 +OLD_LIBS+=usr/lib32/pam_deny.so.3 +OLD_LIBS+=usr/lib32/pam_echo.so.3 +OLD_LIBS+=usr/lib32/pam_exec.so.3 +OLD_LIBS+=usr/lib32/pam_ftpusers.so.3 +OLD_LIBS+=usr/lib32/pam_group.so.3 +OLD_LIBS+=usr/lib32/pam_guest.so.3 +OLD_LIBS+=usr/lib32/pam_krb5.so.3 +OLD_LIBS+=usr/lib32/pam_ksu.so.3 +OLD_LIBS+=usr/lib32/pam_lastlog.so.3 +OLD_LIBS+=usr/lib32/pam_login_access.so.3 +OLD_LIBS+=usr/lib32/pam_nologin.so.3 +OLD_LIBS+=usr/lib32/pam_opie.so.3 +OLD_LIBS+=usr/lib32/pam_opieaccess.so.3 +OLD_LIBS+=usr/lib32/pam_passwdqc.so.3 +OLD_LIBS+=usr/lib32/pam_permit.so.3 +OLD_LIBS+=usr/lib32/pam_radius.so.3 +OLD_LIBS+=usr/lib32/pam_rhosts.so.3 +OLD_LIBS+=usr/lib32/pam_rootok.so.3 +OLD_LIBS+=usr/lib32/pam_securetty.so.3 +OLD_LIBS+=usr/lib32/pam_self.so.3 +OLD_LIBS+=usr/lib32/pam_ssh.so.3 +OLD_LIBS+=usr/lib32/pam_tacplus.so.3 +OLD_LIBS+=usr/lib32/pam_unix.so.3 +.endif # 20070613: IPX over IP tunnel removal OLD_FILES+=usr/include/netipx/ipx_ip.h # 20070605: sched_core removal @@ -603,6 +650,9 @@ OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=usr/lib/libarchive.so.3 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libarchive.so.3 +.endif # 20070301: remove addr2ascii and ascii2addr OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz ==== //depot/projects/arm/src/UPDATING#24 (text+ko) ==== @@ -22,6 +22,20 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080301: + The layout of struct vmspace has changed. This affects libkvm + and any executables that link against libkvm and use the + kvm_getprocs() function. In particular, but not exclusively, + it affects ps(1), fstat(1), pkill(1), systat(1), top(1) and w(1). + The effects are minimal, but it's advisable to upgrade world + nonetheless. + +20080229: + The latest em driver no longer has support in it for the + 82575 adapter, this is now moved to the igb driver. The + split was done to make new features that are incompatible + with older hardware easier to do. + 20080220: The new geom_lvm(4) geom class has been renamed to geom_linux_lvm(4), likewise the kernel option is now GEOM_LINUX_LVM. @@ -983,4 +997,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.520 2008/02/20 07:50:12 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ ==== //depot/projects/arm/src/bin/chflags/chflags.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.30 2008/03/09 12:10:24 rwatson Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -40,7 +40,7 @@ .Nd change file flags .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl fhv .Oo .Fl R .Op Fl H | Fl L | Fl P @@ -57,6 +57,12 @@ .Pp The options are as follows: .Bl -tag -width indent +.It Fl f +Do not display a diagnostic message if +.Nm +could not modify the flags for +.Va file , +nor modify the exit status to reflect such failures. .It Fl H If the .Fl R @@ -79,6 +85,14 @@ .It Fl R Change the file flags for the file hierarchies rooted in the files instead of just the files themselves. +.It Fl v +Cause +.Nm +to be verbose, showing filenames as the flags are modified. +If the +.Fl v +option is specified more than once, the old and new flags of the file +will also be printed, in octal notation. .El .Pp The flags are specified as an octal number or a comma separated list ==== //depot/projects/arm/src/bin/chflags/chflags.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.24 2008/03/09 12:10:24 rwatson Exp $"); #include #include @@ -60,14 +60,15 @@ { FTS *ftsp; FTSENT *p; - u_long clear, set; + u_long clear, newflags, set; long val; - int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval; + int Hflag, Lflag, Rflag, fflag, hflag, vflag; + int ch, fts_options, oct, rval; char *flags, *ep; int (*change_flags)(const char *, unsigned long); - Hflag = Lflag = Rflag = hflag = 0; - while ((ch = getopt(argc, argv, "HLPRh")) != -1) + Hflag = Lflag = Rflag = fflag = hflag = vflag = 0; + while ((ch = getopt(argc, argv, "HLPRfhv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -83,9 +84,15 @@ case 'R': Rflag = 1; break; + case 'f': + fflag = 1; + break; case 'h': hflag = 1; break; + case 'v': + vflag++; + break; case '?': default: usage(); @@ -166,18 +173,23 @@ default: break; } - if (oct) { - if (!(*change_flags)(p->fts_accpath, set)) - continue; - } else { - p->fts_statp->st_flags |= set; - p->fts_statp->st_flags &= clear; - if (!(*change_flags)(p->fts_accpath, - (u_long)p->fts_statp->st_flags)) - continue; + if (oct) + newflags = set; + else + newflags = (p->fts_statp->st_flags | set) & clear; + if (newflags == p->fts_statp->st_flags) + continue; + if ((*change_flags)(p->fts_accpath, newflags) && !fflag) { + warn("%s", p->fts_path); + rval = 1; + } else if (vflag) { + (void)printf("%s", p->fts_path); + if (vflag > 1) + (void)printf(": 0%lo -> 0%lo", + (u_long)p->fts_statp->st_flags, + newflags); + (void)printf("\n"); } - warn("%s", p->fts_path); - rval = 1; } if (errno) err(1, "fts_read"); @@ -188,6 +200,6 @@ usage(void) { (void)fprintf(stderr, - "usage: chflags [-h] [-R [-H | -L | -P]] flags file ...\n"); + "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n"); exit(1); } ==== //depot/projects/arm/src/bin/realpath/realpath.1#2 (text+ko) ==== @@ -31,7 +31,7 @@ .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp -.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.11 2008/03/09 12:46:39 rwatson Exp $ .\" .Dd November 24, 2000 .Dt REALPATH 1 @@ -41,7 +41,9 @@ .Nd return resolved physical path .Sh SYNOPSIS .Nm +.Op Fl q .Ar path +.Op Ar ... .Sh DESCRIPTION The .Nm @@ -55,6 +57,12 @@ .Pa /../ in .Ar path . +.Pp +If +.Fl q +is specified, warnings will not be printed when +.Xr realpath 3 +fails. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO ==== //depot/projects/arm/src/bin/realpath/realpath.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6 2004/04/06 20:06:50 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.7 2008/03/09 12:46:39 rwatson Exp $"); #include @@ -44,20 +44,39 @@ { char buf[PATH_MAX]; char *p; + int ch, i, qflag, rval; - if (argc == 2) { - if ((p = realpath(argv[1], buf)) == NULL) - err(1, "%s", buf); - } else + qflag = 0; + while ((ch = getopt(argc, argv, "q")) != -1) { + switch (ch) { + case 'q': + qflag = 1; + break; + case '?': + default: + usage(); + } + } + argc -= optind; + argv += optind; + if (argc < 1) usage(); - (void)printf("%s\n", p); - exit(0); + rval = 0; + for (i = 0; i < argc; i++) { + if ((p = realpath(argv[i], buf)) == NULL) { + if (!qflag) + warn("%s", argv[i]); + rval = 1; + } else + (void)printf("%s\n", p); + } + exit(rval); } static void usage(void) { - (void)fprintf(stderr, "usage: realpath path\n"); + (void)fprintf(stderr, "usage: realpath [-q] path [...]\n"); exit(1); } ==== //depot/projects/arm/src/contrib/bsnmp/snmpd/main.c#2 (text+ko) ==== @@ -2242,6 +2242,8 @@ return (m); err: + if ((m->flags & LM_ONSTARTLIST) != 0) + TAILQ_REMOVE(&modules_start, m, start); if (m->handle) dlclose(m->handle); free(m->path); ==== //depot/projects/arm/src/etc/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.365 2007/11/11 01:16:51 mlaier Exp $ +# $FreeBSD: src/etc/Makefile,v 1.366 2008/03/05 18:32:58 brooks Exp $ .include @@ -9,7 +9,7 @@ BIN1= amd.map apmd.conf auth.conf \ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ - dhclient.conf disktab fbtab freebsd-update.conf \ + ddb.conf dhclient.conf disktab fbtab freebsd-update.conf \ ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf libalias.conf login.access login.conf mac.conf motd \ ==== //depot/projects/arm/src/etc/defaults/rc.conf#21 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.326 2008/01/27 15:15:11 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -33,6 +33,8 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). +ddb_enable="NO" # Set to YES to load ddb scripts at boot. +ddb_config="/etc/ddb.conf" # ddb(8) config file. devd_enable="YES" # Run devd, to trigger programs on device tree changes. devd_flags="" # Additional flags for devd(8). kldxref_enable="NO" # Build linker.hints files with kldxref(8). @@ -249,7 +251,7 @@ rwhod_enable="NO" # Run the rwho daemon (or NO). rwhod_flags="" # Flags for rwhod rarpd_enable="NO" # Run rarpd (or NO). -rarpd_flags="" # Flags to rarpd. +rarpd_flags="-a" # Flags to rarpd. bootparamd_enable="NO" # Run bootparamd (or NO). bootparamd_flags="" # Flags to bootparamd pppoed_enable="NO" # Run the PPP over Ethernet daemon. ==== //depot/projects/arm/src/etc/rc.d/Makefile#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.88 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ .include @@ -7,7 +7,7 @@ apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ccd cleanvar cleartmp cron \ - devd devfs dhclient \ + ddb devd devfs dhclient \ dmesg dumpon \ early.sh encswap \ fsck ftp-proxy ftpd \ ==== //depot/projects/arm/src/etc/rc.d/mountcritlocal#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.15 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.16 2008/03/06 14:39:33 mtm Exp $ # # PROVIDE: mountcritlocal @@ -15,6 +15,8 @@ mountcritlocal_start() { + local err + # Set up the list of network filesystem types for which mounting # should be delayed until after network initialization. case ${extra_netfs_types} in @@ -34,9 +36,10 @@ done mount_excludes=${mount_excludes%,} mount -a -t ${mount_excludes} + err=$? echo '.' - case $? in + case ${err} in 0) ;; *) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 10 18:35:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA9D71065672; Mon, 10 Mar 2008 18:35:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87D8F1065681 for ; Mon, 10 Mar 2008 18:35:01 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 72FA88FC2C for ; Mon, 10 Mar 2008 18:35:01 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AIZ1sK030335 for ; Mon, 10 Mar 2008 18:35:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AIZ1i6030333 for perforce@freebsd.org; Mon, 10 Mar 2008 18:35:01 GMT (envelope-from sam@freebsd.org) Date: Mon, 10 Mar 2008 18:35:01 GMT Message-Id: <200803101835.m2AIZ1i6030333@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 137336 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, 10 Mar 2008 18:35:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=137336 Change 137336 by sam@sam_ebb on 2008/03/10 18:34:35 radius acl support (sent upstream to Jouni for inclusion) Submitted by: Chris Zimmerman Affected files ... .. //depot/projects/vap/contrib/hostapd/Makefile#3 edit .. //depot/projects/vap/contrib/hostapd/defconfig#3 edit .. //depot/projects/vap/contrib/hostapd/driver.h#3 edit .. //depot/projects/vap/contrib/hostapd/ieee802_11_auth.c#3 edit .. //depot/projects/vap/usr.sbin/wpa/hostapd/driver_freebsd.c#4 edit Differences ... ==== //depot/projects/vap/contrib/hostapd/Makefile#3 (text+ko) ==== @@ -313,6 +313,10 @@ CFLAGS += -DCONFIG_IPV6 endif +ifdef CONFIG_DRIVER_RADIUS_ACL +CFLAGS += -DCONFIG_DRIVER_RADIUS_ACL +endif + ifdef CONFIG_FULL_DYNAMIC_VLAN # define CONFIG_FULL_DYNAMIC_VLAN to have hostapd manipulate bridges # and vlan interfaces for the vlan feature. ==== //depot/projects/vap/contrib/hostapd/defconfig#3 (text+ko) ==== @@ -102,3 +102,7 @@ # Build IPv6 support for RADIUS operations CONFIG_IPV6=y + +# Use the hostapd's IEEE 802.11 authentication (ACL), but without +# the IEEE 802.11 Management capability +CONFIG_DRIVER_RADIUS_ACL=y ==== //depot/projects/vap/contrib/hostapd/driver.h#3 (text+ko) ==== @@ -141,6 +141,10 @@ * this handler will be called after initial setup has been completed. */ int (*commit)(void *priv); + + int (*set_radius_acl_auth)(void *priv, const u8 *mac, int accepted, + u32 session_timeout); + int (*set_radius_acl_expire)(void *priv, const u8 *mac); }; static inline int @@ -653,4 +657,22 @@ return hapd->driver->commit(hapd->driver); } +static inline int +hostapd_set_radius_acl_auth(struct hostapd_data *hapd, const u8 *mac, int accepted, + u32 session_timeout) +{ + if (hapd->driver == NULL || hapd->driver->set_radius_acl_auth == NULL) + return 0; + return hapd->driver->set_radius_acl_auth(hapd->driver, mac, accepted, + session_timeout); +} + +static inline int +hostapd_set_radius_acl_expire(struct hostapd_data *hapd, const u8 *mac) +{ + if (hapd->driver == NULL || hapd->driver->set_radius_acl_expire == NULL) + return 0; + return hapd->driver->set_radius_acl_expire(hapd->driver, mac); +} + #endif /* DRIVER_H */ ==== //depot/projects/vap/contrib/hostapd/ieee802_11_auth.c#3 (text+ko) ==== @@ -22,6 +22,7 @@ #include "radius.h" #include "radius_client.h" #include "eloop.h" +#include "driver.h" #define RADIUS_ACL_TIMEOUT 30 @@ -74,8 +75,10 @@ if (now - entry->timestamp > RADIUS_ACL_TIMEOUT) return -1; /* entry has expired */ if (entry->accepted == HOSTAPD_ACL_ACCEPT_TIMEOUT) - *session_timeout = entry->session_timeout; - *acct_interim_interval = entry->acct_interim_interval; + if (session_timeout) + *session_timeout = entry->session_timeout; + if (acct_interim_interval) + *acct_interim_interval = entry->acct_interim_interval; if (vlan_id) *vlan_id = entry->vlan_id; return entry->accepted; @@ -192,8 +195,10 @@ const u8 *msg, size_t len, u32 *session_timeout, u32 *acct_interim_interval, int *vlan_id) { - *session_timeout = 0; - *acct_interim_interval = 0; + if (session_timeout) + *session_timeout = 0; + if (acct_interim_interval) + *acct_interim_interval = 0; if (vlan_id) *vlan_id = 0; @@ -287,7 +292,9 @@ prev->next = entry->next; else hapd->acl_cache = entry->next; - +#ifdef CONFIG_DRIVER_RADIUS_ACL + hostapd_set_radius_acl_expire(hapd, entry->addr); +#endif tmp = entry; entry = entry->next; free(tmp); @@ -413,11 +420,16 @@ cache->next = hapd->acl_cache; hapd->acl_cache = cache; +#ifdef CONFIG_DRIVER_RADIUS_ACL + hostapd_set_radius_acl_auth(hapd, query->addr, cache->accepted, + cache->session_timeout); +#else /* Re-send original authentication frame for 802.11 processing */ HOSTAPD_DEBUG(HOSTAPD_DEBUG_MINIMAL, "Re-sending authentication frame " "after successful RADIUS ACL query\n"); ieee802_11_mgmt(hapd, query->auth_msg, query->auth_msg_len, WLAN_FC_STYPE_AUTH, NULL); +#endif done: if (prev == NULL) ==== //depot/projects/vap/usr.sbin/wpa/hostapd/driver_freebsd.c#4 (text+ko) ==== @@ -30,6 +30,7 @@ #include "hostapd.h" #include "driver.h" #include "ieee802_1x.h" +#include "ieee802_11_auth.h" #include "eloop.h" #include "sta_info.h" #include "l2_packet.h" @@ -544,6 +545,9 @@ struct ieee80211_michael_event *mic; struct ieee80211_join_event *join; struct ieee80211_leave_event *leave; +#ifdef CONFIG_DRIVER_RADIUS_ACL + struct ieee80211_auth_event *auth; +#endif int n; n = read(sock, buf, sizeof(buf)); @@ -596,6 +600,32 @@ MAC2STR(mic->iev_src)); ieee80211_michael_mic_failure(hapd, mic->iev_src, 1); break; +#ifdef CONFIG_DRIVER_RADIUS_ACL + case RTM_IEEE80211_AUTH: + auth = (struct ieee80211_auth_event *) &ifan[1]; + wpa_printf(MSG_DEBUG, "802.11 AUTH, STA = " MACSTR, + MAC2STR(auth->iev_addr)); + n = hostapd_allowed_address(hapd, auth->iev_addr, + NULL, 0, NULL, NULL, NULL); + switch (n) { + case HOSTAPD_ACL_ACCEPT: + case HOSTAPD_ACL_REJECT: + hostapd_set_radius_acl_auth(hapd, + auth->iev_addr, n, 0); + wpa_printf(MSG_DEBUG, + "802.11 AUTH, STA = " MACSTR " hostapd says: %s", + MAC2STR(auth->iev_addr), + (n == HOSTAPD_ACL_ACCEPT ? + "ACCEPT" : "REJECT" )); + break; + case HOSTAPD_ACL_PENDING: + wpa_printf(MSG_DEBUG, + "802.11 AUTH, STA = " MACSTR " pending", + MAC2STR(auth->iev_addr)); + break; + } + break; +#endif /* CONFIG_DRIVER_RADIUS_ACL */ } break; } @@ -728,7 +758,68 @@ return set80211param(drv, IEEE80211_IOC_COUNTERMEASURES, enabled); } +#ifdef CONFIG_DRIVER_RADIUS_ACL +static int +bsd_set_radius_acl_auth(void *priv, const u8 *mac, int accepted, + u32 session_timeout) +{ + struct bsd_driver_data *drv = priv; + struct hostapd_data *hapd = drv->hapd; + struct ieee80211req_mlme mlme; + + switch (accepted) { + case HOSTAPD_ACL_ACCEPT_TIMEOUT: + wpa_printf(MSG_DEBUG, "[%s] STA " MACSTR + " has been accepted by RADIUS ACL with timeout " + "of %d.\n", hapd->conf->iface, MAC2STR(mac), + session_timeout); + mlme.im_reason = IEEE80211_STATUS_SUCCESS; + break; + case HOSTAPD_ACL_ACCEPT: + wpa_printf(MSG_DEBUG, "[%s] STA " MACSTR + " has been accepted by RADIUS ACL.\n", + hapd->conf->iface, MAC2STR(mac)); + mlme.im_reason = IEEE80211_STATUS_SUCCESS; + break; + case HOSTAPD_ACL_REJECT: + wpa_printf(MSG_DEBUG, "[%s] STA " MACSTR + " has been rejected by RADIUS ACL.\n", + hapd->conf->iface, MAC2STR(mac)); + mlme.im_reason = IEEE80211_STATUS_UNSPECIFIED; + break; + default: + wpa_printf(MSG_ERROR, "[%s] STA " MACSTR + " has unknown status (%d) by RADIUS ACL. " + "Nothing to do...\n", hapd->conf->iface, + MAC2STR(mac), accepted); + return 0; + } + memset(&mlme, 0, sizeof(mlme)); + mlme.im_op = IEEE80211_MLME_AUTH; + memcpy(mlme.im_macaddr, mac, IEEE80211_ADDR_LEN); + return set80211var(drv, IEEE80211_IOC_MLME, &mlme, sizeof(mlme)); +} + static int +bsd_set_radius_acl_expire(void *priv, const u8 *mac) +{ + struct bsd_driver_data *drv = priv; + struct hostapd_data *hapd = drv->hapd; + + /* + * The expiry of the MAC address from RADIUS ACL cache doesn't mean + * that we should kick off the client. Our current approach doesn't + * require adding/removing entries from an allow/deny list; so this + * function is likely unecessary + */ + wpa_printf(MSG_DEBUG, "[%s] STA " MACSTR " radius acl cache " + "expired; nothing to do...", hapd->conf->iface, + MAC2STR(mac)); + return 0; +} +#endif /* CONFIG_DRIVER_RADIUS_ACL */ + +static int bsd_init(struct hostapd_data *hapd) { struct bsd_driver_data *drv; @@ -820,6 +911,10 @@ .get_ssid = bsd_get_ssid, .set_countermeasures = bsd_set_countermeasures, .sta_clear_stats = bsd_sta_clear_stats, +#ifdef CONFIG_DRIVER_RADIUS_ACL + .set_radius_acl_auth = bsd_set_radius_acl_auth, + .set_radius_acl_expire = bsd_set_radius_acl_expire, +#endif }; void bsd_driver_register(void) From owner-p4-projects@FreeBSD.ORG Mon Mar 10 18:41:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0C45106567B; Mon, 10 Mar 2008 18:41:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77D7A106567F for ; Mon, 10 Mar 2008 18:41:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 490A38FC28 for ; Mon, 10 Mar 2008 18:41:08 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AIf85Y030509 for ; Mon, 10 Mar 2008 18:41:08 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AIf89m030507 for perforce@freebsd.org; Mon, 10 Mar 2008 18:41:08 GMT (envelope-from sam@freebsd.org) Date: Mon, 10 Mar 2008 18:41:08 GMT Message-Id: <200803101841.m2AIf89m030507@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 137337 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, 10 Mar 2008 18:41:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=137337 Change 137337 by sam@sam_ebb on 2008/03/10 18:40:59 set syslog mask to include DEBUG msgs; otherwise they get silently tossed Affected files ... .. //depot/projects/vap/sbin/dhclient/dhclient.c#3 edit Differences ... ==== //depot/projects/vap/sbin/dhclient/dhclient.c#3 (text+ko) ==== @@ -300,7 +300,7 @@ /* Initially, log errors to stderr as well as to syslogd. */ openlog(__progname, LOG_PID | LOG_NDELAY, DHCPD_LOG_FACILITY); - setlogmask(LOG_UPTO(LOG_INFO)); + setlogmask(LOG_UPTO(LOG_DEBUG)); while ((ch = getopt(argc, argv, "bc:dl:qu")) != -1) switch (ch) { From owner-p4-projects@FreeBSD.ORG Mon Mar 10 18:44:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AF3F10656E3; Mon, 10 Mar 2008 18:44:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2AA510656ED for ; Mon, 10 Mar 2008 18:44:11 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A3CA88FC18 for ; Mon, 10 Mar 2008 18:44:11 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AIiB45030677 for ; Mon, 10 Mar 2008 18:44:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AIiBe9030675 for perforce@freebsd.org; Mon, 10 Mar 2008 18:44:11 GMT (envelope-from sam@freebsd.org) Date: Mon, 10 Mar 2008 18:44:11 GMT Message-Id: <200803101844.m2AIiBe9030675@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 137339 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, 10 Mar 2008 18:44:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=137339 Change 137339 by sam@sam_ebb on 2008/03/10 18:44:10 enable radius acl support for now Affected files ... .. //depot/projects/vap/usr.sbin/wpa/hostapd/Makefile#3 edit Differences ... ==== //depot/projects/vap/usr.sbin/wpa/hostapd/Makefile#3 (text+ko) ==== @@ -25,6 +25,7 @@ CFLAGS+= -DCONFIG_DRIVER_BSD CFLAGS+= -DCONFIG_CTRL_IFACE CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX +CFLAGS+= -DCONFIG_DRIVER_RADIUS_ACL .if ${MK_INET6} != "no" CFLAGS+= -DCONFIG_IPV6 .endif From owner-p4-projects@FreeBSD.ORG Mon Mar 10 20:24:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DB751065675; Mon, 10 Mar 2008 20:24:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BCE5106566C for ; Mon, 10 Mar 2008 20:24:01 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EE6B68FC1B for ; Mon, 10 Mar 2008 20:24:00 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AKO0So039147 for ; Mon, 10 Mar 2008 20:24:00 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AKO07h039141 for perforce@freebsd.org; Mon, 10 Mar 2008 20:24:00 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 10 Mar 2008 20:24:00 GMT Message-Id: <200803102024.m2AKO07h039141@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 137344 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, 10 Mar 2008 20:24:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=137344 Change 137344 by swise@swise:vic10:iwarp on 2008/03/10 20:23:17 Get rid of fast taskqueues. Affected files ... .. //depot/projects/iwarp/sys/contrib/rdma/rdma_addr.c#8 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_cma.c#13 edit .. //depot/projects/iwarp/sys/contrib/rdma/rdma_iwcm.c#11 edit Differences ... ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_addr.c#8 (text+ko) ==== @@ -89,7 +89,7 @@ static void addr_timeout(void *arg) { - taskqueue_enqueue_fast(addr_taskq, &addr_task); + taskqueue_enqueue(addr_taskq, &addr_task); } void rdma_addr_register_client(struct rdma_addr_client *client) @@ -346,7 +346,7 @@ struct sockaddr *sa) { callout_stop(&addr_ch); - taskqueue_enqueue_fast(addr_taskq, &addr_task); + taskqueue_enqueue(addr_taskq, &addr_task); } static int addr_init(void) @@ -354,7 +354,7 @@ TAILQ_INIT(&req_list); mtx_init(&lock, "rdma_addr req_list lock", NULL, MTX_DEF); - addr_taskq = taskqueue_create_fast("rdma_addr_taskq", M_NOWAIT, + addr_taskq = taskqueue_create("rdma_addr_taskq", M_NOWAIT, taskqueue_thread_enqueue, &addr_taskq); if (addr_taskq == NULL) { printf("failed to allocate rdma_addr taskqueue\n"); ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_cma.c#13 (text+ko) ==== @@ -1566,7 +1566,7 @@ work->event.status = status; } - taskqueue_enqueue_fast(cma_wq, &work->task); + taskqueue_enqueue(cma_wq, &work->task); } static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms, @@ -1694,7 +1694,7 @@ work->old_state = CMA_ROUTE_QUERY; work->new_state = CMA_ROUTE_RESOLVED; work->event.event = RDMA_CM_EVENT_ROUTE_RESOLVED; - taskqueue_enqueue_fast(cma_wq, &work->task); + taskqueue_enqueue(cma_wq, &work->task); return 0; } @@ -1858,7 +1858,7 @@ work->old_state = CMA_ADDR_QUERY; work->new_state = CMA_ADDR_RESOLVED; work->event.event = RDMA_CM_EVENT_ADDR_RESOLVED; - taskqueue_enqueue_fast(cma_wq, &work->task); + taskqueue_enqueue(cma_wq, &work->task); return 0; err: free(work, M_DEVBUF); @@ -2941,7 +2941,7 @@ next_port = ((unsigned int) next_port % (ipport_lastauto - ipport_firstauto)) + ipport_firstauto; - cma_wq = taskqueue_create_fast("rdma_cm", M_NOWAIT, taskqueue_thread_enqueue, + cma_wq = taskqueue_create("rdma_cm", M_NOWAIT, taskqueue_thread_enqueue, &cma_wq); if (!cma_wq) ==== //depot/projects/iwarp/sys/contrib/rdma/rdma_iwcm.c#11 (text+ko) ==== @@ -960,7 +960,7 @@ atomic_inc(&cm_id_priv->refcount); if (TAILQ_EMPTY(&cm_id_priv->work_list)) { TAILQ_INSERT_TAIL(&cm_id_priv->work_list, work, list); - taskqueue_enqueue_fast(iwcm_wq, &work->task); + taskqueue_enqueue(iwcm_wq, &work->task); } else TAILQ_INSERT_TAIL(&cm_id_priv->work_list, work, list); out: @@ -1045,7 +1045,7 @@ static int __init iw_cm_init(void) { - iwcm_wq = taskqueue_create_fast("iw_cm_wq", M_NOWAIT, taskqueue_thread_enqueue, &iwcm_wq); + iwcm_wq = taskqueue_create("iw_cm_wq", M_NOWAIT, taskqueue_thread_enqueue, &iwcm_wq); if (!iwcm_wq) return (ENOMEM); From owner-p4-projects@FreeBSD.ORG Mon Mar 10 20:24:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFD7A1065718; Mon, 10 Mar 2008 20:24:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3DF8F1065670 for ; Mon, 10 Mar 2008 20:24:01 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1D0558FC29 for ; Mon, 10 Mar 2008 20:24:01 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AKO13p039152 for ; Mon, 10 Mar 2008 20:24:01 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AKO1BJ039150 for perforce@freebsd.org; Mon, 10 Mar 2008 20:24:01 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 10 Mar 2008 20:24:01 GMT Message-Id: <200803102024.m2AKO1BJ039150@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 137345 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, 10 Mar 2008 20:24:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=137345 Change 137345 by swise@swise:vic10:iwarp on 2008/03/10 20:23:49 Don't use WAITOK. Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom.c#15 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom.c#15 (text+ko) ==== @@ -341,7 +341,7 @@ struct mtutab mtutab; unsigned int l2t_capacity; - t = malloc(sizeof(*t), M_CXGB, M_WAITOK|M_ZERO); + t = malloc(sizeof(*t), M_CXGB, M_NOWAIT|M_ZERO); if (!t) return (ENOMEM); dev->adapter = adapter; @@ -1358,7 +1358,7 @@ t->rx_page_size = rx_page_info.page_size; /* OK if this fails, we just can't do DDP */ t->nppods = (ddp.ulimit + 1 - ddp.llimit) / PPOD_SIZE; - t->ppod_map = malloc(t->nppods, M_DEVBUF, M_WAITOK|M_ZERO); + t->ppod_map = malloc(t->nppods, M_DEVBUF, M_NOWAIT|M_ZERO); mtx_init(&t->ppod_map_lock, "ppod map", NULL, MTX_DEF); From owner-p4-projects@FreeBSD.ORG Mon Mar 10 20:25:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08AB51065682; Mon, 10 Mar 2008 20:25:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A118A1065676 for ; Mon, 10 Mar 2008 20:25:02 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F1D28FC30 for ; Mon, 10 Mar 2008 20:25:02 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AKP2qT039208 for ; Mon, 10 Mar 2008 20:25:02 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AKP282039206 for perforce@freebsd.org; Mon, 10 Mar 2008 20:25:02 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 10 Mar 2008 20:25:02 GMT Message-Id: <200803102025.m2AKP282039206@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 137346 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, 10 Mar 2008 20:25:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=137346 Change 137346 by swise@swise:vic10:iwarp on 2008/03/10 20:24:16 Process all socket upcalls on a thread. Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#8 edit .. //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h#3 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#8 (text+ko) ==== @@ -158,6 +158,15 @@ static void connect_reply_upcall(struct iwch_ep *ep, int status); static void iwch_so_upcall(struct socket *so, void *arg, int waitflag); +/* + * Cruft to offload socket upcalls onto thread. + */ +static struct mtx req_lock; +static TAILQ_HEAD(iwch_ep_list, iwch_ep_common) req_list; +static struct task iw_cxgb_task; +static struct taskqueue *iw_cxgb_taskq; +static void process_req(void *ctx, int pending); + static void start_ep_timer(struct iwch_ep *ep) { @@ -265,8 +274,8 @@ void __free_ep(struct iwch_ep_common *epc) { PDBG("%s ep %p state %s\n", __FUNCTION__, epc, states[state_read(epc)]); - if (epc->so) - printf("%s warning ep->so %p \n", __FUNCTION__, epc->so); + KASSERT(!epc->so, ("%s warning ep->so %p \n", __FUNCTION__, epc->so)); + KASSERT(!epc->entry.tqe_prev, ("%s epc %p still on req list!\n", __FUNCTION__, epc)); free(epc, M_DEVBUF); } @@ -1621,7 +1630,21 @@ iwch_so_upcall(struct socket *so, void *arg, int waitflag) { struct iwch_ep *ep = arg; + + PDBG("%s so %p so state %x ep %p ep state(%d)=%s\n", __FUNCTION__, so, so->so_state, ep, ep->com.state, states[ep->com.state]); + mtx_lock(&req_lock); + if (ep && !ep->com.entry.tqe_prev) { + get_ep(&ep->com); + TAILQ_INSERT_TAIL(&req_list, &ep->com, entry); + taskqueue_enqueue(iw_cxgb_taskq, &iw_cxgb_task); + } + mtx_unlock(&req_lock); +} + +static void process_socket_event(struct iwch_ep *ep) +{ int state = state_read(&ep->com); + struct socket *so = ep->com.so; PDBG("%s so %p so state %x ep %p ep state(%d)=%s\n", __FUNCTION__, so, so->so_state, ep, ep->com.state, states[ep->com.state]); if (state == CONNECTING) { @@ -1641,7 +1664,7 @@ } /* peer close */ - if (so->so_state & SS_ISDISCONNECTING && state < CLOSING) { + if ((so->so_rcv.sb_state & SBS_CANTRCVMORE) && state < CLOSING) { process_peer_close(ep); return; } @@ -1657,9 +1680,37 @@ return; } +static void process_req(void *ctx, int pending) +{ + struct iwch_ep_common *epc; + + PDBG("%s enter\n", __FUNCTION__); + mtx_lock(&req_lock); + while (!TAILQ_EMPTY(&req_list)) { + epc = TAILQ_FIRST(&req_list); + TAILQ_REMOVE(&req_list, epc, entry); + epc->entry.tqe_prev = NULL; + mtx_unlock(&req_lock); + process_socket_event((struct iwch_ep *)epc); + put_ep(epc); + mtx_lock(&req_lock); + } + mtx_unlock(&req_lock); +} + int __init iwch_cm_init(void) { + TAILQ_INIT(&req_list); + mtx_init(&req_lock, "iw_cxgb req_list lock", NULL, MTX_DEF); + iw_cxgb_taskq = taskqueue_create("iw_cxgb_taskq", M_NOWAIT, + taskqueue_thread_enqueue, &iw_cxgb_taskq); + if (iw_cxgb_taskq == NULL) { + printf("failed to allocate iw_cxgb taskqueue\n"); + return (ENOMEM); + } + taskqueue_start_threads(&iw_cxgb_taskq, 1, PI_NET, "iw_cxgb taskq"); + TASK_INIT(&iw_cxgb_task, 0, process_req, NULL); t3tom_register_cpl_handler(CPL_RDMA_TERMINATE, terminate); t3tom_register_cpl_handler(CPL_RDMA_EC_STATUS, ec_status); return 0; @@ -1670,4 +1721,6 @@ { t3tom_register_cpl_handler(CPL_RDMA_TERMINATE, NULL); t3tom_register_cpl_handler(CPL_RDMA_EC_STATUS, NULL); + taskqueue_drain(iw_cxgb_taskq, &iw_cxgb_task); + taskqueue_free(iw_cxgb_taskq); } ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h#3 (text+ko) ==== @@ -115,6 +115,7 @@ }; struct iwch_ep_common { + TAILQ_ENTRY(iwch_ep_common) entry; struct iw_cm_id *cm_id; struct iwch_qp *qp; struct t3cdev *tdev; From owner-p4-projects@FreeBSD.ORG Mon Mar 10 20:42:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E64941065673; Mon, 10 Mar 2008 20:42:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5679106567B for ; Mon, 10 Mar 2008 20:42:21 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 828408FC1A for ; Mon, 10 Mar 2008 20:42:21 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AKgLEb039955 for ; Mon, 10 Mar 2008 20:42:21 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AKgL3h039953 for perforce@freebsd.org; Mon, 10 Mar 2008 20:42:21 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Mar 2008 20:42:21 GMT Message-Id: <200803102042.m2AKgL3h039953@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 137350 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, 10 Mar 2008 20:42:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=137350 Change 137350 by imp@imp_paco-paco on 2008/03/10 20:41:22 IFC @137347 Affected files ... .. //depot/projects/arm/src/bin/uuidgen/Makefile#1 branch .. //depot/projects/arm/src/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/arm/src/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/arm/src/sbin/mount/mount.8#8 integrate .. //depot/projects/arm/src/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/arm/src/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/arm/src/sys/security/audit/audit_worker.c#9 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#23 integrate Differences ... ==== //depot/projects/arm/src/sbin/mount/mount.8#8 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.84 2007/11/27 20:37:16 jhb Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.85 2008/03/10 19:03:55 tmclaugh Exp $ .\" -.Dd July 12, 2006 +.Dd March 10, 2008 .Dt MOUNT 8 .Os .Sh NAME @@ -335,7 +335,7 @@ .Nm command: .Bd -literal -offset indent -mount -t unionfs -o -b /sys $HOME/sys +mount -t unionfs -o below /sys $HOME/sys .Ed .Pp causes ==== //depot/projects/arm/src/sys/security/audit/audit_worker.c#9 (text) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_worker.c,v 1.21 2008/03/01 11:04:04 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_worker.c,v 1.22 2008/03/10 18:15:02 rwatson Exp $ */ #include @@ -170,9 +170,6 @@ * are limited to 1/sec. */ if (audit_qctrl.aq_minfree != 0) { - /* - * XXXAUDIT: Check math and block size calculations here. - */ temp = mnt_stat->f_blocks / (100 / audit_qctrl.aq_minfree); if (mnt_stat->f_bfree < temp) { if (ppsratecheck(&last_lowspace_trigger, ==== //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#23 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.217 2008/02/24 16:38:58 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.218 2008/03/10 18:44:07 emaste Exp $"); /* * For now we want the safety net that the DEBUG flag provides. @@ -78,7 +78,6 @@ #include #include "opt_ffs.h" -#include "opt_quota.h" #ifndef SOFTUPDATES From owner-p4-projects@FreeBSD.ORG Mon Mar 10 20:53:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACAC51065681; Mon, 10 Mar 2008 20:53:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68F391065672 for ; Mon, 10 Mar 2008 20:53:35 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4339E8FC33 for ; Mon, 10 Mar 2008 20:53:35 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AKrZsn049400 for ; Mon, 10 Mar 2008 20:53:35 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AKrYqt049398 for perforce@freebsd.org; Mon, 10 Mar 2008 20:53:34 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Mar 2008 20:53:34 GMT Message-Id: <200803102053.m2AKrYqt049398@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 137352 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, 10 Mar 2008 20:53:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=137352 Change 137352 by imp@imp_paco-paco on 2008/03/10 20:53:20 IFC @137347 Affected files ... .. //depot/projects/mips2/src/Makefile.inc1#16 integrate .. //depot/projects/mips2/src/ObsoleteFiles.inc#14 integrate .. //depot/projects/mips2/src/UPDATING#11 integrate .. //depot/projects/mips2/src/bin/chflags/chflags.1#3 integrate .. //depot/projects/mips2/src/bin/chflags/chflags.c#2 integrate .. //depot/projects/mips2/src/bin/realpath/realpath.1#2 integrate .. //depot/projects/mips2/src/bin/realpath/realpath.c#2 integrate .. //depot/projects/mips2/src/bin/uuidgen/Makefile#1 branch .. //depot/projects/mips2/src/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/mips2/src/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/mips2/src/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/mips2/src/etc/Makefile#6 integrate .. //depot/projects/mips2/src/etc/ddb.conf#1 branch .. //depot/projects/mips2/src/etc/defaults/rc.conf#8 integrate .. //depot/projects/mips2/src/etc/rc.d/Makefile#7 integrate .. //depot/projects/mips2/src/etc/rc.d/ddb#1 branch .. //depot/projects/mips2/src/etc/rc.d/mountcritlocal#5 integrate .. //depot/projects/mips2/src/etc/rc.d/mountlate#3 integrate .. //depot/projects/mips2/src/games/fortune/datfiles/fortunes#9 integrate .. //depot/projects/mips2/src/gnu/usr.bin/binutils/ar/Makefile#4 integrate .. //depot/projects/mips2/src/gnu/usr.bin/binutils/ranlib/Makefile#4 integrate .. //depot/projects/mips2/src/include/pthread_np.h#5 integrate .. //depot/projects/mips2/src/include/unistd.h#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry.3#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read.3#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_zip.c#9 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_util.3#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write.3#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_disk.c#7 integrate .. //depot/projects/mips2/src/lib/libc/gen/sysconf.c#4 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/mac.c#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/mac_exec.c#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/mac_get.c#2 integrate .. //depot/projects/mips2/src/lib/libc/posix1e/mac_set.c#2 integrate .. //depot/projects/mips2/src/lib/libc/stdio/fdopen.c#3 integrate .. //depot/projects/mips2/src/lib/libc/stdio/fopen.c#3 integrate .. //depot/projects/mips2/src/lib/libc/stdio/freopen.c#3 integrate .. //depot/projects/mips2/src/lib/libc/stdlib/getenv.c#5 integrate .. //depot/projects/mips2/src/lib/libc/stdlib/malloc.c#10 integrate .. //depot/projects/mips2/src/lib/libc/sys/Makefile.inc#6 integrate .. //depot/projects/mips2/src/lib/libc/sys/Symbol.map#6 integrate .. //depot/projects/mips2/src/lib/libc/sys/fcntl.2#3 integrate .. //depot/projects/mips2/src/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/mips2/src/lib/libc/sys/mq_close.2#4 integrate .. //depot/projects/mips2/src/lib/libc/sys/mq_getattr.2#4 integrate .. //depot/projects/mips2/src/lib/libc/sys/mq_notify.2#4 integrate .. //depot/projects/mips2/src/lib/libc/sys/mq_open.2#4 integrate .. //depot/projects/mips2/src/lib/libc/sys/mq_receive.2#4 integrate .. //depot/projects/mips2/src/lib/libc/sys/mq_send.2#4 integrate .. //depot/projects/mips2/src/lib/libc/sys/mq_setattr.2#4 integrate .. //depot/projects/mips2/src/lib/libc/sys/readlink.2#4 integrate .. //depot/projects/mips2/src/lib/libelf/elf_update.c#3 integrate .. //depot/projects/mips2/src/lib/libelf/gelf_rel.c#2 integrate .. //depot/projects/mips2/src/lib/libelf/gelf_rela.c#2 integrate .. //depot/projects/mips2/src/lib/libthr/pthread.map#7 integrate .. //depot/projects/mips2/src/lib/libthr/thread/Makefile.inc#2 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_affinity.c#1 branch .. //depot/projects/mips2/src/lib/libthr/thread/thr_attr.c#4 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_create.c#4 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_exit.c#4 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_init.c#6 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_private.h#8 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_sig.c#5 integrate .. //depot/projects/mips2/src/lib/libutil/humanize_number.c#2 integrate .. //depot/projects/mips2/src/lib/msun/Makefile#6 integrate .. //depot/projects/mips2/src/lib/msun/Symbol.map#6 integrate .. //depot/projects/mips2/src/lib/msun/amd64/Makefile.inc#4 integrate .. //depot/projects/mips2/src/lib/msun/amd64/e_sqrtl.S#1 branch .. //depot/projects/mips2/src/lib/msun/i387/Makefile.inc#5 integrate .. //depot/projects/mips2/src/lib/msun/i387/e_sqrtl.S#1 branch .. //depot/projects/mips2/src/lib/msun/ld128/s_nanl.c#2 integrate .. //depot/projects/mips2/src/lib/msun/man/sqrt.3#4 integrate .. //depot/projects/mips2/src/lib/msun/src/e_rem_pio2.c#4 integrate .. //depot/projects/mips2/src/lib/msun/src/e_rem_pio2f.c#4 integrate .. //depot/projects/mips2/src/lib/msun/src/e_sqrt.c#2 integrate .. //depot/projects/mips2/src/lib/msun/src/e_sqrtl.c#1 branch .. //depot/projects/mips2/src/lib/msun/src/math.h#5 integrate .. //depot/projects/mips2/src/rescue/rescue/Makefile#5 integrate .. //depot/projects/mips2/src/sbin/ddb/ddb.8#2 integrate .. //depot/projects/mips2/src/sbin/ddb/ddb.c#2 integrate .. //depot/projects/mips2/src/sbin/fsck_ffs/main.c#5 integrate .. //depot/projects/mips2/src/sbin/geom/Makefile#3 integrate .. //depot/projects/mips2/src/sbin/geom/class/label/geom_label.c#4 integrate .. //depot/projects/mips2/src/sbin/geom/class/multipath/gmultipath.8#3 integrate .. //depot/projects/mips2/src/sbin/geom/core/geom.8#4 integrate .. //depot/projects/mips2/src/sbin/geom/core/geom.c#6 integrate .. //depot/projects/mips2/src/sbin/ifconfig/ifconfig.8#9 integrate .. //depot/projects/mips2/src/sbin/ipfw/ipfw.8#10 integrate .. //depot/projects/mips2/src/sbin/ipfw/ipfw2.c#8 integrate .. //depot/projects/mips2/src/sbin/mount/mount.8#7 integrate .. //depot/projects/mips2/src/sbin/newfs/mkfs.c#4 integrate .. //depot/projects/mips2/src/secure/usr.bin/ssh/Makefile#2 integrate .. //depot/projects/mips2/src/secure/usr.sbin/sshd/Makefile#3 integrate .. //depot/projects/mips2/src/share/man/man3/Makefile#4 integrate .. //depot/projects/mips2/src/share/man/man4/Makefile#15 integrate .. //depot/projects/mips2/src/share/man/man4/cmx.4#1 branch .. //depot/projects/mips2/src/share/man/man4/ddb.4#5 integrate .. //depot/projects/mips2/src/share/man/man4/fwohci.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/ng_nat.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/uchcom.4#1 branch .. //depot/projects/mips2/src/share/man/man4/ucom.4#4 integrate .. //depot/projects/mips2/src/share/man/man4/ucycom.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/uscanner.4#4 integrate .. //depot/projects/mips2/src/share/man/man4/uslcom.4#1 branch .. //depot/projects/mips2/src/share/man/man5/rc.conf.5#8 integrate .. //depot/projects/mips2/src/share/man/man9/DEVICE_PROBE.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/Makefile#10 integrate .. //depot/projects/mips2/src/share/man/man9/bus_space.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/insmntque.9#1 branch .. //depot/projects/mips2/src/share/man/man9/lock.9#7 integrate .. //depot/projects/mips2/src/share/man/man9/vfs_mountedfrom.9#1 branch .. //depot/projects/mips2/src/share/man/man9/vgone.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/vhold.9#3 integrate .. //depot/projects/mips2/src/share/man/man9/vput.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/vref.9#2 integrate .. //depot/projects/mips2/src/share/man/man9/vrefcnt.9#1 branch .. //depot/projects/mips2/src/share/man/man9/vrele.9#2 integrate .. //depot/projects/mips2/src/share/misc/bsd-family-tree#9 integrate .. //depot/projects/mips2/src/share/misc/committers-doc.dot#4 integrate .. //depot/projects/mips2/src/share/misc/committers-ports.dot#7 integrate .. //depot/projects/mips2/src/share/mk/bsd.cpu.mk#12 integrate .. //depot/projects/mips2/src/share/mk/sys.mk#11 integrate .. //depot/projects/mips2/src/share/zoneinfo/leapseconds#6 integrate .. //depot/projects/mips2/src/share/zoneinfo/southamerica#7 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/identcpu.c#7 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/pmap.c#15 integrate .. //depot/projects/mips2/src/sys/amd64/conf/GENERIC#11 integrate .. //depot/projects/mips2/src/sys/amd64/include/pmap.h#4 integrate .. //depot/projects/mips2/src/sys/amd64/include/smp.h#5 integrate .. //depot/projects/mips2/src/sys/arm/arm/pmap.c#11 integrate .. //depot/projects/mips2/src/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/arm/conf/AVILA#5 integrate .. //depot/projects/mips2/src/sys/arm/include/pmap.h#6 integrate .. //depot/projects/mips2/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/mips2/src/sys/boot/i386/boot2/boot2.c#4 integrate .. //depot/projects/mips2/src/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/mips2/src/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/mips2/src/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/mips2/src/sys/boot/i386/libi386/biosdisk.c#5 integrate .. //depot/projects/mips2/src/sys/boot/i386/pxeldr/pxeldr.S#3 integrate .. //depot/projects/mips2/src/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/mips2/src/sys/boot/pc98/btx/btx/btx.S#3 integrate .. //depot/projects/mips2/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/mips2/src/sys/boot/pc98/libpc98/biosdisk.c#4 integrate .. //depot/projects/mips2/src/sys/cam/cam_xpt.c#10 integrate .. //depot/projects/mips2/src/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/mips2/src/sys/conf/NOTES#15 integrate .. //depot/projects/mips2/src/sys/conf/files#18 integrate .. //depot/projects/mips2/src/sys/conf/files.powerpc#10 integrate .. //depot/projects/mips2/src/sys/conf/kmod.mk#5 integrate .. //depot/projects/mips2/src/sys/conf/ldscript.powerpc#2 integrate .. //depot/projects/mips2/src/sys/conf/options#12 integrate .. //depot/projects/mips2/src/sys/conf/options.powerpc#4 integrate .. //depot/projects/mips2/src/sys/ddb/db_command.c#5 integrate .. //depot/projects/mips2/src/sys/ddb/db_examine.c#4 integrate .. //depot/projects/mips2/src/sys/ddb/db_input.c#3 integrate .. //depot/projects/mips2/src/sys/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/mips2/src/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-chipset.c#11 integrate .. //depot/projects/mips2/src/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/mips2/src/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/mips2/src/sys/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/mips2/src/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/mips2/src/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/mips2/src/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/mips2/src/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/mips2/src/sys/dev/cxgb/bin2h.pl#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_main.c#11 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/mips2/src/sys/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/mips2/src/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/mips2/src/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/mips2/src/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/mips2/src/sys/dev/em/LICENSE#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_80003es2lan.c#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_80003es2lan.h#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_82540.c#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_82541.c#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_82541.h#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_82542.c#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_82543.c#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_82543.h#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_82571.c#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_82571.h#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_82575.c#3 delete .. //depot/projects/mips2/src/sys/dev/em/e1000_82575.h#3 delete .. //depot/projects/mips2/src/sys/dev/em/e1000_api.c#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_api.h#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_defines.h#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_hw.h#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_ich8lan.c#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_ich8lan.h#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_mac.c#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_mac.h#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_manage.c#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_manage.h#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_nvm.c#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_nvm.h#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_osdep.h#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_phy.c#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_phy.h#3 integrate .. //depot/projects/mips2/src/sys/dev/em/e1000_regs.h#3 integrate .. //depot/projects/mips2/src/sys/dev/em/if_em.c#9 integrate .. //depot/projects/mips2/src/sys/dev/em/if_em.h#8 integrate .. //depot/projects/mips2/src/sys/dev/gem/if_gem.c#6 integrate .. //depot/projects/mips2/src/sys/dev/hptrr/hptrr_os_bsd.c#3 integrate .. //depot/projects/mips2/src/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate .. //depot/projects/mips2/src/sys/dev/hptrr/ldm.h#3 integrate .. //depot/projects/mips2/src/sys/dev/hptrr/osm.h#3 integrate .. //depot/projects/mips2/src/sys/dev/ic/quicc.h#1 branch .. //depot/projects/mips2/src/sys/dev/igb/e1000_82575.c#1 branch .. //depot/projects/mips2/src/sys/dev/igb/e1000_82575.h#1 branch .. //depot/projects/mips2/src/sys/dev/igb/e1000_api.c#1 branch .. //depot/projects/mips2/src/sys/dev/igb/e1000_api.h#1 branch .. //depot/projects/mips2/src/sys/dev/igb/e1000_defines.h#1 branch .. //depot/projects/mips2/src/sys/dev/igb/e1000_hw.h#1 branch .. //depot/projects/mips2/src/sys/dev/igb/e1000_mac.c#1 branch .. //depot/projects/mips2/src/sys/dev/igb/e1000_mac.h#1 branch .. //depot/projects/mips2/src/sys/dev/igb/e1000_manage.c#1 branch .. //depot/projects/mips2/src/sys/dev/igb/e1000_manage.h#1 branch .. //depot/projects/mips2/src/sys/dev/igb/e1000_nvm.c#1 branch .. //depot/projects/mips2/src/sys/dev/igb/e1000_nvm.h#1 branch .. //depot/projects/mips2/src/sys/dev/igb/e1000_osdep.h#1 branch .. //depot/projects/mips2/src/sys/dev/igb/e1000_phy.c#1 branch .. //depot/projects/mips2/src/sys/dev/igb/e1000_phy.h#1 branch .. //depot/projects/mips2/src/sys/dev/igb/e1000_regs.h#1 branch .. //depot/projects/mips2/src/sys/dev/igb/if_igb.c#1 branch .. //depot/projects/mips2/src/sys/dev/igb/if_igb.h#1 branch .. //depot/projects/mips2/src/sys/dev/lge/if_lge.c#5 integrate .. //depot/projects/mips2/src/sys/dev/md/md.c#7 integrate .. //depot/projects/mips2/src/sys/dev/mii/brgphy.c#8 integrate .. //depot/projects/mips2/src/sys/dev/mii/ciphy.c#5 integrate .. //depot/projects/mips2/src/sys/dev/mii/miidevs#8 integrate .. //depot/projects/mips2/src/sys/dev/mii/rgephy.c#5 integrate .. //depot/projects/mips2/src/sys/dev/msk/if_msk.c#7 integrate .. //depot/projects/mips2/src/sys/dev/msk/if_mskreg.h#5 integrate .. //depot/projects/mips2/src/sys/dev/nfe/if_nfe.c#9 integrate .. //depot/projects/mips2/src/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/mips2/src/sys/dev/nfe/if_nfevar.h#5 integrate .. //depot/projects/mips2/src/sys/dev/pccard/pccarddevs#6 integrate .. //depot/projects/mips2/src/sys/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/mips2/src/sys/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/mips2/src/sys/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/mips2/src/sys/dev/quicc/quicc_core.c#1 branch .. //depot/projects/mips2/src/sys/dev/re/if_re.c#12 integrate .. //depot/projects/mips2/src/sys/dev/scc/scc_bfe.h#3 integrate .. //depot/projects/mips2/src/sys/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/mips2/src/sys/dev/scc/scc_bus.h#2 integrate .. //depot/projects/mips2/src/sys/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/mips2/src/sys/dev/tsec/if_tsec.c#1 branch .. //depot/projects/mips2/src/sys/dev/tsec/if_tsec.h#1 branch .. //depot/projects/mips2/src/sys/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/mips2/src/sys/dev/uart/uart.h#3 integrate .. //depot/projects/mips2/src/sys/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/mips2/src/sys/dev/uart/uart_bus_scc.c#2 integrate .. //depot/projects/mips2/src/sys/dev/uart/uart_cpu_powerpc.c#5 integrate .. //depot/projects/mips2/src/sys/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/mips2/src/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_axe.c#7 integrate .. //depot/projects/mips2/src/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/mips2/src/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/mips2/src/sys/dev/usb/uscanner.c#5 integrate .. //depot/projects/mips2/src/sys/dev/usb/uslcom.c#1 branch .. //depot/projects/mips2/src/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/mips2/src/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/mips2/src/sys/fs/nwfs/nwfs_node.c#4 integrate .. //depot/projects/mips2/src/sys/fs/nwfs/nwfs_subr.c#3 integrate .. //depot/projects/mips2/src/sys/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/mips2/src/sys/fs/smbfs/smbfs_node.c#5 integrate .. //depot/projects/mips2/src/sys/fs/smbfs/smbfs_vfsops.c#6 integrate .. //depot/projects/mips2/src/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/mips2/src/sys/geom/part/g_part_vtoc8.c#1 branch .. //depot/projects/mips2/src/sys/i386/conf/GENERIC#11 integrate .. //depot/projects/mips2/src/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/mips2/src/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/mips2/src/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/mips2/src/sys/i386/include/_types.h#2 integrate .. //depot/projects/mips2/src/sys/i386/include/float.h#2 integrate .. //depot/projects/mips2/src/sys/i386/include/smp.h#5 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/mp_machdep.c#5 integrate .. //depot/projects/mips2/src/sys/kern/init_main.c#10 integrate .. //depot/projects/mips2/src/sys/kern/init_sysent.c#8 integrate .. //depot/projects/mips2/src/sys/kern/kern_cpuset.c#1 branch .. //depot/projects/mips2/src/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/mips2/src/sys/kern/kern_lock.c#10 integrate .. //depot/projects/mips2/src/sys/kern/kern_priv.c#3 integrate .. //depot/projects/mips2/src/sys/kern/kern_shutdown.c#7 integrate .. //depot/projects/mips2/src/sys/kern/kern_sig.c#7 integrate .. //depot/projects/mips2/src/sys/kern/kern_synch.c#7 integrate .. //depot/projects/mips2/src/sys/kern/kern_thread.c#9 integrate .. //depot/projects/mips2/src/sys/kern/sched_4bsd.c#8 integrate .. //depot/projects/mips2/src/sys/kern/sched_ule.c#11 integrate .. //depot/projects/mips2/src/sys/kern/subr_bus.c#9 integrate .. //depot/projects/mips2/src/sys/kern/subr_smp.c#7 integrate .. //depot/projects/mips2/src/sys/kern/subr_witness.c#9 integrate .. //depot/projects/mips2/src/sys/kern/syscalls.c#8 integrate .. //depot/projects/mips2/src/sys/kern/syscalls.master#9 integrate .. //depot/projects/mips2/src/sys/kern/systrace_args.c#5 integrate .. //depot/projects/mips2/src/sys/kern/vfs_bio.c#12 integrate .. //depot/projects/mips2/src/sys/kern/vfs_subr.c#13 integrate .. //depot/projects/mips2/src/sys/modules/Makefile#12 integrate .. //depot/projects/mips2/src/sys/modules/cmx/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/cxgb/cxgb/Makefile#4 integrate .. //depot/projects/mips2/src/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/mips2/src/sys/modules/em/Makefile#3 integrate .. //depot/projects/mips2/src/sys/modules/geom/Makefile#5 integrate .. //depot/projects/mips2/src/sys/modules/geom/geom_apple/Makefile#2 delete .. //depot/projects/mips2/src/sys/modules/geom/geom_gpt/Makefile#2 delete .. //depot/projects/mips2/src/sys/modules/geom/geom_part/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/igb/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/ipfw_nat/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/uslcom/Makefile#1 branch .. //depot/projects/mips2/src/sys/modules/zfs/Makefile#5 integrate .. //depot/projects/mips2/src/sys/net/bpf_filter.c#4 integrate .. //depot/projects/mips2/src/sys/net/if.c#8 integrate .. //depot/projects/mips2/src/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/mips2/src/sys/net/if_gif.c#5 integrate .. //depot/projects/mips2/src/sys/net80211/ieee80211_scan_sta.c#4 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_base.c#10 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_ksocket.c#4 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_l2tp.c#5 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_nat.c#4 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_nat.h#3 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_pppoe.c#6 integrate .. //depot/projects/mips2/src/sys/netinet/in.h#4 integrate .. //depot/projects/mips2/src/sys/netinet/in_pcb.c#8 integrate .. //depot/projects/mips2/src/sys/netinet/ip_dummynet.c#9 integrate .. //depot/projects/mips2/src/sys/netinet/ip_fw.h#5 integrate .. //depot/projects/mips2/src/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/mips2/src/sys/netinet/ip_fw_nat.c#1 branch .. //depot/projects/mips2/src/sys/netinet/ip_fw_pfil.c#5 integrate .. //depot/projects/mips2/src/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/libalias/alias_db.c#4 integrate .. //depot/projects/mips2/src/sys/netinet/libalias/alias_ftp.c#4 integrate .. //depot/projects/mips2/src/sys/netinet/libalias/alias_irc.c#4 integrate .. //depot/projects/mips2/src/sys/netinet/libalias/alias_local.h#3 integrate .. //depot/projects/mips2/src/sys/netinet/libalias/alias_proxy.c#5 integrate .. //depot/projects/mips2/src/sys/netinet/libalias/alias_smedia.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_input.c#9 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_output.c#9 integrate .. //depot/projects/mips2/src/sys/netipsec/key.c#3 integrate .. //depot/projects/mips2/src/sys/netipsec/key_debug.c#3 integrate .. //depot/projects/mips2/src/sys/netncp/ncp_conn.h#2 integrate .. //depot/projects/mips2/src/sys/netsmb/smb_conn.h#2 integrate .. //depot/projects/mips2/src/sys/nfs4client/nfs4_idmap.c#3 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/mips2/src/sys/nfsserver/nfs_serv.c#6 integrate .. //depot/projects/mips2/src/sys/pc98/cbus/sio.c#6 integrate .. //depot/projects/mips2/src/sys/pc98/conf/GENERIC#9 integrate .. //depot/projects/mips2/src/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/mips2/src/sys/pci/if_rl.c#6 integrate .. //depot/projects/mips2/src/sys/pci/if_rlreg.h#9 integrate .. //depot/projects/mips2/src/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/mips2/src/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/mips2/src/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/mips2/src/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/aim/trap_subr.S#2 integrate .. //depot/projects/mips2/src/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/booke/clock.c#1 branch .. //depot/projects/mips2/src/sys/powerpc/booke/copyinout.c#1 branch .. //depot/projects/mips2/src/sys/powerpc/booke/interrupt.c#1 branch .. //depot/projects/mips2/src/sys/powerpc/booke/locore.S#1 branch .. //depot/projects/mips2/src/sys/powerpc/booke/machdep.c#1 branch .. //depot/projects/mips2/src/sys/powerpc/booke/pmap.c#1 branch .. //depot/projects/mips2/src/sys/powerpc/booke/support.S#1 branch .. //depot/projects/mips2/src/sys/powerpc/booke/swtch.S#1 branch .. //depot/projects/mips2/src/sys/powerpc/booke/trap.c#1 branch .. //depot/projects/mips2/src/sys/powerpc/booke/trap_subr.S#1 branch .. //depot/projects/mips2/src/sys/powerpc/booke/uio_machdep.c#1 branch .. //depot/projects/mips2/src/sys/powerpc/booke/vm_machdep.c#1 branch .. //depot/projects/mips2/src/sys/powerpc/conf/MPC85XX#1 branch .. //depot/projects/mips2/src/sys/powerpc/conf/NOTES#7 integrate .. //depot/projects/mips2/src/sys/powerpc/include/frame.h#2 integrate .. //depot/projects/mips2/src/sys/powerpc/include/hid.h#3 integrate .. //depot/projects/mips2/src/sys/powerpc/include/intr_machdep.h#6 integrate .. //depot/projects/mips2/src/sys/powerpc/include/kdb.h#3 integrate .. //depot/projects/mips2/src/sys/powerpc/include/md_var.h#6 integrate .. //depot/projects/mips2/src/sys/powerpc/include/mmuvar.h#2 integrate .. //depot/projects/mips2/src/sys/powerpc/include/ocpbus.h#1 branch .. //depot/projects/mips2/src/sys/powerpc/include/openpicvar.h#5 integrate .. //depot/projects/mips2/src/sys/powerpc/include/pcb.h#3 integrate .. //depot/projects/mips2/src/sys/powerpc/include/pcpu.h#4 integrate .. //depot/projects/mips2/src/sys/powerpc/include/pmap.h#3 integrate .. //depot/projects/mips2/src/sys/powerpc/include/psl.h#2 integrate .. //depot/projects/mips2/src/sys/powerpc/include/pte.h#2 integrate .. //depot/projects/mips2/src/sys/powerpc/include/sf_buf.h#2 integrate .. //depot/projects/mips2/src/sys/powerpc/include/spr.h#3 integrate .. //depot/projects/mips2/src/sys/powerpc/include/tlb.h#1 branch .. //depot/projects/mips2/src/sys/powerpc/include/trap.h#3 integrate .. //depot/projects/mips2/src/sys/powerpc/include/trap_aim.h#1 branch .. //depot/projects/mips2/src/sys/powerpc/include/trap_booke.h#1 branch .. //depot/projects/mips2/src/sys/powerpc/include/vmparam.h#6 integrate .. //depot/projects/mips2/src/sys/powerpc/mpc85xx/nexus.c#1 branch .. //depot/projects/mips2/src/sys/powerpc/mpc85xx/ocpbus.c#1 branch .. //depot/projects/mips2/src/sys/powerpc/mpc85xx/ocpbus.h#1 branch .. //depot/projects/mips2/src/sys/powerpc/mpc85xx/opic.c#1 branch .. //depot/projects/mips2/src/sys/powerpc/mpc85xx/pci_ocp.c#1 branch .. //depot/projects/mips2/src/sys/powerpc/powermac/openpic_macio.c#4 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/autoconf.c#3 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/cpu.c#4 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/db_trace.c#4 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/gdb_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/genassym.c#4 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/intr_machdep.c#8 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/openpic.c#5 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/pic_if.m#5 integrate .. //depot/projects/mips2/src/sys/powerpc/psim/openpic_iobus.c#4 integrate .. //depot/projects/mips2/src/sys/security/audit/audit.c#9 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_bsm_klib.c#8 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_private.h#6 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_syscalls.c#8 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_trigger.c#4 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_worker.c#6 integrate .. //depot/projects/mips2/src/sys/sparc64/include/tlb.h#2 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/iommu.c#4 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/mips2/src/sys/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/mips2/src/sys/sys/_types.h#2 integrate .. //depot/projects/mips2/src/sys/sys/buf.h#5 integrate .. //depot/projects/mips2/src/sys/sys/bufobj.h#4 integrate .. //depot/projects/mips2/src/sys/sys/bus.h#5 integrate .. //depot/projects/mips2/src/sys/sys/cpuset.h#1 branch .. //depot/projects/mips2/src/sys/sys/fcntl.h#3 integrate .. //depot/projects/mips2/src/sys/sys/lockmgr.h#7 integrate .. //depot/projects/mips2/src/sys/sys/mount.h#6 integrate .. //depot/projects/mips2/src/sys/sys/param.h#12 integrate .. //depot/projects/mips2/src/sys/sys/pcpu.h#7 integrate .. //depot/projects/mips2/src/sys/sys/proc.h#12 integrate .. //depot/projects/mips2/src/sys/sys/sched.h#4 integrate .. //depot/projects/mips2/src/sys/sys/smp.h#3 integrate .. //depot/projects/mips2/src/sys/sys/syscall.h#8 integrate .. //depot/projects/mips2/src/sys/sys/syscall.mk#8 integrate .. //depot/projects/mips2/src/sys/sys/sysproto.h#8 integrate .. //depot/projects/mips2/src/sys/sys/types.h#4 integrate .. //depot/projects/mips2/src/sys/sys/vnode.h#6 integrate .. //depot/projects/mips2/src/sys/sys/vtoc.h#1 branch .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_softdep.c#8 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/extattr.h#3 integrate .. //depot/projects/mips2/src/sys/ufs/ufs/ufs_extattr.c#5 integrate .. //depot/projects/mips2/src/sys/vm/vm_fault.c#8 integrate .. //depot/projects/mips2/src/sys/vm/vm_map.h#4 integrate .. //depot/projects/mips2/src/sys/vm/vm_object.c#8 integrate .. //depot/projects/mips2/src/tools/build/mk/OptionalObsoleteFiles.inc#6 integrate .. //depot/projects/mips2/src/tools/regression/environ/envctl.c#2 integrate .. //depot/projects/mips2/src/tools/regression/file/dup/dup.c#2 integrate .. //depot/projects/mips2/src/tools/regression/lib/msun/test-trig.c#2 integrate .. //depot/projects/mips2/src/tools/tools/tinybsd/tinybsd#3 integrate .. //depot/projects/mips2/src/usr.bin/Makefile#9 integrate .. //depot/projects/mips2/src/usr.bin/ar/write.c#2 integrate .. //depot/projects/mips2/src/usr.bin/awk/Makefile#4 integrate .. //depot/projects/mips2/src/usr.bin/calendar/calendars/calendar.freebsd#8 integrate .. //depot/projects/mips2/src/usr.bin/chat/chat.c#2 integrate .. //depot/projects/mips2/src/usr.bin/cpuset/Makefile#1 branch .. //depot/projects/mips2/src/usr.bin/cpuset/cpuset.1#1 branch .. //depot/projects/mips2/src/usr.bin/cpuset/cpuset.c#1 branch .. //depot/projects/mips2/src/usr.bin/find/find.1#5 integrate .. //depot/projects/mips2/src/usr.bin/find/main.c#2 integrate .. //depot/projects/mips2/src/usr.bin/gzip/gzip.c#3 integrate .. //depot/projects/mips2/src/usr.bin/make/Makefile#2 integrate .. //depot/projects/mips2/src/usr.bin/make/Makefile.dist#3 integrate .. //depot/projects/mips2/src/usr.bin/make/arch.c#2 integrate .. //depot/projects/mips2/src/usr.bin/make/job.c#3 integrate .. //depot/projects/mips2/src/usr.bin/make/main.c#7 integrate .. //depot/projects/mips2/src/usr.bin/make/make.1#4 integrate .. //depot/projects/mips2/src/usr.bin/unifdef/unifdef.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/Makefile#10 integrate .. //depot/projects/mips2/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#4 integrate .. //depot/projects/mips2/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/fifolog/Makefile#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/Makefile.inc#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_create/Makefile#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/flint.lnt#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/lib/Makefile#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/lib/fifolog.h#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/lib/fifolog_create.c#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/lib/fifolog_int.c#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/lib/fifolog_write.h#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/lib/getdate.y#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/lib/libfifolog.h#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch .. //depot/projects/mips2/src/usr.sbin/fifolog/lib/miniobj.h#1 branch .. //depot/projects/mips2/src/usr.sbin/fwcontrol/fwcontrol.8#4 integrate .. //depot/projects/mips2/src/usr.sbin/fwcontrol/fwcontrol.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/mountd/mountd.c#6 integrate .. //depot/projects/mips2/src/usr.sbin/moused/Makefile#3 integrate .. //depot/projects/mips2/src/usr.sbin/moused/moused.c#5 integrate Differences ... ==== //depot/projects/mips2/src/Makefile.inc1#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.600 2008/02/25 16:29:54 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -196,6 +196,9 @@ GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac +.if ${OSRELDATE} < 700044 +CROSSENV+= AR=gnu-ar RANLIB=gnu-ranlib +.endif # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -948,10 +951,6 @@ .endif .endif -.if make(cross-tools) && ${BOOTSTRAPPING} < 700044 -.MAKEFLAGS+= -D_WITH_GNUAR -.endif - cross-tools: .for _tool in \ gnu/usr.bin/binutils \ ==== //depot/projects/mips2/src/ObsoleteFiles.inc#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -32,6 +32,11 @@ OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libkse.a +OLD_FILES+=usr/lib32/libkse_p.a +OLD_FILES+=usr/lib32/libkse_pic.a +.endif .endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h @@ -134,6 +139,12 @@ OLD_DIRS+=usr/include/netatm/uni OLD_DIRS+=usr/include/netatm OLD_DIRS+=usr/share/examples/atm +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libatm.a +OLD_FILES+=usr/lib32/libatm.so +OLD_LIBS+=usr/lib32/libatm.so.5 +OLD_FILES+=usr/lib32/libatm_p.a +.endif # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -224,6 +235,42 @@ OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libalias.so.5 +OLD_LIBS+=usr/lib32/libbsnmp.so.3 +OLD_LIBS+=usr/lib32/libdialog.so.5 +OLD_LIBS+=usr/lib32/libgnuregex.so.3 +OLD_LIBS+=usr/lib32/libhistory.so.6 +OLD_LIBS+=usr/lib32/libncurses.so.6 +OLD_LIBS+=usr/lib32/libncursesw.so.6 +OLD_LIBS+=usr/lib32/libpam.so.3 +OLD_LIBS+=usr/lib32/libreadline.so.6 +OLD_LIBS+=usr/lib32/libssh.so.3 +OLD_LIBS+=usr/lib32/pam_chroot.so.3 +OLD_LIBS+=usr/lib32/pam_deny.so.3 +OLD_LIBS+=usr/lib32/pam_echo.so.3 +OLD_LIBS+=usr/lib32/pam_exec.so.3 +OLD_LIBS+=usr/lib32/pam_ftpusers.so.3 +OLD_LIBS+=usr/lib32/pam_group.so.3 +OLD_LIBS+=usr/lib32/pam_guest.so.3 +OLD_LIBS+=usr/lib32/pam_krb5.so.3 +OLD_LIBS+=usr/lib32/pam_ksu.so.3 +OLD_LIBS+=usr/lib32/pam_lastlog.so.3 +OLD_LIBS+=usr/lib32/pam_login_access.so.3 +OLD_LIBS+=usr/lib32/pam_nologin.so.3 +OLD_LIBS+=usr/lib32/pam_opie.so.3 +OLD_LIBS+=usr/lib32/pam_opieaccess.so.3 +OLD_LIBS+=usr/lib32/pam_passwdqc.so.3 +OLD_LIBS+=usr/lib32/pam_permit.so.3 +OLD_LIBS+=usr/lib32/pam_radius.so.3 +OLD_LIBS+=usr/lib32/pam_rhosts.so.3 +OLD_LIBS+=usr/lib32/pam_rootok.so.3 +OLD_LIBS+=usr/lib32/pam_securetty.so.3 +OLD_LIBS+=usr/lib32/pam_self.so.3 +OLD_LIBS+=usr/lib32/pam_ssh.so.3 +OLD_LIBS+=usr/lib32/pam_tacplus.so.3 +OLD_LIBS+=usr/lib32/pam_unix.so.3 +.endif # 20070613: IPX over IP tunnel removal OLD_FILES+=usr/include/netipx/ipx_ip.h # 20070605: sched_core removal @@ -603,6 +650,9 @@ OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=usr/lib/libarchive.so.3 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libarchive.so.3 +.endif # 20070301: remove addr2ascii and ascii2addr OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz ==== //depot/projects/mips2/src/UPDATING#11 (text+ko) ==== @@ -22,6 +22,20 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080301: + The layout of struct vmspace has changed. This affects libkvm + and any executables that link against libkvm and use the + kvm_getprocs() function. In particular, but not exclusively, + it affects ps(1), fstat(1), pkill(1), systat(1), top(1) and w(1). + The effects are minimal, but it's advisable to upgrade world + nonetheless. + +20080229: + The latest em driver no longer has support in it for the + 82575 adapter, this is now moved to the igb driver. The + split was done to make new features that are incompatible + with older hardware easier to do. + 20080220: The new geom_lvm(4) geom class has been renamed to geom_linux_lvm(4), likewise the kernel option is now GEOM_LINUX_LVM. @@ -983,4 +997,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.520 2008/02/20 07:50:12 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ ==== //depot/projects/mips2/src/bin/chflags/chflags.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.30 2008/03/09 12:10:24 rwatson Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -40,7 +40,7 @@ .Nd change file flags .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl fhv .Oo .Fl R .Op Fl H | Fl L | Fl P @@ -57,6 +57,12 @@ .Pp The options are as follows: .Bl -tag -width indent +.It Fl f +Do not display a diagnostic message if +.Nm +could not modify the flags for +.Va file , +nor modify the exit status to reflect such failures. .It Fl H If the .Fl R @@ -79,6 +85,14 @@ .It Fl R Change the file flags for the file hierarchies rooted in the files instead of just the files themselves. +.It Fl v +Cause +.Nm +to be verbose, showing filenames as the flags are modified. +If the +.Fl v +option is specified more than once, the old and new flags of the file +will also be printed, in octal notation. .El .Pp The flags are specified as an octal number or a comma separated list ==== //depot/projects/mips2/src/bin/chflags/chflags.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.24 2008/03/09 12:10:24 rwatson Exp $"); #include #include @@ -60,14 +60,15 @@ { FTS *ftsp; FTSENT *p; - u_long clear, set; + u_long clear, newflags, set; long val; - int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval; + int Hflag, Lflag, Rflag, fflag, hflag, vflag; + int ch, fts_options, oct, rval; char *flags, *ep; int (*change_flags)(const char *, unsigned long); - Hflag = Lflag = Rflag = hflag = 0; - while ((ch = getopt(argc, argv, "HLPRh")) != -1) + Hflag = Lflag = Rflag = fflag = hflag = vflag = 0; + while ((ch = getopt(argc, argv, "HLPRfhv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -83,9 +84,15 @@ case 'R': Rflag = 1; break; + case 'f': + fflag = 1; + break; case 'h': hflag = 1; break; + case 'v': + vflag++; + break; case '?': default: usage(); @@ -166,18 +173,23 @@ default: break; } - if (oct) { - if (!(*change_flags)(p->fts_accpath, set)) - continue; - } else { - p->fts_statp->st_flags |= set; - p->fts_statp->st_flags &= clear; - if (!(*change_flags)(p->fts_accpath, - (u_long)p->fts_statp->st_flags)) - continue; + if (oct) + newflags = set; + else + newflags = (p->fts_statp->st_flags | set) & clear; + if (newflags == p->fts_statp->st_flags) + continue; + if ((*change_flags)(p->fts_accpath, newflags) && !fflag) { + warn("%s", p->fts_path); + rval = 1; + } else if (vflag) { + (void)printf("%s", p->fts_path); + if (vflag > 1) + (void)printf(": 0%lo -> 0%lo", + (u_long)p->fts_statp->st_flags, + newflags); + (void)printf("\n"); } - warn("%s", p->fts_path); - rval = 1; } if (errno) err(1, "fts_read"); @@ -188,6 +200,6 @@ usage(void) { (void)fprintf(stderr, - "usage: chflags [-h] [-R [-H | -L | -P]] flags file ...\n"); + "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n"); exit(1); } ==== //depot/projects/mips2/src/bin/realpath/realpath.1#2 (text+ko) ==== @@ -31,7 +31,7 @@ .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp -.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.11 2008/03/09 12:46:39 rwatson Exp $ .\" .Dd November 24, 2000 .Dt REALPATH 1 @@ -41,7 +41,9 @@ .Nd return resolved physical path .Sh SYNOPSIS .Nm +.Op Fl q .Ar path +.Op Ar ... .Sh DESCRIPTION The .Nm @@ -55,6 +57,12 @@ .Pa /../ in .Ar path . +.Pp +If +.Fl q +is specified, warnings will not be printed when +.Xr realpath 3 +fails. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO ==== //depot/projects/mips2/src/bin/realpath/realpath.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6 2004/04/06 20:06:50 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.7 2008/03/09 12:46:39 rwatson Exp $"); #include @@ -44,20 +44,39 @@ { char buf[PATH_MAX]; char *p; + int ch, i, qflag, rval; - if (argc == 2) { - if ((p = realpath(argv[1], buf)) == NULL) - err(1, "%s", buf); - } else + qflag = 0; + while ((ch = getopt(argc, argv, "q")) != -1) { + switch (ch) { + case 'q': + qflag = 1; + break; + case '?': + default: + usage(); + } + } + argc -= optind; + argv += optind; + if (argc < 1) usage(); - (void)printf("%s\n", p); - exit(0); + rval = 0; + for (i = 0; i < argc; i++) { + if ((p = realpath(argv[i], buf)) == NULL) { + if (!qflag) + warn("%s", argv[i]); + rval = 1; + } else + (void)printf("%s\n", p); + } + exit(rval); } static void usage(void) { - (void)fprintf(stderr, "usage: realpath path\n"); + (void)fprintf(stderr, "usage: realpath [-q] path [...]\n"); exit(1); } ==== //depot/projects/mips2/src/contrib/bsnmp/snmpd/main.c#2 (text+ko) ==== @@ -2242,6 +2242,8 @@ return (m); err: + if ((m->flags & LM_ONSTARTLIST) != 0) + TAILQ_REMOVE(&modules_start, m, start); if (m->handle) dlclose(m->handle); free(m->path); ==== //depot/projects/mips2/src/etc/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.365 2007/11/11 01:16:51 mlaier Exp $ +# $FreeBSD: src/etc/Makefile,v 1.366 2008/03/05 18:32:58 brooks Exp $ .include @@ -9,7 +9,7 @@ BIN1= amd.map apmd.conf auth.conf \ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ - dhclient.conf disktab fbtab freebsd-update.conf \ + ddb.conf dhclient.conf disktab fbtab freebsd-update.conf \ ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf libalias.conf login.access login.conf mac.conf motd \ ==== //depot/projects/mips2/src/etc/defaults/rc.conf#8 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.326 2008/01/27 15:15:11 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -33,6 +33,8 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). +ddb_enable="NO" # Set to YES to load ddb scripts at boot. +ddb_config="/etc/ddb.conf" # ddb(8) config file. devd_enable="YES" # Run devd, to trigger programs on device tree changes. devd_flags="" # Additional flags for devd(8). kldxref_enable="NO" # Build linker.hints files with kldxref(8). @@ -249,7 +251,7 @@ rwhod_enable="NO" # Run the rwho daemon (or NO). rwhod_flags="" # Flags for rwhod rarpd_enable="NO" # Run rarpd (or NO). -rarpd_flags="" # Flags to rarpd. +rarpd_flags="-a" # Flags to rarpd. bootparamd_enable="NO" # Run bootparamd (or NO). bootparamd_flags="" # Flags to bootparamd pppoed_enable="NO" # Run the PPP over Ethernet daemon. ==== //depot/projects/mips2/src/etc/rc.d/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.88 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ .include @@ -7,7 +7,7 @@ apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ccd cleanvar cleartmp cron \ - devd devfs dhclient \ + ddb devd devfs dhclient \ dmesg dumpon \ early.sh encswap \ fsck ftp-proxy ftpd \ ==== //depot/projects/mips2/src/etc/rc.d/mountcritlocal#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.15 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.16 2008/03/06 14:39:33 mtm Exp $ # # PROVIDE: mountcritlocal @@ -15,6 +15,8 @@ mountcritlocal_start() { + local err + # Set up the list of network filesystem types for which mounting # should be delayed until after network initialization. case ${extra_netfs_types} in @@ -34,9 +36,10 @@ done mount_excludes=${mount_excludes%,} mount -a -t ${mount_excludes} + err=$? >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 10 21:48:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CE691065677; Mon, 10 Mar 2008 21:48:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4AF801065675 for ; Mon, 10 Mar 2008 21:48:34 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 20EA58FC27 for ; Mon, 10 Mar 2008 21:48:34 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2ALmYuv052388 for ; Mon, 10 Mar 2008 21:48:34 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2ALmXT1052386 for perforce@freebsd.org; Mon, 10 Mar 2008 21:48:33 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Mar 2008 21:48:33 GMT Message-Id: <200803102148.m2ALmXT1052386@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 137358 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, 10 Mar 2008 21:48:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=137358 Change 137358 by imp@imp_paco-paco on 2008/03/10 21:48:03 IFmips2 @137352 (IFC'd to 137347) Affected files ... .. //depot/projects/mips2-jnpr/src/Makefile.inc1#8 integrate .. //depot/projects/mips2-jnpr/src/ObsoleteFiles.inc#3 integrate .. //depot/projects/mips2-jnpr/src/UPDATING#3 integrate .. //depot/projects/mips2-jnpr/src/bin/chflags/chflags.1#2 integrate .. //depot/projects/mips2-jnpr/src/bin/chflags/chflags.c#2 integrate .. //depot/projects/mips2-jnpr/src/bin/realpath/realpath.1#2 integrate .. //depot/projects/mips2-jnpr/src/bin/realpath/realpath.c#2 integrate .. //depot/projects/mips2-jnpr/src/bin/uuidgen/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/mips2-jnpr/src/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/mips2-jnpr/src/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/mips2-jnpr/src/etc/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/etc/ddb.conf#1 branch .. //depot/projects/mips2-jnpr/src/etc/defaults/rc.conf#3 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/ddb#1 branch .. //depot/projects/mips2-jnpr/src/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/mountlate#2 integrate .. //depot/projects/mips2-jnpr/src/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ar/Makefile#4 integrate .. //depot/projects/mips2-jnpr/src/gnu/usr.bin/binutils/ranlib/Makefile#4 integrate .. //depot/projects/mips2-jnpr/src/include/pthread_np.h#3 integrate .. //depot/projects/mips2-jnpr/src/include/unistd.h#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_util.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/posix1e/mac.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/posix1e/mac_exec.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/posix1e/mac_get.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/posix1e/mac_set.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/stdio/fdopen.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/stdio/fopen.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/stdio/freopen.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/stdlib/getenv.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/Symbol.map#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/mq_close.2#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/mq_getattr.2#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/mq_notify.2#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/mq_open.2#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/mq_receive.2#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/mq_send.2#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/mq_setattr.2#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/readlink.2#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libelf/elf_update.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libelf/gelf_rel.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libelf/gelf_rela.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/pthread.map#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/Makefile.inc#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_affinity.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_attr.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libutil/humanize_number.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/Symbol.map#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/amd64/Makefile.inc#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/amd64/e_sqrtl.S#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/i387/Makefile.inc#3 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/i387/e_sqrtl.S#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/ld128/s_nanl.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/man/sqrt.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_rem_pio2.c#5 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_rem_pio2f.c#5 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_sqrt.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/msun/src/e_sqrtl.c#1 branch .. //depot/projects/mips2-jnpr/src/lib/msun/src/math.h#3 integrate .. //depot/projects/mips2-jnpr/src/rescue/rescue/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/ddb/ddb.8#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/ddb/ddb.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/fsck_ffs/main.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/geom/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/geom/class/label/geom_label.c#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/geom/class/multipath/gmultipath.8#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/geom/core/geom.8#3 integrate .. //depot/projects/mips2-jnpr/src/sbin/geom/core/geom.c#3 integrate .. //depot/projects/mips2-jnpr/src/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/mips2-jnpr/src/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/mips2-jnpr/src/sbin/mount/mount.8#2 integrate .. //depot/projects/mips2-jnpr/src/sbin/newfs/mkfs.c#2 integrate .. //depot/projects/mips2-jnpr/src/secure/usr.bin/ssh/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man3/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/cmx.4#1 branch .. //depot/projects/mips2-jnpr/src/share/man/man4/ddb.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/fwohci.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/ng_nat.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/uchcom.4#1 branch .. //depot/projects/mips2-jnpr/src/share/man/man4/ucom.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/ucycom.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/uscanner.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/uslcom.4#1 branch .. //depot/projects/mips2-jnpr/src/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/DEVICE_PROBE.9#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/bus_space.9#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/insmntque.9#1 branch .. //depot/projects/mips2-jnpr/src/share/man/man9/lock.9#4 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/vfs_mountedfrom.9#1 branch .. //depot/projects/mips2-jnpr/src/share/man/man9/vgone.9#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/vhold.9#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/vput.9#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/vref.9#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man9/vrefcnt.9#1 branch .. //depot/projects/mips2-jnpr/src/share/man/man9/vrele.9#2 integrate .. //depot/projects/mips2-jnpr/src/share/misc/bsd-family-tree#3 integrate .. //depot/projects/mips2-jnpr/src/share/misc/committers-doc.dot#2 integrate .. //depot/projects/mips2-jnpr/src/share/misc/committers-ports.dot#3 integrate .. //depot/projects/mips2-jnpr/src/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/mips2-jnpr/src/share/mk/sys.mk#2 integrate .. //depot/projects/mips2-jnpr/src/share/zoneinfo/leapseconds#3 integrate .. //depot/projects/mips2-jnpr/src/share/zoneinfo/southamerica#3 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/include/smp.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/conf/AVILA#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/include/pmap.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/NOTES#4 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/files#5 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/files.powerpc#3 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/kmod.mk#2 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/ldscript.powerpc#2 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/options#3 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/options.powerpc#3 integrate .. //depot/projects/mips2-jnpr/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/ddb/db_examine.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/ddb/db_input.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/bin2h.pl#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/mips2-jnpr/src/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/LICENSE#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_82540.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_82541.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_82541.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_82542.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_82543.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_82543.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_82571.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_82571.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_82575.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_82575.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_api.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_api.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_defines.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_hw.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_mac.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_mac.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_manage.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_manage.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_phy.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_phy.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/e1000_regs.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/hptrr/hptrr_os_bsd.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/hptrr/ldm.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/hptrr/osm.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/ic/quicc.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_82575.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_82575.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_api.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_api.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_defines.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_hw.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_mac.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_mac.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_manage.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_manage.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_nvm.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_nvm.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_osdep.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_phy.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_phy.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/e1000_regs.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/if_igb.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/igb/if_igb.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/md/md.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/mii/miidevs#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/quicc/quicc_core.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/scc/scc_bus.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/tsec/if_tsec.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/tsec/if_tsec.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/uart/uart.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/uart/uart_bus_scc.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/usb/ubsa.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/usb/uslcom.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/fs/nwfs/nwfs_node.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/geom/part/g_part_vtoc8.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/include/_types.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/include/float.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/include/smp.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/init_main.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_cpuset.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_lock.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_priv.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/sched_ule.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/subr_bus.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/subr_smp.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/syscalls.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/systrace_args.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/cmx/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/sys/modules/cxgb/cxgb/Makefile#4 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/em/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/geom/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/geom/geom_apple/Makefile#2 delete .. //depot/projects/mips2-jnpr/src/sys/modules/geom/geom_gpt/Makefile#2 delete .. //depot/projects/mips2-jnpr/src/sys/modules/geom/geom_part/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/sys/modules/igb/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/sys/modules/ipfw_nat/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/sys/modules/uslcom/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/sys/net/bpf_filter.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/net/if.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/net/if_gif.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netgraph/ng_nat.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/in.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/ip_fw_nat.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/libalias/alias.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/libalias/alias_proxy.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/libalias/alias_smedia.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netipsec/key.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netipsec/key_debug.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netncp/ncp_conn.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netsmb/smb_conn.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/nfs4client/nfs4_idmap.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/mips2-jnpr/src/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/aim/trap_subr.S#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/clock.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/copyinout.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/interrupt.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/locore.S#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/machdep.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/pmap.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/support.S#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/swtch.S#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/trap.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/trap_subr.S#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/uio_machdep.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/vm_machdep.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/conf/MPC85XX#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/conf/NOTES#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/frame.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/hid.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/intr_machdep.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/kdb.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/mmuvar.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/ocpbus.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/openpicvar.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/psl.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/pte.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/sf_buf.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/spr.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/tlb.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/trap.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/trap_aim.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/trap_booke.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/mpc85xx/nexus.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/mpc85xx/ocpbus.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/mpc85xx/ocpbus.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/mpc85xx/opic.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/mpc85xx/pci_ocp.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/powerpc/powermac/openpic_macio.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/powerpc/autoconf.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/powerpc/gdb_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/powerpc/openpic.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/powerpc/pic_if.m#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_bsm_klib.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_syscalls.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/include/tlb.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/_types.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/buf.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/bufobj.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/bus.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/cpuset.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/sys/fcntl.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/lockmgr.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/mount.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/param.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/pcpu.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/proc.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/sched.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/smp.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/syscall.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/syscall.mk#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/sysproto.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/types.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/vnode.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/vtoc.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/ufs/ufs/extattr.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/vm/vm_map.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/vm/vm_object.c#3 integrate .. //depot/projects/mips2-jnpr/src/tools/build/mk/OptionalObsoleteFiles.inc#3 integrate .. //depot/projects/mips2-jnpr/src/tools/regression/environ/envctl.c#2 integrate .. //depot/projects/mips2-jnpr/src/tools/regression/file/dup/dup.c#2 integrate .. //depot/projects/mips2-jnpr/src/tools/regression/lib/msun/test-trig.c#2 integrate .. //depot/projects/mips2-jnpr/src/tools/tools/tinybsd/tinybsd#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/Makefile#4 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/ar/write.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/awk/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/chat/chat.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/cpuset/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/usr.bin/cpuset/cpuset.1#1 branch .. //depot/projects/mips2-jnpr/src/usr.bin/cpuset/cpuset.c#1 branch .. //depot/projects/mips2-jnpr/src/usr.bin/find/find.1#3 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/find/main.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/gzip/gzip.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/make/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/make/Makefile.dist#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/make/arch.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/make/job.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/make/main.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/make/make.1#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/unifdef/unifdef.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/Makefile.inc#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/fifolog_create/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/flint.lnt#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/lib/Makefile#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/lib/fifolog.h#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/lib/fifolog_create.c#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/lib/fifolog_int.c#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/lib/fifolog_write.h#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/lib/getdate.y#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/lib/libfifolog.h#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fifolog/lib/miniobj.h#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/fwcontrol/fwcontrol.8#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/fwcontrol/fwcontrol.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/moused/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/moused/moused.c#2 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/Makefile.inc1#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.600 2008/02/25 16:29:54 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -196,6 +196,9 @@ GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac +.if ${OSRELDATE} < 700044 +CROSSENV+= AR=gnu-ar RANLIB=gnu-ranlib +.endif # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -948,10 +951,6 @@ .endif .endif -.if make(cross-tools) && ${BOOTSTRAPPING} < 700044 -.MAKEFLAGS+= -D_WITH_GNUAR -.endif - cross-tools: .for _tool in \ gnu/usr.bin/binutils \ ==== //depot/projects/mips2-jnpr/src/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -32,6 +32,11 @@ OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libkse.a +OLD_FILES+=usr/lib32/libkse_p.a +OLD_FILES+=usr/lib32/libkse_pic.a +.endif .endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h @@ -134,6 +139,12 @@ OLD_DIRS+=usr/include/netatm/uni OLD_DIRS+=usr/include/netatm OLD_DIRS+=usr/share/examples/atm +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libatm.a +OLD_FILES+=usr/lib32/libatm.so +OLD_LIBS+=usr/lib32/libatm.so.5 +OLD_FILES+=usr/lib32/libatm_p.a +.endif # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -224,6 +235,42 @@ OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libalias.so.5 +OLD_LIBS+=usr/lib32/libbsnmp.so.3 +OLD_LIBS+=usr/lib32/libdialog.so.5 +OLD_LIBS+=usr/lib32/libgnuregex.so.3 +OLD_LIBS+=usr/lib32/libhistory.so.6 +OLD_LIBS+=usr/lib32/libncurses.so.6 +OLD_LIBS+=usr/lib32/libncursesw.so.6 +OLD_LIBS+=usr/lib32/libpam.so.3 +OLD_LIBS+=usr/lib32/libreadline.so.6 +OLD_LIBS+=usr/lib32/libssh.so.3 +OLD_LIBS+=usr/lib32/pam_chroot.so.3 +OLD_LIBS+=usr/lib32/pam_deny.so.3 +OLD_LIBS+=usr/lib32/pam_echo.so.3 +OLD_LIBS+=usr/lib32/pam_exec.so.3 +OLD_LIBS+=usr/lib32/pam_ftpusers.so.3 +OLD_LIBS+=usr/lib32/pam_group.so.3 +OLD_LIBS+=usr/lib32/pam_guest.so.3 +OLD_LIBS+=usr/lib32/pam_krb5.so.3 +OLD_LIBS+=usr/lib32/pam_ksu.so.3 +OLD_LIBS+=usr/lib32/pam_lastlog.so.3 +OLD_LIBS+=usr/lib32/pam_login_access.so.3 +OLD_LIBS+=usr/lib32/pam_nologin.so.3 +OLD_LIBS+=usr/lib32/pam_opie.so.3 +OLD_LIBS+=usr/lib32/pam_opieaccess.so.3 +OLD_LIBS+=usr/lib32/pam_passwdqc.so.3 +OLD_LIBS+=usr/lib32/pam_permit.so.3 +OLD_LIBS+=usr/lib32/pam_radius.so.3 +OLD_LIBS+=usr/lib32/pam_rhosts.so.3 +OLD_LIBS+=usr/lib32/pam_rootok.so.3 +OLD_LIBS+=usr/lib32/pam_securetty.so.3 +OLD_LIBS+=usr/lib32/pam_self.so.3 +OLD_LIBS+=usr/lib32/pam_ssh.so.3 +OLD_LIBS+=usr/lib32/pam_tacplus.so.3 +OLD_LIBS+=usr/lib32/pam_unix.so.3 +.endif # 20070613: IPX over IP tunnel removal OLD_FILES+=usr/include/netipx/ipx_ip.h # 20070605: sched_core removal @@ -603,6 +650,9 @@ OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=usr/lib/libarchive.so.3 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libarchive.so.3 +.endif # 20070301: remove addr2ascii and ascii2addr OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz ==== //depot/projects/mips2-jnpr/src/UPDATING#3 (text+ko) ==== @@ -22,6 +22,20 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080301: + The layout of struct vmspace has changed. This affects libkvm + and any executables that link against libkvm and use the + kvm_getprocs() function. In particular, but not exclusively, + it affects ps(1), fstat(1), pkill(1), systat(1), top(1) and w(1). + The effects are minimal, but it's advisable to upgrade world + nonetheless. + +20080229: + The latest em driver no longer has support in it for the + 82575 adapter, this is now moved to the igb driver. The + split was done to make new features that are incompatible + with older hardware easier to do. + 20080220: The new geom_lvm(4) geom class has been renamed to geom_linux_lvm(4), likewise the kernel option is now GEOM_LINUX_LVM. @@ -983,4 +997,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.520 2008/02/20 07:50:12 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ ==== //depot/projects/mips2-jnpr/src/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.29 2007/05/28 04:23:09 pjd Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.30 2008/03/09 12:10:24 rwatson Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -40,7 +40,7 @@ .Nd change file flags .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl fhv .Oo .Fl R .Op Fl H | Fl L | Fl P @@ -57,6 +57,12 @@ .Pp The options are as follows: .Bl -tag -width indent +.It Fl f +Do not display a diagnostic message if +.Nm +could not modify the flags for +.Va file , +nor modify the exit status to reflect such failures. .It Fl H If the .Fl R @@ -79,6 +85,14 @@ .It Fl R Change the file flags for the file hierarchies rooted in the files instead of just the files themselves. +.It Fl v +Cause +.Nm +to be verbose, showing filenames as the flags are modified. +If the +.Fl v +option is specified more than once, the old and new flags of the file +will also be printed, in octal notation. .El .Pp The flags are specified as an octal number or a comma separated list ==== //depot/projects/mips2-jnpr/src/bin/chflags/chflags.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.24 2008/03/09 12:10:24 rwatson Exp $"); #include #include @@ -60,14 +60,15 @@ { FTS *ftsp; FTSENT *p; - u_long clear, set; + u_long clear, newflags, set; long val; - int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval; + int Hflag, Lflag, Rflag, fflag, hflag, vflag; + int ch, fts_options, oct, rval; char *flags, *ep; int (*change_flags)(const char *, unsigned long); - Hflag = Lflag = Rflag = hflag = 0; - while ((ch = getopt(argc, argv, "HLPRh")) != -1) + Hflag = Lflag = Rflag = fflag = hflag = vflag = 0; + while ((ch = getopt(argc, argv, "HLPRfhv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -83,9 +84,15 @@ case 'R': Rflag = 1; break; + case 'f': + fflag = 1; + break; case 'h': hflag = 1; break; + case 'v': + vflag++; + break; case '?': default: usage(); @@ -166,18 +173,23 @@ default: break; } - if (oct) { - if (!(*change_flags)(p->fts_accpath, set)) - continue; - } else { - p->fts_statp->st_flags |= set; - p->fts_statp->st_flags &= clear; - if (!(*change_flags)(p->fts_accpath, - (u_long)p->fts_statp->st_flags)) - continue; + if (oct) + newflags = set; + else + newflags = (p->fts_statp->st_flags | set) & clear; + if (newflags == p->fts_statp->st_flags) + continue; + if ((*change_flags)(p->fts_accpath, newflags) && !fflag) { + warn("%s", p->fts_path); + rval = 1; + } else if (vflag) { + (void)printf("%s", p->fts_path); + if (vflag > 1) + (void)printf(": 0%lo -> 0%lo", + (u_long)p->fts_statp->st_flags, + newflags); + (void)printf("\n"); } - warn("%s", p->fts_path); - rval = 1; } if (errno) err(1, "fts_read"); @@ -188,6 +200,6 @@ usage(void) { (void)fprintf(stderr, - "usage: chflags [-h] [-R [-H | -L | -P]] flags file ...\n"); + "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n"); exit(1); } ==== //depot/projects/mips2-jnpr/src/bin/realpath/realpath.1#2 (text+ko) ==== @@ -31,7 +31,7 @@ .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp -.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.11 2008/03/09 12:46:39 rwatson Exp $ .\" .Dd November 24, 2000 .Dt REALPATH 1 @@ -41,7 +41,9 @@ .Nd return resolved physical path .Sh SYNOPSIS .Nm +.Op Fl q .Ar path +.Op Ar ... .Sh DESCRIPTION The .Nm @@ -55,6 +57,12 @@ .Pa /../ in .Ar path . +.Pp +If +.Fl q +is specified, warnings will not be printed when +.Xr realpath 3 +fails. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO ==== //depot/projects/mips2-jnpr/src/bin/realpath/realpath.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6 2004/04/06 20:06:50 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.7 2008/03/09 12:46:39 rwatson Exp $"); #include @@ -44,20 +44,39 @@ { char buf[PATH_MAX]; char *p; + int ch, i, qflag, rval; - if (argc == 2) { - if ((p = realpath(argv[1], buf)) == NULL) - err(1, "%s", buf); - } else + qflag = 0; + while ((ch = getopt(argc, argv, "q")) != -1) { + switch (ch) { + case 'q': + qflag = 1; + break; + case '?': + default: + usage(); + } + } + argc -= optind; + argv += optind; + if (argc < 1) usage(); - (void)printf("%s\n", p); - exit(0); + rval = 0; + for (i = 0; i < argc; i++) { + if ((p = realpath(argv[i], buf)) == NULL) { + if (!qflag) + warn("%s", argv[i]); + rval = 1; + } else + (void)printf("%s\n", p); + } + exit(rval); } static void usage(void) { - (void)fprintf(stderr, "usage: realpath path\n"); + (void)fprintf(stderr, "usage: realpath [-q] path [...]\n"); exit(1); } ==== //depot/projects/mips2-jnpr/src/contrib/bsnmp/snmpd/main.c#2 (text+ko) ==== @@ -2242,6 +2242,8 @@ return (m); err: + if ((m->flags & LM_ONSTARTLIST) != 0) + TAILQ_REMOVE(&modules_start, m, start); if (m->handle) dlclose(m->handle); free(m->path); ==== //depot/projects/mips2-jnpr/src/etc/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.365 2007/11/11 01:16:51 mlaier Exp $ +# $FreeBSD: src/etc/Makefile,v 1.366 2008/03/05 18:32:58 brooks Exp $ .include @@ -9,7 +9,7 @@ BIN1= amd.map apmd.conf auth.conf \ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ - dhclient.conf disktab fbtab freebsd-update.conf \ + ddb.conf dhclient.conf disktab fbtab freebsd-update.conf \ ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf libalias.conf login.access login.conf mac.conf motd \ ==== //depot/projects/mips2-jnpr/src/etc/defaults/rc.conf#3 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.326 2008/01/27 15:15:11 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -33,6 +33,8 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). +ddb_enable="NO" # Set to YES to load ddb scripts at boot. +ddb_config="/etc/ddb.conf" # ddb(8) config file. devd_enable="YES" # Run devd, to trigger programs on device tree changes. devd_flags="" # Additional flags for devd(8). kldxref_enable="NO" # Build linker.hints files with kldxref(8). @@ -249,7 +251,7 @@ rwhod_enable="NO" # Run the rwho daemon (or NO). rwhod_flags="" # Flags for rwhod rarpd_enable="NO" # Run rarpd (or NO). -rarpd_flags="" # Flags to rarpd. +rarpd_flags="-a" # Flags to rarpd. bootparamd_enable="NO" # Run bootparamd (or NO). bootparamd_flags="" # Flags to bootparamd pppoed_enable="NO" # Run the PPP over Ethernet daemon. ==== //depot/projects/mips2-jnpr/src/etc/rc.d/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.88 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ .include @@ -7,7 +7,7 @@ apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ccd cleanvar cleartmp cron \ - devd devfs dhclient \ + ddb devd devfs dhclient \ dmesg dumpon \ early.sh encswap \ fsck ftp-proxy ftpd \ ==== //depot/projects/mips2-jnpr/src/etc/rc.d/mountcritlocal#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.15 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.16 2008/03/06 14:39:33 mtm Exp $ # # PROVIDE: mountcritlocal @@ -15,6 +15,8 @@ mountcritlocal_start() { + local err + # Set up the list of network filesystem types for which mounting # should be delayed until after network initialization. case ${extra_netfs_types} in @@ -34,9 +36,10 @@ done mount_excludes=${mount_excludes%,} mount -a -t ${mount_excludes} + err=$? >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 10 22:10:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94A791065675; Mon, 10 Mar 2008 22:10:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 53DF61065673 for ; Mon, 10 Mar 2008 22:10:59 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A7ED8FC16 for ; Mon, 10 Mar 2008 22:10:59 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AMAxTU054315 for ; Mon, 10 Mar 2008 22:10:59 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AMAxeM054313 for perforce@freebsd.org; Mon, 10 Mar 2008 22:10:59 GMT (envelope-from sam@freebsd.org) Date: Mon, 10 Mar 2008 22:10:59 GMT Message-Id: <200803102210.m2AMAxeM054313@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 137360 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, 10 Mar 2008 22:11:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=137360 Change 137360 by sam@sam_ebb on 2008/03/10 22:10:52 don't fudge on ht rates; expand the table to have entries for the various combinations: ht20/ht40 x short/long GI Submitted by: Chris Zimmerman Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211.c#29 edit .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#18 edit .. //depot/projects/vap/sys/net80211/ieee80211_ht.h#11 edit .. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#21 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211.c#29 (text+ko) ==== @@ -907,8 +907,8 @@ IEEE80211_MODE_AUTO, IFM_IEEE80211_MCS); /* XXX could walk htrates */ /* XXX known array size */ - if (ieee80211_htrates[15] > maxrate) - maxrate = ieee80211_htrates[15]; + if (ieee80211_htrates[15].ht40_rate_400ns > maxrate) + maxrate = ieee80211_htrates[15].ht40_rate_400ns; } return maxrate; } ==== //depot/projects/vap/sys/net80211/ieee80211_ht.c#18 (text+ko) ==== @@ -53,32 +53,28 @@ #define MS(_v, _f) (((_v) & _f) >> _f##_S) #define SM(_v, _f) (((_v) << _f##_S) & _f) -/* XXX need max array size */ -/* NB: these are for HT20 w/ long GI */ -const int ieee80211_htrates[16] = { - 13, /* IFM_IEEE80211_MCS0 */ - 26, /* IFM_IEEE80211_MCS1 */ - 39, /* IFM_IEEE80211_MCS2 */ - 52, /* IFM_IEEE80211_MCS3 */ - 78, /* IFM_IEEE80211_MCS4 */ - 104, /* IFM_IEEE80211_MCS5 */ - 117, /* IFM_IEEE80211_MCS6 */ - 130, /* IFM_IEEE80211_MCS7 */ - 26, /* IFM_IEEE80211_MCS8 */ - 52, /* IFM_IEEE80211_MCS9 */ - 78, /* IFM_IEEE80211_MCS10 */ - 104, /* IFM_IEEE80211_MCS11 */ - 156, /* IFM_IEEE80211_MCS12 */ - 208, /* IFM_IEEE80211_MCS13 */ - 234, /* IFM_IEEE80211_MCS14 */ - 260, /* IFM_IEEE80211_MCS15 */ +const struct ieee80211_mcs_rates ieee80211_htrates[16] = { + { 13, 14, 27, 30 }, /* MCS 0 */ + { 26, 29, 54, 60 }, /* MCS 1 */ + { 39, 43, 81, 90 }, /* MCS 2 */ + { 52, 58, 108, 120 }, /* MCS 3 */ + { 78, 87, 162, 180 }, /* MCS 4 */ + { 104, 116, 216, 240 }, /* MCS 5 */ + { 117, 130, 243, 270 }, /* MCS 6 */ + { 130, 144, 270, 300 }, /* MCS 7 */ + { 26, 29, 54, 60 }, /* MCS 8 */ + { 52, 58, 108, 120 }, /* MCS 9 */ + { 78, 87, 162, 180 }, /* MCS 10 */ + { 104, 116, 216, 240 }, /* MCS 11 */ + { 156, 173, 324, 360 }, /* MCS 12 */ + { 208, 231, 432, 480 }, /* MCS 13 */ + { 234, 260, 486, 540 }, /* MCS 14 */ + { 260, 289, 540, 600 } /* MCS 15 */ }; static const struct ieee80211_htrateset ieee80211_rateset_11n = { 16, { - /* MCS: 6.5 13 19.5 26 39 52 58.5 65 13 26 */ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - /* 39 52 78 104 117, 130 */ 10, 11, 12, 13, 14, 15 } }; @@ -201,7 +197,7 @@ rs->rs_rates[i] | IEEE80211_RATE_MCS, mode); if (IFM_SUBTYPE(mword) != IFM_IEEE80211_MCS) continue; - rate = ieee80211_htrates[rs->rs_rates[i]]; + rate = ieee80211_htrates[rs->rs_rates[i]].ht40_rate_400ns; printf("%s%d%sMbps", (i != 0 ? " " : ""), rate / 2, ((rate & 0x1) != 0 ? ".5" : "")); } ==== //depot/projects/vap/sys/net80211/ieee80211_ht.h#11 (text+ko) ==== @@ -148,7 +148,13 @@ void ieee80211_ht_announce(struct ieee80211com *); -extern const int ieee80211_htrates[16]; +struct ieee80211_mcs_rates { + uint16_t ht20_rate_800ns; + uint16_t ht20_rate_400ns; + uint16_t ht40_rate_800ns; + uint16_t ht40_rate_400ns; +}; +extern const struct ieee80211_mcs_rates ieee80211_htrates[16]; const struct ieee80211_htrateset *ieee80211_get_suphtrates( struct ieee80211com *, const struct ieee80211_channel *); ==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#21 (text+ko) ==== @@ -694,10 +694,12 @@ for (i = 15; i >= 0 && isclr(htcap->hc_mcsset, i); i--) ; if (i >= 0) { - rmax = ieee80211_htrates[i]; caps = LE_READ_2(&htcap->hc_cap); + /* XXX short/long GI */ if (caps & IEEE80211_HTCAP_CHWIDTH40) - rmax *= 2; + rmax = ieee80211_htrates[i].ht40_rate_400ns; + else + rmax = ieee80211_htrates[i].ht40_rate_800ns; } } for (i = 0; i < se->se_rates[1]; i++) { From owner-p4-projects@FreeBSD.ORG Mon Mar 10 22:13:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D22B81065675; Mon, 10 Mar 2008 22:13:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90D8D106566B for ; Mon, 10 Mar 2008 22:13:01 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 678048FC16 for ; Mon, 10 Mar 2008 22:13:01 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AMD1K5054368 for ; Mon, 10 Mar 2008 22:13:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AMD1p4054366 for perforce@freebsd.org; Mon, 10 Mar 2008 22:13:01 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Mar 2008 22:13:01 GMT Message-Id: <200803102213.m2AMD1p4054366@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 137361 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, 10 Mar 2008 22:13:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=137361 Change 137361 by imp@imp_paco-paco on 2008/03/10 22:12:07 Add mips Affected files ... .. //depot/projects/mips2-jnpr/src/share/mk/bsd.cpu.mk#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/share/mk/bsd.cpu.mk#3 (text+ko) ==== @@ -67,6 +67,7 @@ # http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html # http://gcc.gnu.org/onlinedocs/gcc/IA-64-Options.html # http://gcc.gnu.org/onlinedocs/gcc/RS-6000-and-PowerPC-Options.html +# http://gcc.gnu.org/onlinedocs/gcc/MIPS-Options.html # http://gcc.gnu.org/onlinedocs/gcc/SPARC-Options.html # http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86-64-Options.html From owner-p4-projects@FreeBSD.ORG Mon Mar 10 22:15:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD9A11065670; Mon, 10 Mar 2008 22:15:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21ABD106566B for ; Mon, 10 Mar 2008 22:15:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E6A708FC1C for ; Mon, 10 Mar 2008 22:15:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AMF3W4054436 for ; Mon, 10 Mar 2008 22:15:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AMF32L054434 for perforce@freebsd.org; Mon, 10 Mar 2008 22:15:03 GMT (envelope-from sam@freebsd.org) Date: Mon, 10 Mar 2008 22:15:03 GMT Message-Id: <200803102215.m2AMF32L054434@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 137362 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, 10 Mar 2008 22:15:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=137362 Change 137362 by sam@sam_ebb on 2008/03/10 22:14:10 Report the current tx rate in .5 Mb/s units so user code doesn't need to know about channel width and short/long GI for ht operation; this is still not entirely accurate as these parameters can vary per-packet so we could maintain a running rate based on recent packets but since this is really for reporting a subjective value to user space this will do for now. Note there is no abi change as there was a hole in the sta info structure this new field fits in and we intentionally leave the old data so old code will work. Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#41 edit .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#16 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#41 (text+ko) ==== @@ -399,6 +399,22 @@ si->isi_nrates = 15; memcpy(si->isi_rates, ni->ni_rates.rs_rates, si->isi_nrates); si->isi_txrate = ni->ni_txrate; + if (si->isi_txrate & IEEE80211_RATE_MCS) { + const struct ieee80211_mcs_rates *mcs = + &ieee80211_htrates[ni->ni_txrate &~ IEEE80211_RATE_MCS]; + if (IEEE80211_IS_CHAN_HT40(ni->ni_chan)) { + if (ni->ni_htcap & IEEE80211_HTCAP_SHORTGI40) + si->isi_txmbps = mcs->ht40_rate_800ns; + else + si->isi_txmbps = mcs->ht40_rate_400ns; + } else { + if (ni->ni_htcap & IEEE80211_HTCAP_SHORTGI20) + si->isi_txmbps = mcs->ht20_rate_800ns; + else + si->isi_txmbps = mcs->ht20_rate_400ns; + } + } else + si->isi_txmbps = si->isi_txrate; si->isi_associd = ni->ni_associd; si->isi_txpower = ni->ni_txpower; si->isi_vlan = ni->ni_vlan; ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#16 (text+ko) ==== @@ -363,6 +363,7 @@ uint16_t isi_txseqs[IEEE80211_TID_SIZE];/* tx seq #/TID */ uint16_t isi_rxseqs[IEEE80211_TID_SIZE];/* rx seq#/TID */ uint16_t isi_inact; /* inactivity timer */ + uint16_t isi_txmbps; /* current tx rate in .5 Mb/s */ uint32_t isi_jointime; /* time of assoc/join */ struct ieee80211_mimo_info isi_mimo; /* MIMO info for 11n sta's */ /* XXX frag state? */ From owner-p4-projects@FreeBSD.ORG Mon Mar 10 22:16:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B51551065675; Mon, 10 Mar 2008 22:16:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73CEF1065671 for ; Mon, 10 Mar 2008 22:16:05 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4A0C18FC15 for ; Mon, 10 Mar 2008 22:16:05 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AMG5vW054470 for ; Mon, 10 Mar 2008 22:16:05 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AMG5WC054468 for perforce@freebsd.org; Mon, 10 Mar 2008 22:16:05 GMT (envelope-from sam@freebsd.org) Date: Mon, 10 Mar 2008 22:16:05 GMT Message-Id: <200803102216.m2AMG5WC054468@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 137363 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, 10 Mar 2008 22:16:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=137363 Change 137363 by sam@sam_ebb on 2008/03/10 22:15:31 use the new sta info data for the current tx rate so we can more accurately report ht rates Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#13 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifieee80211.c#13 (text+ko) ==== @@ -161,26 +161,6 @@ "sturbo", "11na", "11ng" }; -/* XXX need max array size */ -static const int htrates[16] = { - 13, /* IFM_IEEE80211_MCS0 */ - 26, /* IFM_IEEE80211_MCS1 */ - 39, /* IFM_IEEE80211_MCS2 */ - 52, /* IFM_IEEE80211_MCS3 */ - 78, /* IFM_IEEE80211_MCS4 */ - 104, /* IFM_IEEE80211_MCS5 */ - 117, /* IFM_IEEE80211_MCS6 */ - 130, /* IFM_IEEE80211_MCS7 */ - 26, /* IFM_IEEE80211_MCS8 */ - 52, /* IFM_IEEE80211_MCS9 */ - 78, /* IFM_IEEE80211_MCS10 */ - 104, /* IFM_IEEE80211_MCS11 */ - 156, /* IFM_IEEE80211_MCS12 */ - 208, /* IFM_IEEE80211_MCS13 */ - 234, /* IFM_IEEE80211_MCS14 */ - 260, /* IFM_IEEE80211_MCS15 */ -}; - static void set80211(int s, int type, int val, int len, void *data); static int get80211(int s, int type, void *data, int len); static int get80211len(int s, int type, void *data, int len, int *plen); @@ -3391,20 +3371,6 @@ #undef IEEE80211_NODE_QOS } -static int -gettxrate(const struct ieee80211req_sta_info *si) -{ - int txrate = si->isi_txrate; - - if (txrate & 0x80) { - txrate = htrates[txrate & 0xf]; - /* NB: could bump this more based on short gi */ - return si->isi_flags & IEEE80211_CHAN_HT40 ? - txrate : txrate / 2; - } else - return (txrate & IEEE80211_RATE_VAL) / 2; -} - static void list_stations(int s) { @@ -3455,7 +3421,7 @@ , ether_ntoa((const struct ether_addr*) si->isi_macaddr) , IEEE80211_AID(si->isi_associd) , ieee80211_mhz2ieee(si->isi_freq, si->isi_flags) - , gettxrate(si) + , si->isi_txmbps/2 , si->isi_rssi/2. , si->isi_inact , gettxseq(si) From owner-p4-projects@FreeBSD.ORG Mon Mar 10 22:18:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2ABEC1065676; Mon, 10 Mar 2008 22:18:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB5461065672 for ; Mon, 10 Mar 2008 22:18:07 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 87E1C8FC15 for ; Mon, 10 Mar 2008 22:18:07 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2AMI7Vd054604 for ; Mon, 10 Mar 2008 22:18:07 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2AMI78W054598 for perforce@freebsd.org; Mon, 10 Mar 2008 22:18:07 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Mar 2008 22:18:07 GMT Message-Id: <200803102218.m2AMI78W054598@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 137364 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, 10 Mar 2008 22:18:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=137364 Change 137364 by imp@imp_paco-paco on 2008/03/10 22:17:22 Add missing endif. Affected files ... .. //depot/projects/mips2-jnpr/src/share/mk/bsd.cpu.mk#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/share/mk/bsd.cpu.mk#4 (text+ko) ==== @@ -118,6 +118,7 @@ . if ${CPUTYPE} == "e500" MACHINE_CPU = booke _CPUCFLAGS = -Wa,-me500 -msoft-float +. endif . elif ${MACHINE_ARCH} == "mips" . if ${CPUTYPE} == "mips64" _CPUCFLAGS = -march=mips64 From owner-p4-projects@FreeBSD.ORG Mon Mar 10 23:17:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 155C31065678; Mon, 10 Mar 2008 23:17:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C77611065672 for ; Mon, 10 Mar 2008 23:17:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9AB218FC17 for ; Mon, 10 Mar 2008 23:17:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2ANHCXX058155 for ; Mon, 10 Mar 2008 23:17:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2ANHCYl058153 for perforce@freebsd.org; Mon, 10 Mar 2008 23:17:12 GMT (envelope-from imp@freebsd.org) Date: Mon, 10 Mar 2008 23:17:12 GMT Message-Id: <200803102317.m2ANHCYl058153@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 137368 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, 10 Mar 2008 23:17:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=137368 Change 137368 by imp@imp_paco-paco on 2008/03/10 23:16:57 A few more of the targets that we support, or are close to supporting. Affected files ... .. //depot/projects/mips2-jnpr/src/share/mk/bsd.cpu.mk#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/share/mk/bsd.cpu.mk#5 (text+ko) ==== @@ -120,10 +120,18 @@ _CPUCFLAGS = -Wa,-me500 -msoft-float . endif . elif ${MACHINE_ARCH} == "mips" -. if ${CPUTYPE} == "mips64" +. if ${CPUTYPE} == "mips32" +_CPUCFLAGS = -march=mips32 +. elif ${CPUTYPE} == "mips32r2" +_CPUCFLAGS = -march=mips32r2 +. elif ${CPUTYPE} == "mips64" _CPUCFLAGS = -march=mips64 -. elif ${CPUTYPE} == "mipsr4kc" +. elif ${CPUTYPE} == "mips64r2" +_CPUCFLAGS = -march=mips64r2 +. elif ${CPUTYPE} == "mips4kc" _CPUCFLAGS = -march=4kc +. elif ${CPUTYPE} == "mips24kc" +_CPUCFLAGS = -march=24kc . endif . endif From owner-p4-projects@FreeBSD.ORG Mon Mar 10 23:42:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC2D21065671; Mon, 10 Mar 2008 23:42:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7BBB2106566B for ; Mon, 10 Mar 2008 23:42:40 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 33CF18FC12 for ; Mon, 10 Mar 2008 23:42:40 +0000 (UTC) (envelope-from swise@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2ANgemU058897 for ; Mon, 10 Mar 2008 23:42:40 GMT (envelope-from swise@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2ANge40058895 for perforce@freebsd.org; Mon, 10 Mar 2008 23:42:40 GMT (envelope-from swise@FreeBSD.org) Date: Mon, 10 Mar 2008 23:42:40 GMT Message-Id: <200803102342.m2ANge40058895@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swise@FreeBSD.org using -f From: Steve Wise To: Perforce Change Reviews Cc: Subject: PERFORCE change 137370 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, 10 Mar 2008 23:42:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=137370 Change 137370 by swise@swise:vic10:iwarp on 2008/03/10 23:42:32 turn off debug in iw_cxgb Affected files ... .. //depot/projects/iwarp/sys/modules/cxgb/iw_cxgb/Makefile#5 edit Differences ... ==== //depot/projects/iwarp/sys/modules/cxgb/iw_cxgb/Makefile#5 (text+ko) ==== @@ -9,6 +9,6 @@ SRCS+= iw_cxgb_ev.c iw_cxgb_mem.c iw_cxgb_dbg.c iw_cxgb_cq.c SRCS+= bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -I${CXGB} -DSMP -CFLAGS+= -DDEBUG +#CFLAGS+= -DDEBUG .include From owner-p4-projects@FreeBSD.ORG Tue Mar 11 00:36:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 224F41065675; Tue, 11 Mar 2008 00:36:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5ADF1065671 for ; Tue, 11 Mar 2008 00:36:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C4A978FC19 for ; Tue, 11 Mar 2008 00:36:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2B0aZ7Y061782 for ; Tue, 11 Mar 2008 00:36:35 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2B0aZIc061780 for perforce@freebsd.org; Tue, 11 Mar 2008 00:36:35 GMT (envelope-from sam@freebsd.org) Date: Tue, 11 Mar 2008 00:36:35 GMT Message-Id: <200803110036.m2B0aZIc061780@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 137371 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, 11 Mar 2008 00:36:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=137371 Change 137371 by sam@sam_ebb on 2008/03/11 00:36:18 must not cache regdomain state so we get correct status when multiple cards are present Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#14 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifieee80211.c#14 (text+ko) ==== @@ -180,6 +180,7 @@ static struct ieee80211req_chaninfo chaninfo; static struct ieee80211_regdomain regdomain; +static int gotregdomain = 0; static struct ieee80211_roamparams_req roamparams; static int gotroam = 0; static struct ieee80211_txparams_req txparams; @@ -422,14 +423,12 @@ static void getregdomain(int s) { - static int gotrd = 0; - - if (gotrd) + if (gotregdomain) return; if (get80211(s, IEEE80211_IOC_REGDOMAIN, ®domain, sizeof(regdomain)) < 0) errx(1, "unable to get regulatory domain info"); - gotrd = 1; + gotregdomain = 1; } static void @@ -4131,7 +4130,7 @@ gotroam = 0; gottxparams = 0; gothtconf = 0; - /* NB: ok to use cached regdomain state */ + gotregdomain = 0; if (get80211val(s, IEEE80211_IOC_NUMSSIDS, &num) < 0) num = 0; From owner-p4-projects@FreeBSD.ORG Tue Mar 11 04:27:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 846AA1065674; Tue, 11 Mar 2008 04:27:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 41C0C1065672 for ; Tue, 11 Mar 2008 04:27:40 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2810A8FC1D for ; Tue, 11 Mar 2008 04:27:40 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2B4ReXO085630 for ; Tue, 11 Mar 2008 04:27:40 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2B4RdWk085628 for perforce@freebsd.org; Tue, 11 Mar 2008 04:27:39 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 11 Mar 2008 04:27:39 GMT Message-Id: <200803110427.m2B4RdWk085628@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 137378 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, 11 Mar 2008 04:27:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=137378 Change 137378 by kmacy@pandemonium:kmacy:iwarp on 2008/03/11 04:26:44 IFC @137377 Affected files ... .. //depot/projects/iwarp/Makefile.inc1#8 integrate .. //depot/projects/iwarp/ObsoleteFiles.inc#10 integrate .. //depot/projects/iwarp/UPDATING#8 integrate .. //depot/projects/iwarp/bin/chflags/chflags.1#2 integrate .. //depot/projects/iwarp/bin/chflags/chflags.c#2 integrate .. //depot/projects/iwarp/bin/cp/cp.1#2 integrate .. //depot/projects/iwarp/bin/cp/cp.c#3 integrate .. //depot/projects/iwarp/bin/cp/utils.c#2 integrate .. //depot/projects/iwarp/bin/realpath/realpath.1#2 integrate .. //depot/projects/iwarp/bin/realpath/realpath.c#2 integrate .. //depot/projects/iwarp/bin/uuidgen/Makefile#1 branch .. //depot/projects/iwarp/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/iwarp/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/iwarp/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/iwarp/etc/Makefile#4 integrate .. //depot/projects/iwarp/etc/ddb.conf#1 branch .. //depot/projects/iwarp/etc/defaults/rc.conf#4 integrate .. //depot/projects/iwarp/etc/rc.d/Makefile#4 integrate .. //depot/projects/iwarp/etc/rc.d/ddb#1 branch .. //depot/projects/iwarp/etc/rc.d/mountcritlocal#3 integrate .. //depot/projects/iwarp/etc/rc.d/mountlate#2 integrate .. //depot/projects/iwarp/games/fortune/datfiles/fortunes#7 integrate .. //depot/projects/iwarp/gnu/usr.bin/binutils/ar/Makefile#3 integrate .. //depot/projects/iwarp/gnu/usr.bin/binutils/ranlib/Makefile#3 integrate .. //depot/projects/iwarp/include/pthread_np.h#5 integrate .. //depot/projects/iwarp/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_util.3#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/iwarp/lib/libc/posix1e/mac.c#2 integrate .. //depot/projects/iwarp/lib/libc/posix1e/mac_exec.c#2 integrate .. //depot/projects/iwarp/lib/libc/posix1e/mac_get.c#2 integrate .. //depot/projects/iwarp/lib/libc/posix1e/mac_set.c#2 integrate .. //depot/projects/iwarp/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/iwarp/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/iwarp/lib/libc/sys/Symbol.map#2 integrate .. //depot/projects/iwarp/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/iwarp/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/iwarp/lib/libelf/elf_update.c#2 integrate .. //depot/projects/iwarp/lib/libelf/gelf_rel.c#2 integrate .. //depot/projects/iwarp/lib/libelf/gelf_rela.c#2 integrate .. //depot/projects/iwarp/lib/libsdp/sdp.h#2 integrate .. //depot/projects/iwarp/lib/libthr/pthread.map#6 integrate .. //depot/projects/iwarp/lib/libthr/thread/Makefile.inc#2 integrate .. //depot/projects/iwarp/lib/libthr/thread/thr_affinity.c#1 branch .. //depot/projects/iwarp/lib/libthr/thread/thr_attr.c#2 integrate .. //depot/projects/iwarp/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/iwarp/lib/libthr/thread/thr_exit.c#3 integrate .. //depot/projects/iwarp/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/iwarp/lib/libthr/thread/thr_private.h#5 integrate .. //depot/projects/iwarp/lib/libthr/thread/thr_sem.c#4 integrate .. //depot/projects/iwarp/lib/libthr/thread/thr_sig.c#3 integrate .. //depot/projects/iwarp/lib/libutil/humanize_number.c#2 integrate .. //depot/projects/iwarp/lib/msun/Makefile#5 integrate .. //depot/projects/iwarp/lib/msun/Symbol.map#5 integrate .. //depot/projects/iwarp/lib/msun/amd64/Makefile.inc#5 integrate .. //depot/projects/iwarp/lib/msun/amd64/e_sqrtl.S#1 branch .. //depot/projects/iwarp/lib/msun/i387/Makefile.inc#4 integrate .. //depot/projects/iwarp/lib/msun/i387/e_sqrtl.S#1 branch .. //depot/projects/iwarp/lib/msun/ld128/s_nanl.c#2 integrate .. //depot/projects/iwarp/lib/msun/man/sqrt.3#3 integrate .. //depot/projects/iwarp/lib/msun/src/e_sqrt.c#2 integrate .. //depot/projects/iwarp/lib/msun/src/e_sqrtl.c#1 branch .. //depot/projects/iwarp/lib/msun/src/math.h#6 integrate .. //depot/projects/iwarp/rescue/rescue/Makefile#4 integrate .. //depot/projects/iwarp/sbin/ddb/ddb.8#2 integrate .. //depot/projects/iwarp/sbin/ddb/ddb.c#2 integrate .. //depot/projects/iwarp/sbin/fsck_ffs/main.c#2 integrate .. //depot/projects/iwarp/sbin/geom/Makefile#3 integrate .. //depot/projects/iwarp/sbin/geom/class/label/geom_label.c#2 integrate .. //depot/projects/iwarp/sbin/geom/class/multipath/gmultipath.8#2 integrate .. //depot/projects/iwarp/sbin/geom/core/geom.8#3 integrate .. //depot/projects/iwarp/sbin/geom/core/geom.c#4 integrate .. //depot/projects/iwarp/sbin/mount/mount.8#4 integrate .. //depot/projects/iwarp/sbin/newfs/mkfs.c#3 integrate .. //depot/projects/iwarp/secure/usr.bin/ssh/Makefile#2 integrate .. //depot/projects/iwarp/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/iwarp/share/man/man3/Makefile#2 integrate .. //depot/projects/iwarp/share/man/man4/Makefile#10 integrate .. //depot/projects/iwarp/share/man/man4/cmx.4#1 branch .. //depot/projects/iwarp/share/man/man4/ddb.4#3 integrate .. //depot/projects/iwarp/share/man/man4/fwohci.4#2 integrate .. //depot/projects/iwarp/share/man/man4/uslcom.4#1 branch .. //depot/projects/iwarp/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/iwarp/share/man/man9/DEVICE_PROBE.9#2 integrate .. //depot/projects/iwarp/share/man/man9/bus_space.9#2 integrate .. //depot/projects/iwarp/share/man/man9/lock.9#6 integrate .. //depot/projects/iwarp/share/misc/committers-ports.dot#5 integrate .. //depot/projects/iwarp/share/mk/bsd.cpu.mk#4 integrate .. //depot/projects/iwarp/share/mk/sys.mk#5 integrate .. //depot/projects/iwarp/share/zoneinfo/leapseconds#3 integrate .. //depot/projects/iwarp/share/zoneinfo/southamerica#4 integrate .. //depot/projects/iwarp/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/iwarp/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/iwarp/sys/amd64/conf/GENERIC#14 integrate .. //depot/projects/iwarp/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/iwarp/sys/amd64/include/smp.h#2 integrate .. //depot/projects/iwarp/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/iwarp/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/iwarp/sys/arm/conf/AVILA#3 integrate .. //depot/projects/iwarp/sys/arm/include/pmap.h#3 integrate .. //depot/projects/iwarp/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/iwarp/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/iwarp/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/iwarp/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/iwarp/sys/conf/NOTES#10 integrate .. //depot/projects/iwarp/sys/conf/files#13 integrate .. //depot/projects/iwarp/sys/conf/files.powerpc#7 integrate .. //depot/projects/iwarp/sys/conf/kmod.mk#4 integrate .. //depot/projects/iwarp/sys/conf/options#6 integrate .. //depot/projects/iwarp/sys/conf/options.powerpc#4 integrate .. //depot/projects/iwarp/sys/ddb/db_command.c#3 integrate .. //depot/projects/iwarp/sys/ddb/db_examine.c#3 integrate .. //depot/projects/iwarp/sys/ddb/db_input.c#3 integrate .. //depot/projects/iwarp/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/iwarp/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/iwarp/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/iwarp/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/iwarp/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/iwarp/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/iwarp/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/iwarp/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/iwarp/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/iwarp/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/iwarp/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/iwarp/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/iwarp/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/iwarp/sys/dev/hptrr/hptrr_os_bsd.c#3 integrate .. //depot/projects/iwarp/sys/dev/hptrr/hptrr_osm_bsd.c#4 integrate .. //depot/projects/iwarp/sys/dev/hptrr/ldm.h#3 integrate .. //depot/projects/iwarp/sys/dev/hptrr/osm.h#3 integrate .. //depot/projects/iwarp/sys/dev/ic/quicc.h#1 branch .. //depot/projects/iwarp/sys/dev/lge/if_lge.c#4 integrate .. //depot/projects/iwarp/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/iwarp/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/iwarp/sys/dev/mii/miidevs#4 integrate .. //depot/projects/iwarp/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/iwarp/sys/dev/msk/if_msk.c#7 integrate .. //depot/projects/iwarp/sys/dev/nfe/if_nfe.c#7 integrate .. //depot/projects/iwarp/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/iwarp/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/iwarp/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/iwarp/sys/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/iwarp/sys/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/iwarp/sys/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/iwarp/sys/dev/quicc/quicc_core.c#1 branch .. //depot/projects/iwarp/sys/dev/re/if_re.c#6 integrate .. //depot/projects/iwarp/sys/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/iwarp/sys/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/iwarp/sys/dev/scc/scc_bus.h#2 integrate .. //depot/projects/iwarp/sys/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/iwarp/sys/dev/tsec/if_tsec.c#1 branch .. //depot/projects/iwarp/sys/dev/tsec/if_tsec.h#1 branch .. //depot/projects/iwarp/sys/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/iwarp/sys/dev/uart/uart.h#2 integrate .. //depot/projects/iwarp/sys/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/iwarp/sys/dev/uart/uart_bus_scc.c#2 integrate .. //depot/projects/iwarp/sys/dev/uart/uart_cpu_powerpc.c#3 integrate .. //depot/projects/iwarp/sys/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/iwarp/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/iwarp/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/iwarp/sys/dev/usb/uslcom.c#1 branch .. //depot/projects/iwarp/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/iwarp/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/iwarp/sys/dev/wpi/if_wpi.c#6 integrate .. //depot/projects/iwarp/sys/dev/wpi/if_wpireg.h#3 integrate .. //depot/projects/iwarp/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/iwarp/sys/fs/nwfs/nwfs_node.c#4 integrate .. //depot/projects/iwarp/sys/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/iwarp/sys/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/iwarp/sys/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/projects/iwarp/sys/geom/part/g_part_vtoc8.c#1 branch .. //depot/projects/iwarp/sys/i386/conf/GENERIC#10 integrate .. //depot/projects/iwarp/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/iwarp/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/iwarp/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/iwarp/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/iwarp/sys/i386/include/_types.h#2 integrate .. //depot/projects/iwarp/sys/i386/include/float.h#2 integrate .. //depot/projects/iwarp/sys/i386/include/smp.h#2 integrate .. //depot/projects/iwarp/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/iwarp/sys/kern/init_main.c#6 integrate .. //depot/projects/iwarp/sys/kern/init_sysent.c#4 integrate .. //depot/projects/iwarp/sys/kern/kern_cpuset.c#1 branch .. //depot/projects/iwarp/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/iwarp/sys/kern/kern_priv.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/iwarp/sys/kern/kern_sig.c#6 integrate .. //depot/projects/iwarp/sys/kern/kern_synch.c#4 integrate .. //depot/projects/iwarp/sys/kern/kern_thread.c#7 integrate .. //depot/projects/iwarp/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/iwarp/sys/kern/sched_ule.c#6 integrate .. //depot/projects/iwarp/sys/kern/subr_bus.c#5 integrate .. //depot/projects/iwarp/sys/kern/subr_smp.c#4 integrate .. //depot/projects/iwarp/sys/kern/subr_witness.c#6 integrate .. //depot/projects/iwarp/sys/kern/syscalls.c#4 integrate .. //depot/projects/iwarp/sys/kern/syscalls.master#5 integrate .. //depot/projects/iwarp/sys/kern/systrace_args.c#4 integrate .. //depot/projects/iwarp/sys/modules/Makefile#8 integrate .. //depot/projects/iwarp/sys/modules/cmx/Makefile#1 branch .. //depot/projects/iwarp/sys/modules/geom/Makefile#4 integrate .. //depot/projects/iwarp/sys/modules/geom/geom_apple/Makefile#2 delete .. //depot/projects/iwarp/sys/modules/geom/geom_gpt/Makefile#2 delete .. //depot/projects/iwarp/sys/modules/geom/geom_part/Makefile#1 branch .. //depot/projects/iwarp/sys/modules/uslcom/Makefile#1 branch .. //depot/projects/iwarp/sys/modules/vr/Makefile#2 integrate .. //depot/projects/iwarp/sys/modules/zfs/Makefile#4 integrate .. //depot/projects/iwarp/sys/net/bpf_filter.c#3 integrate .. //depot/projects/iwarp/sys/net/if.c#6 integrate .. //depot/projects/iwarp/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/iwarp/sys/net/if_gif.c#3 integrate .. //depot/projects/iwarp/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/iwarp/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/iwarp/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/iwarp/sys/netgraph/ng_nat.h#3 integrate .. //depot/projects/iwarp/sys/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/iwarp/sys/netinet/in.h#2 integrate .. //depot/projects/iwarp/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/iwarp/sys/netinet/ip_fw_nat.c#2 integrate .. //depot/projects/iwarp/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/iwarp/sys/netinet/libalias/alias.c#2 integrate .. //depot/projects/iwarp/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/iwarp/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/iwarp/sys/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/iwarp/sys/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/iwarp/sys/netinet/libalias/alias_proxy.c#2 integrate .. //depot/projects/iwarp/sys/netinet/libalias/alias_smedia.c#2 integrate .. //depot/projects/iwarp/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/iwarp/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/iwarp/sys/netipsec/key.c#2 integrate .. //depot/projects/iwarp/sys/netipsec/key_debug.c#2 integrate .. //depot/projects/iwarp/sys/netsmb/smb_conn.h#3 integrate .. //depot/projects/iwarp/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/iwarp/sys/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/iwarp/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/iwarp/sys/pci/if_rl.c#3 integrate .. //depot/projects/iwarp/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/iwarp/sys/pci/if_vr.c#3 delete .. //depot/projects/iwarp/sys/pci/if_vrreg.h#2 delete .. //depot/projects/iwarp/sys/powerpc/aim/locore.S#3 integrate .. //depot/projects/iwarp/sys/powerpc/aim/machdep.c#4 integrate .. //depot/projects/iwarp/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/iwarp/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/aim/trap_subr.S#2 integrate .. //depot/projects/iwarp/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/booke/clock.c#1 branch .. //depot/projects/iwarp/sys/powerpc/booke/copyinout.c#1 branch .. //depot/projects/iwarp/sys/powerpc/booke/interrupt.c#1 branch .. //depot/projects/iwarp/sys/powerpc/booke/locore.S#1 branch .. //depot/projects/iwarp/sys/powerpc/booke/machdep.c#1 branch .. //depot/projects/iwarp/sys/powerpc/booke/pmap.c#1 branch .. //depot/projects/iwarp/sys/powerpc/booke/support.S#1 branch .. //depot/projects/iwarp/sys/powerpc/booke/swtch.S#1 branch .. //depot/projects/iwarp/sys/powerpc/booke/trap.c#1 branch .. //depot/projects/iwarp/sys/powerpc/booke/trap_subr.S#1 branch .. //depot/projects/iwarp/sys/powerpc/booke/uio_machdep.c#1 branch .. //depot/projects/iwarp/sys/powerpc/booke/vm_machdep.c#1 branch .. //depot/projects/iwarp/sys/powerpc/conf/MPC85XX#1 branch .. //depot/projects/iwarp/sys/powerpc/conf/NOTES#4 integrate .. //depot/projects/iwarp/sys/powerpc/include/frame.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/hid.h#3 integrate .. //depot/projects/iwarp/sys/powerpc/include/intr_machdep.h#3 integrate .. //depot/projects/iwarp/sys/powerpc/include/kdb.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/md_var.h#3 integrate .. //depot/projects/iwarp/sys/powerpc/include/mmuvar.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/ocpbus.h#1 branch .. //depot/projects/iwarp/sys/powerpc/include/openpicvar.h#3 integrate .. //depot/projects/iwarp/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/psl.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/pte.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/sf_buf.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/spr.h#3 integrate .. //depot/projects/iwarp/sys/powerpc/include/tlb.h#1 branch .. //depot/projects/iwarp/sys/powerpc/include/trap.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/trap_aim.h#1 branch .. //depot/projects/iwarp/sys/powerpc/include/trap_booke.h#1 branch .. //depot/projects/iwarp/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/iwarp/sys/powerpc/mpc85xx/nexus.c#1 branch .. //depot/projects/iwarp/sys/powerpc/mpc85xx/ocpbus.c#1 branch .. //depot/projects/iwarp/sys/powerpc/mpc85xx/ocpbus.h#1 branch .. //depot/projects/iwarp/sys/powerpc/mpc85xx/opic.c#1 branch .. //depot/projects/iwarp/sys/powerpc/mpc85xx/pci_ocp.c#1 branch .. //depot/projects/iwarp/sys/powerpc/powermac/openpic_macio.c#3 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/autoconf.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/db_trace.c#3 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/gdb_machdep.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/genassym.c#4 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/intr_machdep.c#4 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/mp_machdep.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/openpic.c#3 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/pic_if.m#3 integrate .. //depot/projects/iwarp/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/iwarp/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/iwarp/sys/security/audit/audit_trigger.c#3 integrate .. //depot/projects/iwarp/sys/security/audit/audit_worker.c#6 integrate .. //depot/projects/iwarp/sys/sparc64/include/tlb.h#2 integrate .. //depot/projects/iwarp/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/iwarp/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/iwarp/sys/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/iwarp/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/iwarp/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/iwarp/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/iwarp/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/iwarp/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/iwarp/sys/sys/_types.h#2 integrate .. //depot/projects/iwarp/sys/sys/bus.h#3 integrate .. //depot/projects/iwarp/sys/sys/cpuset.h#1 branch .. //depot/projects/iwarp/sys/sys/fcntl.h#3 integrate .. //depot/projects/iwarp/sys/sys/param.h#11 integrate .. //depot/projects/iwarp/sys/sys/pcpu.h#5 integrate .. //depot/projects/iwarp/sys/sys/proc.h#10 integrate .. //depot/projects/iwarp/sys/sys/sched.h#2 integrate .. //depot/projects/iwarp/sys/sys/smp.h#3 integrate .. //depot/projects/iwarp/sys/sys/syscall.h#4 integrate .. //depot/projects/iwarp/sys/sys/syscall.mk#4 integrate .. //depot/projects/iwarp/sys/sys/sysproto.h#4 integrate .. //depot/projects/iwarp/sys/sys/types.h#3 integrate .. //depot/projects/iwarp/sys/sys/vtoc.h#1 branch .. //depot/projects/iwarp/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/iwarp/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/iwarp/sys/ufs/ufs/extattr.h#2 integrate .. //depot/projects/iwarp/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/iwarp/sys/vm/vm_fault.c#4 integrate .. //depot/projects/iwarp/sys/vm/vm_map.h#3 integrate .. //depot/projects/iwarp/tools/build/mk/OptionalObsoleteFiles.inc#4 integrate .. //depot/projects/iwarp/tools/regression/file/dup/dup.c#2 integrate .. //depot/projects/iwarp/tools/regression/lib/msun/test-trig.c#2 integrate .. //depot/projects/iwarp/tools/tools/tinybsd/tinybsd#2 integrate .. //depot/projects/iwarp/usr.bin/Makefile#5 integrate .. //depot/projects/iwarp/usr.bin/ar/write.c#2 integrate .. //depot/projects/iwarp/usr.bin/calendar/calendars/calendar.freebsd#7 integrate .. //depot/projects/iwarp/usr.bin/chat/chat.c#2 integrate .. //depot/projects/iwarp/usr.bin/cpuset/Makefile#1 branch .. //depot/projects/iwarp/usr.bin/cpuset/cpuset.1#1 branch .. //depot/projects/iwarp/usr.bin/cpuset/cpuset.c#1 branch .. //depot/projects/iwarp/usr.bin/find/find.1#3 integrate .. //depot/projects/iwarp/usr.bin/find/main.c#2 integrate .. //depot/projects/iwarp/usr.bin/gzip/gzip.c#2 integrate .. //depot/projects/iwarp/usr.bin/make/Makefile#2 integrate .. //depot/projects/iwarp/usr.bin/make/Makefile.dist#3 integrate .. //depot/projects/iwarp/usr.bin/make/arch.c#2 integrate .. //depot/projects/iwarp/usr.bin/make/job.c#2 integrate .. //depot/projects/iwarp/usr.bin/make/main.c#3 integrate .. //depot/projects/iwarp/usr.bin/make/make.1#3 integrate .. //depot/projects/iwarp/usr.bin/unifdef/unifdef.c#3 integrate .. //depot/projects/iwarp/usr.sbin/Makefile#5 integrate .. //depot/projects/iwarp/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#2 integrate .. //depot/projects/iwarp/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#2 integrate .. //depot/projects/iwarp/usr.sbin/fifolog/Makefile#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/Makefile.inc#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/fifolog_create/Makefile#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/flint.lnt#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/lib/Makefile#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/lib/fifolog.h#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/lib/fifolog_create.c#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/lib/fifolog_int.c#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/lib/fifolog_write.h#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/lib/getdate.y#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/lib/libfifolog.h#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch .. //depot/projects/iwarp/usr.sbin/fifolog/lib/miniobj.h#1 branch .. //depot/projects/iwarp/usr.sbin/fwcontrol/fwcontrol.8#3 integrate .. //depot/projects/iwarp/usr.sbin/fwcontrol/fwcontrol.c#2 integrate .. //depot/projects/iwarp/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/iwarp/usr.sbin/moused/Makefile#2 integrate .. //depot/projects/iwarp/usr.sbin/moused/moused.c#2 integrate Differences ... ==== //depot/projects/iwarp/Makefile.inc1#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.600 2008/02/25 16:29:54 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -203,6 +203,9 @@ GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac +.if ${OSRELDATE} < 700044 +CROSSENV+= AR=gnu-ar RANLIB=gnu-ranlib +.endif # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -972,10 +975,6 @@ .endif .endif -.if make(cross-tools) && ${BOOTSTRAPPING} < 700044 -.MAKEFLAGS+= -D_WITH_GNUAR -.endif - cross-tools: .for _tool in \ gnu/usr.bin/binutils \ ==== //depot/projects/iwarp/ObsoleteFiles.inc#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -32,6 +32,11 @@ OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libkse.a +OLD_FILES+=usr/lib32/libkse_p.a +OLD_FILES+=usr/lib32/libkse_pic.a +.endif .endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h @@ -134,6 +139,12 @@ OLD_DIRS+=usr/include/netatm/uni OLD_DIRS+=usr/include/netatm OLD_DIRS+=usr/share/examples/atm +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libatm.a +OLD_FILES+=usr/lib32/libatm.so +OLD_LIBS+=usr/lib32/libatm.so.5 +OLD_FILES+=usr/lib32/libatm_p.a +.endif # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -224,6 +235,42 @@ OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libalias.so.5 +OLD_LIBS+=usr/lib32/libbsnmp.so.3 +OLD_LIBS+=usr/lib32/libdialog.so.5 +OLD_LIBS+=usr/lib32/libgnuregex.so.3 +OLD_LIBS+=usr/lib32/libhistory.so.6 +OLD_LIBS+=usr/lib32/libncurses.so.6 +OLD_LIBS+=usr/lib32/libncursesw.so.6 +OLD_LIBS+=usr/lib32/libpam.so.3 +OLD_LIBS+=usr/lib32/libreadline.so.6 +OLD_LIBS+=usr/lib32/libssh.so.3 +OLD_LIBS+=usr/lib32/pam_chroot.so.3 +OLD_LIBS+=usr/lib32/pam_deny.so.3 +OLD_LIBS+=usr/lib32/pam_echo.so.3 +OLD_LIBS+=usr/lib32/pam_exec.so.3 +OLD_LIBS+=usr/lib32/pam_ftpusers.so.3 +OLD_LIBS+=usr/lib32/pam_group.so.3 +OLD_LIBS+=usr/lib32/pam_guest.so.3 +OLD_LIBS+=usr/lib32/pam_krb5.so.3 +OLD_LIBS+=usr/lib32/pam_ksu.so.3 +OLD_LIBS+=usr/lib32/pam_lastlog.so.3 +OLD_LIBS+=usr/lib32/pam_login_access.so.3 +OLD_LIBS+=usr/lib32/pam_nologin.so.3 +OLD_LIBS+=usr/lib32/pam_opie.so.3 +OLD_LIBS+=usr/lib32/pam_opieaccess.so.3 +OLD_LIBS+=usr/lib32/pam_passwdqc.so.3 +OLD_LIBS+=usr/lib32/pam_permit.so.3 +OLD_LIBS+=usr/lib32/pam_radius.so.3 +OLD_LIBS+=usr/lib32/pam_rhosts.so.3 +OLD_LIBS+=usr/lib32/pam_rootok.so.3 +OLD_LIBS+=usr/lib32/pam_securetty.so.3 +OLD_LIBS+=usr/lib32/pam_self.so.3 +OLD_LIBS+=usr/lib32/pam_ssh.so.3 +OLD_LIBS+=usr/lib32/pam_tacplus.so.3 +OLD_LIBS+=usr/lib32/pam_unix.so.3 +.endif # 20070613: IPX over IP tunnel removal OLD_FILES+=usr/include/netipx/ipx_ip.h # 20070605: sched_core removal @@ -603,6 +650,9 @@ OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=usr/lib/libarchive.so.3 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libarchive.so.3 +.endif # 20070301: remove addr2ascii and ascii2addr OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz ==== //depot/projects/iwarp/UPDATING#8 (text+ko) ==== @@ -22,6 +22,14 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080301: + The layout of struct vmspace has changed. This affects libkvm + and any executables that link against libkvm and use the + kvm_getprocs() function. In particular, but not exclusively, + it affects ps(1), fstat(1), pkill(1), systat(1), top(1) and w(1). + The effects are minimal, but it's advisable to upgrade world + nonetheless. + 20080229: The latest em driver no longer has support in it for the 82575 adapter, this is now moved to the igb driver. The @@ -989,4 +997,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.521 2008/02/29 22:08:49 jfv Exp $ +$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ ==== //depot/projects/iwarp/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.29 2007/05/28 04:23:09 pjd Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.30 2008/03/09 12:10:24 rwatson Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -40,7 +40,7 @@ .Nd change file flags .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl fhv .Oo .Fl R .Op Fl H | Fl L | Fl P @@ -57,6 +57,12 @@ .Pp The options are as follows: .Bl -tag -width indent +.It Fl f +Do not display a diagnostic message if +.Nm +could not modify the flags for +.Va file , +nor modify the exit status to reflect such failures. .It Fl H If the .Fl R @@ -79,6 +85,14 @@ .It Fl R Change the file flags for the file hierarchies rooted in the files instead of just the files themselves. +.It Fl v +Cause +.Nm +to be verbose, showing filenames as the flags are modified. +If the +.Fl v +option is specified more than once, the old and new flags of the file +will also be printed, in octal notation. .El .Pp The flags are specified as an octal number or a comma separated list ==== //depot/projects/iwarp/bin/chflags/chflags.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.24 2008/03/09 12:10:24 rwatson Exp $"); #include #include @@ -60,14 +60,15 @@ { FTS *ftsp; FTSENT *p; - u_long clear, set; + u_long clear, newflags, set; long val; - int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval; + int Hflag, Lflag, Rflag, fflag, hflag, vflag; + int ch, fts_options, oct, rval; char *flags, *ep; int (*change_flags)(const char *, unsigned long); - Hflag = Lflag = Rflag = hflag = 0; - while ((ch = getopt(argc, argv, "HLPRh")) != -1) + Hflag = Lflag = Rflag = fflag = hflag = vflag = 0; + while ((ch = getopt(argc, argv, "HLPRfhv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -83,9 +84,15 @@ case 'R': Rflag = 1; break; + case 'f': + fflag = 1; + break; case 'h': hflag = 1; break; + case 'v': + vflag++; + break; case '?': default: usage(); @@ -166,18 +173,23 @@ default: break; } - if (oct) { - if (!(*change_flags)(p->fts_accpath, set)) - continue; - } else { - p->fts_statp->st_flags |= set; - p->fts_statp->st_flags &= clear; - if (!(*change_flags)(p->fts_accpath, - (u_long)p->fts_statp->st_flags)) - continue; + if (oct) + newflags = set; + else + newflags = (p->fts_statp->st_flags | set) & clear; + if (newflags == p->fts_statp->st_flags) + continue; + if ((*change_flags)(p->fts_accpath, newflags) && !fflag) { + warn("%s", p->fts_path); + rval = 1; + } else if (vflag) { + (void)printf("%s", p->fts_path); + if (vflag > 1) + (void)printf(": 0%lo -> 0%lo", + (u_long)p->fts_statp->st_flags, + newflags); + (void)printf("\n"); } - warn("%s", p->fts_path); - rval = 1; } if (errno) err(1, "fts_read"); @@ -188,6 +200,6 @@ usage(void) { (void)fprintf(stderr, - "usage: chflags [-h] [-R [-H | -L | -P]] flags file ...\n"); + "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n"); exit(1); } ==== //depot/projects/iwarp/bin/cp/cp.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $ .\" .Dd October 27, 2006 .Dt CP 1 @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -116,6 +116,10 @@ or .Xr pax 1 instead. +.It Fl a +Archive mode. +Same as +.Fl RpP . .It Fl f For each existing destination pathname, remove it and create a new file, without prompting for confirmation ==== //depot/projects/iwarp/bin/cp/cp.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); /* * Cp copies source files to target files. @@ -102,7 +102,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -119,6 +119,12 @@ case 'R': Rflag = 1; break; + case 'a': + Pflag = 1; + pflag = 1; + Rflag = 1; + Hflag = Lflag = 0; + break; case 'f': fflag = 1; iflag = nflag = 0; ==== //depot/projects/iwarp/bin/cp/utils.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.53 2008/03/10 19:58:41 jhb Exp $"); #include #include @@ -429,8 +429,8 @@ { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " "target_directory"); exit(EX_USAGE); } ==== //depot/projects/iwarp/bin/realpath/realpath.1#2 (text+ko) ==== @@ -31,7 +31,7 @@ .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp -.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.11 2008/03/09 12:46:39 rwatson Exp $ .\" .Dd November 24, 2000 .Dt REALPATH 1 @@ -41,7 +41,9 @@ .Nd return resolved physical path .Sh SYNOPSIS .Nm +.Op Fl q .Ar path +.Op Ar ... .Sh DESCRIPTION The .Nm @@ -55,6 +57,12 @@ .Pa /../ in .Ar path . +.Pp +If +.Fl q +is specified, warnings will not be printed when +.Xr realpath 3 +fails. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO ==== //depot/projects/iwarp/bin/realpath/realpath.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6 2004/04/06 20:06:50 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.7 2008/03/09 12:46:39 rwatson Exp $"); #include @@ -44,20 +44,39 @@ { char buf[PATH_MAX]; char *p; + int ch, i, qflag, rval; - if (argc == 2) { - if ((p = realpath(argv[1], buf)) == NULL) - err(1, "%s", buf); - } else + qflag = 0; + while ((ch = getopt(argc, argv, "q")) != -1) { + switch (ch) { + case 'q': + qflag = 1; + break; + case '?': + default: + usage(); + } + } + argc -= optind; + argv += optind; + if (argc < 1) usage(); - (void)printf("%s\n", p); - exit(0); + rval = 0; + for (i = 0; i < argc; i++) { + if ((p = realpath(argv[i], buf)) == NULL) { + if (!qflag) + warn("%s", argv[i]); + rval = 1; + } else + (void)printf("%s\n", p); + } + exit(rval); } static void usage(void) { - (void)fprintf(stderr, "usage: realpath path\n"); + (void)fprintf(stderr, "usage: realpath [-q] path [...]\n"); exit(1); } ==== //depot/projects/iwarp/contrib/bsnmp/snmpd/main.c#2 (text+ko) ==== @@ -2242,6 +2242,8 @@ return (m); err: + if ((m->flags & LM_ONSTARTLIST) != 0) + TAILQ_REMOVE(&modules_start, m, start); if (m->handle) dlclose(m->handle); free(m->path); ==== //depot/projects/iwarp/etc/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.365 2007/11/11 01:16:51 mlaier Exp $ +# $FreeBSD: src/etc/Makefile,v 1.366 2008/03/05 18:32:58 brooks Exp $ .include @@ -9,7 +9,7 @@ BIN1= amd.map apmd.conf auth.conf \ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ - dhclient.conf disktab fbtab freebsd-update.conf \ + ddb.conf dhclient.conf disktab fbtab freebsd-update.conf \ ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf libalias.conf login.access login.conf mac.conf motd \ ==== //depot/projects/iwarp/etc/defaults/rc.conf#4 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.326 2008/01/27 15:15:11 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -33,6 +33,8 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). +ddb_enable="NO" # Set to YES to load ddb scripts at boot. +ddb_config="/etc/ddb.conf" # ddb(8) config file. devd_enable="YES" # Run devd, to trigger programs on device tree changes. devd_flags="" # Additional flags for devd(8). kldxref_enable="NO" # Build linker.hints files with kldxref(8). @@ -249,7 +251,7 @@ rwhod_enable="NO" # Run the rwho daemon (or NO). rwhod_flags="" # Flags for rwhod rarpd_enable="NO" # Run rarpd (or NO). -rarpd_flags="" # Flags to rarpd. +rarpd_flags="-a" # Flags to rarpd. bootparamd_enable="NO" # Run bootparamd (or NO). bootparamd_flags="" # Flags to bootparamd pppoed_enable="NO" # Run the PPP over Ethernet daemon. ==== //depot/projects/iwarp/etc/rc.d/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.88 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ .include @@ -7,7 +7,7 @@ apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ccd cleanvar cleartmp cron \ - devd devfs dhclient \ + ddb devd devfs dhclient \ dmesg dumpon \ early.sh encswap \ fsck ftp-proxy ftpd \ ==== //depot/projects/iwarp/etc/rc.d/mountcritlocal#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.15 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.16 2008/03/06 14:39:33 mtm Exp $ # # PROVIDE: mountcritlocal @@ -15,6 +15,8 @@ mountcritlocal_start() { + local err + # Set up the list of network filesystem types for which mounting # should be delayed until after network initialization. case ${extra_netfs_types} in @@ -34,9 +36,10 @@ done mount_excludes=${mount_excludes%,} mount -a -t ${mount_excludes} + err=$? echo '.' - case $? in + case ${err} in 0) ;; *) ==== //depot/projects/iwarp/etc/rc.d/mountlate#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.2 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.3 2008/03/06 14:39:33 mtm Exp $ # # PROVIDE: mountlate @@ -16,12 +16,15 @@ mountlate_start() { + local err + # Mount "late" filesystems. echo -n 'Mounting late file systems:' mount -a -l + err=$? echo '.' - case $? in + case ${err} in 0) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 11 07:58:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6807E1065671; Tue, 11 Mar 2008 07:58:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 25701106566C for ; Tue, 11 Mar 2008 07:58:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 016128FC1F for ; Tue, 11 Mar 2008 07:58:21 +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.14.1/8.14.1) with ESMTP id m2B7wKQc047855 for ; Tue, 11 Mar 2008 07:58:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2B7wKeQ047853 for perforce@freebsd.org; Tue, 11 Mar 2008 07:58:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Mar 2008 07:58:20 GMT Message-Id: <200803110758.m2B7wKeQ047853@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 137384 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, 11 Mar 2008 07:58:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=137384 Change 137384 by rwatson@rwatson_cinnamon on 2008/03/11 07:58:19 Integrate zcopybpf branch. Affected files ... .. //depot/projects/zcopybpf/src/sys/amd64/amd64/legacy.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/files#20 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi.c#10 integrate .. //depot/projects/zcopybpf/src/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/msk/if_msk.c#11 integrate .. //depot/projects/zcopybpf/src/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/wpi/if_wpi.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/wpi/if_wpireg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/legacy.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_synch.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_4bsd.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_ule.c#16 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_bus.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_smp.c#8 integrate .. //depot/projects/zcopybpf/src/sys/modules/vr/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/netsmb/smb_conn.h#3 integrate .. //depot/projects/zcopybpf/src/sys/pc98/conf/GENERIC#10 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_vr.c#6 delete .. //depot/projects/zcopybpf/src/sys/pci/if_vrreg.h#3 delete .. //depot/projects/zcopybpf/src/sys/security/audit/audit_worker.c#6 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/conf/GENERIC#9 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/mp_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/sched.h#4 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_softdep.c#11 integrate Differences ... ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/legacy.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.61 2007/09/30 11:05:13 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.62 2008/03/10 22:18:06 jhb Exp $"); /* * This code implements a system driver for legacy systems that do not @@ -132,20 +132,10 @@ legacy_attach(device_t dev) { device_t child; - int i; - /* First, attach the CPU pseudo-driver. */ - for (i = 0; i <= mp_maxid; i++) - if (!CPU_ABSENT(i)) { - child = BUS_ADD_CHILD(dev, 0, "cpu", i); - if (child == NULL) - panic("legacy_attach cpu"); - device_probe_and_attach(child); - } - /* - * Second, let our child driver's identify any child devices that - * they can find. Once that is done attach any devices that we + * Let our child drivers identify any child devices that they + * can find. Once that is done attach any devices that we * found. */ bus_generic_probe(dev); @@ -241,6 +231,7 @@ * Legacy CPU attachment when ACPI is not available. Drivers like * cpufreq(4) hang off this. */ +static void cpu_identify(driver_t *driver, device_t parent); static int cpu_read_ivar(device_t dev, device_t child, int index, uintptr_t *result); static device_t cpu_add_child(device_t bus, int order, const char *name, @@ -254,6 +245,7 @@ static device_method_t cpu_methods[] = { /* Device interface */ + DEVMETHOD(device_identify, cpu_identify), DEVMETHOD(device_probe, bus_generic_probe), DEVMETHOD(device_attach, bus_generic_attach), DEVMETHOD(device_detach, bus_generic_detach), @@ -287,6 +279,25 @@ static devclass_t cpu_devclass; DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0); +static void +cpu_identify(driver_t *driver, device_t parent) +{ + device_t child; + int i; + + /* + * Attach a cpuX device for each CPU. We use an order of 150 + * so that these devices are attached after the Host-PCI + * bridges (which are added at order 100). + */ + for (i = 0; i <= mp_maxid; i++) + if (!CPU_ABSENT(i)) { + child = BUS_ADD_CHILD(parent, 150, "cpu", i); + if (child == NULL) + panic("legacy_attach cpu"); + } +} + static device_t cpu_add_child(device_t bus, int order, const char *name, int unit) { ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/mp_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.288 2008/03/02 07:58:40 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.289 2008/03/10 01:32:48 jeff Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -950,15 +950,8 @@ ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]); - if (ipi_bitmap & (1 << IPI_PREEMPT)) { - struct thread *running_thread = curthread; - thread_lock(running_thread); - if (running_thread->td_critnest > 1) - running_thread->td_owepreempt = 1; - else - mi_switch(SW_INVOL | SW_PREEMPT, NULL); - thread_unlock(running_thread); - } + if (ipi_bitmap & (1 << IPI_PREEMPT)) + sched_preempt(curthread); /* Nothing to do for AST */ } ==== //depot/projects/zcopybpf/src/sys/boot/i386/btx/btx/btx.S#3 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.45 2008/02/27 23:35:39 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.46 2008/03/10 21:43:31 jhb Exp $ */ /* @@ -21,11 +21,11 @@ .set MEM_BTX,0x1000 # Start of BTX memory .set MEM_ESP0,0x1800 # Supervisor stack .set MEM_BUF,0x1800 # Scratch buffer - .set MEM_ESP1,0x1e00 # Link stack - .set MEM_IDT,0x1e00 # IDT - .set MEM_TSS,0x1f98 # TSS - .set MEM_MAP,0x2000 # I/O bit map - .set MEM_TSS_END,0x3fff # Page directory + .set MEM_ESPR,0x5e00 # Real mode stack + .set MEM_IDT,0x5e00 # IDT + .set MEM_TSS,0x5f98 # TSS + .set MEM_MAP,0x6000 # I/O bit map + .set MEM_TSS_END,0x7fff # End of TSS .set MEM_ORG,0x9000 # BTX code .set MEM_USR,0xa000 # Start of user memory /* @@ -48,7 +48,6 @@ */ .set TSS_ESP0,0x4 # PL 0 ESP .set TSS_SS0,0x8 # PL 0 SS - .set TSS_ESP1,0xc # PL 1 ESP .set TSS_MAP,0x66 # I/O bit map base /* * System calls. @@ -56,10 +55,20 @@ .set SYS_EXIT,0x0 # Exit .set SYS_EXEC,0x1 # Exec /* - * V86 constants. + * Fields in V86 interface structure. + */ + .set V86_CTL,0x0 # Control flags + .set V86_ADDR,0x4 # Int number/address + .set V86_ES,0x8 # V86 ES + .set V86_DS,0xc # V86 DS + .set V86_FS,0x10 # V86 FS + .set V86_GS,0x14 # V86 GS +/* + * V86 control flags. */ - .set V86_FLG,0x208eff # V86 flag mask - .set V86_STK,0x400 # V86 stack allowance + .set V86F_ADDR,0x10000 # Segment:offset address + .set V86F_CALLF,0x20000 # Emulate far call + .set V86F_FLAGS,0x40000 # Return flags /* * Dump format control bytes. */ @@ -77,7 +86,6 @@ * BIOS Data Area locations. */ .set BDA_MEM,0x413 # Free memory - .set BDA_KEYFLAGS,0x417 # Keyboard shift-state flags .set BDA_SCR,0x449 # Video mode .set BDA_POS,0x450 # Cursor position .set BDA_BOOT,0x472 # Boot howto flag @@ -85,7 +93,6 @@ * Derivations, for brevity. */ .set _ESP0H,MEM_ESP0>>0x8 # Byte 1 of ESP0 - .set _ESP1H,MEM_ESP1>>0x8 # Byte 1 of ESP1 .set _TSSIO,MEM_MAP-MEM_TSS # TSS I/O base .set _TSSLM,MEM_TSS_END-MEM_TSS # TSS limit .set _IDTLM,MEM_TSS-MEM_IDT-1 # IDT limit @@ -102,7 +109,7 @@ .byte 0xe # Header size .ascii "BTX" # Magic .byte 0x1 # Major version - .byte 0x1 # Minor version + .byte 0x2 # Minor version .byte BTX_FLAGS # Flags .word PAG_CNT-MEM_ORG>>0xc # Paging control .word break-start # Text size @@ -123,13 +130,24 @@ */ mov $MEM_IDT,%di # Memory to initialize mov $(MEM_ORG-MEM_IDT)/2,%cx # Words to zero - push %di # Save rep # Zero-fill stosw # memory - pop %di # Restore +/* + * Update real mode IDT for reflecting hardware interrupts. + */ + mov $intr20,%bx # Address first handler + mov $0x10,%cx # Number of handlers + mov $0x20*4,%di # First real mode IDT entry +init.0: mov %bx,(%di) # Store IP + inc %di # Address next + inc %di # entry + stosw # Store CS + add $4,%bx # Next handler + loop init.0 # Next IRQ /* * Create IDT. */ + mov $MEM_IDT,%di mov $idtctl,%si # Control string init.1: lodsb # Get entry cbw # count @@ -155,7 +173,6 @@ */ init.4: movb $_ESP0H,TSS_ESP0+1(%di) # Set ESP0 movb $SEL_SDATA,TSS_SS0(%di) # Set SS0 - movb $_ESP1H,TSS_ESP1+1(%di) # Set ESP1 movb $_TSSIO,TSS_MAP(%di) # Set I/O bit map base /* * Bring up the system. @@ -281,10 +298,6 @@ retw # To caller .code32 /* - * Initiate return from V86 mode to user mode. - */ -inthlt: hlt # To supervisor mode -/* * Exception jump table. */ intx00: push $0x0 # Int 0x0: #DE @@ -310,18 +323,12 @@ push $0xc # Int 0xc: #SS jmp except # Stack segment fault push $0xd # Int 0xd: #GP - jmp ex_v86 # General protection + jmp except # General protection push $0xe # Int 0xe: #PF jmp except # Page fault intx10: push $0x10 # Int 0x10: #MF jmp ex_noc # Floating-point error /* - * Handle #GP exception. - */ -ex_v86: testb $0x2,0x12(%esp,1) # V86 mode? - jz except # No - jmp v86mon # To monitor -/* * Save a zero error code. */ ex_noc: pushl (%esp,1) # Duplicate int no @@ -333,24 +340,17 @@ pushl %ds # Save pushl %es # most pusha # registers - movb $0x6,%al # Push loop count - testb $0x2,0x3a(%esp,1) # V86 mode? - jnz except.1 # Yes pushl %gs # Set GS pushl %fs # Set FS pushl %ds # Set DS pushl %es # Set ES - movb $0x2,%al # Push loop count cmpw $SEL_SCODE,0x44(%esp,1) # Supervisor mode? jne except.1 # No pushl %ss # Set SS - leal 0x50(%esp,1),%eax # Set - pushl %eax # ESP jmp except.2 # Join common code -except.1: pushl 0x50(%esp,1) # Set GS, FS, DS, ES - decb %al # (if V86 mode), and - jne except.1 # SS, ESP -except.2: push $SEL_SDATA # Set up +except.1: pushl 0x50(%esp,1) # Set SS +except.2: pushl 0x50(%esp,1) # Set ESP + push $SEL_SDATA # Set up popl %ds # to pushl %ds # address popl %es # data @@ -374,234 +374,6 @@ except.2a: jmp exit # Exit except.3: leal 0x8(%esp,1),%esp # Discard err, int no iret # From interrupt -/* - * Return to user mode from V86 mode. - */ -intrtn: cld # String ops inc - pushl %ds # Address - popl %es # data - leal 0x3c(%ebp),%edx # V86 Segment registers - movl MEM_TSS+TSS_ESP1,%esi # Link stack pointer - lodsl # INT_V86 args pointer - movl %esi,%ebx # Saved exception frame - testl %eax,%eax # INT_V86 args? - jz intrtn.2 # No - movl $MEM_USR,%edi # User base - movl 0x1c(%esi),%ebx # User ESP - movl %eax,(%edi,%ebx,1) # Restore to user stack - leal 0x8(%edi,%eax,1),%edi # Arg segment registers - testb $0x4,-0x6(%edi) # Return flags? - jz intrtn.1 # No - movl 0x30(%ebp),%eax # Get V86 flags - movw %ax,0x18(%esi) # Set user flags -intrtn.1: leal 0x10(%esi),%ebx # Saved exception frame - xchgl %edx,%esi # Segment registers - movb $0x4,%cl # Update seg regs - rep # in INT_V86 - movsl # args -intrtn.2: xchgl %edx,%esi # Segment registers - leal 0x28(%ebp),%edi # Set up seg - movb $0x4,%cl # regs for - rep # later - movsl # pop - xchgl %ebx,%esi # Restore exception - movb $0x5,%cl # frame to - rep # supervisor - movsl # stack - movl %esi,MEM_TSS+TSS_ESP1 # Link stack pointer - popa # Restore - leal 0x8(%esp,1),%esp # Discard err, int no - popl %es # Restore - popl %ds # user - popl %fs # segment - popl %gs # registers - iret # To user mode -/* - * V86 monitor. - */ -v86mon: cld # String ops inc - pushl $SEL_SDATA # Set up for - popl %ds # flat addressing - pusha # Save registers - movl %esp,%ebp # Address stack frame - movzwl 0x2c(%ebp),%edi # Load V86 CS - shll $0x4,%edi # To linear - movl 0x28(%ebp),%esi # Load V86 IP - addl %edi,%esi # Code pointer - xorl %ecx,%ecx # Zero - movb $0x2,%cl # 16-bit operands - xorl %eax,%eax # Zero -v86mon.1: lodsb # Get opcode - cmpb $0x66,%al # Operand size prefix? - jne v86mon.2 # No - movb $0x4,%cl # 32-bit operands - jmp v86mon.1 # Continue -v86mon.2: cmpb $0xf4,%al # HLT? - jne v86mon.3 # No - cmpl $inthlt+0x1,%esi # Is inthlt? - jne v86mon.7 # No (ignore) - jmp intrtn # Return to user mode -v86mon.3: cmpb $0xf,%al # Prefixed instruction? - jne v86mon.4 # No - cmpb $0x09,(%esi) # Is it a WBINVD? - je v86wbinvd # Yes - cmpb $0x30,(%esi) # Is it a WRMSR? - je v86wrmsr # Yes - cmpb $0x32,(%esi) # Is it a RDMSR? - je v86rdmsr # Yes - cmpb $0x20,(%esi) # Is this a MOV reg,CRx? - je v86mov # Yes -v86mon.4: cmpb $0xfa,%al # CLI? - je v86cli # Yes - cmpb $0xfb,%al # STI? - je v86sti # Yes - cmpb $0xcc,%al # INT3? - je v86mon.7 # Yes, ignore - movzwl 0x38(%ebp),%ebx # Load V86 SS - shll $0x4,%ebx # To offset - pushl %ebx # Save - addl 0x34(%ebp),%ebx # Add V86 SP - movl 0x30(%ebp),%edx # Load V86 flags - cmpb $0x9c,%al # PUSHF/PUSHFD? - je v86pushf # Yes - cmpb $0x9d,%al # POPF/POPFD? - je v86popf # Yes - cmpb $0xcd,%al # INT imm8? - je v86intn # Yes - cmpb $0xcf,%al # IRET/IRETD? - je v86iret # Yes - popl %ebx # Restore - popa # Restore - jmp except # Handle exception -v86mon.5: movl %edx,0x30(%ebp) # Save V86 flags -v86mon.6: popl %edx # V86 SS adjustment - subl %edx,%ebx # Save V86 - movl %ebx,0x34(%ebp) # SP -v86mon.7: subl %edi,%esi # From linear - movl %esi,0x28(%ebp) # Save V86 IP - popa # Restore - leal 0x8(%esp,1),%esp # Discard int no, error - iret # To V86 mode -/* - * Emulate MOV reg,CRx. - */ -v86mov: movb 0x1(%esi),%bl # Fetch Mod R/M byte - testb $0x10,%bl # Read CR2 or CR3? - jnz v86mov.1 # Yes - movl %cr0,%eax # Read CR0 - testb $0x20,%bl # Read CR4 instead? - jz v86mov.2 # No - movl %cr4,%eax # Read CR4 - jmp v86mov.2 -v86mov.1: movl %cr2,%eax # Read CR2 - testb $0x08,%bl # Read CR3 instead? - jz v86mov.2 # No - movl %cr3,%eax # Read CR3 -v86mov.2: andl $0x7,%ebx # Compute offset in - shl $2,%ebx # frame of destination - neg %ebx # register - movl %eax,0x1c(%ebp,%ebx,1) # Store CR to reg - incl %esi # Adjust IP -/* - * Return from emulating a 0x0f prefixed instruction - */ -v86preret: incl %esi # Adjust IP - jmp v86mon.7 # Finish up -/* - * Emulate WBINVD - */ -v86wbinvd: wbinvd # Write back and invalidate - # cache - jmp v86preret # Finish up -/* - * Emulate WRMSR - */ -v86wrmsr: movl 0x18(%ebp),%ecx # Get user's %ecx (MSR to write) - movl 0x14(%ebp),%edx # Load the value - movl 0x1c(%ebp),%eax # to write - wrmsr # Write MSR - jmp v86preret # Finish up -/* - * Emulate RDMSR - */ -v86rdmsr: movl 0x18(%ebp),%ecx # MSR to read - rdmsr # Read the MSR - movl %eax,0x1c(%ebp) # Return the value of - movl %edx,0x14(%ebp) # the MSR to the user - jmp v86preret # Finish up -/* - * Emulate CLI. - */ -v86cli: andb $~0x2,0x31(%ebp) # Clear IF - jmp v86mon.7 # Finish up -/* - * Emulate STI. - */ -v86sti: orb $0x2,0x31(%ebp) # Set IF - jmp v86mon.7 # Finish up -/* - * Emulate PUSHF/PUSHFD. - */ -v86pushf: subl %ecx,%ebx # Adjust SP - cmpb $0x4,%cl # 32-bit - je v86pushf.1 # Yes - data16 # 16-bit -v86pushf.1: movl %edx,(%ebx) # Save flags - jmp v86mon.6 # Finish up -/* - * Emulate IRET/IRETD. - */ -v86iret: movzwl (%ebx),%esi # Load V86 IP - movzwl 0x2(%ebx),%edi # Load V86 CS - leal 0x4(%ebx),%ebx # Adjust SP - movl %edi,0x2c(%ebp) # Save V86 CS - xorl %edi,%edi # No ESI adjustment -/* - * Emulate POPF/POPFD (and remainder of IRET/IRETD). - */ -v86popf: cmpb $0x4,%cl # 32-bit? - je v86popf.1 # Yes - movl %edx,%eax # Initialize - data16 # 16-bit -v86popf.1: movl (%ebx),%eax # Load flags - addl %ecx,%ebx # Adjust SP - andl $V86_FLG,%eax # Merge - andl $~V86_FLG,%edx # the - orl %eax,%edx # flags - jmp v86mon.5 # Finish up -/* - * trap int 15, function 87 - * reads %es:%si from saved registers on stack to find a GDT containing - * source and destination locations - * reads count of words from saved %cx - * returns success by setting %ah to 0 - */ -int15_87: pushl %esi # Save - pushl %edi # registers - movl 0x3C(%ebp),%edi # Load ES - movzwl 0x4(%ebp),%eax # Load user's SI - shll $0x4,%edi # EDI = (ES << 4) + - addl %eax,%edi # SI - movl 0x11(%edi),%eax # Read base of - movb 0x17(%edi),%al # GDT entry - ror $8,%eax # for source - xchgl %eax,%esi # into %esi - movl 0x19(%edi),%eax # Read base of - movb 0x1f(%edi),%al # GDT entry for - ror $8,%eax # destination - xchgl %eax,%edi # into %edi - pushl %ds # Make: - popl %es # es = ds - movzwl 0x18(%ebp),%ecx # Get user's CX - shll $0x1,%ecx # Convert count from words - rep # repeat... - movsb # perform copy. - popl %edi # Restore - popl %esi # registers - movb $0x0,0x1d(%ebp) # set ah = 0 to indicate - # success - andb $0xfe,%dl # clear CF - jmp v86mon.5 # Finish up /* * Reboot the machine by setting the reboot flag and exiting @@ -610,37 +382,8 @@ jmp exit # Terminate BTX and reboot /* - * Emulate INT imm8... also make sure to check if it's int 15/87 + * Protected Mode Hardware interrupt jump table. */ -v86intn: lodsb # Get int no - cmpb $0x19,%al # is it int 19? - je reboot # yes, reboot the machine - cmpb $0x15,%al # is it int 15? - jne v86intn.1 # no, skip parse - cmpb $0x87,0x1d(%ebp) # is it the memcpy subfunction? - je int15_87 # yes - cmpw $0x4f53,0x1c(%ebp) # is it the delete key callout? - jne v86intn.1 # no, handle the int normally - movb BDA_KEYFLAGS,%ch # get the shift key state - andb $0xc,%ch # mask off just Ctrl and Alt - cmpb $0xc,%ch # are both Ctrl and Alt down? - je reboot # yes, reboot the machine -v86intn.1: subl %edi,%esi # From - shrl $0x4,%edi # linear - movw %dx,-0x2(%ebx) # Save flags - movw %di,-0x4(%ebx) # Save CS - leal -0x6(%ebx),%ebx # Adjust SP - movw %si,(%ebx) # Save IP - shll $0x2,%eax # Scale - movzwl (%eax),%esi # Load IP - movzwl 0x2(%eax),%edi # Load CS - movl %edi,0x2c(%ebp) # Save CS - xorl %edi,%edi # No ESI adjustment - andb $~0x1,%dh # Clear TF - jmp v86mon.5 # Finish up -/* - * Hardware interrupt jump table. - */ intx20: push $0x8 # Int 0x20: IRQ0 jmp int_hw # V86 int 0x8 push $0x9 # Int 0x21: IRQ1 @@ -673,127 +416,239 @@ jmp int_hw # V86 int 0x76 push $0x77 # Int 0x2f: IRQ15 jmp int_hw # V86 int 0x77 + /* - * Reflect hardware interrupts. + * Invoke real mode interrupt/function call from user mode with arguments. */ -int_hw: testb $0x2,0xe(%esp,1) # V86 mode? - jz intusr # No - pushl $SEL_SDATA # Address - popl %ds # data - xchgl %eax,(%esp,1) # Swap EAX, int no - pushl %ebp # Address - movl %esp,%ebp # stack frame - pushl %ebx # Save - shll $0x2,%eax # Get int - movl (%eax),%eax # vector - subl $0x6,0x14(%ebp) # Adjust V86 ESP - movzwl 0x18(%ebp),%ebx # V86 SS - shll $0x4,%ebx # * 0x10 - addl 0x14(%ebp),%ebx # + V86 ESP - xchgw %ax,0x8(%ebp) # Swap V86 IP - rorl $0x10,%eax # Swap words - xchgw %ax,0xc(%ebp) # Swap V86 CS - roll $0x10,%eax # Swap words - movl %eax,(%ebx) # CS:IP for IRET - movl 0x10(%ebp),%eax # V86 flags - movw %ax,0x4(%ebx) # Flags for IRET - andb $~0x3,0x11(%ebp) # Clear IF, TF - popl %ebx # Restore - popl %ebp # saved - popl %eax # registers - iret # To V86 mode +intx31: pushl $-1 # Dummy int no for btx_v86 /* - * Invoke V86 interrupt from user mode, with arguments. + * Invoke real mode interrupt/function call from protected mode. + * + * We place a trampoline on the user stack that will return to rret_tramp + * which will reenter protected mode and then finally return to the user + * client. + * + * Kernel frame %esi points to: Real mode stack frame at MEM_ESPR: + * + * -0x00 user %ss -0x04 kernel %esp (with full frame) + * -0x04 user %esp -0x08 btx_v86 pointer + * -0x08 user %eflags -0x0c flags (only used if interrupt) + * -0x0c user %cs -0x10 real mode CS:IP return trampoline + * -0x10 user %eip -0x12 real mode flags + * -0x14 int no -0x16 real mode CS:IP (target) + * -0x18 %eax + * -0x1c %ecx + * -0x20 %edx + * -0x24 %ebx + * -0x28 %esp + * -0x2c %ebp + * -0x30 %esi + * -0x34 %edi + * -0x38 %gs + * -0x3c %fs + * -0x40 %ds + * -0x44 %es */ -intx31: stc # Have btx_v86 - pushl %eax # Missing int no -/* - * Invoke V86 interrupt from user mode. - */ -intusr: std # String ops dec - pushl %eax # Expand - pushl %eax # stack - pushl %eax # frame - pusha # Save +int_hw: cld # String ops inc + pusha # Save gp regs pushl %gs # Save - movl %esp,%eax # seg regs - pushl %fs # and - pushl %ds # point - pushl %es # to them + pushl %fs # seg + pushl %ds # regs + pushl %es push $SEL_SDATA # Set up popl %ds # to pushl %ds # address popl %es # data + leal 0x44(%esp,1),%esi # Base of frame + movl -0x14(%esi),%eax # Get Int no + cmpl $-1,%eax # Hardware interrupt? + jne intusr.2 # Yes +/* + * v86 calls save the btx_v86 pointer on the real mode stack and read the + * address and flags from the btx_v86 structure. + */ movl $MEM_USR,%ebx # User base movl %ebx,%edx # address - jc intusr.1 # If btx_v86 - xorl %edx,%edx # Control flags - xorl %ebp,%ebp # btx_v86 pointer -intusr.1: leal 0x50(%esp,1),%esi # Base of frame - pushl %esi # Save addl -0x4(%esi),%ebx # User ESP - movl MEM_TSS+TSS_ESP1,%edi # Link stack pointer - leal -0x4(%edi),%edi # Adjust for push - xorl %ecx,%ecx # Zero - movb $0x5,%cl # Push exception - rep # frame on - movsl # link stack - xchgl %eax,%esi # Saved seg regs - movl 0x40(%esp,1),%eax # Get int no - testl %edx,%edx # Have btx_v86? - jz intusr.2 # No movl (%ebx),%ebp # btx_v86 pointer - movb $0x4,%cl # Count - addl %ecx,%ebx # Adjust for pop - rep # Push saved seg regs - movsl # on link stack addl %ebp,%edx # Flatten btx_v86 ptr - leal 0x14(%edx),%esi # Seg regs pointer - movl 0x4(%edx),%eax # Get int no/address - movzwl 0x2(%edx),%edx # Get control flags -intusr.2: movl %ebp,(%edi) # Push btx_v86 and - movl %edi,MEM_TSS+TSS_ESP1 # save link stack ptr - popl %edi # Base of frame - xchgl %eax,%ebp # Save intno/address - movl 0x48(%esp,1),%eax # Get flags - testb $0x2,%dl # Simulate CALLF? - jnz intusr.3 # Yes - decl %ebx # Push flags - decl %ebx # on V86 - movw %ax,(%ebx) # stack -intusr.3: movb $0x4,%cl # Count - subl %ecx,%ebx # Push return address - movl $inthlt,(%ebx) # on V86 stack - rep # Copy seg regs to - movsl # exception frame - xchgl %eax,%ecx # Save flags - movl %ebx,%eax # User ESP - subl $V86_STK,%eax # Less bytes - ja intusr.4 # to - xorl %eax,%eax # keep -intusr.4: shrl $0x4,%eax # Gives segment - stosl # Set SS - shll $0x4,%eax # To bytes - xchgl %eax,%ebx # Swap - subl %ebx,%eax # Gives offset - stosl # Set ESP - xchgl %eax,%ecx # Get flags - btsl $0x11,%eax # Set VM - andb $~0x1,%ah # Clear TF - stosl # Set EFL - xchgl %eax,%ebp # Get int no/address - testb $0x1,%dl # Address? - jnz intusr.5 # Yes + movl %edx,MEM_ESPR-0x08 # Save btx_v86 ptr + movl -0x08(%esi),%ebx # Pass user flags to + movw %bx,MEM_ESPR-0x12 # real mode target + movl V86_ADDR(%edx),%eax # Get int no/address + movl V86_CTL(%edx),%edx # Get control flags + jmp intusr.3 # Skip hardware interrupt +/* + * Hardware interrupts store a NULL btx_v86 pointer and use the address + * (interrupt number) from the stack with empty flags. Also, we clear + * the segment registers for the interrupt handler and ensure interrupts + * are disabled when the interrupt handler is invoked. + */ +intusr.2: xorl %edx,%edx # Control flags + movl %edx,MEM_ESPR-0x08 # NULL btx_v86 ptr + movl %edx,-0x38(%esi) # Real mode %gs of 0 + movl %edx,-0x3c(%esi) # Real mode %fs of 0 + movl %edx,-0x40(%esi) # Real mode %ds of 0 + movl %edx,-0x44(%esi) # Real mode %es of 0 + movl -0x08(%esi),%ebx # Pass user flags with + andl $~0x200,%ebx # interrupts disabled + movw %bx,MEM_ESPR-0x12 # to real mode target +/* + * %eax now holds either the interrupt number or segment:offset of function. + * %edx now holds the V86F_* flags. + */ +intusr.3: testl $V86F_ADDR,%edx # Segment:offset? + jnz intusr.4 # Yes shll $0x2,%eax # Scale movl (%eax),%eax # Load int vector -intusr.5: movl %eax,%ecx # Save - shrl $0x10,%eax # Gives segment - stosl # Set CS - movw %cx,%ax # Restore - stosl # Set EIP - leal 0x10(%esp,1),%esp # Discard seg regs - popa # Restore - iret # To V86 mode + jmp intusr.5 # Skip CALLF test +intusr.4: testl $V86F_CALLF,%edx # Far call? + jnz intusr.5 # Ok + movl %edx,0x30(%esp,1) # Place VM86 flags in int no + movl $badvm86,%esi # Display bad + call putstr # VM86 call + popl %es # Restore + popl %ds # seg + popl %fs # regs + popl %gs + popal # Restore gp regs + jmp ex_noc # Panic +/* + * If this is a v86 call, copy the seg regs out of the btx_v86 structure. + */ +intusr.5: movl MEM_ESPR-0x08,%ecx # Get btx_v86 ptr + jecxz intusr.6 # Skip for hardware ints + leal -0x44(%esi),%edi # %edi => kernel stack seg regs + pushl %esi # Save + leal V86_ES(%ecx),%esi # %esi => btx_v86 seg regs + movl $4,%ecx # Copy seg regs + rep # from btx_v86 + movsl # to kernel stack + popl %esi # Restore +intusr.6: movl %esp,MEM_ESPR-0x04 # Save kernel stack pointer + movl -0x08(%esi),%ebx # Copy user flags to real + movl %ebx,MEM_ESPR-0x0c # mode return trampoline + movl $rret_tramp,%ebx # Set return trampoline + movl %ebx,MEM_ESPR-0x10 # CS:IP + movl %eax,MEM_ESPR-0x16 # Real mode target CS:IP + ljmpw $SEL_RCODE,$intusr.7 # Change to 16-bit segment + .code16 +intusr.7: movl %cr0,%eax # Leave + dec %al # protected + movl %eax,%cr0 # mode + ljmpw $0x0,$intusr.8 +intusr.8: xorw %ax,%ax # Reset %ds + movw %ax,%ds # and + movw %ax,%ss # %ss + lidt ivtdesc # Set IVT + popl %es # Restore + popl %ds # seg + popl %fs # regs + popl %gs + popal # Restore gp regs + movw $MEM_ESPR-0x16,%sp # Switch to real mode stack + iret # Call target routine +/* + * For the return to real mode we setup a stack frame like this on the real + * mode stack. Note that callf calls won't pop off the flags, but we just + * ignore that by repositioning %sp to be just above the btx_v86 pointer + * so it is aligned. The stack is relative to MEM_ESPR. + * + * -0x04 kernel %esp + * -0x08 btx_v86 + * -0x0c %eax + * -0x10 %ecx + * -0x14 %edx + * -0x18 %ebx + * -0x1c %esp + * -0x20 %ebp + * -0x24 %esi + * -0x28 %edi + * -0x2c %gs + * -0x30 %fs + * -0x34 %ds + * -0x38 %es + * -0x3c %eflags + */ +rret_tramp: movw $MEM_ESPR-0x08,%sp # Reset stack pointer + pushal # Save gp regs + pushl %gs # Save + pushl %fs # seg + pushl %ds # regs + pushl %es + pushfl # Save %eflags + cli # Disable interrupts + std # String ops dec + xorw %ax,%ax # Reset seg + movw %ax,%ds # regs + movw %ax,%es # (%ss is already 0) + lidt idtdesc # Set IDT + lgdt gdtdesc # Set GDT + mov %cr0,%eax # Switch to protected + inc %ax # mode + mov %eax,%cr0 # + ljmp $SEL_SCODE,$rret_tramp.1 # To 32-bit code + .code32 +rret_tramp.1: xorl %ecx,%ecx # Zero + movb $SEL_SDATA,%cl # Setup + movw %cx,%ss # 32-bit + movw %cx,%ds # seg + movw %cx,%es # regs + movl MEM_ESPR-0x04,%esp # Switch to kernel stack + leal 0x44(%esp,1),%esi # Base of frame + andb $~0x2,tss_desc+0x5 # Clear TSS busy + movb $SEL_TSS,%cl # Set task + ltr %cx # register +/* + * Now we are back in protected mode. Copy the registers off of the real + * mode stack onto the kernel stack. Also, initialize all the seg regs on + * the kernel stack. + * + * Note that the %esp in the kernel stack after this is garbage, but popa + * ignores it, so we don't have to fix it up. + */ + leal -0x18(%esi),%edi # Kernel stack GP regs + pushl %esi # Save + movl $MEM_ESPR-0x0c,%esi # Real mode stack GP regs + movl $8,%ecx # Copy GP regs from + rep # real mode stack + movsl # to kernel stack + popl %esi # Restore + movl $SEL_UDATA,%eax # Selector for data seg regs + movl $4,%ecx # Initialize %ds, + rep # %es, %fs, and + stosl # %gs +/* + * If this was a V86 call, copy the saved seg regs on the real mode stack + * back over to the btx_v86 structure. Also, conditionally update the saved + * eflags on the kernel stack based on the flags from the user. + */ + movl MEM_ESPR-0x08,%ecx # Get btx_v86 ptr + jecxz rret_tramp.3 # Skip for hardware ints + leal V86_GS(%ecx),%edi # %edi => btx_v86 seg regs + pushl %esi # Save + leal MEM_ESPR-0x2c,%esi # %esi => real mode seg regs + xchgl %ecx,%edx # Save btx_v86 ptr + movl $4,%ecx # Copy seg regs + rep # from real mode stack + movsl # to btx_v86 + popl %esi # Restore + movl V86_CTL(%edx),%edx # Read V86 control flags + testl $V86F_FLAGS,%edx # User wants flags? + jz rret_tramp.3 # No + movl MEM_ESPR-0x3c,%eax # Read real mode flags + movw %ax,-0x08(%esi) # Update user flags (low 16) +/* + * Return to the user task + */ +rret_tramp.3: popl %es # Restore + popl %ds # seg + popl %fs # regs + popl %gs + popal # Restore gp regs + addl $4,%esp # Discard int no + iret # Return to user mode + /* * System Call. */ @@ -1035,6 +890,61 @@ ret # To caller #endif + .code16 +/* + * Real Mode Hardware interrupt jump table. + */ +intr20: push $0x8 # Int 0x20: IRQ0 + jmp int_hwr # V86 int 0x8 + push $0x9 # Int 0x21: IRQ1 + jmp int_hwr # V86 int 0x9 + push $0xa # Int 0x22: IRQ2 + jmp int_hwr # V86 int 0xa + push $0xb # Int 0x23: IRQ3 + jmp int_hwr # V86 int 0xb + push $0xc # Int 0x24: IRQ4 + jmp int_hwr # V86 int 0xc + push $0xd # Int 0x25: IRQ5 + jmp int_hwr # V86 int 0xd + push $0xe # Int 0x26: IRQ6 + jmp int_hwr # V86 int 0xe + push $0xf # Int 0x27: IRQ7 + jmp int_hwr # V86 int 0xf + push $0x70 # Int 0x28: IRQ8 + jmp int_hwr # V86 int 0x70 + push $0x71 # Int 0x29: IRQ9 + jmp int_hwr # V86 int 0x71 + push $0x72 # Int 0x2a: IRQ10 + jmp int_hwr # V86 int 0x72 + push $0x73 # Int 0x2b: IRQ11 + jmp int_hwr # V86 int 0x73 + push $0x74 # Int 0x2c: IRQ12 + jmp int_hwr # V86 int 0x74 + push $0x75 # Int 0x2d: IRQ13 + jmp int_hwr # V86 int 0x75 + push $0x76 # Int 0x2e: IRQ14 + jmp int_hwr # V86 int 0x76 + push $0x77 # Int 0x2f: IRQ15 + jmp int_hwr # V86 int 0x77 +/* + * Reflect hardware interrupts in real mode. + */ +int_hwr: push %ax # Save + push %ds # Save + push %bp # Save + mov %sp,%bp # Address stack frame + xchg %bx,6(%bp) # Swap BX, int no + xor %ax,%ax # Set %ds:%bx to + shl $2,%bx # point to + mov %ax,%ds # IDT entry + mov (%bx),%ax # Load IP + mov 2(%bx),%bx # Load CS + xchg %ax,4(%bp) # Swap saved %ax,%bx with + xchg %bx,6(%bp) # CS:IP of handler + pop %bp # Restore >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 11 08:33:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 453D21065674; Tue, 11 Mar 2008 08:33:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 04BD61065670 for ; Tue, 11 Mar 2008 08:33:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D57378FC14 for ; Tue, 11 Mar 2008 08:33:57 +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.14.1/8.14.1) with ESMTP id m2B8XvC3050190 for ; Tue, 11 Mar 2008 08:33:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2B8Xvcq050188 for perforce@freebsd.org; Tue, 11 Mar 2008 08:33:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Mar 2008 08:33:57 GMT Message-Id: <200803110833.m2B8Xvcq050188@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 137386 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, 11 Mar 2008 08:33:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=137386 Change 137386 by rwatson@rwatson_cinnamon on 2008/03/11 08:33:27 Remove duplicate definitions of bpf default and maximum buffer sizes that got reintroduced during an integration at some point. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#48 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#48 (text+ko) ==== @@ -123,12 +123,6 @@ static int bpf_stats_sysctl(SYSCTL_HANDLER_ARGS); SYSCTL_NODE(_net, OID_AUTO, bpf, CTLFLAG_RW, 0, "bpf sysctl"); -static int bpf_bufsize = 4096; -SYSCTL_INT(_net_bpf, OID_AUTO, bufsize, CTLFLAG_RW, - &bpf_bufsize, 0, "Default bpf buffer size"); -static int bpf_maxbufsize = BPF_MAXBUFSIZE; -SYSCTL_INT(_net_bpf, OID_AUTO, maxbufsize, CTLFLAG_RW, - &bpf_maxbufsize, 0, "Maximum bpf buffer size"); static int bpf_maxinsns = BPF_MAXINSNS; SYSCTL_INT(_net_bpf, OID_AUTO, maxinsns, CTLFLAG_RW, &bpf_maxinsns, 0, "Maximum bpf program instructions"); From owner-p4-projects@FreeBSD.ORG Tue Mar 11 13:48:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B330A1065675; Tue, 11 Mar 2008 13:48:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72D4B1065672 for ; Tue, 11 Mar 2008 13:48:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4793E8FC1E for ; Tue, 11 Mar 2008 13:48:33 +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.14.1/8.14.1) with ESMTP id m2BDmXKJ019956 for ; Tue, 11 Mar 2008 13:48:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BDmW4Z019946 for perforce@freebsd.org; Tue, 11 Mar 2008 13:48:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Mar 2008 13:48:32 GMT Message-Id: <200803111348.m2BDmW4Z019946@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 137393 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, 11 Mar 2008 13:48:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=137393 Change 137393 by rwatson@rwatson_fledge on 2008/03/11 13:47:35 Revert a wording to the CVS version, which seems preferable. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpfdesc.h#9 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpfdesc.h#9 (text+ko) ==== @@ -52,7 +52,7 @@ struct bpf_d { LIST_ENTRY(bpf_d) bd_next; /* Linked list of descriptors */ /* - * Buffer slots: two memory buffers buffer the incoming packets. + * Buffer slots: two memory buffers store the incoming packets. * The model has three slots. Sbuf is always occupied. * sbuf (store) - Receive interrupt puts packets here. * hbuf (hold) - When sbuf is full, put buffer here and From owner-p4-projects@FreeBSD.ORG Tue Mar 11 14:01:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DC1F1065672; Tue, 11 Mar 2008 14:01:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D81F106566C for ; Tue, 11 Mar 2008 14:01:47 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 130188FC1C for ; Tue, 11 Mar 2008 14:01:47 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2BE1kwx030757 for ; Tue, 11 Mar 2008 14:01:46 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BE1k8q030755 for perforce@freebsd.org; Tue, 11 Mar 2008 14:01:46 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Tue, 11 Mar 2008 14:01:46 GMT Message-Id: <200803111401.m2BE1k8q030755@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 137394 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, 11 Mar 2008 14:01:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=137394 Change 137394 by zhouzhouyi@zhouzhouyi_mactest on 2008/03/11 14:01:06 add setuid and setgid test for MAC Framework follows the example of fstest/fstest.c Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#15 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#15 (text+ko) ==== @@ -230,7 +230,7 @@ usage(void) { - fprintf(stderr, "usage: mactest -m label_string -f macconf_file syscall args ...\n"); + fprintf(stderr, "usage: mactest [-u uid] [-g gid1[,gid2[...]]] -m label_string -f macconf_file syscall args ...\n"); exit(1); } @@ -549,6 +549,42 @@ return (i); } + +static void +set_gids(char *gids) +{ + gid_t *gidset; + long ngroups; + char *g, *endp; + unsigned i; + + ngroups = sysconf(_SC_NGROUPS_MAX); + assert(ngroups > 0); + gidset = malloc(sizeof(*gidset) * ngroups); + assert(gidset != NULL); + for (i = 0, g = strtok(gids, ","); g != NULL; g = strtok(NULL, ","), i++) { + if (i >= ngroups) { + fprintf(stderr, "too many gids\n"); + exit(1); + } + gidset[i] = strtol(g, &endp, 0); + if (*endp != '\0' && !isspace((unsigned char)*endp)) { + fprintf(stderr, "invalid gid '%s' - number expected\n", + g); + exit(1); + } + } + if (setgroups(i, gidset) < 0) { + fprintf(stderr, "cannot change groups: %s\n", strerror(errno)); + exit(1); + } + if (setegid(gidset[0]) < 0) { + fprintf(stderr, "cannot change effective gid: %s\n", strerror(errno)); + exit(1); + } + free(gidset); +} + int main(int argc, char *argv[]) { @@ -560,10 +596,13 @@ int error; int mactestpipefd; char buf[2048]; - int ch; + char *gids, *endp; + int uid, ch; + uid = -1; + gids = NULL; - while ((ch = getopt(argc, argv, "m:f:")) != -1) { + while ((ch = getopt(argc, argv, "m:f:g:u:")) != -1) { switch(ch) { case 'm': label_string = optarg; @@ -571,6 +610,17 @@ case 'f': macconf_file = optarg; break; + case 'g': + gids = optarg; + break; + case 'u': + uid = (int)strtol(optarg, &endp, 0); + if (*endp != '\0' && !isspace((unsigned char)*endp)) { + fprintf(stderr, "invalid uid '%s' - number " + "expected\n", optarg); + exit(1); + } + break; default: usage(); } @@ -611,6 +661,18 @@ logfd = open(LOGDEV, O_RDWR); + if (gids != NULL) { + set_gids(gids); + } + + if (uid != -1) { + if (setuid(uid) < 0) { + fprintf(stderr, "cannot change uid: %s\n", + strerror(errno)); + exit(1); + } + } + /*Begin to log */ ioctl(logfd, BEGINLOG, NULL); From owner-p4-projects@FreeBSD.ORG Tue Mar 11 14:31:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0A131065673; Tue, 11 Mar 2008 14:31:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8DE9D1065671 for ; Tue, 11 Mar 2008 14:31:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 62BF28FC12 for ; Tue, 11 Mar 2008 14:31:20 +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.14.1/8.14.1) with ESMTP id m2BEVK8X037318 for ; Tue, 11 Mar 2008 14:31:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BEVK64037316 for perforce@freebsd.org; Tue, 11 Mar 2008 14:31:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Mar 2008 14:31:20 GMT Message-Id: <200803111431.m2BEVK64037316@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 137397 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, 11 Mar 2008 14:31:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=137397 Change 137397 by rwatson@rwatson_cinnamon on 2008/03/11 14:30:41 A bit more detail on the shared memory model and a pointer to bpf(4). Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#29 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#29 (text+ko) ==== @@ -60,7 +60,11 @@ * are mapped into the kernel address space using sf_bufs and used directly * by BPF. Memory is wired since page faults cannot be tolerated in the * contexts where the buffers are copied to (locks held, interrupt context, - * etc). + * etc). Access to shared memory buffers is synchronized using a header on + * each buffer, allowing the number of system calls to go to zero as BPF + * reaches saturation (buffers filled as fast as they can be drained by the + * user process). Full details of the protocol for communicating between the + * user process and BPF may be found in bpf(4). */ /* From owner-p4-projects@FreeBSD.ORG Tue Mar 11 14:34:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CEC61065672; Tue, 11 Mar 2008 14:34:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C09721065671 for ; Tue, 11 Mar 2008 14:34:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 950FB8FC15 for ; Tue, 11 Mar 2008 14:34:23 +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.14.1/8.14.1) with ESMTP id m2BEYN8K037457 for ; Tue, 11 Mar 2008 14:34:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BEYN5s037455 for perforce@freebsd.org; Tue, 11 Mar 2008 14:34:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Mar 2008 14:34:23 GMT Message-Id: <200803111434.m2BEYN5s037455@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 137398 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, 11 Mar 2008 14:34:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=137398 Change 137398 by rwatson@rwatson_cinnamon on 2008/03/11 14:33:23 Comment for zrotbuf. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#30 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#30 (text+ko) ==== @@ -414,6 +414,11 @@ return (0); } +/* + * Ioctl to force rotation of the two buffers, if there's any data available. + * This can be used by user space to implement time outs when waiting for a + * buffer to fill. + */ int bpf_zerocopy_ioctl_rotzbuf(struct thread *td, struct bpf_d *d, struct bpf_zbuf *bz) From owner-p4-projects@FreeBSD.ORG Tue Mar 11 14:43:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D98651065672; Tue, 11 Mar 2008 14:43:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98F13106566C for ; Tue, 11 Mar 2008 14:43:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6DAFB8FC1F for ; Tue, 11 Mar 2008 14:43:33 +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.14.1/8.14.1) with ESMTP id m2BEhXRu038925 for ; Tue, 11 Mar 2008 14:43:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BEhXdC038923 for perforce@freebsd.org; Tue, 11 Mar 2008 14:43:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Mar 2008 14:43:33 GMT Message-Id: <200803111443.m2BEhXdC038923@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 137399 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, 11 Mar 2008 14:43:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=137399 Change 137399 by rwatson@rwatson_cinnamon on 2008/03/11 14:42:42 Don't optimize failure handling in BPF buffer setup, and hence avoid redundant checks. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#31 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#31 (text+ko) ==== @@ -464,19 +464,7 @@ return (EINVAL); /* - * As a simplifying assumption, we allow buffers to be designated - * only once per descriptor. Checked up front to save some trouble, - * as we can more easily return EINVAL here; if the system is low on - * sf_bufs, then it will be ENOMEM later. - * - * Note: lockless read. - */ - if (d->bd_hbuf != NULL || d->bd_sbuf != NULL || d->bd_fbuf != NULL || - d->bd_bif != NULL) - return (EINVAL); - - /* - * Allocate new buffers if required. + * Allocate new buffers. */ error = zbuf_setup(td, (vm_offset_t)bz->bz_bufa, bz->bz_buflen, &zba); From owner-p4-projects@FreeBSD.ORG Tue Mar 11 14:45:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 464441065678; Tue, 11 Mar 2008 14:45:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 055631065677 for ; Tue, 11 Mar 2008 14:45:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CDECD8FC21 for ; Tue, 11 Mar 2008 14:45:35 +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.14.1/8.14.1) with ESMTP id m2BEjZWv039113 for ; Tue, 11 Mar 2008 14:45:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BEjZxs039111 for perforce@freebsd.org; Tue, 11 Mar 2008 14:45:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Mar 2008 14:45:35 GMT Message-Id: <200803111445.m2BEjZxs039111@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 137400 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, 11 Mar 2008 14:45:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=137400 Change 137400 by rwatson@rwatson_cinnamon on 2008/03/11 14:44:35 Attempt to clarify the setup checks being done a little more. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#32 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#32 (text+ko) ==== @@ -479,7 +479,8 @@ } /* - * Perform atomic check-and-exchange. + * We only allow buffers to be installed once, so atomically check + * that no buffers are currently installed and install new buffers. */ BPFD_LOCK(d); if (d->bd_hbuf != NULL || d->bd_sbuf != NULL || d->bd_fbuf != NULL || From owner-p4-projects@FreeBSD.ORG Tue Mar 11 14:46:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87D8B1065676; Tue, 11 Mar 2008 14:46:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 471FF106566C for ; Tue, 11 Mar 2008 14:46:37 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B2AA8FC12 for ; Tue, 11 Mar 2008 14:46:37 +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.14.1/8.14.1) with ESMTP id m2BEkaA2039202 for ; Tue, 11 Mar 2008 14:46:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BEkaVo039200 for perforce@freebsd.org; Tue, 11 Mar 2008 14:46:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Mar 2008 14:46:36 GMT Message-Id: <200803111446.m2BEkaVo039200@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 137401 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, 11 Mar 2008 14:46:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=137401 Change 137401 by rwatson@rwatson_cinnamon on 2008/03/11 14:46:03 Minor style tweaks. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#33 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf_zerocopy.c#33 (text+ko) ==== @@ -186,15 +186,21 @@ *zbp = NULL; - /* User address must be page-aligned. */ + /* + * User address must be page-aligned. + */ if (uaddr & PAGE_MASK) return (EINVAL); - /* Length must be an integer number of full pages. */ + /* + * Length must be an integer number of full pages. + */ if (len & PAGE_MASK) return (EINVAL); - /* Length must not exceed per-buffer resource limit. */ + /* + * Length must not exceed per-buffer resource limit. + */ if ((len / PAGE_SIZE) > BPF_MAX_PAGES) return (EINVAL); @@ -470,7 +476,6 @@ &zba); if (error) return (error); - error = zbuf_setup(td, (vm_offset_t)bz->bz_bufb, bz->bz_buflen, &zbb); if (error) { From owner-p4-projects@FreeBSD.ORG Tue Mar 11 14:57:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71CC51065697; Tue, 11 Mar 2008 14:57:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EDDB81065678 for ; Tue, 11 Mar 2008 14:57:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C203B8FC1B for ; Tue, 11 Mar 2008 14:57:48 +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.14.1/8.14.1) with ESMTP id m2BEvmA3042005 for ; Tue, 11 Mar 2008 14:57:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BEvmX5042003 for perforce@freebsd.org; Tue, 11 Mar 2008 14:57:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Mar 2008 14:57:48 GMT Message-Id: <200803111457.m2BEvmX5042003@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 137403 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, 11 Mar 2008 14:57:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=137403 Change 137403 by rwatson@rwatson_cinnamon on 2008/03/11 14:57:12 Update README. Affected files ... .. //depot/projects/zcopybpf/README#5 edit Differences ... ==== //depot/projects/zcopybpf/README#5 (text+ko) ==== @@ -4,12 +4,12 @@ Reduce the number of system calls, copies, and even context switches in BPF by adding shared memory buffers between userspace and the kernel. Processes select zero-copy buffer mode, "donate" two buffers to the kernel, which are -used in place of the two kernel memory buffers in BPF. They can then use -BPF ioctls to query the state of the buffers, acknowledge/rotate them, -select on their being ready to read, etc. They can also use a solely shared -memory interface to check for new data and acknowledge buffers, so as load -increases, the number of system calls required to access the BPF stream -approaches zero. +used in place of the two kernel memory buffers in BPF. The process uses a +shared memory interface to check for new data and acknowledge buffers, but +can also use an ioctl to force early rotation of a buffer before it is full +(timeout), and select()/poll()/kevent() to wait for a buffer to fill. This +API allows the number of system calls used to access BPF data to go to zero +as the load increases. This implementation was created by Robert N. M. Watson under contract to Seccuris Inc., in collaboration with Christian S. J. Peron of Seccuris Inc, @@ -19,21 +19,20 @@ -------- Untar the tarball and drop the new src/ files into your src/ tree; this -should consist of two new .c files and two new .h files in src/sys/net/, and -two sample kernel config files that enable BPF_ZEROCOPY. +should consist of two new .c files and two new .h files in src/sys/net/. Apply the patch, which should modify a number of files in the kernel, especially src/sys/net and src/sys/conf, as well as in contrib/libpcap in order to teach the pcap library how to use zero-copy buffers. -Build a fresh kernel and install it, with options BPF_ZEROCOPY if you want -zero-copy buffer support. Build and install a fresh libpcap. +Build a fresh kernel and install it; build and install a fresh libpcap. -A new sysctl will be present, net.bpf.zerocopy_enable -- if it is set to 1 -(the default) then all new BPF sessions created by libpcap will use zero-copy -support. If set to 0, new sessions will use buffered reads. The -BPF_ZERO_COPY/BPF_ZEROCOPY environmental variables used in earlier prototypes -have now been removed in favour of this model. +A new sysctl will be present, net.bpf.zerocopy_enable -- when it is set to 1 +all new BPF sessions created by libpcap will use zero-copy support. If set +to 0, new sessions will use buffered reads. The BPF_ZEROCOPY kernel option +and BPF_ZERO_COPY/BPF_ZEROCOPY environmental variables used in earlier +prototypes have now been removed in favour of this run-time configuration +model. Notes ----- From owner-p4-projects@FreeBSD.ORG Tue Mar 11 15:09:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF33B1065679; Tue, 11 Mar 2008 15:09:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E30A1065675 for ; Tue, 11 Mar 2008 15:09:00 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6329F8FC2D for ; Tue, 11 Mar 2008 15:09:00 +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.14.1/8.14.1) with ESMTP id m2BF90TS043784 for ; Tue, 11 Mar 2008 15:09:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BF9051043782 for perforce@freebsd.org; Tue, 11 Mar 2008 15:09:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Mar 2008 15:09:00 GMT Message-Id: <200803111509.m2BF9051043782@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 137406 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, 11 Mar 2008 15:09:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=137406 Change 137406 by rwatson@rwatson_cinnamon on 2008/03/11 15:08:32 Embed the size of struct xbpf_d in the structure so that userspace can check that the run-time version is the same as the compile-time version. Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#49 edit .. //depot/projects/zcopybpf/src/sys/net/bpfdesc.h#10 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#49 (text+ko) ==== @@ -1959,6 +1959,7 @@ bzero(d, sizeof(*d)); BPFD_LOCK_ASSERT(bd); + d->bd_structsize = sizeof(*d); d->bd_immediate = bd->bd_immediate; d->bd_promisc = bd->bd_promisc; d->bd_hdrcmplt = bd->bd_hdrcmplt; ==== //depot/projects/zcopybpf/src/sys/net/bpfdesc.h#10 (text+ko) ==== @@ -114,6 +114,7 @@ * External representation of the bpf descriptor */ struct xbpf_d { + u_int bd_structsize; /* Size of this structure. */ u_char bd_promisc; u_char bd_immediate; int bd_hdrcmplt; From owner-p4-projects@FreeBSD.ORG Tue Mar 11 15:28:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E70361065673; Tue, 11 Mar 2008 15:28:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A55781065671 for ; Tue, 11 Mar 2008 15:28:20 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7B50C8FC25 for ; Tue, 11 Mar 2008 15:28:20 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2BFSKhi049544 for ; Tue, 11 Mar 2008 15:28:20 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BFSKak049542 for perforce@freebsd.org; Tue, 11 Mar 2008 15:28:20 GMT (envelope-from piso@freebsd.org) Date: Tue, 11 Mar 2008 15:28:20 GMT Message-Id: <200803111528.m2BFSKak049542@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 137408 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, 11 Mar 2008 15:28:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=137408 Change 137408 by piso@piso_ferret on 2008/03/11 15:27:45 Delete the old Packet*() API: it has been deprectaed and marked as 'don't use it' for 2 releases, it's time to axe it. Affected files ... .. //depot/projects/soc2005/libalias/lib/libalias/libalias/Makefile#6 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#16 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_old.c#4 delete Differences ... ==== //depot/projects/soc2005/libalias/lib/libalias/libalias/Makefile#6 (text+ko) ==== @@ -6,7 +6,7 @@ SHLIBDIR?= /lib SHLIB_MAJOR= 6 MAN= libalias.3 -SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c +SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c INCS= alias.h WARNS?= 6 NO_WERROR= ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#16 (text+ko) ==== @@ -81,60 +81,6 @@ */ struct alias_link; - -/* OLD API */ - -/* Initialization and control functions. */ -void PacketAliasInit(void); -void PacketAliasSetAddress(struct in_addr _addr); -void PacketAliasSetFWBase(unsigned int _base, unsigned int _num); -void PacketAliasSetSkinnyPort(unsigned int _port); -unsigned int - PacketAliasSetMode(unsigned int _flags, unsigned int _mask); -void PacketAliasUninit(void); - -/* Packet Handling functions. */ -int PacketAliasIn(char *_ptr, int _maxpacketsize); -int PacketAliasOut(char *_ptr, int _maxpacketsize); -int PacketUnaliasOut(char *_ptr, int _maxpacketsize); - -/* Port and address redirection functions. */ - - -int -PacketAliasAddServer(struct alias_link *_lnk, - struct in_addr _addr, unsigned short _port); -struct alias_link * -PacketAliasRedirectAddr(struct in_addr _src_addr, - struct in_addr _alias_addr); -int PacketAliasRedirectDynamic(struct alias_link *_lnk); -void PacketAliasRedirectDelete(struct alias_link *_lnk); -struct alias_link * -PacketAliasRedirectPort(struct in_addr _src_addr, - unsigned short _src_port, struct in_addr _dst_addr, - unsigned short _dst_port, struct in_addr _alias_addr, - unsigned short _alias_port, unsigned char _proto); -struct alias_link * -PacketAliasRedirectProto(struct in_addr _src_addr, - struct in_addr _dst_addr, struct in_addr _alias_addr, - unsigned char _proto); - -/* Fragment Handling functions. */ -void PacketAliasFragmentIn(char *_ptr, char *_ptr_fragment); -char *PacketAliasGetFragment(char *_ptr); -int PacketAliasSaveFragment(char *_ptr); - -/* Miscellaneous functions. */ -int PacketAliasCheckNewLink(void); -unsigned short - PacketAliasInternetChecksum(unsigned short *_ptr, int _nbytes); -void PacketAliasSetTarget(struct in_addr _target_addr); - -/* Transparent proxying routines. */ -int PacketAliasProxyRule(const char *_cmd); - -/* NEW API */ - /* Initialization and control functions. */ struct libalias *LibAliasInit(struct libalias *); void LibAliasSetAddress(struct libalias *, struct in_addr _addr); From owner-p4-projects@FreeBSD.ORG Tue Mar 11 16:24:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0F711065676; Tue, 11 Mar 2008 16:24:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A07531065671 for ; Tue, 11 Mar 2008 16:24:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 777038FC16 for ; Tue, 11 Mar 2008 16:24:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2BGOJ2i076875 for ; Tue, 11 Mar 2008 16:24:19 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BGOJeI076873 for perforce@freebsd.org; Tue, 11 Mar 2008 16:24:19 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 11 Mar 2008 16:24:19 GMT Message-Id: <200803111624.m2BGOJeI076873@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 137412 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, 11 Mar 2008 16:24:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=137412 Change 137412 by hselasky@hselasky_laptop001 on 2008/03/11 16:23:57 EHCI workarounds for what looks like a BIOS or SMI bug. Reported by John Baldwin. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#31 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#31 (text+ko) ==== @@ -85,7 +85,6 @@ #define PCI_EHCI_BASE_REG 0x10 -static void ehci_pci_givecontroller(device_t self); static void ehci_pci_takecontroller(device_t self); static device_probe_t ehci_pci_probe; @@ -131,7 +130,6 @@ if (err) return (err); ehci_shutdown(sc); - ehci_pci_givecontroller(self); return (0); } @@ -435,8 +433,13 @@ continue; } legsup = eec; - pci_write_config(self, eecp, legsup | EHCI_LEGSUP_OSOWNED, 4); if (legsup & EHCI_LEGSUP_BIOSOWNED) { + /* + * Only set the "OSOWNED" bit if the + * "BIOSOWNED" bit is set: + */ + pci_write_config(self, eecp, + legsup | EHCI_LEGSUP_OSOWNED, 4); device_printf(sc->sc_bus.bdev, "waiting for BIOS " "to give up control\n"); @@ -454,25 +457,6 @@ } } -static void -ehci_pci_givecontroller(device_t self) -{ - ehci_softc_t *sc = device_get_softc(self); - uint32_t cparams, eec, legsup; - int eecp; - - cparams = EREAD4(sc, EHCI_HCCPARAMS); - for (eecp = EHCI_HCC_EECP(cparams); eecp != 0; - eecp = EHCI_EECP_NEXT(eec)) { - eec = pci_read_config(self, eecp, 4); - if (EHCI_EECP_ID(eec) != EHCI_EC_LEGSUP) { - continue; - } - legsup = eec; - pci_write_config(self, eecp, legsup & ~EHCI_LEGSUP_OSOWNED, 4); - } -} - static driver_t ehci_driver = { .name = "ehci", From owner-p4-projects@FreeBSD.ORG Tue Mar 11 16:39:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 536A51065674; Tue, 11 Mar 2008 16:39:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13057106566B for ; Tue, 11 Mar 2008 16:39:35 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E00598FC12 for ; Tue, 11 Mar 2008 16:39:34 +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.14.1/8.14.1) with ESMTP id m2BGdYcw082872 for ; Tue, 11 Mar 2008 16:39:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BGdYVV082870 for perforce@freebsd.org; Tue, 11 Mar 2008 16:39:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Mar 2008 16:39:34 GMT Message-Id: <200803111639.m2BGdYVV082870@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 137413 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, 11 Mar 2008 16:39:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=137413 Change 137413 by rwatson@rwatson_cinnamon on 2008/03/11 16:38:52 Don't print BPF descriptor data if we have the wrong structure size/version, as it may be garbage. Affected files ... .. //depot/projects/zcopybpf/src/usr.sbin/netstat/bpf.c#8 edit Differences ... ==== //depot/projects/zcopybpf/src/usr.sbin/netstat/bpf.c#8 (text+ko) ==== @@ -127,6 +127,10 @@ if (bpf_get_stats(&size, &bd) < 0) return; for (d = &bd[0]; d < &bd[size / sizeof(*d)]; d++) { + if (d->bd_structsize != sizeof(*d)) { + warnx("bpf_stats_extended: version mismatch"); + return; + } if (ifname && strcmp(ifname, d->bd_ifname) != 0) continue; pname = bpf_pidname(d->bd_pid); @@ -169,6 +173,10 @@ "Pid", "Netif", "Flags", "Recv", "Drop", "Match", "Sblen", "Hblen", "Command"); for (d = &bd[0]; d < &bd[size / sizeof(*d)]; d++) { + if (d->bd_structsize != sizeof(*d)) { + warnx("bpf_stats_extended: version mismatch"); + return; + } if (ifname && strcmp(ifname, d->bd_ifname) != 0) continue; bpf_flags(d, flagbuf); From owner-p4-projects@FreeBSD.ORG Tue Mar 11 17:21:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C225E10656D1; Tue, 11 Mar 2008 17:21:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7CAD31065696 for ; Tue, 11 Mar 2008 17:21:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 46CA98FC21 for ; Tue, 11 Mar 2008 17:21:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2BHLHDK098619 for ; Tue, 11 Mar 2008 17:21:17 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BHLHe6098617 for perforce@freebsd.org; Tue, 11 Mar 2008 17:21:17 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 11 Mar 2008 17:21:17 GMT Message-Id: <200803111721.m2BHLHe6098617@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 137414 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, 11 Mar 2008 17:21:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=137414 Change 137414 by hselasky@hselasky_laptop001 on 2008/03/11 17:20:22 Remove unused variable. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ustorage_fs.c#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ustorage_fs.c#2 (text+ko) ==== @@ -128,7 +128,6 @@ uint8_t read_only:1; uint8_t prevent_medium_removal:1; - uint8_t registered:1; uint8_t info_valid:1; uint8_t removable:1; }; From owner-p4-projects@FreeBSD.ORG Tue Mar 11 18:21:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55AA11065675; Tue, 11 Mar 2008 18:21:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 151161065673 for ; Tue, 11 Mar 2008 18:21:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 02BBA8FC14 for ; Tue, 11 Mar 2008 18:21:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2BILMLV006920 for ; Tue, 11 Mar 2008 18:21:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BILMAX006918 for perforce@freebsd.org; Tue, 11 Mar 2008 18:21:22 GMT (envelope-from jb@freebsd.org) Date: Tue, 11 Mar 2008 18:21:22 GMT Message-Id: <200803111821.m2BILMAX006918@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 137419 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, 11 Mar 2008 18:21:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=137419 Change 137419 by jb@jb_freebsd8 on 2008/03/11 18:20:31 I created this file from scratch and I want people to be able to use it as a template to start writing a DTrace provider without any (additional) license hassles, so I'll remove the license altogether. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/prototype.c#9 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/prototype.c#9 (text+ko) ==== @@ -1,34 +1,11 @@ /* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] + * This file is freeware. You are free to use it and add your own + * license. * - * CDDL HEADER END - * - * Portions Copyright 2006-2008 John Birrell jb@freebsd.org - * * $FreeBSD$ * */ -/* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - #include #include #include @@ -40,6 +17,7 @@ static d_open_t prototype_open; static int prototype_unload(void); +static void prototype_getargdesc(void *, dtrace_id_t, void *, dtrace_argdesc_t *); static void prototype_provide(void *, dtrace_probedesc_t *); static void prototype_destroy(void *, dtrace_id_t, void *); static void prototype_enable(void *, dtrace_id_t, void *); @@ -67,9 +45,9 @@ prototype_disable, NULL, NULL, + prototype_getargdesc, NULL, NULL, - NULL, prototype_destroy }; @@ -77,6 +55,11 @@ static dtrace_provider_id_t prototype_id; static void +prototype_getargdesc(void *arg, dtrace_id_t id, void *parg, dtrace_argdesc_t *desc) +{ +} + +static void prototype_provide(void *arg, dtrace_probedesc_t *desc) { } From owner-p4-projects@FreeBSD.ORG Tue Mar 11 18:26:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1C371065671; Tue, 11 Mar 2008 18:26:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7109B106566B for ; Tue, 11 Mar 2008 18:26:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 450418FC2D for ; Tue, 11 Mar 2008 18:26:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2BIQS8Z007063 for ; Tue, 11 Mar 2008 18:26:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BIQSAx007061 for perforce@freebsd.org; Tue, 11 Mar 2008 18:26:28 GMT (envelope-from jb@freebsd.org) Date: Tue, 11 Mar 2008 18:26:28 GMT Message-Id: <200803111826.m2BIQSAx007061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 137420 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, 11 Mar 2008 18:26:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=137420 Change 137420 by jb@jb_freebsd8 on 2008/03/11 18:25:49 Fix the date range. Affected files ... .. //depot/projects/dtrace/src/sys/sys/sdt.h#13 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/sdt.h#13 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright 20062008 John Birrell + * Copyright 2006-2008 John Birrell * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions From owner-p4-projects@FreeBSD.ORG Tue Mar 11 20:24:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F27C1065677; Tue, 11 Mar 2008 20:24:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A47B31065673 for ; Tue, 11 Mar 2008 20:24:37 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 929038FC18 for ; Tue, 11 Mar 2008 20:24:37 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2BKObJB016582 for ; Tue, 11 Mar 2008 20:24:37 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BKOa9m016576 for perforce@freebsd.org; Tue, 11 Mar 2008 20:24:36 GMT (envelope-from peter-gmail@wemm.org) Date: Tue, 11 Mar 2008 20:24:36 GMT Message-Id: <200803112024.m2BKOa9m016576@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137433 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, 11 Mar 2008 20:24:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=137433 Change 137433 by peter@peter_daintree on 2008/03/11 20:24:33 IFC @137432 Affected files ... .. //depot/projects/hammer/Makefile.inc1#132 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#46 integrate .. //depot/projects/hammer/UPDATING#113 integrate .. //depot/projects/hammer/bin/chflags/chflags.1#14 integrate .. //depot/projects/hammer/bin/chflags/chflags.c#8 integrate .. //depot/projects/hammer/bin/cp/cp.1#11 integrate .. //depot/projects/hammer/bin/cp/cp.c#15 integrate .. //depot/projects/hammer/bin/cp/utils.c#11 integrate .. //depot/projects/hammer/bin/realpath/realpath.1#5 integrate .. //depot/projects/hammer/bin/realpath/realpath.c#4 integrate .. //depot/projects/hammer/bin/uuidgen/Makefile#1 branch .. //depot/projects/hammer/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/hammer/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmpd/main.c#12 integrate .. //depot/projects/hammer/etc/Makefile#61 integrate .. //depot/projects/hammer/etc/ddb.conf#1 branch .. //depot/projects/hammer/etc/defaults/rc.conf#83 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#59 integrate .. //depot/projects/hammer/etc/rc.d/ddb#1 branch .. //depot/projects/hammer/etc/rc.d/mountcritlocal#13 integrate .. //depot/projects/hammer/etc/rc.d/mountlate#3 integrate .. //depot/projects/hammer/etc/rc.d/root#14 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#77 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ar/Makefile#7 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/ranlib/Makefile#8 integrate .. //depot/projects/hammer/include/pthread_np.h#8 integrate .. //depot/projects/hammer/include/unistd.h#21 integrate .. //depot/projects/hammer/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.3#15 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.3#26 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_zip.c#17 integrate .. //depot/projects/hammer/lib/libarchive/archive_util.3#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.3#15 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_disk.c#11 integrate .. //depot/projects/hammer/lib/libc/gen/sysconf.c#8 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac.c#8 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac_exec.c#3 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac_get.c#6 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac_set.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/fdopen.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fopen.c#4 integrate .. //depot/projects/hammer/lib/libc/stdio/freopen.c#7 integrate .. //depot/projects/hammer/lib/libc/stdlib/getenv.c#8 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#42 integrate .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#31 integrate .. //depot/projects/hammer/lib/libc/sys/Symbol.map#6 integrate .. //depot/projects/hammer/lib/libc/sys/fcntl.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/kldunload.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/mq_close.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/mq_getattr.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/mq_notify.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/mq_open.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/mq_receive.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/mq_send.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/mq_setattr.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/readlink.2#5 integrate .. //depot/projects/hammer/lib/libelf/elf_update.c#3 integrate .. //depot/projects/hammer/lib/libelf/gelf_rel.c#2 integrate .. //depot/projects/hammer/lib/libelf/gelf_rela.c#2 integrate .. //depot/projects/hammer/lib/libsdp/sdp.h#6 integrate .. //depot/projects/hammer/lib/libthr/pthread.map#18 integrate .. //depot/projects/hammer/lib/libthr/thread/Makefile.inc#15 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_affinity.c#1 branch .. //depot/projects/hammer/lib/libthr/thread/thr_attr.c#9 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_create.c#24 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#22 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#28 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#39 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_sem.c#9 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#16 integrate .. //depot/projects/hammer/lib/libutil/humanize_number.c#3 integrate .. //depot/projects/hammer/lib/msun/Makefile#39 integrate .. //depot/projects/hammer/lib/msun/Symbol.map#9 integrate .. //depot/projects/hammer/lib/msun/amd64/Makefile.inc#9 integrate .. //depot/projects/hammer/lib/msun/amd64/e_sqrtl.S#1 branch .. //depot/projects/hammer/lib/msun/i387/Makefile.inc#10 integrate .. //depot/projects/hammer/lib/msun/i387/e_sqrtl.S#1 branch .. //depot/projects/hammer/lib/msun/ld128/s_nanl.c#2 integrate .. //depot/projects/hammer/lib/msun/man/sqrt.3#5 integrate .. //depot/projects/hammer/lib/msun/src/e_rem_pio2.c#5 integrate .. //depot/projects/hammer/lib/msun/src/e_rem_pio2f.c#9 integrate .. //depot/projects/hammer/lib/msun/src/e_sqrt.c#4 integrate .. //depot/projects/hammer/lib/msun/src/e_sqrtl.c#1 branch .. //depot/projects/hammer/lib/msun/src/math.h#35 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#50 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#36 integrate .. //depot/projects/hammer/sbin/ddb/ddb.8#2 integrate .. //depot/projects/hammer/sbin/ddb/ddb.c#2 integrate .. //depot/projects/hammer/sbin/fsck_ffs/main.c#14 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass1.c#11 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass2.c#8 integrate .. //depot/projects/hammer/sbin/fsck_ffs/setup.c#14 integrate .. //depot/projects/hammer/sbin/geom/Makefile#3 integrate .. //depot/projects/hammer/sbin/geom/class/label/geom_label.c#11 integrate .. //depot/projects/hammer/sbin/geom/class/multipath/gmultipath.8#3 integrate .. //depot/projects/hammer/sbin/geom/core/geom.8#15 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#21 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#48 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#64 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#63 integrate .. //depot/projects/hammer/sbin/mount/mount.8#25 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#23 integrate .. //depot/projects/hammer/secure/usr.bin/ssh/Makefile#13 integrate .. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#17 integrate .. //depot/projects/hammer/share/man/man3/Makefile#18 integrate .. //depot/projects/hammer/share/man/man4/Makefile#103 integrate .. //depot/projects/hammer/share/man/man4/cmx.4#1 branch .. //depot/projects/hammer/share/man/man4/ddb.4#13 integrate .. //depot/projects/hammer/share/man/man4/fwohci.4#13 integrate .. //depot/projects/hammer/share/man/man4/ng_nat.4#4 integrate .. //depot/projects/hammer/share/man/man4/uchcom.4#1 branch .. //depot/projects/hammer/share/man/man4/ucom.4#8 integrate .. //depot/projects/hammer/share/man/man4/ucycom.4#4 integrate .. //depot/projects/hammer/share/man/man4/uscanner.4#19 integrate .. //depot/projects/hammer/share/man/man4/uslcom.4#1 branch .. //depot/projects/hammer/share/man/man4/vr.4#14 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#86 integrate .. //depot/projects/hammer/share/man/man9/DEVICE_PROBE.9#9 integrate .. //depot/projects/hammer/share/man/man9/Makefile#79 integrate .. //depot/projects/hammer/share/man/man9/bus_space.9#5 integrate .. //depot/projects/hammer/share/man/man9/insmntque.9#1 branch .. //depot/projects/hammer/share/man/man9/lock.9#13 integrate .. //depot/projects/hammer/share/man/man9/vfs_mountedfrom.9#1 branch .. //depot/projects/hammer/share/man/man9/vgone.9#5 integrate .. //depot/projects/hammer/share/man/man9/vhold.9#5 integrate .. //depot/projects/hammer/share/man/man9/vput.9#4 integrate .. //depot/projects/hammer/share/man/man9/vref.9#7 integrate .. //depot/projects/hammer/share/man/man9/vrefcnt.9#1 branch .. //depot/projects/hammer/share/man/man9/vrele.9#5 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#42 integrate .. //depot/projects/hammer/share/misc/committers-doc.dot#4 integrate .. //depot/projects/hammer/share/misc/committers-ports.dot#9 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#34 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#39 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#24 integrate .. //depot/projects/hammer/share/mk/sys.mk#28 integrate .. //depot/projects/hammer/share/zoneinfo/leapseconds#13 integrate .. //depot/projects/hammer/share/zoneinfo/southamerica#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#59 integrate .. //depot/projects/hammer/sys/amd64/amd64/legacy.c#23 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#130 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#174 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#105 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#66 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#36 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#28 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#50 integrate .. //depot/projects/hammer/sys/arm/arm/uio_machdep.c#5 integrate .. //depot/projects/hammer/sys/arm/conf/AVILA#7 integrate .. //depot/projects/hammer/sys/arm/include/_bus.h#2 integrate .. //depot/projects/hammer/sys/arm/include/pmap.h#24 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425.c#6 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/hammer/sys/boot/i386/boot2/boot2.c#22 integrate .. //depot/projects/hammer/sys/boot/i386/btx/btx/Makefile#6 integrate .. //depot/projects/hammer/sys/boot/i386/btx/btx/btx.S#6 integrate .. //depot/projects/hammer/sys/boot/i386/gptboot/gptboot.c#3 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biosdisk.c#15 integrate .. //depot/projects/hammer/sys/boot/i386/pxeldr/pxeldr.S#6 integrate .. //depot/projects/hammer/sys/boot/pc98/btx/btx/Makefile#7 integrate .. //depot/projects/hammer/sys/boot/pc98/btx/btx/btx.S#8 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/Makefile#11 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/biosdisk.c#12 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#38 integrate .. //depot/projects/hammer/sys/compat/linux/linux_futex.c#5 integrate .. //depot/projects/hammer/sys/conf/NOTES#138 integrate .. //depot/projects/hammer/sys/conf/files#174 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#29 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#67 integrate .. //depot/projects/hammer/sys/conf/ldscript.powerpc#2 integrate .. //depot/projects/hammer/sys/conf/options#123 integrate .. //depot/projects/hammer/sys/conf/options.powerpc#10 integrate .. //depot/projects/hammer/sys/ddb/db_command.c#22 integrate .. //depot/projects/hammer/sys/ddb/db_examine.c#7 integrate .. //depot/projects/hammer/sys/ddb/db_input.c#8 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#81 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#41 integrate .. //depot/projects/hammer/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#85 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#51 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#79 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#42 integrate .. //depot/projects/hammer/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/hammer/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/hammer/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/hammer/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/hammer/sys/dev/cpufreq/ichss.c#7 integrate .. //depot/projects/hammer/sys/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#16 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/hammer/sys/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/hammer/sys/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/hammer/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/hammer/sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu#2 delete .. //depot/projects/hammer/sys/dev/drm/drm_pciids.h#7 integrate .. //depot/projects/hammer/sys/dev/em/LICENSE#6 integrate .. //depot/projects/hammer/sys/dev/em/e1000_80003es2lan.c#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_80003es2lan.h#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_82540.c#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_82541.c#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_82541.h#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_82542.c#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_82543.c#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_82543.h#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_82571.c#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_82571.h#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_82575.c#4 delete .. //depot/projects/hammer/sys/dev/em/e1000_82575.h#4 delete .. //depot/projects/hammer/sys/dev/em/e1000_api.c#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_api.h#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_defines.h#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_hw.h#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_ich8lan.c#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_ich8lan.h#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_mac.c#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_mac.h#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_manage.c#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_manage.h#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_nvm.c#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_nvm.h#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_osdep.h#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_phy.c#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_phy.h#4 integrate .. //depot/projects/hammer/sys/dev/em/e1000_regs.h#4 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#72 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#36 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#33 integrate .. //depot/projects/hammer/sys/dev/hptrr/hptrr_os_bsd.c#3 integrate .. //depot/projects/hammer/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate .. //depot/projects/hammer/sys/dev/hptrr/ldm.h#3 integrate .. //depot/projects/hammer/sys/dev/hptrr/osm.h#3 integrate .. //depot/projects/hammer/sys/dev/ic/quicc.h#1 branch .. //depot/projects/hammer/sys/dev/igb/e1000_82575.c#1 branch .. //depot/projects/hammer/sys/dev/igb/e1000_82575.h#1 branch .. //depot/projects/hammer/sys/dev/igb/e1000_api.c#1 branch .. //depot/projects/hammer/sys/dev/igb/e1000_api.h#1 branch .. //depot/projects/hammer/sys/dev/igb/e1000_defines.h#1 branch .. //depot/projects/hammer/sys/dev/igb/e1000_hw.h#1 branch .. //depot/projects/hammer/sys/dev/igb/e1000_mac.c#1 branch .. //depot/projects/hammer/sys/dev/igb/e1000_mac.h#1 branch .. //depot/projects/hammer/sys/dev/igb/e1000_manage.c#1 branch .. //depot/projects/hammer/sys/dev/igb/e1000_manage.h#1 branch .. //depot/projects/hammer/sys/dev/igb/e1000_nvm.c#1 branch .. //depot/projects/hammer/sys/dev/igb/e1000_nvm.h#1 branch .. //depot/projects/hammer/sys/dev/igb/e1000_osdep.h#1 branch .. //depot/projects/hammer/sys/dev/igb/e1000_phy.c#1 branch .. //depot/projects/hammer/sys/dev/igb/e1000_phy.h#1 branch .. //depot/projects/hammer/sys/dev/igb/e1000_regs.h#1 branch .. //depot/projects/hammer/sys/dev/igb/if_igb.c#1 branch .. //depot/projects/hammer/sys/dev/igb/if_igb.h#1 branch .. //depot/projects/hammer/sys/dev/lge/if_lge.c#37 integrate .. //depot/projects/hammer/sys/dev/md/md.c#65 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#33 integrate .. //depot/projects/hammer/sys/dev/mii/ciphy.c#7 integrate .. //depot/projects/hammer/sys/dev/mii/miidevs#21 integrate .. //depot/projects/hammer/sys/dev/mii/rgephy.c#9 integrate .. //depot/projects/hammer/sys/dev/msk/if_msk.c#11 integrate .. //depot/projects/hammer/sys/dev/msk/if_mskreg.h#6 integrate .. //depot/projects/hammer/sys/dev/nfe/if_nfe.c#10 integrate .. //depot/projects/hammer/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/hammer/sys/dev/nfe/if_nfevar.h#5 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#50 integrate .. //depot/projects/hammer/sys/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/hammer/sys/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/hammer/sys/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/hammer/sys/dev/quicc/quicc_core.c#1 branch .. //depot/projects/hammer/sys/dev/re/if_re.c#57 integrate .. //depot/projects/hammer/sys/dev/scc/scc_bfe.h#5 integrate .. //depot/projects/hammer/sys/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/hammer/sys/dev/scc/scc_bus.h#2 integrate .. //depot/projects/hammer/sys/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/hammer/sys/dev/tsec/if_tsec.c#1 branch .. //depot/projects/hammer/sys/dev/tsec/if_tsec.h#1 branch .. //depot/projects/hammer/sys/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/hammer/sys/dev/uart/uart.h#7 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/hammer/sys/dev/uart/uart_bus_scc.c#2 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_powerpc.c#5 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/hammer/sys/dev/usb/ehci.c#32 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#38 integrate .. //depot/projects/hammer/sys/dev/usb/ubsa.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#95 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#28 integrate .. //depot/projects/hammer/sys/dev/usb/uslcom.c#1 branch .. //depot/projects/hammer/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/hammer/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/hammer/sys/dev/wpi/if_wpi.c#5 integrate .. //depot/projects/hammer/sys/dev/wpi/if_wpireg.h#3 integrate .. //depot/projects/hammer/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/hammer/sys/fs/coda/TODO#3 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#22 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_node.c#18 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_subr.c#8 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs.h#8 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#25 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#27 integrate .. //depot/projects/hammer/sys/gdb/gdb_main.c#8 integrate .. //depot/projects/hammer/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/hammer/sys/geom/part/g_part_vtoc8.c#1 branch .. //depot/projects/hammer/sys/i386/conf/GENERIC#63 integrate .. //depot/projects/hammer/sys/i386/cpufreq/est.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/i686_mem.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#42 integrate .. //depot/projects/hammer/sys/i386/i386/legacy.c#15 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#72 integrate .. //depot/projects/hammer/sys/i386/include/_types.h#11 integrate .. //depot/projects/hammer/sys/i386/include/float.h#9 integrate .. //depot/projects/hammer/sys/i386/include/smp.h#19 integrate .. //depot/projects/hammer/sys/i386/include/specialreg.h#16 integrate .. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#21 integrate .. //depot/projects/hammer/sys/kern/init_main.c#53 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#65 integrate .. //depot/projects/hammer/sys/kern/kern_cpuset.c#1 branch .. //depot/projects/hammer/sys/kern/kern_descrip.c#76 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#38 integrate .. //depot/projects/hammer/sys/kern/kern_priv.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#51 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#87 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#65 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#104 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#57 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#92 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#58 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#34 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#68 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#63 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#65 integrate .. //depot/projects/hammer/sys/kern/systrace_args.c#9 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#85 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#125 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#26 integrate .. //depot/projects/hammer/sys/modules/Makefile#121 integrate .. //depot/projects/hammer/sys/modules/cmx/Makefile#1 branch .. //depot/projects/hammer/sys/modules/cxgb/Makefile#9 integrate .. //depot/projects/hammer/sys/modules/cxgb/cxgb/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/hammer/sys/modules/em/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/geom/Makefile#18 integrate .. //depot/projects/hammer/sys/modules/geom/geom_apple/Makefile#2 delete .. //depot/projects/hammer/sys/modules/geom/geom_gpt/Makefile#2 delete .. //depot/projects/hammer/sys/modules/geom/geom_part/Makefile#1 branch .. //depot/projects/hammer/sys/modules/igb/Makefile#1 branch .. //depot/projects/hammer/sys/modules/ipfw_nat/Makefile#1 branch .. //depot/projects/hammer/sys/modules/uslcom/Makefile#1 branch .. //depot/projects/hammer/sys/modules/vr/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/zfs/Makefile#7 integrate .. //depot/projects/hammer/sys/net/bpf_filter.c#9 integrate .. //depot/projects/hammer/sys/net/if.c#72 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#70 integrate .. //depot/projects/hammer/sys/net/if_gif.c#29 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#55 integrate .. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#24 integrate .. //depot/projects/hammer/sys/netgraph/ng_l2tp.c#14 integrate .. //depot/projects/hammer/sys/netgraph/ng_nat.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_nat.h#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#28 integrate .. //depot/projects/hammer/sys/netinet/in.h#27 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#53 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#47 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#32 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#92 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_nat.c#1 branch .. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#19 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias.c#5 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_db.c#6 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_ftp.c#6 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_irc.c#6 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_local.h#5 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_proxy.c#7 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_smedia.c#5 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#82 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#49 integrate .. //depot/projects/hammer/sys/netipsec/key.c#18 integrate .. //depot/projects/hammer/sys/netipsec/key_debug.c#6 integrate .. //depot/projects/hammer/sys/netncp/ncp_conn.h#4 integrate .. //depot/projects/hammer/sys/netsmb/smb_conn.h#7 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_idmap.c#6 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#54 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#39 integrate .. //depot/projects/hammer/sys/pc98/cbus/sio.c#13 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#49 integrate .. //depot/projects/hammer/sys/pc98/pc98/machdep.c#22 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#59 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#31 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#47 delete .. //depot/projects/hammer/sys/pci/if_vrreg.h#13 delete .. //depot/projects/hammer/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/hammer/sys/powerpc/aim/machdep.c#4 integrate .. //depot/projects/hammer/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/hammer/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/hammer/sys/powerpc/aim/trap_subr.S#2 integrate .. //depot/projects/hammer/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/hammer/sys/powerpc/booke/clock.c#1 branch .. //depot/projects/hammer/sys/powerpc/booke/copyinout.c#1 branch .. //depot/projects/hammer/sys/powerpc/booke/interrupt.c#1 branch .. //depot/projects/hammer/sys/powerpc/booke/locore.S#1 branch .. //depot/projects/hammer/sys/powerpc/booke/machdep.c#1 branch .. //depot/projects/hammer/sys/powerpc/booke/pmap.c#1 branch .. //depot/projects/hammer/sys/powerpc/booke/support.S#1 branch .. //depot/projects/hammer/sys/powerpc/booke/swtch.S#1 branch .. //depot/projects/hammer/sys/powerpc/booke/trap.c#1 branch .. //depot/projects/hammer/sys/powerpc/booke/trap_subr.S#1 branch .. //depot/projects/hammer/sys/powerpc/booke/uio_machdep.c#1 branch .. //depot/projects/hammer/sys/powerpc/booke/vm_machdep.c#1 branch .. //depot/projects/hammer/sys/powerpc/conf/MPC85XX#1 branch .. //depot/projects/hammer/sys/powerpc/conf/NOTES#9 integrate .. //depot/projects/hammer/sys/powerpc/include/frame.h#7 integrate .. //depot/projects/hammer/sys/powerpc/include/hid.h#5 integrate .. //depot/projects/hammer/sys/powerpc/include/intr_machdep.h#12 integrate .. //depot/projects/hammer/sys/powerpc/include/kdb.h#5 integrate .. //depot/projects/hammer/sys/powerpc/include/md_var.h#9 integrate .. //depot/projects/hammer/sys/powerpc/include/mmuvar.h#2 integrate .. //depot/projects/hammer/sys/powerpc/include/ocpbus.h#1 branch .. //depot/projects/hammer/sys/powerpc/include/openpicvar.h#8 integrate .. //depot/projects/hammer/sys/powerpc/include/pcb.h#6 integrate .. //depot/projects/hammer/sys/powerpc/include/pcpu.h#6 integrate .. //depot/projects/hammer/sys/powerpc/include/pmap.h#13 integrate .. //depot/projects/hammer/sys/powerpc/include/psl.h#4 integrate .. //depot/projects/hammer/sys/powerpc/include/pte.h#3 integrate .. //depot/projects/hammer/sys/powerpc/include/sf_buf.h#3 integrate .. //depot/projects/hammer/sys/powerpc/include/spr.h#7 integrate .. //depot/projects/hammer/sys/powerpc/include/tlb.h#1 branch .. //depot/projects/hammer/sys/powerpc/include/trap.h#4 integrate .. //depot/projects/hammer/sys/powerpc/include/trap_aim.h#1 branch .. //depot/projects/hammer/sys/powerpc/include/trap_booke.h#1 branch .. //depot/projects/hammer/sys/powerpc/include/vmparam.h#10 integrate .. //depot/projects/hammer/sys/powerpc/mpc85xx/nexus.c#1 branch .. //depot/projects/hammer/sys/powerpc/mpc85xx/ocpbus.c#1 branch .. //depot/projects/hammer/sys/powerpc/mpc85xx/ocpbus.h#1 branch .. //depot/projects/hammer/sys/powerpc/mpc85xx/opic.c#1 branch .. //depot/projects/hammer/sys/powerpc/mpc85xx/pci_ocp.c#1 branch .. //depot/projects/hammer/sys/powerpc/powermac/openpic_macio.c#10 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/autoconf.c#8 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/cpu.c#9 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/db_trace.c#15 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/gdb_machdep.c#2 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/genassym.c#14 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/intr_machdep.c#16 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/mp_machdep.c#6 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/openpic.c#15 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pic_if.m#6 integrate .. //depot/projects/hammer/sys/powerpc/psim/openpic_iobus.c#9 integrate .. //depot/projects/hammer/sys/security/audit/audit.c#15 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm_klib.c#10 integrate .. //depot/projects/hammer/sys/security/audit/audit_private.h#8 integrate .. //depot/projects/hammer/sys/security/audit/audit_syscalls.c#12 integrate .. //depot/projects/hammer/sys/security/audit/audit_trigger.c#6 integrate .. //depot/projects/hammer/sys/security/audit/audit_worker.c#8 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#59 integrate .. //depot/projects/hammer/sys/sparc64/include/tlb.h#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/cache.c#9 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/cheetah.c#6 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/iommu.c#23 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#22 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#51 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/spitfire.c#6 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/tlb.c#6 integrate .. //depot/projects/hammer/sys/sun4v/sun4v/mp_machdep.c#5 integrate .. //depot/projects/hammer/sys/sys/_types.h#17 integrate .. //depot/projects/hammer/sys/sys/buf.h#35 integrate .. //depot/projects/hammer/sys/sys/bufobj.h#10 integrate .. //depot/projects/hammer/sys/sys/bus.h#26 integrate .. //depot/projects/hammer/sys/sys/cpuset.h#1 branch .. //depot/projects/hammer/sys/sys/fcntl.h#6 integrate .. //depot/projects/hammer/sys/sys/lockmgr.h#18 integrate .. //depot/projects/hammer/sys/sys/mount.h#52 integrate .. //depot/projects/hammer/sys/sys/param.h#106 integrate .. //depot/projects/hammer/sys/sys/pcpu.h#17 integrate .. //depot/projects/hammer/sys/sys/proc.h#115 integrate .. //depot/projects/hammer/sys/sys/sched.h#24 integrate .. //depot/projects/hammer/sys/sys/smp.h#15 integrate .. //depot/projects/hammer/sys/sys/syscall.h#62 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#62 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#63 integrate .. //depot/projects/hammer/sys/sys/types.h#25 integrate .. //depot/projects/hammer/sys/sys/vnode.h#76 integrate .. //depot/projects/hammer/sys/sys/vtoc.h#1 branch .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#50 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#72 integrate .. //depot/projects/hammer/sys/ufs/ufs/extattr.h#6 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#27 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#51 integrate .. //depot/projects/hammer/sys/vm/vm_map.h#23 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#75 integrate .. //depot/projects/hammer/tools/build/mk/OptionalObsoleteFiles.inc#9 integrate .. //depot/projects/hammer/tools/regression/environ/envctl.c#3 integrate .. //depot/projects/hammer/tools/regression/file/dup/dup.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-trig.c#2 integrate .. //depot/projects/hammer/tools/tools/tinybsd/tinybsd#3 integrate .. //depot/projects/hammer/usr.bin/Makefile#59 integrate .. //depot/projects/hammer/usr.bin/ar/ar.1#4 integrate .. //depot/projects/hammer/usr.bin/ar/ar.c#5 integrate .. //depot/projects/hammer/usr.bin/ar/ar.h#2 integrate .. //depot/projects/hammer/usr.bin/ar/write.c#3 integrate .. //depot/projects/hammer/usr.bin/awk/Makefile#7 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#61 integrate .. //depot/projects/hammer/usr.bin/chat/chat.c#5 integrate .. //depot/projects/hammer/usr.bin/cpuset/Makefile#1 branch .. //depot/projects/hammer/usr.bin/cpuset/cpuset.1#1 branch .. //depot/projects/hammer/usr.bin/cpuset/cpuset.c#1 branch .. //depot/projects/hammer/usr.bin/find/find.1#25 integrate .. //depot/projects/hammer/usr.bin/find/main.c#3 integrate .. //depot/projects/hammer/usr.bin/gzip/gzip.c#4 integrate .. //depot/projects/hammer/usr.bin/make/Makefile#23 integrate .. //depot/projects/hammer/usr.bin/make/Makefile.dist#5 integrate .. //depot/projects/hammer/usr.bin/make/arch.c#20 integrate .. //depot/projects/hammer/usr.bin/make/job.c#31 integrate .. //depot/projects/hammer/usr.bin/make/main.c#43 integrate .. //depot/projects/hammer/usr.bin/make/make.1#32 integrate .. //depot/projects/hammer/usr.bin/unifdef/unifdef.c#9 integrate .. //depot/projects/hammer/usr.sbin/Makefile#86 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#13 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#6 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/gn.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/nap.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/panu.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/profile.c#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/profile.h#2 integrate .. //depot/projects/hammer/usr.sbin/fifolog/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/Makefile.inc#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/fifolog_create/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/flint.lnt#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/lib/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog.h#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog_create.c#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog_int.c#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog_write.h#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/lib/getdate.y#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/lib/libfifolog.h#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch .. //depot/projects/hammer/usr.sbin/fifolog/lib/miniobj.h#1 branch .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.8#15 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.c#14 integrate .. //depot/projects/hammer/usr.sbin/mountd/mountd.c#23 integrate .. //depot/projects/hammer/usr.sbin/moused/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/moused/moused.c#20 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#22 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#132 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -203,6 +203,9 @@ GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac +.if ${OSRELDATE} < 700044 +CROSSENV+= AR=gnu-ar RANLIB=gnu-ranlib +.endif # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -227,7 +230,7 @@ # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - -DWITHOUT_FORTRAN -DWITHOUT_GDB + -DWITHOUT_GDB # world stage WMAKEENV= ${CROSSENV} \ @@ -313,8 +316,9 @@ .endif .else rm -rf ${WORLDTMP}/legacy/usr/include -# XXX - These two can depend on any header file. +# XXX - These three can depend on any header file. rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c + rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/kdump_subr.c rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ @@ -853,8 +857,8 @@ # legacy: Build compatibility shims for the next three targets # legacy: -.if ${BOOTSTRAPPING} < 503000 - @echo "ERROR: Source upgrades from versions prior to 5.3 not supported."; \ +.if ${BOOTSTRAPPING} < 600034 && ${BOOTSTRAPPING} != 0 + @echo "ERROR: Source upgrades from versions prior to 6.0 not supported."; \ false .endif .for _tool in tools/build @@ -883,23 +887,11 @@ .endif .endif -.if ${BOOTSTRAPPING} < 600029 -_texinfo= gnu/usr.bin/texinfo +.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022 +_ar= usr.bin/ar .endif -.if ${BOOTSTRAPPING} < 600015 -_cap_mkdb= usr.bin/cap_mkdb -.endif - -.if ${BOOTSTRAPPING} < 600018 -_colldef= usr.bin/colldef -.endif - -.if ${BOOTSTRAPPING} < 600017 -_gencat= usr.bin/gencat -.endif - -.if ${BOOTSTRAPPING} < 600016 +.if ${BOOTSTRAPPING} < 800013 _mklocale= usr.bin/mklocale .endif @@ -912,19 +904,12 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 600020 -_pwd_mkdb= usr.sbin/pwd_mkdb -.endif - bootstrap-tools: .for _tool in \ ${_strfile} \ ${_gperf} \ ${_groff} \ - ${_texinfo} \ - ${_cap_mkdb} \ - ${_colldef} \ - ${_gencat} \ + ${_ar} \ usr.bin/lorder \ usr.bin/makewhatis \ ${_mklocale} \ @@ -932,8 +917,7 @@ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ - ${_crunchgen} \ - ${_pwd_mkdb} + ${_crunchgen} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ==== //depot/projects/hammer/ObsoleteFiles.inc#46 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -32,6 +32,11 @@ OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libkse.a +OLD_FILES+=usr/lib32/libkse_p.a +OLD_FILES+=usr/lib32/libkse_pic.a +.endif .endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h @@ -134,6 +139,12 @@ OLD_DIRS+=usr/include/netatm/uni OLD_DIRS+=usr/include/netatm OLD_DIRS+=usr/share/examples/atm +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libatm.a +OLD_FILES+=usr/lib32/libatm.so +OLD_LIBS+=usr/lib32/libatm.so.5 +OLD_FILES+=usr/lib32/libatm_p.a +.endif # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -224,6 +235,42 @@ OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libalias.so.5 +OLD_LIBS+=usr/lib32/libbsnmp.so.3 +OLD_LIBS+=usr/lib32/libdialog.so.5 +OLD_LIBS+=usr/lib32/libgnuregex.so.3 +OLD_LIBS+=usr/lib32/libhistory.so.6 +OLD_LIBS+=usr/lib32/libncurses.so.6 +OLD_LIBS+=usr/lib32/libncursesw.so.6 +OLD_LIBS+=usr/lib32/libpam.so.3 +OLD_LIBS+=usr/lib32/libreadline.so.6 +OLD_LIBS+=usr/lib32/libssh.so.3 +OLD_LIBS+=usr/lib32/pam_chroot.so.3 +OLD_LIBS+=usr/lib32/pam_deny.so.3 +OLD_LIBS+=usr/lib32/pam_echo.so.3 +OLD_LIBS+=usr/lib32/pam_exec.so.3 +OLD_LIBS+=usr/lib32/pam_ftpusers.so.3 +OLD_LIBS+=usr/lib32/pam_group.so.3 +OLD_LIBS+=usr/lib32/pam_guest.so.3 +OLD_LIBS+=usr/lib32/pam_krb5.so.3 +OLD_LIBS+=usr/lib32/pam_ksu.so.3 +OLD_LIBS+=usr/lib32/pam_lastlog.so.3 +OLD_LIBS+=usr/lib32/pam_login_access.so.3 +OLD_LIBS+=usr/lib32/pam_nologin.so.3 +OLD_LIBS+=usr/lib32/pam_opie.so.3 +OLD_LIBS+=usr/lib32/pam_opieaccess.so.3 +OLD_LIBS+=usr/lib32/pam_passwdqc.so.3 +OLD_LIBS+=usr/lib32/pam_permit.so.3 +OLD_LIBS+=usr/lib32/pam_radius.so.3 +OLD_LIBS+=usr/lib32/pam_rhosts.so.3 +OLD_LIBS+=usr/lib32/pam_rootok.so.3 +OLD_LIBS+=usr/lib32/pam_securetty.so.3 +OLD_LIBS+=usr/lib32/pam_self.so.3 +OLD_LIBS+=usr/lib32/pam_ssh.so.3 +OLD_LIBS+=usr/lib32/pam_tacplus.so.3 +OLD_LIBS+=usr/lib32/pam_unix.so.3 +.endif # 20070613: IPX over IP tunnel removal OLD_FILES+=usr/include/netipx/ipx_ip.h # 20070605: sched_core removal @@ -603,6 +650,9 @@ OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=usr/lib/libarchive.so.3 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libarchive.so.3 +.endif # 20070301: remove addr2ascii and ascii2addr OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz ==== //depot/projects/hammer/UPDATING#113 (text+ko) ==== @@ -22,6 +22,20 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080301: + The layout of struct vmspace has changed. This affects libkvm + and any executables that link against libkvm and use the + kvm_getprocs() function. In particular, but not exclusively, + it affects ps(1), fstat(1), pkill(1), systat(1), top(1) and w(1). + The effects are minimal, but it's advisable to upgrade world + nonetheless. + +20080229: + The latest em driver no longer has support in it for the + 82575 adapter, this is now moved to the igb driver. The + split was done to make new features that are incompatible + with older hardware easier to do. + 20080220: The new geom_lvm(4) geom class has been renamed to geom_linux_lvm(4), likewise the kernel option is now GEOM_LINUX_LVM. @@ -983,4 +997,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.520 2008/02/20 07:50:12 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ ==== //depot/projects/hammer/bin/chflags/chflags.1#14 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.30 2008/03/09 12:10:24 rwatson Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -40,7 +40,7 @@ .Nd change file flags .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl fhv .Oo .Fl R .Op Fl H | Fl L | Fl P @@ -57,6 +57,12 @@ .Pp The options are as follows: .Bl -tag -width indent +.It Fl f +Do not display a diagnostic message if +.Nm +could not modify the flags for +.Va file , +nor modify the exit status to reflect such failures. .It Fl H If the .Fl R @@ -79,6 +85,14 @@ .It Fl R Change the file flags for the file hierarchies rooted in the files instead of just the files themselves. +.It Fl v +Cause +.Nm +to be verbose, showing filenames as the flags are modified. +If the +.Fl v +option is specified more than once, the old and new flags of the file +will also be printed, in octal notation. .El .Pp The flags are specified as an octal number or a comma separated list ==== //depot/projects/hammer/bin/chflags/chflags.c#8 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.24 2008/03/09 12:10:24 rwatson Exp $"); #include #include @@ -60,14 +60,15 @@ { FTS *ftsp; FTSENT *p; - u_long clear, set; + u_long clear, newflags, set; long val; - int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval; + int Hflag, Lflag, Rflag, fflag, hflag, vflag; + int ch, fts_options, oct, rval; char *flags, *ep; int (*change_flags)(const char *, unsigned long); - Hflag = Lflag = Rflag = hflag = 0; - while ((ch = getopt(argc, argv, "HLPRh")) != -1) + Hflag = Lflag = Rflag = fflag = hflag = vflag = 0; + while ((ch = getopt(argc, argv, "HLPRfhv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -83,9 +84,15 @@ case 'R': Rflag = 1; break; + case 'f': + fflag = 1; + break; case 'h': hflag = 1; break; + case 'v': + vflag++; + break; case '?': default: usage(); @@ -166,18 +173,23 @@ default: break; } - if (oct) { - if (!(*change_flags)(p->fts_accpath, set)) - continue; - } else { - p->fts_statp->st_flags |= set; - p->fts_statp->st_flags &= clear; - if (!(*change_flags)(p->fts_accpath, - (u_long)p->fts_statp->st_flags)) - continue; + if (oct) + newflags = set; + else + newflags = (p->fts_statp->st_flags | set) & clear; + if (newflags == p->fts_statp->st_flags) + continue; + if ((*change_flags)(p->fts_accpath, newflags) && !fflag) { + warn("%s", p->fts_path); + rval = 1; + } else if (vflag) { + (void)printf("%s", p->fts_path); + if (vflag > 1) + (void)printf(": 0%lo -> 0%lo", + (u_long)p->fts_statp->st_flags, + newflags); + (void)printf("\n"); } - warn("%s", p->fts_path); - rval = 1; } if (errno) err(1, "fts_read"); @@ -188,6 +200,6 @@ usage(void) { (void)fprintf(stderr, - "usage: chflags [-h] [-R [-H | -L | -P]] flags file ...\n"); + "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n"); exit(1); } ==== //depot/projects/hammer/bin/cp/cp.1#11 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $ .\" .Dd October 27, 2006 .Dt CP 1 @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -116,6 +116,10 @@ or .Xr pax 1 instead. +.It Fl a +Archive mode. +Same as +.Fl RpP . .It Fl f For each existing destination pathname, remove it and create a new file, without prompting for confirmation ==== //depot/projects/hammer/bin/cp/cp.c#15 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); /* * Cp copies source files to target files. @@ -102,7 +102,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -119,6 +119,12 @@ case 'R': Rflag = 1; break; + case 'a': + Pflag = 1; + pflag = 1; + Rflag = 1; + Hflag = Lflag = 0; + break; case 'f': >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 11 22:04:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B44201065675; Tue, 11 Mar 2008 22:04:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73F0D106566C for ; Tue, 11 Mar 2008 22:04:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6300B8FC19 for ; Tue, 11 Mar 2008 22:04:27 +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.14.1/8.14.1) with ESMTP id m2BM4RF3041279 for ; Tue, 11 Mar 2008 22:04:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BM4RDt041277 for perforce@freebsd.org; Tue, 11 Mar 2008 22:04:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Mar 2008 22:04:27 GMT Message-Id: <200803112204.m2BM4RDt041277@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 137444 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, 11 Mar 2008 22:04:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=137444 Change 137444 by rwatson@rwatson_cinnamon on 2008/03/11 22:03:31 Read the default buffer size from bpf device so that zero-copy tracks net.bpf.bpfsize as a default. Round up to page size. Affected files ... .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#22 edit Differences ... ==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#22 (text+ko) ==== @@ -810,7 +810,12 @@ pcap_strerror(errno)); goto bad; } - p->zbufsize = 32768; + if ((ioctl(fd, BIOCGBLEN, (caddr_t)&v) < 0) || v < 32768) + v = 32768; +#ifndef roundup +#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) /* to any y */ +#endif + p->zbufsize = roundup(v, getpagesize()); if (p->zbufsize > zbufmax) p->zbufsize = zbufmax; p->zbuf1 = mmap(NULL, p->zbufsize, PROT_READ | PROT_WRITE, From owner-p4-projects@FreeBSD.ORG Tue Mar 11 22:17:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CD6B1065676; Tue, 11 Mar 2008 22:17:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A5A71065671 for ; Tue, 11 Mar 2008 22:17:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 192058FC18 for ; Tue, 11 Mar 2008 22:17:41 +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.14.1/8.14.1) with ESMTP id m2BMHe4Z043082 for ; Tue, 11 Mar 2008 22:17:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BMHeJr043080 for perforce@freebsd.org; Tue, 11 Mar 2008 22:17:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Mar 2008 22:17:40 GMT Message-Id: <200803112217.m2BMHeJr043080@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 137445 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, 11 Mar 2008 22:17:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=137445 Change 137445 by rwatson@rwatson_cinnamon on 2008/03/11 22:16:50 If the requested timeout is 0, then we want to wait forever, so pass NULL to select() for its timeout rather than an under-initialized timeval. Affected files ... .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#23 edit Differences ... ==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#23 (text+ko) ==== @@ -217,7 +217,8 @@ tv.tv_sec = p->to_ms / 1000; tv.tv_usec = (p->to_ms * 1000) % 1000000; } - r = select(p->fd + 1, &r_set, NULL, NULL, &tv); + r = select(p->fd + 1, &r_set, NULL, NULL, p->to_ms != 0 ? &tv : + NULL); if (r < 0 && errno == EINTR) return (0); else if (r < 0) { From owner-p4-projects@FreeBSD.ORG Tue Mar 11 23:30:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CE2D1065673; Tue, 11 Mar 2008 23:30:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0BD6F106566B for ; Tue, 11 Mar 2008 23:30:59 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D5A788FC2B for ; Tue, 11 Mar 2008 23:30:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2BNUwDl050476 for ; Tue, 11 Mar 2008 23:30:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BNUw2h050474 for perforce@freebsd.org; Tue, 11 Mar 2008 23:30:58 GMT (envelope-from sam@freebsd.org) Date: Tue, 11 Mar 2008 23:30:58 GMT Message-Id: <200803112330.m2BNUw2h050474@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 137451 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, 11 Mar 2008 23:31:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=137451 Change 137451 by sam@sam_ebb on 2008/03/11 23:30:04 plug memory leak in ieee80211_ioctl_setregdomain Submitted by: Miguel Vega Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#42 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#42 (text+ko) ==== @@ -2052,12 +2052,14 @@ } IEEE80211_UNLOCK(ic); - return ENETRESET; -invalid: - error = EINVAL; + error = ENETRESET; + /* fall thru... */ bad: FREE(reg, M_TEMP); return error; +invalid: + error = EINVAL; + goto bad; } static int From owner-p4-projects@FreeBSD.ORG Wed Mar 12 00:01:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF9E41065674; Wed, 12 Mar 2008 00:01:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6DBDA1065672 for ; Wed, 12 Mar 2008 00:01:31 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B06C8FC40 for ; Wed, 12 Mar 2008 00:01:31 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2C01VxC051883 for ; Wed, 12 Mar 2008 00:01:31 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2C01U1X051881 for perforce@freebsd.org; Wed, 12 Mar 2008 00:01:30 GMT (envelope-from sephe@FreeBSD.org) Date: Wed, 12 Mar 2008 00:01:30 GMT Message-Id: <200803120001.m2C01U1X051881@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 137453 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, 12 Mar 2008 00:01:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=137453 Change 137453 by sephe@sephe_enigma:sam_wifi on 2008/03/12 00:01:23 IFC Affected files ... .. //depot/projects/wifi/Makefile.inc1#41 integrate .. //depot/projects/wifi/ObsoleteFiles.inc#28 integrate .. //depot/projects/wifi/UPDATING#41 integrate .. //depot/projects/wifi/bin/chflags/chflags.1#9 integrate .. //depot/projects/wifi/bin/chflags/chflags.c#4 integrate .. //depot/projects/wifi/bin/cp/cp.1#6 integrate .. //depot/projects/wifi/bin/cp/cp.c#7 integrate .. //depot/projects/wifi/bin/cp/utils.c#5 integrate .. //depot/projects/wifi/bin/realpath/realpath.1#4 integrate .. //depot/projects/wifi/bin/realpath/realpath.c#2 integrate .. //depot/projects/wifi/bin/sh/cd.c#3 integrate .. //depot/projects/wifi/bin/uuidgen/Makefile#1 branch .. //depot/projects/wifi/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/wifi/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/wifi/contrib/bsnmp/snmpd/main.c#8 integrate .. //depot/projects/wifi/contrib/tcpdump/print-802_11.c#7 integrate .. //depot/projects/wifi/etc/Makefile#17 integrate .. //depot/projects/wifi/etc/ddb.conf#1 branch .. //depot/projects/wifi/etc/defaults/rc.conf#35 integrate .. //depot/projects/wifi/etc/rc.d/Makefile#22 integrate .. //depot/projects/wifi/etc/rc.d/ddb#1 branch .. //depot/projects/wifi/etc/rc.d/mountcritlocal#5 integrate .. //depot/projects/wifi/etc/rc.d/mountlate#3 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes#27 integrate .. //depot/projects/wifi/gnu/lib/libgcc/Makefile#8 integrate .. //depot/projects/wifi/gnu/usr.bin/binutils/ar/Makefile#4 integrate .. //depot/projects/wifi/gnu/usr.bin/binutils/ranlib/Makefile#4 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/kgdb.h#8 integrate .. //depot/projects/wifi/include/pthread_np.h#6 integrate .. //depot/projects/wifi/include/unistd.h#11 integrate .. //depot/projects/wifi/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry.3#8 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.3#17 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_zip.c#13 integrate .. //depot/projects/wifi/lib/libarchive/archive_util.3#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_write.3#11 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_disk.c#12 integrate .. //depot/projects/wifi/lib/libc/gen/sysconf.c#5 integrate .. //depot/projects/wifi/lib/libc/posix1e/mac.c#2 integrate .. //depot/projects/wifi/lib/libc/posix1e/mac_exec.c#2 integrate .. //depot/projects/wifi/lib/libc/posix1e/mac_get.c#3 integrate .. //depot/projects/wifi/lib/libc/posix1e/mac_set.c#2 integrate .. //depot/projects/wifi/lib/libc/powerpc/gen/flt_rounds.c#2 integrate .. //depot/projects/wifi/lib/libc/powerpc/gen/fpgetmask.c#2 integrate .. //depot/projects/wifi/lib/libc/powerpc/gen/fpgetround.c#2 integrate .. //depot/projects/wifi/lib/libc/powerpc/gen/fpgetsticky.c#2 integrate .. //depot/projects/wifi/lib/libc/powerpc/gen/fpsetmask.c#2 integrate .. //depot/projects/wifi/lib/libc/powerpc/gen/fpsetround.c#2 integrate .. //depot/projects/wifi/lib/libc/stdio/fdopen.c#3 integrate .. //depot/projects/wifi/lib/libc/stdio/fopen.c#3 integrate .. //depot/projects/wifi/lib/libc/stdio/freopen.c#4 integrate .. //depot/projects/wifi/lib/libc/stdlib/getenv.c#8 integrate .. //depot/projects/wifi/lib/libc/stdlib/malloc.c#14 integrate .. //depot/projects/wifi/lib/libc/sys/Makefile.inc#13 integrate .. //depot/projects/wifi/lib/libc/sys/Symbol.map#8 integrate .. //depot/projects/wifi/lib/libc/sys/clock_gettime.2#5 integrate .. //depot/projects/wifi/lib/libc/sys/fcntl.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/kldunload.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/mq_close.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/mq_getattr.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/mq_notify.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/mq_open.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/mq_receive.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/mq_send.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/mq_setattr.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/readlink.2#4 integrate .. //depot/projects/wifi/lib/libelf/elf_update.c#3 integrate .. //depot/projects/wifi/lib/libelf/gelf_rel.c#2 integrate .. //depot/projects/wifi/lib/libelf/gelf_rela.c#2 integrate .. //depot/projects/wifi/lib/libsdp/sdp.h#5 integrate .. //depot/projects/wifi/lib/libthr/pthread.map#13 integrate .. //depot/projects/wifi/lib/libthr/thread/Makefile.inc#7 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_affinity.c#1 branch .. //depot/projects/wifi/lib/libthr/thread/thr_attr.c#6 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_create.c#10 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_exit.c#10 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_init.c#12 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_private.h#13 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_sem.c#7 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_sig.c#7 integrate .. //depot/projects/wifi/lib/libutil/humanize_number.c#2 integrate .. //depot/projects/wifi/lib/msun/Makefile#20 integrate .. //depot/projects/wifi/lib/msun/Symbol.map#7 integrate .. //depot/projects/wifi/lib/msun/amd64/Makefile.inc#8 integrate .. //depot/projects/wifi/lib/msun/amd64/e_sqrtl.S#1 branch .. //depot/projects/wifi/lib/msun/i387/Makefile.inc#8 integrate .. //depot/projects/wifi/lib/msun/i387/e_sqrtl.S#1 branch .. //depot/projects/wifi/lib/msun/ld128/s_nanl.c#2 integrate .. //depot/projects/wifi/lib/msun/man/sqrt.3#5 integrate .. //depot/projects/wifi/lib/msun/powerpc/fenv.h#4 integrate .. //depot/projects/wifi/lib/msun/src/e_rem_pio2.c#4 integrate .. //depot/projects/wifi/lib/msun/src/e_rem_pio2f.c#6 integrate .. //depot/projects/wifi/lib/msun/src/e_sqrt.c#3 integrate .. //depot/projects/wifi/lib/msun/src/e_sqrtl.c#1 branch .. //depot/projects/wifi/lib/msun/src/k_rem_pio2.c#5 integrate .. //depot/projects/wifi/lib/msun/src/math.h#13 integrate .. //depot/projects/wifi/lib/msun/src/math_private.h#8 integrate .. //depot/projects/wifi/lib/msun/src/s_cosf.c#5 integrate .. //depot/projects/wifi/lib/msun/src/s_sinf.c#5 integrate .. //depot/projects/wifi/lib/msun/src/s_tanf.c#5 integrate .. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#28 integrate .. //depot/projects/wifi/rescue/rescue/Makefile#21 integrate .. //depot/projects/wifi/sbin/ddb/ddb.8#2 integrate .. //depot/projects/wifi/sbin/ddb/ddb.c#2 integrate .. //depot/projects/wifi/sbin/fsck_ffs/main.c#7 integrate .. //depot/projects/wifi/sbin/fsck_ffs/pass1.c#2 integrate .. //depot/projects/wifi/sbin/fsck_ffs/pass2.c#2 integrate .. //depot/projects/wifi/sbin/fsck_ffs/setup.c#4 integrate .. //depot/projects/wifi/sbin/geom/Makefile#3 integrate .. //depot/projects/wifi/sbin/geom/class/label/geom_label.c#9 integrate .. //depot/projects/wifi/sbin/geom/class/multipath/gmultipath.8#3 integrate .. //depot/projects/wifi/sbin/geom/core/geom.8#10 integrate .. //depot/projects/wifi/sbin/geom/core/geom.c#15 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#29 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw.8#27 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw2.c#25 integrate .. //depot/projects/wifi/sbin/mount/mount.8#12 integrate .. //depot/projects/wifi/sbin/newfs/mkfs.c#7 integrate .. //depot/projects/wifi/sbin/ping6/ping6.c#7 integrate .. //depot/projects/wifi/secure/usr.bin/ssh/Makefile#5 integrate .. //depot/projects/wifi/secure/usr.sbin/sshd/Makefile#8 integrate .. //depot/projects/wifi/share/man/man3/Makefile#9 integrate .. //depot/projects/wifi/share/man/man4/Makefile#48 integrate .. //depot/projects/wifi/share/man/man4/cmx.4#1 branch .. //depot/projects/wifi/share/man/man4/ddb.4#8 integrate .. //depot/projects/wifi/share/man/man4/fwohci.4#8 integrate .. //depot/projects/wifi/share/man/man4/ng_nat.4#4 integrate .. //depot/projects/wifi/share/man/man4/uchcom.4#1 branch .. //depot/projects/wifi/share/man/man4/ucom.4#5 integrate .. //depot/projects/wifi/share/man/man4/ucycom.4#4 integrate .. //depot/projects/wifi/share/man/man4/uscanner.4#6 integrate .. //depot/projects/wifi/share/man/man4/uslcom.4#1 branch .. //depot/projects/wifi/share/man/man4/vr.4#8 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#35 integrate .. //depot/projects/wifi/share/man/man9/DEVICE_PROBE.9#4 integrate .. //depot/projects/wifi/share/man/man9/Makefile#28 integrate .. //depot/projects/wifi/share/man/man9/VOP_LOCK.9#7 integrate .. //depot/projects/wifi/share/man/man9/bus_space.9#4 integrate .. //depot/projects/wifi/share/man/man9/insmntque.9#1 branch .. //depot/projects/wifi/share/man/man9/lock.9#11 integrate .. //depot/projects/wifi/share/man/man9/vfs_mountedfrom.9#1 branch .. //depot/projects/wifi/share/man/man9/vgone.9#4 integrate .. //depot/projects/wifi/share/man/man9/vhold.9#5 integrate .. //depot/projects/wifi/share/man/man9/vput.9#3 integrate .. //depot/projects/wifi/share/man/man9/vref.9#3 integrate .. //depot/projects/wifi/share/man/man9/vrefcnt.9#1 branch .. //depot/projects/wifi/share/man/man9/vrele.9#3 integrate .. //depot/projects/wifi/share/misc/bsd-family-tree#21 integrate .. //depot/projects/wifi/share/misc/committers-doc.dot#4 integrate .. //depot/projects/wifi/share/misc/committers-ports.dot#11 integrate .. //depot/projects/wifi/share/mk/bsd.cpu.mk#11 integrate .. //depot/projects/wifi/share/mk/sys.mk#11 integrate .. //depot/projects/wifi/share/zoneinfo/leapseconds#11 integrate .. //depot/projects/wifi/share/zoneinfo/southamerica#9 integrate .. //depot/projects/wifi/sys/amd64/amd64/identcpu.c#13 integrate .. //depot/projects/wifi/sys/amd64/amd64/legacy.c#6 integrate .. //depot/projects/wifi/sys/amd64/amd64/mp_machdep.c#23 integrate .. //depot/projects/wifi/sys/amd64/amd64/pmap.c#26 integrate .. //depot/projects/wifi/sys/amd64/conf/GENERIC#28 integrate .. //depot/projects/wifi/sys/amd64/include/pmap.h#8 integrate .. //depot/projects/wifi/sys/amd64/include/smp.h#12 integrate .. //depot/projects/wifi/sys/arm/arm/pmap.c#26 integrate .. //depot/projects/wifi/sys/arm/arm/uio_machdep.c#3 integrate .. //depot/projects/wifi/sys/arm/conf/AVILA#5 integrate .. //depot/projects/wifi/sys/arm/include/_bus.h#2 integrate .. //depot/projects/wifi/sys/arm/include/pmap.h#17 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/ixp425.c#7 integrate .. //depot/projects/wifi/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/wifi/sys/boot/i386/boot2/boot2.c#9 integrate .. //depot/projects/wifi/sys/boot/i386/btx/btx/Makefile#3 integrate .. //depot/projects/wifi/sys/boot/i386/btx/btx/btx.S#4 integrate .. //depot/projects/wifi/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/wifi/sys/boot/i386/libi386/biosdisk.c#6 integrate .. //depot/projects/wifi/sys/boot/i386/pxeldr/pxeldr.S#4 integrate .. //depot/projects/wifi/sys/boot/pc98/btx/btx/Makefile#4 integrate .. //depot/projects/wifi/sys/boot/pc98/btx/btx/btx.S#5 integrate .. //depot/projects/wifi/sys/boot/pc98/libpc98/Makefile#6 integrate .. //depot/projects/wifi/sys/boot/pc98/libpc98/biosdisk.c#6 integrate .. //depot/projects/wifi/sys/cam/cam_xpt.c#26 integrate .. //depot/projects/wifi/sys/compat/linux/linux_futex.c#5 integrate .. //depot/projects/wifi/sys/conf/NOTES#52 integrate .. //depot/projects/wifi/sys/conf/files#67 integrate .. //depot/projects/wifi/sys/conf/files.powerpc#14 integrate .. //depot/projects/wifi/sys/conf/kmod.mk#26 integrate .. //depot/projects/wifi/sys/conf/ldscript.powerpc#2 integrate .. //depot/projects/wifi/sys/conf/options#46 integrate .. //depot/projects/wifi/sys/conf/options.powerpc#4 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#10 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 integrate .. //depot/projects/wifi/sys/ddb/db_command.c#12 integrate .. //depot/projects/wifi/sys/ddb/db_examine.c#5 integrate .. //depot/projects/wifi/sys/ddb/db_input.c#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi.c#33 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_cpu.c#16 integrate .. //depot/projects/wifi/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#31 integrate .. //depot/projects/wifi/sys/dev/ata/ata-pci.h#23 integrate .. //depot/projects/wifi/sys/dev/atkbdc/psm.c#8 integrate .. //depot/projects/wifi/sys/dev/bge/if_bge.c#29 integrate .. //depot/projects/wifi/sys/dev/bge/if_bgereg.h#19 integrate .. //depot/projects/wifi/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/wifi/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/wifi/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/wifi/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/wifi/sys/dev/cpufreq/ichss.c#6 integrate .. //depot/projects/wifi/sys/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/wifi/sys/dev/cxgb/cxgb_main.c#15 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_sge.c#15 integrate .. //depot/projects/wifi/sys/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/wifi/sys/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/wifi/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/wifi/sys/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/wifi/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/wifi/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/wifi/sys/dev/cxgb/t3fw-5.0.0.bin.gz.uu#2 delete .. //depot/projects/wifi/sys/dev/drm/drm_pciids.h#7 integrate .. //depot/projects/wifi/sys/dev/em/LICENSE#5 integrate .. //depot/projects/wifi/sys/dev/em/e1000_80003es2lan.c#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_80003es2lan.h#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82540.c#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82541.c#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82541.h#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82542.c#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82543.c#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82543.h#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82571.c#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82571.h#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_82575.c#4 delete .. //depot/projects/wifi/sys/dev/em/e1000_82575.h#4 delete .. //depot/projects/wifi/sys/dev/em/e1000_api.c#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_api.h#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_defines.h#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_hw.h#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_ich8lan.c#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_ich8lan.h#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_mac.c#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_mac.h#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_manage.c#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_manage.h#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_nvm.c#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_nvm.h#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_osdep.h#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_phy.c#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_phy.h#4 integrate .. //depot/projects/wifi/sys/dev/em/e1000_regs.h#4 integrate .. //depot/projects/wifi/sys/dev/em/if_em.c#30 integrate .. //depot/projects/wifi/sys/dev/em/if_em.h#15 integrate .. //depot/projects/wifi/sys/dev/gem/if_gem.c#17 integrate .. //depot/projects/wifi/sys/dev/hptrr/hptrr_os_bsd.c#3 integrate .. //depot/projects/wifi/sys/dev/hptrr/hptrr_osm_bsd.c#4 integrate .. //depot/projects/wifi/sys/dev/hptrr/ldm.h#3 integrate .. //depot/projects/wifi/sys/dev/hptrr/osm.h#3 integrate .. //depot/projects/wifi/sys/dev/ic/quicc.h#1 branch .. //depot/projects/wifi/sys/dev/igb/e1000_82575.c#1 branch .. //depot/projects/wifi/sys/dev/igb/e1000_82575.h#1 branch .. //depot/projects/wifi/sys/dev/igb/e1000_api.c#1 branch .. //depot/projects/wifi/sys/dev/igb/e1000_api.h#1 branch .. //depot/projects/wifi/sys/dev/igb/e1000_defines.h#1 branch .. //depot/projects/wifi/sys/dev/igb/e1000_hw.h#1 branch .. //depot/projects/wifi/sys/dev/igb/e1000_mac.c#1 branch .. //depot/projects/wifi/sys/dev/igb/e1000_mac.h#1 branch .. //depot/projects/wifi/sys/dev/igb/e1000_manage.c#1 branch .. //depot/projects/wifi/sys/dev/igb/e1000_manage.h#1 branch .. //depot/projects/wifi/sys/dev/igb/e1000_nvm.c#1 branch .. //depot/projects/wifi/sys/dev/igb/e1000_nvm.h#1 branch .. //depot/projects/wifi/sys/dev/igb/e1000_osdep.h#1 branch .. //depot/projects/wifi/sys/dev/igb/e1000_phy.c#1 branch .. //depot/projects/wifi/sys/dev/igb/e1000_phy.h#1 branch .. //depot/projects/wifi/sys/dev/igb/e1000_regs.h#1 branch .. //depot/projects/wifi/sys/dev/igb/if_igb.c#1 branch .. //depot/projects/wifi/sys/dev/igb/if_igb.h#1 branch .. //depot/projects/wifi/sys/dev/lge/if_lge.c#16 integrate .. //depot/projects/wifi/sys/dev/md/md.c#20 integrate .. //depot/projects/wifi/sys/dev/mii/brgphy.c#17 integrate .. //depot/projects/wifi/sys/dev/mii/ciphy.c#7 integrate .. //depot/projects/wifi/sys/dev/mii/miidevs#14 integrate .. //depot/projects/wifi/sys/dev/mii/rgephy.c#7 integrate .. //depot/projects/wifi/sys/dev/msk/if_msk.c#11 integrate .. //depot/projects/wifi/sys/dev/msk/if_mskreg.h#7 integrate .. //depot/projects/wifi/sys/dev/nfe/if_nfe.c#9 integrate .. //depot/projects/wifi/sys/dev/nfe/if_nfereg.h#5 integrate .. //depot/projects/wifi/sys/dev/nfe/if_nfevar.h#5 integrate .. //depot/projects/wifi/sys/dev/pccard/pccarddevs#17 integrate .. //depot/projects/wifi/sys/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/wifi/sys/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/wifi/sys/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/wifi/sys/dev/quicc/quicc_core.c#1 branch .. //depot/projects/wifi/sys/dev/re/if_re.c#26 integrate .. //depot/projects/wifi/sys/dev/scc/scc_bfe.h#4 integrate .. //depot/projects/wifi/sys/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/wifi/sys/dev/scc/scc_bus.h#2 integrate .. //depot/projects/wifi/sys/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/wifi/sys/dev/tsec/if_tsec.c#1 branch .. //depot/projects/wifi/sys/dev/tsec/if_tsec.h#1 branch .. //depot/projects/wifi/sys/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/wifi/sys/dev/uart/uart.h#5 integrate .. //depot/projects/wifi/sys/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/wifi/sys/dev/uart/uart_bus_scc.c#2 integrate .. //depot/projects/wifi/sys/dev/uart/uart_cpu_powerpc.c#4 integrate .. //depot/projects/wifi/sys/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/wifi/sys/dev/usb/ehci.c#22 integrate .. //depot/projects/wifi/sys/dev/usb/if_axe.c#26 integrate .. //depot/projects/wifi/sys/dev/usb/ubsa.c#11 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#37 integrate .. //depot/projects/wifi/sys/dev/usb/uscanner.c#14 integrate .. //depot/projects/wifi/sys/dev/usb/uslcom.c#1 branch .. //depot/projects/wifi/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/wifi/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/wifi/sys/dev/wpi/if_wpi.c#22 integrate .. //depot/projects/wifi/sys/dev/wpi/if_wpireg.h#4 integrate .. //depot/projects/wifi/sys/dev/wpi/if_wpivar.h#8 integrate .. //depot/projects/wifi/sys/fs/coda/TODO#3 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#40 integrate .. //depot/projects/wifi/sys/fs/fdescfs/fdesc_vnops.c#12 integrate .. //depot/projects/wifi/sys/fs/nullfs/null_vfsops.c#18 integrate .. //depot/projects/wifi/sys/fs/nullfs/null_vnops.c#21 integrate .. //depot/projects/wifi/sys/fs/nwfs/nwfs_node.c#12 integrate .. //depot/projects/wifi/sys/fs/nwfs/nwfs_subr.c#6 integrate .. //depot/projects/wifi/sys/fs/pseudofs/pseudofs_vncache.c#13 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs.h#5 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_io.c#12 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_node.c#15 integrate .. //depot/projects/wifi/sys/fs/smbfs/smbfs_vfsops.c#15 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_subr.c#8 integrate .. //depot/projects/wifi/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_vfsops.c#13 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_vnops.c#24 integrate .. //depot/projects/wifi/sys/gdb/gdb_main.c#6 integrate .. //depot/projects/wifi/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/wifi/sys/geom/part/g_part_vtoc8.c#1 branch .. //depot/projects/wifi/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#4 integrate .. //depot/projects/wifi/sys/i386/conf/GENERIC#25 integrate .. //depot/projects/wifi/sys/i386/cpufreq/est.c#7 integrate .. //depot/projects/wifi/sys/i386/i386/identcpu.c#16 integrate .. //depot/projects/wifi/sys/i386/i386/initcpu.c#7 integrate .. //depot/projects/wifi/sys/i386/i386/legacy.c#7 integrate .. //depot/projects/wifi/sys/i386/i386/mp_machdep.c#28 integrate .. //depot/projects/wifi/sys/i386/include/_types.h#6 integrate .. //depot/projects/wifi/sys/i386/include/float.h#3 integrate .. //depot/projects/wifi/sys/i386/include/smp.h#12 integrate .. //depot/projects/wifi/sys/ia64/ia64/mp_machdep.c#10 integrate .. //depot/projects/wifi/sys/kern/init_main.c#23 integrate .. //depot/projects/wifi/sys/kern/init_sysent.c#22 integrate .. //depot/projects/wifi/sys/kern/kern_cpuset.c#1 branch .. //depot/projects/wifi/sys/kern/kern_descrip.c#34 integrate .. //depot/projects/wifi/sys/kern/kern_lock.c#26 integrate .. //depot/projects/wifi/sys/kern/kern_priv.c#5 integrate .. //depot/projects/wifi/sys/kern/kern_shutdown.c#13 integrate .. //depot/projects/wifi/sys/kern/kern_sig.c#27 integrate .. //depot/projects/wifi/sys/kern/kern_synch.c#20 integrate .. //depot/projects/wifi/sys/kern/kern_thread.c#26 integrate .. //depot/projects/wifi/sys/kern/sched_4bsd.c#20 integrate .. //depot/projects/wifi/sys/kern/sched_ule.c#32 integrate .. //depot/projects/wifi/sys/kern/subr_bus.c#26 integrate .. //depot/projects/wifi/sys/kern/subr_smp.c#11 integrate .. //depot/projects/wifi/sys/kern/subr_witness.c#33 integrate .. //depot/projects/wifi/sys/kern/syscalls.c#22 integrate .. //depot/projects/wifi/sys/kern/syscalls.master#23 integrate .. //depot/projects/wifi/sys/kern/systrace_args.c#7 integrate .. //depot/projects/wifi/sys/kern/vfs_bio.c#31 integrate .. //depot/projects/wifi/sys/kern/vfs_cache.c#17 integrate .. //depot/projects/wifi/sys/kern/vfs_default.c#28 integrate .. //depot/projects/wifi/sys/kern/vfs_lookup.c#24 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#48 integrate .. //depot/projects/wifi/sys/kern/vnode_if.src#17 integrate .. //depot/projects/wifi/sys/modules/Makefile#48 integrate .. //depot/projects/wifi/sys/modules/cmx/Makefile#1 branch .. //depot/projects/wifi/sys/modules/cxgb/Makefile#8 integrate .. //depot/projects/wifi/sys/modules/cxgb/cxgb/Makefile#4 integrate .. //depot/projects/wifi/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/wifi/sys/modules/em/Makefile#5 integrate .. //depot/projects/wifi/sys/modules/geom/Makefile#9 integrate .. //depot/projects/wifi/sys/modules/geom/geom_apple/Makefile#2 delete .. //depot/projects/wifi/sys/modules/geom/geom_gpt/Makefile#2 delete .. //depot/projects/wifi/sys/modules/geom/geom_part/Makefile#1 branch .. //depot/projects/wifi/sys/modules/igb/Makefile#1 branch .. //depot/projects/wifi/sys/modules/ipfw_nat/Makefile#1 branch .. //depot/projects/wifi/sys/modules/uslcom/Makefile#1 branch .. //depot/projects/wifi/sys/modules/vr/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/zfs/Makefile#7 integrate .. //depot/projects/wifi/sys/net/bpf_filter.c#7 integrate .. //depot/projects/wifi/sys/net/if.c#31 integrate .. //depot/projects/wifi/sys/net/if_ethersubr.c#28 integrate .. //depot/projects/wifi/sys/net/if_gif.c#12 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#28 integrate .. //depot/projects/wifi/sys/netgraph/ng_base.c#30 integrate .. //depot/projects/wifi/sys/netgraph/ng_ksocket.c#9 integrate .. //depot/projects/wifi/sys/netgraph/ng_l2tp.c#6 integrate .. //depot/projects/wifi/sys/netgraph/ng_nat.c#6 integrate .. //depot/projects/wifi/sys/netgraph/ng_nat.h#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_pppoe.c#14 integrate .. //depot/projects/wifi/sys/netinet/in.h#12 integrate .. //depot/projects/wifi/sys/netinet/in_pcb.c#21 integrate .. //depot/projects/wifi/sys/netinet/ip_dummynet.c#17 integrate .. //depot/projects/wifi/sys/netinet/ip_fw.h#15 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#34 integrate .. //depot/projects/wifi/sys/netinet/ip_fw_nat.c#1 branch .. //depot/projects/wifi/sys/netinet/ip_fw_pfil.c#15 integrate .. //depot/projects/wifi/sys/netinet/libalias/alias.c#5 integrate .. //depot/projects/wifi/sys/netinet/libalias/alias_db.c#6 integrate .. //depot/projects/wifi/sys/netinet/libalias/alias_ftp.c#6 integrate .. //depot/projects/wifi/sys/netinet/libalias/alias_irc.c#6 integrate .. //depot/projects/wifi/sys/netinet/libalias/alias_local.h#5 integrate .. //depot/projects/wifi/sys/netinet/libalias/alias_proxy.c#7 integrate .. //depot/projects/wifi/sys/netinet/libalias/alias_smedia.c#5 integrate .. //depot/projects/wifi/sys/netinet/tcp_input.c#34 integrate .. //depot/projects/wifi/sys/netinet/tcp_output.c#21 integrate .. //depot/projects/wifi/sys/netipsec/key.c#7 integrate .. //depot/projects/wifi/sys/netipsec/key_debug.c#5 integrate .. //depot/projects/wifi/sys/netncp/ncp_conn.c#8 integrate .. //depot/projects/wifi/sys/netncp/ncp_conn.h#3 integrate .. //depot/projects/wifi/sys/netsmb/smb_conn.c#8 integrate .. //depot/projects/wifi/sys/netsmb/smb_conn.h#3 integrate .. //depot/projects/wifi/sys/netsmb/smb_iod.c#5 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_idmap.c#4 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_vfsops.c#15 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_node.c#17 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_subs.c#16 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vfsops.c#24 integrate .. //depot/projects/wifi/sys/nfsserver/nfs_serv.c#17 integrate .. //depot/projects/wifi/sys/pc98/cbus/sio.c#10 integrate .. //depot/projects/wifi/sys/pc98/conf/GENERIC#23 integrate .. //depot/projects/wifi/sys/pc98/pc98/machdep.c#16 integrate .. //depot/projects/wifi/sys/pci/if_rl.c#17 integrate .. //depot/projects/wifi/sys/pci/if_rlreg.h#16 integrate .. //depot/projects/wifi/sys/pci/if_vr.c#16 delete .. //depot/projects/wifi/sys/pci/if_vrreg.h#9 delete .. //depot/projects/wifi/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/wifi/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/wifi/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/wifi/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/wifi/sys/powerpc/aim/trap_subr.S#2 integrate .. //depot/projects/wifi/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/wifi/sys/powerpc/booke/clock.c#1 branch .. //depot/projects/wifi/sys/powerpc/booke/copyinout.c#1 branch .. //depot/projects/wifi/sys/powerpc/booke/interrupt.c#1 branch .. //depot/projects/wifi/sys/powerpc/booke/locore.S#1 branch .. //depot/projects/wifi/sys/powerpc/booke/machdep.c#1 branch .. //depot/projects/wifi/sys/powerpc/booke/pmap.c#1 branch .. //depot/projects/wifi/sys/powerpc/booke/support.S#1 branch .. //depot/projects/wifi/sys/powerpc/booke/swtch.S#1 branch .. //depot/projects/wifi/sys/powerpc/booke/trap.c#1 branch .. //depot/projects/wifi/sys/powerpc/booke/trap_subr.S#1 branch .. //depot/projects/wifi/sys/powerpc/booke/uio_machdep.c#1 branch .. //depot/projects/wifi/sys/powerpc/booke/vm_machdep.c#1 branch .. //depot/projects/wifi/sys/powerpc/conf/MPC85XX#1 branch .. //depot/projects/wifi/sys/powerpc/conf/NOTES#9 integrate .. //depot/projects/wifi/sys/powerpc/fpu/fpu_emu.c#2 integrate .. //depot/projects/wifi/sys/powerpc/include/float.h#3 integrate .. //depot/projects/wifi/sys/powerpc/include/frame.h#4 integrate .. //depot/projects/wifi/sys/powerpc/include/hid.h#3 integrate .. //depot/projects/wifi/sys/powerpc/include/intr_machdep.h#7 integrate .. //depot/projects/wifi/sys/powerpc/include/kdb.h#4 integrate .. //depot/projects/wifi/sys/powerpc/include/md_var.h#6 integrate .. //depot/projects/wifi/sys/powerpc/include/mmuvar.h#2 integrate .. //depot/projects/wifi/sys/powerpc/include/ocpbus.h#1 branch .. //depot/projects/wifi/sys/powerpc/include/openpicvar.h#6 integrate .. //depot/projects/wifi/sys/powerpc/include/pcb.h#3 integrate .. //depot/projects/wifi/sys/powerpc/include/pcpu.h#4 integrate .. //depot/projects/wifi/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/wifi/sys/powerpc/include/psl.h#4 integrate .. //depot/projects/wifi/sys/powerpc/include/pte.h#3 integrate .. //depot/projects/wifi/sys/powerpc/include/sf_buf.h#2 integrate .. //depot/projects/wifi/sys/powerpc/include/spr.h#4 integrate .. //depot/projects/wifi/sys/powerpc/include/tlb.h#1 branch .. //depot/projects/wifi/sys/powerpc/include/trap.h#4 integrate .. //depot/projects/wifi/sys/powerpc/include/trap_aim.h#1 branch .. //depot/projects/wifi/sys/powerpc/include/trap_booke.h#1 branch .. //depot/projects/wifi/sys/powerpc/include/vmparam.h#7 integrate .. //depot/projects/wifi/sys/powerpc/mpc85xx/nexus.c#1 branch .. //depot/projects/wifi/sys/powerpc/mpc85xx/ocpbus.c#1 branch .. //depot/projects/wifi/sys/powerpc/mpc85xx/ocpbus.h#1 branch .. //depot/projects/wifi/sys/powerpc/mpc85xx/opic.c#1 branch .. //depot/projects/wifi/sys/powerpc/mpc85xx/pci_ocp.c#1 branch .. //depot/projects/wifi/sys/powerpc/powermac/openpic_macio.c#5 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/autoconf.c#5 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/cpu.c#6 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/db_trace.c#10 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/gdb_machdep.c#2 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/genassym.c#6 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/intr_machdep.c#9 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/mp_machdep.c#4 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/openpic.c#7 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/pic_if.m#6 integrate .. //depot/projects/wifi/sys/powerpc/psim/openpic_iobus.c#5 integrate .. //depot/projects/wifi/sys/security/audit/audit.c#14 integrate .. //depot/projects/wifi/sys/security/audit/audit_arg.c#11 integrate .. //depot/projects/wifi/sys/security/audit/audit_bsm.c#9 integrate .. //depot/projects/wifi/sys/security/audit/audit_bsm_klib.c#6 integrate .. //depot/projects/wifi/sys/security/audit/audit_private.h#7 integrate .. //depot/projects/wifi/sys/security/audit/audit_syscalls.c#13 integrate .. //depot/projects/wifi/sys/security/audit/audit_trigger.c#4 integrate .. //depot/projects/wifi/sys/security/audit/audit_worker.c#8 integrate .. //depot/projects/wifi/sys/sparc64/conf/GENERIC#23 integrate .. //depot/projects/wifi/sys/sparc64/include/tlb.h#2 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/cache.c#3 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/iommu.c#7 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/mp_machdep.c#10 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/pmap.c#20 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/wifi/sys/sun4v/sun4v/mp_machdep.c#5 integrate .. //depot/projects/wifi/sys/sys/_types.h#6 integrate .. //depot/projects/wifi/sys/sys/buf.h#20 integrate .. //depot/projects/wifi/sys/sys/bufobj.h#9 integrate .. //depot/projects/wifi/sys/sys/bus.h#14 integrate .. //depot/projects/wifi/sys/sys/cpuset.h#1 branch .. //depot/projects/wifi/sys/sys/fcntl.h#3 integrate .. //depot/projects/wifi/sys/sys/lockmgr.h#16 integrate .. //depot/projects/wifi/sys/sys/mount.h#23 integrate .. //depot/projects/wifi/sys/sys/param.h#38 integrate .. //depot/projects/wifi/sys/sys/pcpu.h#9 integrate .. //depot/projects/wifi/sys/sys/proc.h#40 integrate .. //depot/projects/wifi/sys/sys/sched.h#9 integrate .. //depot/projects/wifi/sys/sys/smp.h#6 integrate .. //depot/projects/wifi/sys/sys/syscall.h#21 integrate .. //depot/projects/wifi/sys/sys/syscall.mk#21 integrate .. //depot/projects/wifi/sys/sys/sysproto.h#21 integrate .. //depot/projects/wifi/sys/sys/types.h#8 integrate .. //depot/projects/wifi/sys/sys/vnode.h#37 integrate .. //depot/projects/wifi/sys/sys/vtoc.h#1 branch .. //depot/projects/wifi/sys/ufs/ffs/ffs_rawread.c#13 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_softdep.c#24 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vfsops.c#34 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vnops.c#24 integrate .. //depot/projects/wifi/sys/ufs/ufs/extattr.h#5 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_extattr.c#16 integrate .. //depot/projects/wifi/sys/vm/vm_fault.c#24 integrate .. //depot/projects/wifi/sys/vm/vm_map.h#7 integrate .. //depot/projects/wifi/sys/vm/vm_object.c#27 integrate .. //depot/projects/wifi/tools/build/mk/OptionalObsoleteFiles.inc#8 integrate .. //depot/projects/wifi/tools/regression/bin/sh/builtins/cd1.0#1 branch .. //depot/projects/wifi/tools/regression/environ/envctl.c#3 integrate .. //depot/projects/wifi/tools/regression/file/dup/dup.c#2 integrate .. //depot/projects/wifi/tools/regression/lib/msun/test-trig.c#2 integrate .. //depot/projects/wifi/tools/tools/tinybsd/tinybsd#3 integrate .. //depot/projects/wifi/usr.bin/Makefile#17 integrate .. //depot/projects/wifi/usr.bin/ar/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/ar/ar.c#2 integrate .. //depot/projects/wifi/usr.bin/ar/write.c#2 integrate .. //depot/projects/wifi/usr.bin/awk/Makefile#5 integrate .. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.freebsd#28 integrate .. //depot/projects/wifi/usr.bin/chat/chat.c#2 integrate .. //depot/projects/wifi/usr.bin/cpuset/Makefile#1 branch .. //depot/projects/wifi/usr.bin/cpuset/cpuset.1#1 branch .. //depot/projects/wifi/usr.bin/cpuset/cpuset.c#1 branch .. //depot/projects/wifi/usr.bin/du/du.1#5 integrate .. //depot/projects/wifi/usr.bin/du/du.c#8 integrate .. //depot/projects/wifi/usr.bin/find/find.1#9 integrate .. //depot/projects/wifi/usr.bin/find/main.c#2 integrate .. //depot/projects/wifi/usr.bin/gzip/gzip.c#4 integrate .. //depot/projects/wifi/usr.bin/make/Makefile#13 integrate .. //depot/projects/wifi/usr.bin/make/Makefile.dist#5 integrate .. //depot/projects/wifi/usr.bin/make/arch.c#14 integrate .. //depot/projects/wifi/usr.bin/make/job.c#21 integrate .. //depot/projects/wifi/usr.bin/make/main.c#28 integrate .. //depot/projects/wifi/usr.bin/make/make.1#18 integrate .. //depot/projects/wifi/usr.bin/unifdef/unifdef.c#4 integrate .. //depot/projects/wifi/usr.sbin/Makefile#28 integrate .. //depot/projects/wifi/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#8 integrate .. //depot/projects/wifi/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#3 integrate .. //depot/projects/wifi/usr.sbin/fifolog/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/Makefile.inc#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/fifolog_create/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/flint.lnt#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/lib/Makefile#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/lib/fifolog.h#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/lib/fifolog_create.c#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/lib/fifolog_int.c#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/lib/fifolog_write.h#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/lib/getdate.y#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/lib/libfifolog.h#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch .. //depot/projects/wifi/usr.sbin/fifolog/lib/miniobj.h#1 branch .. //depot/projects/wifi/usr.sbin/fwcontrol/fwcontrol.8#8 integrate .. //depot/projects/wifi/usr.sbin/fwcontrol/fwcontrol.c#5 integrate .. //depot/projects/wifi/usr.sbin/mountd/mountd.c#12 integrate .. //depot/projects/wifi/usr.sbin/moused/Makefile#5 integrate .. //depot/projects/wifi/usr.sbin/moused/moused.c#11 integrate .. //depot/projects/wifi/usr.sbin/pkg_install/add/main.c#10 integrate Differences ... ==== //depot/projects/wifi/Makefile.inc1#41 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.598 2008/02/05 15:41:58 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -203,6 +203,9 @@ GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac +.if ${OSRELDATE} < 700044 +CROSSENV+= AR=gnu-ar RANLIB=gnu-ranlib +.endif # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -872,6 +875,14 @@ .endif .endif +.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022 +_ar= usr.bin/ar +.endif + +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -881,18 +892,15 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 800013 -_mklocale= usr.bin/mklocale -.endif - bootstrap-tools: .for _tool in \ - ${_mklocale} \ ${_strfile} \ ${_gperf} \ ${_groff} \ + ${_ar} \ usr.bin/lorder \ usr.bin/makewhatis \ + ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ ==== //depot/projects/wifi/ObsoleteFiles.inc#28 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -32,6 +32,11 @@ OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libkse.a +OLD_FILES+=usr/lib32/libkse_p.a +OLD_FILES+=usr/lib32/libkse_pic.a +.endif .endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h @@ -134,6 +139,12 @@ OLD_DIRS+=usr/include/netatm/uni OLD_DIRS+=usr/include/netatm OLD_DIRS+=usr/share/examples/atm +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libatm.a +OLD_FILES+=usr/lib32/libatm.so +OLD_LIBS+=usr/lib32/libatm.so.5 +OLD_FILES+=usr/lib32/libatm_p.a +.endif # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -224,6 +235,42 @@ OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libalias.so.5 +OLD_LIBS+=usr/lib32/libbsnmp.so.3 +OLD_LIBS+=usr/lib32/libdialog.so.5 +OLD_LIBS+=usr/lib32/libgnuregex.so.3 +OLD_LIBS+=usr/lib32/libhistory.so.6 +OLD_LIBS+=usr/lib32/libncurses.so.6 +OLD_LIBS+=usr/lib32/libncursesw.so.6 +OLD_LIBS+=usr/lib32/libpam.so.3 +OLD_LIBS+=usr/lib32/libreadline.so.6 +OLD_LIBS+=usr/lib32/libssh.so.3 +OLD_LIBS+=usr/lib32/pam_chroot.so.3 +OLD_LIBS+=usr/lib32/pam_deny.so.3 +OLD_LIBS+=usr/lib32/pam_echo.so.3 +OLD_LIBS+=usr/lib32/pam_exec.so.3 +OLD_LIBS+=usr/lib32/pam_ftpusers.so.3 +OLD_LIBS+=usr/lib32/pam_group.so.3 +OLD_LIBS+=usr/lib32/pam_guest.so.3 +OLD_LIBS+=usr/lib32/pam_krb5.so.3 +OLD_LIBS+=usr/lib32/pam_ksu.so.3 +OLD_LIBS+=usr/lib32/pam_lastlog.so.3 +OLD_LIBS+=usr/lib32/pam_login_access.so.3 +OLD_LIBS+=usr/lib32/pam_nologin.so.3 +OLD_LIBS+=usr/lib32/pam_opie.so.3 +OLD_LIBS+=usr/lib32/pam_opieaccess.so.3 +OLD_LIBS+=usr/lib32/pam_passwdqc.so.3 +OLD_LIBS+=usr/lib32/pam_permit.so.3 +OLD_LIBS+=usr/lib32/pam_radius.so.3 +OLD_LIBS+=usr/lib32/pam_rhosts.so.3 +OLD_LIBS+=usr/lib32/pam_rootok.so.3 +OLD_LIBS+=usr/lib32/pam_securetty.so.3 +OLD_LIBS+=usr/lib32/pam_self.so.3 +OLD_LIBS+=usr/lib32/pam_ssh.so.3 +OLD_LIBS+=usr/lib32/pam_tacplus.so.3 +OLD_LIBS+=usr/lib32/pam_unix.so.3 +.endif # 20070613: IPX over IP tunnel removal OLD_FILES+=usr/include/netipx/ipx_ip.h # 20070605: sched_core removal @@ -603,6 +650,9 @@ OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=usr/lib/libarchive.so.3 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libarchive.so.3 +.endif # 20070301: remove addr2ascii and ascii2addr OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz ==== //depot/projects/wifi/UPDATING#41 (text+ko) ==== @@ -22,6 +22,20 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080301: + The layout of struct vmspace has changed. This affects libkvm + and any executables that link against libkvm and use the + kvm_getprocs() function. In particular, but not exclusively, + it affects ps(1), fstat(1), pkill(1), systat(1), top(1) and w(1). + The effects are minimal, but it's advisable to upgrade world + nonetheless. + +20080229: + The latest em driver no longer has support in it for the + 82575 adapter, this is now moved to the igb driver. The + split was done to make new features that are incompatible + with older hardware easier to do. + 20080220: The new geom_lvm(4) geom class has been renamed to geom_linux_lvm(4), likewise the kernel option is now GEOM_LINUX_LVM. @@ -983,4 +997,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.520 2008/02/20 07:50:12 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ ==== //depot/projects/wifi/bin/chflags/chflags.1#9 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.30 2008/03/09 12:10:24 rwatson Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -40,7 +40,7 @@ .Nd change file flags .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl fhv .Oo .Fl R .Op Fl H | Fl L | Fl P @@ -57,6 +57,12 @@ .Pp The options are as follows: .Bl -tag -width indent +.It Fl f +Do not display a diagnostic message if +.Nm +could not modify the flags for +.Va file , +nor modify the exit status to reflect such failures. .It Fl H If the .Fl R @@ -79,6 +85,14 @@ .It Fl R Change the file flags for the file hierarchies rooted in the files instead of just the files themselves. +.It Fl v +Cause +.Nm +to be verbose, showing filenames as the flags are modified. +If the +.Fl v +option is specified more than once, the old and new flags of the file +will also be printed, in octal notation. .El .Pp The flags are specified as an octal number or a comma separated list ==== //depot/projects/wifi/bin/chflags/chflags.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.24 2008/03/09 12:10:24 rwatson Exp $"); #include #include @@ -60,14 +60,15 @@ { FTS *ftsp; FTSENT *p; - u_long clear, set; + u_long clear, newflags, set; long val; - int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval; + int Hflag, Lflag, Rflag, fflag, hflag, vflag; + int ch, fts_options, oct, rval; char *flags, *ep; int (*change_flags)(const char *, unsigned long); - Hflag = Lflag = Rflag = hflag = 0; - while ((ch = getopt(argc, argv, "HLPRh")) != -1) + Hflag = Lflag = Rflag = fflag = hflag = vflag = 0; + while ((ch = getopt(argc, argv, "HLPRfhv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -83,9 +84,15 @@ case 'R': Rflag = 1; break; + case 'f': + fflag = 1; + break; case 'h': hflag = 1; break; + case 'v': + vflag++; + break; case '?': default: usage(); @@ -166,18 +173,23 @@ default: break; } - if (oct) { - if (!(*change_flags)(p->fts_accpath, set)) - continue; - } else { - p->fts_statp->st_flags |= set; - p->fts_statp->st_flags &= clear; - if (!(*change_flags)(p->fts_accpath, - (u_long)p->fts_statp->st_flags)) - continue; + if (oct) + newflags = set; + else + newflags = (p->fts_statp->st_flags | set) & clear; + if (newflags == p->fts_statp->st_flags) + continue; + if ((*change_flags)(p->fts_accpath, newflags) && !fflag) { + warn("%s", p->fts_path); + rval = 1; + } else if (vflag) { + (void)printf("%s", p->fts_path); + if (vflag > 1) + (void)printf(": 0%lo -> 0%lo", + (u_long)p->fts_statp->st_flags, + newflags); + (void)printf("\n"); } - warn("%s", p->fts_path); - rval = 1; } if (errno) err(1, "fts_read"); @@ -188,6 +200,6 @@ usage(void) { (void)fprintf(stderr, - "usage: chflags [-h] [-R [-H | -L | -P]] flags file ...\n"); + "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n"); exit(1); } ==== //depot/projects/wifi/bin/cp/cp.1#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $ .\" .Dd October 27, 2006 .Dt CP 1 @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -116,6 +116,10 @@ or .Xr pax 1 instead. +.It Fl a +Archive mode. +Same as +.Fl RpP . .It Fl f For each existing destination pathname, remove it and create a new file, without prompting for confirmation ==== //depot/projects/wifi/bin/cp/cp.c#7 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); /* * Cp copies source files to target files. @@ -102,7 +102,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -119,6 +119,12 @@ case 'R': Rflag = 1; break; + case 'a': + Pflag = 1; + pflag = 1; + Rflag = 1; + Hflag = Lflag = 0; + break; case 'f': fflag = 1; iflag = nflag = 0; ==== //depot/projects/wifi/bin/cp/utils.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.53 2008/03/10 19:58:41 jhb Exp $"); #include #include @@ -429,8 +429,8 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 12 00:37:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 742301065676; Wed, 12 Mar 2008 00:37:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 332A91065672 for ; Wed, 12 Mar 2008 00:37:08 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 211908FC27 for ; Wed, 12 Mar 2008 00:37:08 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2C0b8QV054439 for ; Wed, 12 Mar 2008 00:37:08 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2C0b8p0054437 for perforce@freebsd.org; Wed, 12 Mar 2008 00:37:08 GMT (envelope-from peter-gmail@wemm.org) Date: Wed, 12 Mar 2008 00:37:08 GMT Message-Id: <200803120037.m2C0b8p0054437@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137455 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, 12 Mar 2008 00:37:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=137455 Change 137455 by peter@peter_melody on 2008/03/12 00:36:14 Checkpoint cpu_switch speedup. This gets almost double the gain that Jeff's patch does on my boxes. There are still some loose ends in here. WIP. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#43 edit .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#49 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#43 (text+ko) ==== @@ -97,43 +97,27 @@ movq TD_PCB(%rdi),%r8 movq (%rsp),%rax /* Hardware registers */ + movq %r15,PCB_R15(%r8) + movq %r14,PCB_R14(%r8) + movq %r13,PCB_R13(%r8) + movq %r12,PCB_R12(%r8) + movq %rbp,PCB_RBP(%r8) + movq %rsp,PCB_RSP(%r8) + movq %rbx,PCB_RBX(%r8) movq %rax,PCB_RIP(%r8) - movq %rbx,PCB_RBX(%r8) - movq %rsp,PCB_RSP(%r8) - movq %rbp,PCB_RBP(%r8) - movq %r12,PCB_R12(%r8) - movq %r13,PCB_R13(%r8) - movq %r14,PCB_R14(%r8) - movq %r15,PCB_R15(%r8) + +#if 0 + /* Save copy of pcb pointer */ + movq %r8,%r9 +#endif testl $PCB_32BIT,PCB_FLAGS(%r8) - jz 1f /* no, skip over */ + jnz store_gs /* static predict not taken */ +done_store_gs: - /* Save userland %gs */ - movl %gs,PCB_GS(%r8) - movq PCB_GS32P(%r8),%rax - movq (%rax),%rax - movq %rax,PCB_GS32SD(%r8) - -1: - /* Test if debug registers should be saved. */ testl $PCB_DBREGS,PCB_FLAGS(%r8) - jz 1f /* no, skip over */ - movq %dr7,%rax /* yes, do the save */ - movq %rax,PCB_DR7(%r8) - andq $0x0000fc00, %rax /* disable all watchpoints */ - movq %rax,%dr7 - movq %dr6,%rax - movq %rax,PCB_DR6(%r8) - movq %dr3,%rax - movq %rax,PCB_DR3(%r8) - movq %dr2,%rax - movq %rax,PCB_DR2(%r8) - movq %dr1,%rax - movq %rax,PCB_DR1(%r8) - movq %dr0,%rax - movq %rax,PCB_DR0(%r8) -1: + jnz store_dr /* static predict not taken */ +done_store_dr: /* have we used fp, and need a save? */ cmpq %rdi,PCPU(FPCURTHREAD) @@ -181,82 +165,133 @@ cmpq %rcx, %rdx pause je 1b - lfence #endif /* * At this point, we've switched address spaces and are ready * to load up the rest of the next context. */ +#if 1 movq TD_PCB(%rsi),%r8 +#endif + + /* Skip loading user fsbase/gsbase for kthreads */ + testl $TDP_KTHREAD,TD_PFLAGS(%rsi) + jnz 2f + movq TD_PCB(%rdi),%r9 + movq PCB_FSBASE(%r8),%r10 + cmpq PCB_FSBASE(%r9),%r10 + jz 1f /* Restore userland %fs */ movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx wrmsr +1: + movq PCB_GSBASE(%r8),%r10 + cmpq PCB_GSBASE(%r9),%r10 + jz 2f /* Restore userland %gs */ movl $MSR_KGSBASE,%ecx movl PCB_GSBASE(%r8),%eax movl PCB_GSBASE+4(%r8),%edx wrmsr +2: /* Update the TSS_RSP0 pointer for the next interrupt */ movq PCPU(TSSP), %rax + movq %r8, PCPU(RSP0) + movq %r8, PCPU(CURPCB) addq $COMMON_TSS_RSP0, %rax - leaq -16(%r8), %rbx - movq %rbx, (%rax) - movq %rbx, PCPU(RSP0) + movq %rsi, PCPU(CURTHREAD) /* into next thread */ + movq %r8, (%rax) - movq %r8, PCPU(CURPCB) - movq %rsi, PCPU(CURTHREAD) /* into next thread */ + /* Test if debug registers should be restored. */ + testl $PCB_DBREGS,PCB_FLAGS(%r8) + jnz load_dr /* static predict not taken */ +done_load_dr: testl $PCB_32BIT,PCB_FLAGS(%r8) - jz 1f /* no, skip over */ + jnz load_gs /* static predict not taken */ +done_load_gs: + + /* Restore context. */ + movq PCB_R15(%r8),%r15 + movq PCB_R14(%r8),%r14 + movq PCB_R13(%r8),%r13 + movq PCB_R12(%r8),%r12 + movq PCB_RBP(%r8),%rbp + movq PCB_RSP(%r8),%rsp + movq PCB_RBX(%r8),%rbx + movq PCB_RIP(%r8),%rax + movq %rax,(%rsp) + ret + + /* + * We order these strangely for several reasons. + * 1: I wanted to use static branch prediction hints + * 2: Most athlon64/opteron cpus don't have them. They define + * a forward branch as 'predict not taken'. Intel cores have + * the 'rep' prefix to invert this. + * So, to make it work on both forms of cpu we do the detour. + * We use jumps rather than call in order to avoid the stack. + */ +store_gs: + movl %gs,PCB_GS(%r8) + movq PCB_GS32P(%r8),%rax + movq (%rax),%rax + movq %rax,PCB_GS32SD(%r8) + jmp done_store_gs +load_gs: /* Restore userland %gs while preserving kernel gsbase */ movq PCB_GS32P(%r8),%rax - movq PCB_GS32SD(%r8),%rbx - movq %rbx,(%rax) + movq PCB_GS32SD(%r8),%rcx + movq %rcx,(%rax) movl $MSR_GSBASE,%ecx rdmsr movl PCB_GS(%r8),%gs wrmsr + jmp done_load_gs -1: - /* Restore context. */ - movq PCB_RBX(%r8),%rbx - movq PCB_RSP(%r8),%rsp - movq PCB_RBP(%r8),%rbp - movq PCB_R12(%r8),%r12 - movq PCB_R13(%r8),%r13 - movq PCB_R14(%r8),%r14 - movq PCB_R15(%r8),%r15 - movq PCB_RIP(%r8),%rax - movq %rax,(%rsp) +store_dr: + movq %dr7,%rax /* yes, do the save */ + movq %rax,PCB_DR7(%r8) + andq $0x0000fc00, %rax /* disable all watchpoints */ + movq %rax,%dr7 + movq %dr6,%r11 + movq %dr3,%r12 + movq %dr2,%r13 + movq %dr1,%r14 + movq %dr0,%r15 + movq %r11,PCB_DR6(%r8) + movq %r12,PCB_DR3(%r8) + movq %r13,PCB_DR2(%r8) + movq %r14,PCB_DR1(%r8) + movq %r15,PCB_DR0(%r8) + jmp done_store_dr - /* Test if debug registers should be restored. */ - testl $PCB_DBREGS,PCB_FLAGS(%r8) - jz 1f - movq PCB_DR6(%r8),%rax - movq %rax,%dr6 - movq PCB_DR3(%r8),%rax - movq %rax,%dr3 - movq PCB_DR2(%r8),%rax - movq %rax,%dr2 - movq PCB_DR1(%r8),%rax - movq %rax,%dr1 - movq PCB_DR0(%r8),%rax - movq %rax,%dr0 +load_dr: + movq PCB_DR6(%r8),%r11 + movq PCB_DR3(%r8),%r12 + movq PCB_DR2(%r8),%r13 + movq PCB_DR1(%r8),%r14 + movq PCB_DR0(%r8),%r15 + movq %r11,%dr6 + movq %r12,%dr3 + movq %r13,%dr2 + movq %r14,%dr1 + movq %r15,%dr0 /* But preserve reserved bits in %dr7 */ movq %dr7,%rax + movq PCB_DR7(%r8),%rcx andq $0x0000fc00,%rax - movq PCB_DR7(%r8),%rcx andq $~0x0000fc00,%rcx orq %rcx,%rax movq %rax,%dr7 -1: - ret + jmp done_load_dr + END(cpu_switch) /* ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#49 (text+ko) ==== @@ -86,6 +86,7 @@ ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); ASSYM(TDP_CALLCHAIN, TDP_CALLCHAIN); +ASSYM(TDP_KTHREAD, TDP_KTHREAD); ASSYM(V_TRAP, offsetof(struct vmmeter, v_trap)); ASSYM(V_SYSCALL, offsetof(struct vmmeter, v_syscall)); From owner-p4-projects@FreeBSD.ORG Wed Mar 12 01:43:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 856B51065746; Wed, 12 Mar 2008 01:43:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 433291065741 for ; Wed, 12 Mar 2008 01:43:16 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 310788FC20 for ; Wed, 12 Mar 2008 01:43:16 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2C1hGTv073168 for ; Wed, 12 Mar 2008 01:43:16 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2C1hG7m073166 for perforce@freebsd.org; Wed, 12 Mar 2008 01:43:16 GMT (envelope-from peter-gmail@wemm.org) Date: Wed, 12 Mar 2008 01:43:16 GMT Message-Id: <200803120143.m2C1hG7m073166@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137457 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, 12 Mar 2008 01:43:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=137457 Change 137457 by peter@peter_melody on 2008/03/12 01:42:55 Handle arriving via cpu_throw. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#44 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#44 (text+ko) ==== @@ -80,6 +80,8 @@ movq TD_PCB(%rsi),%rdx /* newtd->td_proc */ movq PCB_CR3(%rdx),%rdx movq %rdx,%cr3 /* new address space */ + xorl %r9d,%r9d /* Old pcb pointer */ + movq TD_PCB(%rsi),%r8 jmp swact END(cpu_throw) @@ -106,10 +108,8 @@ movq %rbx,PCB_RBX(%r8) movq %rax,PCB_RIP(%r8) -#if 0 /* Save copy of pcb pointer */ movq %r8,%r9 -#endif testl $PCB_32BIT,PCB_FLAGS(%r8) jnz store_gs /* static predict not taken */ @@ -170,17 +170,22 @@ * At this point, we've switched address spaces and are ready * to load up the rest of the next context. */ -#if 1 - movq TD_PCB(%rsi),%r8 -#endif /* Skip loading user fsbase/gsbase for kthreads */ testl $TDP_KTHREAD,TD_PFLAGS(%rsi) - jnz 2f + jnz do_tss + + testq %r9,%r9 + jz no_pcb + cmpq PCB_FSBASE(%r9),%r10 + cmpq PCB_GSBASE(%r9),%r11 + jmp check_bases +no_pcb: + movq $-1,%r10 /* Illegal value - force reload on cpu_throw */ + movq %r10,%r11 - movq TD_PCB(%rdi),%r9 +check_bases: movq PCB_FSBASE(%r8),%r10 - cmpq PCB_FSBASE(%r9),%r10 jz 1f /* Restore userland %fs */ movl $MSR_FSBASE,%ecx @@ -189,8 +194,7 @@ wrmsr 1: - movq PCB_GSBASE(%r8),%r10 - cmpq PCB_GSBASE(%r9),%r10 + movq PCB_GSBASE(%r8),%r11 jz 2f /* Restore userland %gs */ movl $MSR_KGSBASE,%ecx @@ -198,6 +202,7 @@ movl PCB_GSBASE+4(%r8),%edx wrmsr 2: +do_tss: /* Update the TSS_RSP0 pointer for the next interrupt */ movq PCPU(TSSP), %rax From owner-p4-projects@FreeBSD.ORG Wed Mar 12 05:36:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3129D1065675; Wed, 12 Mar 2008 05:36:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E55C11065672 for ; Wed, 12 Mar 2008 05:36:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCEB18FC16 for ; Wed, 12 Mar 2008 05:36:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2C5aLLm006352 for ; Wed, 12 Mar 2008 05:36:21 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2C5aLru006350 for perforce@freebsd.org; Wed, 12 Mar 2008 05:36:21 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Mar 2008 05:36:21 GMT Message-Id: <200803120536.m2C5aLru006350@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 137465 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, 12 Mar 2008 05:36:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=137465 Change 137465 by jb@jb_freebsd8 on 2008/03/12 05:35:25 Fix a bug in the pointer value printing. Oops. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#16 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#16 (text) ==== @@ -904,6 +904,7 @@ dt_type_cbdata_t cbdata; ctf_arinfo_t arinfo; ctf_encoding_t cte; + uintptr_t *up; void *vp = addr; cbdata = *cbdatap; cbdata.name = ""; @@ -964,7 +965,7 @@ dt_printf(cbdatap->dtp, cbdatap->fp, "CTF_K_FLOAT: format %x offset %u bits %u\n",cte.cte_format,cte.cte_offset,cte.cte_bits); break; case CTF_K_POINTER: - dt_printf(cbdatap->dtp, cbdatap->fp, "%p;\n", *((char *) addr)); + dt_printf(cbdatap->dtp, cbdatap->fp, "%p;\n", *((void **) addr)); break; case CTF_K_ARRAY: if (ctf_array_info(cbdatap->dtt.dtt_ctfp, type, &arinfo) != 0) From owner-p4-projects@FreeBSD.ORG Wed Mar 12 06:51:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C079D1065672; Wed, 12 Mar 2008 06:51:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 804EF106566B for ; Wed, 12 Mar 2008 06:51:41 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 63ABA8FC1A for ; Wed, 12 Mar 2008 06:51:41 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2C6pfsL010103 for ; Wed, 12 Mar 2008 06:51:41 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2C6pfjZ010101 for perforce@freebsd.org; Wed, 12 Mar 2008 06:51:41 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Wed, 12 Mar 2008 06:51:41 GMT Message-Id: <200803120651.m2C6pfjZ010101@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 137469 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, 12 Mar 2008 06:51:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=137469 Change 137469 by zhouzhouyi@zhouzhouyi_mactest on 2008/03/12 06:51:30 Test cases for setuid and setgid for MAC Framework Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#16 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/00.t#8 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#16 (text+ko) ==== @@ -660,6 +660,7 @@ } logfd = open(LOGDEV, O_RDWR); + ioctl(logfd, BEGINLOG, NULL); if (gids != NULL) { set_gids(gids); @@ -675,7 +676,6 @@ /*Begin to log */ - ioctl(logfd, BEGINLOG, NULL); for (;;) { scall = find_syscall(argv[0]); ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/00.t#8 (text+ko) ==== @@ -30,11 +30,11 @@ touch ${mactest_conf} setfmac "mls/equal,biba/equal" ${mactest_conf} - echo "1..7" + echo "1..8" n0=`namegen` n1=`namegen` - + n2=`namegen` dvplabel=`getfmac ".."| sed 's/\(\.\.:\ \)\([a-z\,\/]*\)/\2/`; @@ -119,6 +119,16 @@ echo "biba/high(low-high),mls/5(low-high) biba/high,mls/8" >> ${mactest_conf} mactestexpect "" 0 -m "mls/5" -f ${mactest_conf} chown . 65535 65535 +#case 8 setuid and setgid: + echo -n "pid = -1 proc_check_setegid:" > ${mactest_conf} + echo "biba/high(low-high),mls/5(low-high)" >> ${mactest_conf} + echo -n "pid = -1 proc_check_setuid:" >> ${mactest_conf} + echo "biba/high(low-high),mls/5(low-high)" >> ${mactest_conf} + echo -n "pid = -1 proc_check_setgroups:" >> ${mactest_conf} + echo "biba/high(low-high),mls/5(low-high)" >> ${mactest_conf} + mactestexpect "" 0 -u 65535 -g 65535 -m "mls/5" -f ${mactest_conf} mkdir ${n2} 0755 + + #cleanup: sysctl security.mac.mls.enabled=0 >/dev/null From owner-p4-projects@FreeBSD.ORG Wed Mar 12 07:15:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A610D1065674; Wed, 12 Mar 2008 07:15:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4CF031065670 for ; Wed, 12 Mar 2008 07:15:05 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2F1B88FC23 for ; Wed, 12 Mar 2008 07:15:05 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2C7F5hR011974 for ; Wed, 12 Mar 2008 07:15:05 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2C7F5Fm011972 for perforce@freebsd.org; Wed, 12 Mar 2008 07:15:05 GMT (envelope-from peter-gmail@wemm.org) Date: Wed, 12 Mar 2008 07:15:05 GMT Message-Id: <200803120715.m2C7F5Fm011972@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137470 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, 12 Mar 2008 07:15:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=137470 Change 137470 by peter@peter_overcee on 2008/03/12 07:14:48 move ts_rqindex to thread Affected files ... .. //depot/projects/bike_sched/sys/kern/kern_switch.c#9 edit .. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#15 edit .. //depot/projects/bike_sched/sys/kern/sched_ule.c#15 edit .. //depot/projects/bike_sched/sys/sys/proc.h#9 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/kern_switch.c#9 (text+ko) ==== @@ -404,7 +404,7 @@ int pri; pri = TS_TO_TD(ts)->td_priority / RQ_PPQ; - ts->ts_rqindex = pri; + TS_TO_TD(ts)->td_rqindex = pri; runq_setbit(rq, pri); rqh = &rq->rq_queues[pri]; CTR5(KTR_RUNQ, "runq_add: td=%p ts=%p pri=%d %d rqh=%p", @@ -421,7 +421,7 @@ struct rqhead *rqh; KASSERT(pri < RQ_NQS, ("runq_add_pri: %d out of range", pri)); - ts->ts_rqindex = pri; + TS_TO_TD(ts)->td_rqindex = pri; runq_setbit(rq, pri); rqh = &rq->rq_queues[pri]; CTR5(KTR_RUNQ, "runq_add_pri: td=%p ke=%p pri=%d idx=%d rqh=%p", @@ -517,7 +517,7 @@ KASSERT(ts != NULL, ("runq_choose: no proc on busy queue")); CTR4(KTR_RUNQ, "runq_choose_from: pri=%d ts=%p idx=%d rqh=%p", - pri, ts, ts->ts_rqindex, rqh); + pri, ts, TS_TO_TD(ts)->td_rqindex, rqh); return (ts); } CTR1(KTR_RUNQ, "runq_choose_from: idleproc pri=%d", pri); @@ -544,7 +544,7 @@ KASSERT(TS_TO_TD(ts)->td_flags & TDF_INMEM, ("runq_remove_idx: thread swapped out")); - pri = ts->ts_rqindex; + pri = TS_TO_TD(ts)->td_rqindex; KASSERT(pri < RQ_NQS, ("runq_remove_idx: Invalid index %d\n", pri)); rqh = &rq->rq_queues[pri]; CTR5(KTR_RUNQ, "runq_remove_idx: td=%p, ts=%p pri=%d %d rqh=%p", ==== //depot/projects/bike_sched/sys/kern/sched_4bsd.c#15 (text+ko) ==== @@ -81,7 +81,6 @@ struct td_sched { TAILQ_ENTRY(td_sched) ts_procq; /* (j/z) Run queue. */ fixpt_t ts_pctcpu; /* (j) %cpu during p_swtime. */ - u_char ts_rqindex; /* (j) Run queue index. */ u_char ts_flags; /* (t) Flags */ int ts_cpticks; /* (j) Ticks of cpu time. */ int ts_slptime; /* (j) Seconds !RUNNING. */ @@ -672,7 +671,7 @@ return; td->td_priority = prio; if (TD_ON_RUNQ(td) && - TD_TO_TS(td)->ts_rqindex != (prio / RQ_PPQ)) { + td->td_rqindex != (prio / RQ_PPQ)) { sched_rem(td); sched_add(td, SRQ_BORING); } ==== //depot/projects/bike_sched/sys/kern/sched_ule.c#15 (text+ko) ==== @@ -85,7 +85,6 @@ TAILQ_ENTRY(td_sched) ts_procq; /* Run queue. */ struct runq *ts_runq; /* Run-queue we're queued on. */ short ts_flags; /* TSF_* flags. */ - u_char ts_rqindex; /* Run queue index. */ u_char ts_cpu; /* CPU that we have affinity for. */ int ts_slice; /* Ticks of slice remaining. */ u_int ts_slptime; /* Number of ticks we vol. slept */ @@ -346,7 +345,7 @@ TAILQ_FOREACH(ts, rqh, ts_procq) { td = TS_TO_TD(ts); printf("\t\t\ttd %p(%s) priority %d rqindex %d pri %d\n", - td, td->td_name, td->td_priority, ts->ts_rqindex, pri); + td, td->td_name, td->td_priority, td->td_rqindex, pri); } } } ==== //depot/projects/bike_sched/sys/sys/proc.h#9 (text+ko) ==== @@ -213,6 +213,7 @@ volatile u_char td_owepreempt; /* (k*) Preempt on last critical_exit */ short td_locks; /* (k) Count of non-spin locks. */ u_char td_tsqueue; /* (t) Turnstile queue blocked on. */ + u_char td_rqindex; struct turnstile *td_blocked; /* (t) Lock thread is blocked on. */ const char *td_lockname; /* (t) Name of lock blocked on. */ LIST_HEAD(, turnstile) td_contested; /* (q) Contested locks. */ From owner-p4-projects@FreeBSD.ORG Wed Mar 12 07:29:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA4E81065677; Wed, 12 Mar 2008 07:29:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86BAE1065671 for ; Wed, 12 Mar 2008 07:29:20 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 67D198FC1E for ; Wed, 12 Mar 2008 07:29:20 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2C7TKJY012357 for ; Wed, 12 Mar 2008 07:29:20 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2C7TK2W012355 for perforce@freebsd.org; Wed, 12 Mar 2008 07:29:20 GMT (envelope-from peter-gmail@wemm.org) Date: Wed, 12 Mar 2008 07:29:20 GMT Message-Id: <200803120729.m2C7TK2W012355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137471 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, 12 Mar 2008 07:29:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=137471 Change 137471 by peter@peter_overcee on 2008/03/12 07:28:21 switch runq back to threads. moves ts_procq back to thread. This likely won't compile anymore. Affected files ... .. //depot/projects/bike_sched/sys/kern/kern_switch.c#10 edit .. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#16 edit .. //depot/projects/bike_sched/sys/kern/sched_ule.c#16 edit .. //depot/projects/bike_sched/sys/sys/proc.h#10 edit .. //depot/projects/bike_sched/sys/sys/runq.h#3 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/kern_switch.c#10 (text+ko) ==== @@ -398,38 +398,38 @@ * corresponding status bit. */ void -runq_add(struct runq *rq, struct td_sched *ts, int flags) +runq_add(struct runq *rq, struct thread *td, int flags) { struct rqhead *rqh; int pri; - pri = TS_TO_TD(ts)->td_priority / RQ_PPQ; - TS_TO_TD(ts)->td_rqindex = pri; + pri = td->td_priority / RQ_PPQ; + td->td_rqindex = pri; runq_setbit(rq, pri); rqh = &rq->rq_queues[pri]; - CTR5(KTR_RUNQ, "runq_add: td=%p ts=%p pri=%d %d rqh=%p", - TS_TO_TD(ts), ts, TS_TO_TD(ts)->td_priority, pri, rqh); + CTR5(KTR_RUNQ, "runq_add: td=%p pri=%d %d rqh=%p", + td, td->td_priority, pri, rqh); if (flags & SRQ_PREEMPTED) - TAILQ_INSERT_HEAD(rqh, ts, ts_procq); + TAILQ_INSERT_HEAD(rqh, td, td_procq); else - TAILQ_INSERT_TAIL(rqh, ts, ts_procq); + TAILQ_INSERT_TAIL(rqh, td, td_procq); } void -runq_add_pri(struct runq *rq, struct td_sched *ts, u_char pri, int flags) +runq_add_pri(struct runq *rq, struct thread *td, u_char pri, int flags) { struct rqhead *rqh; KASSERT(pri < RQ_NQS, ("runq_add_pri: %d out of range", pri)); - TS_TO_TD(ts)->td_rqindex = pri; + td->td_rqindex = pri; runq_setbit(rq, pri); rqh = &rq->rq_queues[pri]; - CTR5(KTR_RUNQ, "runq_add_pri: td=%p ke=%p pri=%d idx=%d rqh=%p", - TS_TO_TD(ts), ts, TS_TO_TD(ts)->td_priority, pri, rqh); + CTR5(KTR_RUNQ, "runq_add_pri: td=%p pri=%d idx=%d rqh=%p", + td, td->td_priority, pri, rqh); if (flags & SRQ_PREEMPTED) { - TAILQ_INSERT_HEAD(rqh, ts, ts_procq); + TAILQ_INSERT_HEAD(rqh, td, td_procq); } else { - TAILQ_INSERT_TAIL(rqh, ts, ts_procq); + TAILQ_INSERT_TAIL(rqh, td, td_procq); } } /* @@ -463,11 +463,11 @@ /* * Find the highest priority process on the run queue. */ -struct td_sched * +struct thread * runq_choose(struct runq *rq) { struct rqhead *rqh; - struct td_sched *ts; + struct thread *td; int pri; while ((pri = runq_findbit(rq)) != -1) { @@ -481,44 +481,44 @@ */ int count = runq_fuzz; int cpu = PCPU_GET(cpuid); - struct td_sched *ts2; - ts2 = ts = TAILQ_FIRST(rqh); + struct thread *td2; + td2 = td = TAILQ_FIRST(rqh); - while (count-- && ts2) { - if (TS_TO_TD(ts)->td_lastcpu == cpu) { - ts = ts2; + while (count-- && td2) { + if (td->td_lastcpu == cpu) { + td = td2; break; } - ts2 = TAILQ_NEXT(ts2, ts_procq); + td2 = TAILQ_NEXT(td2, td_procq); } } else #endif - ts = TAILQ_FIRST(rqh); - KASSERT(ts != NULL, ("runq_choose: no proc on busy queue")); + td = TAILQ_FIRST(rqh); + KASSERT(td != NULL, ("runq_choose: no proc on busy queue")); CTR3(KTR_RUNQ, - "runq_choose: pri=%d td_sched=%p rqh=%p", pri, ts, rqh); - return (ts); + "runq_choose: pri=%d td=%p rqh=%p", pri, td, rqh); + return (td); } CTR1(KTR_RUNQ, "runq_choose: idleproc pri=%d", pri); return (NULL); } -struct td_sched * +struct thread * runq_choose_from(struct runq *rq, u_char idx) { struct rqhead *rqh; - struct td_sched *ts; + struct thread *td; int pri; if ((pri = runq_findbit_from(rq, idx)) != -1) { rqh = &rq->rq_queues[pri]; - ts = TAILQ_FIRST(rqh); - KASSERT(ts != NULL, ("runq_choose: no proc on busy queue")); + td = TAILQ_FIRST(rqh); + KASSERT(td != NULL, ("runq_choose: no proc on busy queue")); CTR4(KTR_RUNQ, - "runq_choose_from: pri=%d ts=%p idx=%d rqh=%p", - pri, ts, TS_TO_TD(ts)->td_rqindex, rqh); - return (ts); + "runq_choose_from: pri=%d td=%p idx=%d rqh=%p", + pri, td, td->td_rqindex, rqh); + return (td); } CTR1(KTR_RUNQ, "runq_choose_from: idleproc pri=%d", pri); @@ -530,36 +530,36 @@ * Caller must set state afterwards. */ void -runq_remove(struct runq *rq, struct td_sched *ts) +runq_remove(struct runq *rq, struct thread *td) { - runq_remove_idx(rq, ts, NULL); + runq_remove_idx(rq, td, NULL); } void -runq_remove_idx(struct runq *rq, struct td_sched *ts, u_char *idx) +runq_remove_idx(struct runq *rq, struct thread *td, u_char *idx) { struct rqhead *rqh; u_char pri; - KASSERT(TS_TO_TD(ts)->td_flags & TDF_INMEM, + KASSERT(td->td_flags & TDF_INMEM, ("runq_remove_idx: thread swapped out")); - pri = TS_TO_TD(ts)->td_rqindex; + pri = td->td_rqindex; KASSERT(pri < RQ_NQS, ("runq_remove_idx: Invalid index %d\n", pri)); rqh = &rq->rq_queues[pri]; - CTR5(KTR_RUNQ, "runq_remove_idx: td=%p, ts=%p pri=%d %d rqh=%p", - TS_TO_TD(ts), ts, TS_TO_TD(ts)->td_priority, pri, rqh); + CTR5(KTR_RUNQ, "runq_remove_idx: td=%p, pri=%d %d rqh=%p", + td, td->td_priority, pri, rqh); { - struct td_sched *nts; + struct thread *ntd; - TAILQ_FOREACH(nts, rqh, ts_procq) - if (nts == ts) + TAILQ_FOREACH(ntd, rqh, td_procq) + if (ntd == td) break; - if (ts != nts) - panic("runq_remove_idx: ts %p not on rqindex %d", - ts, pri); + if (td != ntd) + panic("runq_remove_idx: td %p not on rqindex %d", + td, pri); } - TAILQ_REMOVE(rqh, ts, ts_procq); + TAILQ_REMOVE(rqh, td, td_procq); if (TAILQ_EMPTY(rqh)) { CTR0(KTR_RUNQ, "runq_remove_idx: empty"); runq_clrbit(rq, pri); ==== //depot/projects/bike_sched/sys/kern/sched_4bsd.c#16 (text+ko) ==== @@ -79,7 +79,6 @@ * the requirements of this scheduler */ struct td_sched { - TAILQ_ENTRY(td_sched) ts_procq; /* (j/z) Run queue. */ fixpt_t ts_pctcpu; /* (j) %cpu during p_swtime. */ u_char ts_flags; /* (t) Flags */ int ts_cpticks; /* (j) Ticks of cpu time. */ ==== //depot/projects/bike_sched/sys/kern/sched_ule.c#16 (text+ko) ==== @@ -82,7 +82,6 @@ * by the thread lock. */ struct td_sched { - TAILQ_ENTRY(td_sched) ts_procq; /* Run queue. */ struct runq *ts_runq; /* Run-queue we're queued on. */ short ts_flags; /* TSF_* flags. */ u_char ts_cpu; /* CPU that we have affinity for. */ @@ -301,8 +300,8 @@ static void tdq_move(struct tdq *, struct tdq *); static int tdq_idled(struct tdq *); static void tdq_notify(struct td_sched *); -static struct td_sched *tdq_steal(struct tdq *); -static struct td_sched *runq_steal(struct runq *); +static struct thread *tdq_steal(struct tdq *); +static struct thread *runq_steal(struct runq *); static int sched_pickcpu(struct td_sched *, int); static void sched_balance(void); static void sched_balance_groups(void); @@ -329,7 +328,6 @@ runq_print(struct runq *rq) { struct rqhead *rqh; - struct td_sched *ts; struct thread *td; int pri; int j; @@ -342,8 +340,7 @@ if (rq->rq_status.rqb_bits[i] & (1ul << j)) { pri = j + (i << RQB_L2BPW); rqh = &rq->rq_queues[pri]; - TAILQ_FOREACH(ts, rqh, ts_procq) { - td = TS_TO_TD(ts); + TAILQ_FOREACH(td, rqh, td_procq) { printf("\t\t\ttd %p(%s) priority %d rqindex %d pri %d\n", td, td->td_name, td->td_priority, td->td_rqindex, pri); } @@ -859,10 +856,10 @@ * Steals load from a timeshare queue. Honors the rotating queue head * index. */ -static struct td_sched * +static struct thread * runq_steal_from(struct runq *rq, u_char start) { - struct td_sched *ts; + struct thread *td; struct rqbits *rqb; struct rqhead *rqh; int first; @@ -888,9 +885,9 @@ pri = RQB_FFS(rqb->rqb_bits[i]); pri += (i << RQB_L2BPW); rqh = &rq->rq_queues[pri]; - TAILQ_FOREACH(ts, rqh, ts_procq) { - if (first && THREAD_CAN_MIGRATE(TS_TO_TD(ts))) - return (ts); + TAILQ_FOREACH(td, rqh, td_procq) { + if (first && THREAD_CAN_MIGRATE(td)) + return (td); first = 1; } } @@ -905,12 +902,12 @@ /* * Steals load from a standard linear queue. */ -static struct td_sched * +static struct thread * runq_steal(struct runq *rq) { struct rqhead *rqh; struct rqbits *rqb; - struct td_sched *ts; + struct thread *td; int word; int bit; @@ -922,9 +919,9 @@ if ((rqb->rqb_bits[word] & (1ul << bit)) == 0) continue; rqh = &rq->rq_queues[bit + (word << RQB_L2BPW)]; - TAILQ_FOREACH(ts, rqh, ts_procq) - if (THREAD_CAN_MIGRATE(TS_TO_TD(ts))) - return (ts); + TAILQ_FOREACH(td, rqh, td_procq) + if (THREAD_CAN_MIGRATE(td)) + return (td); } } return (NULL); @@ -933,16 +930,16 @@ /* * Attempt to steal a thread in priority order from a thread queue. */ -static struct td_sched * +static struct thread * tdq_steal(struct tdq *tdq) { - struct td_sched *ts; + struct td_sched *td; TDQ_LOCK_ASSERT(tdq, MA_OWNED); - if ((ts = runq_steal(&tdq->tdq_realtime)) != NULL) - return (ts); - if ((ts = runq_steal_from(&tdq->tdq_timeshare, tdq->tdq_ridx)) != NULL) - return (ts); + if ((td = runq_steal(&tdq->tdq_realtime)) != NULL) + return (td); + if ((td = runq_steal_from(&tdq->tdq_timeshare, tdq->tdq_ridx)) != NULL) + return (td); return (runq_steal(&tdq->tdq_idle)); } @@ -951,15 +948,15 @@ * current lock and returns with the assigned queue locked. */ static inline struct tdq * -sched_setcpu(struct td_sched *ts, int cpu, int flags) +sched_setcpu(struct td_sched *td, int cpu, int flags) { struct thread *td; struct tdq *tdq; - THREAD_LOCK_ASSERT(TS_TO_TD(ts), MA_OWNED); + THREAD_LOCK_ASSERT(td, MA_OWNED); tdq = TDQ_CPU(cpu); - td = TS_TO_TD(ts); + ts = TD_TO_TS(td); ts->ts_cpu = cpu; /* If the lock matches just return the queue. */ ==== //depot/projects/bike_sched/sys/sys/proc.h#10 (text+ko) ==== @@ -190,6 +190,7 @@ /* The two queues below should someday be merged. */ TAILQ_ENTRY(thread) td_slpq; /* (t) Sleep queue. */ TAILQ_ENTRY(thread) td_lockq; /* (t) Lock queue. */ + TAILQ_ENTRY(thread) td_procq; /* (j/z) Run queue. */ TAILQ_HEAD(, selinfo) td_selq; /* (p) List of selinfos. */ struct sleepqueue *td_sleepqueue; /* (k) Associated sleep queue. */ ==== //depot/projects/bike_sched/sys/sys/runq.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ #include -struct td_sched; +struct thread; /* * Run queue parameters. @@ -43,7 +43,7 @@ /* * Head of run queues. */ -TAILQ_HEAD(rqhead, td_sched); +TAILQ_HEAD(rqhead, thread); /* * Bit array which maintains the status of a run queue. When a queue is @@ -62,13 +62,13 @@ struct rqhead rq_queues[RQ_NQS]; }; -void runq_add(struct runq *, struct td_sched *, int); -void runq_add_pri(struct runq *, struct td_sched *, u_char, int); +void runq_add(struct runq *, struct thread *, int); +void runq_add_pri(struct runq *, struct thread *, u_char, int); int runq_check(struct runq *); -struct td_sched *runq_choose(struct runq *); -struct td_sched *runq_choose_from(struct runq *, u_char); +struct thread *runq_choose(struct runq *); +struct thread *runq_choose_from(struct runq *, u_char); void runq_init(struct runq *); -void runq_remove(struct runq *, struct td_sched *); -void runq_remove_idx(struct runq *, struct td_sched *, u_char *); +void runq_remove(struct runq *, struct thread *); +void runq_remove_idx(struct runq *, struct thread *, u_char *); #endif From owner-p4-projects@FreeBSD.ORG Wed Mar 12 07:30:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BE9C1065677; Wed, 12 Mar 2008 07:30:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF27E1065670 for ; Wed, 12 Mar 2008 07:30:21 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A1B738FC12 for ; Wed, 12 Mar 2008 07:30:21 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2C7ULsF012422 for ; Wed, 12 Mar 2008 07:30:21 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2C7ULkH012420 for perforce@freebsd.org; Wed, 12 Mar 2008 07:30:21 GMT (envelope-from peter-gmail@wemm.org) Date: Wed, 12 Mar 2008 07:30:21 GMT Message-Id: <200803120730.m2C7ULkH012420@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137472 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, 12 Mar 2008 07:30:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=137472 Change 137472 by peter@peter_overcee on 2008/03/12 07:29:22 hide td_sched from public view. Affected files ... .. //depot/projects/bike_sched/sys/sys/proc.h#11 edit Differences ... ==== //depot/projects/bike_sched/sys/sys/proc.h#11 (text+ko) ==== @@ -153,7 +153,6 @@ * for write access. */ struct kaudit_record; -struct td_sched; struct nlminfo; struct kaioinfo; struct p_sched; @@ -275,7 +274,6 @@ int td_altkstack_pages; /* (a) Size of alternate kstack. */ volatile u_int td_critnest; /* (k*) Critical section nest level. */ struct mdthread td_md; /* (k) Any machine-dependent fields. */ - struct td_sched *td_sched; /* (*) Scheduler-specific data. */ struct kaudit_record *td_ar; /* (k) Active audit record, if any. */ int td_syscalls; /* per-thread syscall count (used by NFS :)) */ }; From owner-p4-projects@FreeBSD.ORG Wed Mar 12 07:31:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 368261065679; Wed, 12 Mar 2008 07:31:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E986C1065676 for ; Wed, 12 Mar 2008 07:31:22 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CBA2F8FC18 for ; Wed, 12 Mar 2008 07:31:22 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2C7VMGw012444 for ; Wed, 12 Mar 2008 07:31:22 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2C7VMAD012442 for perforce@freebsd.org; Wed, 12 Mar 2008 07:31:22 GMT (envelope-from peter-gmail@wemm.org) Date: Wed, 12 Mar 2008 07:31:22 GMT Message-Id: <200803120731.m2C7VMAD012442@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137473 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, 12 Mar 2008 07:31:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=137473 Change 137473 by peter@peter_overcee on 2008/03/12 07:31:01 remove td_sched pointer entirely. Its now private to schedulers. Affected files ... .. //depot/projects/bike_sched/sys/kern/kern_fork.c#7 edit .. //depot/projects/bike_sched/sys/kern/kern_synch.c#7 edit .. //depot/projects/bike_sched/sys/kern/kern_thread.c#11 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/kern_fork.c#7 (text+ko) ==== @@ -763,8 +763,8 @@ p = td->td_proc; KASSERT(p->p_state == PRS_NORMAL, ("executing process is still new")); - CTR4(KTR_PROC, "fork_exit: new thread %p (td %p, pid %d, %s)", - td, td->td_sched, p->p_pid, td->td_name); + CTR4(KTR_PROC, "fork_exit: new thread %p (pid %d, %s)", + td, p->p_pid, td->td_name); sched_fork_exit(td); /* ==== //depot/projects/bike_sched/sys/kern/kern_synch.c#7 (text+ko) ==== @@ -414,8 +414,8 @@ td->td_generation++; /* bump preempt-detect counter */ PCPU_INC(cnt.v_swtch); PCPU_SET(switchticks, ticks); - CTR4(KTR_PROC, "mi_switch: old thread %ld (ts %p, pid %ld, %s)", - td->td_tid, td->td_sched, p->p_pid, td->td_name); + CTR4(KTR_PROC, "mi_switch: old thread %ld (pid %ld, %s)", + td->td_tid, p->p_pid, td->td_name); #if (KTR_COMPILE & KTR_SCHED) != 0 if (TD_IS_IDLETHREAD(td)) CTR3(KTR_SCHED, "mi_switch: %p(%s) prio %d idle", @@ -435,8 +435,8 @@ CTR3(KTR_SCHED, "mi_switch: running %p(%s) prio %d", td, td->td_name, td->td_priority); - CTR4(KTR_PROC, "mi_switch: new thread %ld (ts %p, pid %ld, %s)", - td->td_tid, td->td_sched, p->p_pid, td->td_name); + CTR4(KTR_PROC, "mi_switch: new thread %ld (pid %ld, %s)", + td->td_tid, p->p_pid, td->td_name); /* * If the last thread was exiting, finish cleaning it up. ==== //depot/projects/bike_sched/sys/kern/kern_thread.c#11 (text+ko) ==== @@ -163,7 +163,6 @@ td->td_sleepqueue = sleepq_alloc(); td->td_turnstile = turnstile_alloc(); EVENTHANDLER_INVOKE(thread_init, td); - td->td_sched = (struct td_sched *)&td[1]; sched_newthread(td); umtx_thread_init(td); td->td_kstack = 0; From owner-p4-projects@FreeBSD.ORG Wed Mar 12 07:34:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75A811065675; Wed, 12 Mar 2008 07:34:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35E261065673 for ; Wed, 12 Mar 2008 07:34:26 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1757E8FC1B for ; Wed, 12 Mar 2008 07:34:26 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2C7YPv8012553 for ; Wed, 12 Mar 2008 07:34:25 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2C7YPch012551 for perforce@freebsd.org; Wed, 12 Mar 2008 07:34:25 GMT (envelope-from peter-gmail@wemm.org) Date: Wed, 12 Mar 2008 07:34:25 GMT Message-Id: <200803120734.m2C7YPch012551@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137474 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, 12 Mar 2008 07:34:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=137474 Change 137474 by peter@peter_overcee on 2008/03/12 07:33:43 Carry out 'temporary' threat and move sched_newthread as promised. 'struct td_sched' is now totally private to sched_*. Affected files ... .. //depot/projects/bike_sched/sys/kern/kern_switch.c#11 edit .. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#17 edit .. //depot/projects/bike_sched/sys/kern/sched_ule.c#17 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/kern_switch.c#11 (text+ko) ==== @@ -567,25 +567,4 @@ *idx = (pri + 1) % RQ_NQS; } } - -/****** functions that are temporarily here ***********/ -#include - -/* - * thread is being either created or recycled. - * Fix up the per-scheduler resources associated with it. - * Called from: - * sched_fork() - * thread_dtor() (*may go away) - * thread_init() (*may go away) - */ -void -sched_newthread(struct thread *td) -{ - struct td_sched *ts; - - ts = TD_TO_TS(td); - bzero(ts, sizeof(*ts)); -} - #endif /* KERN_SWITCH_INCLUDE */ ==== //depot/projects/bike_sched/sys/kern/sched_4bsd.c#17 (text+ko) ==== @@ -1374,5 +1374,24 @@ THREAD_LOCK_ASSERT(td, MA_OWNED | MA_NOTRECURSED); } +#include + +/* + * thread is being either created or recycled. + * Fix up the per-scheduler resources associated with it. + * Called from: + * sched_fork() + * thread_dtor() (*may go away) + * thread_init() (*may go away) + */ +void +sched_newthread(struct thread *td) +{ + struct td_sched *ts; + + ts = TD_TO_TS(td); + bzero(ts, sizeof(*ts)); +} + #define KERN_SWITCH_INCLUDE 1 #include "kern/kern_switch.c" ==== //depot/projects/bike_sched/sys/kern/sched_ule.c#17 (text+ko) ==== @@ -2655,5 +2655,25 @@ static int ccpu = 0; SYSCTL_INT(_kern, OID_AUTO, ccpu, CTLFLAG_RD, &ccpu, 0, ""); +#include + +/* + * thread is being either created or recycled. + * Fix up the per-scheduler resources associated with it. + * Called from: + * sched_fork() + * thread_dtor() (*may go away) + * thread_init() (*may go away) + */ +void +sched_newthread(struct thread *td) +{ + struct td_sched *ts; + + ts = TD_TO_TS(td); + bzero(ts, sizeof(*ts)); +} + #define KERN_SWITCH_INCLUDE 1 #include "kern/kern_switch.c" + From owner-p4-projects@FreeBSD.ORG Wed Mar 12 07:50:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4516D1065670; Wed, 12 Mar 2008 07:50:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD464106566C for ; Wed, 12 Mar 2008 07:50:43 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BE1CE8FC1C for ; Wed, 12 Mar 2008 07:50:43 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2C7ohd9013067 for ; Wed, 12 Mar 2008 07:50:43 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2C7ohu0013065 for perforce@freebsd.org; Wed, 12 Mar 2008 07:50:43 GMT (envelope-from peter-gmail@wemm.org) Date: Wed, 12 Mar 2008 07:50:43 GMT Message-Id: <200803120750.m2C7ohu0013065@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137475 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, 12 Mar 2008 07:50:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=137475 Change 137475 by peter@peter_overcee on 2008/03/12 07:50:27 Use struct thread for all internal APIs. struct td_sched becomes a an adjunct storage item, not something that is passed around. TS_TO_TD() goes away as 'td' is always available. Affected files ... .. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#18 edit .. //depot/projects/bike_sched/sys/kern/sched_ule.c#18 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/sched_4bsd.c#18 (text+ko) ==== @@ -94,7 +94,6 @@ ((ts)->ts_runq != 0 && (ts)->ts_runq != &runq) #define TD_TO_TS(td) ((struct td_sched *)(&(td)[1])) -#define TS_TO_TD(ts) (&((struct thread *)(ts))[-1]) /* Packed structure to match the layout of the uma thread zone */ static struct { @@ -1193,40 +1192,40 @@ struct thread * sched_choose(void) { - struct td_sched *ts; + struct td_sched *td; struct runq *rq; mtx_assert(&sched_lock, MA_OWNED); #ifdef SMP - struct td_sched *kecpu; + struct thread *kecpu; rq = &runq; - ts = runq_choose(&runq); + td = runq_choose(&runq); kecpu = runq_choose(&runq_pcpu[PCPU_GET(cpuid)]); - if (ts == NULL || + if (td == NULL || (kecpu != NULL && - TS_TO_TD(kecpu)->td_priority < TS_TO_TD(ts)->td_priority)) { - CTR2(KTR_RUNQ, "choosing td_sched %p from pcpu runq %d", kecpu, + kecpu->td_priority < td->td_priority)) { + CTR2(KTR_RUNQ, "choosing thread %p from pcpu runq %d", kecpu, PCPU_GET(cpuid)); - ts = kecpu; + td = kecpu; rq = &runq_pcpu[PCPU_GET(cpuid)]; } else { - CTR1(KTR_RUNQ, "choosing td_sched %p from main runq", ts); + CTR1(KTR_RUNQ, "choosing thread %p from main runq", td); } #else rq = &runq; - ts = runq_choose(&runq); + td = runq_choose(&runq); #endif - if (ts) { - runq_remove(rq, ts); - ts->ts_flags |= TSF_DIDRUN; + if (td) { + runq_remove(rq, td); + TD_TO_TS(ts)->ts_flags |= TSF_DIDRUN; - KASSERT(TS_TO_TD(ts)->td_flags & TDF_INMEM, + KASSERT(td->td_flags & TDF_INMEM, ("sched_choose: thread swapped out")); - return (TS_TO_TD(ts)); + return (td); } return (PCPU_GET(idlethread)); } ==== //depot/projects/bike_sched/sys/kern/sched_ule.c#18 (text+ko) ==== @@ -101,7 +101,6 @@ #define TSF_XFERABLE 0x0002 /* Thread was added as transferable. */ #define TD_TO_TS(td) ((struct td_sched *)(&(td)[1])) -#define TS_TO_TD(ts) (&((struct thread *)(ts))[-1]) static struct { struct thread initial_thread; @@ -284,30 +283,30 @@ static int sched_interact_score(struct thread *); static void sched_interact_update(struct thread *); static void sched_interact_fork(struct thread *); -static void sched_pctcpu_update(struct td_sched *); +static void sched_pctcpu_update(struct thread *); /* Operations on per processor queues */ -static struct td_sched * tdq_choose(struct tdq *); +static struct thread * tdq_choose(struct tdq *); static void tdq_setup(struct tdq *); -static void tdq_load_add(struct tdq *, struct td_sched *); -static void tdq_load_rem(struct tdq *, struct td_sched *); -static __inline void tdq_runq_add(struct tdq *, struct td_sched *, int); -static __inline void tdq_runq_rem(struct tdq *, struct td_sched *); +static void tdq_load_add(struct tdq *, struct thread *); +static void tdq_load_rem(struct tdq *, struct thread *); +static __inline void tdq_runq_add(struct tdq *, struct thread *, int); +static __inline void tdq_runq_rem(struct tdq *, struct thread *); void tdq_print(int cpu); static void runq_print(struct runq *rq); static void tdq_add(struct tdq *, struct thread *, int); #ifdef SMP static void tdq_move(struct tdq *, struct tdq *); static int tdq_idled(struct tdq *); -static void tdq_notify(struct td_sched *); +static void tdq_notify(struct thread *); static struct thread *tdq_steal(struct tdq *); static struct thread *runq_steal(struct runq *); -static int sched_pickcpu(struct td_sched *, int); +static int sched_pickcpu(struct thread *, int); static void sched_balance(void); static void sched_balance_groups(void); static void sched_balance_group(struct tdq_group *); static void sched_balance_pair(struct tdq *, struct tdq *); -static inline struct tdq *sched_setcpu(struct td_sched *, int, int); +static inline struct tdq *sched_setcpu(struct thread *, int, int); static inline struct mtx *thread_block_switch(struct thread *); static inline void thread_unblock_switch(struct thread *, struct mtx *); static struct mtx *sched_switch_migrate(struct tdq *, struct thread *, int); @@ -384,12 +383,13 @@ * queue position for timeshare threads. */ static __inline void -tdq_runq_add(struct tdq *tdq, struct td_sched *ts, int flags) +tdq_runq_add(struct tdq *tdq, struct thread *td, int flags) { + struct td_sched *ts = TD_TO_TS(td); TDQ_LOCK_ASSERT(tdq, MA_OWNED); - THREAD_LOCK_ASSERT(TS_TO_TD(ts), MA_OWNED); + THREAD_LOCK_ASSERT(td, MA_OWNED); #ifdef SMP - if (THREAD_CAN_MIGRATE(TS_TO_TD(ts))) { + if (THREAD_CAN_MIGRATE(td)) { tdq->tdq_transferable++; tdq->tdq_group->tdg_transferable++; ts->ts_flags |= TSF_XFERABLE; @@ -398,7 +398,7 @@ if (ts->ts_runq == &tdq->tdq_timeshare) { u_char pri; - pri = TS_TO_TD(ts)->td_priority; + pri = td->td_priority; KASSERT(pri <= PRI_MAX_TIMESHARE && pri >= PRI_MIN_TIMESHARE, ("Invalid priority %d on timeshare runq", pri)); /* @@ -429,11 +429,12 @@ * transferable count does not reflect them. */ static __inline void -tdq_runq_rem(struct tdq *tdq, struct td_sched *ts) +tdq_runq_rem(struct tdq *tdq, struct thread *td) { + struct td_sched *ts = TD_TO_TS(td); TDQ_LOCK_ASSERT(tdq, MA_OWNED); KASSERT(ts->ts_runq != NULL, - ("tdq_runq_remove: thread %p null ts_runq", TS_TO_TD(ts))); + ("tdq_runq_remove: thread %p null ts_runq", td)); #ifdef SMP if (ts->ts_flags & TSF_XFERABLE) { tdq->tdq_transferable--; @@ -443,16 +444,16 @@ #endif if (ts->ts_runq == &tdq->tdq_timeshare) { if (tdq->tdq_idx != tdq->tdq_ridx) - runq_remove_idx(ts->ts_runq, ts, &tdq->tdq_ridx); + runq_remove_idx(ts->ts_runq, td, &tdq->tdq_ridx); else - runq_remove_idx(ts->ts_runq, ts, NULL); + runq_remove_idx(ts->ts_runq, td, NULL); /* * For timeshare threads we update the priority here so * the priority reflects the time we've been sleeping. */ ts->ts_ltick = ticks; - sched_pctcpu_update(ts); - sched_priority(TS_TO_TD(ts)); + sched_pctcpu_update(td); + sched_priority(td); } else runq_remove(ts->ts_runq, ts); } @@ -462,17 +463,17 @@ * for this thread to the referenced thread queue. */ static void -tdq_load_add(struct tdq *tdq, struct td_sched *ts) +tdq_load_add(struct tdq *tdq, struct thread *td) { int class; TDQ_LOCK_ASSERT(tdq, MA_OWNED); - THREAD_LOCK_ASSERT(TS_TO_TD(ts), MA_OWNED); - class = PRI_BASE(TS_TO_TD(ts)->td_pri_class); + THREAD_LOCK_ASSERT(td, MA_OWNED); + class = PRI_BASE(td->td_pri_class); tdq->tdq_load++; CTR2(KTR_SCHED, "cpu %d load: %d", TDQ_ID(tdq), tdq->tdq_load); if (class != PRI_ITHD && - (TS_TO_TD(ts)->td_proc->p_flag & P_NOLOAD) == 0) + (td->td_proc->p_flag & P_NOLOAD) == 0) #ifdef SMP tdq->tdq_group->tdg_load++; #else @@ -485,15 +486,15 @@ * exiting. */ static void -tdq_load_rem(struct tdq *tdq, struct td_sched *ts) +tdq_load_rem(struct tdq *tdq, struct thread *td) { int class; - THREAD_LOCK_ASSERT(TS_TO_TD(ts), MA_OWNED); + THREAD_LOCK_ASSERT(td, MA_OWNED); TDQ_LOCK_ASSERT(tdq, MA_OWNED); - class = PRI_BASE(TS_TO_TD(ts)->td_pri_class); + class = PRI_BASE(td->td_pri_class); if (class != PRI_ITHD && - (TS_TO_TD(ts)->td_proc->p_flag & P_NOLOAD) == 0) + (td->td_proc->p_flag & P_NOLOAD) == 0) #ifdef SMP tdq->tdq_group->tdg_load--; #else @@ -503,7 +504,7 @@ ("tdq_load_rem: Removing with 0 load on queue %d", TDQ_ID(tdq))); tdq->tdq_load--; CTR1(KTR_SCHED, "load: %d", tdq->tdq_load); - ts->ts_runq = NULL; + TD_TO_TS(td)->ts_runq = NULL; } #ifdef SMP @@ -692,7 +693,7 @@ static void tdq_move(struct tdq *from, struct tdq *to) { - struct td_sched *ts; + struct thread *td; struct thread *td; struct tdq *tdq; int cpu; @@ -702,23 +703,22 @@ tdq = from; cpu = TDQ_ID(to); - ts = tdq_steal(tdq); - if (ts == NULL) { + td = tdq_steal(tdq); + if (td == NULL) { struct tdq_group *tdg; tdg = tdq->tdq_group; LIST_FOREACH(tdq, &tdg->tdg_members, tdq_siblings) { if (tdq == from || tdq->tdq_transferable == 0) continue; - ts = tdq_steal(tdq); + td = tdq_steal(tdq); break; } - if (ts == NULL) + if (td == NULL) return; } if (tdq == to) return; - td = TS_TO_TD(ts); /* * Although the run queue is locked the thread may be blocked. Lock * it to clear this and acquire the run-queue lock. @@ -727,7 +727,7 @@ /* Drop recursive lock on from acquired via thread_lock(). */ TDQ_UNLOCK(from); sched_rem(td); - ts->ts_cpu = cpu; + TD_TO_TS(ts)->ts_cpu = cpu; td->td_lock = TDQ_LOCKPTR(to); tdq_add(to, td, SRQ_YIELDING); } @@ -811,7 +811,7 @@ * Notify a remote cpu of new work. Sends an IPI if criteria are met. */ static void -tdq_notify(struct td_sched *ts) +tdq_notify(struct thread *td) { struct thread *ctd; struct pcpu *pcpu; @@ -819,8 +819,8 @@ int pri; int cpu; - cpu = ts->ts_cpu; - pri = TS_TO_TD(ts)->td_priority; + cpu = TD_TO_TS(ts)->ts_cpu; + pri = td->td_priority; pcpu = pcpu_find(cpu); ctd = pcpu->pc_curthread; cpri = ctd->td_priority; @@ -948,7 +948,7 @@ * current lock and returns with the assigned queue locked. */ static inline struct tdq * -sched_setcpu(struct td_sched *td, int cpu, int flags) +sched_setcpu(struct thread *td, int cpu, int flags) { struct thread *td; struct tdq *tdq; @@ -1063,8 +1063,9 @@ * a determination based on load or priority of available processors. */ static int -sched_pickcpu(struct td_sched *ts, int flags) +sched_pickcpu(struct thread *td, int flags) { + struct td_sched *ts; struct tdq *tdq; int self; int pri; @@ -1081,7 +1082,8 @@ curthread->td_priority); return (self); } - pri = TS_TO_TD(ts)->td_priority; + pri = td->td_priority; + ts = TD_TO_TS(td); cpu = ts->ts_cpu; /* * Regardless of affinity, if the last cpu is idle send it there. @@ -1137,29 +1139,28 @@ /* * Pick the highest priority task we have and return it. */ -static struct td_sched * +static struct thread * tdq_choose(struct tdq *tdq) { - struct td_sched *ts; TDQ_LOCK_ASSERT(tdq, MA_OWNED); - ts = runq_choose(&tdq->tdq_realtime); - if (ts != NULL) - return (ts); - ts = runq_choose_from(&tdq->tdq_timeshare, tdq->tdq_ridx); - if (ts != NULL) { - KASSERT(TS_TO_TD(ts)->td_priority >= PRI_MIN_TIMESHARE, + td = runq_choose(&tdq->tdq_realtime); + if (td != NULL) + return (td); + td = runq_choose_from(&tdq->tdq_timeshare, tdq->tdq_ridx); + if (td != NULL) { + KASSERT(td->td_priority >= PRI_MIN_TIMESHARE, ("tdq_choose: Invalid priority on timeshare queue %d", - TS_TO_TD(ts)->td_priority)); - return (ts); + td->td_priority)); + return (td); } - ts = runq_choose(&tdq->tdq_idle); - if (ts != NULL) { - KASSERT(TS_TO_TD(ts)->td_priority >= PRI_MIN_IDLE, + td = runq_choose(&tdq->tdq_idle); + if (td != NULL) { + KASSERT(td->td_priority >= PRI_MIN_IDLE, ("tdq_choose: Invalid priority on idle queue %d", - TS_TO_TD(ts)->td_priority)); - return (ts); + td->td_priority)); + return (td); } return (NULL); @@ -1573,8 +1574,9 @@ * mechanism since it happens with less regular and frequent events. */ static void -sched_pctcpu_update(struct td_sched *ts) +sched_pctcpu_update(struct thread *td) { + struct td_sched *ts = TD_TO_TS(td); if (ts->ts_ticks == 0) return; @@ -1757,7 +1759,7 @@ TDQ_UNLOCK(tdq); thread_lock(td); spinlock_exit(); - sched_setcpu(TD_TO_TS(td), TDQ_ID(tdq), SRQ_YIELDING); + sched_setcpu(td, TDQ_ID(tdq), SRQ_YIELDING); #else td->td_lock = TDQ_LOCKPTR(tdq); #endif @@ -1985,7 +1987,7 @@ hzticks = (ticks - slptick) << SCHED_TICK_SHIFT; ts->ts_slptime += hzticks; sched_interact_update(td); - sched_pctcpu_update(ts); + sched_pctcpu_update(td); sched_priority(td); } /* Reset the slice value after we sleep. */ @@ -2175,7 +2177,7 @@ * second. */ if (ts->ts_ftick + SCHED_TICK_MAX < ts->ts_ltick) - sched_pctcpu_update(ts); + sched_pctcpu_update(curthread); } /* @@ -2221,7 +2223,7 @@ ts = tdq_choose(tdq); if (ts) { tdq_runq_rem(tdq, ts); - return (TS_TO_TD(ts)); + return (td); } #ifdef SMP /* @@ -2365,7 +2367,7 @@ cpu = ts->ts_cpu; else cpu = sched_pickcpu(ts, flags); - tdq = sched_setcpu(ts, cpu, flags); + tdq = sched_setcpu(td, cpu, flags); tdq_add(tdq, td, flags); if (cpu != cpuid) { tdq_notify(ts); @@ -2434,7 +2436,7 @@ if (ts->ts_ticks) { int rtick; - sched_pctcpu_update(ts); + sched_pctcpu_update(td); /* How many rtick per second ? */ rtick = min(SCHED_TICK_HZ(ts) / SCHED_TICK_SECS, hz); pctcpu = (FSCALE * ((FSCALE * rtick)/hz)) >> FSHIFT; From owner-p4-projects@FreeBSD.ORG Wed Mar 12 07:53:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CBD41065671; Wed, 12 Mar 2008 07:53:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C576106566B for ; Wed, 12 Mar 2008 07:53:47 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 245C98FC16 for ; Wed, 12 Mar 2008 07:53:47 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2C7rlJO013123 for ; Wed, 12 Mar 2008 07:53:47 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2C7rkiL013121 for perforce@freebsd.org; Wed, 12 Mar 2008 07:53:47 GMT (envelope-from peter-gmail@wemm.org) Date: Wed, 12 Mar 2008 07:53:47 GMT Message-Id: <200803120753.m2C7rkiL013121@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137476 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, 12 Mar 2008 07:53:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=137476 Change 137476 by peter@peter_overcee on 2008/03/12 07:53:13 build kern_switch standalone Affected files ... .. //depot/projects/bike_sched/sys/conf/files#6 edit Differences ... ==== //depot/projects/bike_sched/sys/conf/files#6 (text+ko) ==== @@ -1452,6 +1452,7 @@ kern/kern_shutdown.c standard kern/kern_sig.c standard kern/kern_subr.c standard +kern/kern_switch.c standard kern/kern_sx.c standard kern/kern_synch.c standard kern/kern_syscalls.c standard From owner-p4-projects@FreeBSD.ORG Wed Mar 12 07:54:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD31C1065674; Wed, 12 Mar 2008 07:54:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C8631065672 for ; Wed, 12 Mar 2008 07:54:48 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F02C8FC19 for ; Wed, 12 Mar 2008 07:54:48 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2C7smQL013141 for ; Wed, 12 Mar 2008 07:54:48 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2C7smsM013139 for perforce@freebsd.org; Wed, 12 Mar 2008 07:54:48 GMT (envelope-from peter-gmail@wemm.org) Date: Wed, 12 Mar 2008 07:54:48 GMT Message-Id: <200803120754.m2C7smsM013139@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137477 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, 12 Mar 2008 07:54:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=137477 Change 137477 by peter@peter_overcee on 2008/03/12 07:53:58 goodbye! Affected files ... .. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#19 edit .. //depot/projects/bike_sched/sys/kern/sched_ule.c#19 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/sched_4bsd.c#19 (text+ko) ==== @@ -1391,6 +1391,3 @@ ts = TD_TO_TS(td); bzero(ts, sizeof(*ts)); } - -#define KERN_SWITCH_INCLUDE 1 -#include "kern/kern_switch.c" ==== //depot/projects/bike_sched/sys/kern/sched_ule.c#19 (text+ko) ==== @@ -2675,7 +2675,3 @@ ts = TD_TO_TS(td); bzero(ts, sizeof(*ts)); } - -#define KERN_SWITCH_INCLUDE 1 -#include "kern/kern_switch.c" - From owner-p4-projects@FreeBSD.ORG Wed Mar 12 09:16:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6696D1065674; Wed, 12 Mar 2008 09:16:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 262AC1065671 for ; Wed, 12 Mar 2008 09:16:13 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0D1A28FC37 for ; Wed, 12 Mar 2008 09:16:13 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2C9GCAk029461 for ; Wed, 12 Mar 2008 09:16:12 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2C9GCZK029459 for perforce@freebsd.org; Wed, 12 Mar 2008 09:16:12 GMT (envelope-from peter-gmail@wemm.org) Date: Wed, 12 Mar 2008 09:16:12 GMT Message-Id: <200803120916.m2C9GCZK029459@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137480 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, 12 Mar 2008 09:16:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=137480 Change 137480 by peter@peter_melody on 2008/03/12 09:15:42 More speedups. (was 10%, now 23% elapsed time reduction from baseline) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#45 edit .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#50 edit .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#165 edit .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#27 edit .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#91 edit .. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#22 edit .. //depot/projects/hammer/sys/amd64/include/pcpu.h#28 edit .. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#21 edit .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#19 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#45 (text+ko) ==== @@ -80,7 +80,6 @@ movq TD_PCB(%rsi),%rdx /* newtd->td_proc */ movq PCB_CR3(%rdx),%rdx movq %rdx,%cr3 /* new address space */ - xorl %r9d,%r9d /* Old pcb pointer */ movq TD_PCB(%rsi),%r8 jmp swact END(cpu_throw) @@ -108,9 +107,6 @@ movq %rbx,PCB_RBX(%r8) movq %rax,PCB_RIP(%r8) - /* Save copy of pcb pointer */ - movq %r8,%r9 - testl $PCB_32BIT,PCB_FLAGS(%r8) jnz store_gs /* static predict not taken */ done_store_gs: @@ -175,32 +171,29 @@ testl $TDP_KTHREAD,TD_PFLAGS(%rsi) jnz do_tss - testq %r9,%r9 - jz no_pcb - cmpq PCB_FSBASE(%r9),%r10 - cmpq PCB_GSBASE(%r9),%r11 - jmp check_bases -no_pcb: - movq $-1,%r10 /* Illegal value - force reload on cpu_throw */ - movq %r10,%r11 + movq PCPU(FSBASE),%r10 + movq PCPU(GSBASE),%r11 -check_bases: - movq PCB_FSBASE(%r8),%r10 + cmpq PCB_FSBASE(%r8),%r10 jz 1f /* Restore userland %fs */ movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx wrmsr + movq PCB_FSBASE(%r8),%rax + movq %rax,PCPU(FSBASE) 1: - movq PCB_GSBASE(%r8),%r11 + cmpq PCB_GSBASE(%r8),%r11 jz 2f /* Restore userland %gs */ movl $MSR_KGSBASE,%ecx movl PCB_GSBASE(%r8),%eax movl PCB_GSBASE+4(%r8),%edx wrmsr + movq PCB_GSBASE(%r8),%rax + movq %rax,PCPU(GSBASE) 2: do_tss: @@ -262,38 +255,38 @@ store_dr: movq %dr7,%rax /* yes, do the save */ + movq %dr0,%r15 + movq %dr1,%r14 + movq %dr2,%r13 + movq %dr3,%r12 + movq %dr6,%r11 + andq $0x0000fc00, %rax /* disable all watchpoints */ + movq %r15,PCB_DR0(%r8) + movq %r14,PCB_DR1(%r8) + movq %r13,PCB_DR2(%r8) + movq %r12,PCB_DR3(%r8) + movq %r11,PCB_DR6(%r8) movq %rax,PCB_DR7(%r8) - andq $0x0000fc00, %rax /* disable all watchpoints */ movq %rax,%dr7 - movq %dr6,%r11 - movq %dr3,%r12 - movq %dr2,%r13 - movq %dr1,%r14 - movq %dr0,%r15 - movq %r11,PCB_DR6(%r8) - movq %r12,PCB_DR3(%r8) - movq %r13,PCB_DR2(%r8) - movq %r14,PCB_DR1(%r8) - movq %r15,PCB_DR0(%r8) jmp done_store_dr load_dr: + movq %dr7,%rax + movq PCB_DR0(%r8),%r15 + movq PCB_DR1(%r8),%r14 + movq PCB_DR2(%r8),%r13 + movq PCB_DR3(%r8),%r12 movq PCB_DR6(%r8),%r11 - movq PCB_DR3(%r8),%r12 - movq PCB_DR2(%r8),%r13 - movq PCB_DR1(%r8),%r14 - movq PCB_DR0(%r8),%r15 - movq %r11,%dr6 - movq %r12,%dr3 - movq %r13,%dr2 + movq PCB_DR7(%r8),%rcx + movq %r15,%dr0 movq %r14,%dr1 - movq %r15,%dr0 - /* But preserve reserved bits in %dr7 */ - movq %dr7,%rax - movq PCB_DR7(%r8),%rcx + /* Preserve reserved bits in %dr7 */ andq $0x0000fc00,%rax andq $~0x0000fc00,%rcx + movq %r13,%dr2 + movq %r12,%dr3 orq %rcx,%rax + movq %r11,%dr6 movq %rax,%dr7 jmp done_load_dr ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#50 (text+ko) ==== @@ -198,6 +198,8 @@ 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_FSBASE, offsetof(struct pcpu, pc_fsbase)); +ASSYM(PC_GSBASE, offsetof(struct pcpu, pc_gsbase)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#165 (text+ko) ==== @@ -601,6 +601,8 @@ critical_enter(); wrmsr(MSR_FSBASE, 0); wrmsr(MSR_KGSBASE, 0); /* User value while we're in the kernel */ + PCPU_SET(fsbase, 0); + PCPU_SET(gsbase, 0); pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; critical_exit(); ==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#27 (text+ko) ==== @@ -73,6 +73,7 @@ if (!error) { critical_enter(); wrmsr(MSR_FSBASE, i386base); + PCPU_SET(fsbase, i386base); pcb->pcb_fsbase = i386base; critical_exit(); } @@ -86,6 +87,7 @@ if (!error) { critical_enter(); wrmsr(MSR_KGSBASE, i386base); + PCPU_SET(gsbase, i386base); pcb->pcb_gsbase = i386base; critical_exit(); } @@ -100,6 +102,7 @@ if (a64base < VM_MAXUSER_ADDRESS) { critical_enter(); wrmsr(MSR_FSBASE, a64base); + PCPU_SET(fsbase, a64base); pcb->pcb_fsbase = a64base; critical_exit(); } else { @@ -118,6 +121,7 @@ if (a64base < VM_MAXUSER_ADDRESS) { critical_enter(); wrmsr(MSR_KGSBASE, a64base); + PCPU_SET(gsbase, a64base); pcb->pcb_gsbase = a64base; critical_exit(); } else { ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#91 (text+ko) ==== @@ -385,6 +385,7 @@ critical_enter(); td->td_pcb->pcb_gsbase = (register_t)tls_base; wrmsr(MSR_KGSBASE, td->td_pcb->pcb_gsbase); + PCPU_SET(gsbase, td->td_pcb->pcb_gsbase); critical_exit(); } else { td->td_pcb->pcb_gsbase = (register_t)tls_base; @@ -396,6 +397,7 @@ critical_enter(); td->td_pcb->pcb_fsbase = (register_t)tls_base; wrmsr(MSR_FSBASE, td->td_pcb->pcb_fsbase); + PCPU_SET(fsbase, td->td_pcb->pcb_fsbase); critical_exit(); } else { td->td_pcb->pcb_fsbase = (register_t)tls_base; ==== //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#22 (text+ko) ==== @@ -715,10 +715,14 @@ struct trapframe *regs = td->td_frame; struct pcb *pcb = td->td_pcb; + critical_enter(); wrmsr(MSR_FSBASE, 0); wrmsr(MSR_KGSBASE, 0); /* User value while we're in the kernel */ + PCPU_SET(fsbase, 0); + PCPU_SET(gsbase, 0); pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; + critical_exit(); load_ds(_udatasel); load_es(_udatasel); load_fs(_udatasel); ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#28 (text+ko) ==== @@ -49,7 +49,9 @@ register_t pc_rsp0; \ register_t pc_scratch_rsp; /* User %rsp in syscall */ \ u_int pc_apic_id; \ - u_int pc_acpi_id /* ACPI CPU id */ + u_int pc_acpi_id; /* ACPI CPU id */ \ + register_t pc_fsbase; /* User values of fsbase */ \ + register_t pc_gsbase /* User values of gsbase */ #ifdef lint ==== //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#21 (text+ko) ==== @@ -1356,6 +1356,7 @@ td->td_pcb->pcb_gs32p = &gdt[GUGS32_SEL]; td->td_pcb->pcb_flags |= PCB_32BIT; wrmsr(MSR_KGSBASE, td->td_pcb->pcb_gsbase); + PCPU_SET(gsbase, td->td_pcb->pcb_gsbase); critical_exit(); return (0); ==== //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#19 (text+ko) ==== @@ -820,6 +820,8 @@ critical_enter(); wrmsr(MSR_FSBASE, 0); wrmsr(MSR_KGSBASE, 0); /* User value while we're in the kernel */ + PCPU_SET(fsbase, 0); + PCPU_SET(gsbase, 0); pcb->pcb_fsbase = 0; pcb->pcb_gsbase = 0; critical_exit(); From owner-p4-projects@FreeBSD.ORG Wed Mar 12 11:31:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50523106567D; Wed, 12 Mar 2008 11:31:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0BA47106567B for ; Wed, 12 Mar 2008 11:31:44 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED5CF8FC21 for ; Wed, 12 Mar 2008 11:31:43 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2CBVhe0045307 for ; Wed, 12 Mar 2008 11:31:43 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2CBVhEq045305 for perforce@freebsd.org; Wed, 12 Mar 2008 11:31:43 GMT (envelope-from piso@freebsd.org) Date: Wed, 12 Mar 2008 11:31:43 GMT Message-Id: <200803121131.m2CBVhEq045305@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 137492 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, 12 Mar 2008 11:31:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=137492 Change 137492 by piso@piso_ferret on 2008/03/12 11:31:22 IFC@137490 Affected files ... .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#25 integrate .. //depot/projects/soc2005/libalias/UPDATING#24 integrate .. //depot/projects/soc2005/libalias/bin/chflags/chflags.1#3 integrate .. //depot/projects/soc2005/libalias/bin/chflags/chflags.c#2 integrate .. //depot/projects/soc2005/libalias/bin/cp/cp.1#6 integrate .. //depot/projects/soc2005/libalias/bin/cp/cp.c#8 integrate .. //depot/projects/soc2005/libalias/bin/cp/utils.c#4 integrate .. //depot/projects/soc2005/libalias/bin/ps/ps.1#4 integrate .. //depot/projects/soc2005/libalias/bin/realpath/realpath.1#2 integrate .. //depot/projects/soc2005/libalias/bin/realpath/realpath.c#2 integrate .. //depot/projects/soc2005/libalias/bin/uuidgen/Makefile#1 branch .. //depot/projects/soc2005/libalias/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/soc2005/libalias/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/soc2005/libalias/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/soc2005/libalias/etc/Makefile#7 integrate .. //depot/projects/soc2005/libalias/etc/ddb.conf#1 branch .. //depot/projects/soc2005/libalias/etc/defaults/rc.conf#18 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/Makefile#11 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/ddb#1 branch .. //depot/projects/soc2005/libalias/etc/rc.d/mountcritlocal#5 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/mountlate#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/root#4 integrate .. //depot/projects/soc2005/libalias/lib/Makefile#10 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_entry.3#6 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_entry.c#9 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read.3#9 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read.c#12 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_private.h#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_util.3#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write.3#7 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/Makefile#6 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/main.c#6 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/test.h#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_entry.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/Makefile.inc#5 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/sem_timedwait.3#1 branch .. //depot/projects/soc2005/libalias/lib/libc/posix1e/mac.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/posix1e/mac_exec.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/posix1e/mac_get.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/posix1e/mac_set.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/malloc.c#13 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/Makefile.inc#7 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/Symbol.map#7 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/fcntl.2#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libkvm/kvm_proc.c#8 integrate .. //depot/projects/soc2005/libalias/lib/libsdp/sdp.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_attr.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_create.c#8 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_exit.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_sem.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libthread_db/Makefile#4 integrate .. //depot/projects/soc2005/libalias/lib/libutil/humanize_number.c#2 integrate .. //depot/projects/soc2005/libalias/release/doc/share/misc/dev.archlist.txt#11 integrate .. //depot/projects/soc2005/libalias/rescue/rescue/Makefile#7 integrate .. //depot/projects/soc2005/libalias/sbin/ddb/ddb.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/ddb/ddb.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/label/geom_label.c#4 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/multipath/gmultipath.8#3 integrate .. //depot/projects/soc2005/libalias/sbin/geom/core/geom.8#4 integrate .. //depot/projects/soc2005/libalias/sbin/geom/core/geom.c#7 integrate .. //depot/projects/soc2005/libalias/sbin/mount/mount.8#7 integrate .. //depot/projects/soc2005/libalias/sbin/newfs/mkfs.c#5 integrate .. //depot/projects/soc2005/libalias/secure/usr.bin/ssh/Makefile#2 integrate .. //depot/projects/soc2005/libalias/secure/usr.sbin/sshd/Makefile#3 integrate .. //depot/projects/soc2005/libalias/share/man/man3/Makefile#5 integrate .. //depot/projects/soc2005/libalias/share/man/man4/Makefile#17 integrate .. //depot/projects/soc2005/libalias/share/man/man4/cmx.4#1 branch .. //depot/projects/soc2005/libalias/share/man/man4/ddb.4#10 integrate .. //depot/projects/soc2005/libalias/share/man/man4/uslcom.4#1 branch .. //depot/projects/soc2005/libalias/share/man/man4/vr.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man5/rc.conf.5#16 integrate .. //depot/projects/soc2005/libalias/share/man/man9/DEVICE_PROBE.9#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/bus_space.9#3 integrate .. //depot/projects/soc2005/libalias/share/misc/committers-ports.dot#8 integrate .. //depot/projects/soc2005/libalias/share/zoneinfo/leapseconds#6 integrate .. //depot/projects/soc2005/libalias/share/zoneinfo/southamerica#6 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/legacy.c#4 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/machdep.c#15 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/mp_machdep.c#10 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/trap.c#12 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/vm_machdep.c#7 integrate .. //depot/projects/soc2005/libalias/sys/amd64/conf/DEFAULTS#6 integrate .. //depot/projects/soc2005/libalias/sys/amd64/conf/GENERIC#13 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/specialreg.h#8 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysvec.c#10 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/pmap.c#11 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/trap.c#8 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/conf/AVILA#7 integrate .. //depot/projects/soc2005/libalias/sys/arm/include/pmap.h#8 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/btx/btx/btx.S#6 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/pxeldr/pxeldr.S#3 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_proto.h#16 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscall.h#16 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscalls.c#16 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_sysent.c#16 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/syscalls.master#16 integrate .. //depot/projects/soc2005/libalias/sys/conf/NOTES#28 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#33 integrate .. //depot/projects/soc2005/libalias/sys/conf/options#25 integrate .. //depot/projects/soc2005/libalias/sys/ddb/db_command.c#7 integrate .. //depot/projects/soc2005/libalias/sys/ddb/db_examine.c#4 integrate .. //depot/projects/soc2005/libalias/sys/ddb/db_input.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi.c#11 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi_cpu.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-chipset.c#17 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-pci.h#12 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bge.c#22 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bgereg.h#16 integrate .. //depot/projects/soc2005/libalias/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/hptrr/hptrr_os_bsd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/hptrr/ldm.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/hptrr/osm.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/brgphy.c#13 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/miidevs#14 integrate .. //depot/projects/soc2005/libalias/sys/dev/msk/if_msk.c#12 integrate .. //depot/projects/soc2005/libalias/sys/dev/nfe/if_nfe.c#11 integrate .. //depot/projects/soc2005/libalias/sys/dev/nfe/if_nfereg.h#6 integrate .. //depot/projects/soc2005/libalias/sys/dev/nfe/if_nfevar.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_axe.c#8 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uslcom.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/soc2005/libalias/sys/fs/procfs/procfs_ctl.c#3 integrate .. //depot/projects/soc2005/libalias/sys/fs/procfs/procfs_dbregs.c#3 integrate .. //depot/projects/soc2005/libalias/sys/fs/procfs/procfs_status.c#6 integrate .. //depot/projects/soc2005/libalias/sys/i386/conf/DEFAULTS#6 integrate .. //depot/projects/soc2005/libalias/sys/i386/conf/GENERIC#12 integrate .. //depot/projects/soc2005/libalias/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/legacy.c#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/mp_machdep.c#12 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/sys_machdep.c#8 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/trap.c#11 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/imgact_coff.c#5 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/specialreg.h#7 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_sysvec.c#7 integrate .. //depot/projects/soc2005/libalias/sys/ia64/conf/DEFAULTS#8 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/machdep.c#10 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/trap.c#9 integrate .. //depot/projects/soc2005/libalias/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/init_sysent.c#15 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_clock.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_condvar.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_cpuset.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_descrip.c#12 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_exec.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_fork.c#13 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_intr.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_kse.c#9 delete .. //depot/projects/soc2005/libalias/sys/kern/kern_priv.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_proc.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_resource.c#13 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_sig.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_switch.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_sx.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_synch.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_thread.c#13 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_timeout.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/p1003_1b.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/sched_4bsd.c#15 integrate .. //depot/projects/soc2005/libalias/sys/kern/sched_ule.c#15 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_bus.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_smp.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_trap.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_witness.c#14 integrate .. //depot/projects/soc2005/libalias/sys/kern/sys_process.c#9 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.c#15 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.master#16 integrate .. //depot/projects/soc2005/libalias/sys/kern/systrace_args.c#12 integrate .. //depot/projects/soc2005/libalias/sys/modules/Makefile#21 integrate .. //depot/projects/soc2005/libalias/sys/modules/cmx/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/uslcom/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/vr/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/zfs/Makefile#6 integrate .. //depot/projects/soc2005/libalias/sys/net/bpf_filter.c#4 integrate .. //depot/projects/soc2005/libalias/sys/net/if.c#11 integrate .. //depot/projects/soc2005/libalias/sys/net/if_ethersubr.c#15 integrate .. //depot/projects/soc2005/libalias/sys/net/if_gif.c#8 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/netgraph.h#5 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_ksocket.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_l2tp.c#5 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_socket.c#8 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#68 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#30 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_ftp.c#23 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_irc.c#25 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#32 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_proxy.c#28 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_smedia.c#23 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_output.c#12 integrate .. //depot/projects/soc2005/libalias/sys/netsmb/smb_conn.h#3 integrate .. //depot/projects/soc2005/libalias/sys/pc98/conf/DEFAULTS#5 integrate .. //depot/projects/soc2005/libalias/sys/pc98/conf/GENERIC#11 integrate .. //depot/projects/soc2005/libalias/sys/pc98/pc98/machdep.c#14 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_vr.c#7 delete .. //depot/projects/soc2005/libalias/sys/pci/if_vrreg.h#4 delete .. //depot/projects/soc2005/libalias/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/conf/DEFAULTS#6 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/intr_machdep.h#5 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/md_var.h#7 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/openpicvar.h#5 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/pcpu.h#5 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/mpc85xx/opic.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/mpc85xx/pci_ocp.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powermac/openpic_macio.c#4 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/cpu.c#5 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/intr_machdep.c#8 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/openpic.c#5 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/pic_if.m#5 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/psim/openpic_iobus.c#4 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_syscalls.c#15 integrate .. //depot/projects/soc2005/libalias/sys/security/audit/audit_worker.c#9 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/conf/DEFAULTS#6 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/conf/GENERIC#11 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/include/tlb.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/iommu.c#4 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/mp_machdep.c#6 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/trap.c#7 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/mp_machdep.c#9 integrate .. //depot/projects/soc2005/libalias/sys/sys/bus.h#7 integrate .. //depot/projects/soc2005/libalias/sys/sys/condvar.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/fcntl.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/kse.h#2 delete .. //depot/projects/soc2005/libalias/sys/sys/param.h#21 integrate .. //depot/projects/soc2005/libalias/sys/sys/pcpu.h#8 integrate .. //depot/projects/soc2005/libalias/sys/sys/proc.h#17 integrate .. //depot/projects/soc2005/libalias/sys/sys/sched.h#10 integrate .. //depot/projects/soc2005/libalias/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.h#15 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.mk#15 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysproto.h#15 integrate .. //depot/projects/soc2005/libalias/sys/sys/systm.h#16 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_softdep.c#10 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ffs/ffs_vfsops.c#12 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_fault.c#10 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_glue.c#8 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_map.c#9 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_meter.c#6 integrate .. //depot/projects/soc2005/libalias/tools/build/mk/OptionalObsoleteFiles.inc#10 integrate .. //depot/projects/soc2005/libalias/tools/regression/file/dup/dup.c#2 integrate .. //depot/projects/soc2005/libalias/tools/tools/tinybsd/tinybsd#6 integrate .. //depot/projects/soc2005/libalias/usr.bin/ar/ar.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/ar/ar.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/ar/ar.h#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/ar/write.c#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/calendar/calendars/calendar.freebsd#16 integrate .. //depot/projects/soc2005/libalias/usr.bin/chat/chat.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/cpuset/cpuset.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/gzip/gzip.c#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/make/main.c#8 integrate .. //depot/projects/soc2005/libalias/usr.bin/make/make.1#7 integrate .. //depot/projects/soc2005/libalias/usr.bin/ministat/ministat.1#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/Makefile#13 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/sdpd/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/sdpd/gn.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/sdpd/nap.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/sdpd/panu.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/sdpd/profile.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/bluetooth/sdpd/profile.h#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/Makefile#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/Makefile.inc#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/fifolog_create/Makefile#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/flint.lnt#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/Makefile#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/fifolog.h#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/fifolog_create.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/fifolog_int.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/fifolog_write.h#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/getdate.y#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/libfifolog.h#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/fifolog/lib/miniobj.h#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/moused/Makefile#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/moused/moused.c#5 integrate Differences ... ==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#25 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -32,6 +32,11 @@ OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libkse.a +OLD_FILES+=usr/lib32/libkse_p.a +OLD_FILES+=usr/lib32/libkse_pic.a +.endif .endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h @@ -134,6 +139,12 @@ OLD_DIRS+=usr/include/netatm/uni OLD_DIRS+=usr/include/netatm OLD_DIRS+=usr/share/examples/atm +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libatm.a +OLD_FILES+=usr/lib32/libatm.so +OLD_LIBS+=usr/lib32/libatm.so.5 +OLD_FILES+=usr/lib32/libatm_p.a +.endif # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -224,6 +235,42 @@ OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libalias.so.5 +OLD_LIBS+=usr/lib32/libbsnmp.so.3 +OLD_LIBS+=usr/lib32/libdialog.so.5 +OLD_LIBS+=usr/lib32/libgnuregex.so.3 +OLD_LIBS+=usr/lib32/libhistory.so.6 +OLD_LIBS+=usr/lib32/libncurses.so.6 +OLD_LIBS+=usr/lib32/libncursesw.so.6 +OLD_LIBS+=usr/lib32/libpam.so.3 +OLD_LIBS+=usr/lib32/libreadline.so.6 +OLD_LIBS+=usr/lib32/libssh.so.3 +OLD_LIBS+=usr/lib32/pam_chroot.so.3 +OLD_LIBS+=usr/lib32/pam_deny.so.3 +OLD_LIBS+=usr/lib32/pam_echo.so.3 +OLD_LIBS+=usr/lib32/pam_exec.so.3 +OLD_LIBS+=usr/lib32/pam_ftpusers.so.3 +OLD_LIBS+=usr/lib32/pam_group.so.3 +OLD_LIBS+=usr/lib32/pam_guest.so.3 +OLD_LIBS+=usr/lib32/pam_krb5.so.3 +OLD_LIBS+=usr/lib32/pam_ksu.so.3 +OLD_LIBS+=usr/lib32/pam_lastlog.so.3 +OLD_LIBS+=usr/lib32/pam_login_access.so.3 +OLD_LIBS+=usr/lib32/pam_nologin.so.3 +OLD_LIBS+=usr/lib32/pam_opie.so.3 +OLD_LIBS+=usr/lib32/pam_opieaccess.so.3 +OLD_LIBS+=usr/lib32/pam_passwdqc.so.3 +OLD_LIBS+=usr/lib32/pam_permit.so.3 +OLD_LIBS+=usr/lib32/pam_radius.so.3 +OLD_LIBS+=usr/lib32/pam_rhosts.so.3 +OLD_LIBS+=usr/lib32/pam_rootok.so.3 +OLD_LIBS+=usr/lib32/pam_securetty.so.3 +OLD_LIBS+=usr/lib32/pam_self.so.3 +OLD_LIBS+=usr/lib32/pam_ssh.so.3 +OLD_LIBS+=usr/lib32/pam_tacplus.so.3 +OLD_LIBS+=usr/lib32/pam_unix.so.3 +.endif # 20070613: IPX over IP tunnel removal OLD_FILES+=usr/include/netipx/ipx_ip.h # 20070605: sched_core removal @@ -603,6 +650,9 @@ OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=usr/lib/libarchive.so.3 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libarchive.so.3 +.endif # 20070301: remove addr2ascii and ascii2addr OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz ==== //depot/projects/soc2005/libalias/UPDATING#24 (text+ko) ==== @@ -22,6 +22,16 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080312: + Support for KSE threading has been removed from the kernel. To + run legacy applications linked against KSE libmap.conf may + be used. The following libmap.conf may be used to ensure + compatibility with any prior release: + + libpthread.so.1 libthr.so.1 + libpthread.so.2 libthr.so.2 + libkse.so.3 libthr.so.3 + 20080301: The layout of struct vmspace has changed. This affects libkvm and any executables that link against libkvm and use the @@ -997,4 +1007,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ ==== //depot/projects/soc2005/libalias/bin/chflags/chflags.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.30 2008/03/09 12:10:24 rwatson Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -40,7 +40,7 @@ .Nd change file flags .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl fhv .Oo .Fl R .Op Fl H | Fl L | Fl P @@ -57,6 +57,12 @@ .Pp The options are as follows: .Bl -tag -width indent +.It Fl f +Do not display a diagnostic message if +.Nm +could not modify the flags for +.Va file , +nor modify the exit status to reflect such failures. .It Fl H If the .Fl R @@ -79,6 +85,14 @@ .It Fl R Change the file flags for the file hierarchies rooted in the files instead of just the files themselves. +.It Fl v +Cause +.Nm +to be verbose, showing filenames as the flags are modified. +If the +.Fl v +option is specified more than once, the old and new flags of the file +will also be printed, in octal notation. .El .Pp The flags are specified as an octal number or a comma separated list ==== //depot/projects/soc2005/libalias/bin/chflags/chflags.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.24 2008/03/09 12:10:24 rwatson Exp $"); #include #include @@ -60,14 +60,15 @@ { FTS *ftsp; FTSENT *p; - u_long clear, set; + u_long clear, newflags, set; long val; - int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval; + int Hflag, Lflag, Rflag, fflag, hflag, vflag; + int ch, fts_options, oct, rval; char *flags, *ep; int (*change_flags)(const char *, unsigned long); - Hflag = Lflag = Rflag = hflag = 0; - while ((ch = getopt(argc, argv, "HLPRh")) != -1) + Hflag = Lflag = Rflag = fflag = hflag = vflag = 0; + while ((ch = getopt(argc, argv, "HLPRfhv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -83,9 +84,15 @@ case 'R': Rflag = 1; break; + case 'f': + fflag = 1; + break; case 'h': hflag = 1; break; + case 'v': + vflag++; + break; case '?': default: usage(); @@ -166,18 +173,23 @@ default: break; } - if (oct) { - if (!(*change_flags)(p->fts_accpath, set)) - continue; - } else { - p->fts_statp->st_flags |= set; - p->fts_statp->st_flags &= clear; - if (!(*change_flags)(p->fts_accpath, - (u_long)p->fts_statp->st_flags)) - continue; + if (oct) + newflags = set; + else + newflags = (p->fts_statp->st_flags | set) & clear; + if (newflags == p->fts_statp->st_flags) + continue; + if ((*change_flags)(p->fts_accpath, newflags) && !fflag) { + warn("%s", p->fts_path); + rval = 1; + } else if (vflag) { + (void)printf("%s", p->fts_path); + if (vflag > 1) + (void)printf(": 0%lo -> 0%lo", + (u_long)p->fts_statp->st_flags, + newflags); + (void)printf("\n"); } - warn("%s", p->fts_path); - rval = 1; } if (errno) err(1, "fts_read"); @@ -188,6 +200,6 @@ usage(void) { (void)fprintf(stderr, - "usage: chflags [-h] [-R [-H | -L | -P]] flags file ...\n"); + "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n"); exit(1); } ==== //depot/projects/soc2005/libalias/bin/cp/cp.1#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $ .\" .Dd October 27, 2006 .Dt CP 1 @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -116,6 +116,10 @@ or .Xr pax 1 instead. +.It Fl a +Archive mode. +Same as +.Fl RpP . .It Fl f For each existing destination pathname, remove it and create a new file, without prompting for confirmation ==== //depot/projects/soc2005/libalias/bin/cp/cp.c#8 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); /* * Cp copies source files to target files. @@ -102,7 +102,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -119,6 +119,12 @@ case 'R': Rflag = 1; break; + case 'a': + Pflag = 1; + pflag = 1; + Rflag = 1; + Hflag = Lflag = 0; + break; case 'f': fflag = 1; iflag = nflag = 0; ==== //depot/projects/soc2005/libalias/bin/cp/utils.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.53 2008/03/10 19:58:41 jhb Exp $"); #include #include @@ -429,8 +429,8 @@ { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " "target_directory"); exit(EX_USAGE); } ==== //depot/projects/soc2005/libalias/bin/ps/ps.1#4 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.90 2008/03/12 10:01:34 jeff Exp $ .\" .Dd August 21, 2006 .Dt PS 1 @@ -290,7 +290,6 @@ .It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us" .It Dv "P_WEXIT" Ta No "0x02000 Working on exiting" .It Dv "P_EXEC" Ta No "0x04000 Process called exec" -.It Dv "P_SA" Ta No "0x08000 Using scheduler activations" .It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state" .It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP" .It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing" ==== //depot/projects/soc2005/libalias/bin/realpath/realpath.1#2 (text+ko) ==== @@ -31,7 +31,7 @@ .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp -.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.11 2008/03/09 12:46:39 rwatson Exp $ .\" .Dd November 24, 2000 .Dt REALPATH 1 @@ -41,7 +41,9 @@ .Nd return resolved physical path .Sh SYNOPSIS .Nm +.Op Fl q .Ar path +.Op Ar ... .Sh DESCRIPTION The .Nm @@ -55,6 +57,12 @@ .Pa /../ in .Ar path . +.Pp +If +.Fl q +is specified, warnings will not be printed when +.Xr realpath 3 +fails. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO ==== //depot/projects/soc2005/libalias/bin/realpath/realpath.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6 2004/04/06 20:06:50 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.7 2008/03/09 12:46:39 rwatson Exp $"); #include @@ -44,20 +44,39 @@ { char buf[PATH_MAX]; char *p; + int ch, i, qflag, rval; - if (argc == 2) { - if ((p = realpath(argv[1], buf)) == NULL) - err(1, "%s", buf); - } else + qflag = 0; + while ((ch = getopt(argc, argv, "q")) != -1) { + switch (ch) { + case 'q': + qflag = 1; + break; + case '?': + default: + usage(); + } + } + argc -= optind; + argv += optind; + if (argc < 1) usage(); - (void)printf("%s\n", p); - exit(0); + rval = 0; + for (i = 0; i < argc; i++) { + if ((p = realpath(argv[i], buf)) == NULL) { + if (!qflag) + warn("%s", argv[i]); + rval = 1; + } else + (void)printf("%s\n", p); + } + exit(rval); } static void usage(void) { - (void)fprintf(stderr, "usage: realpath path\n"); + (void)fprintf(stderr, "usage: realpath [-q] path [...]\n"); exit(1); } ==== //depot/projects/soc2005/libalias/contrib/bsnmp/snmpd/main.c#2 (text+ko) ==== @@ -2242,6 +2242,8 @@ return (m); err: + if ((m->flags & LM_ONSTARTLIST) != 0) + TAILQ_REMOVE(&modules_start, m, start); if (m->handle) dlclose(m->handle); free(m->path); ==== //depot/projects/soc2005/libalias/etc/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.365 2007/11/11 01:16:51 mlaier Exp $ +# $FreeBSD: src/etc/Makefile,v 1.366 2008/03/05 18:32:58 brooks Exp $ .include @@ -9,7 +9,7 @@ BIN1= amd.map apmd.conf auth.conf \ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ - dhclient.conf disktab fbtab freebsd-update.conf \ + ddb.conf dhclient.conf disktab fbtab freebsd-update.conf \ ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf libalias.conf login.access login.conf mac.conf motd \ ==== //depot/projects/soc2005/libalias/etc/defaults/rc.conf#18 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.326 2008/01/27 15:15:11 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -33,6 +33,8 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). +ddb_enable="NO" # Set to YES to load ddb scripts at boot. +ddb_config="/etc/ddb.conf" # ddb(8) config file. devd_enable="YES" # Run devd, to trigger programs on device tree changes. devd_flags="" # Additional flags for devd(8). kldxref_enable="NO" # Build linker.hints files with kldxref(8). @@ -249,7 +251,7 @@ rwhod_enable="NO" # Run the rwho daemon (or NO). rwhod_flags="" # Flags for rwhod rarpd_enable="NO" # Run rarpd (or NO). -rarpd_flags="" # Flags to rarpd. +rarpd_flags="-a" # Flags to rarpd. bootparamd_enable="NO" # Run bootparamd (or NO). bootparamd_flags="" # Flags to bootparamd pppoed_enable="NO" # Run the PPP over Ethernet daemon. ==== //depot/projects/soc2005/libalias/etc/rc.d/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.88 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.89 2008/03/05 18:32:58 brooks Exp $ .include @@ -7,7 +7,7 @@ apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ccd cleanvar cleartmp cron \ - devd devfs dhclient \ + ddb devd devfs dhclient \ dmesg dumpon \ early.sh encswap \ fsck ftp-proxy ftpd \ ==== //depot/projects/soc2005/libalias/etc/rc.d/mountcritlocal#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.15 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.16 2008/03/06 14:39:33 mtm Exp $ # # PROVIDE: mountcritlocal @@ -15,6 +15,8 @@ mountcritlocal_start() { + local err + # Set up the list of network filesystem types for which mounting # should be delayed until after network initialization. case ${extra_netfs_types} in @@ -34,9 +36,10 @@ done mount_excludes=${mount_excludes%,} mount -a -t ${mount_excludes} + err=$? echo '.' - case $? in + case ${err} in 0) ;; *) ==== //depot/projects/soc2005/libalias/etc/rc.d/mountlate#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.2 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.5 2008/03/11 17:21:55 delphij Exp $ # # PROVIDE: mountlate @@ -16,12 +16,15 @@ mountlate_start() { + local err + # Mount "late" filesystems. echo -n 'Mounting late file systems:' mount -a -l + err=$? echo '.' - case $? in + case ${err} in 0) ;; *) @@ -30,6 +33,12 @@ stop_boot true ;; esac + + # If we booted a special kernel remove the record + # so we will boot the default kernel next time. + if [ -x /sbin/nextboot ]; then + /sbin/nextboot -D + fi } load_rc_config $name ==== //depot/projects/soc2005/libalias/etc/rc.d/root#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/root,v 1.16 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.17 2008/03/11 17:21:14 delphij Exp $ # # PROVIDE: root @@ -34,7 +34,7 @@ # If we booted a special kernel remove the record # so we will boot the default kernel next time. if [ -x /sbin/nextboot ]; then - /sbin/nextboot -D + /sbin/nextboot -D > /dev/null 2>&1 fi } ==== //depot/projects/soc2005/libalias/lib/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $ .include @@ -34,7 +34,7 @@ ${_libgssapi} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ + libpmc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -104,10 +104,6 @@ _libsmb= libsmb .endif -.if ${MK_LIBKSE} != "no" -_libkse= libkse -.endif - .if ${MK_LIBTHR} != "no" _libthr= libthr .endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 12 14:17:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5681F1065671; Wed, 12 Mar 2008 14:17:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12220106566C for ; Wed, 12 Mar 2008 14:17:40 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C7EC98FC2D for ; Wed, 12 Mar 2008 14:17:39 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2CEHdsv066747 for ; Wed, 12 Mar 2008 14:17:39 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2CEHdE6066745 for perforce@freebsd.org; Wed, 12 Mar 2008 14:17:39 GMT (envelope-from rrs@cisco.com) Date: Wed, 12 Mar 2008 14:17:39 GMT Message-Id: <200803121417.m2CEHdE6066745@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 137500 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, 12 Mar 2008 14:17:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=137500 Change 137500 by rrs@rrs-mips2-jnpr on 2008/03/12 14:16:51 Makes the sp subtract add be 48 instead of 44. Affected files ... .. //depot/projects/mips2-jnpr/src/libexec/rtld-elf/mips/rtld_start.S#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/libexec/rtld-elf/mips/rtld_start.S#3 (text+ko) ==== @@ -90,7 +90,7 @@ move v1,gp /* save old GP */ add t9,8 /* modify T9 to point at .cpload */ .cpload t9 - subu sp,44 /* save arguments and sp value */ + subu sp,48 /* save arguments and sp value */ .cprestore 36 sw a0,16(sp) sw a1,20(sp) @@ -119,7 +119,7 @@ lw a2,24(sp) lw a3,28(sp) lw s0,32(sp) - addu sp,44 + addu sp,48 move t9,v0 jr t9 nop From owner-p4-projects@FreeBSD.ORG Wed Mar 12 17:41:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D7621065674; Wed, 12 Mar 2008 17:41:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C40C1065672 for ; Wed, 12 Mar 2008 17:41:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 10AC58FC27 for ; Wed, 12 Mar 2008 17:41:41 +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.14.1/8.14.1) with ESMTP id m2CHfer4090309 for ; Wed, 12 Mar 2008 17:41:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2CHfe29090307 for perforce@freebsd.org; Wed, 12 Mar 2008 17:41:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 12 Mar 2008 17:41:40 GMT Message-Id: <200803121741.m2CHfe29090307@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 137527 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, 12 Mar 2008 17:41:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=137527 Change 137527 by rwatson@rwatson_cinnamon on 2008/03/12 17:41:35 When there's no data to return from a check for new BPF data, zero it even though we also return an error. Doesn't cost much, but makes debugging easier. Add comment on how we pick the shared memory buffer size. Minor style nit. Affected files ... .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#24 edit Differences ... ==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#24 (text+ko) ==== @@ -181,6 +181,7 @@ return (1); } } + *cc = 0; return (0); } @@ -806,6 +807,15 @@ bufmode = BPF_BUFMODE_ZBUF; if (ioctl(fd, BIOCSETBUFMODE, (caddr_t)&bufmode) == 0) { p->zerocopy = 1; + + /* + * How to pick a buffer size: first, query the maximum buffer + * size supported by zero-copy. This also lets us quickly + * determine whether the kernel generally supports zero-copy. + * Then, query the default buffer size, which reflects kernel + * policy for a desired default. Round to the nearest page + * size. + */ if (ioctl(fd, BIOCGETZMAX, (caddr_t)&zbufmax) < 0) { snprintf(ebuf, PCAP_ERRBUF_SIZE, "BIOCGETZMAX: %s", pcap_strerror(errno)); @@ -843,7 +853,6 @@ device, pcap_strerror(errno)); goto bad; } - v = p->zbufsize - sizeof(struct bpf_zbuf_header); } else { #endif From owner-p4-projects@FreeBSD.ORG Wed Mar 12 21:17:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 757CF1065672; Wed, 12 Mar 2008 21:17:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3341F106566C for ; Wed, 12 Mar 2008 21:17:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2844A8FC16 for ; Wed, 12 Mar 2008 21:17:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2CLHe6E014116 for ; Wed, 12 Mar 2008 21:17:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2CLHduv014114 for perforce@freebsd.org; Wed, 12 Mar 2008 21:17:39 GMT (envelope-from sam@freebsd.org) Date: Wed, 12 Mar 2008 21:17:39 GMT Message-Id: <200803122117.m2CLHduv014114@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 137546 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, 12 Mar 2008 21:17:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=137546 Change 137546 by sam@sam_ebb on 2008/03/12 21:17:30 IFC @ 137545 Affected files ... .. //depot/projects/vap/UPDATING#6 integrate .. //depot/projects/vap/bin/cp/cp.1#3 integrate .. //depot/projects/vap/bin/cp/cp.c#4 integrate .. //depot/projects/vap/bin/cp/utils.c#3 integrate .. //depot/projects/vap/bin/ps/ps.1#3 integrate .. //depot/projects/vap/bin/uuidgen/Makefile#1 branch .. //depot/projects/vap/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/vap/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/vap/etc/rc.d/mountlate#4 integrate .. //depot/projects/vap/etc/rc.d/root#4 integrate .. //depot/projects/vap/lib/Makefile#4 integrate .. //depot/projects/vap/lib/libalias/libalias/Makefile#3 integrate .. //depot/projects/vap/lib/libarchive/archive_entry.3#3 integrate .. //depot/projects/vap/lib/libarchive/archive_entry.c#4 integrate .. //depot/projects/vap/lib/libarchive/archive_read.3#3 integrate .. //depot/projects/vap/lib/libarchive/archive_read.c#4 integrate .. //depot/projects/vap/lib/libarchive/archive_read_private.h#4 integrate .. //depot/projects/vap/lib/libarchive/archive_util.3#3 integrate .. //depot/projects/vap/lib/libarchive/archive_write.3#3 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.3#3 integrate .. //depot/projects/vap/lib/libarchive/test/Makefile#6 integrate .. //depot/projects/vap/lib/libarchive/test/main.c#5 integrate .. //depot/projects/vap/lib/libarchive/test/test.h#5 integrate .. //depot/projects/vap/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_entry.c#3 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse.c#4 integrate .. //depot/projects/vap/lib/libc/gen/Makefile.inc#5 integrate .. //depot/projects/vap/lib/libc/gen/sem_timedwait.3#1 branch .. //depot/projects/vap/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/vap/lib/libc/sys/Symbol.map#4 integrate .. //depot/projects/vap/lib/libc/sys/kldunload.2#3 integrate .. //depot/projects/vap/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/vap/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/vap/lib/libpmc/pmc_capabilities.3#3 integrate .. //depot/projects/vap/lib/libsdp/sdp.h#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_sem.c#4 integrate .. //depot/projects/vap/lib/libthread_db/Makefile#3 integrate .. //depot/projects/vap/release/doc/share/misc/dev.archlist.txt#6 integrate .. //depot/projects/vap/sbin/mount/mount.8#3 integrate .. //depot/projects/vap/share/man/man4/uart.4#3 integrate .. //depot/projects/vap/share/man/man4/vr.4#3 integrate .. //depot/projects/vap/sys/amd64/amd64/amd64_mem.c#3 integrate .. //depot/projects/vap/sys/amd64/amd64/legacy.c#6 integrate .. //depot/projects/vap/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/vap/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/vap/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/vap/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/vap/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/vap/sys/amd64/include/specialreg.h#7 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_sysvec.c#6 integrate .. //depot/projects/vap/sys/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/vap/sys/arm/arm/nexus.c#5 integrate .. //depot/projects/vap/sys/arm/arm/trap.c#6 integrate .. //depot/projects/vap/sys/arm/conf/AVILA#5 integrate .. //depot/projects/vap/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/vap/sys/boot/common/dev_net.c#3 integrate .. //depot/projects/vap/sys/boot/i386/btx/btx/btx.S#6 integrate .. //depot/projects/vap/sys/boot/powerpc/uboot/metadata.c#3 integrate .. //depot/projects/vap/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/vap/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/vap/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/vap/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/vap/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/vap/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/vap/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/vap/sys/dev/acpica/acpi.c#8 integrate .. //depot/projects/vap/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/vap/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/vap/sys/dev/cpufreq/ichss.c#5 integrate .. //depot/projects/vap/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/vap/sys/dev/msk/if_msk.c#8 integrate .. //depot/projects/vap/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/vap/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/vap/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/vap/sys/dev/uart/uart.h#6 integrate .. //depot/projects/vap/sys/dev/uart/uart_dev_ns8250.c#5 integrate .. //depot/projects/vap/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/vap/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#9 edit .. //depot/projects/vap/sys/dev/wpi/if_wpireg.h#3 integrate .. //depot/projects/vap/sys/dev/wpi/if_wpivar.h#4 integrate .. //depot/projects/vap/sys/fs/fifofs/fifo_vnops.c#8 integrate .. //depot/projects/vap/sys/fs/procfs/procfs_ctl.c#5 integrate .. //depot/projects/vap/sys/fs/procfs/procfs_dbregs.c#5 integrate .. //depot/projects/vap/sys/fs/procfs/procfs_status.c#6 integrate .. //depot/projects/vap/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/vap/sys/i386/cpufreq/est.c#7 integrate .. //depot/projects/vap/sys/i386/i386/i686_mem.c#3 integrate .. //depot/projects/vap/sys/i386/i386/k6_mem.c#3 integrate .. //depot/projects/vap/sys/i386/i386/legacy.c#6 integrate .. //depot/projects/vap/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/vap/sys/i386/i386/sys_machdep.c#6 integrate .. //depot/projects/vap/sys/i386/i386/trap.c#7 integrate .. //depot/projects/vap/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/vap/sys/i386/ibcs2/imgact_coff.c#7 integrate .. //depot/projects/vap/sys/i386/include/specialreg.h#5 integrate .. //depot/projects/vap/sys/i386/linux/linux_sysvec.c#6 integrate .. //depot/projects/vap/sys/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/vap/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/vap/sys/ia64/ia64/trap.c#6 integrate .. //depot/projects/vap/sys/ia64/include/ucontext.h#3 integrate .. //depot/projects/vap/sys/kern/imgact_elf.c#7 integrate .. //depot/projects/vap/sys/kern/init_sysent.c#10 integrate .. //depot/projects/vap/sys/kern/kern_clock.c#6 integrate .. //depot/projects/vap/sys/kern/kern_condvar.c#5 integrate .. //depot/projects/vap/sys/kern/kern_exec.c#7 integrate .. //depot/projects/vap/sys/kern/kern_fork.c#6 integrate .. //depot/projects/vap/sys/kern/kern_intr.c#6 integrate .. //depot/projects/vap/sys/kern/kern_kse.c#6 delete .. //depot/projects/vap/sys/kern/kern_proc.c#7 integrate .. //depot/projects/vap/sys/kern/kern_resource.c#6 integrate .. //depot/projects/vap/sys/kern/kern_sig.c#8 integrate .. //depot/projects/vap/sys/kern/kern_switch.c#6 integrate .. //depot/projects/vap/sys/kern/kern_sx.c#6 integrate .. //depot/projects/vap/sys/kern/kern_synch.c#7 integrate .. //depot/projects/vap/sys/kern/kern_thread.c#8 integrate .. //depot/projects/vap/sys/kern/kern_timeout.c#7 integrate .. //depot/projects/vap/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/vap/sys/kern/sched_4bsd.c#8 integrate .. //depot/projects/vap/sys/kern/sched_ule.c#9 integrate .. //depot/projects/vap/sys/kern/subr_bus.c#9 integrate .. //depot/projects/vap/sys/kern/subr_sleepqueue.c#8 integrate .. //depot/projects/vap/sys/kern/subr_smp.c#8 integrate .. //depot/projects/vap/sys/kern/subr_trap.c#7 integrate .. //depot/projects/vap/sys/kern/subr_witness.c#8 integrate .. //depot/projects/vap/sys/kern/sys_process.c#6 integrate .. //depot/projects/vap/sys/kern/syscalls.c#10 integrate .. //depot/projects/vap/sys/kern/syscalls.master#10 integrate .. //depot/projects/vap/sys/kern/systrace_args.c#7 integrate .. //depot/projects/vap/sys/modules/vr/Makefile#5 integrate .. //depot/projects/vap/sys/net/bpf_filter.c#6 integrate .. //depot/projects/vap/sys/netgraph/netgraph.h#7 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#12 integrate .. //depot/projects/vap/sys/netgraph/ng_socket.c#7 integrate .. //depot/projects/vap/sys/netinet/libalias/alias.c#6 integrate .. //depot/projects/vap/sys/netinet/libalias/alias.h#5 integrate .. //depot/projects/vap/sys/netinet/libalias/alias_old.c#5 delete .. //depot/projects/vap/sys/netsmb/smb_conn.h#4 integrate .. //depot/projects/vap/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/vap/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/vap/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/vap/sys/pci/if_vr.c#6 delete .. //depot/projects/vap/sys/pci/if_vrreg.h#5 delete .. //depot/projects/vap/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/vap/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/vap/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/vap/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/vap/sys/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/vap/sys/powerpc/conf/DEFAULTS#3 integrate .. //depot/projects/vap/sys/powerpc/include/bootinfo.h#4 integrate .. //depot/projects/vap/sys/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/vap/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/vap/sys/powerpc/powerpc/intr_machdep.c#7 integrate .. //depot/projects/vap/sys/security/audit/audit_worker.c#6 integrate .. //depot/projects/vap/sys/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/vap/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/vap/sys/sparc64/sparc64/iommu.c#6 integrate .. //depot/projects/vap/sys/sparc64/sparc64/trap.c#7 integrate .. //depot/projects/vap/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/vap/sys/sys/condvar.h#5 integrate .. //depot/projects/vap/sys/sys/disklabel.h#7 integrate .. //depot/projects/vap/sys/sys/kse.h#3 delete .. //depot/projects/vap/sys/sys/param.h#12 integrate .. //depot/projects/vap/sys/sys/proc.h#10 integrate .. //depot/projects/vap/sys/sys/sched.h#7 integrate .. //depot/projects/vap/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/vap/sys/sys/syscall.h#10 integrate .. //depot/projects/vap/sys/sys/syscall.mk#10 integrate .. //depot/projects/vap/sys/sys/sysproto.h#10 integrate .. //depot/projects/vap/sys/sys/systm.h#7 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_softdep.c#8 integrate .. //depot/projects/vap/sys/vm/vm_glue.c#6 integrate .. //depot/projects/vap/sys/vm/vm_map.c#7 integrate .. //depot/projects/vap/sys/vm/vm_meter.c#6 integrate .. //depot/projects/vap/usr.bin/ar/ar.1#2 integrate .. //depot/projects/vap/usr.bin/ar/ar.c#2 integrate .. //depot/projects/vap/usr.bin/ar/ar.h#2 integrate .. //depot/projects/vap/usr.bin/ar/write.c#3 integrate .. //depot/projects/vap/usr.bin/cpuset/cpuset.1#2 integrate .. //depot/projects/vap/usr.bin/kdump/kdump.c#5 integrate .. //depot/projects/vap/usr.bin/kdump/kdump_subr.h#3 integrate .. //depot/projects/vap/usr.bin/kdump/mksubr#5 integrate .. //depot/projects/vap/usr.bin/make/globals.h#3 integrate .. //depot/projects/vap/usr.bin/make/hash_tables.c#3 integrate .. //depot/projects/vap/usr.bin/make/main.c#4 integrate .. //depot/projects/vap/usr.bin/make/make.1#4 integrate .. //depot/projects/vap/usr.bin/make/parse.c#3 integrate .. //depot/projects/vap/usr.bin/ministat/ministat.1#2 integrate .. //depot/projects/vap/usr.sbin/Makefile#5 integrate .. //depot/projects/vap/usr.sbin/bluetooth/sdpd/Makefile#3 integrate .. //depot/projects/vap/usr.sbin/bluetooth/sdpd/gn.c#1 branch .. //depot/projects/vap/usr.sbin/bluetooth/sdpd/nap.c#1 branch .. //depot/projects/vap/usr.sbin/bluetooth/sdpd/panu.c#1 branch .. //depot/projects/vap/usr.sbin/bluetooth/sdpd/profile.c#3 integrate .. //depot/projects/vap/usr.sbin/bluetooth/sdpd/profile.h#3 integrate .. //depot/projects/vap/usr.sbin/fifolog/Makefile#1 branch .. //depot/projects/vap/usr.sbin/fifolog/Makefile.inc#1 branch .. //depot/projects/vap/usr.sbin/fifolog/fifolog_create/Makefile#1 branch .. //depot/projects/vap/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch .. //depot/projects/vap/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch .. //depot/projects/vap/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch .. //depot/projects/vap/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch .. //depot/projects/vap/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch .. //depot/projects/vap/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch .. //depot/projects/vap/usr.sbin/fifolog/flint.lnt#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/Makefile#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog.h#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog_create.c#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog_int.c#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog_write.h#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/getdate.y#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/libfifolog.h#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch .. //depot/projects/vap/usr.sbin/fifolog/lib/miniobj.h#1 branch .. //depot/projects/vap/usr.sbin/ppp/command.c#3 integrate .. //depot/projects/vap/usr.sbin/ppp/ipcp.c#3 integrate .. //depot/projects/vap/usr.sbin/ppp/main.c#3 integrate .. //depot/projects/vap/usr.sbin/ppp/nat_cmd.c#3 integrate Differences ... ==== //depot/projects/vap/UPDATING#6 (text+ko) ==== @@ -22,6 +22,16 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080312: + Support for KSE threading has been removed from the kernel. To + run legacy applications linked against KSE libmap.conf may + be used. The following libmap.conf may be used to ensure + compatibility with any prior release: + + libpthread.so.1 libthr.so.1 + libpthread.so.2 libthr.so.2 + libkse.so.3 libthr.so.3 + 20080301: The layout of struct vmspace has changed. This affects libkvm and any executables that link against libkvm and use the @@ -997,4 +1007,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ ==== //depot/projects/vap/bin/cp/cp.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $ .\" .Dd October 27, 2006 .Dt CP 1 @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -116,6 +116,10 @@ or .Xr pax 1 instead. +.It Fl a +Archive mode. +Same as +.Fl RpP . .It Fl f For each existing destination pathname, remove it and create a new file, without prompting for confirmation ==== //depot/projects/vap/bin/cp/cp.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); /* * Cp copies source files to target files. @@ -102,7 +102,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -119,6 +119,12 @@ case 'R': Rflag = 1; break; + case 'a': + Pflag = 1; + pflag = 1; + Rflag = 1; + Hflag = Lflag = 0; + break; case 'f': fflag = 1; iflag = nflag = 0; ==== //depot/projects/vap/bin/cp/utils.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.53 2008/03/10 19:58:41 jhb Exp $"); #include #include @@ -429,8 +429,8 @@ { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " "target_directory"); exit(EX_USAGE); } ==== //depot/projects/vap/bin/ps/ps.1#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.90 2008/03/12 10:01:34 jeff Exp $ .\" .Dd August 21, 2006 .Dt PS 1 @@ -290,7 +290,6 @@ .It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us" .It Dv "P_WEXIT" Ta No "0x02000 Working on exiting" .It Dv "P_EXEC" Ta No "0x04000 Process called exec" -.It Dv "P_SA" Ta No "0x08000 Using scheduler activations" .It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state" .It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP" .It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing" ==== //depot/projects/vap/etc/rc.d/mountlate#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.3 2008/03/06 14:39:33 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.5 2008/03/11 17:21:55 delphij Exp $ # # PROVIDE: mountlate @@ -33,6 +33,12 @@ stop_boot true ;; esac + + # If we booted a special kernel remove the record + # so we will boot the default kernel next time. + if [ -x /sbin/nextboot ]; then + /sbin/nextboot -D + fi } load_rc_config $name ==== //depot/projects/vap/etc/rc.d/root#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/root,v 1.16 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.17 2008/03/11 17:21:14 delphij Exp $ # # PROVIDE: root @@ -34,7 +34,7 @@ # If we booted a special kernel remove the record # so we will boot the default kernel next time. if [ -x /sbin/nextboot ]; then - /sbin/nextboot -D + /sbin/nextboot -D > /dev/null 2>&1 fi } ==== //depot/projects/vap/lib/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $ .include @@ -34,7 +34,7 @@ ${_libgssapi} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ + libpmc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -104,10 +104,6 @@ _libsmb= libsmb .endif -.if ${MK_LIBKSE} != "no" -_libkse= libkse -.endif - .if ${MK_LIBTHR} != "no" _libthr= libthr .endif ==== //depot/projects/vap/lib/libalias/libalias/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.4 2007/06/18 18:47:53 rafan Exp $ +# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.5 2008/03/12 11:58:28 piso Exp $ .PATH: ${.CURDIR}/../../../sys/netinet/libalias @@ -6,7 +6,7 @@ SHLIBDIR?= /lib SHLIB_MAJOR= 6 MAN= libalias.3 -SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c +SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c INCS= alias.h WARNS?= 6 NO_WERROR= ==== //depot/projects/vap/lib/libarchive/archive_entry.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.15 2007/07/15 19:10:34 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.16 2008/03/10 14:44:40 jkoshy Exp $ .\" .Dd December 15, 2003 .Dt archive_entry 3 @@ -101,17 +101,47 @@ .Sh SYNOPSIS .In archive_entry.h .Ft void -.Fn archive_entry_acl_add_entry "struct archive_entry *" "int type" "int permset" "int tag" "int qual" "const char *name" +.Fo archive_entry_acl_add_entry +.Fa "struct archive_entry *" +.Fa "int type" +.Fa "int permset" +.Fa "int tag" +.Fa "int qual" +.Fa "const char *name" +.Fc .Ft void -.Fn archive_entry_acl_add_entry_w "struct archive_entry *" "int type" "int permset" "int tag" "int qual" "const wchar_t *name" +.Fo archive_entry_acl_add_entry_w +.Fa "struct archive_entry *" +.Fa "int type" +.Fa "int permset" +.Fa "int tag" +.Fa "int qual" +.Fa "const wchar_t *name" +.Fc .Ft void .Fn archive_entry_acl_clear "struct archive_entry *" .Ft int .Fn archive_entry_acl_count "struct archive_entry *" "int type" .Ft int -.Fn archive_entry_acl_next "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const char **name" +.Fo archive_entry_acl_next +.Fa "struct archive_entry *" +.Fa "int want_type" +.Fa "int *type" +.Fa "int *permset" +.Fa "int *tag" +.Fa "int *qual" +.Fa "const char **name" +.Fc .Ft int -.Fn archive_entry_acl_next_w "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const wchar_t **name" +.Fo archive_entry_acl_next_w +.Fa "struct archive_entry *" +.Fa "int want_type" +.Fa "int *type" +.Fa "int *permset" +.Fa "int *tag" +.Fa "int *qual" +.Fa "const wchar_t **name" +.Fc .Ft int .Fn archive_entry_acl_reset "struct archive_entry *" "int want_type" .Ft const wchar_t * @@ -155,7 +185,11 @@ .Ft mode_t .Fn archive_entry_filetype "struct archive_entry *" .Ft void -.Fn archive_entry_fflags "struct archive_entry *" "unsigned long *set" "unsigned long *clear" +.Fo archive_entry_fflags +.Fa "struct archive_entry *" +.Fa "unsigned long *set" +.Fa "unsigned long *clear" +.Fc .Ft const char * .Fn archive_entry_fflags_text "struct archive_entry *" .Ft void @@ -195,7 +229,11 @@ .Ft void .Fn archive_entry_set_filetype "struct archive_entry *" "unsigned int" .Ft void -.Fn archive_entry_set_fflags "struct archive_entry *" "unsigned long set" "unsigned long clear" +.Fo archive_entry_set_fflags +.Fa "struct archive_entry *" +.Fa "unsigned long set" +.Fa "unsigned long clear" +.Fc .Ft void .Fn archive_entry_set_gid "struct archive_entry *" "gid_t" .Ft void ==== //depot/projects/vap/lib/libarchive/archive_entry.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.45 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.47 2008/03/12 04:47:37 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -1124,6 +1124,11 @@ entry->acl_p = entry->acl_p->next; if (entry->acl_p == NULL) { entry->acl_state = 0; + *type = 0; + *permset = 0; + *tag = 0; + *id = -1; + *name = NULL; return (ARCHIVE_EOF); /* End of ACL entries. */ } *type = entry->acl_p->type; @@ -1505,7 +1510,7 @@ return (ARCHIVE_OK); } else { *name = NULL; - *name = NULL; + *value = NULL; *size = (size_t)0; return (ARCHIVE_WARN); } ==== //depot/projects/vap/lib/libarchive/archive_read.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.35 2007/09/19 16:37:45 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.36 2008/03/10 14:45:29 jkoshy Exp $ .\" .Dd August 19, 2006 .Dt archive_read 3 @@ -75,7 +75,10 @@ .Ft int .Fn archive_read_support_compression_none "struct archive *" .Ft int -.Fn archive_read_support_compression_program "struct archive *" "const char *cmd" +.Fo archive_read_support_compression_program +.Fa "struct archive *" +.Fa "const char *cmd" +.Fc .Ft int .Fn archive_read_support_format_all "struct archive *" .Ft int @@ -89,15 +92,32 @@ .Ft int .Fn archive_read_support_format_zip "struct archive *" .Ft int -.Fn archive_read_open "struct archive *" "void *client_data" "archive_open_callback *" "archive_read_callback *" "archive_close_callback *" +.Fo archive_read_open +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "archive_open_callback *" +.Fa "archive_read_callback *" +.Fa "archive_close_callback *" +.Fc .Ft int -.Fn archive_read_open2 "struct archive *" "void *client_data" "archive_open_callback *" "archive_read_callback *" "archive_skip_callback *" "archive_close_callback *" +.Fo archive_read_open2 +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "archive_open_callback *" +.Fa "archive_read_callback *" +.Fa "archive_skip_callback *" +.Fa "archive_close_callback *" +.Fc .Ft int .Fn archive_read_open_FILE "struct archive *" "FILE *file" .Ft int .Fn archive_read_open_fd "struct archive *" "int fd" "size_t block_size" .Ft int -.Fn archive_read_open_filename "struct archive *" "const char *filename" "size_t block_size" +.Fo archive_read_open_filename +.Fa "struct archive *" +.Fa "const char *filename" +.Fa "size_t block_size" +.Fc .Ft int .Fn archive_read_open_memory "struct archive *" "void *buff" "size_t size" .Ft int @@ -105,7 +125,12 @@ .Ft ssize_t .Fn archive_read_data "struct archive *" "void *buff" "size_t len" .Ft int -.Fn archive_read_data_block "struct archive *" "const void **buff" "size_t *len" "off_t *offset" +.Fo archive_read_data_block +.Fa "struct archive *" +.Fa "const void **buff" +.Fa "size_t *len" +.Fa "off_t *offset" +.Fc .Ft int .Fn archive_read_data_skip "struct archive *" .\" #if ARCHIVE_API_VERSION < 3 @@ -115,9 +140,17 @@ .Ft int .Fn archive_read_data_into_fd "struct archive *" "int fd" .Ft int -.Fn archive_read_extract "struct archive *" "struct archive_entry *" "int flags" +.Fo archive_read_extract +.Fa "struct archive *" +.Fa "struct archive_entry *" +.Fa "int flags" +.Fc .Ft void -.Fn archive_read_extract_set_progress_callback "struct archive *" "void (*func)(void *)" "void *user_data" +.Fo archive_read_extract_set_progress_callback +.Fa "struct archive *" +.Fa "void (*func)(void *)" +.Fa "void *user_data" +.Fc .Ft int .Fn archive_read_close "struct archive *" .Ft int @@ -136,7 +169,13 @@ Allocates and initializes a .Tn struct archive object suitable for reading from an archive. -.It Fn archive_read_support_compression_all , Fn archive_read_support_compression_bzip2 , Fn archive_read_support_compression_compress , Fn archive_read_support_compression_gzip , Fn archive_read_support_compression_none +.It Xo +.Fn archive_read_support_compression_all , +.Fn archive_read_support_compression_bzip2 , +.Fn archive_read_support_compression_compress , +.Fn archive_read_support_compression_gzip , +.Fn archive_read_support_compression_none +.Xc Enables auto-detection code and decompression support for the specified compression. Note that @@ -150,7 +189,14 @@ Note that this disables automatic detection of the compression format, so it makes no sense to specify this in conjunction with any other decompression option. -.It Fn archive_read_support_format_all , Fn archive_read_support_format_cpio , Fn archive_read_support_format_empty , Fn archive_read_support_format_iso9660 , Fn archive_read_support_format_tar, Fn archive_read_support_format_zip +.It Xo +.Fn archive_read_support_format_all , +.Fn archive_read_support_format_cpio , +.Fn archive_read_support_format_empty , +.Fn archive_read_support_format_iso9660 , +.Fn archive_read_support_format_tar , +.Fn archive_read_support_format_zip +.Xc Enables support---including auto-detection code---for the specified archive format. For example, @@ -311,14 +357,26 @@ .Bl -item -offset indent .It .Ft typedef ssize_t -.Fn archive_read_callback "struct archive *" "void *client_data" "const void **buffer" +.Fo archive_read_callback +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "const void **buffer" +.Fc .It .\" #if ARCHIVE_API_VERSION < 2 .Ft typedef int -.Fn archive_skip_callback "struct archive *" "void *client_data" "size_t request" +.Fo archive_skip_callback +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "size_t request" +.Fc .\" #else .\" .Ft typedef off_t -.\" .Fn archive_skip_callback "struct archive *" "void *client_data" "off_t request" +.\" .Fo archive_skip_callback +.\" .Fa "struct archive *" +.\" .Fa "void *client_data" +.\" .Fa "off_t request" +.\" .Fc .\" #endif .It .Ft typedef int ==== //depot/projects/vap/lib/libarchive/archive_read.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.37 2008/01/03 17:54:26 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.38 2008/03/12 04:58:32 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -64,26 +64,13 @@ archive_read_new(void) { struct archive_read *a; - unsigned char *nulls; a = (struct archive_read *)malloc(sizeof(*a)); if (a == NULL) return (NULL); memset(a, 0, sizeof(*a)); a->archive.magic = ARCHIVE_READ_MAGIC; - a->bytes_per_block = ARCHIVE_DEFAULT_BYTES_PER_BLOCK; - a->null_length = 1024; - nulls = (unsigned char *)malloc(a->null_length); - if (nulls == NULL) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate archive object 'nulls' element"); - free(a); - return (NULL); - } - memset(nulls, 0, a->null_length); - a->nulls = nulls; - a->archive.state = ARCHIVE_STATE_NEW; a->entry = archive_entry_new(); @@ -660,8 +647,6 @@ (a->formats[i].cleanup)(a); } - /* Casting a pointer to int allows us to remove 'const.' */ - free((void *)(uintptr_t)(const void *)a->nulls); archive_string_free(&a->archive.error_string); if (a->entry) archive_entry_free(a->entry); ==== //depot/projects/vap/lib/libarchive/archive_read_private.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.4 2008/01/03 17:54:26 des Exp $ + * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.5 2008/03/12 04:58:32 kientzle Exp $ */ #ifndef ARCHIVE_READ_PRIVATE_H_INCLUDED @@ -41,10 +41,6 @@ dev_t skip_file_dev; ino_t skip_file_ino; - /* Utility: Pointer to a block of nulls. */ - const unsigned char *nulls; - size_t null_length; - /* * Used by archive_read_data() to track blocks and copy * data to client buffers, filling gaps with zero bytes. @@ -58,30 +54,9 @@ archive_open_callback *client_opener; archive_read_callback *client_reader; archive_skip_callback *client_skipper; - archive_write_callback *client_writer; archive_close_callback *client_closer; void *client_data; - /* - * Blocking information. Note that bytes_in_last_block is - * misleadingly named; I should find a better name. These - * control the final output from all compressors, including - * compression_none. - */ - int bytes_per_block; - int bytes_in_last_block; - - /* - * These control whether data within a gzip/bzip2 compressed - * stream gets padded or not. If pad_uncompressed is set, - * the data will be padded to a full block before being - * compressed. The pad_uncompressed_byte determines the value - * that will be used for padding. Note that these have no - * effect on compression "none." - */ - int pad_uncompressed; - int pad_uncompressed_byte; /* TODO: Support this. */ - /* File offset of beginning of most recently-read header. */ off_t header_position; @@ -142,18 +117,6 @@ struct archive_format_descriptor *format; /* Active format. */ /* - * Pointers to format-specific functions for writing. They're - * initialized by archive_write_set_format_XXX() calls. - */ - int (*format_init)(struct archive *); /* Only used on write. */ - int (*format_finish)(struct archive *); - int (*format_finish_entry)(struct archive *); - int (*format_write_header)(struct archive *, - struct archive_entry *); - ssize_t (*format_write_data)(struct archive *, - const void *buff, size_t); - - /* * Various information needed by archive_extract. */ struct extract *extract; ==== //depot/projects/vap/lib/libarchive/archive_util.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_util.3,v 1.7 2007/05/29 01:00:19 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_util.3,v 1.8 2008/03/10 14:44:40 jkoshy Exp $ .\" .Dd January 8, 2005 .Dt archive_util 3 @@ -57,7 +57,12 @@ .Ft const char * .Fn archive_format_name "struct archive *" .Ft void -.Fn archive_set_error "struct archive *" "int error_code" "const char *fmt" "..." +.Fo archive_set_error +.Fa "struct archive *" +.Fa "int error_code" +.Fa "const char *fmt" +.Fa "..." +.Fc .Sh DESCRIPTION These functions provide access to various information about the .Tn struct archive ==== //depot/projects/vap/lib/libarchive/archive_write.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.22 2007/05/29 01:00:19 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.23 2008/03/10 14:44:41 jkoshy Exp $ .\" .Dd August 19, 2006 .Dt archive_write 3 @@ -70,7 +70,10 @@ .Ft int .Fn archive_write_set_compression_none "struct archive *" .Ft int -.Fn archive_write_set_compression_program "struct archive *" "const char * cmd" +.Fo archive_write_set_compression_program +.Fa "struct archive *" +.Fa "const char * cmd" +.Fc .Ft int .Fn archive_write_set_format_cpio "struct archive *" .Ft int @@ -84,7 +87,13 @@ .Ft int .Fn archive_write_set_format_ustar "struct archive *" .Ft int -.Fn archive_write_open "struct archive *" "void *client_data" "archive_open_callback *" "archive_write_callback *" "archive_close_callback *" +.Fo archive_write_open +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "archive_open_callback *" +.Fa "archive_write_callback *" +.Fa "archive_close_callback *" +.Fc .Ft int .Fn archive_write_open_fd "struct archive *" "int fd" .Ft int @@ -92,7 +101,12 @@ .Ft int .Fn archive_write_open_filename "struct archive *" "const char *filename" .Ft int -.Fn archive_write_open_memory "struct archive *" "void *buffer" "size_t bufferSize" "size_t *outUsed" +.Fo archive_write_open_memory +.Fa "struct archive *" +.Fa "void *buffer" +.Fa "size_t bufferSize" +.Fa "size_t *outUsed" +.Fc .Ft int .Fn archive_write_header "struct archive *" "struct archive_entry *" .Ft ssize_t @@ -150,7 +164,14 @@ .It Fn archive_write_get_bytes_in_last_block Retrieve the currently-set value for last block size. A value of -1 here indicates that the library should use default values. -.It Fn archive_write_set_format_cpio , Fn archive_write_set_format_pax , Fn archive_write_set_format_pax_restricted , Fn archive_write_set_format_shar , Fn archive_write_set_format_shar_binary , Fn archive_write_set_format_ustar +.It Xo +.Fn archive_write_set_format_cpio , +.Fn archive_write_set_format_pax , +.Fn archive_write_set_format_pax_restricted , +.Fn archive_write_set_format_shar , +.Fn archive_write_set_format_shar_binary , +.Fn archive_write_set_format_ustar +.Xc Sets the format that will be used for the archive. The library can write POSIX octet-oriented cpio format archives, @@ -174,7 +195,11 @@ is the library default; this is the same as pax format, but suppresses the pax extended header for most normal files. In most cases, this will result in ordinary ustar archives. -.It Fn archive_write_set_compression_bzip2 , Fn archive_write_set_compression_gzip , Fn archive_write_set_compression_none +.It Xo +.Fn archive_write_set_compression_bzip2 , +.Fn archive_write_set_compression_gzip , +.Fn archive_write_set_compression_none +.Xc The resulting archive will be compressed as specified. Note that the compressed output is always properly blocked. .It Fn archive_write_set_compression_program @@ -310,7 +335,12 @@ .Bl -item -offset indent .It .Ft typedef ssize_t -.Fn archive_write_callback "struct archive *" "void *client_data" "void *buffer" "size_t length" +.Fo archive_write_callback +.Fa "struct archive *" +.Fa "void *client_data" +.Fa "void *buffer" +.Fa "size_t length" +.Fc .El .Pp The write callback is invoked whenever the library ==== //depot/projects/vap/lib/libarchive/archive_write_disk.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_write_disk.3,v 1.1 2007/03/03 07:37:36 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_write_disk.3,v 1.2 2008/03/10 14:44:41 jkoshy Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 12 21:28:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBCB81065672; Wed, 12 Mar 2008 21:28:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B3101065685 for ; Wed, 12 Mar 2008 21:28:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 926FC8FC16 for ; Wed, 12 Mar 2008 21:28:52 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2CLSqM6014811 for ; Wed, 12 Mar 2008 21:28:52 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2CLSqtc014809 for perforce@freebsd.org; Wed, 12 Mar 2008 21:28:52 GMT (envelope-from sam@freebsd.org) Date: Wed, 12 Mar 2008 21:28:52 GMT Message-Id: <200803122128.m2CLSqtc014809@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 137548 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, 12 Mar 2008 21:28:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=137548 Change 137548 by sam@sam_ebb on 2008/03/12 21:28:39 IFC Affected files ... .. //depot/projects/vap/sys/conf/files#23 edit .. //depot/projects/vap/sys/conf/options#14 edit Differences ... ==== //depot/projects/vap/sys/conf/files#23 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1278 2008/03/06 08:09:44 rink Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1280 2008/03/12 10:11:56 jeff Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1188,6 +1188,7 @@ dev/utopia/utopia.c optional utopia dev/vge/if_vge.c optional vge dev/vkbd/vkbd.c optional vkbd +dev/vr/if_vr.c optional vr pci dev/vx/if_vx.c optional vx dev/vx/if_vx_eisa.c optional vx eisa dev/vx/if_vx_pci.c optional vx pci @@ -1464,7 +1465,6 @@ kern/kern_idle.c standard kern/kern_intr.c standard kern/kern_jail.c standard -kern/kern_kse.c standard kern/kern_kthread.c standard kern/kern_ktr.c optional ktr kern/kern_ktrace.c standard @@ -2062,7 +2062,6 @@ pci/if_sis.c optional sis pci pci/if_ste.c optional ste pci pci/if_tl.c optional tl pci -pci/if_vr.c optional vr pci pci/if_wb.c optional wb pci pci/if_xl.c optional xl pci pci/intpm.c optional intpm pci ==== //depot/projects/vap/sys/conf/options#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.619 2008/03/02 00:52:49 marcel Exp $ +# $FreeBSD: src/sys/conf/options,v 1.620 2008/03/12 10:11:56 jeff Exp $ # # On the handling of kernel options # @@ -104,7 +104,6 @@ GEOM_VIRSTOR opt_geom.h GEOM_VOL opt_geom.h GEOM_ZERO opt_geom.h -KSE opt_global.h KSTACK_MAX_PAGES KSTACK_PAGES KTRACE From owner-p4-projects@FreeBSD.ORG Thu Mar 13 03:09:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BF4A1065673; Thu, 13 Mar 2008 03:09:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9EEC2106566B for ; Thu, 13 Mar 2008 03:09:57 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9F4BC8FC14 for ; Thu, 13 Mar 2008 03:09:57 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2D39vhs057858 for ; Thu, 13 Mar 2008 03:09:57 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2D39uYS057856 for perforce@freebsd.org; Thu, 13 Mar 2008 03:09:56 GMT (envelope-from marcel@freebsd.org) Date: Thu, 13 Mar 2008 03:09:56 GMT Message-Id: <200803130309.m2D39uYS057856@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 137565 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, 13 Mar 2008 03:09:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=137565 Change 137565 by marcel@marcel_xcllnt on 2008/03/13 03:09:01 IFC @137564 Affected files ... .. //depot/projects/powerpc/ObsoleteFiles.inc#16 integrate .. //depot/projects/powerpc/UPDATING#17 integrate .. //depot/projects/powerpc/bin/chflags/chflags.1#3 integrate .. //depot/projects/powerpc/bin/chflags/chflags.c#2 integrate .. //depot/projects/powerpc/bin/cp/cp.1#2 integrate .. //depot/projects/powerpc/bin/cp/cp.c#3 integrate .. //depot/projects/powerpc/bin/cp/utils.c#2 integrate .. //depot/projects/powerpc/bin/ps/ps.1#2 integrate .. //depot/projects/powerpc/bin/realpath/realpath.1#2 integrate .. //depot/projects/powerpc/bin/realpath/realpath.c#2 integrate .. //depot/projects/powerpc/bin/uuidgen/Makefile#1 branch .. //depot/projects/powerpc/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/powerpc/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/powerpc/contrib/tcsh/sh.lex.c#5 integrate .. //depot/projects/powerpc/etc/rc.d/mountlate#4 integrate .. //depot/projects/powerpc/etc/rc.d/root#4 integrate .. //depot/projects/powerpc/lib/Makefile#8 integrate .. //depot/projects/powerpc/lib/libalias/libalias/Makefile#3 integrate .. //depot/projects/powerpc/lib/libarchive/archive_entry.3#6 integrate .. //depot/projects/powerpc/lib/libarchive/archive_entry.c#9 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read.3#8 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read.c#9 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_private.h#5 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_ar.c#6 integrate .. //depot/projects/powerpc/lib/libarchive/archive_util.3#5 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write.3#5 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/Makefile#9 integrate .. //depot/projects/powerpc/lib/libarchive/test/main.c#8 integrate .. //depot/projects/powerpc/lib/libarchive/test/test.h#7 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_entry.c#3 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_ar.c#5 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_read_format_gtar_sparse.c#4 integrate .. //depot/projects/powerpc/lib/libarchive/test/test_write_format_ar.c#5 integrate .. //depot/projects/powerpc/lib/libc/gen/Makefile.inc#7 integrate .. //depot/projects/powerpc/lib/libc/gen/sem_timedwait.3#1 branch .. //depot/projects/powerpc/lib/libc/gen/sem_wait.3#2 integrate .. //depot/projects/powerpc/lib/libc/sys/Makefile.inc#8 integrate .. //depot/projects/powerpc/lib/libc/sys/Symbol.map#7 integrate .. //depot/projects/powerpc/lib/libc/sys/fcntl.2#3 integrate .. //depot/projects/powerpc/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/powerpc/lib/libkvm/kvm_proc.c#5 integrate .. //depot/projects/powerpc/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/powerpc/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/powerpc/lib/libsdp/sdp.h#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_sem.c#4 integrate .. //depot/projects/powerpc/lib/libthread_db/Makefile#4 integrate .. //depot/projects/powerpc/lib/libutil/humanize_number.c#2 integrate .. //depot/projects/powerpc/release/doc/share/misc/dev.archlist.txt#11 integrate .. //depot/projects/powerpc/sbin/mount/mount.8#5 integrate .. //depot/projects/powerpc/share/man/man4/uart.4#2 integrate .. //depot/projects/powerpc/share/man/man4/vr.4#3 integrate .. //depot/projects/powerpc/share/man/man9/DEVICE_PROBE.9#2 integrate .. //depot/projects/powerpc/share/misc/committers-ports.dot#10 integrate .. //depot/projects/powerpc/share/zoneinfo/leapseconds#6 integrate .. //depot/projects/powerpc/share/zoneinfo/southamerica#6 integrate .. //depot/projects/powerpc/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/powerpc/sys/amd64/amd64/legacy.c#4 integrate .. //depot/projects/powerpc/sys/amd64/amd64/machdep.c#12 integrate .. //depot/projects/powerpc/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/powerpc/sys/amd64/amd64/mp_machdep.c#9 integrate .. //depot/projects/powerpc/sys/amd64/amd64/trap.c#8 integrate .. //depot/projects/powerpc/sys/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/powerpc/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/powerpc/sys/amd64/include/specialreg.h#8 integrate .. //depot/projects/powerpc/sys/amd64/linux32/linux32_sysvec.c#7 integrate .. //depot/projects/powerpc/sys/arm/arm/busdma_machdep.c#9 integrate .. //depot/projects/powerpc/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/powerpc/sys/arm/arm/trap.c#6 integrate .. //depot/projects/powerpc/sys/arm/conf/AVILA#7 integrate .. //depot/projects/powerpc/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/dev_net.c#4 integrate .. //depot/projects/powerpc/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/powerpc/sys/boot/powerpc/uboot/metadata.c#2 integrate .. //depot/projects/powerpc/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/powerpc/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/powerpc/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/powerpc/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/powerpc/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/powerpc/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_sysvec.c#5 integrate .. //depot/projects/powerpc/sys/conf/NOTES#22 integrate .. //depot/projects/powerpc/sys/conf/files#25 integrate .. //depot/projects/powerpc/sys/conf/options#24 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi_cpu.c#12 integrate .. //depot/projects/powerpc/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/powerpc/sys/dev/bge/if_bge.c#18 integrate .. //depot/projects/powerpc/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/powerpc/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/powerpc/sys/dev/msk/if_msk.c#14 integrate .. //depot/projects/powerpc/sys/dev/mxge/if_mxge.c#14 integrate .. //depot/projects/powerpc/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/powerpc/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/powerpc/sys/dev/uart/uart.h#4 integrate .. //depot/projects/powerpc/sys/dev/uart/uart_dev_ns8250.c#5 integrate .. //depot/projects/powerpc/sys/dev/usb/ehci_pci.c#7 integrate .. //depot/projects/powerpc/sys/dev/usb/ums.c#10 integrate .. //depot/projects/powerpc/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/powerpc/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/powerpc/sys/dev/wpi/if_wpi.c#5 integrate .. //depot/projects/powerpc/sys/dev/wpi/if_wpireg.h#3 integrate .. //depot/projects/powerpc/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/powerpc/sys/fs/fifofs/fifo_vnops.c#11 integrate .. //depot/projects/powerpc/sys/fs/procfs/procfs_ctl.c#6 integrate .. //depot/projects/powerpc/sys/fs/procfs/procfs_dbregs.c#6 integrate .. //depot/projects/powerpc/sys/fs/procfs/procfs_status.c#7 integrate .. //depot/projects/powerpc/sys/i386/conf/DEFAULTS#4 integrate .. //depot/projects/powerpc/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/powerpc/sys/i386/i386/i686_mem.c#4 integrate .. //depot/projects/powerpc/sys/i386/i386/k6_mem.c#4 integrate .. //depot/projects/powerpc/sys/i386/i386/legacy.c#4 integrate .. //depot/projects/powerpc/sys/i386/i386/mp_machdep.c#14 integrate .. //depot/projects/powerpc/sys/i386/i386/sys_machdep.c#8 integrate .. //depot/projects/powerpc/sys/i386/i386/trap.c#12 integrate .. //depot/projects/powerpc/sys/i386/i386/vm_machdep.c#11 integrate .. //depot/projects/powerpc/sys/i386/ibcs2/imgact_coff.c#8 integrate .. //depot/projects/powerpc/sys/i386/include/specialreg.h#9 integrate .. //depot/projects/powerpc/sys/i386/linux/linux_sysvec.c#7 integrate .. //depot/projects/powerpc/sys/ia64/conf/DEFAULTS#5 integrate .. //depot/projects/powerpc/sys/ia64/ia64/machdep.c#15 integrate .. //depot/projects/powerpc/sys/ia64/ia64/trap.c#9 integrate .. //depot/projects/powerpc/sys/ia64/include/ucontext.h#4 integrate .. //depot/projects/powerpc/sys/kern/imgact_elf.c#10 integrate .. //depot/projects/powerpc/sys/kern/init_sysent.c#11 integrate .. //depot/projects/powerpc/sys/kern/kern_clock.c#13 integrate .. //depot/projects/powerpc/sys/kern/kern_condvar.c#9 integrate .. //depot/projects/powerpc/sys/kern/kern_descrip.c#17 integrate .. //depot/projects/powerpc/sys/kern/kern_exec.c#13 integrate .. //depot/projects/powerpc/sys/kern/kern_fork.c#13 integrate .. //depot/projects/powerpc/sys/kern/kern_intr.c#13 integrate .. //depot/projects/powerpc/sys/kern/kern_kse.c#9 delete .. //depot/projects/powerpc/sys/kern/kern_proc.c#11 integrate .. //depot/projects/powerpc/sys/kern/kern_resource.c#14 integrate .. //depot/projects/powerpc/sys/kern/kern_sig.c#15 integrate .. //depot/projects/powerpc/sys/kern/kern_switch.c#11 integrate .. //depot/projects/powerpc/sys/kern/kern_sx.c#14 integrate .. //depot/projects/powerpc/sys/kern/kern_synch.c#14 integrate .. //depot/projects/powerpc/sys/kern/kern_thread.c#14 integrate .. //depot/projects/powerpc/sys/kern/kern_timeout.c#9 integrate .. //depot/projects/powerpc/sys/kern/p1003_1b.c#5 integrate .. //depot/projects/powerpc/sys/kern/sched_4bsd.c#13 integrate .. //depot/projects/powerpc/sys/kern/sched_ule.c#15 integrate .. //depot/projects/powerpc/sys/kern/subr_bus.c#10 integrate .. //depot/projects/powerpc/sys/kern/subr_sleepqueue.c#9 integrate .. //depot/projects/powerpc/sys/kern/subr_smp.c#10 integrate .. //depot/projects/powerpc/sys/kern/subr_trap.c#11 integrate .. //depot/projects/powerpc/sys/kern/subr_witness.c#18 integrate .. //depot/projects/powerpc/sys/kern/sys_process.c#8 integrate .. //depot/projects/powerpc/sys/kern/syscalls.c#11 integrate .. //depot/projects/powerpc/sys/kern/syscalls.master#12 integrate .. //depot/projects/powerpc/sys/kern/systrace_args.c#8 integrate .. //depot/projects/powerpc/sys/modules/vr/Makefile#4 integrate .. //depot/projects/powerpc/sys/net/bpf_filter.c#7 integrate .. //depot/projects/powerpc/sys/netgraph/netgraph.h#8 integrate .. //depot/projects/powerpc/sys/netgraph/ng_base.c#15 integrate .. //depot/projects/powerpc/sys/netgraph/ng_l2tp.c#5 integrate .. //depot/projects/powerpc/sys/netgraph/ng_socket.c#8 integrate .. //depot/projects/powerpc/sys/netinet/libalias/alias.c#4 integrate .. //depot/projects/powerpc/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/powerpc/sys/netinet/libalias/alias_old.c#2 delete .. //depot/projects/powerpc/sys/netinet/tcp_output.c#13 integrate .. //depot/projects/powerpc/sys/netsmb/smb_conn.h#5 integrate .. //depot/projects/powerpc/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/powerpc/sys/pc98/conf/GENERIC#12 integrate .. //depot/projects/powerpc/sys/pc98/pc98/machdep.c#12 integrate .. //depot/projects/powerpc/sys/pci/if_vr.c#9 delete .. //depot/projects/powerpc/sys/pci/if_vrreg.h#6 delete .. //depot/projects/powerpc/sys/powerpc/aim/trap.c#4 integrate .. //depot/projects/powerpc/sys/powerpc/aim/vm_machdep.c#4 integrate .. //depot/projects/powerpc/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/powerpc/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/powerpc/sys/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/powerpc/sys/powerpc/conf/DEFAULTS#4 integrate .. //depot/projects/powerpc/sys/powerpc/include/bootinfo.h#5 integrate .. //depot/projects/powerpc/sys/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/powerpc/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/powerpc/sys/powerpc/powerpc/intr_machdep.c#9 integrate .. //depot/projects/powerpc/sys/security/audit/audit_worker.c#8 integrate .. //depot/projects/powerpc/sys/sparc64/conf/DEFAULTS#4 integrate .. //depot/projects/powerpc/sys/sparc64/conf/GENERIC#13 integrate .. //depot/projects/powerpc/sys/sparc64/include/tlb.h#5 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/cache.c#3 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/iommu.c#5 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/mp_machdep.c#6 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/pmap.c#12 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/tlb.c#3 integrate .. //depot/projects/powerpc/sys/sparc64/sparc64/trap.c#8 integrate .. //depot/projects/powerpc/sys/sun4v/sun4v/mp_machdep.c#6 integrate .. //depot/projects/powerpc/sys/sys/bus.h#6 integrate .. //depot/projects/powerpc/sys/sys/condvar.h#6 integrate .. //depot/projects/powerpc/sys/sys/cpuset.h#3 integrate .. //depot/projects/powerpc/sys/sys/disklabel.h#6 integrate .. //depot/projects/powerpc/sys/sys/fcntl.h#5 integrate .. //depot/projects/powerpc/sys/sys/kse.h#3 delete .. //depot/projects/powerpc/sys/sys/param.h#17 integrate .. //depot/projects/powerpc/sys/sys/proc.h#21 integrate .. //depot/projects/powerpc/sys/sys/sched.h#5 integrate .. //depot/projects/powerpc/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/powerpc/sys/sys/syscall.h#11 integrate .. //depot/projects/powerpc/sys/sys/syscall.mk#11 integrate .. //depot/projects/powerpc/sys/sys/sysproto.h#11 integrate .. //depot/projects/powerpc/sys/sys/systm.h#14 integrate .. //depot/projects/powerpc/sys/ufs/ffs/ffs_softdep.c#13 integrate .. //depot/projects/powerpc/sys/vm/vm_fault.c#13 integrate .. //depot/projects/powerpc/sys/vm/vm_glue.c#10 integrate .. //depot/projects/powerpc/sys/vm/vm_map.c#11 integrate .. //depot/projects/powerpc/sys/vm/vm_meter.c#9 integrate .. //depot/projects/powerpc/tools/build/mk/OptionalObsoleteFiles.inc#8 integrate .. //depot/projects/powerpc/tools/regression/file/dup/dup.c#2 integrate .. //depot/projects/powerpc/usr.bin/ar/ar.1#2 integrate .. //depot/projects/powerpc/usr.bin/ar/ar.c#3 integrate .. //depot/projects/powerpc/usr.bin/ar/ar.h#2 integrate .. //depot/projects/powerpc/usr.bin/ar/write.c#3 integrate .. //depot/projects/powerpc/usr.bin/cpuset/cpuset.1#2 integrate .. //depot/projects/powerpc/usr.bin/cpuset/cpuset.c#3 integrate .. //depot/projects/powerpc/usr.bin/gzip/gzip.c#4 integrate .. //depot/projects/powerpc/usr.bin/kdump/kdump.c#9 integrate .. //depot/projects/powerpc/usr.bin/kdump/kdump_subr.h#4 integrate .. //depot/projects/powerpc/usr.bin/kdump/mksubr#6 integrate .. //depot/projects/powerpc/usr.bin/make/globals.h#3 integrate .. //depot/projects/powerpc/usr.bin/make/hash_tables.c#2 integrate .. //depot/projects/powerpc/usr.bin/make/main.c#7 integrate .. //depot/projects/powerpc/usr.bin/make/make.1#6 integrate .. //depot/projects/powerpc/usr.bin/make/parse.c#4 integrate .. //depot/projects/powerpc/usr.bin/ministat/ministat.1#2 integrate .. //depot/projects/powerpc/usr.sbin/Makefile#8 integrate .. //depot/projects/powerpc/usr.sbin/bluetooth/sdpd/Makefile#2 integrate .. //depot/projects/powerpc/usr.sbin/bluetooth/sdpd/gn.c#1 branch .. //depot/projects/powerpc/usr.sbin/bluetooth/sdpd/nap.c#1 branch .. //depot/projects/powerpc/usr.sbin/bluetooth/sdpd/panu.c#1 branch .. //depot/projects/powerpc/usr.sbin/bluetooth/sdpd/profile.c#2 integrate .. //depot/projects/powerpc/usr.sbin/bluetooth/sdpd/profile.h#2 integrate .. //depot/projects/powerpc/usr.sbin/fifolog/Makefile#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/Makefile.inc#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/fifolog_create/Makefile#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/flint.lnt#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/lib/Makefile#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/lib/fifolog.h#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/lib/fifolog_create.c#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/lib/fifolog_int.c#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/lib/fifolog_write.h#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/lib/getdate.y#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/lib/libfifolog.h#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch .. //depot/projects/powerpc/usr.sbin/fifolog/lib/miniobj.h#1 branch .. //depot/projects/powerpc/usr.sbin/ppp/command.c#3 integrate .. //depot/projects/powerpc/usr.sbin/ppp/ipcp.c#2 integrate .. //depot/projects/powerpc/usr.sbin/ppp/main.c#2 integrate .. //depot/projects/powerpc/usr.sbin/ppp/nat_cmd.c#2 integrate Differences ... ==== //depot/projects/powerpc/ObsoleteFiles.inc#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -32,6 +32,11 @@ OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libkse.a +OLD_FILES+=usr/lib32/libkse_p.a +OLD_FILES+=usr/lib32/libkse_pic.a +.endif .endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h @@ -134,6 +139,12 @@ OLD_DIRS+=usr/include/netatm/uni OLD_DIRS+=usr/include/netatm OLD_DIRS+=usr/share/examples/atm +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libatm.a +OLD_FILES+=usr/lib32/libatm.so +OLD_LIBS+=usr/lib32/libatm.so.5 +OLD_FILES+=usr/lib32/libatm_p.a +.endif # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -224,6 +235,42 @@ OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libalias.so.5 +OLD_LIBS+=usr/lib32/libbsnmp.so.3 +OLD_LIBS+=usr/lib32/libdialog.so.5 +OLD_LIBS+=usr/lib32/libgnuregex.so.3 +OLD_LIBS+=usr/lib32/libhistory.so.6 +OLD_LIBS+=usr/lib32/libncurses.so.6 +OLD_LIBS+=usr/lib32/libncursesw.so.6 +OLD_LIBS+=usr/lib32/libpam.so.3 +OLD_LIBS+=usr/lib32/libreadline.so.6 +OLD_LIBS+=usr/lib32/libssh.so.3 +OLD_LIBS+=usr/lib32/pam_chroot.so.3 +OLD_LIBS+=usr/lib32/pam_deny.so.3 +OLD_LIBS+=usr/lib32/pam_echo.so.3 +OLD_LIBS+=usr/lib32/pam_exec.so.3 +OLD_LIBS+=usr/lib32/pam_ftpusers.so.3 +OLD_LIBS+=usr/lib32/pam_group.so.3 +OLD_LIBS+=usr/lib32/pam_guest.so.3 +OLD_LIBS+=usr/lib32/pam_krb5.so.3 +OLD_LIBS+=usr/lib32/pam_ksu.so.3 +OLD_LIBS+=usr/lib32/pam_lastlog.so.3 +OLD_LIBS+=usr/lib32/pam_login_access.so.3 +OLD_LIBS+=usr/lib32/pam_nologin.so.3 +OLD_LIBS+=usr/lib32/pam_opie.so.3 +OLD_LIBS+=usr/lib32/pam_opieaccess.so.3 +OLD_LIBS+=usr/lib32/pam_passwdqc.so.3 +OLD_LIBS+=usr/lib32/pam_permit.so.3 +OLD_LIBS+=usr/lib32/pam_radius.so.3 +OLD_LIBS+=usr/lib32/pam_rhosts.so.3 +OLD_LIBS+=usr/lib32/pam_rootok.so.3 +OLD_LIBS+=usr/lib32/pam_securetty.so.3 +OLD_LIBS+=usr/lib32/pam_self.so.3 +OLD_LIBS+=usr/lib32/pam_ssh.so.3 +OLD_LIBS+=usr/lib32/pam_tacplus.so.3 +OLD_LIBS+=usr/lib32/pam_unix.so.3 +.endif # 20070613: IPX over IP tunnel removal OLD_FILES+=usr/include/netipx/ipx_ip.h # 20070605: sched_core removal @@ -603,6 +650,9 @@ OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=usr/lib/libarchive.so.3 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libarchive.so.3 +.endif # 20070301: remove addr2ascii and ascii2addr OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz ==== //depot/projects/powerpc/UPDATING#17 (text+ko) ==== @@ -22,6 +22,16 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080312: + Support for KSE threading has been removed from the kernel. To + run legacy applications linked against KSE libmap.conf may + be used. The following libmap.conf may be used to ensure + compatibility with any prior release: + + libpthread.so.1 libthr.so.1 + libpthread.so.2 libthr.so.2 + libkse.so.3 libthr.so.3 + 20080301: The layout of struct vmspace has changed. This affects libkvm and any executables that link against libkvm and use the @@ -997,4 +1007,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ ==== //depot/projects/powerpc/bin/chflags/chflags.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.30 2008/03/09 12:10:24 rwatson Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -40,7 +40,7 @@ .Nd change file flags .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl fhv .Oo .Fl R .Op Fl H | Fl L | Fl P @@ -57,6 +57,12 @@ .Pp The options are as follows: .Bl -tag -width indent +.It Fl f +Do not display a diagnostic message if +.Nm +could not modify the flags for +.Va file , +nor modify the exit status to reflect such failures. .It Fl H If the .Fl R @@ -79,6 +85,14 @@ .It Fl R Change the file flags for the file hierarchies rooted in the files instead of just the files themselves. +.It Fl v +Cause +.Nm +to be verbose, showing filenames as the flags are modified. +If the +.Fl v +option is specified more than once, the old and new flags of the file +will also be printed, in octal notation. .El .Pp The flags are specified as an octal number or a comma separated list ==== //depot/projects/powerpc/bin/chflags/chflags.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.24 2008/03/09 12:10:24 rwatson Exp $"); #include #include @@ -60,14 +60,15 @@ { FTS *ftsp; FTSENT *p; - u_long clear, set; + u_long clear, newflags, set; long val; - int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval; + int Hflag, Lflag, Rflag, fflag, hflag, vflag; + int ch, fts_options, oct, rval; char *flags, *ep; int (*change_flags)(const char *, unsigned long); - Hflag = Lflag = Rflag = hflag = 0; - while ((ch = getopt(argc, argv, "HLPRh")) != -1) + Hflag = Lflag = Rflag = fflag = hflag = vflag = 0; + while ((ch = getopt(argc, argv, "HLPRfhv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -83,9 +84,15 @@ case 'R': Rflag = 1; break; + case 'f': + fflag = 1; + break; case 'h': hflag = 1; break; + case 'v': + vflag++; + break; case '?': default: usage(); @@ -166,18 +173,23 @@ default: break; } - if (oct) { - if (!(*change_flags)(p->fts_accpath, set)) - continue; - } else { - p->fts_statp->st_flags |= set; - p->fts_statp->st_flags &= clear; - if (!(*change_flags)(p->fts_accpath, - (u_long)p->fts_statp->st_flags)) - continue; + if (oct) + newflags = set; + else + newflags = (p->fts_statp->st_flags | set) & clear; + if (newflags == p->fts_statp->st_flags) + continue; + if ((*change_flags)(p->fts_accpath, newflags) && !fflag) { + warn("%s", p->fts_path); + rval = 1; + } else if (vflag) { + (void)printf("%s", p->fts_path); + if (vflag > 1) + (void)printf(": 0%lo -> 0%lo", + (u_long)p->fts_statp->st_flags, + newflags); + (void)printf("\n"); } - warn("%s", p->fts_path); - rval = 1; } if (errno) err(1, "fts_read"); @@ -188,6 +200,6 @@ usage(void) { (void)fprintf(stderr, - "usage: chflags [-h] [-R [-H | -L | -P]] flags file ...\n"); + "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n"); exit(1); } ==== //depot/projects/powerpc/bin/cp/cp.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $ .\" .Dd October 27, 2006 .Dt CP 1 @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -116,6 +116,10 @@ or .Xr pax 1 instead. +.It Fl a +Archive mode. +Same as +.Fl RpP . .It Fl f For each existing destination pathname, remove it and create a new file, without prompting for confirmation ==== //depot/projects/powerpc/bin/cp/cp.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); /* * Cp copies source files to target files. @@ -102,7 +102,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -119,6 +119,12 @@ case 'R': Rflag = 1; break; + case 'a': + Pflag = 1; + pflag = 1; + Rflag = 1; + Hflag = Lflag = 0; + break; case 'f': fflag = 1; iflag = nflag = 0; ==== //depot/projects/powerpc/bin/cp/utils.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.53 2008/03/10 19:58:41 jhb Exp $"); #include #include @@ -429,8 +429,8 @@ { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " "target_directory"); exit(EX_USAGE); } ==== //depot/projects/powerpc/bin/ps/ps.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.90 2008/03/12 10:01:34 jeff Exp $ .\" .Dd August 21, 2006 .Dt PS 1 @@ -290,7 +290,6 @@ .It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us" .It Dv "P_WEXIT" Ta No "0x02000 Working on exiting" .It Dv "P_EXEC" Ta No "0x04000 Process called exec" -.It Dv "P_SA" Ta No "0x08000 Using scheduler activations" .It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state" .It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP" .It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing" ==== //depot/projects/powerpc/bin/realpath/realpath.1#2 (text+ko) ==== @@ -31,7 +31,7 @@ .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp -.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.11 2008/03/09 12:46:39 rwatson Exp $ .\" .Dd November 24, 2000 .Dt REALPATH 1 @@ -41,7 +41,9 @@ .Nd return resolved physical path .Sh SYNOPSIS .Nm +.Op Fl q .Ar path +.Op Ar ... .Sh DESCRIPTION The .Nm @@ -55,6 +57,12 @@ .Pa /../ in .Ar path . +.Pp +If +.Fl q +is specified, warnings will not be printed when +.Xr realpath 3 +fails. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO ==== //depot/projects/powerpc/bin/realpath/realpath.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6 2004/04/06 20:06:50 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.7 2008/03/09 12:46:39 rwatson Exp $"); #include @@ -44,20 +44,39 @@ { char buf[PATH_MAX]; char *p; + int ch, i, qflag, rval; - if (argc == 2) { - if ((p = realpath(argv[1], buf)) == NULL) - err(1, "%s", buf); - } else + qflag = 0; + while ((ch = getopt(argc, argv, "q")) != -1) { + switch (ch) { + case 'q': + qflag = 1; + break; + case '?': + default: + usage(); + } + } + argc -= optind; + argv += optind; + if (argc < 1) usage(); - (void)printf("%s\n", p); - exit(0); + rval = 0; + for (i = 0; i < argc; i++) { + if ((p = realpath(argv[i], buf)) == NULL) { + if (!qflag) + warn("%s", argv[i]); + rval = 1; + } else + (void)printf("%s\n", p); + } + exit(rval); } static void usage(void) { - (void)fprintf(stderr, "usage: realpath path\n"); + (void)fprintf(stderr, "usage: realpath [-q] path [...]\n"); exit(1); } ==== //depot/projects/powerpc/contrib/tcsh/sh.lex.c#5 (text+ko) ==== @@ -851,7 +851,8 @@ return (en); } slhs.len = 0; - Strbuf_append(&slhs, lhsb.s); + if (lhsb.s != NULL && lhsb.len != 0) + Strbuf_append(&slhs, lhsb.s); Strbuf_terminate(&slhs); if (exclc) en = dosub(sc, en, global); ==== //depot/projects/powerpc/etc/rc.d/mountlate#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.3 2008/03/06 14:39:33 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.5 2008/03/11 17:21:55 delphij Exp $ # # PROVIDE: mountlate @@ -33,6 +33,12 @@ stop_boot true ;; esac + + # If we booted a special kernel remove the record + # so we will boot the default kernel next time. + if [ -x /sbin/nextboot ]; then + /sbin/nextboot -D + fi } load_rc_config $name ==== //depot/projects/powerpc/etc/rc.d/root#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/root,v 1.16 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.17 2008/03/11 17:21:14 delphij Exp $ # # PROVIDE: root @@ -34,7 +34,7 @@ # If we booted a special kernel remove the record # so we will boot the default kernel next time. if [ -x /sbin/nextboot ]; then - /sbin/nextboot -D + /sbin/nextboot -D > /dev/null 2>&1 fi } ==== //depot/projects/powerpc/lib/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $ .include @@ -34,7 +34,7 @@ ${_libgssapi} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ + libpmc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -104,10 +104,6 @@ _libsmb= libsmb .endif -.if ${MK_LIBKSE} != "no" -_libkse= libkse -.endif - .if ${MK_LIBTHR} != "no" _libthr= libthr .endif ==== //depot/projects/powerpc/lib/libalias/libalias/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.4 2007/06/18 18:47:53 rafan Exp $ +# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.5 2008/03/12 11:58:28 piso Exp $ .PATH: ${.CURDIR}/../../../sys/netinet/libalias @@ -6,7 +6,7 @@ SHLIBDIR?= /lib SHLIB_MAJOR= 6 MAN= libalias.3 -SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c +SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c INCS= alias.h WARNS?= 6 NO_WERROR= ==== //depot/projects/powerpc/lib/libarchive/archive_entry.3#6 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.15 2007/07/15 19:10:34 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.16 2008/03/10 14:44:40 jkoshy Exp $ .\" .Dd December 15, 2003 .Dt archive_entry 3 @@ -101,17 +101,47 @@ .Sh SYNOPSIS .In archive_entry.h .Ft void -.Fn archive_entry_acl_add_entry "struct archive_entry *" "int type" "int permset" "int tag" "int qual" "const char *name" +.Fo archive_entry_acl_add_entry +.Fa "struct archive_entry *" +.Fa "int type" +.Fa "int permset" +.Fa "int tag" +.Fa "int qual" +.Fa "const char *name" +.Fc .Ft void -.Fn archive_entry_acl_add_entry_w "struct archive_entry *" "int type" "int permset" "int tag" "int qual" "const wchar_t *name" +.Fo archive_entry_acl_add_entry_w +.Fa "struct archive_entry *" +.Fa "int type" +.Fa "int permset" +.Fa "int tag" +.Fa "int qual" +.Fa "const wchar_t *name" +.Fc .Ft void .Fn archive_entry_acl_clear "struct archive_entry *" .Ft int .Fn archive_entry_acl_count "struct archive_entry *" "int type" .Ft int -.Fn archive_entry_acl_next "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const char **name" +.Fo archive_entry_acl_next +.Fa "struct archive_entry *" +.Fa "int want_type" +.Fa "int *type" +.Fa "int *permset" +.Fa "int *tag" +.Fa "int *qual" +.Fa "const char **name" +.Fc .Ft int -.Fn archive_entry_acl_next_w "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const wchar_t **name" +.Fo archive_entry_acl_next_w +.Fa "struct archive_entry *" +.Fa "int want_type" +.Fa "int *type" +.Fa "int *permset" +.Fa "int *tag" +.Fa "int *qual" +.Fa "const wchar_t **name" +.Fc .Ft int .Fn archive_entry_acl_reset "struct archive_entry *" "int want_type" .Ft const wchar_t * @@ -155,7 +185,11 @@ .Ft mode_t .Fn archive_entry_filetype "struct archive_entry *" .Ft void -.Fn archive_entry_fflags "struct archive_entry *" "unsigned long *set" "unsigned long *clear" +.Fo archive_entry_fflags +.Fa "struct archive_entry *" +.Fa "unsigned long *set" +.Fa "unsigned long *clear" +.Fc .Ft const char * .Fn archive_entry_fflags_text "struct archive_entry *" .Ft void @@ -195,7 +229,11 @@ .Ft void .Fn archive_entry_set_filetype "struct archive_entry *" "unsigned int" .Ft void -.Fn archive_entry_set_fflags "struct archive_entry *" "unsigned long set" "unsigned long clear" +.Fo archive_entry_set_fflags +.Fa "struct archive_entry *" +.Fa "unsigned long set" +.Fa "unsigned long clear" +.Fc .Ft void .Fn archive_entry_set_gid "struct archive_entry *" "gid_t" .Ft void ==== //depot/projects/powerpc/lib/libarchive/archive_entry.c#9 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.45 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.47 2008/03/12 04:47:37 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -1124,6 +1124,11 @@ entry->acl_p = entry->acl_p->next; if (entry->acl_p == NULL) { entry->acl_state = 0; + *type = 0; + *permset = 0; + *tag = 0; + *id = -1; + *name = NULL; return (ARCHIVE_EOF); /* End of ACL entries. */ } *type = entry->acl_p->type; @@ -1505,7 +1510,7 @@ return (ARCHIVE_OK); } else { *name = NULL; - *name = NULL; + *value = NULL; *size = (size_t)0; return (ARCHIVE_WARN); } ==== //depot/projects/powerpc/lib/libarchive/archive_read.3#8 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.35 2007/09/19 16:37:45 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.36 2008/03/10 14:45:29 jkoshy Exp $ .\" .Dd August 19, 2006 .Dt archive_read 3 @@ -75,7 +75,10 @@ .Ft int .Fn archive_read_support_compression_none "struct archive *" .Ft int -.Fn archive_read_support_compression_program "struct archive *" "const char *cmd" +.Fo archive_read_support_compression_program +.Fa "struct archive *" +.Fa "const char *cmd" +.Fc .Ft int .Fn archive_read_support_format_all "struct archive *" .Ft int @@ -89,15 +92,32 @@ .Ft int .Fn archive_read_support_format_zip "struct archive *" .Ft int -.Fn archive_read_open "struct archive *" "void *client_data" "archive_open_callback *" "archive_read_callback *" "archive_close_callback *" +.Fo archive_read_open >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 13 03:23:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94D1A1065672; Thu, 13 Mar 2008 03:23:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51980106566C for ; Thu, 13 Mar 2008 03:23:12 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 50EC28FC1B for ; Thu, 13 Mar 2008 03:23:12 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2D3NCbB058279 for ; Thu, 13 Mar 2008 03:23:12 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2D3NBhS058277 for perforce@freebsd.org; Thu, 13 Mar 2008 03:23:11 GMT (envelope-from marcel@freebsd.org) Date: Thu, 13 Mar 2008 03:23:11 GMT Message-Id: <200803130323.m2D3NBhS058277@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 137566 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, 13 Mar 2008 03:23:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=137566 Change 137566 by marcel@marcel_xcllnt on 2008/03/13 03:22:22 IFC @137564 Affected files ... .. //depot/projects/bdb/ObsoleteFiles.inc#2 integrate .. //depot/projects/bdb/UPDATING#2 integrate .. //depot/projects/bdb/bin/chflags/chflags.1#2 integrate .. //depot/projects/bdb/bin/chflags/chflags.c#2 integrate .. //depot/projects/bdb/bin/cp/cp.1#2 integrate .. //depot/projects/bdb/bin/cp/cp.c#2 integrate .. //depot/projects/bdb/bin/cp/utils.c#2 integrate .. //depot/projects/bdb/bin/ps/ps.1#2 integrate .. //depot/projects/bdb/bin/realpath/realpath.1#2 integrate .. //depot/projects/bdb/bin/realpath/realpath.c#2 integrate .. //depot/projects/bdb/bin/uuidgen/Makefile#1 branch .. //depot/projects/bdb/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/bdb/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/bdb/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/bdb/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/bdb/etc/Makefile#2 integrate .. //depot/projects/bdb/etc/ddb.conf#1 branch .. //depot/projects/bdb/etc/defaults/rc.conf#2 integrate .. //depot/projects/bdb/etc/rc.d/Makefile#2 integrate .. //depot/projects/bdb/etc/rc.d/ddb#1 branch .. //depot/projects/bdb/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/bdb/etc/rc.d/mountlate#2 integrate .. //depot/projects/bdb/etc/rc.d/root#2 integrate .. //depot/projects/bdb/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/bdb/include/pthread_np.h#2 integrate .. //depot/projects/bdb/lib/Makefile#2 integrate .. //depot/projects/bdb/lib/libalias/libalias/Makefile#2 integrate .. //depot/projects/bdb/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/bdb/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/bdb/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/bdb/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/bdb/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/bdb/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/bdb/lib/libarchive/archive_util.3#2 integrate .. //depot/projects/bdb/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/bdb/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/bdb/lib/libarchive/test/Makefile#2 integrate .. //depot/projects/bdb/lib/libarchive/test/main.c#2 integrate .. //depot/projects/bdb/lib/libarchive/test/test.h#2 integrate .. //depot/projects/bdb/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/bdb/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate .. //depot/projects/bdb/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/bdb/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/bdb/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/bdb/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/bdb/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/bdb/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/bdb/lib/libc/gen/sem_timedwait.3#1 branch .. //depot/projects/bdb/lib/libc/gen/sem_wait.3#2 integrate .. //depot/projects/bdb/lib/libc/posix1e/mac.c#2 integrate .. //depot/projects/bdb/lib/libc/posix1e/mac_exec.c#2 integrate .. //depot/projects/bdb/lib/libc/posix1e/mac_get.c#2 integrate .. //depot/projects/bdb/lib/libc/posix1e/mac_set.c#2 integrate .. //depot/projects/bdb/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/bdb/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/bdb/lib/libc/sys/Symbol.map#2 integrate .. //depot/projects/bdb/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/bdb/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/bdb/lib/libelf/elf_update.c#2 integrate .. //depot/projects/bdb/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/bdb/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/bdb/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/bdb/lib/libsdp/sdp.h#2 integrate .. //depot/projects/bdb/lib/libthr/pthread.map#2 integrate .. //depot/projects/bdb/lib/libthr/thread/Makefile.inc#2 integrate .. //depot/projects/bdb/lib/libthr/thread/thr_affinity.c#1 branch .. //depot/projects/bdb/lib/libthr/thread/thr_attr.c#2 integrate .. //depot/projects/bdb/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/bdb/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/projects/bdb/lib/libthr/thread/thr_init.c#2 integrate .. //depot/projects/bdb/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/bdb/lib/libthr/thread/thr_sem.c#2 integrate .. //depot/projects/bdb/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/bdb/lib/libthread_db/Makefile#2 integrate .. //depot/projects/bdb/lib/libutil/humanize_number.c#2 integrate .. //depot/projects/bdb/lib/msun/ld128/s_nanl.c#2 integrate .. //depot/projects/bdb/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/bdb/rescue/rescue/Makefile#2 integrate .. //depot/projects/bdb/sbin/ddb/ddb.8#2 integrate .. //depot/projects/bdb/sbin/ddb/ddb.c#2 integrate .. //depot/projects/bdb/sbin/fsck_ffs/main.c#2 integrate .. //depot/projects/bdb/sbin/geom/Makefile#2 integrate .. //depot/projects/bdb/sbin/geom/class/label/geom_label.c#2 integrate .. //depot/projects/bdb/sbin/geom/class/multipath/gmultipath.8#2 integrate .. //depot/projects/bdb/sbin/geom/core/geom.8#2 integrate .. //depot/projects/bdb/sbin/geom/core/geom.c#2 integrate .. //depot/projects/bdb/sbin/mount/mount.8#2 integrate .. //depot/projects/bdb/sbin/newfs/mkfs.c#2 integrate .. //depot/projects/bdb/secure/usr.bin/ssh/Makefile#2 integrate .. //depot/projects/bdb/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/bdb/share/man/man3/Makefile#2 integrate .. //depot/projects/bdb/share/man/man4/Makefile#2 integrate .. //depot/projects/bdb/share/man/man4/cmx.4#1 branch .. //depot/projects/bdb/share/man/man4/ddb.4#2 integrate .. //depot/projects/bdb/share/man/man4/fwohci.4#2 integrate .. //depot/projects/bdb/share/man/man4/uart.4#2 integrate .. //depot/projects/bdb/share/man/man4/uslcom.4#1 branch .. //depot/projects/bdb/share/man/man4/vr.4#2 integrate .. //depot/projects/bdb/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/bdb/share/man/man9/DEVICE_PROBE.9#2 integrate .. //depot/projects/bdb/share/man/man9/bus_space.9#2 integrate .. //depot/projects/bdb/share/man/man9/lock.9#2 integrate .. //depot/projects/bdb/share/misc/committers-ports.dot#2 integrate .. //depot/projects/bdb/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/bdb/share/mk/sys.mk#2 integrate .. //depot/projects/bdb/share/zoneinfo/leapseconds#2 integrate .. //depot/projects/bdb/share/zoneinfo/southamerica#2 integrate .. //depot/projects/bdb/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/bdb/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/bdb/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/bdb/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/bdb/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/bdb/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/bdb/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/bdb/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/bdb/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/bdb/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/bdb/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/bdb/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/bdb/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/bdb/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/bdb/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/bdb/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/bdb/sys/arm/arm/trap.c#2 integrate .. //depot/projects/bdb/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/bdb/sys/arm/conf/AVILA#2 integrate .. //depot/projects/bdb/sys/arm/include/pmap.h#2 integrate .. //depot/projects/bdb/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/bdb/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/bdb/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/bdb/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/bdb/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/bdb/sys/boot/powerpc/uboot/metadata.c#2 integrate .. //depot/projects/bdb/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/bdb/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/bdb/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/bdb/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/bdb/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/bdb/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/bdb/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/bdb/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/bdb/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/bdb/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/bdb/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/bdb/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/bdb/sys/conf/NOTES#2 integrate .. //depot/projects/bdb/sys/conf/files#2 integrate .. //depot/projects/bdb/sys/conf/files.powerpc#2 integrate .. //depot/projects/bdb/sys/conf/kmod.mk#2 integrate .. //depot/projects/bdb/sys/conf/options#2 integrate .. //depot/projects/bdb/sys/conf/options.powerpc#2 integrate .. //depot/projects/bdb/sys/ddb/db_command.c#2 integrate .. //depot/projects/bdb/sys/ddb/db_examine.c#2 integrate .. //depot/projects/bdb/sys/ddb/db_input.c#2 integrate .. //depot/projects/bdb/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/bdb/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/bdb/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/bdb/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/bdb/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/bdb/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/bdb/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/bdb/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/bdb/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/bdb/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/bdb/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/bdb/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/bdb/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/bdb/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/bdb/sys/dev/hptrr/hptrr_os_bsd.c#2 integrate .. //depot/projects/bdb/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/bdb/sys/dev/hptrr/ldm.h#2 integrate .. //depot/projects/bdb/sys/dev/hptrr/osm.h#2 integrate .. //depot/projects/bdb/sys/dev/ic/quicc.h#1 branch .. //depot/projects/bdb/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/bdb/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/bdb/sys/dev/mii/ciphy.c#2 integrate .. //depot/projects/bdb/sys/dev/mii/miidevs#2 integrate .. //depot/projects/bdb/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/bdb/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/bdb/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/bdb/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/bdb/sys/dev/nfe/if_nfereg.h#2 integrate .. //depot/projects/bdb/sys/dev/nfe/if_nfevar.h#2 integrate .. //depot/projects/bdb/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/bdb/sys/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/bdb/sys/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/bdb/sys/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/bdb/sys/dev/quicc/quicc_core.c#1 branch .. //depot/projects/bdb/sys/dev/re/if_re.c#2 integrate .. //depot/projects/bdb/sys/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/bdb/sys/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/bdb/sys/dev/scc/scc_bus.h#2 integrate .. //depot/projects/bdb/sys/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/bdb/sys/dev/tsec/if_tsec.c#1 branch .. //depot/projects/bdb/sys/dev/tsec/if_tsec.h#1 branch .. //depot/projects/bdb/sys/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/bdb/sys/dev/uart/uart.h#2 integrate .. //depot/projects/bdb/sys/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/bdb/sys/dev/uart/uart_bus_scc.c#2 integrate .. //depot/projects/bdb/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/bdb/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/bdb/sys/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/bdb/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/bdb/sys/dev/usb/if_axe.c#2 integrate .. //depot/projects/bdb/sys/dev/usb/ums.c#2 integrate .. //depot/projects/bdb/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/bdb/sys/dev/usb/uslcom.c#1 branch .. //depot/projects/bdb/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/bdb/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/bdb/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/bdb/sys/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/bdb/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/bdb/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/bdb/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/bdb/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/bdb/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/bdb/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/bdb/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/bdb/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/bdb/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/bdb/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/bdb/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/bdb/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/bdb/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/bdb/sys/i386/i386/trap.c#2 integrate .. //depot/projects/bdb/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/bdb/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/bdb/sys/i386/include/_types.h#2 integrate .. //depot/projects/bdb/sys/i386/include/float.h#2 integrate .. //depot/projects/bdb/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/bdb/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/bdb/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/bdb/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/bdb/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/bdb/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/bdb/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/bdb/sys/kern/init_sysent.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_clock.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_cpuset.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_exec.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_fork.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_intr.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_kse.c#2 delete .. //depot/projects/bdb/sys/kern/kern_priv.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_proc.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_resource.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_sig.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_switch.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_sx.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_synch.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_thread.c#2 integrate .. //depot/projects/bdb/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/bdb/sys/kern/p1003_1b.c#2 integrate .. //depot/projects/bdb/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/bdb/sys/kern/sched_ule.c#2 integrate .. //depot/projects/bdb/sys/kern/subr_bus.c#2 integrate .. //depot/projects/bdb/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/bdb/sys/kern/subr_smp.c#2 integrate .. //depot/projects/bdb/sys/kern/subr_trap.c#2 integrate .. //depot/projects/bdb/sys/kern/subr_witness.c#2 integrate .. //depot/projects/bdb/sys/kern/sys_process.c#2 integrate .. //depot/projects/bdb/sys/kern/syscalls.c#2 integrate .. //depot/projects/bdb/sys/kern/syscalls.master#2 integrate .. //depot/projects/bdb/sys/kern/systrace_args.c#2 integrate .. //depot/projects/bdb/sys/modules/Makefile#2 integrate .. //depot/projects/bdb/sys/modules/cmx/Makefile#1 branch .. //depot/projects/bdb/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/bdb/sys/modules/uslcom/Makefile#1 branch .. //depot/projects/bdb/sys/modules/vr/Makefile#2 integrate .. //depot/projects/bdb/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/bdb/sys/net/bpf_filter.c#2 integrate .. //depot/projects/bdb/sys/net/if.c#2 integrate .. //depot/projects/bdb/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/bdb/sys/net/if_gif.c#2 integrate .. //depot/projects/bdb/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/bdb/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/bdb/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/bdb/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/bdb/sys/netgraph/ng_nat.h#2 integrate .. //depot/projects/bdb/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/bdb/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/bdb/sys/netinet/in.h#2 integrate .. //depot/projects/bdb/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/bdb/sys/netinet/ip_fw_nat.c#2 integrate .. //depot/projects/bdb/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/bdb/sys/netinet/libalias/alias.c#2 integrate .. //depot/projects/bdb/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/bdb/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/bdb/sys/netinet/libalias/alias_ftp.c#2 integrate .. //depot/projects/bdb/sys/netinet/libalias/alias_irc.c#2 integrate .. //depot/projects/bdb/sys/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/bdb/sys/netinet/libalias/alias_old.c#2 delete .. //depot/projects/bdb/sys/netinet/libalias/alias_proxy.c#2 integrate .. //depot/projects/bdb/sys/netinet/libalias/alias_smedia.c#2 integrate .. //depot/projects/bdb/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/bdb/sys/netsmb/smb_conn.h#2 integrate .. //depot/projects/bdb/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/bdb/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/bdb/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/bdb/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/bdb/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/bdb/sys/pci/if_rl.c#2 integrate .. //depot/projects/bdb/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/bdb/sys/pci/if_vr.c#2 delete .. //depot/projects/bdb/sys/pci/if_vrreg.h#2 delete .. //depot/projects/bdb/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/bdb/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/bdb/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/bdb/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/bdb/sys/powerpc/booke/clock.c#1 branch .. //depot/projects/bdb/sys/powerpc/booke/copyinout.c#1 branch .. //depot/projects/bdb/sys/powerpc/booke/interrupt.c#1 branch .. //depot/projects/bdb/sys/powerpc/booke/locore.S#1 branch .. //depot/projects/bdb/sys/powerpc/booke/machdep.c#1 branch .. //depot/projects/bdb/sys/powerpc/booke/pmap.c#1 branch .. //depot/projects/bdb/sys/powerpc/booke/support.S#1 branch .. //depot/projects/bdb/sys/powerpc/booke/swtch.S#1 branch .. //depot/projects/bdb/sys/powerpc/booke/trap.c#1 branch .. //depot/projects/bdb/sys/powerpc/booke/trap_subr.S#1 branch .. //depot/projects/bdb/sys/powerpc/booke/uio_machdep.c#1 branch .. //depot/projects/bdb/sys/powerpc/booke/vm_machdep.c#1 branch .. //depot/projects/bdb/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/bdb/sys/powerpc/conf/MPC85XX#1 branch .. //depot/projects/bdb/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/bdb/sys/powerpc/include/bootinfo.h#2 integrate .. //depot/projects/bdb/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/bdb/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/bdb/sys/powerpc/include/mmuvar.h#2 integrate .. //depot/projects/bdb/sys/powerpc/include/ocpbus.h#1 branch .. //depot/projects/bdb/sys/powerpc/include/openpicvar.h#2 integrate .. //depot/projects/bdb/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/bdb/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/bdb/sys/powerpc/include/psl.h#2 integrate .. //depot/projects/bdb/sys/powerpc/include/pte.h#2 integrate .. //depot/projects/bdb/sys/powerpc/include/sf_buf.h#2 integrate .. //depot/projects/bdb/sys/powerpc/include/spr.h#2 integrate .. //depot/projects/bdb/sys/powerpc/include/tlb.h#1 branch .. //depot/projects/bdb/sys/powerpc/include/trap.h#2 integrate .. //depot/projects/bdb/sys/powerpc/include/trap_aim.h#1 branch .. //depot/projects/bdb/sys/powerpc/include/trap_booke.h#1 branch .. //depot/projects/bdb/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/bdb/sys/powerpc/mpc85xx/nexus.c#1 branch .. //depot/projects/bdb/sys/powerpc/mpc85xx/ocpbus.c#1 branch .. //depot/projects/bdb/sys/powerpc/mpc85xx/ocpbus.h#1 branch .. //depot/projects/bdb/sys/powerpc/mpc85xx/opic.c#1 branch .. //depot/projects/bdb/sys/powerpc/mpc85xx/pci_ocp.c#1 branch .. //depot/projects/bdb/sys/powerpc/powermac/openpic_macio.c#2 integrate .. //depot/projects/bdb/sys/powerpc/powerpc/autoconf.c#2 integrate .. //depot/projects/bdb/sys/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/bdb/sys/powerpc/powerpc/gdb_machdep.c#2 integrate .. //depot/projects/bdb/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/bdb/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/bdb/sys/powerpc/powerpc/pic_if.m#2 integrate .. //depot/projects/bdb/sys/powerpc/psim/openpic_iobus.c#2 integrate .. //depot/projects/bdb/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/bdb/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/bdb/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/bdb/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/bdb/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/bdb/sys/sparc64/include/tlb.h#2 integrate .. //depot/projects/bdb/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/bdb/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/bdb/sys/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/bdb/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/bdb/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/bdb/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/bdb/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/bdb/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/bdb/sys/sun4v/sun4v/mp_machdep.c#2 integrate .. //depot/projects/bdb/sys/sys/bus.h#2 integrate .. //depot/projects/bdb/sys/sys/condvar.h#2 integrate .. //depot/projects/bdb/sys/sys/cpuset.h#2 integrate .. //depot/projects/bdb/sys/sys/disklabel.h#2 integrate .. //depot/projects/bdb/sys/sys/fcntl.h#2 integrate .. //depot/projects/bdb/sys/sys/kse.h#2 delete .. //depot/projects/bdb/sys/sys/param.h#2 integrate .. //depot/projects/bdb/sys/sys/pcpu.h#2 integrate .. //depot/projects/bdb/sys/sys/proc.h#2 integrate .. //depot/projects/bdb/sys/sys/sched.h#2 integrate .. //depot/projects/bdb/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/bdb/sys/sys/syscall.h#2 integrate .. //depot/projects/bdb/sys/sys/syscall.mk#2 integrate .. //depot/projects/bdb/sys/sys/sysproto.h#2 integrate .. //depot/projects/bdb/sys/sys/systm.h#2 integrate .. //depot/projects/bdb/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/bdb/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/bdb/sys/ufs/ufs/extattr.h#2 integrate .. //depot/projects/bdb/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/bdb/sys/vm/vm_fault.c#2 integrate .. //depot/projects/bdb/sys/vm/vm_glue.c#2 integrate .. //depot/projects/bdb/sys/vm/vm_map.c#2 integrate .. //depot/projects/bdb/sys/vm/vm_meter.c#2 integrate .. //depot/projects/bdb/tools/build/mk/OptionalObsoleteFiles.inc#2 integrate .. //depot/projects/bdb/tools/regression/file/dup/dup.c#2 integrate .. //depot/projects/bdb/tools/regression/lib/msun/test-trig.c#2 integrate .. //depot/projects/bdb/tools/tools/tinybsd/tinybsd#2 integrate .. //depot/projects/bdb/usr.bin/ar/ar.1#2 integrate .. //depot/projects/bdb/usr.bin/ar/ar.c#2 integrate .. //depot/projects/bdb/usr.bin/ar/ar.h#2 integrate .. //depot/projects/bdb/usr.bin/ar/write.c#2 integrate .. //depot/projects/bdb/usr.bin/calendar/calendars/calendar.freebsd#2 integrate .. //depot/projects/bdb/usr.bin/chat/chat.c#2 integrate .. //depot/projects/bdb/usr.bin/cpuset/Makefile#2 integrate .. //depot/projects/bdb/usr.bin/cpuset/cpuset.1#1 branch .. //depot/projects/bdb/usr.bin/cpuset/cpuset.c#2 integrate .. //depot/projects/bdb/usr.bin/find/find.1#2 integrate .. //depot/projects/bdb/usr.bin/find/main.c#2 integrate .. //depot/projects/bdb/usr.bin/gzip/gzip.c#2 integrate .. //depot/projects/bdb/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/bdb/usr.bin/kdump/kdump_subr.h#2 integrate .. //depot/projects/bdb/usr.bin/kdump/mksubr#2 integrate .. //depot/projects/bdb/usr.bin/make/Makefile#2 integrate .. //depot/projects/bdb/usr.bin/make/Makefile.dist#2 integrate .. //depot/projects/bdb/usr.bin/make/arch.c#2 integrate .. //depot/projects/bdb/usr.bin/make/globals.h#2 integrate .. //depot/projects/bdb/usr.bin/make/hash_tables.c#2 integrate .. //depot/projects/bdb/usr.bin/make/job.c#2 integrate .. //depot/projects/bdb/usr.bin/make/main.c#2 integrate .. //depot/projects/bdb/usr.bin/make/make.1#2 integrate .. //depot/projects/bdb/usr.bin/make/parse.c#2 integrate .. //depot/projects/bdb/usr.bin/ministat/ministat.1#2 integrate .. //depot/projects/bdb/usr.bin/unifdef/unifdef.c#2 integrate .. //depot/projects/bdb/usr.sbin/Makefile#2 integrate .. //depot/projects/bdb/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#2 integrate .. //depot/projects/bdb/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#2 integrate .. //depot/projects/bdb/usr.sbin/bluetooth/sdpd/Makefile#2 integrate .. //depot/projects/bdb/usr.sbin/bluetooth/sdpd/gn.c#1 branch .. //depot/projects/bdb/usr.sbin/bluetooth/sdpd/nap.c#1 branch .. //depot/projects/bdb/usr.sbin/bluetooth/sdpd/panu.c#1 branch .. //depot/projects/bdb/usr.sbin/bluetooth/sdpd/profile.c#2 integrate .. //depot/projects/bdb/usr.sbin/bluetooth/sdpd/profile.h#2 integrate .. //depot/projects/bdb/usr.sbin/fifolog/Makefile#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/Makefile.inc#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/fifolog_create/Makefile#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/flint.lnt#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/lib/Makefile#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/lib/fifolog.h#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/lib/fifolog_create.c#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/lib/fifolog_int.c#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/lib/fifolog_write.h#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/lib/getdate.y#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/lib/libfifolog.h#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch .. //depot/projects/bdb/usr.sbin/fifolog/lib/miniobj.h#1 branch .. //depot/projects/bdb/usr.sbin/fwcontrol/fwcontrol.8#2 integrate .. //depot/projects/bdb/usr.sbin/fwcontrol/fwcontrol.c#2 integrate .. //depot/projects/bdb/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/bdb/usr.sbin/moused/Makefile#2 integrate .. //depot/projects/bdb/usr.sbin/moused/moused.c#2 integrate .. //depot/projects/bdb/usr.sbin/ppp/command.c#2 integrate .. //depot/projects/bdb/usr.sbin/ppp/ipcp.c#2 integrate .. //depot/projects/bdb/usr.sbin/ppp/main.c#2 integrate .. //depot/projects/bdb/usr.sbin/ppp/nat_cmd.c#2 integrate Differences ... ==== //depot/projects/bdb/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -32,6 +32,11 @@ OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libkse.a +OLD_FILES+=usr/lib32/libkse_p.a +OLD_FILES+=usr/lib32/libkse_pic.a +.endif .endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h @@ -134,6 +139,12 @@ OLD_DIRS+=usr/include/netatm/uni OLD_DIRS+=usr/include/netatm OLD_DIRS+=usr/share/examples/atm +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libatm.a +OLD_FILES+=usr/lib32/libatm.so +OLD_LIBS+=usr/lib32/libatm.so.5 +OLD_FILES+=usr/lib32/libatm_p.a +.endif # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -224,6 +235,42 @@ OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libalias.so.5 +OLD_LIBS+=usr/lib32/libbsnmp.so.3 +OLD_LIBS+=usr/lib32/libdialog.so.5 +OLD_LIBS+=usr/lib32/libgnuregex.so.3 +OLD_LIBS+=usr/lib32/libhistory.so.6 +OLD_LIBS+=usr/lib32/libncurses.so.6 +OLD_LIBS+=usr/lib32/libncursesw.so.6 +OLD_LIBS+=usr/lib32/libpam.so.3 +OLD_LIBS+=usr/lib32/libreadline.so.6 +OLD_LIBS+=usr/lib32/libssh.so.3 +OLD_LIBS+=usr/lib32/pam_chroot.so.3 +OLD_LIBS+=usr/lib32/pam_deny.so.3 +OLD_LIBS+=usr/lib32/pam_echo.so.3 +OLD_LIBS+=usr/lib32/pam_exec.so.3 +OLD_LIBS+=usr/lib32/pam_ftpusers.so.3 +OLD_LIBS+=usr/lib32/pam_group.so.3 +OLD_LIBS+=usr/lib32/pam_guest.so.3 +OLD_LIBS+=usr/lib32/pam_krb5.so.3 +OLD_LIBS+=usr/lib32/pam_ksu.so.3 +OLD_LIBS+=usr/lib32/pam_lastlog.so.3 +OLD_LIBS+=usr/lib32/pam_login_access.so.3 +OLD_LIBS+=usr/lib32/pam_nologin.so.3 +OLD_LIBS+=usr/lib32/pam_opie.so.3 +OLD_LIBS+=usr/lib32/pam_opieaccess.so.3 +OLD_LIBS+=usr/lib32/pam_passwdqc.so.3 +OLD_LIBS+=usr/lib32/pam_permit.so.3 +OLD_LIBS+=usr/lib32/pam_radius.so.3 +OLD_LIBS+=usr/lib32/pam_rhosts.so.3 +OLD_LIBS+=usr/lib32/pam_rootok.so.3 +OLD_LIBS+=usr/lib32/pam_securetty.so.3 +OLD_LIBS+=usr/lib32/pam_self.so.3 +OLD_LIBS+=usr/lib32/pam_ssh.so.3 +OLD_LIBS+=usr/lib32/pam_tacplus.so.3 +OLD_LIBS+=usr/lib32/pam_unix.so.3 +.endif # 20070613: IPX over IP tunnel removal OLD_FILES+=usr/include/netipx/ipx_ip.h # 20070605: sched_core removal @@ -603,6 +650,9 @@ OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=usr/lib/libarchive.so.3 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libarchive.so.3 +.endif # 20070301: remove addr2ascii and ascii2addr OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz ==== //depot/projects/bdb/UPDATING#2 (text+ko) ==== @@ -22,6 +22,16 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080312: + Support for KSE threading has been removed from the kernel. To + run legacy applications linked against KSE libmap.conf may + be used. The following libmap.conf may be used to ensure + compatibility with any prior release: + + libpthread.so.1 libthr.so.1 + libpthread.so.2 libthr.so.2 + libkse.so.3 libthr.so.3 + 20080301: The layout of struct vmspace has changed. This affects libkvm and any executables that link against libkvm and use the @@ -997,4 +1007,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ ==== //depot/projects/bdb/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.29 2007/05/28 04:23:09 pjd Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.30 2008/03/09 12:10:24 rwatson Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -40,7 +40,7 @@ .Nd change file flags .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl fhv .Oo .Fl R .Op Fl H | Fl L | Fl P @@ -57,6 +57,12 @@ .Pp The options are as follows: .Bl -tag -width indent +.It Fl f +Do not display a diagnostic message if +.Nm +could not modify the flags for +.Va file , +nor modify the exit status to reflect such failures. .It Fl H If the .Fl R @@ -79,6 +85,14 @@ .It Fl R Change the file flags for the file hierarchies rooted in the files instead of just the files themselves. +.It Fl v +Cause +.Nm +to be verbose, showing filenames as the flags are modified. +If the +.Fl v +option is specified more than once, the old and new flags of the file +will also be printed, in octal notation. .El .Pp The flags are specified as an octal number or a comma separated list ==== //depot/projects/bdb/bin/chflags/chflags.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.24 2008/03/09 12:10:24 rwatson Exp $"); #include #include @@ -60,14 +60,15 @@ { FTS *ftsp; FTSENT *p; - u_long clear, set; + u_long clear, newflags, set; long val; - int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval; + int Hflag, Lflag, Rflag, fflag, hflag, vflag; + int ch, fts_options, oct, rval; char *flags, *ep; int (*change_flags)(const char *, unsigned long); - Hflag = Lflag = Rflag = hflag = 0; - while ((ch = getopt(argc, argv, "HLPRh")) != -1) + Hflag = Lflag = Rflag = fflag = hflag = vflag = 0; + while ((ch = getopt(argc, argv, "HLPRfhv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -83,9 +84,15 @@ case 'R': Rflag = 1; break; + case 'f': + fflag = 1; + break; case 'h': hflag = 1; break; + case 'v': + vflag++; + break; case '?': default: usage(); @@ -166,18 +173,23 @@ default: break; } - if (oct) { - if (!(*change_flags)(p->fts_accpath, set)) - continue; - } else { - p->fts_statp->st_flags |= set; - p->fts_statp->st_flags &= clear; - if (!(*change_flags)(p->fts_accpath, - (u_long)p->fts_statp->st_flags)) - continue; + if (oct) + newflags = set; + else + newflags = (p->fts_statp->st_flags | set) & clear; + if (newflags == p->fts_statp->st_flags) + continue; + if ((*change_flags)(p->fts_accpath, newflags) && !fflag) { + warn("%s", p->fts_path); + rval = 1; + } else if (vflag) { + (void)printf("%s", p->fts_path); + if (vflag > 1) + (void)printf(": 0%lo -> 0%lo", + (u_long)p->fts_statp->st_flags, + newflags); + (void)printf("\n"); } - warn("%s", p->fts_path); - rval = 1; } if (errno) err(1, "fts_read"); @@ -188,6 +200,6 @@ usage(void) { (void)fprintf(stderr, - "usage: chflags [-h] [-R [-H | -L | -P]] flags file ...\n"); + "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n"); exit(1); } ==== //depot/projects/bdb/bin/cp/cp.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $ .\" .Dd October 27, 2006 .Dt CP 1 @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -116,6 +116,10 @@ or .Xr pax 1 instead. +.It Fl a +Archive mode. +Same as +.Fl RpP . .It Fl f For each existing destination pathname, remove it and create a new file, without prompting for confirmation ==== //depot/projects/bdb/bin/cp/cp.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); /* * Cp copies source files to target files. @@ -102,7 +102,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -119,6 +119,12 @@ case 'R': Rflag = 1; break; + case 'a': + Pflag = 1; + pflag = 1; + Rflag = 1; + Hflag = Lflag = 0; + break; case 'f': fflag = 1; iflag = nflag = 0; ==== //depot/projects/bdb/bin/cp/utils.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.53 2008/03/10 19:58:41 jhb Exp $"); #include #include @@ -429,8 +429,8 @@ { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " "target_directory"); exit(EX_USAGE); } ==== //depot/projects/bdb/bin/ps/ps.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.90 2008/03/12 10:01:34 jeff Exp $ .\" .Dd August 21, 2006 .Dt PS 1 @@ -290,7 +290,6 @@ .It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us" .It Dv "P_WEXIT" Ta No "0x02000 Working on exiting" .It Dv "P_EXEC" Ta No "0x04000 Process called exec" -.It Dv "P_SA" Ta No "0x08000 Using scheduler activations" .It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state" .It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP" .It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing" ==== //depot/projects/bdb/bin/realpath/realpath.1#2 (text+ko) ==== @@ -31,7 +31,7 @@ .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp -.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.11 2008/03/09 12:46:39 rwatson Exp $ .\" .Dd November 24, 2000 .Dt REALPATH 1 @@ -41,7 +41,9 @@ .Nd return resolved physical path .Sh SYNOPSIS .Nm +.Op Fl q .Ar path +.Op Ar ... .Sh DESCRIPTION The .Nm @@ -55,6 +57,12 @@ .Pa /../ in .Ar path . +.Pp +If +.Fl q +is specified, warnings will not be printed when +.Xr realpath 3 +fails. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO ==== //depot/projects/bdb/bin/realpath/realpath.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6 2004/04/06 20:06:50 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.7 2008/03/09 12:46:39 rwatson Exp $"); #include @@ -44,20 +44,39 @@ { char buf[PATH_MAX]; char *p; + int ch, i, qflag, rval; - if (argc == 2) { - if ((p = realpath(argv[1], buf)) == NULL) - err(1, "%s", buf); - } else + qflag = 0; + while ((ch = getopt(argc, argv, "q")) != -1) { + switch (ch) { + case 'q': + qflag = 1; + break; + case '?': + default: + usage(); + } + } + argc -= optind; + argv += optind; + if (argc < 1) usage(); - (void)printf("%s\n", p); - exit(0); + rval = 0; + for (i = 0; i < argc; i++) { + if ((p = realpath(argv[i], buf)) == NULL) { + if (!qflag) + warn("%s", argv[i]); + rval = 1; + } else + (void)printf("%s\n", p); + } + exit(rval); } static void usage(void) { - (void)fprintf(stderr, "usage: realpath path\n"); + (void)fprintf(stderr, "usage: realpath [-q] path [...]\n"); exit(1); } ==== //depot/projects/bdb/contrib/bsnmp/snmpd/main.c#2 (text+ko) ==== @@ -2242,6 +2242,8 @@ return (m); err: + if ((m->flags & LM_ONSTARTLIST) != 0) + TAILQ_REMOVE(&modules_start, m, start); if (m->handle) dlclose(m->handle); free(m->path); ==== //depot/projects/bdb/contrib/tcsh/sh.lex.c#2 (text+ko) ==== @@ -851,7 +851,8 @@ return (en); } slhs.len = 0; - Strbuf_append(&slhs, lhsb.s); + if (lhsb.s != NULL && lhsb.len != 0) + Strbuf_append(&slhs, lhsb.s); Strbuf_terminate(&slhs); if (exclc) en = dosub(sc, en, global); ==== //depot/projects/bdb/etc/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.365 2007/11/11 01:16:51 mlaier Exp $ +# $FreeBSD: src/etc/Makefile,v 1.366 2008/03/05 18:32:58 brooks Exp $ .include @@ -9,7 +9,7 @@ BIN1= amd.map apmd.conf auth.conf \ crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ - dhclient.conf disktab fbtab freebsd-update.conf \ + ddb.conf dhclient.conf disktab fbtab freebsd-update.conf \ ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf libalias.conf login.access login.conf mac.conf motd \ ==== //depot/projects/bdb/etc/defaults/rc.conf#2 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.326 2008/01/27 15:15:11 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.328 2008/03/06 14:01:10 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -33,6 +33,8 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). +ddb_enable="NO" # Set to YES to load ddb scripts at boot. +ddb_config="/etc/ddb.conf" # ddb(8) config file. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 13 03:33:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 574901065673; Thu, 13 Mar 2008 03:33:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EEBA61065672 for ; Thu, 13 Mar 2008 03:33:34 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF3C08FC16 for ; Thu, 13 Mar 2008 03:33:34 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2D3XYWc058722 for ; Thu, 13 Mar 2008 03:33:34 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2D3XNYJ058720 for perforce@freebsd.org; Thu, 13 Mar 2008 03:33:23 GMT (envelope-from marcel@freebsd.org) Date: Thu, 13 Mar 2008 03:33:23 GMT Message-Id: <200803130333.m2D3XNYJ058720@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 137568 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, 13 Mar 2008 03:33:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=137568 Change 137568 by marcel@marcel_xcllnt on 2008/03/13 03:32:45 IFC @137564 Affected files ... .. //depot/projects/busdma/Makefile#7 integrate .. //depot/projects/busdma/amd64/acpica/madt.c#5 integrate .. //depot/projects/busdma/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/busdma/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/busdma/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/busdma/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/busdma/amd64/amd64/legacy.c#4 integrate .. //depot/projects/busdma/amd64/amd64/machdep.c#8 integrate .. //depot/projects/busdma/amd64/amd64/mem.c#2 integrate .. //depot/projects/busdma/amd64/amd64/minidump_machdep.c#3 integrate .. //depot/projects/busdma/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/busdma/amd64/amd64/mp_watchdog.c#3 integrate .. //depot/projects/busdma/amd64/amd64/pmap.c#8 integrate .. //depot/projects/busdma/amd64/amd64/trap.c#7 integrate .. //depot/projects/busdma/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/busdma/amd64/conf/DEFAULTS#6 integrate .. //depot/projects/busdma/amd64/conf/GENERIC#9 integrate .. //depot/projects/busdma/amd64/conf/NOTES#9 integrate .. //depot/projects/busdma/amd64/include/_types.h#2 integrate .. //depot/projects/busdma/amd64/include/float.h#2 integrate .. //depot/projects/busdma/amd64/include/ieeefp.h#2 integrate .. //depot/projects/busdma/amd64/include/pmap.h#4 integrate .. //depot/projects/busdma/amd64/include/proc.h#2 integrate .. //depot/projects/busdma/amd64/include/smp.h#5 integrate .. //depot/projects/busdma/amd64/include/specialreg.h#6 integrate .. //depot/projects/busdma/amd64/include/vmparam.h#5 integrate .. //depot/projects/busdma/amd64/isa/clock.c#6 integrate .. //depot/projects/busdma/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/busdma/amd64/linux32/linux32_sysvec.c#7 integrate .. //depot/projects/busdma/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/busdma/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/busdma/arm/arm/genassym.c#4 integrate .. //depot/projects/busdma/arm/arm/locore.S#5 integrate .. //depot/projects/busdma/arm/arm/nexus.c#3 integrate .. //depot/projects/busdma/arm/arm/pmap.c#7 integrate .. //depot/projects/busdma/arm/arm/support.S#4 integrate .. //depot/projects/busdma/arm/arm/swtch.S#4 integrate .. //depot/projects/busdma/arm/arm/trap.c#6 integrate .. //depot/projects/busdma/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/busdma/arm/at91/at91.c#5 integrate .. //depot/projects/busdma/arm/at91/if_ate.c#7 integrate .. //depot/projects/busdma/arm/at91/kb920x_machdep.c#7 integrate .. //depot/projects/busdma/arm/at91/uart_dev_at91usart.c#6 integrate .. //depot/projects/busdma/arm/conf/AVILA#4 integrate .. //depot/projects/busdma/arm/include/_bus.h#2 integrate .. //depot/projects/busdma/arm/include/asmacros.h#3 integrate .. //depot/projects/busdma/arm/include/atomic.h#5 integrate .. //depot/projects/busdma/arm/include/pmap.h#6 integrate .. //depot/projects/busdma/arm/include/sysarch.h#2 integrate .. //depot/projects/busdma/arm/include/vmparam.h#5 integrate .. //depot/projects/busdma/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/busdma/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/busdma/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/busdma/boot/Makefile#5 integrate .. //depot/projects/busdma/boot/arm/at91/boot2/bwct_board.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/spi_flash.c#3 integrate .. //depot/projects/busdma/boot/common/bootstrap.h#3 integrate .. //depot/projects/busdma/boot/common/dev_net.c#2 integrate .. //depot/projects/busdma/boot/common/load_elf.c#4 integrate .. //depot/projects/busdma/boot/forth/loader.conf.5#2 integrate .. //depot/projects/busdma/boot/forth/support.4th#3 integrate .. //depot/projects/busdma/boot/i386/boot2/boot2.c#4 integrate .. //depot/projects/busdma/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/busdma/boot/i386/btx/btx/btx.S#4 integrate .. //depot/projects/busdma/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/busdma/boot/i386/libi386/biosdisk.c#5 integrate .. //depot/projects/busdma/boot/i386/pxeldr/pxeldr.S#3 integrate .. //depot/projects/busdma/boot/ofw/libofw/ofw_console.c#3 integrate .. //depot/projects/busdma/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/busdma/boot/pc98/btx/btx/btx.S#3 integrate .. //depot/projects/busdma/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/busdma/boot/pc98/libpc98/biosdisk.c#4 integrate .. //depot/projects/busdma/boot/powerpc/Makefile#2 integrate .. //depot/projects/busdma/boot/powerpc/loader/Makefile#2 delete .. //depot/projects/busdma/boot/powerpc/loader/conf.c#3 delete .. //depot/projects/busdma/boot/powerpc/loader/help.ofw#2 delete .. //depot/projects/busdma/boot/powerpc/loader/ldscript.powerpc#2 delete .. //depot/projects/busdma/boot/powerpc/loader/metadata.c#2 delete .. //depot/projects/busdma/boot/powerpc/loader/start.c#2 delete .. //depot/projects/busdma/boot/powerpc/loader/version#2 delete .. //depot/projects/busdma/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/busdma/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/busdma/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/busdma/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/busdma/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/busdma/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/busdma/boot/powerpc/ofw/version#1 branch .. //depot/projects/busdma/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/busdma/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/busdma/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/busdma/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/busdma/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/busdma/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/busdma/boot/powerpc/uboot/version#1 branch .. //depot/projects/busdma/boot/uboot/Makefile#1 branch .. //depot/projects/busdma/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/busdma/boot/uboot/common/main.c#1 branch .. //depot/projects/busdma/boot/uboot/lib/Makefile#1 branch .. //depot/projects/busdma/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/busdma/boot/uboot/lib/console.c#1 branch .. //depot/projects/busdma/boot/uboot/lib/copy.c#1 branch .. //depot/projects/busdma/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/busdma/boot/uboot/lib/disk.c#1 branch .. //depot/projects/busdma/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/busdma/boot/uboot/lib/glue.c#1 branch .. //depot/projects/busdma/boot/uboot/lib/glue.h#1 branch .. //depot/projects/busdma/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/busdma/boot/uboot/lib/module.c#1 branch .. //depot/projects/busdma/boot/uboot/lib/net.c#1 branch .. //depot/projects/busdma/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/busdma/boot/uboot/lib/time.c#1 branch .. //depot/projects/busdma/cam/cam_periph.c#6 integrate .. //depot/projects/busdma/cam/cam_xpt.c#8 integrate .. //depot/projects/busdma/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/busdma/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/busdma/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/busdma/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/busdma/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/busdma/compat/linux/linux_file.c#7 integrate .. //depot/projects/busdma/compat/linux/linux_futex.c#4 integrate .. //depot/projects/busdma/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/busdma/compat/linux/linux_misc.c#8 integrate .. //depot/projects/busdma/compat/linux/linux_misc.h#2 integrate .. //depot/projects/busdma/compat/linux/linux_stats.c#7 integrate .. //depot/projects/busdma/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/busdma/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/busdma/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/projects/busdma/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/busdma/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/busdma/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/busdma/compat/opensolaris/sys/kmem.h#3 integrate .. //depot/projects/busdma/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/busdma/compat/pecoff/imgact_pecoff.c#4 integrate .. //depot/projects/busdma/compat/svr4/imgact_svr4.c#3 integrate .. //depot/projects/busdma/compat/svr4/svr4_fcntl.c#5 integrate .. //depot/projects/busdma/compat/svr4/svr4_misc.c#7 integrate .. //depot/projects/busdma/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/busdma/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/busdma/conf/Makefile.arm#5 integrate .. //depot/projects/busdma/conf/NOTES#9 integrate .. //depot/projects/busdma/conf/files#9 integrate .. //depot/projects/busdma/conf/files.amd64#9 integrate .. //depot/projects/busdma/conf/files.i386#9 integrate .. //depot/projects/busdma/conf/files.powerpc#7 integrate .. //depot/projects/busdma/conf/files.sparc64#5 integrate .. //depot/projects/busdma/conf/kern.post.mk#5 integrate .. //depot/projects/busdma/conf/kern.pre.mk#6 integrate .. //depot/projects/busdma/conf/kmod.mk#8 integrate .. //depot/projects/busdma/conf/ldscript.powerpc#2 integrate .. //depot/projects/busdma/conf/options#9 integrate .. //depot/projects/busdma/conf/options.powerpc#2 integrate .. //depot/projects/busdma/contrib/dev/acpica/evgpe.c#3 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/busdma/crypto/rijndael/rijndael-api.c#2 integrate .. //depot/projects/busdma/crypto/rijndael/test00.c#2 integrate .. //depot/projects/busdma/ddb/db_capture.c#1 branch .. //depot/projects/busdma/ddb/db_command.c#4 integrate .. //depot/projects/busdma/ddb/db_command.h#2 integrate .. //depot/projects/busdma/ddb/db_examine.c#4 integrate .. //depot/projects/busdma/ddb/db_input.c#2 integrate .. //depot/projects/busdma/ddb/db_lex.c#2 integrate .. //depot/projects/busdma/ddb/db_lex.h#2 integrate .. //depot/projects/busdma/ddb/db_main.c#3 integrate .. //depot/projects/busdma/ddb/db_output.c#4 integrate .. //depot/projects/busdma/ddb/db_script.c#1 branch .. //depot/projects/busdma/ddb/db_textdump.c#1 branch .. //depot/projects/busdma/ddb/ddb.h#3 integrate .. //depot/projects/busdma/dev/aac/aac.c#4 integrate .. //depot/projects/busdma/dev/acpica/Osd/OsdDebug.c#3 integrate .. //depot/projects/busdma/dev/acpica/Osd/OsdSchedule.c#4 integrate .. //depot/projects/busdma/dev/acpica/acpi.c#8 integrate .. //depot/projects/busdma/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/busdma/dev/acpica/acpi_hpet.c#7 integrate .. //depot/projects/busdma/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/busdma/dev/acpica/acpi_thermal.c#6 integrate .. //depot/projects/busdma/dev/agp/agp_i810.c#2 integrate .. //depot/projects/busdma/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/busdma/dev/aic7xxx/aic79xx_osm.c#4 integrate .. //depot/projects/busdma/dev/amr/amr.c#5 integrate .. //depot/projects/busdma/dev/amr/amr_cam.c#5 integrate .. //depot/projects/busdma/dev/amr/amr_pci.c#4 integrate .. //depot/projects/busdma/dev/amr/amrreg.h#2 integrate .. //depot/projects/busdma/dev/amr/amrvar.h#2 integrate .. //depot/projects/busdma/dev/an/if_an.c#6 integrate .. //depot/projects/busdma/dev/an/if_an_pci.c#3 integrate .. //depot/projects/busdma/dev/an/if_anreg.h#3 integrate .. //depot/projects/busdma/dev/ata/ata-all.h#6 integrate .. //depot/projects/busdma/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/busdma/dev/ata/ata-disk.c#6 integrate .. //depot/projects/busdma/dev/ata/ata-dma.c#5 integrate .. //depot/projects/busdma/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/busdma/dev/ata/ata-pci.h#7 integrate .. //depot/projects/busdma/dev/ath/if_ath.c#9 integrate .. //depot/projects/busdma/dev/atkbdc/atkbd.c#5 integrate .. //depot/projects/busdma/dev/atkbdc/atkbd_atkbdc.c#3 integrate .. //depot/projects/busdma/dev/atkbdc/psm.c#4 integrate .. //depot/projects/busdma/dev/bce/if_bce.c#7 integrate .. //depot/projects/busdma/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/busdma/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/busdma/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/busdma/dev/bfe/if_bfereg.h#4 integrate .. //depot/projects/busdma/dev/bge/if_bge.c#8 integrate .. //depot/projects/busdma/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/busdma/dev/ciss/ciss.c#6 integrate .. //depot/projects/busdma/dev/cmx/cmx.c#1 branch .. //depot/projects/busdma/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/busdma/dev/cmx/cmxreg.h#1 branch .. //depot/projects/busdma/dev/cmx/cmxvar.h#1 branch .. //depot/projects/busdma/dev/coretemp/coretemp.c#3 integrate .. //depot/projects/busdma/dev/cpufreq/ichss.c#3 integrate .. //depot/projects/busdma/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/busdma/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_common.h#4 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_firmware_exports.h#3 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_regs.h#3 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_t3_hw.c#4 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_tcb.h#3 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_vsc8211.c#4 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_xgmac.c#4 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_include.h#3 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_ioctl.h#3 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_l2t.h#2 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_multiq.c#1 branch .. //depot/projects/busdma/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_sge.c#4 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/busdma/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/busdma/dev/cxgb/sys/cxgb_support.c#1 branch .. //depot/projects/busdma/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/busdma/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/busdma/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/busdma/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/busdma/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/busdma/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/busdma/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/busdma/dev/cxgb/t3cdev.h#1 branch .. //depot/projects/busdma/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete .. //depot/projects/busdma/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch .. //depot/projects/busdma/dev/cxgb/ulp/toecore/toedev.c#1 branch .. //depot/projects/busdma/dev/cxgb/ulp/toecore/toedev.h#2 delete .. //depot/projects/busdma/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 branch .. //depot/projects/busdma/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 branch .. //depot/projects/busdma/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch .. //depot/projects/busdma/dev/cxgb/ulp/tom/cxgb_defs.h#1 branch .. //depot/projects/busdma/dev/cxgb/ulp/tom/cxgb_listen.c#1 branch .. //depot/projects/busdma/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 branch .. //depot/projects/busdma/dev/cxgb/ulp/tom/cxgb_tcp.h#1 branch .. //depot/projects/busdma/dev/cxgb/ulp/tom/cxgb_toepcb.h#1 branch .. //depot/projects/busdma/dev/cxgb/ulp/tom/cxgb_tom.c#1 branch .. //depot/projects/busdma/dev/cxgb/ulp/tom/cxgb_tom.h#1 branch .. //depot/projects/busdma/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 branch .. //depot/projects/busdma/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch .. //depot/projects/busdma/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch .. //depot/projects/busdma/dev/dcons/dcons_os.c#5 integrate .. //depot/projects/busdma/dev/drm/drm_drv.c#3 integrate .. //depot/projects/busdma/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/busdma/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/busdma/dev/ed/if_ed_rtl80x9.c#2 integrate .. //depot/projects/busdma/dev/em/LICENSE#3 integrate .. //depot/projects/busdma/dev/em/e1000_80003es2lan.c#3 integrate .. //depot/projects/busdma/dev/em/e1000_80003es2lan.h#3 integrate .. //depot/projects/busdma/dev/em/e1000_82540.c#3 integrate .. //depot/projects/busdma/dev/em/e1000_82541.c#3 integrate .. //depot/projects/busdma/dev/em/e1000_82541.h#3 integrate .. //depot/projects/busdma/dev/em/e1000_82542.c#3 integrate .. //depot/projects/busdma/dev/em/e1000_82543.c#3 integrate .. //depot/projects/busdma/dev/em/e1000_82543.h#3 integrate .. //depot/projects/busdma/dev/em/e1000_82571.c#3 integrate .. //depot/projects/busdma/dev/em/e1000_82571.h#3 integrate .. //depot/projects/busdma/dev/em/e1000_82575.c#3 delete .. //depot/projects/busdma/dev/em/e1000_82575.h#3 delete .. //depot/projects/busdma/dev/em/e1000_api.c#3 integrate .. //depot/projects/busdma/dev/em/e1000_api.h#3 integrate .. //depot/projects/busdma/dev/em/e1000_defines.h#3 integrate .. //depot/projects/busdma/dev/em/e1000_hw.h#3 integrate .. //depot/projects/busdma/dev/em/e1000_ich8lan.c#3 integrate .. //depot/projects/busdma/dev/em/e1000_ich8lan.h#3 integrate .. //depot/projects/busdma/dev/em/e1000_mac.c#3 integrate .. //depot/projects/busdma/dev/em/e1000_mac.h#3 integrate .. //depot/projects/busdma/dev/em/e1000_manage.c#3 integrate .. //depot/projects/busdma/dev/em/e1000_manage.h#3 integrate .. //depot/projects/busdma/dev/em/e1000_nvm.c#3 integrate .. //depot/projects/busdma/dev/em/e1000_nvm.h#3 integrate .. //depot/projects/busdma/dev/em/e1000_osdep.h#3 integrate .. //depot/projects/busdma/dev/em/e1000_phy.c#3 integrate .. //depot/projects/busdma/dev/em/e1000_phy.h#3 integrate .. //depot/projects/busdma/dev/em/e1000_regs.h#3 integrate .. //depot/projects/busdma/dev/em/if_em.c#7 integrate .. //depot/projects/busdma/dev/em/if_em.h#6 integrate .. //depot/projects/busdma/dev/fb/creator.c#5 integrate .. //depot/projects/busdma/dev/fb/fb.c#2 integrate .. //depot/projects/busdma/dev/fb/fbreg.h#3 integrate .. //depot/projects/busdma/dev/fb/machfb.c#3 integrate .. //depot/projects/busdma/dev/fb/splash_bmp.c#3 integrate .. //depot/projects/busdma/dev/fb/splash_pcx.c#2 integrate .. //depot/projects/busdma/dev/fb/vga.c#2 integrate .. //depot/projects/busdma/dev/fdc/fdc.c#6 integrate .. //depot/projects/busdma/dev/gem/if_gem.c#7 integrate .. //depot/projects/busdma/dev/gem/if_gem_pci.c#5 integrate .. //depot/projects/busdma/dev/gem/if_gemreg.h#4 integrate .. //depot/projects/busdma/dev/gem/if_gemvar.h#5 integrate .. //depot/projects/busdma/dev/hatm/if_hatm_intr.c#3 integrate .. //depot/projects/busdma/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/busdma/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/busdma/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/busdma/dev/hptrr/array.h#1 branch .. //depot/projects/busdma/dev/hptrr/him.h#1 branch .. //depot/projects/busdma/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/busdma/dev/hptrr/hptintf.h#1 branch .. //depot/projects/busdma/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/busdma/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/busdma/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/busdma/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/busdma/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/busdma/dev/hptrr/ldm.h#1 branch .. //depot/projects/busdma/dev/hptrr/list.h#1 branch .. //depot/projects/busdma/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/busdma/dev/hptrr/osm.h#1 branch .. //depot/projects/busdma/dev/hwpmc/hwpmc_mod.c#6 integrate .. //depot/projects/busdma/dev/ic/quicc.h#1 branch .. //depot/projects/busdma/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/busdma/dev/ichwd/ichwd.h#4 integrate .. //depot/projects/busdma/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/busdma/dev/igb/e1000_82575.c#1 branch .. //depot/projects/busdma/dev/igb/e1000_82575.h#1 branch .. //depot/projects/busdma/dev/igb/e1000_api.c#1 branch .. //depot/projects/busdma/dev/igb/e1000_api.h#1 branch .. //depot/projects/busdma/dev/igb/e1000_defines.h#1 branch .. //depot/projects/busdma/dev/igb/e1000_hw.h#1 branch .. //depot/projects/busdma/dev/igb/e1000_mac.c#1 branch .. //depot/projects/busdma/dev/igb/e1000_mac.h#1 branch .. //depot/projects/busdma/dev/igb/e1000_manage.c#1 branch .. //depot/projects/busdma/dev/igb/e1000_manage.h#1 branch .. //depot/projects/busdma/dev/igb/e1000_nvm.c#1 branch .. //depot/projects/busdma/dev/igb/e1000_nvm.h#1 branch .. //depot/projects/busdma/dev/igb/e1000_osdep.h#1 branch .. //depot/projects/busdma/dev/igb/e1000_phy.c#1 branch .. //depot/projects/busdma/dev/igb/e1000_phy.h#1 branch .. //depot/projects/busdma/dev/igb/e1000_regs.h#1 branch .. //depot/projects/busdma/dev/igb/if_igb.c#1 branch .. //depot/projects/busdma/dev/igb/if_igb.h#1 branch .. //depot/projects/busdma/dev/iir/iir.c#5 integrate .. //depot/projects/busdma/dev/iscsi/initiator/isc_soc.c#3 integrate .. //depot/projects/busdma/dev/kbd/kbd.c#3 integrate .. //depot/projects/busdma/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/busdma/dev/kbdmux/kbdmux.c#4 integrate .. //depot/projects/busdma/dev/le/am7990.c#4 integrate .. //depot/projects/busdma/dev/le/am79900.c#4 integrate .. //depot/projects/busdma/dev/lge/if_lge.c#6 integrate .. //depot/projects/busdma/dev/md/md.c#5 integrate .. //depot/projects/busdma/dev/mfi/mfi.c#8 integrate .. //depot/projects/busdma/dev/mfi/mfi_pci.c#6 integrate .. //depot/projects/busdma/dev/mfi/mfireg.h#7 integrate .. //depot/projects/busdma/dev/mii/amphy.c#5 integrate .. //depot/projects/busdma/dev/mii/brgphy.c#7 integrate .. //depot/projects/busdma/dev/mii/ciphy.c#6 integrate .. //depot/projects/busdma/dev/mii/miidevs#6 integrate .. //depot/projects/busdma/dev/mii/nsphy.c#5 integrate .. //depot/projects/busdma/dev/mii/nsphyter.c#1 branch .. //depot/projects/busdma/dev/mii/nsphyterreg.h#1 branch .. //depot/projects/busdma/dev/mii/rgephy.c#7 integrate .. //depot/projects/busdma/dev/msk/if_msk.c#4 integrate .. //depot/projects/busdma/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/busdma/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/busdma/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/busdma/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/busdma/dev/mxge/if_mxge_var.h#6 integrate .. //depot/projects/busdma/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/busdma/dev/mxge/mxge_mcp.h#4 integrate .. //depot/projects/busdma/dev/mxge/mxge_rss_eth_z8e.c#1 branch .. //depot/projects/busdma/dev/mxge/mxge_rss_ethp_z8e.c#1 branch .. //depot/projects/busdma/dev/mxge/rss_eth_z8e.h#1 branch .. //depot/projects/busdma/dev/mxge/rss_ethp_z8e.h#1 branch .. //depot/projects/busdma/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/busdma/dev/nfe/if_nfereg.h#5 integrate .. //depot/projects/busdma/dev/nfe/if_nfevar.h#4 integrate .. //depot/projects/busdma/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/busdma/dev/ofw/openpromio.c#2 integrate .. //depot/projects/busdma/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/busdma/dev/pccard/pccarddevs#7 integrate .. //depot/projects/busdma/dev/pci/pci.c#7 integrate .. //depot/projects/busdma/dev/pci/pci_user.c#4 integrate .. //depot/projects/busdma/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/busdma/dev/ppbus/ppbconf.c#3 integrate .. //depot/projects/busdma/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/busdma/dev/puc/pucdata.c#6 integrate .. //depot/projects/busdma/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/busdma/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/busdma/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/busdma/dev/quicc/quicc_core.c#1 branch .. //depot/projects/busdma/dev/ral/rt2560.c#7 integrate .. //depot/projects/busdma/dev/ral/rt2560reg.h#3 integrate .. //depot/projects/busdma/dev/ral/rt2560var.h#4 integrate .. //depot/projects/busdma/dev/re/if_re.c#8 integrate .. //depot/projects/busdma/dev/rr232x/LICENSE#2 delete .. //depot/projects/busdma/dev/rr232x/README#2 delete .. //depot/projects/busdma/dev/rr232x/amd64-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/busdma/dev/rr232x/array.h#2 delete .. //depot/projects/busdma/dev/rr232x/him.h#2 delete .. //depot/projects/busdma/dev/rr232x/himfuncs.h#2 delete .. //depot/projects/busdma/dev/rr232x/hptintf.h#2 delete .. //depot/projects/busdma/dev/rr232x/i386-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/busdma/dev/rr232x/ldm.h#2 delete .. //depot/projects/busdma/dev/rr232x/list.h#2 delete .. //depot/projects/busdma/dev/rr232x/os_bsd.c#2 delete .. //depot/projects/busdma/dev/rr232x/os_bsd.h#3 delete .. //depot/projects/busdma/dev/rr232x/osm.h#2 delete .. //depot/projects/busdma/dev/rr232x/osm_bsd.c#5 delete .. //depot/projects/busdma/dev/rr232x/rr232x_config.c#2 delete .. //depot/projects/busdma/dev/rr232x/rr232x_config.h#2 delete .. //depot/projects/busdma/dev/scc/scc_bfe.h#3 integrate .. //depot/projects/busdma/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/busdma/dev/scc/scc_bus.h#2 integrate .. //depot/projects/busdma/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/busdma/dev/sf/if_sf.c#1 branch .. //depot/projects/busdma/dev/sf/if_sfreg.h#1 branch .. //depot/projects/busdma/dev/sf/starfire_rx.h#1 branch .. //depot/projects/busdma/dev/sf/starfire_tx.h#1 branch .. //depot/projects/busdma/dev/sio/sio.c#7 integrate .. //depot/projects/busdma/dev/sk/if_sk.c#8 integrate .. //depot/projects/busdma/dev/sk/if_skreg.h#5 integrate .. //depot/projects/busdma/dev/snp/snp.c#5 integrate .. //depot/projects/busdma/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/busdma/dev/sound/pci/ich.c#6 integrate .. //depot/projects/busdma/dev/sound/pci/maestro.c#5 integrate .. //depot/projects/busdma/dev/stge/if_stge.c#5 integrate .. //depot/projects/busdma/dev/stge/if_stgereg.h#3 integrate .. //depot/projects/busdma/dev/streams/streams.c#5 integrate .. //depot/projects/busdma/dev/syscons/blank/blank_saver.c#2 integrate .. //depot/projects/busdma/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/busdma/dev/syscons/dragon/dragon_saver.c#2 integrate .. //depot/projects/busdma/dev/syscons/fade/fade_saver.c#2 integrate .. //depot/projects/busdma/dev/syscons/fire/fire_saver.c#3 integrate .. //depot/projects/busdma/dev/syscons/green/green_saver.c#2 integrate .. //depot/projects/busdma/dev/syscons/logo/logo_saver.c#3 integrate .. //depot/projects/busdma/dev/syscons/rain/rain_saver.c#3 integrate .. //depot/projects/busdma/dev/syscons/scgfbrndr.c#3 integrate .. //depot/projects/busdma/dev/syscons/scvgarndr.c#3 integrate .. //depot/projects/busdma/dev/syscons/scvidctl.c#3 integrate .. //depot/projects/busdma/dev/syscons/snake/snake_saver.c#2 integrate .. //depot/projects/busdma/dev/syscons/star/star_saver.c#2 integrate .. //depot/projects/busdma/dev/syscons/syscons.c#7 integrate .. //depot/projects/busdma/dev/syscons/syscons.h#5 integrate .. //depot/projects/busdma/dev/syscons/warp/warp_saver.c#3 integrate .. //depot/projects/busdma/dev/ti/if_ti.c#5 integrate .. //depot/projects/busdma/dev/tsec/if_tsec.c#1 branch .. //depot/projects/busdma/dev/tsec/if_tsec.h#1 branch .. //depot/projects/busdma/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/busdma/dev/twe/twe.c#2 integrate .. //depot/projects/busdma/dev/uart/uart.h#4 integrate .. //depot/projects/busdma/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/busdma/dev/uart/uart_bus_scc.c#2 integrate .. //depot/projects/busdma/dev/uart/uart_core.c#3 integrate .. //depot/projects/busdma/dev/uart/uart_cpu_powerpc.c#4 integrate .. //depot/projects/busdma/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/busdma/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/busdma/dev/usb/ehci.c#6 integrate .. //depot/projects/busdma/dev/usb/ehci_pci.c#7 integrate .. //depot/projects/busdma/dev/usb/if_axe.c#7 integrate .. //depot/projects/busdma/dev/usb/if_rum.c#3 integrate .. //depot/projects/busdma/dev/usb/if_udav.c#5 integrate .. //depot/projects/busdma/dev/usb/if_zyd.c#2 integrate .. //depot/projects/busdma/dev/usb/uark.c#3 integrate .. //depot/projects/busdma/dev/usb/ubsa.c#5 integrate .. //depot/projects/busdma/dev/usb/ucom.c#4 integrate .. //depot/projects/busdma/dev/usb/uftdi.c#4 integrate .. //depot/projects/busdma/dev/usb/uftdireg.h#2 integrate .. //depot/projects/busdma/dev/usb/ukbd.c#6 integrate .. //depot/projects/busdma/dev/usb/umass.c#5 integrate .. //depot/projects/busdma/dev/usb/ums.c#5 integrate .. //depot/projects/busdma/dev/usb/uplcom.c#7 integrate .. //depot/projects/busdma/dev/usb/usbdevs#8 integrate .. //depot/projects/busdma/dev/usb/usbdi.c#6 integrate .. //depot/projects/busdma/dev/usb/uscanner.c#6 integrate .. //depot/projects/busdma/dev/usb/uslcom.c#1 branch .. //depot/projects/busdma/dev/vkbd/vkbd.c#3 integrate .. //depot/projects/busdma/dev/vr/if_vr.c#1 branch .. //depot/projects/busdma/dev/vr/if_vrreg.h#1 branch .. //depot/projects/busdma/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/busdma/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/busdma/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/busdma/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/busdma/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/busdma/fs/coda/TODO#2 integrate .. //depot/projects/busdma/fs/coda/cnode.h#2 integrate .. //depot/projects/busdma/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/busdma/fs/coda/coda_io.h#2 integrate .. //depot/projects/busdma/fs/coda/coda_kernel.h#2 delete .. //depot/projects/busdma/fs/coda/coda_namecache.c#2 delete .. //depot/projects/busdma/fs/coda/coda_namecache.h#2 delete .. //depot/projects/busdma/fs/coda/coda_opstats.h#2 integrate .. //depot/projects/busdma/fs/coda/coda_pioctl.h#2 integrate .. //depot/projects/busdma/fs/coda/coda_psdev.c#2 integrate .. //depot/projects/busdma/fs/coda/coda_psdev.h#2 integrate .. //depot/projects/busdma/fs/coda/coda_subr.c#2 integrate .. //depot/projects/busdma/fs/coda/coda_subr.h#2 integrate .. //depot/projects/busdma/fs/coda/coda_venus.c#2 integrate .. //depot/projects/busdma/fs/coda/coda_venus.h#2 integrate .. //depot/projects/busdma/fs/coda/coda_vfsops.c#3 integrate .. //depot/projects/busdma/fs/coda/coda_vfsops.h#2 integrate .. //depot/projects/busdma/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/busdma/fs/coda/coda_vnops.h#2 integrate .. //depot/projects/busdma/fs/devfs/devfs_devs.c#6 integrate .. //depot/projects/busdma/fs/devfs/devfs_vfsops.c#4 integrate .. //depot/projects/busdma/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/busdma/fs/fdescfs/fdesc_vfsops.c#5 integrate .. //depot/projects/busdma/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/busdma/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/busdma/fs/hpfs/hpfs_subr.h#2 integrate .. //depot/projects/busdma/fs/hpfs/hpfs_vfsops.c#5 integrate .. //depot/projects/busdma/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/busdma/fs/msdosfs/msdosfs_denode.c#5 integrate .. //depot/projects/busdma/fs/msdosfs/msdosfs_lookup.c#4 integrate .. //depot/projects/busdma/fs/msdosfs/msdosfs_vfsops.c#7 integrate .. //depot/projects/busdma/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/busdma/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/busdma/fs/ntfs/ntfs_vfsops.c#6 integrate .. //depot/projects/busdma/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/busdma/fs/nullfs/null_subr.c#4 integrate .. //depot/projects/busdma/fs/nullfs/null_vfsops.c#7 integrate .. //depot/projects/busdma/fs/nullfs/null_vnops.c#5 integrate .. //depot/projects/busdma/fs/nwfs/nwfs_node.c#3 integrate .. //depot/projects/busdma/fs/nwfs/nwfs_subr.c#4 integrate .. //depot/projects/busdma/fs/nwfs/nwfs_vfsops.c#4 integrate .. //depot/projects/busdma/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/busdma/fs/portalfs/portal_vfsops.c#5 integrate .. //depot/projects/busdma/fs/portalfs/portal_vnops.c#4 integrate .. //depot/projects/busdma/fs/procfs/procfs.c#4 integrate .. //depot/projects/busdma/fs/procfs/procfs_ctl.c#3 integrate .. //depot/projects/busdma/fs/procfs/procfs_dbregs.c#3 integrate .. //depot/projects/busdma/fs/procfs/procfs_map.c#4 integrate .. //depot/projects/busdma/fs/procfs/procfs_status.c#5 integrate .. //depot/projects/busdma/fs/pseudofs/pseudofs_vncache.c#4 integrate .. //depot/projects/busdma/fs/pseudofs/pseudofs_vnops.c#6 integrate .. //depot/projects/busdma/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/busdma/fs/smbfs/smbfs_io.c#5 integrate .. //depot/projects/busdma/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/busdma/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/projects/busdma/fs/smbfs/smbfs_vnops.c#5 integrate .. //depot/projects/busdma/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/busdma/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/busdma/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/busdma/fs/udf/udf_vfsops.c#7 integrate .. //depot/projects/busdma/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/busdma/fs/unionfs/union_subr.c#5 integrate .. //depot/projects/busdma/fs/unionfs/union_vfsops.c#5 integrate .. //depot/projects/busdma/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/busdma/gdb/gdb_main.c#3 integrate .. //depot/projects/busdma/geom/geom_dev.c#5 integrate .. //depot/projects/busdma/geom/geom_disk.c#4 integrate .. //depot/projects/busdma/geom/geom_io.c#6 integrate .. //depot/projects/busdma/geom/linux_lvm/g_linux_lvm.c#1 branch .. //depot/projects/busdma/geom/linux_lvm/g_linux_lvm.h#1 branch .. //depot/projects/busdma/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/busdma/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/busdma/geom/part/g_part_vtoc8.c#1 branch .. //depot/projects/busdma/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/busdma/gnu/fs/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/busdma/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/busdma/gnu/fs/ext2fs/fs.h#2 integrate .. //depot/projects/busdma/gnu/fs/reiserfs/reiserfs_inode.c#3 integrate .. //depot/projects/busdma/gnu/fs/reiserfs/reiserfs_namei.c#3 integrate .. //depot/projects/busdma/gnu/fs/reiserfs/reiserfs_vfsops.c#7 integrate .. //depot/projects/busdma/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate .. //depot/projects/busdma/gnu/fs/xfs/FreeBSD/xfs_buf.h#3 integrate .. //depot/projects/busdma/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#3 integrate .. //depot/projects/busdma/gnu/fs/xfs/FreeBSD/xfs_mountops.c#6 integrate .. //depot/projects/busdma/gnu/fs/xfs/FreeBSD/xfs_super.c#4 integrate .. //depot/projects/busdma/gnu/fs/xfs/FreeBSD/xfs_vnode.c#3 integrate .. //depot/projects/busdma/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate .. //depot/projects/busdma/i386/acpica/madt.c#6 integrate .. //depot/projects/busdma/i386/conf/DEFAULTS#6 integrate .. //depot/projects/busdma/i386/conf/GENERIC#8 integrate .. //depot/projects/busdma/i386/conf/GENERIC.hints#4 integrate .. //depot/projects/busdma/i386/conf/NOTES#9 integrate .. //depot/projects/busdma/i386/conf/PAE#7 integrate .. //depot/projects/busdma/i386/cpufreq/est.c#3 integrate .. //depot/projects/busdma/i386/i386/busdma_machdep.c#7 integrate .. //depot/projects/busdma/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/busdma/i386/i386/geode.c#4 integrate .. //depot/projects/busdma/i386/i386/i686_mem.c#2 integrate .. //depot/projects/busdma/i386/i386/identcpu.c#6 integrate .. //depot/projects/busdma/i386/i386/initcpu.c#5 integrate .. //depot/projects/busdma/i386/i386/k6_mem.c#2 integrate .. //depot/projects/busdma/i386/i386/legacy.c#4 integrate .. //depot/projects/busdma/i386/i386/machdep.c#8 integrate .. //depot/projects/busdma/i386/i386/minidump_machdep.c#4 integrate .. //depot/projects/busdma/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/busdma/i386/i386/mp_watchdog.c#3 integrate .. //depot/projects/busdma/i386/i386/pmap.c#8 integrate .. //depot/projects/busdma/i386/i386/sys_machdep.c#5 integrate .. //depot/projects/busdma/i386/i386/trap.c#7 integrate .. //depot/projects/busdma/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_misc.c#6 integrate .. //depot/projects/busdma/i386/ibcs2/imgact_coff.c#5 integrate .. //depot/projects/busdma/i386/include/_types.h#2 integrate .. //depot/projects/busdma/i386/include/float.h#2 integrate .. //depot/projects/busdma/i386/include/ieeefp.h#2 integrate .. //depot/projects/busdma/i386/include/pmap.h#5 integrate .. //depot/projects/busdma/i386/include/proc.h#3 integrate .. //depot/projects/busdma/i386/include/smp.h#5 integrate .. //depot/projects/busdma/i386/include/specialreg.h#6 integrate .. //depot/projects/busdma/i386/include/vmparam.h#5 integrate .. //depot/projects/busdma/i386/isa/clock.c#6 integrate .. //depot/projects/busdma/i386/linux/imgact_linux.c#4 integrate .. //depot/projects/busdma/i386/linux/linux_machdep.c#6 integrate .. //depot/projects/busdma/i386/linux/linux_sysvec.c#6 integrate .. //depot/projects/busdma/i386/pci/pci_pir.c#3 integrate .. //depot/projects/busdma/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/busdma/ia64/conf/DEFAULTS#7 integrate .. //depot/projects/busdma/ia64/conf/GENERIC#8 integrate .. //depot/projects/busdma/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/busdma/ia64/ia64/locore.S#3 integrate .. //depot/projects/busdma/ia64/ia64/machdep.c#6 integrate .. //depot/projects/busdma/ia64/ia64/mp_machdep.c#5 integrate .. //depot/projects/busdma/ia64/ia64/pmap.c#8 integrate .. //depot/projects/busdma/ia64/ia64/trap.c#8 integrate .. //depot/projects/busdma/ia64/include/md_var.h#4 integrate .. //depot/projects/busdma/ia64/include/ucontext.h#2 integrate .. //depot/projects/busdma/ia64/include/vmparam.h#6 integrate .. //depot/projects/busdma/isa/vga_isa.c#2 integrate .. //depot/projects/busdma/kern/Makefile#4 integrate .. //depot/projects/busdma/kern/genassym.sh#2 integrate .. //depot/projects/busdma/kern/imgact_aout.c#3 integrate .. //depot/projects/busdma/kern/imgact_elf.c#5 integrate .. //depot/projects/busdma/kern/imgact_gzip.c#3 integrate .. //depot/projects/busdma/kern/init_main.c#7 integrate .. //depot/projects/busdma/kern/init_sysent.c#6 integrate .. //depot/projects/busdma/kern/kern_acct.c#7 integrate .. //depot/projects/busdma/kern/kern_alq.c#5 integrate .. //depot/projects/busdma/kern/kern_clock.c#6 integrate .. //depot/projects/busdma/kern/kern_condvar.c#4 integrate .. //depot/projects/busdma/kern/kern_cpu.c#5 integrate .. //depot/projects/busdma/kern/kern_cpuset.c#1 branch .. //depot/projects/busdma/kern/kern_descrip.c#7 integrate .. //depot/projects/busdma/kern/kern_event.c#6 integrate .. //depot/projects/busdma/kern/kern_exec.c#8 integrate .. //depot/projects/busdma/kern/kern_exit.c#7 integrate .. //depot/projects/busdma/kern/kern_fork.c#7 integrate .. //depot/projects/busdma/kern/kern_intr.c#6 integrate .. //depot/projects/busdma/kern/kern_jail.c#5 integrate .. //depot/projects/busdma/kern/kern_kse.c#5 delete .. //depot/projects/busdma/kern/kern_ktrace.c#7 integrate .. //depot/projects/busdma/kern/kern_linker.c#8 integrate .. //depot/projects/busdma/kern/kern_lock.c#6 integrate .. //depot/projects/busdma/kern/kern_mbuf.c#7 integrate .. //depot/projects/busdma/kern/kern_mib.c#5 integrate .. //depot/projects/busdma/kern/kern_module.c#6 integrate .. //depot/projects/busdma/kern/kern_mutex.c#7 integrate .. //depot/projects/busdma/kern/kern_priv.c#3 integrate .. //depot/projects/busdma/kern/kern_proc.c#6 integrate .. //depot/projects/busdma/kern/kern_resource.c#5 integrate .. //depot/projects/busdma/kern/kern_rwlock.c#6 integrate .. //depot/projects/busdma/kern/kern_shutdown.c#5 integrate .. //depot/projects/busdma/kern/kern_sig.c#8 integrate .. //depot/projects/busdma/kern/kern_switch.c#6 integrate .. //depot/projects/busdma/kern/kern_sx.c#6 integrate .. //depot/projects/busdma/kern/kern_synch.c#6 integrate .. //depot/projects/busdma/kern/kern_tc.c#5 integrate .. //depot/projects/busdma/kern/kern_thread.c#7 integrate .. //depot/projects/busdma/kern/kern_time.c#5 integrate .. //depot/projects/busdma/kern/kern_timeout.c#5 integrate .. //depot/projects/busdma/kern/kern_umtx.c#8 integrate .. //depot/projects/busdma/kern/link_elf.c#7 integrate .. //depot/projects/busdma/kern/link_elf_obj.c#6 integrate .. //depot/projects/busdma/kern/p1003_1b.c#3 integrate .. //depot/projects/busdma/kern/sched_4bsd.c#8 integrate .. //depot/projects/busdma/kern/sched_ule.c#7 integrate .. //depot/projects/busdma/kern/subr_autoconf.c#3 integrate .. //depot/projects/busdma/kern/subr_bus.c#7 integrate .. //depot/projects/busdma/kern/subr_kdb.c#4 integrate .. //depot/projects/busdma/kern/subr_lock.c#5 integrate .. //depot/projects/busdma/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/busdma/kern/subr_smp.c#5 integrate .. //depot/projects/busdma/kern/subr_trap.c#5 integrate .. //depot/projects/busdma/kern/subr_turnstile.c#6 integrate .. //depot/projects/busdma/kern/subr_witness.c#6 integrate .. //depot/projects/busdma/kern/sys_generic.c#6 integrate .. //depot/projects/busdma/kern/sys_pipe.c#6 integrate .. //depot/projects/busdma/kern/sys_process.c#6 integrate .. //depot/projects/busdma/kern/sys_socket.c#6 integrate .. //depot/projects/busdma/kern/syscalls.c#6 integrate .. //depot/projects/busdma/kern/syscalls.master#7 integrate .. //depot/projects/busdma/kern/systrace_args.c#4 integrate .. //depot/projects/busdma/kern/sysv_shm.c#6 integrate .. //depot/projects/busdma/kern/tty.c#5 integrate .. //depot/projects/busdma/kern/tty_cons.c#6 integrate .. //depot/projects/busdma/kern/tty_pty.c#6 integrate .. //depot/projects/busdma/kern/uipc_cow.c#2 integrate .. //depot/projects/busdma/kern/uipc_debug.c#3 integrate .. //depot/projects/busdma/kern/uipc_mbuf.c#7 integrate .. //depot/projects/busdma/kern/uipc_mqueue.c#5 integrate .. //depot/projects/busdma/kern/uipc_sem.c#5 integrate .. //depot/projects/busdma/kern/uipc_shm.c#1 branch .. //depot/projects/busdma/kern/uipc_sockbuf.c#5 integrate .. //depot/projects/busdma/kern/uipc_socket.c#7 integrate .. //depot/projects/busdma/kern/uipc_syscalls.c#7 integrate .. //depot/projects/busdma/kern/uipc_usrreq.c#8 integrate .. //depot/projects/busdma/kern/vfs_acl.c#3 integrate .. //depot/projects/busdma/kern/vfs_aio.c#8 integrate .. //depot/projects/busdma/kern/vfs_bio.c#6 integrate .. //depot/projects/busdma/kern/vfs_cache.c#6 integrate .. //depot/projects/busdma/kern/vfs_default.c#5 integrate .. //depot/projects/busdma/kern/vfs_extattr.c#3 integrate .. //depot/projects/busdma/kern/vfs_lookup.c#6 integrate .. //depot/projects/busdma/kern/vfs_mount.c#8 integrate .. //depot/projects/busdma/kern/vfs_subr.c#8 integrate .. //depot/projects/busdma/kern/vfs_syscalls.c#8 integrate .. //depot/projects/busdma/kern/vfs_vnops.c#7 integrate .. //depot/projects/busdma/kern/vnode_if.src#5 integrate .. //depot/projects/busdma/libkern/cmpdi2.c#1 branch .. //depot/projects/busdma/libkern/quad.h#2 integrate .. //depot/projects/busdma/modules/Makefile#9 integrate .. //depot/projects/busdma/modules/cmx/Makefile#1 branch .. //depot/projects/busdma/modules/coda/Makefile#3 integrate .. //depot/projects/busdma/modules/coda5/Makefile#3 integrate .. //depot/projects/busdma/modules/cxgb/Makefile#4 integrate .. //depot/projects/busdma/modules/cxgb/cxgb/Makefile#1 branch .. //depot/projects/busdma/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/busdma/modules/cxgb/toecore/Makefile#1 branch .. //depot/projects/busdma/modules/cxgb/tom/Makefile#1 branch .. //depot/projects/busdma/modules/em/Makefile#3 integrate .. //depot/projects/busdma/modules/geom/Makefile#5 integrate .. //depot/projects/busdma/modules/geom/geom_apple/Makefile#2 delete .. //depot/projects/busdma/modules/geom/geom_eli/Makefile#3 integrate .. //depot/projects/busdma/modules/geom/geom_gpt/Makefile#2 delete .. //depot/projects/busdma/modules/geom/geom_linux_lvm/Makefile#1 branch .. //depot/projects/busdma/modules/geom/geom_part/Makefile#1 branch .. //depot/projects/busdma/modules/hptrr/Makefile#1 branch .. //depot/projects/busdma/modules/hwpmc/Makefile#3 integrate .. //depot/projects/busdma/modules/igb/Makefile#1 branch .. //depot/projects/busdma/modules/ipfw_nat/Makefile#1 branch .. //depot/projects/busdma/modules/mii/Makefile#4 integrate .. //depot/projects/busdma/modules/mxge/Makefile#2 integrate .. //depot/projects/busdma/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch .. //depot/projects/busdma/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch .. //depot/projects/busdma/modules/rr232x/Makefile#3 delete .. //depot/projects/busdma/modules/sf/Makefile#2 integrate .. //depot/projects/busdma/modules/sound/driver/emu10kx/Makefile#4 integrate .. //depot/projects/busdma/modules/uslcom/Makefile#1 branch .. //depot/projects/busdma/modules/vr/Makefile#2 integrate .. //depot/projects/busdma/modules/zfs/Makefile#4 integrate .. //depot/projects/busdma/net/bpf.c#9 integrate .. //depot/projects/busdma/net/bpf.h#6 integrate .. //depot/projects/busdma/net/bpf_filter.c#4 integrate .. //depot/projects/busdma/net/ieee8023ad_lacp.c#4 integrate .. //depot/projects/busdma/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/busdma/net/if.c#8 integrate .. //depot/projects/busdma/net/if.h#5 integrate .. //depot/projects/busdma/net/if_bridge.c#7 integrate .. //depot/projects/busdma/net/if_enc.c#5 integrate .. //depot/projects/busdma/net/if_ethersubr.c#6 integrate .. //depot/projects/busdma/net/if_gif.c#7 integrate .. //depot/projects/busdma/net/if_lagg.c#4 integrate .. //depot/projects/busdma/net/netisr.h#2 integrate .. //depot/projects/busdma/net/route.c#7 integrate .. //depot/projects/busdma/net/route.h#2 integrate .. //depot/projects/busdma/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/busdma/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/busdma/net80211/ieee80211_input.c#7 integrate .. //depot/projects/busdma/net80211/ieee80211_radiotap.h#4 integrate .. //depot/projects/busdma/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/busdma/netgraph/netflow/netflow.c#4 integrate .. //depot/projects/busdma/netgraph/netflow/ng_netflow.c#3 integrate .. //depot/projects/busdma/netgraph/netgraph.h#6 integrate .. //depot/projects/busdma/netgraph/ng_base.c#6 integrate .. //depot/projects/busdma/netgraph/ng_bpf.c#3 integrate .. //depot/projects/busdma/netgraph/ng_car.c#2 integrate .. //depot/projects/busdma/netgraph/ng_car.h#2 integrate .. //depot/projects/busdma/netgraph/ng_iface.c#3 integrate .. //depot/projects/busdma/netgraph/ng_ksocket.c#4 integrate .. //depot/projects/busdma/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/busdma/netgraph/ng_nat.c#4 integrate .. //depot/projects/busdma/netgraph/ng_nat.h#3 integrate .. //depot/projects/busdma/netgraph/ng_ppp.c#5 integrate .. //depot/projects/busdma/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/busdma/netgraph/ng_pppoe.h#3 integrate .. //depot/projects/busdma/netgraph/ng_pred1.c#2 integrate .. //depot/projects/busdma/netgraph/ng_socket.c#7 integrate .. //depot/projects/busdma/netgraph/ng_tee.c#2 integrate .. //depot/projects/busdma/netinet/if_ether.c#8 integrate .. //depot/projects/busdma/netinet/if_ether.h#2 integrate .. //depot/projects/busdma/netinet/in.c#6 integrate .. //depot/projects/busdma/netinet/in.h#5 integrate .. //depot/projects/busdma/netinet/in_pcb.c#8 integrate .. //depot/projects/busdma/netinet/in_rmx.c#5 integrate .. //depot/projects/busdma/netinet/ip_carp.c#7 integrate .. //depot/projects/busdma/netinet/ip_dummynet.c#6 integrate .. //depot/projects/busdma/netinet/ip_fw.h#6 integrate .. //depot/projects/busdma/netinet/ip_fw2.c#9 integrate .. //depot/projects/busdma/netinet/ip_fw_nat.c#1 branch .. //depot/projects/busdma/netinet/ip_fw_pfil.c#5 integrate .. //depot/projects/busdma/netinet/ip_id.c#4 integrate .. //depot/projects/busdma/netinet/ip_options.c#5 integrate .. //depot/projects/busdma/netinet/ip_output.c#8 integrate .. //depot/projects/busdma/netinet/libalias/alias.c#4 integrate .. //depot/projects/busdma/netinet/libalias/alias.h#4 integrate .. //depot/projects/busdma/netinet/libalias/alias_db.c#4 integrate .. //depot/projects/busdma/netinet/libalias/alias_ftp.c#4 integrate .. //depot/projects/busdma/netinet/libalias/alias_irc.c#4 integrate .. //depot/projects/busdma/netinet/libalias/alias_local.h#4 integrate .. //depot/projects/busdma/netinet/libalias/alias_old.c#3 delete .. //depot/projects/busdma/netinet/libalias/alias_proxy.c#5 integrate .. //depot/projects/busdma/netinet/libalias/alias_smedia.c#4 integrate .. //depot/projects/busdma/netinet/sctp_auth.c#4 integrate .. //depot/projects/busdma/netinet/sctp_bsd_addr.c#4 integrate .. //depot/projects/busdma/netinet/sctp_indata.c#4 integrate .. //depot/projects/busdma/netinet/sctp_input.c#4 integrate .. //depot/projects/busdma/netinet/sctp_output.c#4 integrate .. //depot/projects/busdma/netinet/sctp_pcb.c#4 integrate .. //depot/projects/busdma/netinet/sctp_peeloff.c#4 integrate .. //depot/projects/busdma/netinet/sctputil.c#4 integrate .. //depot/projects/busdma/netinet/tcp.h#4 integrate .. //depot/projects/busdma/netinet/tcp_input.c#8 integrate .. //depot/projects/busdma/netinet/tcp_offload.c#1 branch .. //depot/projects/busdma/netinet/tcp_offload.h#1 branch .. //depot/projects/busdma/netinet/tcp_output.c#6 integrate .. //depot/projects/busdma/netinet/tcp_subr.c#6 integrate .. //depot/projects/busdma/netinet/tcp_syncache.c#8 integrate .. //depot/projects/busdma/netinet/tcp_syncache.h#2 integrate .. //depot/projects/busdma/netinet/tcp_usrreq.c#8 integrate .. //depot/projects/busdma/netinet/tcp_var.h#8 integrate .. //depot/projects/busdma/netinet/toedev.h#1 branch .. //depot/projects/busdma/netinet6/dest6.c#3 integrate .. //depot/projects/busdma/netinet6/frag6.c#6 integrate .. //depot/projects/busdma/netinet6/icmp6.c#5 integrate .. //depot/projects/busdma/netinet6/in6.c#8 integrate .. //depot/projects/busdma/netinet6/in6.h#3 integrate .. //depot/projects/busdma/netinet6/in6_cksum.c#6 integrate .. //depot/projects/busdma/netinet6/in6_gif.c#5 integrate .. //depot/projects/busdma/netinet6/in6_gif.h#2 integrate .. //depot/projects/busdma/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/busdma/netinet6/in6_ifattach.h#2 integrate .. //depot/projects/busdma/netinet6/in6_pcb.c#6 integrate .. //depot/projects/busdma/netinet6/in6_pcb.h#3 integrate .. //depot/projects/busdma/netinet6/in6_proto.c#5 integrate .. //depot/projects/busdma/netinet6/in6_rmx.c#4 integrate .. //depot/projects/busdma/netinet6/in6_src.c#6 integrate .. //depot/projects/busdma/netinet6/in6_var.h#5 integrate .. //depot/projects/busdma/netinet6/ip6_ecn.h#2 integrate .. //depot/projects/busdma/netinet6/ip6_forward.c#7 integrate .. //depot/projects/busdma/netinet6/ip6_id.c#3 integrate .. //depot/projects/busdma/netinet6/ip6_input.c#6 integrate .. //depot/projects/busdma/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/busdma/netinet6/ip6_ipsec.h#2 integrate .. //depot/projects/busdma/netinet6/ip6_mroute.c#5 integrate .. //depot/projects/busdma/netinet6/ip6_mroute.h#5 integrate .. //depot/projects/busdma/netinet6/ip6_output.c#6 integrate .. //depot/projects/busdma/netinet6/ip6_var.h#4 integrate .. //depot/projects/busdma/netinet6/ip6protosw.h#2 integrate .. //depot/projects/busdma/netinet6/mld6.c#5 integrate .. //depot/projects/busdma/netinet6/mld6_var.h#2 integrate .. //depot/projects/busdma/netinet6/nd6.c#7 integrate .. //depot/projects/busdma/netinet6/nd6.h#2 integrate .. //depot/projects/busdma/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/busdma/netinet6/nd6_rtr.c#5 integrate .. //depot/projects/busdma/netinet6/pim6.h#2 integrate .. //depot/projects/busdma/netinet6/pim6_var.h#2 integrate .. //depot/projects/busdma/netinet6/raw_ip6.c#6 integrate .. //depot/projects/busdma/netinet6/raw_ip6.h#2 integrate .. //depot/projects/busdma/netinet6/route6.c#3 integrate .. //depot/projects/busdma/netinet6/scope6.c#4 integrate .. //depot/projects/busdma/netinet6/scope6_var.h#2 integrate .. //depot/projects/busdma/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/busdma/netinet6/sctp6_var.h#4 integrate .. //depot/projects/busdma/netinet6/tcp6_var.h#2 integrate .. //depot/projects/busdma/netinet6/udp6_usrreq.c#7 integrate .. //depot/projects/busdma/netinet6/udp6_var.h#3 integrate .. //depot/projects/busdma/netipsec/ipsec.c#6 integrate .. //depot/projects/busdma/netipsec/ipsec.h#5 integrate .. //depot/projects/busdma/netipsec/ipsec6.h#3 integrate .. //depot/projects/busdma/netipsec/key.c#4 integrate .. //depot/projects/busdma/netipsec/key_debug.c#3 integrate .. //depot/projects/busdma/netncp/ncp_conn.c#4 integrate .. //depot/projects/busdma/netncp/ncp_conn.h#2 integrate .. //depot/projects/busdma/netncp/ncp_rq.c#2 integrate .. //depot/projects/busdma/netncp/ncp_sock.c#5 integrate .. //depot/projects/busdma/netncp/ncp_sock.h#2 integrate .. //depot/projects/busdma/netsmb/smb_conn.c#4 integrate .. //depot/projects/busdma/netsmb/smb_conn.h#2 integrate .. //depot/projects/busdma/netsmb/smb_iod.c#4 integrate .. //depot/projects/busdma/netsmb/smb_trantcp.c#4 integrate .. //depot/projects/busdma/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/busdma/nfs4client/nfs4_vfsops.c#6 integrate .. //depot/projects/busdma/nfs4client/nfs4_vnops.c#6 integrate .. //depot/projects/busdma/nfsclient/nfs_bio.c#6 integrate .. //depot/projects/busdma/nfsclient/nfs_diskless.c#4 integrate .. //depot/projects/busdma/nfsclient/nfs_node.c#5 integrate .. //depot/projects/busdma/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/busdma/nfsclient/nfs_subs.c#7 integrate .. //depot/projects/busdma/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/busdma/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/busdma/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/busdma/nfsclient/nfsnode.h#5 integrate .. //depot/projects/busdma/nfsserver/nfs_serv.c#6 integrate .. //depot/projects/busdma/nfsserver/nfs_srvsubs.c#7 integrate .. //depot/projects/busdma/opencrypto/cryptodev.c#6 integrate .. //depot/projects/busdma/pc98/cbus/gdc.c#2 integrate .. //depot/projects/busdma/pc98/cbus/pckbd.c#4 integrate .. //depot/projects/busdma/pc98/cbus/scgdcrndr.c#2 integrate .. //depot/projects/busdma/pc98/cbus/sio.c#6 integrate .. //depot/projects/busdma/pc98/conf/DEFAULTS#5 integrate .. //depot/projects/busdma/pc98/conf/GENERIC#9 integrate .. //depot/projects/busdma/pc98/pc98/machdep.c#8 integrate .. //depot/projects/busdma/pci/amdsmb.c#5 integrate .. //depot/projects/busdma/pci/if_rl.c#6 integrate .. //depot/projects/busdma/pci/if_rlreg.h#8 integrate .. //depot/projects/busdma/pci/if_sf.c#5 delete .. //depot/projects/busdma/pci/if_sfreg.h#4 delete .. //depot/projects/busdma/pci/if_vr.c#6 delete .. //depot/projects/busdma/pci/if_vrreg.h#6 delete .. //depot/projects/busdma/pci/if_wb.c#5 integrate .. //depot/projects/busdma/pci/nfsmb.c#6 integrate .. //depot/projects/busdma/powerpc/aim/clock.c#1 branch .. //depot/projects/busdma/powerpc/aim/copyinout.c#1 branch .. //depot/projects/busdma/powerpc/aim/interrupt.c#1 branch .. //depot/projects/busdma/powerpc/aim/locore.S#1 branch .. //depot/projects/busdma/powerpc/aim/machdep.c#1 branch .. //depot/projects/busdma/powerpc/aim/mmu_oea.c#1 branch .. //depot/projects/busdma/powerpc/aim/nexus.c#1 branch .. //depot/projects/busdma/powerpc/aim/ofw_machdep.c#1 branch .. //depot/projects/busdma/powerpc/aim/ofwmagic.S#1 branch .. //depot/projects/busdma/powerpc/aim/swtch.S#1 branch .. //depot/projects/busdma/powerpc/aim/trap.c#1 branch .. //depot/projects/busdma/powerpc/aim/trap_subr.S#1 branch .. //depot/projects/busdma/powerpc/aim/uio_machdep.c#1 branch .. //depot/projects/busdma/powerpc/aim/uma_machdep.c#1 branch .. //depot/projects/busdma/powerpc/aim/vm_machdep.c#1 branch .. //depot/projects/busdma/powerpc/booke/clock.c#1 branch .. //depot/projects/busdma/powerpc/booke/copyinout.c#1 branch .. //depot/projects/busdma/powerpc/booke/interrupt.c#1 branch .. //depot/projects/busdma/powerpc/booke/locore.S#1 branch .. //depot/projects/busdma/powerpc/booke/machdep.c#1 branch .. //depot/projects/busdma/powerpc/booke/pmap.c#1 branch .. //depot/projects/busdma/powerpc/booke/support.S#1 branch .. //depot/projects/busdma/powerpc/booke/swtch.S#1 branch .. //depot/projects/busdma/powerpc/booke/trap.c#1 branch .. //depot/projects/busdma/powerpc/booke/trap_subr.S#1 branch .. //depot/projects/busdma/powerpc/booke/uio_machdep.c#1 branch .. //depot/projects/busdma/powerpc/booke/vm_machdep.c#1 branch .. //depot/projects/busdma/powerpc/conf/DEFAULTS#5 integrate .. //depot/projects/busdma/powerpc/conf/GENERIC#8 integrate .. //depot/projects/busdma/powerpc/conf/MPC85XX#1 branch .. //depot/projects/busdma/powerpc/conf/NOTES#5 integrate .. //depot/projects/busdma/powerpc/fpu/fpu_add.c#1 branch .. //depot/projects/busdma/powerpc/fpu/fpu_arith.h#1 branch .. //depot/projects/busdma/powerpc/fpu/fpu_compare.c#1 branch .. //depot/projects/busdma/powerpc/fpu/fpu_div.c#1 branch .. //depot/projects/busdma/powerpc/fpu/fpu_emu.c#1 branch .. //depot/projects/busdma/powerpc/fpu/fpu_emu.h#1 branch .. //depot/projects/busdma/powerpc/fpu/fpu_explode.c#1 branch .. //depot/projects/busdma/powerpc/fpu/fpu_extern.h#1 branch .. //depot/projects/busdma/powerpc/fpu/fpu_implode.c#1 branch .. //depot/projects/busdma/powerpc/fpu/fpu_instr.h#1 branch .. //depot/projects/busdma/powerpc/fpu/fpu_mul.c#1 branch .. //depot/projects/busdma/powerpc/fpu/fpu_sqrt.c#1 branch .. //depot/projects/busdma/powerpc/fpu/fpu_subr.c#1 branch .. //depot/projects/busdma/powerpc/include/_bus.h#2 integrate .. //depot/projects/busdma/powerpc/include/bootinfo.h#2 integrate .. //depot/projects/busdma/powerpc/include/bus.h#3 integrate .. //depot/projects/busdma/powerpc/include/float.h#2 integrate .. //depot/projects/busdma/powerpc/include/fpu.h#2 integrate .. //depot/projects/busdma/powerpc/include/frame.h#2 integrate .. //depot/projects/busdma/powerpc/include/hid.h#2 integrate .. //depot/projects/busdma/powerpc/include/intr_machdep.h#4 integrate .. //depot/projects/busdma/powerpc/include/kdb.h#3 integrate .. //depot/projects/busdma/powerpc/include/md_var.h#5 integrate .. //depot/projects/busdma/powerpc/include/metadata.h#2 integrate .. //depot/projects/busdma/powerpc/include/mmuvar.h#2 integrate .. //depot/projects/busdma/powerpc/include/ocpbus.h#1 branch .. //depot/projects/busdma/powerpc/include/openpicreg.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 13 03:37:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9F201065672; Thu, 13 Mar 2008 03:37:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8873C1065670 for ; Thu, 13 Mar 2008 03:37:39 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 866418FC1E for ; Thu, 13 Mar 2008 03:37:39 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2D3bdu8058893 for ; Thu, 13 Mar 2008 03:37:39 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2D3bcpK058891 for perforce@freebsd.org; Thu, 13 Mar 2008 03:37:38 GMT (envelope-from marcel@freebsd.org) Date: Thu, 13 Mar 2008 03:37:38 GMT Message-Id: <200803130337.m2D3bcpK058891@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 137569 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, 13 Mar 2008 03:37:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=137569 Change 137569 by marcel@marcel_xcllnt on 2008/03/13 03:37:35 IFC @137564 Affected files ... .. //depot/projects/e500/ObsoleteFiles.inc#10 integrate .. //depot/projects/e500/UPDATING#10 integrate .. //depot/projects/e500/bin/chflags/chflags.1#3 integrate .. //depot/projects/e500/bin/chflags/chflags.c#2 integrate .. //depot/projects/e500/bin/cp/cp.1#2 integrate .. //depot/projects/e500/bin/cp/cp.c#3 integrate .. //depot/projects/e500/bin/cp/utils.c#2 integrate .. //depot/projects/e500/bin/ps/ps.1#2 integrate .. //depot/projects/e500/bin/realpath/realpath.1#2 integrate .. //depot/projects/e500/bin/realpath/realpath.c#2 integrate .. //depot/projects/e500/bin/uuidgen/Makefile#1 branch .. //depot/projects/e500/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/e500/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/e500/contrib/tcsh/sh.lex.c#3 integrate .. //depot/projects/e500/etc/rc.d/mountlate#4 integrate .. //depot/projects/e500/etc/rc.d/root#4 integrate .. //depot/projects/e500/lib/Makefile#6 integrate .. //depot/projects/e500/lib/libalias/libalias/Makefile#3 integrate .. //depot/projects/e500/lib/libarchive/archive_entry.3#4 integrate .. //depot/projects/e500/lib/libarchive/archive_entry.c#5 integrate .. //depot/projects/e500/lib/libarchive/archive_read.3#4 integrate .. //depot/projects/e500/lib/libarchive/archive_read.c#4 integrate .. //depot/projects/e500/lib/libarchive/archive_read_private.h#4 integrate .. //depot/projects/e500/lib/libarchive/archive_read_support_format_ar.c#5 integrate .. //depot/projects/e500/lib/libarchive/archive_util.3#3 integrate .. //depot/projects/e500/lib/libarchive/archive_write.3#3 integrate .. //depot/projects/e500/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/e500/lib/libarchive/test/Makefile#6 integrate .. //depot/projects/e500/lib/libarchive/test/main.c#6 integrate .. //depot/projects/e500/lib/libarchive/test/test.h#6 integrate .. //depot/projects/e500/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/e500/lib/libarchive/test/test_entry.c#3 integrate .. //depot/projects/e500/lib/libarchive/test/test_read_format_ar.c#4 integrate .. //depot/projects/e500/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/e500/lib/libarchive/test/test_write_format_ar.c#4 integrate .. //depot/projects/e500/lib/libc/gen/Makefile.inc#6 integrate .. //depot/projects/e500/lib/libc/gen/sem_timedwait.3#1 branch .. //depot/projects/e500/lib/libc/gen/sem_wait.3#2 integrate .. //depot/projects/e500/lib/libc/sys/Makefile.inc#6 integrate .. //depot/projects/e500/lib/libc/sys/Symbol.map#7 integrate .. //depot/projects/e500/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/e500/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/e500/lib/libkvm/kvm_proc.c#5 integrate .. //depot/projects/e500/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/e500/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/e500/lib/libsdp/sdp.h#2 integrate .. //depot/projects/e500/lib/libthr/thread/thr_sem.c#4 integrate .. //depot/projects/e500/lib/libthread_db/Makefile#3 integrate .. //depot/projects/e500/lib/libutil/humanize_number.c#2 integrate .. //depot/projects/e500/release/doc/share/misc/dev.archlist.txt#7 integrate .. //depot/projects/e500/sbin/mount/mount.8#5 integrate .. //depot/projects/e500/share/man/man4/uart.4#2 integrate .. //depot/projects/e500/share/man/man4/vr.4#2 integrate .. //depot/projects/e500/share/man/man9/DEVICE_PROBE.9#2 integrate .. //depot/projects/e500/share/misc/committers-ports.dot#8 integrate .. //depot/projects/e500/share/zoneinfo/leapseconds#5 integrate .. //depot/projects/e500/share/zoneinfo/southamerica#6 integrate .. //depot/projects/e500/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/e500/sys/amd64/amd64/legacy.c#3 integrate .. //depot/projects/e500/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/e500/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/e500/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/e500/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/e500/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/e500/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/e500/sys/amd64/include/specialreg.h#6 integrate .. //depot/projects/e500/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/e500/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/e500/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/e500/sys/arm/arm/trap.c#5 integrate .. //depot/projects/e500/sys/arm/conf/AVILA#6 integrate .. //depot/projects/e500/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/e500/sys/boot/common/dev_net.c#3 integrate .. //depot/projects/e500/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/e500/sys/boot/powerpc/uboot/metadata.c#10 integrate .. //depot/projects/e500/sys/boot/uboot/lib/console.c#5 integrate .. //depot/projects/e500/sys/boot/uboot/lib/copy.c#4 integrate .. //depot/projects/e500/sys/boot/uboot/lib/glue.c#8 integrate .. //depot/projects/e500/sys/boot/uboot/lib/libuboot.h#5 integrate .. //depot/projects/e500/sys/boot/uboot/lib/net.c#5 integrate .. //depot/projects/e500/sys/boot/uboot/lib/time.c#5 integrate .. //depot/projects/e500/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/e500/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/e500/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/e500/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/e500/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/e500/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/e500/sys/conf/NOTES#17 integrate .. //depot/projects/e500/sys/conf/files#19 integrate .. //depot/projects/e500/sys/conf/options#13 integrate .. //depot/projects/e500/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/e500/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/e500/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/e500/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/e500/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/e500/sys/dev/gem/if_gem.c#6 integrate .. //depot/projects/e500/sys/dev/msk/if_msk.c#8 integrate .. //depot/projects/e500/sys/dev/mxge/if_mxge.c#10 integrate .. //depot/projects/e500/sys/dev/tsec/if_tsec.c#10 integrate .. //depot/projects/e500/sys/dev/tsec/if_tsec.h#5 integrate .. //depot/projects/e500/sys/dev/uart/uart.h#4 integrate .. //depot/projects/e500/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/e500/sys/dev/usb/ehci_pci.c#5 integrate .. //depot/projects/e500/sys/dev/usb/ums.c#6 integrate .. //depot/projects/e500/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/e500/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/e500/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/e500/sys/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/e500/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/e500/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/e500/sys/fs/procfs/procfs_ctl.c#3 integrate .. //depot/projects/e500/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/e500/sys/fs/procfs/procfs_status.c#4 integrate .. //depot/projects/e500/sys/i386/conf/DEFAULTS#4 integrate .. //depot/projects/e500/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/e500/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/e500/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/e500/sys/i386/i386/legacy.c#3 integrate .. //depot/projects/e500/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/e500/sys/i386/i386/sys_machdep.c#5 integrate .. //depot/projects/e500/sys/i386/i386/trap.c#6 integrate .. //depot/projects/e500/sys/i386/i386/vm_machdep.c#7 integrate .. //depot/projects/e500/sys/i386/ibcs2/imgact_coff.c#5 integrate .. //depot/projects/e500/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/e500/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/e500/sys/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/e500/sys/ia64/ia64/machdep.c#10 integrate .. //depot/projects/e500/sys/ia64/ia64/trap.c#5 integrate .. //depot/projects/e500/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/e500/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/e500/sys/kern/init_sysent.c#6 integrate .. //depot/projects/e500/sys/kern/kern_clock.c#8 integrate .. //depot/projects/e500/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/e500/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/e500/sys/kern/kern_exec.c#8 integrate .. //depot/projects/e500/sys/kern/kern_fork.c#8 integrate .. //depot/projects/e500/sys/kern/kern_intr.c#6 integrate .. //depot/projects/e500/sys/kern/kern_kse.c#6 delete .. //depot/projects/e500/sys/kern/kern_proc.c#7 integrate .. //depot/projects/e500/sys/kern/kern_resource.c#8 integrate .. //depot/projects/e500/sys/kern/kern_sig.c#11 integrate .. //depot/projects/e500/sys/kern/kern_switch.c#6 integrate .. //depot/projects/e500/sys/kern/kern_sx.c#8 integrate .. //depot/projects/e500/sys/kern/kern_synch.c#8 integrate .. //depot/projects/e500/sys/kern/kern_thread.c#12 integrate .. //depot/projects/e500/sys/kern/kern_timeout.c#7 integrate .. //depot/projects/e500/sys/kern/p1003_1b.c#4 integrate .. //depot/projects/e500/sys/kern/sched_4bsd.c#9 integrate .. //depot/projects/e500/sys/kern/sched_ule.c#10 integrate .. //depot/projects/e500/sys/kern/subr_bus.c#7 integrate .. //depot/projects/e500/sys/kern/subr_sleepqueue.c#8 integrate .. //depot/projects/e500/sys/kern/subr_smp.c#8 integrate .. //depot/projects/e500/sys/kern/subr_trap.c#8 integrate .. //depot/projects/e500/sys/kern/subr_witness.c#11 integrate .. //depot/projects/e500/sys/kern/sys_process.c#5 integrate .. //depot/projects/e500/sys/kern/syscalls.c#6 integrate .. //depot/projects/e500/sys/kern/syscalls.master#7 integrate .. //depot/projects/e500/sys/kern/systrace_args.c#6 integrate .. //depot/projects/e500/sys/modules/vr/Makefile#2 integrate .. //depot/projects/e500/sys/net/bpf_filter.c#4 integrate .. //depot/projects/e500/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/e500/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/e500/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/e500/sys/netgraph/ng_socket.c#5 integrate .. //depot/projects/e500/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/e500/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/e500/sys/netinet/libalias/alias_old.c#2 delete .. //depot/projects/e500/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/e500/sys/netsmb/smb_conn.h#3 integrate .. //depot/projects/e500/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/e500/sys/pc98/conf/GENERIC#8 integrate .. //depot/projects/e500/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/e500/sys/pci/if_vr.c#4 delete .. //depot/projects/e500/sys/pci/if_vrreg.h#2 delete .. //depot/projects/e500/sys/powerpc/aim/trap.c#9 integrate .. //depot/projects/e500/sys/powerpc/aim/vm_machdep.c#10 integrate .. //depot/projects/e500/sys/powerpc/booke/machdep.c#16 integrate .. //depot/projects/e500/sys/powerpc/booke/trap.c#10 integrate .. //depot/projects/e500/sys/powerpc/booke/vm_machdep.c#7 integrate .. //depot/projects/e500/sys/powerpc/conf/DEFAULTS#3 integrate .. //depot/projects/e500/sys/powerpc/include/bootinfo.h#6 integrate .. //depot/projects/e500/sys/powerpc/include/ocpbus.h#4 integrate .. //depot/projects/e500/sys/powerpc/mpc85xx/ocpbus.c#11 integrate .. //depot/projects/e500/sys/powerpc/powerpc/intr_machdep.c#7 integrate .. //depot/projects/e500/sys/security/audit/audit_worker.c#7 integrate .. //depot/projects/e500/sys/sparc64/conf/DEFAULTS#4 integrate .. //depot/projects/e500/sys/sparc64/conf/GENERIC#9 integrate .. //depot/projects/e500/sys/sparc64/include/tlb.h#2 integrate .. //depot/projects/e500/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/e500/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/e500/sys/sparc64/sparc64/iommu.c#3 integrate .. //depot/projects/e500/sys/sparc64/sparc64/mp_machdep.c#6 integrate .. //depot/projects/e500/sys/sparc64/sparc64/pmap.c#9 integrate .. //depot/projects/e500/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/e500/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/e500/sys/sparc64/sparc64/trap.c#4 integrate .. //depot/projects/e500/sys/sun4v/sun4v/mp_machdep.c#5 integrate .. //depot/projects/e500/sys/sys/bus.h#3 integrate .. //depot/projects/e500/sys/sys/condvar.h#2 integrate .. //depot/projects/e500/sys/sys/cpuset.h#3 integrate .. //depot/projects/e500/sys/sys/disklabel.h#3 integrate .. //depot/projects/e500/sys/sys/fcntl.h#3 integrate .. //depot/projects/e500/sys/sys/kse.h#2 delete .. //depot/projects/e500/sys/sys/param.h#13 integrate .. //depot/projects/e500/sys/sys/proc.h#12 integrate .. //depot/projects/e500/sys/sys/sched.h#5 integrate .. //depot/projects/e500/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/e500/sys/sys/syscall.h#6 integrate .. //depot/projects/e500/sys/sys/syscall.mk#6 integrate .. //depot/projects/e500/sys/sys/sysproto.h#6 integrate .. //depot/projects/e500/sys/sys/systm.h#8 integrate .. //depot/projects/e500/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/e500/sys/vm/vm_fault.c#9 integrate .. //depot/projects/e500/sys/vm/vm_glue.c#7 integrate .. //depot/projects/e500/sys/vm/vm_map.c#8 integrate .. //depot/projects/e500/sys/vm/vm_meter.c#6 integrate .. //depot/projects/e500/tools/build/mk/OptionalObsoleteFiles.inc#5 integrate .. //depot/projects/e500/tools/regression/file/dup/dup.c#2 integrate .. //depot/projects/e500/usr.bin/ar/ar.1#2 integrate .. //depot/projects/e500/usr.bin/ar/ar.c#3 integrate .. //depot/projects/e500/usr.bin/ar/ar.h#2 integrate .. //depot/projects/e500/usr.bin/ar/write.c#4 integrate .. //depot/projects/e500/usr.bin/cpuset/cpuset.1#2 integrate .. //depot/projects/e500/usr.bin/cpuset/cpuset.c#3 integrate .. //depot/projects/e500/usr.bin/gzip/gzip.c#4 integrate .. //depot/projects/e500/usr.bin/kdump/kdump.c#6 integrate .. //depot/projects/e500/usr.bin/kdump/kdump_subr.h#2 integrate .. //depot/projects/e500/usr.bin/kdump/mksubr#4 integrate .. //depot/projects/e500/usr.bin/make/globals.h#2 integrate .. //depot/projects/e500/usr.bin/make/hash_tables.c#2 integrate .. //depot/projects/e500/usr.bin/make/main.c#5 integrate .. //depot/projects/e500/usr.bin/make/make.1#4 integrate .. //depot/projects/e500/usr.bin/make/parse.c#2 integrate .. //depot/projects/e500/usr.bin/ministat/ministat.1#2 integrate .. //depot/projects/e500/usr.sbin/Makefile#6 integrate .. //depot/projects/e500/usr.sbin/bluetooth/sdpd/Makefile#2 integrate .. //depot/projects/e500/usr.sbin/bluetooth/sdpd/gn.c#1 branch .. //depot/projects/e500/usr.sbin/bluetooth/sdpd/nap.c#1 branch .. //depot/projects/e500/usr.sbin/bluetooth/sdpd/panu.c#1 branch .. //depot/projects/e500/usr.sbin/bluetooth/sdpd/profile.c#2 integrate .. //depot/projects/e500/usr.sbin/bluetooth/sdpd/profile.h#2 integrate .. //depot/projects/e500/usr.sbin/fifolog/Makefile#1 branch .. //depot/projects/e500/usr.sbin/fifolog/Makefile.inc#1 branch .. //depot/projects/e500/usr.sbin/fifolog/fifolog_create/Makefile#1 branch .. //depot/projects/e500/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch .. //depot/projects/e500/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch .. //depot/projects/e500/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch .. //depot/projects/e500/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch .. //depot/projects/e500/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch .. //depot/projects/e500/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch .. //depot/projects/e500/usr.sbin/fifolog/flint.lnt#1 branch .. //depot/projects/e500/usr.sbin/fifolog/lib/Makefile#1 branch .. //depot/projects/e500/usr.sbin/fifolog/lib/fifolog.h#1 branch .. //depot/projects/e500/usr.sbin/fifolog/lib/fifolog_create.c#1 branch .. //depot/projects/e500/usr.sbin/fifolog/lib/fifolog_int.c#1 branch .. //depot/projects/e500/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch .. //depot/projects/e500/usr.sbin/fifolog/lib/fifolog_write.h#1 branch .. //depot/projects/e500/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch .. //depot/projects/e500/usr.sbin/fifolog/lib/getdate.y#1 branch .. //depot/projects/e500/usr.sbin/fifolog/lib/libfifolog.h#1 branch .. //depot/projects/e500/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch .. //depot/projects/e500/usr.sbin/fifolog/lib/miniobj.h#1 branch .. //depot/projects/e500/usr.sbin/ppp/command.c#3 integrate .. //depot/projects/e500/usr.sbin/ppp/ipcp.c#2 integrate .. //depot/projects/e500/usr.sbin/ppp/main.c#2 integrate .. //depot/projects/e500/usr.sbin/ppp/nat_cmd.c#2 integrate Differences ... ==== //depot/projects/e500/ObsoleteFiles.inc#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -32,6 +32,11 @@ OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libkse.a +OLD_FILES+=usr/lib32/libkse_p.a +OLD_FILES+=usr/lib32/libkse_pic.a +.endif .endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h @@ -134,6 +139,12 @@ OLD_DIRS+=usr/include/netatm/uni OLD_DIRS+=usr/include/netatm OLD_DIRS+=usr/share/examples/atm +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libatm.a +OLD_FILES+=usr/lib32/libatm.so +OLD_LIBS+=usr/lib32/libatm.so.5 +OLD_FILES+=usr/lib32/libatm_p.a +.endif # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -224,6 +235,42 @@ OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libalias.so.5 +OLD_LIBS+=usr/lib32/libbsnmp.so.3 +OLD_LIBS+=usr/lib32/libdialog.so.5 +OLD_LIBS+=usr/lib32/libgnuregex.so.3 +OLD_LIBS+=usr/lib32/libhistory.so.6 +OLD_LIBS+=usr/lib32/libncurses.so.6 +OLD_LIBS+=usr/lib32/libncursesw.so.6 +OLD_LIBS+=usr/lib32/libpam.so.3 +OLD_LIBS+=usr/lib32/libreadline.so.6 +OLD_LIBS+=usr/lib32/libssh.so.3 +OLD_LIBS+=usr/lib32/pam_chroot.so.3 +OLD_LIBS+=usr/lib32/pam_deny.so.3 +OLD_LIBS+=usr/lib32/pam_echo.so.3 +OLD_LIBS+=usr/lib32/pam_exec.so.3 +OLD_LIBS+=usr/lib32/pam_ftpusers.so.3 +OLD_LIBS+=usr/lib32/pam_group.so.3 +OLD_LIBS+=usr/lib32/pam_guest.so.3 +OLD_LIBS+=usr/lib32/pam_krb5.so.3 +OLD_LIBS+=usr/lib32/pam_ksu.so.3 +OLD_LIBS+=usr/lib32/pam_lastlog.so.3 +OLD_LIBS+=usr/lib32/pam_login_access.so.3 +OLD_LIBS+=usr/lib32/pam_nologin.so.3 +OLD_LIBS+=usr/lib32/pam_opie.so.3 +OLD_LIBS+=usr/lib32/pam_opieaccess.so.3 +OLD_LIBS+=usr/lib32/pam_passwdqc.so.3 +OLD_LIBS+=usr/lib32/pam_permit.so.3 +OLD_LIBS+=usr/lib32/pam_radius.so.3 +OLD_LIBS+=usr/lib32/pam_rhosts.so.3 +OLD_LIBS+=usr/lib32/pam_rootok.so.3 +OLD_LIBS+=usr/lib32/pam_securetty.so.3 +OLD_LIBS+=usr/lib32/pam_self.so.3 +OLD_LIBS+=usr/lib32/pam_ssh.so.3 +OLD_LIBS+=usr/lib32/pam_tacplus.so.3 +OLD_LIBS+=usr/lib32/pam_unix.so.3 +.endif # 20070613: IPX over IP tunnel removal OLD_FILES+=usr/include/netipx/ipx_ip.h # 20070605: sched_core removal @@ -603,6 +650,9 @@ OLD_FILES+=usr/share/info/bzip2.info.gz # 20070303: libarchive 2.0 OLD_LIBS+=usr/lib/libarchive.so.3 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libarchive.so.3 +.endif # 20070301: remove addr2ascii and ascii2addr OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz ==== //depot/projects/e500/UPDATING#10 (text+ko) ==== @@ -22,6 +22,16 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080312: + Support for KSE threading has been removed from the kernel. To + run legacy applications linked against KSE libmap.conf may + be used. The following libmap.conf may be used to ensure + compatibility with any prior release: + + libpthread.so.1 libthr.so.1 + libpthread.so.2 libthr.so.2 + libkse.so.3 libthr.so.3 + 20080301: The layout of struct vmspace has changed. This affects libkvm and any executables that link against libkvm and use the @@ -997,4 +1007,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ ==== //depot/projects/e500/bin/chflags/chflags.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.29 2007/05/28 04:23:09 pjd Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.30 2008/03/09 12:10:24 rwatson Exp $ .\" .Dd March 3, 2006 .Dt CHFLAGS 1 @@ -40,7 +40,7 @@ .Nd change file flags .Sh SYNOPSIS .Nm -.Op Fl h +.Op Fl fhv .Oo .Fl R .Op Fl H | Fl L | Fl P @@ -57,6 +57,12 @@ .Pp The options are as follows: .Bl -tag -width indent +.It Fl f +Do not display a diagnostic message if +.Nm +could not modify the flags for +.Va file , +nor modify the exit status to reflect such failures. .It Fl H If the .Fl R @@ -79,6 +85,14 @@ .It Fl R Change the file flags for the file hierarchies rooted in the files instead of just the files themselves. +.It Fl v +Cause +.Nm +to be verbose, showing filenames as the flags are modified. +If the +.Fl v +option is specified more than once, the old and new flags of the file +will also be printed, in octal notation. .El .Pp The flags are specified as an octal number or a comma separated list ==== //depot/projects/e500/bin/chflags/chflags.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.23 2005/05/14 23:23:10 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/chflags/chflags.c,v 1.24 2008/03/09 12:10:24 rwatson Exp $"); #include #include @@ -60,14 +60,15 @@ { FTS *ftsp; FTSENT *p; - u_long clear, set; + u_long clear, newflags, set; long val; - int Hflag, Lflag, Rflag, hflag, ch, fts_options, oct, rval; + int Hflag, Lflag, Rflag, fflag, hflag, vflag; + int ch, fts_options, oct, rval; char *flags, *ep; int (*change_flags)(const char *, unsigned long); - Hflag = Lflag = Rflag = hflag = 0; - while ((ch = getopt(argc, argv, "HLPRh")) != -1) + Hflag = Lflag = Rflag = fflag = hflag = vflag = 0; + while ((ch = getopt(argc, argv, "HLPRfhv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -83,9 +84,15 @@ case 'R': Rflag = 1; break; + case 'f': + fflag = 1; + break; case 'h': hflag = 1; break; + case 'v': + vflag++; + break; case '?': default: usage(); @@ -166,18 +173,23 @@ default: break; } - if (oct) { - if (!(*change_flags)(p->fts_accpath, set)) - continue; - } else { - p->fts_statp->st_flags |= set; - p->fts_statp->st_flags &= clear; - if (!(*change_flags)(p->fts_accpath, - (u_long)p->fts_statp->st_flags)) - continue; + if (oct) + newflags = set; + else + newflags = (p->fts_statp->st_flags | set) & clear; + if (newflags == p->fts_statp->st_flags) + continue; + if ((*change_flags)(p->fts_accpath, newflags) && !fflag) { + warn("%s", p->fts_path); + rval = 1; + } else if (vflag) { + (void)printf("%s", p->fts_path); + if (vflag > 1) + (void)printf(": 0%lo -> 0%lo", + (u_long)p->fts_statp->st_flags, + newflags); + (void)printf("\n"); } - warn("%s", p->fts_path); - rval = 1; } if (errno) err(1, "fts_read"); @@ -188,6 +200,6 @@ usage(void) { (void)fprintf(stderr, - "usage: chflags [-h] [-R [-H | -L | -P]] flags file ...\n"); + "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n"); exit(1); } ==== //depot/projects/e500/bin/cp/cp.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $ .\" .Dd October 27, 2006 .Dt CP 1 @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -116,6 +116,10 @@ or .Xr pax 1 instead. +.It Fl a +Archive mode. +Same as +.Fl RpP . .It Fl f For each existing destination pathname, remove it and create a new file, without prompting for confirmation ==== //depot/projects/e500/bin/cp/cp.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); /* * Cp copies source files to target files. @@ -102,7 +102,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -119,6 +119,12 @@ case 'R': Rflag = 1; break; + case 'a': + Pflag = 1; + pflag = 1; + Rflag = 1; + Hflag = Lflag = 0; + break; case 'f': fflag = 1; iflag = nflag = 0; ==== //depot/projects/e500/bin/cp/utils.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.53 2008/03/10 19:58:41 jhb Exp $"); #include #include @@ -429,8 +429,8 @@ { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " "target_directory"); exit(EX_USAGE); } ==== //depot/projects/e500/bin/ps/ps.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.90 2008/03/12 10:01:34 jeff Exp $ .\" .Dd August 21, 2006 .Dt PS 1 @@ -290,7 +290,6 @@ .It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us" .It Dv "P_WEXIT" Ta No "0x02000 Working on exiting" .It Dv "P_EXEC" Ta No "0x04000 Process called exec" -.It Dv "P_SA" Ta No "0x08000 Using scheduler activations" .It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state" .It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP" .It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing" ==== //depot/projects/e500/bin/realpath/realpath.1#2 (text+ko) ==== @@ -31,7 +31,7 @@ .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 .\" From: src/bin/pwd/pwd.1,v 1.11 2000/11/20 11:39:39 ru Exp -.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.10 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/realpath/realpath.1,v 1.11 2008/03/09 12:46:39 rwatson Exp $ .\" .Dd November 24, 2000 .Dt REALPATH 1 @@ -41,7 +41,9 @@ .Nd return resolved physical path .Sh SYNOPSIS .Nm +.Op Fl q .Ar path +.Op Ar ... .Sh DESCRIPTION The .Nm @@ -55,6 +57,12 @@ .Pa /../ in .Ar path . +.Pp +If +.Fl q +is specified, warnings will not be printed when +.Xr realpath 3 +fails. .Sh EXIT STATUS .Ex -std .Sh SEE ALSO ==== //depot/projects/e500/bin/realpath/realpath.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.6 2004/04/06 20:06:50 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/realpath/realpath.c,v 1.7 2008/03/09 12:46:39 rwatson Exp $"); #include @@ -44,20 +44,39 @@ { char buf[PATH_MAX]; char *p; + int ch, i, qflag, rval; - if (argc == 2) { - if ((p = realpath(argv[1], buf)) == NULL) - err(1, "%s", buf); - } else + qflag = 0; + while ((ch = getopt(argc, argv, "q")) != -1) { + switch (ch) { + case 'q': + qflag = 1; + break; + case '?': + default: + usage(); + } + } + argc -= optind; + argv += optind; + if (argc < 1) usage(); - (void)printf("%s\n", p); - exit(0); + rval = 0; + for (i = 0; i < argc; i++) { + if ((p = realpath(argv[i], buf)) == NULL) { + if (!qflag) + warn("%s", argv[i]); + rval = 1; + } else + (void)printf("%s\n", p); + } + exit(rval); } static void usage(void) { - (void)fprintf(stderr, "usage: realpath path\n"); + (void)fprintf(stderr, "usage: realpath [-q] path [...]\n"); exit(1); } ==== //depot/projects/e500/contrib/tcsh/sh.lex.c#3 (text+ko) ==== @@ -851,7 +851,8 @@ return (en); } slhs.len = 0; - Strbuf_append(&slhs, lhsb.s); + if (lhsb.s != NULL && lhsb.len != 0) + Strbuf_append(&slhs, lhsb.s); Strbuf_terminate(&slhs); if (exclc) en = dosub(sc, en, global); ==== //depot/projects/e500/etc/rc.d/mountlate#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.3 2008/03/06 14:39:33 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.5 2008/03/11 17:21:55 delphij Exp $ # # PROVIDE: mountlate @@ -33,6 +33,12 @@ stop_boot true ;; esac + + # If we booted a special kernel remove the record + # so we will boot the default kernel next time. + if [ -x /sbin/nextboot ]; then + /sbin/nextboot -D + fi } load_rc_config $name ==== //depot/projects/e500/etc/rc.d/root#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/root,v 1.16 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.17 2008/03/11 17:21:14 delphij Exp $ # # PROVIDE: root @@ -34,7 +34,7 @@ # If we booted a special kernel remove the record # so we will boot the default kernel next time. if [ -x /sbin/nextboot ]; then - /sbin/nextboot -D + /sbin/nextboot -D > /dev/null 2>&1 fi } ==== //depot/projects/e500/lib/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $ .include @@ -34,7 +34,7 @@ ${_libgssapi} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ + libpmc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -104,10 +104,6 @@ _libsmb= libsmb .endif -.if ${MK_LIBKSE} != "no" -_libkse= libkse -.endif - .if ${MK_LIBTHR} != "no" _libthr= libthr .endif ==== //depot/projects/e500/lib/libalias/libalias/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.4 2007/06/18 18:47:53 rafan Exp $ +# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.5 2008/03/12 11:58:28 piso Exp $ .PATH: ${.CURDIR}/../../../sys/netinet/libalias @@ -6,7 +6,7 @@ SHLIBDIR?= /lib SHLIB_MAJOR= 6 MAN= libalias.3 -SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c +SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c INCS= alias.h WARNS?= 6 NO_WERROR= ==== //depot/projects/e500/lib/libarchive/archive_entry.3#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.15 2007/07/15 19:10:34 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.16 2008/03/10 14:44:40 jkoshy Exp $ .\" .Dd December 15, 2003 .Dt archive_entry 3 @@ -101,17 +101,47 @@ .Sh SYNOPSIS .In archive_entry.h .Ft void -.Fn archive_entry_acl_add_entry "struct archive_entry *" "int type" "int permset" "int tag" "int qual" "const char *name" +.Fo archive_entry_acl_add_entry +.Fa "struct archive_entry *" +.Fa "int type" +.Fa "int permset" +.Fa "int tag" +.Fa "int qual" +.Fa "const char *name" +.Fc .Ft void -.Fn archive_entry_acl_add_entry_w "struct archive_entry *" "int type" "int permset" "int tag" "int qual" "const wchar_t *name" +.Fo archive_entry_acl_add_entry_w +.Fa "struct archive_entry *" +.Fa "int type" +.Fa "int permset" +.Fa "int tag" +.Fa "int qual" +.Fa "const wchar_t *name" +.Fc .Ft void .Fn archive_entry_acl_clear "struct archive_entry *" .Ft int .Fn archive_entry_acl_count "struct archive_entry *" "int type" .Ft int -.Fn archive_entry_acl_next "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const char **name" +.Fo archive_entry_acl_next +.Fa "struct archive_entry *" +.Fa "int want_type" +.Fa "int *type" +.Fa "int *permset" +.Fa "int *tag" +.Fa "int *qual" +.Fa "const char **name" +.Fc .Ft int -.Fn archive_entry_acl_next_w "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const wchar_t **name" +.Fo archive_entry_acl_next_w +.Fa "struct archive_entry *" +.Fa "int want_type" +.Fa "int *type" +.Fa "int *permset" +.Fa "int *tag" +.Fa "int *qual" +.Fa "const wchar_t **name" +.Fc .Ft int .Fn archive_entry_acl_reset "struct archive_entry *" "int want_type" .Ft const wchar_t * @@ -155,7 +185,11 @@ .Ft mode_t .Fn archive_entry_filetype "struct archive_entry *" .Ft void -.Fn archive_entry_fflags "struct archive_entry *" "unsigned long *set" "unsigned long *clear" +.Fo archive_entry_fflags +.Fa "struct archive_entry *" +.Fa "unsigned long *set" +.Fa "unsigned long *clear" +.Fc .Ft const char * .Fn archive_entry_fflags_text "struct archive_entry *" .Ft void @@ -195,7 +229,11 @@ .Ft void .Fn archive_entry_set_filetype "struct archive_entry *" "unsigned int" .Ft void -.Fn archive_entry_set_fflags "struct archive_entry *" "unsigned long set" "unsigned long clear" +.Fo archive_entry_set_fflags +.Fa "struct archive_entry *" +.Fa "unsigned long set" +.Fa "unsigned long clear" +.Fc .Ft void .Fn archive_entry_set_gid "struct archive_entry *" "gid_t" .Ft void ==== //depot/projects/e500/lib/libarchive/archive_entry.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.45 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.47 2008/03/12 04:47:37 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -1124,6 +1124,11 @@ entry->acl_p = entry->acl_p->next; if (entry->acl_p == NULL) { entry->acl_state = 0; + *type = 0; + *permset = 0; + *tag = 0; + *id = -1; + *name = NULL; return (ARCHIVE_EOF); /* End of ACL entries. */ } *type = entry->acl_p->type; @@ -1505,7 +1510,7 @@ return (ARCHIVE_OK); } else { *name = NULL; - *name = NULL; + *value = NULL; *size = (size_t)0; return (ARCHIVE_WARN); } ==== //depot/projects/e500/lib/libarchive/archive_read.3#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.35 2007/09/19 16:37:45 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.36 2008/03/10 14:45:29 jkoshy Exp $ .\" .Dd August 19, 2006 .Dt archive_read 3 @@ -75,7 +75,10 @@ .Ft int .Fn archive_read_support_compression_none "struct archive *" .Ft int -.Fn archive_read_support_compression_program "struct archive *" "const char *cmd" +.Fo archive_read_support_compression_program +.Fa "struct archive *" +.Fa "const char *cmd" +.Fc .Ft int .Fn archive_read_support_format_all "struct archive *" .Ft int @@ -89,15 +92,32 @@ .Ft int .Fn archive_read_support_format_zip "struct archive *" .Ft int -.Fn archive_read_open "struct archive *" "void *client_data" "archive_open_callback *" "archive_read_callback *" "archive_close_callback *" +.Fo archive_read_open >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 13 03:58:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AD561065673; Thu, 13 Mar 2008 03:58:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A8FA1065672 for ; Thu, 13 Mar 2008 03:58:01 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 241DE8FC1B for ; Thu, 13 Mar 2008 03:58:01 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2D3w1Cd059496 for ; Thu, 13 Mar 2008 03:58:01 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2D3w0N2059494 for perforce@freebsd.org; Thu, 13 Mar 2008 03:58:00 GMT (envelope-from marcel@freebsd.org) Date: Thu, 13 Mar 2008 03:58:00 GMT Message-Id: <200803130358.m2D3w0N2059494@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 137570 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, 13 Mar 2008 03:58:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=137570 Change 137570 by marcel@marcel_xcllnt on 2008/03/13 03:57:24 Catch up with BookE support. Affected files ... .. //depot/projects/powerpc/sys/powerpc/aim/trap.c#5 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/aim/trap.c#5 (text+ko) ==== @@ -174,9 +174,9 @@ break; case EXC_DSI: - if (frame->dsisr & DSISR_DABR) { + if (frame->cpu.aim.dsisr & DSISR_DABR) { td->td_pcb->pcb_wppc = frame->srr0; - frame->dar = td->td_pcb->pcb_dabr & ~7; + frame->cpu.aim.dar = td->td_pcb->pcb_dabr & ~7; sig = SIGTRAP; break; } From owner-p4-projects@FreeBSD.ORG Thu Mar 13 04:13:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 191291065673; Thu, 13 Mar 2008 04:13:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAAE7106566B for ; Thu, 13 Mar 2008 04:13:17 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCE918FC1D for ; Thu, 13 Mar 2008 04:13:17 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2D4DHcL062496 for ; Thu, 13 Mar 2008 04:13:17 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2D4DHiS062494 for perforce@freebsd.org; Thu, 13 Mar 2008 04:13:17 GMT (envelope-from imp@freebsd.org) Date: Thu, 13 Mar 2008 04:13:17 GMT Message-Id: <200803130413.m2D4DHiS062494@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 137571 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, 13 Mar 2008 04:13:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=137571 Change 137571 by imp@imp_paco-paco on 2008/03/13 04:13:14 IFC @137558 Affected files ... .. //depot/projects/arm/src/UPDATING#25 integrate .. //depot/projects/arm/src/bin/cp/cp.1#6 integrate .. //depot/projects/arm/src/bin/cp/cp.c#6 integrate .. //depot/projects/arm/src/bin/cp/utils.c#4 integrate .. //depot/projects/arm/src/bin/ps/ps.1#5 integrate .. //depot/projects/arm/src/contrib/tcsh/sh.lex.c#5 integrate .. //depot/projects/arm/src/etc/rc.d/mountlate#4 integrate .. //depot/projects/arm/src/etc/rc.d/root#4 integrate .. //depot/projects/arm/src/lib/Makefile#11 integrate .. //depot/projects/arm/src/lib/libalias/libalias/Makefile#3 integrate .. //depot/projects/arm/src/lib/libarchive/archive_entry.c#11 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read.c#13 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_private.h#5 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_ar.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/test/Makefile#9 integrate .. //depot/projects/arm/src/lib/libarchive/test/main.c#8 integrate .. //depot/projects/arm/src/lib/libarchive/test/test.h#6 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_entry.c#3 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_ar.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_read_format_gtar_sparse.c#5 integrate .. //depot/projects/arm/src/lib/libarchive/test/test_write_format_ar.c#6 integrate .. //depot/projects/arm/src/lib/libc/gen/Makefile.inc#6 integrate .. //depot/projects/arm/src/lib/libc/gen/sem_timedwait.3#1 branch .. //depot/projects/arm/src/lib/libc/sys/Makefile.inc#10 integrate .. //depot/projects/arm/src/lib/libc/sys/Symbol.map#7 integrate .. //depot/projects/arm/src/lib/libkvm/kvm_proc.c#9 integrate .. //depot/projects/arm/src/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/arm/src/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/arm/src/lib/libsdp/sdp.h#3 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_sem.c#5 integrate .. //depot/projects/arm/src/lib/libthread_db/Makefile#5 integrate .. //depot/projects/arm/src/release/doc/share/misc/dev.archlist.txt#12 integrate .. //depot/projects/arm/src/sbin/mount/mount.8#9 integrate .. //depot/projects/arm/src/share/man/man4/uart.4#3 integrate .. //depot/projects/arm/src/share/man/man4/vr.4#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/legacy.c#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#26 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/trap.c#22 integrate .. //depot/projects/arm/src/sys/amd64/amd64/vm_machdep.c#8 integrate .. //depot/projects/arm/src/sys/amd64/conf/DEFAULTS#10 integrate .. //depot/projects/arm/src/sys/amd64/include/specialreg.h#11 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#18 integrate .. //depot/projects/arm/src/sys/arm/arm/busdma_machdep.c#18 integrate .. //depot/projects/arm/src/sys/arm/arm/nexus.c#7 integrate .. //depot/projects/arm/src/sys/arm/arm/trap.c#18 integrate .. //depot/projects/arm/src/sys/arm/conf/AVILA#18 integrate .. //depot/projects/arm/src/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/arm/src/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/arm/src/sys/boot/i386/btx/btx/btx.S#5 integrate .. //depot/projects/arm/src/sys/boot/powerpc/uboot/metadata.c#2 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/arm/src/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#25 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#25 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#25 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#25 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#26 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/arm/src/sys/conf/files#84 integrate .. //depot/projects/arm/src/sys/conf/options#54 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#28 integrate .. //depot/projects/arm/src/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#37 integrate .. //depot/projects/arm/src/sys/dev/cpufreq/ichss.c#5 integrate .. //depot/projects/arm/src/sys/dev/msk/if_msk.c#11 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#22 integrate .. //depot/projects/arm/src/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/arm/src/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/arm/src/sys/dev/uart/uart.h#5 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_dev_ns8250.c#9 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci_pci.c#12 integrate .. //depot/projects/arm/src/sys/dev/usb/ums.c#13 integrate .. //depot/projects/arm/src/sys/dev/vr/if_vr.c#2 integrate .. //depot/projects/arm/src/sys/dev/vr/if_vrreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/arm/src/sys/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/arm/src/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/arm/src/sys/fs/fifofs/fifo_vnops.c#10 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_ctl.c#5 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_dbregs.c#4 integrate .. //depot/projects/arm/src/sys/fs/procfs/procfs_status.c#9 integrate .. //depot/projects/arm/src/sys/i386/conf/DEFAULTS#10 integrate .. //depot/projects/arm/src/sys/i386/cpufreq/est.c#6 integrate .. //depot/projects/arm/src/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/legacy.c#4 integrate .. //depot/projects/arm/src/sys/i386/i386/sys_machdep.c#10 integrate .. //depot/projects/arm/src/sys/i386/i386/trap.c#19 integrate .. //depot/projects/arm/src/sys/i386/i386/vm_machdep.c#12 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/imgact_coff.c#6 integrate .. //depot/projects/arm/src/sys/i386/include/specialreg.h#12 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysvec.c#13 integrate .. //depot/projects/arm/src/sys/ia64/conf/DEFAULTS#10 integrate .. //depot/projects/arm/src/sys/ia64/ia64/machdep.c#20 integrate .. //depot/projects/arm/src/sys/ia64/ia64/trap.c#12 integrate .. //depot/projects/arm/src/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/arm/src/sys/kern/imgact_elf.c#11 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#25 integrate .. //depot/projects/arm/src/sys/kern/kern_clock.c#17 integrate .. //depot/projects/arm/src/sys/kern/kern_condvar.c#10 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#24 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#24 integrate .. //depot/projects/arm/src/sys/kern/kern_intr.c#17 integrate .. //depot/projects/arm/src/sys/kern/kern_kse.c#19 delete .. //depot/projects/arm/src/sys/kern/kern_proc.c#16 integrate .. //depot/projects/arm/src/sys/kern/kern_resource.c#21 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#28 integrate .. //depot/projects/arm/src/sys/kern/kern_switch.c#20 integrate .. //depot/projects/arm/src/sys/kern/kern_sx.c#16 integrate .. //depot/projects/arm/src/sys/kern/kern_synch.c#26 integrate .. //depot/projects/arm/src/sys/kern/kern_thread.c#24 integrate .. //depot/projects/arm/src/sys/kern/kern_timeout.c#9 integrate .. //depot/projects/arm/src/sys/kern/p1003_1b.c#5 integrate .. //depot/projects/arm/src/sys/kern/sched_4bsd.c#25 integrate .. //depot/projects/arm/src/sys/kern/sched_ule.c#31 integrate .. //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#17 integrate .. //depot/projects/arm/src/sys/kern/subr_trap.c#14 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#24 integrate .. //depot/projects/arm/src/sys/kern/sys_process.c#15 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#25 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#28 integrate .. //depot/projects/arm/src/sys/kern/systrace_args.c#13 integrate .. //depot/projects/arm/src/sys/modules/vr/Makefile#3 integrate .. //depot/projects/arm/src/sys/netgraph/netgraph.h#10 integrate .. //depot/projects/arm/src/sys/netgraph/ng_base.c#17 integrate .. //depot/projects/arm/src/sys/netgraph/ng_socket.c#13 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias.c#6 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias.h#4 integrate .. //depot/projects/arm/src/sys/netinet/libalias/alias_old.c#3 delete .. //depot/projects/arm/src/sys/pc98/conf/DEFAULTS#8 integrate .. //depot/projects/arm/src/sys/pc98/pc98/machdep.c#21 integrate .. //depot/projects/arm/src/sys/pci/if_vr.c#11 delete .. //depot/projects/arm/src/sys/pci/if_vrreg.h#7 delete .. //depot/projects/arm/src/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/conf/DEFAULTS#7 integrate .. //depot/projects/arm/src/sys/powerpc/include/bootinfo.h#3 integrate .. //depot/projects/arm/src/sys/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/intr_machdep.c#11 integrate .. //depot/projects/arm/src/sys/sparc64/conf/DEFAULTS#8 integrate .. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#26 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/trap.c#13 integrate .. //depot/projects/arm/src/sys/sys/condvar.h#4 integrate .. //depot/projects/arm/src/sys/sys/disklabel.h#5 integrate .. //depot/projects/arm/src/sys/sys/kse.h#2 delete .. //depot/projects/arm/src/sys/sys/param.h#41 integrate .. //depot/projects/arm/src/sys/sys/proc.h#34 integrate .. //depot/projects/arm/src/sys/sys/sched.h#13 integrate .. //depot/projects/arm/src/sys/sys/sleepqueue.h#8 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#25 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#25 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#26 integrate .. //depot/projects/arm/src/sys/sys/systm.h#29 integrate .. //depot/projects/arm/src/sys/vm/vm_glue.c#12 integrate .. //depot/projects/arm/src/sys/vm/vm_map.c#20 integrate .. //depot/projects/arm/src/sys/vm/vm_meter.c#12 integrate .. //depot/projects/arm/src/usr.bin/ar/ar.1#3 integrate .. //depot/projects/arm/src/usr.bin/ar/ar.c#3 integrate .. //depot/projects/arm/src/usr.bin/ar/ar.h#2 integrate .. //depot/projects/arm/src/usr.bin/ar/write.c#4 integrate .. //depot/projects/arm/src/usr.bin/cpuset/cpuset.1#2 integrate .. //depot/projects/arm/src/usr.bin/kdump/kdump.c#7 integrate .. //depot/projects/arm/src/usr.bin/kdump/kdump_subr.h#4 integrate .. //depot/projects/arm/src/usr.bin/kdump/mksubr#6 integrate .. //depot/projects/arm/src/usr.bin/make/globals.h#3 integrate .. //depot/projects/arm/src/usr.bin/make/hash_tables.c#2 integrate .. //depot/projects/arm/src/usr.bin/make/main.c#8 integrate .. //depot/projects/arm/src/usr.bin/make/make.1#7 integrate .. //depot/projects/arm/src/usr.bin/make/parse.c#4 integrate .. //depot/projects/arm/src/usr.bin/ministat/ministat.1#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/sdpd/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/sdpd/gn.c#1 branch .. //depot/projects/arm/src/usr.sbin/bluetooth/sdpd/nap.c#1 branch .. //depot/projects/arm/src/usr.sbin/bluetooth/sdpd/panu.c#1 branch .. //depot/projects/arm/src/usr.sbin/bluetooth/sdpd/profile.c#2 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/sdpd/profile.h#2 integrate .. //depot/projects/arm/src/usr.sbin/ppp/command.c#4 integrate .. //depot/projects/arm/src/usr.sbin/ppp/ipcp.c#2 integrate .. //depot/projects/arm/src/usr.sbin/ppp/main.c#2 integrate .. //depot/projects/arm/src/usr.sbin/ppp/nat_cmd.c#2 integrate Differences ... ==== //depot/projects/arm/src/UPDATING#25 (text+ko) ==== @@ -22,6 +22,16 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080312: + Support for KSE threading has been removed from the kernel. To + run legacy applications linked against KSE libmap.conf may + be used. The following libmap.conf may be used to ensure + compatibility with any prior release: + + libpthread.so.1 libthr.so.1 + libpthread.so.2 libthr.so.2 + libkse.so.3 libthr.so.3 + 20080301: The layout of struct vmspace has changed. This affects libkvm and any executables that link against libkvm and use the @@ -997,4 +1007,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ ==== //depot/projects/arm/src/bin/cp/cp.1#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $ .\" .Dd October 27, 2006 .Dt CP 1 @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -116,6 +116,10 @@ or .Xr pax 1 instead. +.It Fl a +Archive mode. +Same as +.Fl RpP . .It Fl f For each existing destination pathname, remove it and create a new file, without prompting for confirmation ==== //depot/projects/arm/src/bin/cp/cp.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); /* * Cp copies source files to target files. @@ -102,7 +102,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -119,6 +119,12 @@ case 'R': Rflag = 1; break; + case 'a': + Pflag = 1; + pflag = 1; + Rflag = 1; + Hflag = Lflag = 0; + break; case 'f': fflag = 1; iflag = nflag = 0; ==== //depot/projects/arm/src/bin/cp/utils.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.53 2008/03/10 19:58:41 jhb Exp $"); #include #include @@ -429,8 +429,8 @@ { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " "target_directory"); exit(EX_USAGE); } ==== //depot/projects/arm/src/bin/ps/ps.1#5 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.90 2008/03/12 10:01:34 jeff Exp $ .\" .Dd August 21, 2006 .Dt PS 1 @@ -290,7 +290,6 @@ .It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us" .It Dv "P_WEXIT" Ta No "0x02000 Working on exiting" .It Dv "P_EXEC" Ta No "0x04000 Process called exec" -.It Dv "P_SA" Ta No "0x08000 Using scheduler activations" .It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state" .It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP" .It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing" ==== //depot/projects/arm/src/contrib/tcsh/sh.lex.c#5 (text+ko) ==== @@ -851,7 +851,8 @@ return (en); } slhs.len = 0; - Strbuf_append(&slhs, lhsb.s); + if (lhsb.s != NULL && lhsb.len != 0) + Strbuf_append(&slhs, lhsb.s); Strbuf_terminate(&slhs); if (exclc) en = dosub(sc, en, global); ==== //depot/projects/arm/src/etc/rc.d/mountlate#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.3 2008/03/06 14:39:33 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.5 2008/03/11 17:21:55 delphij Exp $ # # PROVIDE: mountlate @@ -33,6 +33,12 @@ stop_boot true ;; esac + + # If we booted a special kernel remove the record + # so we will boot the default kernel next time. + if [ -x /sbin/nextboot ]; then + /sbin/nextboot -D + fi } load_rc_config $name ==== //depot/projects/arm/src/etc/rc.d/root#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/root,v 1.16 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.17 2008/03/11 17:21:14 delphij Exp $ # # PROVIDE: root @@ -34,7 +34,7 @@ # If we booted a special kernel remove the record # so we will boot the default kernel next time. if [ -x /sbin/nextboot ]; then - /sbin/nextboot -D + /sbin/nextboot -D > /dev/null 2>&1 fi } ==== //depot/projects/arm/src/lib/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $ .include @@ -34,7 +34,7 @@ ${_libgssapi} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ + libpmc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -104,10 +104,6 @@ _libsmb= libsmb .endif -.if ${MK_LIBKSE} != "no" -_libkse= libkse -.endif - .if ${MK_LIBTHR} != "no" _libthr= libthr .endif ==== //depot/projects/arm/src/lib/libalias/libalias/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.4 2007/06/18 18:47:53 rafan Exp $ +# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.5 2008/03/12 11:58:28 piso Exp $ .PATH: ${.CURDIR}/../../../sys/netinet/libalias @@ -6,7 +6,7 @@ SHLIBDIR?= /lib SHLIB_MAJOR= 6 MAN= libalias.3 -SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c +SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c INCS= alias.h WARNS?= 6 NO_WERROR= ==== //depot/projects/arm/src/lib/libarchive/archive_entry.c#11 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.45 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.47 2008/03/12 04:47:37 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -1124,6 +1124,11 @@ entry->acl_p = entry->acl_p->next; if (entry->acl_p == NULL) { entry->acl_state = 0; + *type = 0; + *permset = 0; + *tag = 0; + *id = -1; + *name = NULL; return (ARCHIVE_EOF); /* End of ACL entries. */ } *type = entry->acl_p->type; @@ -1505,7 +1510,7 @@ return (ARCHIVE_OK); } else { *name = NULL; - *name = NULL; + *value = NULL; *size = (size_t)0; return (ARCHIVE_WARN); } ==== //depot/projects/arm/src/lib/libarchive/archive_read.c#13 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.37 2008/01/03 17:54:26 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.38 2008/03/12 04:58:32 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -64,26 +64,13 @@ archive_read_new(void) { struct archive_read *a; - unsigned char *nulls; a = (struct archive_read *)malloc(sizeof(*a)); if (a == NULL) return (NULL); memset(a, 0, sizeof(*a)); a->archive.magic = ARCHIVE_READ_MAGIC; - a->bytes_per_block = ARCHIVE_DEFAULT_BYTES_PER_BLOCK; - a->null_length = 1024; - nulls = (unsigned char *)malloc(a->null_length); - if (nulls == NULL) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate archive object 'nulls' element"); - free(a); - return (NULL); - } - memset(nulls, 0, a->null_length); - a->nulls = nulls; - a->archive.state = ARCHIVE_STATE_NEW; a->entry = archive_entry_new(); @@ -660,8 +647,6 @@ (a->formats[i].cleanup)(a); } - /* Casting a pointer to int allows us to remove 'const.' */ - free((void *)(uintptr_t)(const void *)a->nulls); archive_string_free(&a->archive.error_string); if (a->entry) archive_entry_free(a->entry); ==== //depot/projects/arm/src/lib/libarchive/archive_read_private.h#5 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.4 2008/01/03 17:54:26 des Exp $ + * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.5 2008/03/12 04:58:32 kientzle Exp $ */ #ifndef ARCHIVE_READ_PRIVATE_H_INCLUDED @@ -41,10 +41,6 @@ dev_t skip_file_dev; ino_t skip_file_ino; - /* Utility: Pointer to a block of nulls. */ - const unsigned char *nulls; - size_t null_length; - /* * Used by archive_read_data() to track blocks and copy * data to client buffers, filling gaps with zero bytes. @@ -58,30 +54,9 @@ archive_open_callback *client_opener; archive_read_callback *client_reader; archive_skip_callback *client_skipper; - archive_write_callback *client_writer; archive_close_callback *client_closer; void *client_data; - /* - * Blocking information. Note that bytes_in_last_block is - * misleadingly named; I should find a better name. These - * control the final output from all compressors, including - * compression_none. - */ - int bytes_per_block; - int bytes_in_last_block; - - /* - * These control whether data within a gzip/bzip2 compressed - * stream gets padded or not. If pad_uncompressed is set, - * the data will be padded to a full block before being - * compressed. The pad_uncompressed_byte determines the value - * that will be used for padding. Note that these have no - * effect on compression "none." - */ - int pad_uncompressed; - int pad_uncompressed_byte; /* TODO: Support this. */ - /* File offset of beginning of most recently-read header. */ off_t header_position; @@ -142,18 +117,6 @@ struct archive_format_descriptor *format; /* Active format. */ /* - * Pointers to format-specific functions for writing. They're - * initialized by archive_write_set_format_XXX() calls. - */ - int (*format_init)(struct archive *); /* Only used on write. */ - int (*format_finish)(struct archive *); - int (*format_finish_entry)(struct archive *); - int (*format_write_header)(struct archive *, - struct archive_entry *); - ssize_t (*format_write_data)(struct archive *, - const void *buff, size_t); - - /* * Various information needed by archive_extract. */ struct extract *extract; ==== //depot/projects/arm/src/lib/libarchive/archive_read_support_format_ar.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.8 2008/02/19 05:54:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.9 2008/03/12 21:10:26 kaiw Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -83,8 +83,7 @@ struct archive_entry *e); static uint64_t ar_atol8(const char *p, unsigned char_cnt); static uint64_t ar_atol10(const char *p, unsigned char_cnt); -static int ar_parse_gnu_filename_table(struct archive_read *, struct ar *, - const void *, size_t); +static int ar_parse_gnu_filename_table(struct archive_read *a); static int ar_parse_common_header(struct ar *ar, struct archive_entry *, const char *h); @@ -167,8 +166,8 @@ struct ar *ar; uint64_t number; /* Used to hold parsed numbers before validation. */ ssize_t bytes_read; - size_t bsd_name_length, entry_size; - char *p; + size_t bsd_name_length, entry_size, s; + char *p, *st; const void *b; const char *h; int r; @@ -277,22 +276,42 @@ return (ARCHIVE_FATAL); } entry_size = (size_t)number; + if (entry_size == 0) { + archive_set_error(&a->archive, EINVAL, + "Invalid string table"); + return (ARCHIVE_WARN); + } + if (ar->strtab != NULL) { + archive_set_error(&a->archive, EINVAL, + "More than one string tables exist"); + return (ARCHIVE_WARN); + } + /* Read the filename table into memory. */ - bytes_read = (a->decompressor->read_ahead)(a, &b, entry_size); - if (bytes_read <= 0) + st = malloc(entry_size); + if (st == NULL) { + archive_set_error(&a->archive, ENOMEM, + "Can't allocate filename table buffer"); return (ARCHIVE_FATAL); - if ((size_t)bytes_read < entry_size) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Truncated input file"); - return (ARCHIVE_FATAL); + } + ar->strtab = st; + ar->strtab_size = entry_size; + for (s = entry_size; s > 0; s -= bytes_read) { + bytes_read = (a->decompressor->read_ahead)(a, &b, s); + if (bytes_read <= 0) + return (ARCHIVE_FATAL); + if (bytes_read > (ssize_t)s) + bytes_read = s; + memcpy(st, b, bytes_read); + st += bytes_read; + (a->decompressor->consume)(a, bytes_read); } - /* - * Don't consume the contents, so the client will - * also get a shot at reading it. - */ + /* All contents are consumed. */ + ar->entry_bytes_remaining = 0; + archive_entry_set_size(entry, ar->entry_bytes_remaining); /* Parse the filename table. */ - return (ar_parse_gnu_filename_table(a, ar, b, entry_size)); + return (ar_parse_gnu_filename_table(a)); } /* @@ -492,31 +511,15 @@ } static int -ar_parse_gnu_filename_table(struct archive_read *a, struct ar *ar, - const void *h, size_t size) +ar_parse_gnu_filename_table(struct archive_read *a) { + struct ar *ar; char *p; + size_t size; - if (ar->strtab != NULL) { - archive_set_error(&a->archive, EINVAL, - "More than one string tables exist"); - return (ARCHIVE_WARN); - } - - if (size == 0) { - archive_set_error(&a->archive, EINVAL, "Invalid string table"); - return (ARCHIVE_WARN); - } + ar = (struct ar*)(a->format->data); + size = ar->strtab_size; - ar->strtab_size = size; - ar->strtab = malloc(size); - if (ar->strtab == NULL) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate string table buffer"); - return (ARCHIVE_FATAL); - } - - (void)memcpy(ar->strtab, h, size); for (p = ar->strtab; p < ar->strtab + size - 1; ++p) { if (*p == '/') { *p++ = '\0'; ==== //depot/projects/arm/src/lib/libarchive/test/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.14 2008/01/31 07:47:38 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.15 2008/03/12 05:12:23 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -7,17 +7,6 @@ # Get a list of all libarchive source files LA_SRCS!=make -f ${LA_SRCDIR}/Makefile -V SRCS -TESTFILES= \ - test_compat_gtar_1.tgz \ - test_compat_tar_hardlink_1.tar \ - test_compat_zip_1.zip \ - test_read_format_gtar_sparse_1_13.tgz \ - test_read_format_gtar_sparse_1_17.tgz \ - test_read_format_gtar_sparse_1_17_posix00.tgz \ - test_read_format_gtar_sparse_1_17_posix01.tgz \ - test_read_format_gtar_sparse_1_17_posix10.tgz \ - test_read_format_gtar_sparse_1_17_posix10_modified.tar - TESTS= \ test_acl_basic.c \ test_acl_pax.c \ @@ -104,13 +93,8 @@ WARNS=6 # Build libarchive_test and run it. -check test: libarchive_test ${TESTFILES} - ./libarchive_test - -.for f in ${TESTFILES} -${f}: ${f}.uu - uudecode -p ${.CURDIR}/${f}.uu >${f} -.endfor +check test: libarchive_test + ./libarchive_test -k -r ${.CURDIR} INCS=archive.h list.h ==== //depot/projects/arm/src/lib/libarchive/test/main.c#8 (text+ko) ==== @@ -24,23 +24,26 @@ */ /* - * This same file is used pretty much verbatim for all test harnesses. - * - * The next line is used to define various environment variables, etc. - * - * The tar and cpio test harnesses are identical except for this line; - * the libarchive test harness omits some code that is needed only for - * testing standalone executables. + * Various utility routines useful for test programs. + * Each test program is linked against this file. */ -#define PROGRAM "LIBARCHIVE" - #include #include #include #include #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.10 2008/02/19 05:52:30 kientzle Exp $"); + +/* + * This same file is used pretty much verbatim for all test harnesses. + * + * The next few lines are the only differences. + */ +#undef PROGRAM /* Testing a library, not a program. */ +#define ENVBASE "LIBARCHIVE" /* Prefix for environment variables. */ +#define EXTRA_DUMP(x) archive_error_string((struct archive *)(x)) +#define EXTRA_VERSION archive_version() +__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.11 2008/03/12 05:12:23 kientzle Exp $"); /* * "list.h" is simply created by "grep DEFINE_TEST"; it has @@ -51,7 +54,7 @@ * test functions. */ #undef DEFINE_TEST -#define DEFINE_TEST(name) void name(void); +#define DEFINE_TEST(name) void name(void); #include "list.h" /* Interix doesn't define these in a standard header. */ @@ -71,6 +74,9 @@ /* Cumulative count of assertions. */ static int assertions = 0; +/* Directory where uuencoded reference files can be found. */ +static char *refdir; + /* * My own implementation of the standard assert() macro emits the * message in the same format as GCC (file:line: message). @@ -90,7 +96,7 @@ * For each test source file, we remember how many times each * failure was reported. */ -static const char *failed_filename; +static const char *failed_filename = NULL; static struct line { int line; int count; @@ -163,9 +169,13 @@ fprintf(stderr, " Description: %s\n", msg); msg[0] = '\0'; } - if (extra != NULL) { - fprintf(stderr, " archive error: %s\n", archive_error_string((struct archive *)extra)); - } + +#ifdef EXTRA_DUMP + if (extra != NULL) + fprintf(stderr, " detail: %s\n", EXTRA_DUMP(extra)); +#else + (void)extra; /* UNUSED */ +#endif if (dump_on_failure) { fprintf(stderr, @@ -241,27 +251,28 @@ } /* assertEqualInt() displays the values of the two integers. */ -void +int test_assert_equal_int(const char *file, int line, int v1, const char *e1, int v2, const char *e2, void *extra) { ++assertions; if (v1 == v2) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: Ints not equal\n", file, line); fprintf(stderr, " %s=%d\n", e1, v1); fprintf(stderr, " %s=%d\n", e2, v2); report_failure(extra); + return (0); } /* assertEqualString() displays the values of the two strings. */ -void +int test_assert_equal_string(const char *file, int line, const char *v1, const char *e1, const char *v2, const char *e2, @@ -271,24 +282,25 @@ if (v1 == NULL || v2 == NULL) { if (v1 == v2) { msg[0] = '\0'; - return; + return (1); } } else if (strcmp(v1, v2) == 0) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: Strings not equal\n", file, line); fprintf(stderr, " %s = \"%s\"\n", e1, v1); fprintf(stderr, " %s = \"%s\"\n", e2, v2); report_failure(extra); + return (0); } /* assertEqualWString() displays the values of the two strings. */ -void +int test_assert_equal_wstring(const char *file, int line, const wchar_t *v1, const char *e1, const wchar_t *v2, const char *e2, @@ -297,16 +309,17 @@ ++assertions; if (wcscmp(v1, v2) == 0) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: Unicode strings not equal\n", file, line); fwprintf(stderr, L" %s = \"%ls\"\n", e1, v1); fwprintf(stderr, L" %s = \"%ls\"\n", e2, v2); report_failure(extra); + return (0); } /* @@ -326,7 +339,7 @@ for (j = 0; j < 16 && i + j < l; j++) { if (ref != NULL && p[i + j] != ref[i + j]) sep = '_'; - fprintf(stderr, "%c%02x", sep, p[i+j]); + fprintf(stderr, "%c%02x", sep, 0xff & (int)p[i+j]); if (ref != NULL && p[i + j] == ref[i + j]) sep = ' '; } @@ -348,7 +361,7 @@ /* assertEqualMem() displays the values of the two memory blocks. */ /* TODO: For long blocks, hexdump the first bytes that actually differ. */ -void +int test_assert_equal_mem(const char *file, int line, const char *v1, const char *e1, const char *v2, const char *e2, @@ -358,15 +371,15 @@ if (v1 == NULL || v2 == NULL) { if (v1 == v2) { msg[0] = '\0'; - return; + return (1); } } else if (memcmp(v1, v2, l) == 0) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: memory not equal\n", file, line); fprintf(stderr, " size %s = %d\n", ld, (int)l); @@ -376,14 +389,19 @@ hexdump(v2, v1, l < 32 ? l : 32, 0); fprintf(stderr, "\n"); report_failure(extra); + return (0); } -void +int test_assert_empty_file(const char *f1fmt, ...) { + char buff[1024]; char f1[1024]; struct stat st; va_list ap; + ssize_t s; + int fd; + va_start(ap, f1fmt); vsprintf(f1, f1fmt, ap); @@ -392,16 +410,32 @@ if (stat(f1, &st) != 0) { fprintf(stderr, "%s:%d: Could not stat: %s\n", test_filename, test_line, f1); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 13 04:16:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B78821065674; Thu, 13 Mar 2008 04:16:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73FF7106566C for ; Thu, 13 Mar 2008 04:16:37 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 75A7A8FC18 for ; Thu, 13 Mar 2008 04:16:37 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2D4GbtI067507 for ; Thu, 13 Mar 2008 04:16:37 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2D4GKCK066017 for perforce@freebsd.org; Thu, 13 Mar 2008 04:16:20 GMT (envelope-from marcel@freebsd.org) Date: Thu, 13 Mar 2008 04:16:20 GMT Message-Id: <200803130416.m2D4GKCK066017@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 137572 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, 13 Mar 2008 04:16:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=137572 Change 137572 by marcel@marcel_xcllnt on 2008/03/13 04:15:34 IFC @137564 Affected files ... .. //depot/projects/ia64/COPYRIGHT#6 integrate .. //depot/projects/ia64/LOCKS#3 integrate .. //depot/projects/ia64/MAINTAINERS#60 integrate .. //depot/projects/ia64/Makefile#58 integrate .. //depot/projects/ia64/Makefile.inc1#122 integrate .. //depot/projects/ia64/ObsoleteFiles.inc#23 integrate .. //depot/projects/ia64/UPDATING#101 integrate .. //depot/projects/ia64/bin/chflags/chflags.1#12 integrate .. //depot/projects/ia64/bin/chflags/chflags.c#8 integrate .. //depot/projects/ia64/bin/cp/cp.1#15 integrate .. //depot/projects/ia64/bin/cp/cp.c#21 integrate .. //depot/projects/ia64/bin/cp/utils.c#16 integrate .. //depot/projects/ia64/bin/date/date.c#10 integrate .. //depot/projects/ia64/bin/mv/mv.c#13 integrate .. //depot/projects/ia64/bin/ps/ps.1#30 integrate .. //depot/projects/ia64/bin/realpath/realpath.1#5 integrate .. //depot/projects/ia64/bin/realpath/realpath.c#6 integrate .. //depot/projects/ia64/bin/sh/cd.c#11 integrate .. //depot/projects/ia64/bin/sh/mksyntax.c#8 integrate .. //depot/projects/ia64/bin/uuidgen/Makefile#1 branch .. //depot/projects/ia64/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/ia64/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/ia64/contrib/amd/FREEBSD-Xlist#4 integrate .. //depot/projects/ia64/contrib/amd/FREEBSD-upgrade#5 integrate .. //depot/projects/ia64/contrib/binutils/libiberty/cp-demangle.c#5 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/main.c#10 integrate .. //depot/projects/ia64/contrib/cvs/AUTHORS#3 integrate .. //depot/projects/ia64/contrib/cvs/BUGS#4 integrate .. //depot/projects/ia64/contrib/cvs/ChangeLog#7 integrate .. //depot/projects/ia64/contrib/cvs/FAQ#4 integrate .. //depot/projects/ia64/contrib/cvs/FREEBSD-Xlist#2 integrate .. //depot/projects/ia64/contrib/cvs/FREEBSD-upgrade#4 integrate .. //depot/projects/ia64/contrib/cvs/HACKING#4 integrate .. //depot/projects/ia64/contrib/cvs/INSTALL#7 integrate .. //depot/projects/ia64/contrib/cvs/Makefile.in#6 integrate .. //depot/projects/ia64/contrib/cvs/NEWS#7 integrate .. //depot/projects/ia64/contrib/cvs/README#4 integrate .. //depot/projects/ia64/contrib/cvs/TESTS#4 integrate .. //depot/projects/ia64/contrib/cvs/TODO#5 integrate .. //depot/projects/ia64/contrib/cvs/acinclude.m4#6 integrate .. //depot/projects/ia64/contrib/cvs/aclocal.m4#6 integrate .. //depot/projects/ia64/contrib/cvs/config.h.in#7 integrate .. //depot/projects/ia64/contrib/cvs/configure#7 integrate .. //depot/projects/ia64/contrib/cvs/configure.in#7 integrate .. //depot/projects/ia64/contrib/cvs/contrib/ChangeLog#6 integrate .. //depot/projects/ia64/contrib/cvs/contrib/Makefile.am#6 integrate .. //depot/projects/ia64/contrib/cvs/contrib/Makefile.in#6 integrate .. //depot/projects/ia64/contrib/cvs/contrib/README#3 integrate .. //depot/projects/ia64/contrib/cvs/contrib/clmerge.in#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/cln_hist.in#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/commit_prep.in#3 integrate .. //depot/projects/ia64/contrib/cvs/contrib/cvs2vendor.sh#3 integrate .. //depot/projects/ia64/contrib/cvs/contrib/cvs_acls.html#1 branch .. //depot/projects/ia64/contrib/cvs/contrib/cvs_acls.in#5 integrate .. //depot/projects/ia64/contrib/cvs/contrib/cvscheck.sh#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/debug_check_log.sh#3 integrate .. //depot/projects/ia64/contrib/cvs/contrib/descend.sh#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/log.in#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/log_accum.in#3 integrate .. //depot/projects/ia64/contrib/cvs/contrib/mfpipe.in#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/pvcs2rcs.in#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/rcs-to-cvs.sh#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/rcs2log.sh#4 integrate .. //depot/projects/ia64/contrib/cvs/contrib/rcs2sccs.sh#4 integrate .. //depot/projects/ia64/contrib/cvs/contrib/rcslock.in#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/sccs2rcs.in#4 integrate .. //depot/projects/ia64/contrib/cvs/diff/ChangeLog#6 integrate .. //depot/projects/ia64/contrib/cvs/diff/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/cvs/diff/Makefile.in#6 integrate .. //depot/projects/ia64/contrib/cvs/doc/ChangeLog#7 integrate .. //depot/projects/ia64/contrib/cvs/doc/Makefile.am#5 integrate .. //depot/projects/ia64/contrib/cvs/doc/Makefile.in#6 integrate .. //depot/projects/ia64/contrib/cvs/doc/cvs.1#2 integrate .. //depot/projects/ia64/contrib/cvs/doc/cvs.man.footer#2 integrate .. //depot/projects/ia64/contrib/cvs/doc/cvs.man.header#2 integrate .. //depot/projects/ia64/contrib/cvs/doc/cvs.texinfo#6 integrate .. //depot/projects/ia64/contrib/cvs/doc/cvsclient.texi#4 integrate .. //depot/projects/ia64/contrib/cvs/doc/mkman.in#2 delete .. //depot/projects/ia64/contrib/cvs/doc/mkman.pl#1 branch .. //depot/projects/ia64/contrib/cvs/doc/stamp-1#6 integrate .. //depot/projects/ia64/contrib/cvs/doc/stamp-vti#6 integrate .. //depot/projects/ia64/contrib/cvs/doc/version-client.texi#6 integrate .. //depot/projects/ia64/contrib/cvs/doc/version.texi#6 integrate .. //depot/projects/ia64/contrib/cvs/lib/ChangeLog#7 integrate .. //depot/projects/ia64/contrib/cvs/lib/Makefile.am#5 integrate .. //depot/projects/ia64/contrib/cvs/lib/Makefile.in#6 integrate .. //depot/projects/ia64/contrib/cvs/lib/fncase.c#3 integrate .. //depot/projects/ia64/contrib/cvs/lib/getdate#1 branch .. //depot/projects/ia64/contrib/cvs/lib/getpass.c#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/regex.c#4 integrate .. //depot/projects/ia64/contrib/cvs/lib/system.h#5 integrate .. //depot/projects/ia64/contrib/cvs/lib/test-getdate.sh#1 branch .. //depot/projects/ia64/contrib/cvs/lib/xtime.h#2 integrate .. //depot/projects/ia64/contrib/cvs/man/ChangeLog#6 integrate .. //depot/projects/ia64/contrib/cvs/man/Makefile.am#4 integrate .. //depot/projects/ia64/contrib/cvs/man/Makefile.in#6 integrate .. //depot/projects/ia64/contrib/cvs/man/cvs.1#7 integrate .. //depot/projects/ia64/contrib/cvs/src/ChangeLog#7 integrate .. //depot/projects/ia64/contrib/cvs/src/Makefile.am#6 integrate .. //depot/projects/ia64/contrib/cvs/src/Makefile.in#6 integrate .. //depot/projects/ia64/contrib/cvs/src/add.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/admin.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/annotate.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/buffer.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/buffer.h#5 integrate .. //depot/projects/ia64/contrib/cvs/src/checkin.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/checkout.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/classify.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/client.c#8 integrate .. //depot/projects/ia64/contrib/cvs/src/client.h#4 integrate .. //depot/projects/ia64/contrib/cvs/src/commit.c#7 integrate .. //depot/projects/ia64/contrib/cvs/src/create_adm.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/cvs.h#7 integrate .. //depot/projects/ia64/contrib/cvs/src/cvsrc.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/diff.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/edit.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/entries.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/expand_path.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/fileattr.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/filesubr.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/find_names.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/hardlink.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/hardlink.h#2 integrate .. //depot/projects/ia64/contrib/cvs/src/hash.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/hash.h#3 integrate .. //depot/projects/ia64/contrib/cvs/src/history.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/history.h#2 integrate .. //depot/projects/ia64/contrib/cvs/src/ignore.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/import.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/lock.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/log.c#8 integrate .. //depot/projects/ia64/contrib/cvs/src/login.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/logmsg.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/main.c#7 integrate .. //depot/projects/ia64/contrib/cvs/src/mkmodules.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/modules.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/myndbm.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/myndbm.h#2 integrate .. //depot/projects/ia64/contrib/cvs/src/no_diff.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/parseinfo.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/patch.c#7 integrate .. //depot/projects/ia64/contrib/cvs/src/rcs.c#8 integrate .. //depot/projects/ia64/contrib/cvs/src/rcs.h#4 integrate .. //depot/projects/ia64/contrib/cvs/src/rcscmds.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/recurse.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/release.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/remove.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/repos.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/root.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/root.h#3 integrate .. //depot/projects/ia64/contrib/cvs/src/run.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/sanity.sh#7 integrate .. //depot/projects/ia64/contrib/cvs/src/server.c#9 integrate .. //depot/projects/ia64/contrib/cvs/src/server.h#4 integrate .. //depot/projects/ia64/contrib/cvs/src/stack.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/stack.h#2 integrate .. //depot/projects/ia64/contrib/cvs/src/status.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/subr.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/tag.c#7 integrate .. //depot/projects/ia64/contrib/cvs/src/update.c#7 integrate .. //depot/projects/ia64/contrib/cvs/src/vers_ts.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/version.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/watch.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/wrapper.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/zlib.c#5 integrate .. //depot/projects/ia64/contrib/cvs/tools/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/cvs/tools/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/cvs/tools/Makefile.in#5 integrate .. //depot/projects/ia64/contrib/cvs/tools/README#3 integrate .. //depot/projects/ia64/contrib/file/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/file/FREEBSD-upgrade#5 integrate .. //depot/projects/ia64/contrib/file/Magdir/acorn#2 integrate .. //depot/projects/ia64/contrib/file/Magdir/animation#7 integrate .. //depot/projects/ia64/contrib/file/Magdir/apple#4 integrate .. //depot/projects/ia64/contrib/file/Magdir/archive#8 integrate .. //depot/projects/ia64/contrib/file/Magdir/audio#8 integrate .. //depot/projects/ia64/contrib/file/Magdir/bFLT#2 delete .. //depot/projects/ia64/contrib/file/Magdir/blender#2 integrate .. //depot/projects/ia64/contrib/file/Magdir/chi#2 delete .. //depot/projects/ia64/contrib/file/Magdir/commands#6 integrate .. //depot/projects/ia64/contrib/file/Magdir/console#6 integrate .. //depot/projects/ia64/contrib/file/Magdir/cvs#2 delete .. //depot/projects/ia64/contrib/file/Magdir/database#6 integrate .. //depot/projects/ia64/contrib/file/Magdir/efi#1 branch .. //depot/projects/ia64/contrib/file/Magdir/elf#8 integrate .. //depot/projects/ia64/contrib/file/Magdir/filesystems#9 integrate .. //depot/projects/ia64/contrib/file/Magdir/fortran#1 branch .. //depot/projects/ia64/contrib/file/Magdir/hdf#2 delete .. //depot/projects/ia64/contrib/file/Magdir/impulse#2 delete .. //depot/projects/ia64/contrib/file/Magdir/java#4 integrate .. //depot/projects/ia64/contrib/file/Magdir/macintosh#5 integrate .. //depot/projects/ia64/contrib/file/Magdir/msdos#7 integrate .. //depot/projects/ia64/contrib/file/Magdir/pdf#2 integrate .. //depot/projects/ia64/contrib/file/Magdir/sgi#4 integrate .. //depot/projects/ia64/contrib/file/Magdir/wordperfect#2 delete .. //depot/projects/ia64/contrib/file/Makefile.am#9 integrate .. //depot/projects/ia64/contrib/file/Makefile.in#9 integrate .. //depot/projects/ia64/contrib/file/acconfig.h#4 delete .. //depot/projects/ia64/contrib/file/acinclude.m4#4 integrate .. //depot/projects/ia64/contrib/file/aclocal.m4#7 integrate .. //depot/projects/ia64/contrib/file/apprentice.c#8 integrate .. //depot/projects/ia64/contrib/file/ascmagic.c#8 integrate .. //depot/projects/ia64/contrib/file/compress.c#7 integrate .. //depot/projects/ia64/contrib/file/config.h.in#9 integrate .. //depot/projects/ia64/contrib/file/configure#9 integrate .. //depot/projects/ia64/contrib/file/configure.in#9 integrate .. //depot/projects/ia64/contrib/file/file.c#9 integrate .. //depot/projects/ia64/contrib/file/file.h#8 integrate .. //depot/projects/ia64/contrib/file/file.man#7 integrate .. //depot/projects/ia64/contrib/file/file_opts.h#1 branch .. //depot/projects/ia64/contrib/file/fsmagic.c#7 integrate .. //depot/projects/ia64/contrib/file/funcs.c#5 integrate .. //depot/projects/ia64/contrib/file/install-sh#4 integrate .. //depot/projects/ia64/contrib/file/is_tar.c#6 integrate .. //depot/projects/ia64/contrib/file/libmagic.man#3 integrate .. //depot/projects/ia64/contrib/file/magic.c#5 integrate .. //depot/projects/ia64/contrib/file/magic.h#4 integrate .. //depot/projects/ia64/contrib/file/magic.man#7 integrate .. //depot/projects/ia64/contrib/file/magic.mime#8 integrate .. //depot/projects/ia64/contrib/file/missing#2 delete .. //depot/projects/ia64/contrib/file/mkinstalldirs#4 integrate .. //depot/projects/ia64/contrib/file/names.h#6 integrate .. //depot/projects/ia64/contrib/file/patchlevel.h#9 integrate .. //depot/projects/ia64/contrib/file/print.c#8 integrate .. //depot/projects/ia64/contrib/file/readelf.c#9 integrate .. //depot/projects/ia64/contrib/file/readelf.h#6 integrate .. //depot/projects/ia64/contrib/file/softmagic.c#9 integrate .. //depot/projects/ia64/contrib/file/stamp-h.in#2 delete .. //depot/projects/ia64/contrib/gcc/fold-const.c#14 integrate .. //depot/projects/ia64/contrib/gdb/FREEBSD-diffs#1 branch .. //depot/projects/ia64/contrib/gdtoa/gdtoaimp.h#8 integrate .. //depot/projects/ia64/contrib/gdtoa/hexnan.c#3 integrate .. //depot/projects/ia64/contrib/gdtoa/strtod.c#6 integrate .. //depot/projects/ia64/contrib/gdtoa/strtof.c#3 integrate .. //depot/projects/ia64/contrib/gdtoa/strtorQ.c#3 integrate .. //depot/projects/ia64/contrib/gdtoa/strtorx.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64/contrib/ncurses/FREEBSD-vendor#1 branch .. //depot/projects/ia64/contrib/ncurses/INSTALL#4 integrate .. //depot/projects/ia64/contrib/ncurses/MANIFEST#4 integrate .. //depot/projects/ia64/contrib/ncurses/NEWS#5 integrate .. //depot/projects/ia64/contrib/ncurses/TO-DO#3 integrate .. //depot/projects/ia64/contrib/ncurses/aclocal.m4#4 integrate .. //depot/projects/ia64/contrib/ncurses/config.guess#4 integrate .. //depot/projects/ia64/contrib/ncurses/config.sub#4 integrate .. //depot/projects/ia64/contrib/ncurses/configure#5 integrate .. //depot/projects/ia64/contrib/ncurses/configure.in#5 integrate .. //depot/projects/ia64/contrib/ncurses/dist.mk#5 integrate .. //depot/projects/ia64/contrib/ncurses/doc/hackguide.doc#3 integrate .. //depot/projects/ia64/contrib/ncurses/doc/html/ncurses-intro.html#4 integrate .. //depot/projects/ia64/contrib/ncurses/doc/ncurses-intro.doc#3 integrate .. //depot/projects/ia64/contrib/ncurses/form/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_def.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_dup.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_ftlink.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_link.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/form/fld_newftyp.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/form/frm_def.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/form/frm_driver.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/form/fty_alnum.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/form/fty_alpha.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/form/fty_enum.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/form/fty_int.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/form/fty_num.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/form/fty_regex.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/form/headers#2 integrate .. //depot/projects/ia64/contrib/ncurses/form/modules#3 integrate .. //depot/projects/ia64/contrib/ncurses/include/MKterm.h.awk.in#4 integrate .. //depot/projects/ia64/contrib/ncurses/include/curses.h.in#5 integrate .. //depot/projects/ia64/contrib/ncurses/include/curses.tail#3 integrate .. //depot/projects/ia64/contrib/ncurses/include/curses.wide#3 integrate .. //depot/projects/ia64/contrib/ncurses/include/headers#2 integrate .. //depot/projects/ia64/contrib/ncurses/include/nc_alloc.h#4 integrate .. //depot/projects/ia64/contrib/ncurses/include/ncurses_defs#4 integrate .. //depot/projects/ia64/contrib/ncurses/include/ncurses_dll.h#4 integrate .. //depot/projects/ia64/contrib/ncurses/include/tic.h#5 integrate .. //depot/projects/ia64/contrib/ncurses/install-sh#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/captoinfo.1m#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/clear.1#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_add_wch.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_addch.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_attr.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_border.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_clear.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_deleteln.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_extend.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_getcchar.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_getyx.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_insstr.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_legacy.3x#1 branch .. //depot/projects/ia64/contrib/ncurses/man/curs_mouse.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_opaque.3x#1 branch .. //depot/projects/ia64/contrib/ncurses/man/curs_outopts.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_printw.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_scanw.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_scr_dump.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_slk.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_termattrs.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_termcap.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_terminfo.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_threads.3x#1 branch .. //depot/projects/ia64/contrib/ncurses/man/curs_trace.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/curs_util.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/default_colors.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_driver.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_field_new.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_field_opts.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_field_validation.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_hook.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/form_opts.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/infocmp.1m#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/infotocap.1m#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/legacy_coding.3x#2 integrate .. //depot/projects/ia64/contrib/ncurses/man/man_db.renames#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/manlinks.sed#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_driver.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_hook.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/menu_opts.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/mitem_opts.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/ncurses.3x#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/panel.3x#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/term.5#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/term.7#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/terminfo.head#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/terminfo.tail#4 integrate .. //depot/projects/ia64/contrib/ncurses/man/tic.1m#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/toe.1m#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/tput.1#3 integrate .. //depot/projects/ia64/contrib/ncurses/man/tset.1#3 integrate .. //depot/projects/ia64/contrib/ncurses/menu/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/ncurses/menu/headers#2 integrate .. //depot/projects/ia64/contrib/ncurses/menu/menu.h#3 integrate .. //depot/projects/ia64/contrib/ncurses/menu/modules#3 integrate .. //depot/projects/ia64/contrib/ncurses/misc/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/ncurses/misc/ncurses-config.in#2 integrate .. //depot/projects/ia64/contrib/ncurses/misc/shlib#3 integrate .. //depot/projects/ia64/contrib/ncurses/misc/terminfo.src#5 integrate .. //depot/projects/ia64/contrib/ncurses/mk-1st.awk#4 integrate .. //depot/projects/ia64/contrib/ncurses/mk-hdr.awk#1 branch .. //depot/projects/ia64/contrib/ncurses/mkdirs.sh#1 branch .. //depot/projects/ia64/contrib/ncurses/mkinstalldirs#3 delete .. //depot/projects/ia64/contrib/ncurses/ncurses/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/MKkeyname.awk#5 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/MKlib_gen.sh#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/MKunctrl.awk#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/define_key.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/key_defined.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/keyok.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_addch.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_addstr.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_color.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_delwin.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_freeall.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_getch.c#5 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_initscr.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_insch.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_instr.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_mouse.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_newterm.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_newwin.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_overlay.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_redrawln.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_refresh.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_restart.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_screen.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_set_term.c#5 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slk.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slkclear.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slkinit.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slkset.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_ungetch.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_window.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/memmove.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/resizeterm.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/safe_sprintf.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/tries.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/base/use_window.c#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/base/wresize.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/curses.priv.h#6 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/llib-lncurses#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/llib-lncursest#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/llib-lncursesw#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/modules#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/MKcaptab.sh#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/MKcodes.awk#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/MKnames.awk#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/access.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/add_tries.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/comp_error.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/comp_hash.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/comp_parse.c#5 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/db_iterator.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/entries.c#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/home_terminfo.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/init_keytry.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_acs.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#5 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_data.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_options.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_raw.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_setup.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_termcap.c#5 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_tparm.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_tputs.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#5 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/make_keys.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/name_match.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/parse_entry.c#5 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/read_entry.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/setbuf.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/strings.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/use_screen.c#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/write_entry.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_trace.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_traceatr.c#5 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_tracebits.c#5 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_tracechr.c#5 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_tracedmp.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_tracemse.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/trace_buf.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/trace_tries.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/varargs.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/trace/visbuf.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tty/hardscroll.c#2 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tty/hashmap.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tty/lib_mvcur.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tty/lib_tstp.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tty/lib_twait.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tty/lib_vidattr.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/tty/tty_update.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_cchar.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_get_wch.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_key_name.c#1 branch .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/panel/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/ncurses/panel/headers#2 integrate .. //depot/projects/ia64/contrib/ncurses/panel/modules#2 integrate .. //depot/projects/ia64/contrib/ncurses/progs/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/ncurses/progs/clear.c#3 integrate .. //depot/projects/ia64/contrib/ncurses/progs/dump_entry.c#5 integrate .. //depot/projects/ia64/contrib/ncurses/progs/infocmp.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/progs/modules#3 integrate .. //depot/projects/ia64/contrib/ncurses/progs/progs.priv.h#4 integrate .. //depot/projects/ia64/contrib/ncurses/progs/tic.c#5 integrate .. //depot/projects/ia64/contrib/ncurses/progs/toe.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/progs/tput.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/progs/tset.c#4 integrate .. //depot/projects/ia64/contrib/ncurses/tack/COPYING#3 delete .. //depot/projects/ia64/contrib/ncurses/tack/HISTORY#3 delete .. //depot/projects/ia64/contrib/ncurses/tack/Makefile.in#4 delete .. //depot/projects/ia64/contrib/ncurses/tack/README#2 delete .. //depot/projects/ia64/contrib/ncurses/tack/ansi.c#4 delete .. //depot/projects/ia64/contrib/ncurses/tack/charset.c#4 delete .. //depot/projects/ia64/contrib/ncurses/tack/color.c#3 delete .. //depot/projects/ia64/contrib/ncurses/tack/control.c#3 delete .. //depot/projects/ia64/contrib/ncurses/tack/crum.c#3 delete .. //depot/projects/ia64/contrib/ncurses/tack/edit.c#4 delete .. //depot/projects/ia64/contrib/ncurses/tack/fun.c#3 delete .. //depot/projects/ia64/contrib/ncurses/tack/init.c#4 delete .. //depot/projects/ia64/contrib/ncurses/tack/menu.c#3 delete .. //depot/projects/ia64/contrib/ncurses/tack/modes.c#3 delete .. //depot/projects/ia64/contrib/ncurses/tack/modules#3 delete .. //depot/projects/ia64/contrib/ncurses/tack/output.c#4 delete .. //depot/projects/ia64/contrib/ncurses/tack/pad.c#3 delete .. //depot/projects/ia64/contrib/ncurses/tack/scan.c#3 delete .. //depot/projects/ia64/contrib/ncurses/tack/sync.c#4 delete .. //depot/projects/ia64/contrib/ncurses/tack/sysdep.c#4 delete .. //depot/projects/ia64/contrib/ncurses/tack/tack.1#3 delete .. //depot/projects/ia64/contrib/ncurses/tack/tack.c#4 delete .. //depot/projects/ia64/contrib/ncurses/tack/tack.h#4 delete .. //depot/projects/ia64/contrib/openpam/CREDITS#12 integrate .. //depot/projects/ia64/contrib/openpam/FREEBSD-vendor#1 branch .. //depot/projects/ia64/contrib/openpam/HISTORY#21 integrate .. //depot/projects/ia64/contrib/openpam/INSTALL#9 integrate .. //depot/projects/ia64/contrib/openpam/LICENSE#10 integrate .. //depot/projects/ia64/contrib/openpam/MANIFEST#18 delete .. //depot/projects/ia64/contrib/openpam/Makefile.am#4 integrate .. //depot/projects/ia64/contrib/openpam/Makefile.in#5 integrate .. //depot/projects/ia64/contrib/openpam/README#11 integrate .. //depot/projects/ia64/contrib/openpam/RELNOTES#21 integrate .. //depot/projects/ia64/contrib/openpam/aclocal.m4#4 integrate .. //depot/projects/ia64/contrib/openpam/autogen.sh#3 integrate .. //depot/projects/ia64/contrib/openpam/bin/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/openpam/bin/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/openpam/bin/su/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/openpam/bin/su/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/openpam/bin/su/su.c#11 integrate .. //depot/projects/ia64/contrib/openpam/compile#1 branch .. //depot/projects/ia64/contrib/openpam/config.h.in#3 integrate .. //depot/projects/ia64/contrib/openpam/configure#5 integrate .. //depot/projects/ia64/contrib/openpam/configure.ac#2 integrate .. //depot/projects/ia64/contrib/openpam/configure.in#3 delete .. //depot/projects/ia64/contrib/openpam/depcomp#3 integrate .. //depot/projects/ia64/contrib/openpam/doc/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/openpam/doc/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/Makefile.am#4 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam.man#4 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_envlist.3#3 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_nullconv.3#12 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_readline.3#6 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#17 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam.man#5 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_conv.3#6 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#22 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#22 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#22 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#21 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#21 integrate .. //depot/projects/ia64/contrib/openpam/include/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/openpam/include/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/openpam/include/security/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/openpam/include/security/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/openpam/include/security/openpam.h#20 integrate .. //depot/projects/ia64/contrib/openpam/include/security/openpam_attr.h#1 branch .. //depot/projects/ia64/contrib/openpam/include/security/openpam_version.h#11 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_appl.h#12 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_constants.h#14 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_modules.h#12 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_types.h#13 integrate .. //depot/projects/ia64/contrib/openpam/install-sh#3 integrate .. //depot/projects/ia64/contrib/openpam/lib/Makefile.am#4 integrate .. //depot/projects/ia64/contrib/openpam/lib/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_borrow_cred.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_configure.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_dispatch.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_dynamic.c#14 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_findenv.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_free_data.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_free_envlist.c#2 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_get_option.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#20 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_load.c#14 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_log.c#16 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_nullconv.c#8 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_readline.c#4 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_restore_cred.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_set_option.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_static.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_ttyconv.c#21 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_acct_mgmt.c#13 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_authenticate.c#14 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_authenticate_secondary.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_chauthtok.c#14 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_close_session.c#13 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_end.c#13 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_error.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#20 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_data.c#14 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_item.c#13 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_mapped_authtok.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_mapped_username.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_user.c#16 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_getenv.c#14 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_getenvlist.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_info.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_open_session.c#14 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_prompt.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_putenv.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_set_data.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_set_item.c#14 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_set_mapped_authtok.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_set_mapped_username.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_setcred.c#13 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_setenv.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_acct_mgmt.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_authenticate.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_authenticate_secondary.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_chauthtok.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_close_session.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_get_mapped_username.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_open_session.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_set_mapped_username.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_setcred.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_start.c#13 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_strerror.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_verror.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_vinfo.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_vprompt.c#14 integrate .. //depot/projects/ia64/contrib/openpam/ltconfig#2 delete .. //depot/projects/ia64/contrib/openpam/ltmain.sh#5 integrate .. //depot/projects/ia64/contrib/openpam/misc/gendoc.pl#16 integrate .. //depot/projects/ia64/contrib/openpam/missing#3 integrate .. //depot/projects/ia64/contrib/openpam/mkinstalldirs#2 delete .. //depot/projects/ia64/contrib/openpam/modules/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/openpam/modules/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_deny/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_deny/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_deny/pam_deny.c#12 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_permit/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_permit/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_permit/pam_permit.c#11 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_unix/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_unix/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_unix/pam_unix.c#6 integrate .. //depot/projects/ia64/contrib/openpam/stamp-h.in#3 delete .. //depot/projects/ia64/contrib/pf/man/pf.conf.5#13 integrate .. //depot/projects/ia64/contrib/tcpdump/print-802_11.c#9 integrate .. //depot/projects/ia64/contrib/tcsh/sh.lex.c#7 integrate .. //depot/projects/ia64/contrib/top/display.c#5 integrate .. //depot/projects/ia64/contrib/top/layout.h#2 integrate .. //depot/projects/ia64/contrib/top/machine.h#7 integrate .. //depot/projects/ia64/contrib/top/top.c#11 integrate .. //depot/projects/ia64/contrib/top/top.h#4 integrate .. //depot/projects/ia64/contrib/traceroute/as.c#1 branch .. //depot/projects/ia64/contrib/traceroute/as.h#1 branch .. //depot/projects/ia64/contrib/traceroute/traceroute.8#8 integrate .. //depot/projects/ia64/contrib/traceroute/traceroute.c#13 integrate .. //depot/projects/ia64/crypto/openssh/FREEBSD-Xlist#4 integrate .. //depot/projects/ia64/crypto/openssh/FREEBSD-upgrade#11 integrate .. //depot/projects/ia64/crypto/openssh/FREEBSD-vendor#1 branch .. //depot/projects/ia64/crypto/openssl/crypto/engine/eng_cryptodev.c#2 integrate .. //depot/projects/ia64/etc/Makefile#59 integrate .. //depot/projects/ia64/etc/ddb.conf#1 branch .. //depot/projects/ia64/etc/defaults/periodic.conf#25 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#80 integrate .. //depot/projects/ia64/etc/devd.conf#28 integrate .. //depot/projects/ia64/etc/mail/access.sample#2 integrate .. //depot/projects/ia64/etc/namedb/named.conf#12 integrate .. //depot/projects/ia64/etc/namedb/named.root#6 integrate .. //depot/projects/ia64/etc/netstart#9 integrate .. //depot/projects/ia64/etc/periodic/daily/460.status-mail-rejects#6 integrate .. //depot/projects/ia64/etc/periodic/security/100.chksetuid#10 integrate .. //depot/projects/ia64/etc/rc#35 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#47 integrate .. //depot/projects/ia64/etc/rc.d/ddb#1 branch .. //depot/projects/ia64/etc/rc.d/dhclient#20 integrate .. //depot/projects/ia64/etc/rc.d/hostid#3 integrate .. //depot/projects/ia64/etc/rc.d/ipfw#15 integrate .. //depot/projects/ia64/etc/rc.d/jail#23 integrate .. //depot/projects/ia64/etc/rc.d/kerberos#8 integrate .. //depot/projects/ia64/etc/rc.d/ldconfig#17 integrate .. //depot/projects/ia64/etc/rc.d/mountcritlocal#14 integrate .. //depot/projects/ia64/etc/rc.d/mountcritremote#16 integrate .. //depot/projects/ia64/etc/rc.d/mountlate#3 integrate .. //depot/projects/ia64/etc/rc.d/netif#18 integrate .. //depot/projects/ia64/etc/rc.d/ppp#8 integrate .. //depot/projects/ia64/etc/rc.d/root#14 integrate .. //depot/projects/ia64/etc/rc.firewall#9 integrate .. //depot/projects/ia64/etc/rc.firewall6#9 integrate .. //depot/projects/ia64/etc/rc.subr#37 integrate .. //depot/projects/ia64/etc/sendmail/freebsd.mc#16 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#70 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes-o.real#12 integrate .. //depot/projects/ia64/games/fortune/datfiles/gerrold.limerick#4 integrate .. //depot/projects/ia64/games/fortune/datfiles/limerick#11 integrate .. //depot/projects/ia64/games/fortune/strfile/strfile.c#9 integrate .. //depot/projects/ia64/gnu/lib/csu/Makefile#22 integrate .. //depot/projects/ia64/gnu/lib/libgcc/Makefile#26 integrate .. //depot/projects/ia64/gnu/usr.bin/Makefile#31 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/ar/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/ranlib/Makefile#8 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/contrib/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kgdb.h#7 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kld.c#1 branch .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kthr.c#9 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/main.c#8 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/trgt.c#6 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/trgt_i386.c#6 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#35 integrate .. //depot/projects/ia64/gnu/usr.bin/man/man/man.c#13 integrate .. //depot/projects/ia64/gnu/usr.bin/man/manpath/manpath.c#3 integrate .. //depot/projects/ia64/include/complex.h#5 integrate .. //depot/projects/ia64/include/fts.h#6 integrate .. //depot/projects/ia64/include/nsswitch.h#5 integrate .. //depot/projects/ia64/include/pthread_np.h#8 integrate .. //depot/projects/ia64/include/unistd.h#31 integrate .. //depot/projects/ia64/lib/Makefile#64 integrate .. //depot/projects/ia64/lib/libalias/libalias/Makefile#3 integrate .. //depot/projects/ia64/lib/libarchive/Makefile#29 integrate .. //depot/projects/ia64/lib/libarchive/archive.h.in#17 integrate .. //depot/projects/ia64/lib/libarchive/archive_endian.h#1 branch .. //depot/projects/ia64/lib/libarchive/archive_entry.3#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.c#18 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry.h#14 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry_link_resolver.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_entry_strmode.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_platform.h#16 integrate .. //depot/projects/ia64/lib/libarchive/archive_read.3#18 integrate .. //depot/projects/ia64/lib/libarchive/archive_read.c#16 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_extract.c#22 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_open_filename.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_private.h#3 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_bzip2.c#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_gzip.c#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_none.c#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_all.c#9 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_ar.c#3 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_cpio.c#15 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_iso9660.c#13 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_mtree.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tar.c#23 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_zip.c#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_util.3#8 integrate .. //depot/projects/ia64/lib/libarchive/archive_util.c#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_write.3#14 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_disk.c#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_open_filename.c#4 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_bzip2.c#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_gzip.c#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_none.c#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_ar.c#3 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_cpio.c#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_cpio_newc.c#3 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_pax.c#20 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_ustar.c#14 integrate .. //depot/projects/ia64/lib/libarchive/config_freebsd.h#5 integrate .. //depot/projects/ia64/lib/libarchive/cpio.5#1 branch .. //depot/projects/ia64/lib/libarchive/filter_fork.c#2 integrate .. //depot/projects/ia64/lib/libarchive/libarchive-formats.5#12 integrate .. //depot/projects/ia64/lib/libarchive/libarchive_internals.3#2 integrate .. //depot/projects/ia64/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/ia64/lib/libarchive/test/README#3 integrate .. //depot/projects/ia64/lib/libarchive/test/main.c#4 integrate .. //depot/projects/ia64/lib/libarchive/test/read_open_memory.c#2 integrate .. //depot/projects/ia64/lib/libarchive/test/test.h#4 integrate .. //depot/projects/ia64/lib/libarchive/test/test_compat_gtar.c#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_compat_gtar_1.tgz.uu#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_compat_tar_hardlink.c#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_compat_zip.c#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_compat_zip_1.zip.uu#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_empty_write.c#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_entry.c#3 integrate .. //depot/projects/ia64/lib/libarchive/test/test_entry_strmode.c#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_read_format_ar.c#4 integrate .. //depot/projects/ia64/lib/libarchive/test/test_read_format_cpio_odc.c#2 integrate .. //depot/projects/ia64/lib/libarchive/test/test_read_format_gtar_sparse.c#2 integrate .. //depot/projects/ia64/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_read_format_isorr_bz2.c#3 integrate .. //depot/projects/ia64/lib/libarchive/test/test_read_format_mtree.c#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_read_format_tar.c#3 integrate .. //depot/projects/ia64/lib/libarchive/test/test_read_format_zip.c#3 integrate .. //depot/projects/ia64/lib/libarchive/test/test_read_pax_truncated.c#2 integrate .. //depot/projects/ia64/lib/libarchive/test/test_tar_filenames.c#4 integrate .. //depot/projects/ia64/lib/libarchive/test/test_tar_large.c#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_write_disk.c#5 integrate .. //depot/projects/ia64/lib/libarchive/test/test_write_disk_hardlink.c#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_write_disk_perms.c#4 integrate .. //depot/projects/ia64/lib/libarchive/test/test_write_format_ar.c#4 integrate .. //depot/projects/ia64/lib/libarchive/test/test_write_format_cpio.c#3 integrate .. //depot/projects/ia64/lib/libarchive/test/test_write_format_cpio_newc.c#1 branch .. //depot/projects/ia64/lib/libarchive/test/test_write_format_cpio_odc.c#1 branch .. //depot/projects/ia64/lib/libc/Versions.def#3 integrate .. //depot/projects/ia64/lib/libc/amd64/Symbol.map#4 integrate .. //depot/projects/ia64/lib/libc/amd64/_fpmath.h#5 integrate .. //depot/projects/ia64/lib/libc/amd64/gd_qnan.h#2 integrate .. //depot/projects/ia64/lib/libc/arm/gd_qnan.h#2 integrate .. //depot/projects/ia64/lib/libc/db/test/btree.tests/main.c#4 integrate .. //depot/projects/ia64/lib/libc/db/test/dbtest.c#5 integrate .. //depot/projects/ia64/lib/libc/gdtoa/Symbol.map#5 integrate .. //depot/projects/ia64/lib/libc/gen/Makefile.inc#40 integrate .. //depot/projects/ia64/lib/libc/gen/Symbol.map#7 integrate .. //depot/projects/ia64/lib/libc/gen/feature_present.3#1 branch .. //depot/projects/ia64/lib/libc/gen/feature_present.c#1 branch .. //depot/projects/ia64/lib/libc/gen/fts-compat.c#2 integrate .. //depot/projects/ia64/lib/libc/gen/fts-compat.h#2 integrate .. //depot/projects/ia64/lib/libc/gen/fts.3#12 integrate .. //depot/projects/ia64/lib/libc/gen/fts.c#8 integrate .. //depot/projects/ia64/lib/libc/gen/getgrent.c#15 integrate .. //depot/projects/ia64/lib/libc/gen/getgrouplist.c#8 integrate .. //depot/projects/ia64/lib/libc/gen/getttyent.c#6 integrate .. //depot/projects/ia64/lib/libc/gen/posixshm.c#3 delete .. //depot/projects/ia64/lib/libc/gen/sem_open.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/sem_timedwait.3#1 branch .. //depot/projects/ia64/lib/libc/gen/sem_wait.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/shm_open.3#4 delete .. //depot/projects/ia64/lib/libc/gen/sysconf.c#13 integrate .. //depot/projects/ia64/lib/libc/i386/Symbol.map#5 integrate .. //depot/projects/ia64/lib/libc/i386/_fpmath.h#5 integrate .. //depot/projects/ia64/lib/libc/i386/gd_qnan.h#2 integrate .. //depot/projects/ia64/lib/libc/ia64/Symbol.map#5 integrate .. //depot/projects/ia64/lib/libc/ia64/_fpmath.h#6 integrate .. //depot/projects/ia64/lib/libc/ia64/gd_qnan.h#2 integrate .. //depot/projects/ia64/lib/libc/include/namespace.h#14 integrate .. //depot/projects/ia64/lib/libc/include/un-namespace.h#12 integrate .. //depot/projects/ia64/lib/libc/inet/inet_network.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/Makefile.inc#23 integrate .. //depot/projects/ia64/lib/libc/locale/ascii.c#1 branch .. //depot/projects/ia64/lib/libc/locale/localeconv.c#6 integrate .. //depot/projects/ia64/lib/libc/locale/mblocal.h#6 integrate .. //depot/projects/ia64/lib/libc/locale/setrunelocale.c#19 integrate .. //depot/projects/ia64/lib/libc/net/getaddrinfo.c#29 integrate .. //depot/projects/ia64/lib/libc/net/nsdispatch.c#12 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac.c#9 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac_exec.c#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac_get.c#6 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac_set.c#4 integrate .. //depot/projects/ia64/lib/libc/powerpc/gen/flt_rounds.c#2 integrate .. //depot/projects/ia64/lib/libc/powerpc/gen/fpgetmask.c#2 integrate .. //depot/projects/ia64/lib/libc/powerpc/gen/fpgetround.c#2 integrate .. //depot/projects/ia64/lib/libc/powerpc/gen/fpgetsticky.c#2 integrate .. //depot/projects/ia64/lib/libc/powerpc/gen/fpsetmask.c#2 integrate .. //depot/projects/ia64/lib/libc/powerpc/gen/fpsetround.c#2 integrate .. //depot/projects/ia64/lib/libc/regex/grot/main.c#3 integrate .. //depot/projects/ia64/lib/libc/resolv/res_comp.c#4 integrate .. //depot/projects/ia64/lib/libc/sparc64/Symbol.map#5 integrate .. //depot/projects/ia64/lib/libc/sparc64/_fpmath.h#5 integrate .. //depot/projects/ia64/lib/libc/sparc64/gd_qnan.h#2 integrate .. //depot/projects/ia64/lib/libc/stdio/Symbol.map#4 integrate .. //depot/projects/ia64/lib/libc/stdio/fdopen.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/fopen.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/freopen.c#9 integrate .. //depot/projects/ia64/lib/libc/stdio/vfwprintf.c#19 integrate .. //depot/projects/ia64/lib/libc/stdlib/getenv.c#7 integrate .. //depot/projects/ia64/lib/libc/stdlib/grantpt.c#6 integrate .. //depot/projects/ia64/lib/libc/stdlib/heapsort.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.3#23 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.c#39 integrate .. //depot/projects/ia64/lib/libc/stdlib/qsort.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/rand.c#7 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtod.3#10 integrate .. //depot/projects/ia64/lib/libc/stdtime/localtime.c#16 integrate .. //depot/projects/ia64/lib/libc/string/strtok.3#5 integrate .. //depot/projects/ia64/lib/libc/string/strtok.c#6 integrate .. //depot/projects/ia64/lib/libc/string/wcstok.c#3 integrate .. //depot/projects/ia64/lib/libc/sys/Makefile.inc#33 integrate .. //depot/projects/ia64/lib/libc/sys/Symbol.map#6 integrate .. //depot/projects/ia64/lib/libc/sys/access.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/clock_gettime.2#12 integrate .. //depot/projects/ia64/lib/libc/sys/extattr_get_file.2#14 integrate .. //depot/projects/ia64/lib/libc/sys/fcntl.2#12 integrate .. //depot/projects/ia64/lib/libc/sys/flock.2#9 integrate .. //depot/projects/ia64/lib/libc/sys/kldunload.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/mq_close.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/mq_getattr.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/mq_notify.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/mq_open.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/mq_receive.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/mq_send.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/mq_setattr.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/readlink.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/select.2#12 integrate .. //depot/projects/ia64/lib/libc/sys/sendfile.2#15 integrate .. //depot/projects/ia64/lib/libc/sys/shm_open.2#1 branch .. //depot/projects/ia64/lib/libdevstat/devstat.h#4 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#29 integrate .. //depot/projects/ia64/lib/libelf/elf_update.c#4 integrate .. //depot/projects/ia64/lib/libelf/gelf_fsize.3#2 integrate .. //depot/projects/ia64/lib/libelf/gelf_rel.c#2 integrate .. //depot/projects/ia64/lib/libelf/gelf_rela.c#2 integrate .. //depot/projects/ia64/lib/libfetch/Makefile#22 integrate .. //depot/projects/ia64/lib/libfetch/common.c#14 integrate .. //depot/projects/ia64/lib/libfetch/common.h#9 integrate .. //depot/projects/ia64/lib/libfetch/fetch.3#17 integrate .. //depot/projects/ia64/lib/libfetch/fetch.c#7 integrate .. //depot/projects/ia64/lib/libfetch/file.c#5 integrate .. //depot/projects/ia64/lib/libfetch/ftp.c#19 integrate .. //depot/projects/ia64/lib/libfetch/http.c#20 integrate .. //depot/projects/ia64/lib/libkse/Makefile#2 integrate .. //depot/projects/ia64/lib/libkse/kse.map#2 integrate .. //depot/projects/ia64/lib/libkse/sys/lock.c#2 integrate .. //depot/projects/ia64/lib/libkse/sys/thr_error.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_accept.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_aio_suspend.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_atfork.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_get_np.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getstack.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_init.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setguardsize.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setinheritsched.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setschedparam.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setscope.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setstack.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_barrier.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_barrierattr.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_cancel.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_clean.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_close.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_concurrency.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_cond.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_condattr_init.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_connect.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_creat.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_create.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_detach.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_equal.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_execve.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_exit.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_fcntl.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_fork.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_fsync.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_getprio.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_getschedparam.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_info.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_init.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_join.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_kill.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_main_np.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_mattr_init.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_mattr_kind_np.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_msync.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_multi_np.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_mutex.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_mutex_prioceiling.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_mutex_protocol.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_nanosleep.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_once.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_open.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_pause.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_poll.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_private.h#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_pselect.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_pspinlock.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_raise.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_read.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_readv.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_resume_np.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_rwlock.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_select.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_self.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_sem.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_setprio.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_setschedparam.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_sigaction.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_sigmask.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_sigpending.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_sigprocmask.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_sigwait.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_single_np.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_sleep.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_spec.c#2 integrate .. //depot/projects/ia64/lib/libkse/thread/thr_spinlock.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 13 04:25:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98D621065676; Thu, 13 Mar 2008 04:25:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3CC291065670 for ; Thu, 13 Mar 2008 04:25:48 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3F4828FC1A for ; Thu, 13 Mar 2008 04:25:48 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2D4Pm8h077613 for ; Thu, 13 Mar 2008 04:25:48 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2D4Plom077611 for perforce@freebsd.org; Thu, 13 Mar 2008 04:25:47 GMT (envelope-from marcel@freebsd.org) Date: Thu, 13 Mar 2008 04:25:47 GMT Message-Id: <200803130425.m2D4Plom077611@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 137575 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, 13 Mar 2008 04:25:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=137575 Change 137575 by marcel@marcel_xcllnt on 2008/03/13 04:25:11 IFC @137564 Affected files ... .. //depot/projects/usiii/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/usiii/amd64/amd64/legacy.c#3 integrate .. //depot/projects/usiii/amd64/amd64/machdep.c#4 integrate .. //depot/projects/usiii/amd64/amd64/mem.c#2 integrate .. //depot/projects/usiii/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/usiii/amd64/amd64/trap.c#3 integrate .. //depot/projects/usiii/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/usiii/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/usiii/amd64/include/specialreg.h#4 integrate .. //depot/projects/usiii/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/usiii/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/usiii/arm/arm/nexus.c#2 integrate .. //depot/projects/usiii/arm/arm/trap.c#3 integrate .. //depot/projects/usiii/arm/conf/AVILA#5 integrate .. //depot/projects/usiii/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/usiii/boot/common/dev_net.c#2 integrate .. //depot/projects/usiii/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/usiii/boot/powerpc/uboot/metadata.c#2 integrate .. //depot/projects/usiii/boot/uboot/lib/console.c#2 integrate .. //depot/projects/usiii/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/usiii/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/usiii/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/usiii/boot/uboot/lib/net.c#2 integrate .. //depot/projects/usiii/boot/uboot/lib/time.c#2 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/usiii/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/usiii/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/usiii/conf/files#7 integrate .. //depot/projects/usiii/conf/options#7 integrate .. //depot/projects/usiii/dev/acpica/acpi.c#5 integrate .. //depot/projects/usiii/dev/agp/agp_i810.c#2 integrate .. //depot/projects/usiii/dev/bge/if_bge.c#7 integrate .. //depot/projects/usiii/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/usiii/dev/msk/if_msk.c#6 integrate .. //depot/projects/usiii/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/usiii/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/usiii/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/usiii/dev/uart/uart.h#3 integrate .. //depot/projects/usiii/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/usiii/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/usiii/dev/usb/ums.c#3 integrate .. //depot/projects/usiii/dev/vr/if_vr.c#1 branch .. //depot/projects/usiii/dev/vr/if_vrreg.h#1 branch .. //depot/projects/usiii/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/usiii/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/usiii/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/usiii/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/usiii/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/usiii/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/usiii/fs/procfs/procfs_status.c#3 integrate .. //depot/projects/usiii/i386/conf/DEFAULTS#3 integrate .. //depot/projects/usiii/i386/cpufreq/est.c#4 integrate .. //depot/projects/usiii/i386/i386/i686_mem.c#2 integrate .. //depot/projects/usiii/i386/i386/k6_mem.c#2 integrate .. //depot/projects/usiii/i386/i386/legacy.c#3 integrate .. //depot/projects/usiii/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/usiii/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/usiii/i386/i386/trap.c#3 integrate .. //depot/projects/usiii/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/usiii/i386/ibcs2/imgact_coff.c#4 integrate .. //depot/projects/usiii/i386/include/specialreg.h#2 integrate .. //depot/projects/usiii/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/usiii/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/usiii/ia64/ia64/machdep.c#5 integrate .. //depot/projects/usiii/ia64/ia64/trap.c#3 integrate .. //depot/projects/usiii/ia64/include/ucontext.h#2 integrate .. //depot/projects/usiii/kern/imgact_elf.c#4 integrate .. //depot/projects/usiii/kern/init_sysent.c#5 integrate .. //depot/projects/usiii/kern/kern_clock.c#5 integrate .. //depot/projects/usiii/kern/kern_condvar.c#2 integrate .. //depot/projects/usiii/kern/kern_exec.c#5 integrate .. //depot/projects/usiii/kern/kern_fork.c#4 integrate .. //depot/projects/usiii/kern/kern_intr.c#3 integrate .. //depot/projects/usiii/kern/kern_kse.c#4 delete .. //depot/projects/usiii/kern/kern_proc.c#5 integrate .. //depot/projects/usiii/kern/kern_resource.c#3 integrate .. //depot/projects/usiii/kern/kern_sig.c#5 integrate .. //depot/projects/usiii/kern/kern_switch.c#4 integrate .. //depot/projects/usiii/kern/kern_sx.c#4 integrate .. //depot/projects/usiii/kern/kern_synch.c#5 integrate .. //depot/projects/usiii/kern/kern_thread.c#6 integrate .. //depot/projects/usiii/kern/kern_timeout.c#6 integrate .. //depot/projects/usiii/kern/p1003_1b.c#3 integrate .. //depot/projects/usiii/kern/sched_4bsd.c#6 integrate .. //depot/projects/usiii/kern/sched_ule.c#7 integrate .. //depot/projects/usiii/kern/subr_bus.c#5 integrate .. //depot/projects/usiii/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/usiii/kern/subr_smp.c#6 integrate .. //depot/projects/usiii/kern/subr_trap.c#4 integrate .. //depot/projects/usiii/kern/subr_witness.c#6 integrate .. //depot/projects/usiii/kern/sys_process.c#4 integrate .. //depot/projects/usiii/kern/syscalls.c#5 integrate .. //depot/projects/usiii/kern/syscalls.master#6 integrate .. //depot/projects/usiii/kern/systrace_args.c#5 integrate .. //depot/projects/usiii/modules/vr/Makefile#2 integrate .. //depot/projects/usiii/netgraph/netgraph.h#4 integrate .. //depot/projects/usiii/netgraph/ng_base.c#6 integrate .. //depot/projects/usiii/netgraph/ng_socket.c#4 integrate .. //depot/projects/usiii/netinet/libalias/alias.c#3 integrate .. //depot/projects/usiii/netinet/libalias/alias.h#2 integrate .. //depot/projects/usiii/netinet/libalias/alias_old.c#2 delete .. //depot/projects/usiii/netsmb/smb_conn.h#3 integrate .. //depot/projects/usiii/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/usiii/pc98/conf/GENERIC#5 integrate .. //depot/projects/usiii/pc98/pc98/machdep.c#5 integrate .. //depot/projects/usiii/pci/if_vr.c#3 delete .. //depot/projects/usiii/pci/if_vrreg.h#2 delete .. //depot/projects/usiii/powerpc/aim/trap.c#3 integrate .. //depot/projects/usiii/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/usiii/powerpc/booke/machdep.c#2 integrate .. //depot/projects/usiii/powerpc/booke/trap.c#2 integrate .. //depot/projects/usiii/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/usiii/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/usiii/powerpc/include/bootinfo.h#3 integrate .. //depot/projects/usiii/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/usiii/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/usiii/powerpc/powerpc/intr_machdep.c#5 integrate .. //depot/projects/usiii/security/audit/audit_worker.c#6 integrate .. //depot/projects/usiii/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/usiii/sparc64/conf/GENERIC#5 integrate .. //depot/projects/usiii/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/usiii/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/usiii/sys/condvar.h#2 integrate .. //depot/projects/usiii/sys/cpuset.h#2 integrate .. //depot/projects/usiii/sys/disklabel.h#3 integrate .. //depot/projects/usiii/sys/kse.h#2 delete .. //depot/projects/usiii/sys/param.h#7 integrate .. //depot/projects/usiii/sys/proc.h#7 integrate .. //depot/projects/usiii/sys/sched.h#3 integrate .. //depot/projects/usiii/sys/sleepqueue.h#2 integrate .. //depot/projects/usiii/sys/syscall.h#5 integrate .. //depot/projects/usiii/sys/syscall.mk#5 integrate .. //depot/projects/usiii/sys/sysproto.h#5 integrate .. //depot/projects/usiii/sys/systm.h#4 integrate .. //depot/projects/usiii/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/usiii/vm/vm_glue.c#4 integrate .. //depot/projects/usiii/vm/vm_map.c#5 integrate .. //depot/projects/usiii/vm/vm_meter.c#2 integrate Differences ... ==== //depot/projects/usiii/amd64/amd64/amd64_mem.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.25 2004/08/07 06:21:37 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.29 2008/03/12 22:09:19 jhb Exp $"); #include #include @@ -47,31 +47,31 @@ static char *mem_owner_bios = "BIOS"; -#define MR686_FIXMTRR (1<<0) +#define MR686_FIXMTRR (1<<0) -#define mrwithin(mr, a) \ - (((a) >= (mr)->mr_base) && ((a) < ((mr)->mr_base + (mr)->mr_len))) -#define mroverlap(mra, mrb) \ - (mrwithin(mra, mrb->mr_base) || mrwithin(mrb, mra->mr_base)) +#define mrwithin(mr, a) \ + (((a) >= (mr)->mr_base) && ((a) < ((mr)->mr_base + (mr)->mr_len))) +#define mroverlap(mra, mrb) \ + (mrwithin(mra, mrb->mr_base) || mrwithin(mrb, mra->mr_base)) -#define mrvalid(base, len) \ - ((!(base & ((1 << 12) - 1))) && /* base is multiple of 4k */ \ - ((len) >= (1 << 12)) && /* length is >= 4k */ \ - powerof2((len)) && /* ... and power of two */ \ - !((base) & ((len) - 1))) /* range is not discontiuous */ +#define mrvalid(base, len) \ + ((!(base & ((1 << 12) - 1))) && /* base is multiple of 4k */ \ + ((len) >= (1 << 12)) && /* length is >= 4k */ \ + powerof2((len)) && /* ... and power of two */ \ + !((base) & ((len) - 1))) /* range is not discontiuous */ -#define mrcopyflags(curr, new) (((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK)) +#define mrcopyflags(curr, new) \ + (((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK)) -static int mtrrs_disabled; +static int mtrrs_disabled; TUNABLE_INT("machdep.disable_mtrrs", &mtrrs_disabled); SYSCTL_INT(_machdep, OID_AUTO, disable_mtrrs, CTLFLAG_RDTUN, - &mtrrs_disabled, 0, "Disable amd64 MTRRs."); + &mtrrs_disabled, 0, "Disable amd64 MTRRs."); -static void amd64_mrinit(struct mem_range_softc *sc); -static int amd64_mrset(struct mem_range_softc *sc, - struct mem_range_desc *mrd, - int *arg); -static void amd64_mrAPinit(struct mem_range_softc *sc); +static void amd64_mrinit(struct mem_range_softc *sc); +static int amd64_mrset(struct mem_range_softc *sc, + struct mem_range_desc *mrd, int *arg); +static void amd64_mrAPinit(struct mem_range_softc *sc); static struct mem_range_ops amd64_mrops = { amd64_mrinit, @@ -80,157 +80,159 @@ }; /* XXX for AP startup hook */ -static u_int64_t mtrrcap, mtrrdef; +static u_int64_t mtrrcap, mtrrdef; + +/* The bitmask for the PhysBase and PhysMask fields of the variable MTRRs. */ +static u_int64_t mtrr_physmask; -static struct mem_range_desc *mem_range_match(struct mem_range_softc *sc, - struct mem_range_desc *mrd); -static void amd64_mrfetch(struct mem_range_softc *sc); -static int amd64_mtrrtype(int flags); -static int amd64_mrt2mtrr(int flags, int oldval); -static int amd64_mtrrconflict(int flag1, int flag2); -static void amd64_mrstore(struct mem_range_softc *sc); -static void amd64_mrstoreone(void *arg); -static struct mem_range_desc *amd64_mtrrfixsearch(struct mem_range_softc *sc, - u_int64_t addr); -static int amd64_mrsetlow(struct mem_range_softc *sc, - struct mem_range_desc *mrd, - int *arg); -static int amd64_mrsetvariable(struct mem_range_softc *sc, - struct mem_range_desc *mrd, - int *arg); +static struct mem_range_desc *mem_range_match(struct mem_range_softc *sc, + struct mem_range_desc *mrd); +static void amd64_mrfetch(struct mem_range_softc *sc); +static int amd64_mtrrtype(int flags); +static int amd64_mrt2mtrr(int flags, int oldval); +static int amd64_mtrrconflict(int flag1, int flag2); +static void amd64_mrstore(struct mem_range_softc *sc); +static void amd64_mrstoreone(void *arg); +static struct mem_range_desc *amd64_mtrrfixsearch(struct mem_range_softc *sc, + u_int64_t addr); +static int amd64_mrsetlow(struct mem_range_softc *sc, + struct mem_range_desc *mrd, int *arg); +static int amd64_mrsetvariable(struct mem_range_softc *sc, + struct mem_range_desc *mrd, int *arg); /* amd64 MTRR type to memory range type conversion */ static int amd64_mtrrtomrt[] = { - MDF_UNCACHEABLE, - MDF_WRITECOMBINE, - MDF_UNKNOWN, - MDF_UNKNOWN, - MDF_WRITETHROUGH, - MDF_WRITEPROTECT, - MDF_WRITEBACK + MDF_UNCACHEABLE, + MDF_WRITECOMBINE, + MDF_UNKNOWN, + MDF_UNKNOWN, + MDF_WRITETHROUGH, + MDF_WRITEPROTECT, + MDF_WRITEBACK }; -#define MTRRTOMRTLEN (sizeof(amd64_mtrrtomrt) / sizeof(amd64_mtrrtomrt[0])) - -/* - * Used in /dev/mem drivers and elsewhere - */ -MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); +#define MTRRTOMRTLEN (sizeof(amd64_mtrrtomrt) / sizeof(amd64_mtrrtomrt[0])) static int amd64_mtrr2mrt(int val) { + if (val < 0 || val >= MTRRTOMRTLEN) - return MDF_UNKNOWN; - return amd64_mtrrtomrt[val]; + return (MDF_UNKNOWN); + return (amd64_mtrrtomrt[val]); } -/* +/* * amd64 MTRR conflicts. Writeback and uncachable may overlap. */ static int amd64_mtrrconflict(int flag1, int flag2) { + flag1 &= MDF_ATTRMASK; flag2 &= MDF_ATTRMASK; if ((flag1 & MDF_UNKNOWN) || (flag2 & MDF_UNKNOWN)) - return 1; + return (1); if (flag1 == flag2 || (flag1 == MDF_WRITEBACK && flag2 == MDF_UNCACHEABLE) || (flag2 == MDF_WRITEBACK && flag1 == MDF_UNCACHEABLE)) - return 0; - return 1; + return (0); + return (1); } /* * Look for an exactly-matching range. */ static struct mem_range_desc * -mem_range_match(struct mem_range_softc *sc, struct mem_range_desc *mrd) +mem_range_match(struct mem_range_softc *sc, struct mem_range_desc *mrd) { - struct mem_range_desc *cand; - int i; - - for (i = 0, cand = sc->mr_desc; i < sc->mr_ndesc; i++, cand++) - if ((cand->mr_base == mrd->mr_base) && - (cand->mr_len == mrd->mr_len)) - return(cand); - return(NULL); + struct mem_range_desc *cand; + int i; + + for (i = 0, cand = sc->mr_desc; i < sc->mr_ndesc; i++, cand++) + if ((cand->mr_base == mrd->mr_base) && + (cand->mr_len == mrd->mr_len)) + return (cand); + return (NULL); } /* - * Fetch the current mtrr settings from the current CPU (assumed to all - * be in sync in the SMP case). Note that if we are here, we assume - * that MTRRs are enabled, and we may or may not have fixed MTRRs. + * Fetch the current mtrr settings from the current CPU (assumed to + * all be in sync in the SMP case). Note that if we are here, we + * assume that MTRRs are enabled, and we may or may not have fixed + * MTRRs. */ static void amd64_mrfetch(struct mem_range_softc *sc) { - struct mem_range_desc *mrd; - u_int64_t msrv; - int i, j, msr; + struct mem_range_desc *mrd; + u_int64_t msrv; + int i, j, msr; - mrd = sc->mr_desc; + mrd = sc->mr_desc; - /* Get fixed-range MTRRs */ - if (sc->mr_cap & MR686_FIXMTRR) { - msr = MSR_MTRR64kBase; - for (i = 0; i < (MTRR_N64K / 8); i++, msr++) { - msrv = rdmsr(msr); - for (j = 0; j < 8; j++, mrd++) { - mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | - amd64_mtrr2mrt(msrv & 0xff) | - MDF_ACTIVE; - if (mrd->mr_owner[0] == 0) - strcpy(mrd->mr_owner, mem_owner_bios); - msrv = msrv >> 8; - } + /* Get fixed-range MTRRs. */ + if (sc->mr_cap & MR686_FIXMTRR) { + msr = MSR_MTRR64kBase; + for (i = 0; i < (MTRR_N64K / 8); i++, msr++) { + msrv = rdmsr(msr); + for (j = 0; j < 8; j++, mrd++) { + mrd->mr_flags = + (mrd->mr_flags & ~MDF_ATTRMASK) | + amd64_mtrr2mrt(msrv & 0xff) | MDF_ACTIVE; + if (mrd->mr_owner[0] == 0) + strcpy(mrd->mr_owner, mem_owner_bios); + msrv = msrv >> 8; + } + } + msr = MSR_MTRR16kBase; + for (i = 0; i < (MTRR_N16K / 8); i++, msr++) { + msrv = rdmsr(msr); + for (j = 0; j < 8; j++, mrd++) { + mrd->mr_flags = + (mrd->mr_flags & ~MDF_ATTRMASK) | + amd64_mtrr2mrt(msrv & 0xff) | MDF_ACTIVE; + if (mrd->mr_owner[0] == 0) + strcpy(mrd->mr_owner, mem_owner_bios); + msrv = msrv >> 8; + } + } + msr = MSR_MTRR4kBase; + for (i = 0; i < (MTRR_N4K / 8); i++, msr++) { + msrv = rdmsr(msr); + for (j = 0; j < 8; j++, mrd++) { + mrd->mr_flags = + (mrd->mr_flags & ~MDF_ATTRMASK) | + amd64_mtrr2mrt(msrv & 0xff) | MDF_ACTIVE; + if (mrd->mr_owner[0] == 0) + strcpy(mrd->mr_owner, mem_owner_bios); + msrv = msrv >> 8; + } + } } - msr = MSR_MTRR16kBase; - for (i = 0; i < (MTRR_N16K / 8); i++, msr++) { - msrv = rdmsr(msr); - for (j = 0; j < 8; j++, mrd++) { + + /* Get remainder which must be variable MTRRs. */ + msr = MSR_MTRRVarBase; + for (; (mrd - sc->mr_desc) < sc->mr_ndesc; msr += 2, mrd++) { + msrv = rdmsr(msr); mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | - amd64_mtrr2mrt(msrv & 0xff) | - MDF_ACTIVE; - if (mrd->mr_owner[0] == 0) - strcpy(mrd->mr_owner, mem_owner_bios); - msrv = msrv >> 8; - } + amd64_mtrr2mrt(msrv & MTRR_PHYSBASE_TYPE); + mrd->mr_base = msrv & mtrr_physmask; + msrv = rdmsr(msr + 1); + mrd->mr_flags = (msrv & MTRR_PHYSMASK_VALID) ? + (mrd->mr_flags | MDF_ACTIVE) : + (mrd->mr_flags & ~MDF_ACTIVE); + + /* Compute the range from the mask. Ick. */ + mrd->mr_len = (~(msrv & mtrr_physmask) & + (mtrr_physmask | 0xfffL)) + 1; + if (!mrvalid(mrd->mr_base, mrd->mr_len)) + mrd->mr_flags |= MDF_BOGUS; + + /* If unclaimed and active, must be the BIOS. */ + if ((mrd->mr_flags & MDF_ACTIVE) && (mrd->mr_owner[0] == 0)) + strcpy(mrd->mr_owner, mem_owner_bios); } - msr = MSR_MTRR4kBase; - for (i = 0; i < (MTRR_N4K / 8); i++, msr++) { - msrv = rdmsr(msr); - for (j = 0; j < 8; j++, mrd++) { - mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | - amd64_mtrr2mrt(msrv & 0xff) | - MDF_ACTIVE; - if (mrd->mr_owner[0] == 0) - strcpy(mrd->mr_owner, mem_owner_bios); - msrv = msrv >> 8; - } - } - } - - /* Get remainder which must be variable MTRRs */ - msr = MSR_MTRRVarBase; - for (; (mrd - sc->mr_desc) < sc->mr_ndesc; msr += 2, mrd++) { - msrv = rdmsr(msr); - mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | - amd64_mtrr2mrt(msrv & 0xff); - mrd->mr_base = msrv & 0x000000fffffff000L; - msrv = rdmsr(msr + 1); - mrd->mr_flags = (msrv & 0x800) ? - (mrd->mr_flags | MDF_ACTIVE) : - (mrd->mr_flags & ~MDF_ACTIVE); - /* Compute the range from the mask. Ick. */ - mrd->mr_len = (~(msrv & 0x000000fffffff000L) & 0x000000ffffffffffL) + 1; - if (!mrvalid(mrd->mr_base, mrd->mr_len)) - mrd->mr_flags |= MDF_BOGUS; - /* If unclaimed and active, must be the BIOS */ - if ((mrd->mr_flags & MDF_ACTIVE) && (mrd->mr_owner[0] == 0)) - strcpy(mrd->mr_owner, mem_owner_bios); - } } /* @@ -239,17 +241,17 @@ static int amd64_mtrrtype(int flags) { - int i; + int i; - flags &= MDF_ATTRMASK; + flags &= MDF_ATTRMASK; - for (i = 0; i < MTRRTOMRTLEN; i++) { - if (amd64_mtrrtomrt[i] == MDF_UNKNOWN) - continue; - if (flags == amd64_mtrrtomrt[i]) - return(i); - } - return(-1); + for (i = 0; i < MTRRTOMRTLEN; i++) { + if (amd64_mtrrtomrt[i] == MDF_UNKNOWN) + continue; + if (flags == amd64_mtrrtomrt[i]) + return (i); + } + return (-1); } static int @@ -258,8 +260,8 @@ int val; if ((val = amd64_mtrrtype(flags)) == -1) - return oldval & 0xff; - return val & 0xff; + return (oldval & 0xff); + return (val & 0xff); } /* @@ -272,105 +274,124 @@ amd64_mrstore(struct mem_range_softc *sc) { #ifdef SMP - /* - * We should use ipi_all_but_self() to call other CPUs into a - * locking gate, then call a target function to do this work. - * The "proper" solution involves a generalised locking gate - * implementation, not ready yet. - */ - smp_rendezvous(NULL, amd64_mrstoreone, NULL, (void *)sc); + /* + * We should use ipi_all_but_self() to call other CPUs into a + * locking gate, then call a target function to do this work. + * The "proper" solution involves a generalised locking gate + * implementation, not ready yet. + */ + smp_rendezvous(NULL, amd64_mrstoreone, NULL, sc); #else - disable_intr(); /* disable interrupts */ - amd64_mrstoreone((void *)sc); - enable_intr(); + disable_intr(); /* disable interrupts */ + amd64_mrstoreone(sc); + enable_intr(); #endif } /* * Update the current CPU's MTRRs with those represented in the - * descriptor list. Note that we do this wholesale rather than - * just stuffing one entry; this is simpler (but slower, of course). + * descriptor list. Note that we do this wholesale rather than just + * stuffing one entry; this is simpler (but slower, of course). */ static void amd64_mrstoreone(void *arg) { - struct mem_range_softc *sc = (struct mem_range_softc *)arg; - struct mem_range_desc *mrd; - u_int64_t omsrv, msrv; - int i, j, msr; - u_int cr4save; + struct mem_range_softc *sc = arg; + struct mem_range_desc *mrd; + u_int64_t omsrv, msrv; + int i, j, msr; + u_int cr4save; + + mrd = sc->mr_desc; + + /* Disable PGE. */ + cr4save = rcr4(); + if (cr4save & CR4_PGE) + load_cr4(cr4save & ~CR4_PGE); + + /* Disable caches (CD = 1, NW = 0). */ + load_cr0((rcr0() & ~CR0_NW) | CR0_CD); - mrd = sc->mr_desc; + /* Flushes caches and TLBs. */ + wbinvd(); - cr4save = rcr4(); /* save cr4 */ - if (cr4save & CR4_PGE) - load_cr4(cr4save & ~CR4_PGE); - load_cr0((rcr0() & ~CR0_NW) | CR0_CD); /* disable caches (CD = 1, NW = 0) */ - wbinvd(); /* flush caches, TLBs */ - wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) & ~0x800); /* disable MTRRs (E = 0) */ + /* Disable MTRRs (E = 0). */ + wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) & ~MTRR_DEF_ENABLE); - /* Set fixed-range MTRRs */ - if (sc->mr_cap & MR686_FIXMTRR) { - msr = MSR_MTRR64kBase; - for (i = 0; i < (MTRR_N64K / 8); i++, msr++) { - msrv = 0; - omsrv = rdmsr(msr); - for (j = 7; j >= 0; j--) { - msrv = msrv << 8; - msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, omsrv >> (j*8)); - } - wrmsr(msr, msrv); - mrd += 8; + /* Set fixed-range MTRRs. */ + if (sc->mr_cap & MR686_FIXMTRR) { + msr = MSR_MTRR64kBase; + for (i = 0; i < (MTRR_N64K / 8); i++, msr++) { + msrv = 0; + omsrv = rdmsr(msr); + for (j = 7; j >= 0; j--) { + msrv = msrv << 8; + msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, + omsrv >> (j * 8)); + } + wrmsr(msr, msrv); + mrd += 8; + } + msr = MSR_MTRR16kBase; + for (i = 0; i < (MTRR_N16K / 8); i++, msr++) { + msrv = 0; + omsrv = rdmsr(msr); + for (j = 7; j >= 0; j--) { + msrv = msrv << 8; + msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, + omsrv >> (j * 8)); + } + wrmsr(msr, msrv); + mrd += 8; + } + msr = MSR_MTRR4kBase; + for (i = 0; i < (MTRR_N4K / 8); i++, msr++) { + msrv = 0; + omsrv = rdmsr(msr); + for (j = 7; j >= 0; j--) { + msrv = msrv << 8; + msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, + omsrv >> (j * 8)); + } + wrmsr(msr, msrv); + mrd += 8; + } } - msr = MSR_MTRR16kBase; - for (i = 0; i < (MTRR_N16K / 8); i++, msr++) { - msrv = 0; - omsrv = rdmsr(msr); - for (j = 7; j >= 0; j--) { - msrv = msrv << 8; - msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, omsrv >> (j*8)); - } - wrmsr(msr, msrv); - mrd += 8; + + /* Set remainder which must be variable MTRRs. */ + msr = MSR_MTRRVarBase; + for (; (mrd - sc->mr_desc) < sc->mr_ndesc; msr += 2, mrd++) { + /* base/type register */ + omsrv = rdmsr(msr); + if (mrd->mr_flags & MDF_ACTIVE) { + msrv = mrd->mr_base & mtrr_physmask; + msrv |= amd64_mrt2mtrr(mrd->mr_flags, omsrv); + } else { + msrv = 0; + } + wrmsr(msr, msrv); + + /* mask/active register */ + if (mrd->mr_flags & MDF_ACTIVE) { + msrv = MTRR_PHYSMASK_VALID | + (~(mrd->mr_len - 1) & mtrr_physmask); + } else { + msrv = 0; + } + wrmsr(msr + 1, msrv); } - msr = MSR_MTRR4kBase; - for (i = 0; i < (MTRR_N4K / 8); i++, msr++) { - msrv = 0; - omsrv = rdmsr(msr); - for (j = 7; j >= 0; j--) { - msrv = msrv << 8; - msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, omsrv >> (j*8)); - } - wrmsr(msr, msrv); - mrd += 8; - } - } + + /* Flush caches, TLBs. */ + wbinvd(); + + /* Enable MTRRs. */ + wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) | MTRR_DEF_ENABLE); + + /* Enable caches (CD = 0, NW = 0). */ + load_cr0(rcr0() & ~(CR0_CD | CR0_NW)); - /* Set remainder which must be variable MTRRs */ - msr = MSR_MTRRVarBase; - for (; (mrd - sc->mr_desc) < sc->mr_ndesc; msr += 2, mrd++) { - /* base/type register */ - omsrv = rdmsr(msr); - if (mrd->mr_flags & MDF_ACTIVE) { - msrv = mrd->mr_base & 0x000000fffffff000L; - msrv |= amd64_mrt2mtrr(mrd->mr_flags, omsrv); - } else { - msrv = 0; - } - wrmsr(msr, msrv); - - /* mask/active register */ - if (mrd->mr_flags & MDF_ACTIVE) { - msrv = 0x800 | (~(mrd->mr_len - 1) & 0x000000fffffff000L); - } else { - msrv = 0; - } - wrmsr(msr + 1, msrv); - } - wbinvd(); /* flush caches, TLBs */ - wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) | 0x800); /* restore MTRR state */ - load_cr0(rcr0() & ~(CR0_CD | CR0_NW)); /* enable caches CD = 0 and NW = 0 */ - load_cr4(cr4save); /* restore cr4 */ + /* Restore PGE. */ + load_cr4(cr4save); } /* @@ -379,227 +400,260 @@ static struct mem_range_desc * amd64_mtrrfixsearch(struct mem_range_softc *sc, u_int64_t addr) { - struct mem_range_desc *mrd; - int i; - - for (i = 0, mrd = sc->mr_desc; i < (MTRR_N64K + MTRR_N16K + MTRR_N4K); i++, mrd++) - if ((addr >= mrd->mr_base) && (addr < (mrd->mr_base + mrd->mr_len))) - return(mrd); - return(NULL); + struct mem_range_desc *mrd; + int i; + + for (i = 0, mrd = sc->mr_desc; i < (MTRR_N64K + MTRR_N16K + MTRR_N4K); + i++, mrd++) + if ((addr >= mrd->mr_base) && + (addr < (mrd->mr_base + mrd->mr_len))) + return (mrd); + return (NULL); } /* - * Try to satisfy the given range request by manipulating the fixed MTRRs that - * cover low memory. + * Try to satisfy the given range request by manipulating the fixed + * MTRRs that cover low memory. * - * Note that we try to be generous here; we'll bloat the range out to the - * next higher/lower boundary to avoid the consumer having to know too much - * about the mechanisms here. + * Note that we try to be generous here; we'll bloat the range out to + * the next higher/lower boundary to avoid the consumer having to know + * too much about the mechanisms here. * - * XXX note that this will have to be updated when we start supporting "busy" ranges. + * XXX note that this will have to be updated when we start supporting + * "busy" ranges. */ static int amd64_mrsetlow(struct mem_range_softc *sc, struct mem_range_desc *mrd, int *arg) { - struct mem_range_desc *first_md, *last_md, *curr_md; + struct mem_range_desc *first_md, *last_md, *curr_md; + + /* Range check. */ + if (((first_md = amd64_mtrrfixsearch(sc, mrd->mr_base)) == NULL) || + ((last_md = amd64_mtrrfixsearch(sc, mrd->mr_base + mrd->mr_len - 1)) == NULL)) + return (EINVAL); - /* range check */ - if (((first_md = amd64_mtrrfixsearch(sc, mrd->mr_base)) == NULL) || - ((last_md = amd64_mtrrfixsearch(sc, mrd->mr_base + mrd->mr_len - 1)) == NULL)) - return(EINVAL); + /* Check that we aren't doing something risky. */ + if (!(mrd->mr_flags & MDF_FORCE)) + for (curr_md = first_md; curr_md <= last_md; curr_md++) { + if ((curr_md->mr_flags & MDF_ATTRMASK) == MDF_UNKNOWN) + return (EACCES); + } - /* check we aren't doing something risky */ - if (!(mrd->mr_flags & MDF_FORCE)) + /* Set flags, clear set-by-firmware flag. */ for (curr_md = first_md; curr_md <= last_md; curr_md++) { - if ((curr_md->mr_flags & MDF_ATTRMASK) == MDF_UNKNOWN) - return (EACCES); + curr_md->mr_flags = mrcopyflags(curr_md->mr_flags & + ~MDF_FIRMWARE, mrd->mr_flags); + bcopy(mrd->mr_owner, curr_md->mr_owner, sizeof(mrd->mr_owner)); } - /* set flags, clear set-by-firmware flag */ - for (curr_md = first_md; curr_md <= last_md; curr_md++) { - curr_md->mr_flags = mrcopyflags(curr_md->mr_flags & ~MDF_FIRMWARE, mrd->mr_flags); - bcopy(mrd->mr_owner, curr_md->mr_owner, sizeof(mrd->mr_owner)); - } - - return(0); + return (0); } - /* * Modify/add a variable MTRR to satisfy the request. * * XXX needs to be updated to properly support "busy" ranges. */ static int -amd64_mrsetvariable(struct mem_range_softc *sc, struct mem_range_desc *mrd, int *arg) +amd64_mrsetvariable(struct mem_range_softc *sc, struct mem_range_desc *mrd, + int *arg) { - struct mem_range_desc *curr_md, *free_md; - int i; - - /* - * Scan the currently active variable descriptors, look for - * one we exactly match (straight takeover) and for possible - * accidental overlaps. - * Keep track of the first empty variable descriptor in case we - * can't perform a takeover. - */ - i = (sc->mr_cap & MR686_FIXMTRR) ? MTRR_N64K + MTRR_N16K + MTRR_N4K : 0; - curr_md = sc->mr_desc + i; - free_md = NULL; - for (; i < sc->mr_ndesc; i++, curr_md++) { - if (curr_md->mr_flags & MDF_ACTIVE) { - /* exact match? */ - if ((curr_md->mr_base == mrd->mr_base) && - (curr_md->mr_len == mrd->mr_len)) { - /* whoops, owned by someone */ - if (curr_md->mr_flags & MDF_BUSY) - return(EBUSY); - /* check we aren't doing something risky */ - if (!(mrd->mr_flags & MDF_FORCE) && - ((curr_md->mr_flags & MDF_ATTRMASK) == MDF_UNKNOWN)) - return (EACCES); - /* Ok, just hijack this entry */ - free_md = curr_md; - break; - } - /* non-exact overlap ? */ - if (mroverlap(curr_md, mrd)) { - /* between conflicting region types? */ - if (amd64_mtrrconflict(curr_md->mr_flags, mrd->mr_flags)) - return(EINVAL); - } - } else if (free_md == NULL) { - free_md = curr_md; + struct mem_range_desc *curr_md, *free_md; + int i; + + /* + * Scan the currently active variable descriptors, look for + * one we exactly match (straight takeover) and for possible + * accidental overlaps. + * + * Keep track of the first empty variable descriptor in case + * we can't perform a takeover. + */ + i = (sc->mr_cap & MR686_FIXMTRR) ? MTRR_N64K + MTRR_N16K + MTRR_N4K : 0; + curr_md = sc->mr_desc + i; + free_md = NULL; + for (; i < sc->mr_ndesc; i++, curr_md++) { + if (curr_md->mr_flags & MDF_ACTIVE) { + /* Exact match? */ + if ((curr_md->mr_base == mrd->mr_base) && + (curr_md->mr_len == mrd->mr_len)) { + + /* Whoops, owned by someone. */ + if (curr_md->mr_flags & MDF_BUSY) + return (EBUSY); + + /* Check that we aren't doing something risky */ + if (!(mrd->mr_flags & MDF_FORCE) && + ((curr_md->mr_flags & MDF_ATTRMASK) == + MDF_UNKNOWN)) + return (EACCES); + + /* Ok, just hijack this entry. */ + free_md = curr_md; + break; + } + + /* Non-exact overlap? */ + if (mroverlap(curr_md, mrd)) { + /* Between conflicting region types? */ + if (amd64_mtrrconflict(curr_md->mr_flags, + mrd->mr_flags)) + return (EINVAL); + } + } else if (free_md == NULL) { + free_md = curr_md; + } } - } - /* got somewhere to put it? */ - if (free_md == NULL) - return(ENOSPC); + + /* Got somewhere to put it? */ + if (free_md == NULL) + return (ENOSPC); - /* Set up new descriptor */ - free_md->mr_base = mrd->mr_base; - free_md->mr_len = mrd->mr_len; - free_md->mr_flags = mrcopyflags(MDF_ACTIVE, mrd->mr_flags); - bcopy(mrd->mr_owner, free_md->mr_owner, sizeof(mrd->mr_owner)); - return(0); + /* Set up new descriptor. */ + free_md->mr_base = mrd->mr_base; + free_md->mr_len = mrd->mr_len; + free_md->mr_flags = mrcopyflags(MDF_ACTIVE, mrd->mr_flags); + bcopy(mrd->mr_owner, free_md->mr_owner, sizeof(mrd->mr_owner)); + return (0); } /* * Handle requests to set memory range attributes by manipulating MTRRs. - * */ static int amd64_mrset(struct mem_range_softc *sc, struct mem_range_desc *mrd, int *arg) { - struct mem_range_desc *targ; - int error = 0; + struct mem_range_desc *targ; + int error = 0; + + switch(*arg) { + case MEMRANGE_SET_UPDATE: + /* + * Make sure that what's being asked for is even + * possible at all. + */ + if (!mrvalid(mrd->mr_base, mrd->mr_len) || + amd64_mtrrtype(mrd->mr_flags) == -1) + return (EINVAL); + +#define FIXTOP ((MTRR_N64K * 0x10000) + (MTRR_N16K * 0x4000) + (MTRR_N4K * 0x1000)) - switch(*arg) { - case MEMRANGE_SET_UPDATE: - /* make sure that what's being asked for is even possible at all */ - if (!mrvalid(mrd->mr_base, mrd->mr_len) || - amd64_mtrrtype(mrd->mr_flags) == -1) - return(EINVAL); + /* Are the "low memory" conditions applicable? */ + if ((sc->mr_cap & MR686_FIXMTRR) && + ((mrd->mr_base + mrd->mr_len) <= FIXTOP)) { + if ((error = amd64_mrsetlow(sc, mrd, arg)) != 0) + return (error); + } else { + /* It's time to play with variable MTRRs. */ + if ((error = amd64_mrsetvariable(sc, mrd, arg)) != 0) + return (error); + } + break; -#define FIXTOP ((MTRR_N64K * 0x10000) + (MTRR_N16K * 0x4000) + (MTRR_N4K * 0x1000)) + case MEMRANGE_SET_REMOVE: + if ((targ = mem_range_match(sc, mrd)) == NULL) + return (ENOENT); + if (targ->mr_flags & MDF_FIXACTIVE) + return (EPERM); + if (targ->mr_flags & MDF_BUSY) + return (EBUSY); + targ->mr_flags &= ~MDF_ACTIVE; + targ->mr_owner[0] = 0; + break; - /* are the "low memory" conditions applicable? */ - if ((sc->mr_cap & MR686_FIXMTRR) && - ((mrd->mr_base + mrd->mr_len) <= FIXTOP)) { - if ((error = amd64_mrsetlow(sc, mrd, arg)) != 0) - return(error); - } else { - /* it's time to play with variable MTRRs */ - if ((error = amd64_mrsetvariable(sc, mrd, arg)) != 0) - return(error); + default: + return (EOPNOTSUPP); } - break; - case MEMRANGE_SET_REMOVE: - if ((targ = mem_range_match(sc, mrd)) == NULL) - return(ENOENT); - if (targ->mr_flags & MDF_FIXACTIVE) - return(EPERM); - if (targ->mr_flags & MDF_BUSY) - return(EBUSY); - targ->mr_flags &= ~MDF_ACTIVE; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 13 04:38:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CB5B1065675; Thu, 13 Mar 2008 04:38:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39E541065670 for ; Thu, 13 Mar 2008 04:38:13 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3C2C08FC1C for ; Thu, 13 Mar 2008 04:38:13 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2D4cD4T082666 for ; Thu, 13 Mar 2008 04:38:13 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2D4c2Fs082660 for perforce@freebsd.org; Thu, 13 Mar 2008 04:38:02 GMT (envelope-from marcel@freebsd.org) Date: Thu, 13 Mar 2008 04:38:02 GMT Message-Id: <200803130438.m2D4c2Fs082660@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 137577 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, 13 Mar 2008 04:38:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=137577 Change 137577 by marcel@marcel_xcllnt on 2008/03/13 04:37:01 IFC @137564 Affected files ... .. //depot/projects/uart/Makefile#14 integrate .. //depot/projects/uart/amd64/acpica/madt.c#10 integrate .. //depot/projects/uart/amd64/amd64/amd64_mem.c#4 integrate .. //depot/projects/uart/amd64/amd64/busdma_machdep.c#22 integrate .. //depot/projects/uart/amd64/amd64/dump_machdep.c#5 integrate .. //depot/projects/uart/amd64/amd64/identcpu.c#16 integrate .. //depot/projects/uart/amd64/amd64/legacy.c#7 integrate .. //depot/projects/uart/amd64/amd64/machdep.c#30 integrate .. //depot/projects/uart/amd64/amd64/mem.c#4 integrate .. //depot/projects/uart/amd64/amd64/minidump_machdep.c#3 integrate .. //depot/projects/uart/amd64/amd64/mp_machdep.c#22 integrate .. //depot/projects/uart/amd64/amd64/mp_watchdog.c#4 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#49 integrate .. //depot/projects/uart/amd64/amd64/trap.c#21 integrate .. //depot/projects/uart/amd64/amd64/vm_machdep.c#17 integrate .. //depot/projects/uart/amd64/conf/DEFAULTS#8 integrate .. //depot/projects/uart/amd64/conf/GENERIC#31 integrate .. //depot/projects/uart/amd64/conf/NOTES#18 integrate .. //depot/projects/uart/amd64/include/_types.h#6 integrate .. //depot/projects/uart/amd64/include/float.h#4 integrate .. //depot/projects/uart/amd64/include/ieeefp.h#7 integrate .. //depot/projects/uart/amd64/include/pmap.h#15 integrate .. //depot/projects/uart/amd64/include/proc.h#5 integrate .. //depot/projects/uart/amd64/include/smp.h#13 integrate .. //depot/projects/uart/amd64/include/specialreg.h#11 integrate .. //depot/projects/uart/amd64/include/vmparam.h#9 integrate .. //depot/projects/uart/amd64/isa/clock.c#15 integrate .. //depot/projects/uart/amd64/linux32/linux32_machdep.c#14 integrate .. //depot/projects/uart/amd64/linux32/linux32_sysvec.c#19 integrate .. //depot/projects/uart/arm/arm/busdma_machdep.c#16 integrate .. //depot/projects/uart/arm/arm/dump_machdep.c#3 integrate .. //depot/projects/uart/arm/arm/genassym.c#10 integrate .. //depot/projects/uart/arm/arm/locore.S#11 integrate .. //depot/projects/uart/arm/arm/nexus.c#9 integrate .. //depot/projects/uart/arm/arm/pmap.c#25 integrate .. //depot/projects/uart/arm/arm/support.S#8 integrate .. //depot/projects/uart/arm/arm/swtch.S#11 integrate .. //depot/projects/uart/arm/arm/trap.c#18 integrate .. //depot/projects/uart/arm/arm/uio_machdep.c#3 integrate .. //depot/projects/uart/arm/at91/at91.c#8 integrate .. //depot/projects/uart/arm/at91/if_ate.c#12 integrate .. //depot/projects/uart/arm/at91/kb920x_machdep.c#13 integrate .. //depot/projects/uart/arm/at91/uart_dev_at91usart.c#10 integrate .. //depot/projects/uart/arm/conf/AVILA#4 integrate .. //depot/projects/uart/arm/include/_bus.h#2 integrate .. //depot/projects/uart/arm/include/asmacros.h#6 integrate .. //depot/projects/uart/arm/include/atomic.h#13 integrate .. //depot/projects/uart/arm/include/pmap.h#18 integrate .. //depot/projects/uart/arm/include/sysarch.h#4 integrate .. //depot/projects/uart/arm/include/vmparam.h#8 integrate .. //depot/projects/uart/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/uart/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/uart/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/uart/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/uart/boot/Makefile#11 integrate .. //depot/projects/uart/boot/arm/at91/boot2/bwct_board.c#2 integrate .. //depot/projects/uart/boot/arm/at91/libat91/spi_flash.c#5 integrate .. //depot/projects/uart/boot/common/bootstrap.h#6 integrate .. //depot/projects/uart/boot/common/dev_net.c#4 integrate .. //depot/projects/uart/boot/common/load_elf.c#7 integrate .. //depot/projects/uart/boot/forth/loader.conf.5#6 integrate .. //depot/projects/uart/boot/forth/support.4th#3 integrate .. //depot/projects/uart/boot/i386/boot2/boot2.c#9 integrate .. //depot/projects/uart/boot/i386/btx/btx/Makefile#4 integrate .. //depot/projects/uart/boot/i386/btx/btx/btx.S#5 integrate .. //depot/projects/uart/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/uart/boot/i386/libi386/biosdisk.c#8 integrate .. //depot/projects/uart/boot/i386/pxeldr/pxeldr.S#4 integrate .. //depot/projects/uart/boot/ofw/libofw/ofw_console.c#6 integrate .. //depot/projects/uart/boot/pc98/btx/btx/Makefile#5 integrate .. //depot/projects/uart/boot/pc98/btx/btx/btx.S#5 integrate .. //depot/projects/uart/boot/pc98/libpc98/Makefile#7 integrate .. //depot/projects/uart/boot/pc98/libpc98/biosdisk.c#8 integrate .. //depot/projects/uart/boot/powerpc/Makefile#2 integrate .. //depot/projects/uart/boot/powerpc/loader/Makefile#6 delete .. //depot/projects/uart/boot/powerpc/loader/conf.c#4 delete .. //depot/projects/uart/boot/powerpc/loader/help.ofw#2 delete .. //depot/projects/uart/boot/powerpc/loader/ldscript.powerpc#2 delete .. //depot/projects/uart/boot/powerpc/loader/metadata.c#5 delete .. //depot/projects/uart/boot/powerpc/loader/start.c#5 delete .. //depot/projects/uart/boot/powerpc/loader/version#2 delete .. //depot/projects/uart/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/uart/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/uart/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/uart/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/uart/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/uart/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/uart/boot/powerpc/ofw/version#1 branch .. //depot/projects/uart/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/uart/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/uart/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/uart/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/uart/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/uart/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/uart/boot/powerpc/uboot/version#1 branch .. //depot/projects/uart/boot/uboot/Makefile#1 branch .. //depot/projects/uart/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/uart/boot/uboot/common/main.c#1 branch .. //depot/projects/uart/boot/uboot/lib/Makefile#1 branch .. //depot/projects/uart/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/uart/boot/uboot/lib/console.c#1 branch .. //depot/projects/uart/boot/uboot/lib/copy.c#1 branch .. //depot/projects/uart/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/uart/boot/uboot/lib/disk.c#1 branch .. //depot/projects/uart/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/uart/boot/uboot/lib/glue.c#1 branch .. //depot/projects/uart/boot/uboot/lib/glue.h#1 branch .. //depot/projects/uart/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/uart/boot/uboot/lib/module.c#1 branch .. //depot/projects/uart/boot/uboot/lib/net.c#1 branch .. //depot/projects/uart/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/uart/boot/uboot/lib/time.c#1 branch .. //depot/projects/uart/cam/cam_periph.c#15 integrate .. //depot/projects/uart/cam/cam_xpt.c#21 integrate .. //depot/projects/uart/cam/scsi/scsi_da.c#26 integrate .. //depot/projects/uart/cam/scsi/scsi_low.h#4 integrate .. //depot/projects/uart/cam/scsi/scsi_ses.c#9 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_misc.c#22 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_proto.h#22 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscall.h#22 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscalls.c#22 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_sysent.c#22 integrate .. //depot/projects/uart/compat/freebsd32/syscalls.master#21 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#29 integrate .. //depot/projects/uart/compat/linux/linux_file.c#16 integrate .. //depot/projects/uart/compat/linux/linux_futex.c#5 integrate .. //depot/projects/uart/compat/linux/linux_getcwd.c#12 integrate .. //depot/projects/uart/compat/linux/linux_misc.c#25 integrate .. //depot/projects/uart/compat/linux/linux_misc.h#3 integrate .. //depot/projects/uart/compat/linux/linux_stats.c#16 integrate .. //depot/projects/uart/compat/ndis/kern_ndis.c#12 integrate .. //depot/projects/uart/compat/ndis/subr_ndis.c#13 integrate .. //depot/projects/uart/compat/ndis/subr_ntoskrnl.c#13 integrate .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_vfs.c#6 integrate .. //depot/projects/uart/compat/opensolaris/sys/kmem.h#3 integrate .. //depot/projects/uart/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/uart/compat/pecoff/imgact_pecoff.c#10 integrate .. //depot/projects/uart/compat/svr4/imgact_svr4.c#6 integrate .. //depot/projects/uart/compat/svr4/svr4_fcntl.c#9 integrate .. //depot/projects/uart/compat/svr4/svr4_misc.c#16 integrate .. //depot/projects/uart/compat/svr4/svr4_stream.c#11 integrate .. //depot/projects/uart/compat/svr4/svr4_sysvec.c#8 integrate .. //depot/projects/uart/conf/Makefile.arm#15 integrate .. //depot/projects/uart/conf/NOTES#55 integrate .. //depot/projects/uart/conf/files#86 integrate .. //depot/projects/uart/conf/files.amd64#32 integrate .. //depot/projects/uart/conf/files.i386#38 integrate .. //depot/projects/uart/conf/files.powerpc#18 integrate .. //depot/projects/uart/conf/files.sparc64#20 integrate .. //depot/projects/uart/conf/kern.post.mk#20 integrate .. //depot/projects/uart/conf/kern.pre.mk#18 integrate .. //depot/projects/uart/conf/kmod.mk#29 integrate .. //depot/projects/uart/conf/ldscript.powerpc#2 integrate .. //depot/projects/uart/conf/options#52 integrate .. //depot/projects/uart/conf/options.powerpc#3 integrate .. //depot/projects/uart/contrib/dev/acpica/evgpe.c#7 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/uart/crypto/rijndael/rijndael-api.c#2 integrate .. //depot/projects/uart/crypto/rijndael/test00.c#2 integrate .. //depot/projects/uart/ddb/db_capture.c#1 branch .. //depot/projects/uart/ddb/db_command.c#14 integrate .. //depot/projects/uart/ddb/db_command.h#3 integrate .. //depot/projects/uart/ddb/db_examine.c#5 integrate .. //depot/projects/uart/ddb/db_input.c#3 integrate .. //depot/projects/uart/ddb/db_lex.c#3 integrate .. //depot/projects/uart/ddb/db_lex.h#3 integrate .. //depot/projects/uart/ddb/db_main.c#4 integrate .. //depot/projects/uart/ddb/db_output.c#9 integrate .. //depot/projects/uart/ddb/db_script.c#1 branch .. //depot/projects/uart/ddb/db_textdump.c#1 branch .. //depot/projects/uart/ddb/ddb.h#11 integrate .. //depot/projects/uart/dev/aac/aac.c#20 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdDebug.c#7 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdSchedule.c#14 integrate .. //depot/projects/uart/dev/acpica/acpi.c#31 integrate .. //depot/projects/uart/dev/acpica/acpi_cpu.c#13 integrate .. //depot/projects/uart/dev/acpica/acpi_hpet.c#8 integrate .. //depot/projects/uart/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/uart/dev/acpica/acpi_thermal.c#14 integrate .. //depot/projects/uart/dev/agp/agp_i810.c#2 integrate .. //depot/projects/uart/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx_osm.c#12 integrate .. //depot/projects/uart/dev/amr/amr.c#19 integrate .. //depot/projects/uart/dev/amr/amr_cam.c#13 integrate .. //depot/projects/uart/dev/amr/amr_pci.c#17 integrate .. //depot/projects/uart/dev/amr/amrreg.h#5 integrate .. //depot/projects/uart/dev/amr/amrvar.h#12 integrate .. //depot/projects/uart/dev/an/if_an.c#16 integrate .. //depot/projects/uart/dev/an/if_an_pci.c#10 integrate .. //depot/projects/uart/dev/an/if_anreg.h#8 integrate .. //depot/projects/uart/dev/ata/ata-all.h#20 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#29 integrate .. //depot/projects/uart/dev/ata/ata-disk.c#21 integrate .. //depot/projects/uart/dev/ata/ata-dma.c#16 integrate .. //depot/projects/uart/dev/ata/ata-lowlevel.c#23 integrate .. //depot/projects/uart/dev/ata/ata-pci.h#21 integrate .. //depot/projects/uart/dev/ath/if_ath.c#40 integrate .. //depot/projects/uart/dev/atkbdc/atkbd.c#7 integrate .. //depot/projects/uart/dev/atkbdc/atkbd_atkbdc.c#3 integrate .. //depot/projects/uart/dev/atkbdc/psm.c#7 integrate .. //depot/projects/uart/dev/bce/if_bce.c#11 integrate .. //depot/projects/uart/dev/bce/if_bcefw.h#4 integrate .. //depot/projects/uart/dev/bce/if_bcereg.h#11 integrate .. //depot/projects/uart/dev/bfe/if_bfe.c#18 integrate .. //depot/projects/uart/dev/bfe/if_bfereg.h#7 integrate .. //depot/projects/uart/dev/bge/if_bge.c#37 integrate .. //depot/projects/uart/dev/bge/if_bgereg.h#23 integrate .. //depot/projects/uart/dev/ciss/ciss.c#24 integrate .. //depot/projects/uart/dev/cmx/cmx.c#1 branch .. //depot/projects/uart/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/uart/dev/cmx/cmxreg.h#1 branch .. //depot/projects/uart/dev/cmx/cmxvar.h#1 branch .. //depot/projects/uart/dev/coretemp/coretemp.c#3 integrate .. //depot/projects/uart/dev/cpufreq/ichss.c#3 integrate .. //depot/projects/uart/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/uart/dev/cxgb/common/cxgb_ael1002.c#4 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_ctl_defs.h#4 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_firmware_exports.h#3 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_mc5.c#4 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_regs.h#3 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_t3_cpl.h#4 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_tcb.h#3 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_vsc8211.c#4 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/uart/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/uart/dev/cxgb/cxgb_config.h#4 integrate .. //depot/projects/uart/dev/cxgb/cxgb_include.h#3 integrate .. //depot/projects/uart/dev/cxgb/cxgb_ioctl.h#4 integrate .. //depot/projects/uart/dev/cxgb/cxgb_l2t.c#3 integrate .. //depot/projects/uart/dev/cxgb/cxgb_l2t.h#3 integrate .. //depot/projects/uart/dev/cxgb/cxgb_main.c#8 integrate .. //depot/projects/uart/dev/cxgb/cxgb_multiq.c#1 branch .. //depot/projects/uart/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/uart/dev/cxgb/cxgb_offload.h#4 integrate .. //depot/projects/uart/dev/cxgb/cxgb_osdep.h#6 integrate .. //depot/projects/uart/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/uart/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/uart/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/uart/dev/cxgb/sys/cxgb_support.c#1 branch .. //depot/projects/uart/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/uart/dev/cxgb/sys/mvec.h#5 integrate .. //depot/projects/uart/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/uart/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/uart/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/uart/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/uart/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/uart/dev/cxgb/t3cdev.h#1 branch .. //depot/projects/uart/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete .. //depot/projects/uart/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch .. //depot/projects/uart/dev/cxgb/ulp/toecore/toedev.c#1 branch .. //depot/projects/uart/dev/cxgb/ulp/toecore/toedev.h#2 delete .. //depot/projects/uart/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 branch .. //depot/projects/uart/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 branch .. //depot/projects/uart/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch .. //depot/projects/uart/dev/cxgb/ulp/tom/cxgb_defs.h#1 branch .. //depot/projects/uart/dev/cxgb/ulp/tom/cxgb_listen.c#1 branch .. //depot/projects/uart/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 branch .. //depot/projects/uart/dev/cxgb/ulp/tom/cxgb_tcp.h#1 branch .. //depot/projects/uart/dev/cxgb/ulp/tom/cxgb_toepcb.h#1 branch .. //depot/projects/uart/dev/cxgb/ulp/tom/cxgb_tom.c#1 branch .. //depot/projects/uart/dev/cxgb/ulp/tom/cxgb_tom.h#1 branch .. //depot/projects/uart/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 branch .. //depot/projects/uart/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch .. //depot/projects/uart/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch .. //depot/projects/uart/dev/dcons/dcons_os.c#10 integrate .. //depot/projects/uart/dev/drm/drm_drv.c#5 integrate .. //depot/projects/uart/dev/drm/drm_pciids.h#7 integrate .. //depot/projects/uart/dev/ed/if_ed_pci.c#11 integrate .. //depot/projects/uart/dev/ed/if_ed_rtl80x9.c#2 integrate .. //depot/projects/uart/dev/em/LICENSE#5 integrate .. //depot/projects/uart/dev/em/e1000_80003es2lan.c#3 integrate .. //depot/projects/uart/dev/em/e1000_80003es2lan.h#3 integrate .. //depot/projects/uart/dev/em/e1000_82540.c#3 integrate .. //depot/projects/uart/dev/em/e1000_82541.c#3 integrate .. //depot/projects/uart/dev/em/e1000_82541.h#3 integrate .. //depot/projects/uart/dev/em/e1000_82542.c#3 integrate .. //depot/projects/uart/dev/em/e1000_82543.c#3 integrate .. //depot/projects/uart/dev/em/e1000_82543.h#3 integrate .. //depot/projects/uart/dev/em/e1000_82571.c#3 integrate .. //depot/projects/uart/dev/em/e1000_82571.h#3 integrate .. //depot/projects/uart/dev/em/e1000_82575.c#3 delete .. //depot/projects/uart/dev/em/e1000_82575.h#3 delete .. //depot/projects/uart/dev/em/e1000_api.c#3 integrate .. //depot/projects/uart/dev/em/e1000_api.h#3 integrate .. //depot/projects/uart/dev/em/e1000_defines.h#3 integrate .. //depot/projects/uart/dev/em/e1000_hw.h#3 integrate .. //depot/projects/uart/dev/em/e1000_ich8lan.c#3 integrate .. //depot/projects/uart/dev/em/e1000_ich8lan.h#3 integrate .. //depot/projects/uart/dev/em/e1000_mac.c#3 integrate .. //depot/projects/uart/dev/em/e1000_mac.h#3 integrate .. //depot/projects/uart/dev/em/e1000_manage.c#3 integrate .. //depot/projects/uart/dev/em/e1000_manage.h#3 integrate .. //depot/projects/uart/dev/em/e1000_nvm.c#3 integrate .. //depot/projects/uart/dev/em/e1000_nvm.h#3 integrate .. //depot/projects/uart/dev/em/e1000_osdep.h#3 integrate .. //depot/projects/uart/dev/em/e1000_phy.c#3 integrate .. //depot/projects/uart/dev/em/e1000_phy.h#3 integrate .. //depot/projects/uart/dev/em/e1000_regs.h#3 integrate .. //depot/projects/uart/dev/em/if_em.c#31 integrate .. //depot/projects/uart/dev/em/if_em.h#26 integrate .. //depot/projects/uart/dev/fb/creator.c#9 integrate .. //depot/projects/uart/dev/fb/fb.c#7 integrate .. //depot/projects/uart/dev/fb/fbreg.h#7 integrate .. //depot/projects/uart/dev/fb/machfb.c#5 integrate .. //depot/projects/uart/dev/fb/splash_bmp.c#3 integrate .. //depot/projects/uart/dev/fb/splash_pcx.c#2 integrate .. //depot/projects/uart/dev/fb/vga.c#7 integrate .. //depot/projects/uart/dev/fdc/fdc.c#17 integrate .. //depot/projects/uart/dev/gem/if_gem.c#14 integrate .. //depot/projects/uart/dev/gem/if_gem_pci.c#12 integrate .. //depot/projects/uart/dev/gem/if_gemreg.h#5 integrate .. //depot/projects/uart/dev/gem/if_gemvar.h#8 integrate .. //depot/projects/uart/dev/hatm/if_hatm_intr.c#10 integrate .. //depot/projects/uart/dev/hptiop/hptiop.c#3 integrate .. //depot/projects/uart/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/uart/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/uart/dev/hptrr/array.h#1 branch .. //depot/projects/uart/dev/hptrr/him.h#1 branch .. //depot/projects/uart/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/uart/dev/hptrr/hptintf.h#1 branch .. //depot/projects/uart/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/uart/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/uart/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/uart/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/uart/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/uart/dev/hptrr/ldm.h#1 branch .. //depot/projects/uart/dev/hptrr/list.h#1 branch .. //depot/projects/uart/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/uart/dev/hptrr/osm.h#1 branch .. //depot/projects/uart/dev/hwpmc/hwpmc_mod.c#14 integrate .. //depot/projects/uart/dev/ic/quicc.h#1 branch .. //depot/projects/uart/dev/ichwd/ichwd.c#8 integrate .. //depot/projects/uart/dev/ichwd/ichwd.h#6 integrate .. //depot/projects/uart/dev/if_ndis/if_ndis.c#15 integrate .. //depot/projects/uart/dev/igb/e1000_82575.c#1 branch .. //depot/projects/uart/dev/igb/e1000_82575.h#1 branch .. //depot/projects/uart/dev/igb/e1000_api.c#1 branch .. //depot/projects/uart/dev/igb/e1000_api.h#1 branch .. //depot/projects/uart/dev/igb/e1000_defines.h#1 branch .. //depot/projects/uart/dev/igb/e1000_hw.h#1 branch .. //depot/projects/uart/dev/igb/e1000_mac.c#1 branch .. //depot/projects/uart/dev/igb/e1000_mac.h#1 branch .. //depot/projects/uart/dev/igb/e1000_manage.c#1 branch .. //depot/projects/uart/dev/igb/e1000_manage.h#1 branch .. //depot/projects/uart/dev/igb/e1000_nvm.c#1 branch .. //depot/projects/uart/dev/igb/e1000_nvm.h#1 branch .. //depot/projects/uart/dev/igb/e1000_osdep.h#1 branch .. //depot/projects/uart/dev/igb/e1000_phy.c#1 branch .. //depot/projects/uart/dev/igb/e1000_phy.h#1 branch .. //depot/projects/uart/dev/igb/e1000_regs.h#1 branch .. //depot/projects/uart/dev/igb/if_igb.c#1 branch .. //depot/projects/uart/dev/igb/if_igb.h#1 branch .. //depot/projects/uart/dev/iir/iir.c#13 integrate .. //depot/projects/uart/dev/iscsi/initiator/isc_soc.c#3 integrate .. //depot/projects/uart/dev/kbd/kbd.c#9 integrate .. //depot/projects/uart/dev/kbd/kbdreg.h#5 integrate .. //depot/projects/uart/dev/kbdmux/kbdmux.c#7 integrate .. //depot/projects/uart/dev/le/am7990.c#5 integrate .. //depot/projects/uart/dev/le/am79900.c#5 integrate .. //depot/projects/uart/dev/lge/if_lge.c#17 integrate .. //depot/projects/uart/dev/md/md.c#22 integrate .. //depot/projects/uart/dev/mfi/mfi.c#14 integrate .. //depot/projects/uart/dev/mfi/mfi_pci.c#8 integrate .. //depot/projects/uart/dev/mfi/mfireg.h#10 integrate .. //depot/projects/uart/dev/mii/amphy.c#9 integrate .. //depot/projects/uart/dev/mii/brgphy.c#21 integrate .. //depot/projects/uart/dev/mii/ciphy.c#8 integrate .. //depot/projects/uart/dev/mii/miidevs#15 integrate .. //depot/projects/uart/dev/mii/nsphy.c#9 integrate .. //depot/projects/uart/dev/mii/nsphyter.c#1 branch .. //depot/projects/uart/dev/mii/nsphyterreg.h#1 branch .. //depot/projects/uart/dev/mii/rgephy.c#11 integrate .. //depot/projects/uart/dev/msk/if_msk.c#6 integrate .. //depot/projects/uart/dev/msk/if_mskreg.h#5 integrate .. //depot/projects/uart/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/uart/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/uart/dev/mxge/if_mxge.c#13 integrate .. //depot/projects/uart/dev/mxge/if_mxge_var.h#8 integrate .. //depot/projects/uart/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/uart/dev/mxge/mxge_mcp.h#6 integrate .. //depot/projects/uart/dev/mxge/mxge_rss_eth_z8e.c#1 branch .. //depot/projects/uart/dev/mxge/mxge_rss_ethp_z8e.c#1 branch .. //depot/projects/uart/dev/mxge/rss_eth_z8e.h#1 branch .. //depot/projects/uart/dev/mxge/rss_ethp_z8e.h#1 branch .. //depot/projects/uart/dev/nfe/if_nfe.c#8 integrate .. //depot/projects/uart/dev/nfe/if_nfereg.h#6 integrate .. //depot/projects/uart/dev/nfe/if_nfevar.h#4 integrate .. //depot/projects/uart/dev/ofw/ofw_console.c#10 integrate .. //depot/projects/uart/dev/ofw/openpromio.c#5 integrate .. //depot/projects/uart/dev/patm/if_patm_rx.c#9 integrate .. //depot/projects/uart/dev/pccard/pccarddevs#23 integrate .. //depot/projects/uart/dev/pci/pci.c#34 integrate .. //depot/projects/uart/dev/pci/pci_user.c#11 integrate .. //depot/projects/uart/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/uart/dev/ppbus/ppbconf.c#5 integrate .. //depot/projects/uart/dev/ppbus/ppbconf.h#3 integrate .. //depot/projects/uart/dev/puc/pucdata.c#51 integrate .. //depot/projects/uart/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/uart/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/uart/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/uart/dev/quicc/quicc_core.c#1 branch .. //depot/projects/uart/dev/ral/rt2560.c#11 integrate .. //depot/projects/uart/dev/ral/rt2560reg.h#3 integrate .. //depot/projects/uart/dev/ral/rt2560var.h#4 integrate .. //depot/projects/uart/dev/re/if_re.c#26 integrate .. //depot/projects/uart/dev/rr232x/LICENSE#2 delete .. //depot/projects/uart/dev/rr232x/README#2 delete .. //depot/projects/uart/dev/rr232x/amd64-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/uart/dev/rr232x/array.h#2 delete .. //depot/projects/uart/dev/rr232x/him.h#2 delete .. //depot/projects/uart/dev/rr232x/himfuncs.h#2 delete .. //depot/projects/uart/dev/rr232x/hptintf.h#2 delete .. //depot/projects/uart/dev/rr232x/i386-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/uart/dev/rr232x/ldm.h#2 delete .. //depot/projects/uart/dev/rr232x/list.h#2 delete .. //depot/projects/uart/dev/rr232x/os_bsd.c#2 delete .. //depot/projects/uart/dev/rr232x/os_bsd.h#4 delete .. //depot/projects/uart/dev/rr232x/osm.h#2 delete .. //depot/projects/uart/dev/rr232x/osm_bsd.c#6 delete .. //depot/projects/uart/dev/rr232x/rr232x_config.c#2 delete .. //depot/projects/uart/dev/rr232x/rr232x_config.h#2 delete .. //depot/projects/uart/dev/scc/scc_bfe.h#23 integrate .. //depot/projects/uart/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/uart/dev/scc/scc_bus.h#12 integrate .. //depot/projects/uart/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/uart/dev/sf/if_sf.c#1 branch .. //depot/projects/uart/dev/sf/if_sfreg.h#1 branch .. //depot/projects/uart/dev/sf/starfire_rx.h#1 branch .. //depot/projects/uart/dev/sf/starfire_tx.h#1 branch .. //depot/projects/uart/dev/sio/sio.c#21 integrate .. //depot/projects/uart/dev/sk/if_sk.c#17 integrate .. //depot/projects/uart/dev/sk/if_skreg.h#10 integrate .. //depot/projects/uart/dev/snp/snp.c#13 integrate .. //depot/projects/uart/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/uart/dev/sound/pci/ich.c#29 integrate .. //depot/projects/uart/dev/sound/pci/maestro.c#14 integrate .. //depot/projects/uart/dev/stge/if_stge.c#6 integrate .. //depot/projects/uart/dev/stge/if_stgereg.h#3 integrate .. //depot/projects/uart/dev/streams/streams.c#10 integrate .. //depot/projects/uart/dev/syscons/blank/blank_saver.c#2 integrate .. //depot/projects/uart/dev/syscons/daemon/daemon_saver.c#3 integrate .. //depot/projects/uart/dev/syscons/dragon/dragon_saver.c#3 integrate .. //depot/projects/uart/dev/syscons/fade/fade_saver.c#2 integrate .. //depot/projects/uart/dev/syscons/fire/fire_saver.c#4 integrate .. //depot/projects/uart/dev/syscons/green/green_saver.c#2 integrate .. //depot/projects/uart/dev/syscons/logo/logo_saver.c#4 integrate .. //depot/projects/uart/dev/syscons/rain/rain_saver.c#3 integrate .. //depot/projects/uart/dev/syscons/scgfbrndr.c#9 integrate .. //depot/projects/uart/dev/syscons/scvgarndr.c#8 integrate .. //depot/projects/uart/dev/syscons/scvidctl.c#9 integrate .. //depot/projects/uart/dev/syscons/snake/snake_saver.c#3 integrate .. //depot/projects/uart/dev/syscons/star/star_saver.c#3 integrate .. //depot/projects/uart/dev/syscons/syscons.c#21 integrate .. //depot/projects/uart/dev/syscons/syscons.h#10 integrate .. //depot/projects/uart/dev/syscons/warp/warp_saver.c#4 integrate .. //depot/projects/uart/dev/ti/if_ti.c#6 integrate .. //depot/projects/uart/dev/tsec/if_tsec.c#1 branch .. //depot/projects/uart/dev/tsec/if_tsec.h#1 branch .. //depot/projects/uart/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/uart/dev/twe/twe.c#8 integrate .. //depot/projects/uart/dev/uart/uart.h#14 integrate .. //depot/projects/uart/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/uart/dev/uart/uart_bus_scc.c#11 integrate .. //depot/projects/uart/dev/uart/uart_core.c#60 integrate .. //depot/projects/uart/dev/uart/uart_cpu_powerpc.c#5 integrate .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#52 integrate .. //depot/projects/uart/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/uart/dev/usb/ehci.c#21 integrate .. //depot/projects/uart/dev/usb/ehci_pci.c#17 integrate .. //depot/projects/uart/dev/usb/if_axe.c#20 integrate .. //depot/projects/uart/dev/usb/if_rum.c#4 integrate .. //depot/projects/uart/dev/usb/if_udav.c#11 integrate .. //depot/projects/uart/dev/usb/if_zyd.c#2 integrate .. //depot/projects/uart/dev/usb/uark.c#3 integrate .. //depot/projects/uart/dev/usb/ubsa.c#12 integrate .. //depot/projects/uart/dev/usb/ucom.c#13 integrate .. //depot/projects/uart/dev/usb/uftdi.c#12 integrate .. //depot/projects/uart/dev/usb/uftdireg.h#3 integrate .. //depot/projects/uart/dev/usb/ukbd.c#15 integrate .. //depot/projects/uart/dev/usb/umass.c#24 integrate .. //depot/projects/uart/dev/usb/ums.c#15 integrate .. //depot/projects/uart/dev/usb/uplcom.c#21 integrate .. //depot/projects/uart/dev/usb/usbdevs#35 integrate .. //depot/projects/uart/dev/usb/usbdi.c#15 integrate .. //depot/projects/uart/dev/usb/uscanner.c#18 integrate .. //depot/projects/uart/dev/usb/uslcom.c#1 branch .. //depot/projects/uart/dev/vkbd/vkbd.c#8 integrate .. //depot/projects/uart/dev/vr/if_vr.c#1 branch .. //depot/projects/uart/dev/vr/if_vrreg.h#1 branch .. //depot/projects/uart/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/uart/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/uart/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/uart/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/uart/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/uart/fs/coda/TODO#2 integrate .. //depot/projects/uart/fs/coda/cnode.h#2 integrate .. //depot/projects/uart/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/uart/fs/coda/coda_io.h#2 integrate .. //depot/projects/uart/fs/coda/coda_kernel.h#2 delete .. //depot/projects/uart/fs/coda/coda_namecache.c#2 delete .. //depot/projects/uart/fs/coda/coda_namecache.h#2 delete .. //depot/projects/uart/fs/coda/coda_opstats.h#2 integrate .. //depot/projects/uart/fs/coda/coda_pioctl.h#2 integrate .. //depot/projects/uart/fs/coda/coda_psdev.c#2 integrate .. //depot/projects/uart/fs/coda/coda_psdev.h#2 integrate .. //depot/projects/uart/fs/coda/coda_subr.c#2 integrate .. //depot/projects/uart/fs/coda/coda_subr.h#2 integrate .. //depot/projects/uart/fs/coda/coda_venus.c#2 integrate .. //depot/projects/uart/fs/coda/coda_venus.h#2 integrate .. //depot/projects/uart/fs/coda/coda_vfsops.c#3 integrate .. //depot/projects/uart/fs/coda/coda_vfsops.h#2 integrate .. //depot/projects/uart/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/uart/fs/coda/coda_vnops.h#2 integrate .. //depot/projects/uart/fs/devfs/devfs_devs.c#14 integrate .. //depot/projects/uart/fs/devfs/devfs_vfsops.c#13 integrate .. //depot/projects/uart/fs/devfs/devfs_vnops.c#26 integrate .. //depot/projects/uart/fs/fdescfs/fdesc_vfsops.c#12 integrate .. //depot/projects/uart/fs/fdescfs/fdesc_vnops.c#13 integrate .. //depot/projects/uart/fs/fifofs/fifo_vnops.c#15 integrate .. //depot/projects/uart/fs/hpfs/hpfs_subr.h#3 integrate .. //depot/projects/uart/fs/hpfs/hpfs_vfsops.c#15 integrate .. //depot/projects/uart/fs/hpfs/hpfs_vnops.c#14 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_denode.c#15 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_lookup.c#9 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vfsops.c#22 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vnops.c#18 integrate .. //depot/projects/uart/fs/ntfs/ntfs_subr.c#11 integrate .. //depot/projects/uart/fs/ntfs/ntfs_vfsops.c#19 integrate .. //depot/projects/uart/fs/ntfs/ntfs_vnops.c#14 integrate .. //depot/projects/uart/fs/nullfs/null_subr.c#10 integrate .. //depot/projects/uart/fs/nullfs/null_vfsops.c#15 integrate .. //depot/projects/uart/fs/nullfs/null_vnops.c#15 integrate .. //depot/projects/uart/fs/nwfs/nwfs_node.c#9 integrate .. //depot/projects/uart/fs/nwfs/nwfs_subr.c#7 integrate .. //depot/projects/uart/fs/nwfs/nwfs_vfsops.c#10 integrate .. //depot/projects/uart/fs/nwfs/nwfs_vnops.c#9 integrate .. //depot/projects/uart/fs/portalfs/portal_vfsops.c#10 integrate .. //depot/projects/uart/fs/portalfs/portal_vnops.c#8 integrate .. //depot/projects/uart/fs/procfs/procfs.c#7 integrate .. //depot/projects/uart/fs/procfs/procfs_ctl.c#7 integrate .. //depot/projects/uart/fs/procfs/procfs_dbregs.c#6 integrate .. //depot/projects/uart/fs/procfs/procfs_map.c#9 integrate .. //depot/projects/uart/fs/procfs/procfs_status.c#10 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_vncache.c#11 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_vnops.c#17 integrate .. //depot/projects/uart/fs/smbfs/smbfs.h#5 integrate .. //depot/projects/uart/fs/smbfs/smbfs_io.c#14 integrate .. //depot/projects/uart/fs/smbfs/smbfs_node.c#12 integrate .. //depot/projects/uart/fs/smbfs/smbfs_vfsops.c#14 integrate .. //depot/projects/uart/fs/smbfs/smbfs_vnops.c#13 integrate .. //depot/projects/uart/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/uart/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/uart/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/uart/fs/udf/udf_vfsops.c#20 integrate .. //depot/projects/uart/fs/udf/udf_vnops.c#17 integrate .. //depot/projects/uart/fs/unionfs/union_subr.c#13 integrate .. //depot/projects/uart/fs/unionfs/union_vfsops.c#12 integrate .. //depot/projects/uart/fs/unionfs/union_vnops.c#14 integrate .. //depot/projects/uart/gdb/gdb_main.c#6 integrate .. //depot/projects/uart/geom/geom_dev.c#16 integrate .. //depot/projects/uart/geom/geom_disk.c#15 integrate .. //depot/projects/uart/geom/geom_io.c#16 integrate .. //depot/projects/uart/geom/linux_lvm/g_linux_lvm.c#1 branch .. //depot/projects/uart/geom/linux_lvm/g_linux_lvm.h#1 branch .. //depot/projects/uart/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/uart/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/uart/geom/part/g_part_vtoc8.c#1 branch .. //depot/projects/uart/gnu/fs/ext2fs/ext2_lookup.c#3 integrate .. //depot/projects/uart/gnu/fs/ext2fs/ext2_vfsops.c#11 integrate .. //depot/projects/uart/gnu/fs/ext2fs/ext2_vnops.c#7 integrate .. //depot/projects/uart/gnu/fs/ext2fs/fs.h#3 integrate .. //depot/projects/uart/gnu/fs/reiserfs/reiserfs_inode.c#4 integrate .. //depot/projects/uart/gnu/fs/reiserfs/reiserfs_namei.c#4 integrate .. //depot/projects/uart/gnu/fs/reiserfs/reiserfs_vfsops.c#9 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_buf.h#3 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_mountops.c#8 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_super.c#5 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_vnode.c#3 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate .. //depot/projects/uart/i386/acpica/madt.c#11 integrate .. //depot/projects/uart/i386/conf/DEFAULTS#8 integrate .. //depot/projects/uart/i386/conf/GENERIC#30 integrate .. //depot/projects/uart/i386/conf/GENERIC.hints#6 integrate .. //depot/projects/uart/i386/conf/NOTES#29 integrate .. //depot/projects/uart/i386/conf/PAE#16 integrate .. //depot/projects/uart/i386/cpufreq/est.c#6 integrate .. //depot/projects/uart/i386/i386/busdma_machdep.c#25 integrate .. //depot/projects/uart/i386/i386/dump_machdep.c#5 integrate .. //depot/projects/uart/i386/i386/geode.c#8 integrate .. //depot/projects/uart/i386/i386/i686_mem.c#5 integrate .. //depot/projects/uart/i386/i386/identcpu.c#28 integrate .. //depot/projects/uart/i386/i386/initcpu.c#11 integrate .. //depot/projects/uart/i386/i386/k6_mem.c#3 integrate .. //depot/projects/uart/i386/i386/legacy.c#8 integrate .. //depot/projects/uart/i386/i386/machdep.c#32 integrate .. //depot/projects/uart/i386/i386/minidump_machdep.c#4 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#32 integrate .. //depot/projects/uart/i386/i386/mp_watchdog.c#4 integrate .. //depot/projects/uart/i386/i386/pmap.c#52 integrate .. //depot/projects/uart/i386/i386/sys_machdep.c#20 integrate .. //depot/projects/uart/i386/i386/trap.c#23 integrate .. //depot/projects/uart/i386/i386/vm_machdep.c#22 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_misc.c#14 integrate .. //depot/projects/uart/i386/ibcs2/imgact_coff.c#10 integrate .. //depot/projects/uart/i386/include/_types.h#6 integrate .. //depot/projects/uart/i386/include/float.h#4 integrate .. //depot/projects/uart/i386/include/ieeefp.h#4 integrate .. //depot/projects/uart/i386/include/pmap.h#16 integrate .. //depot/projects/uart/i386/include/proc.h#6 integrate .. //depot/projects/uart/i386/include/smp.h#12 integrate .. //depot/projects/uart/i386/include/specialreg.h#12 integrate .. //depot/projects/uart/i386/include/vmparam.h#9 integrate .. //depot/projects/uart/i386/isa/clock.c#17 integrate .. //depot/projects/uart/i386/linux/imgact_linux.c#8 integrate .. //depot/projects/uart/i386/linux/linux_machdep.c#13 integrate .. //depot/projects/uart/i386/linux/linux_sysvec.c#16 integrate .. //depot/projects/uart/i386/pci/pci_pir.c#8 integrate .. //depot/projects/uart/i386/xbox/xboxfb.c#6 integrate .. //depot/projects/uart/ia64/conf/DEFAULTS#10 integrate .. //depot/projects/uart/ia64/conf/GENERIC#21 integrate .. //depot/projects/uart/ia64/ia64/dump_machdep.c#5 integrate .. //depot/projects/uart/ia64/ia64/locore.S#6 integrate .. //depot/projects/uart/ia64/ia64/machdep.c#33 integrate .. //depot/projects/uart/ia64/ia64/mp_machdep.c#14 integrate .. //depot/projects/uart/ia64/ia64/pmap.c#31 integrate .. //depot/projects/uart/ia64/ia64/trap.c#24 integrate .. //depot/projects/uart/ia64/include/md_var.h#9 integrate .. //depot/projects/uart/ia64/include/ucontext.h#5 integrate .. //depot/projects/uart/ia64/include/vmparam.h#11 integrate .. //depot/projects/uart/isa/vga_isa.c#7 integrate .. //depot/projects/uart/kern/Makefile#5 integrate .. //depot/projects/uart/kern/genassym.sh#2 integrate .. //depot/projects/uart/kern/imgact_aout.c#11 integrate .. //depot/projects/uart/kern/imgact_elf.c#12 integrate .. //depot/projects/uart/kern/imgact_gzip.c#8 integrate .. //depot/projects/uart/kern/init_main.c#23 integrate .. //depot/projects/uart/kern/init_sysent.c#22 integrate .. //depot/projects/uart/kern/kern_acct.c#17 integrate .. //depot/projects/uart/kern/kern_alq.c#12 integrate .. //depot/projects/uart/kern/kern_clock.c#17 integrate .. //depot/projects/uart/kern/kern_condvar.c#12 integrate .. //depot/projects/uart/kern/kern_cpu.c#9 integrate .. //depot/projects/uart/kern/kern_cpuset.c#1 branch .. //depot/projects/uart/kern/kern_descrip.c#32 integrate .. //depot/projects/uart/kern/kern_event.c#20 integrate .. //depot/projects/uart/kern/kern_exec.c#27 integrate .. //depot/projects/uart/kern/kern_exit.c#24 integrate .. //depot/projects/uart/kern/kern_fork.c#24 integrate .. //depot/projects/uart/kern/kern_intr.c#19 integrate .. //depot/projects/uart/kern/kern_jail.c#14 integrate .. //depot/projects/uart/kern/kern_kse.c#17 delete .. //depot/projects/uart/kern/kern_ktrace.c#19 integrate .. //depot/projects/uart/kern/kern_linker.c#16 integrate .. //depot/projects/uart/kern/kern_lock.c#20 integrate .. //depot/projects/uart/kern/kern_mbuf.c#18 integrate .. //depot/projects/uart/kern/kern_mib.c#10 integrate .. //depot/projects/uart/kern/kern_module.c#10 integrate .. //depot/projects/uart/kern/kern_mutex.c#24 integrate .. //depot/projects/uart/kern/kern_priv.c#3 integrate .. //depot/projects/uart/kern/kern_proc.c#23 integrate .. //depot/projects/uart/kern/kern_resource.c#16 integrate .. //depot/projects/uart/kern/kern_rwlock.c#14 integrate .. //depot/projects/uart/kern/kern_shutdown.c#14 integrate .. //depot/projects/uart/kern/kern_sig.c#38 integrate .. //depot/projects/uart/kern/kern_switch.c#17 integrate .. //depot/projects/uart/kern/kern_sx.c#17 integrate .. //depot/projects/uart/kern/kern_synch.c#25 integrate .. //depot/projects/uart/kern/kern_tc.c#18 integrate .. //depot/projects/uart/kern/kern_thread.c#30 integrate .. //depot/projects/uart/kern/kern_time.c#14 integrate .. //depot/projects/uart/kern/kern_timeout.c#13 integrate .. //depot/projects/uart/kern/kern_umtx.c#20 integrate .. //depot/projects/uart/kern/link_elf.c#14 integrate .. //depot/projects/uart/kern/link_elf_obj.c#9 integrate .. //depot/projects/uart/kern/p1003_1b.c#4 integrate .. //depot/projects/uart/kern/sched_4bsd.c#20 integrate .. //depot/projects/uart/kern/sched_ule.c#25 integrate .. //depot/projects/uart/kern/subr_autoconf.c#6 integrate .. //depot/projects/uart/kern/subr_bus.c#22 integrate .. //depot/projects/uart/kern/subr_kdb.c#9 integrate .. //depot/projects/uart/kern/subr_lock.c#8 integrate .. //depot/projects/uart/kern/subr_sleepqueue.c#17 integrate .. //depot/projects/uart/kern/subr_smp.c#10 integrate .. //depot/projects/uart/kern/subr_trap.c#15 integrate .. //depot/projects/uart/kern/subr_turnstile.c#16 integrate .. //depot/projects/uart/kern/subr_witness.c#27 integrate .. //depot/projects/uart/kern/sys_generic.c#21 integrate .. //depot/projects/uart/kern/sys_pipe.c#25 integrate .. //depot/projects/uart/kern/sys_process.c#20 integrate .. //depot/projects/uart/kern/sys_socket.c#13 integrate .. //depot/projects/uart/kern/syscalls.c#22 integrate .. //depot/projects/uart/kern/syscalls.master#24 integrate .. //depot/projects/uart/kern/systrace_args.c#4 integrate .. //depot/projects/uart/kern/sysv_shm.c#17 integrate .. //depot/projects/uart/kern/tty.c#16 integrate .. //depot/projects/uart/kern/tty_cons.c#12 integrate .. //depot/projects/uart/kern/tty_pty.c#14 integrate .. //depot/projects/uart/kern/uipc_cow.c#7 integrate .. //depot/projects/uart/kern/uipc_debug.c#3 integrate .. //depot/projects/uart/kern/uipc_mbuf.c#20 integrate .. //depot/projects/uart/kern/uipc_mqueue.c#12 integrate .. //depot/projects/uart/kern/uipc_sem.c#13 integrate .. //depot/projects/uart/kern/uipc_shm.c#1 branch .. //depot/projects/uart/kern/uipc_sockbuf.c#7 integrate .. //depot/projects/uart/kern/uipc_socket.c#30 integrate .. //depot/projects/uart/kern/uipc_syscalls.c#32 integrate .. //depot/projects/uart/kern/uipc_usrreq.c#24 integrate .. //depot/projects/uart/kern/vfs_acl.c#3 integrate .. //depot/projects/uart/kern/vfs_aio.c#23 integrate .. //depot/projects/uart/kern/vfs_bio.c#33 integrate .. //depot/projects/uart/kern/vfs_cache.c#17 integrate .. //depot/projects/uart/kern/vfs_default.c#21 integrate .. //depot/projects/uart/kern/vfs_extattr.c#3 integrate .. //depot/projects/uart/kern/vfs_lookup.c#21 integrate .. //depot/projects/uart/kern/vfs_mount.c#37 integrate .. //depot/projects/uart/kern/vfs_subr.c#45 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#37 integrate .. //depot/projects/uart/kern/vfs_vnops.c#26 integrate .. //depot/projects/uart/kern/vnode_if.src#17 integrate .. //depot/projects/uart/libkern/cmpdi2.c#1 branch .. //depot/projects/uart/libkern/quad.h#3 integrate .. //depot/projects/uart/modules/Makefile#52 integrate .. //depot/projects/uart/modules/cmx/Makefile#1 branch .. //depot/projects/uart/modules/coda/Makefile#5 integrate .. //depot/projects/uart/modules/coda5/Makefile#7 integrate .. //depot/projects/uart/modules/cxgb/Makefile#6 integrate .. //depot/projects/uart/modules/cxgb/cxgb/Makefile#1 branch .. //depot/projects/uart/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/uart/modules/cxgb/toecore/Makefile#1 branch .. //depot/projects/uart/modules/cxgb/tom/Makefile#1 branch .. //depot/projects/uart/modules/em/Makefile#5 integrate .. //depot/projects/uart/modules/geom/Makefile#9 integrate .. //depot/projects/uart/modules/geom/geom_apple/Makefile#2 delete .. //depot/projects/uart/modules/geom/geom_eli/Makefile#5 integrate .. //depot/projects/uart/modules/geom/geom_gpt/Makefile#2 delete .. //depot/projects/uart/modules/geom/geom_linux_lvm/Makefile#1 branch .. //depot/projects/uart/modules/geom/geom_part/Makefile#1 branch .. //depot/projects/uart/modules/hptrr/Makefile#1 branch .. //depot/projects/uart/modules/hwpmc/Makefile#4 integrate .. //depot/projects/uart/modules/igb/Makefile#1 branch .. //depot/projects/uart/modules/ipfw_nat/Makefile#1 branch .. //depot/projects/uart/modules/mii/Makefile#7 integrate .. //depot/projects/uart/modules/mxge/Makefile#3 integrate .. //depot/projects/uart/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch .. //depot/projects/uart/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch .. //depot/projects/uart/modules/rr232x/Makefile#4 delete .. //depot/projects/uart/modules/sf/Makefile#3 integrate .. //depot/projects/uart/modules/sound/driver/emu10kx/Makefile#4 integrate .. //depot/projects/uart/modules/uslcom/Makefile#1 branch .. //depot/projects/uart/modules/vr/Makefile#3 integrate .. //depot/projects/uart/modules/zfs/Makefile#5 integrate .. //depot/projects/uart/net/bpf.c#23 integrate .. //depot/projects/uart/net/bpf.h#11 integrate .. //depot/projects/uart/net/bpf_filter.c#8 integrate .. //depot/projects/uart/net/ieee8023ad_lacp.c#6 integrate .. //depot/projects/uart/net/ieee8023ad_lacp.h#5 integrate .. //depot/projects/uart/net/if.c#32 integrate .. //depot/projects/uart/net/if.h#16 integrate .. //depot/projects/uart/net/if_bridge.c#19 integrate .. //depot/projects/uart/net/if_enc.c#5 integrate .. //depot/projects/uart/net/if_ethersubr.c#27 integrate .. //depot/projects/uart/net/if_gif.c#14 integrate .. //depot/projects/uart/net/if_lagg.c#5 integrate .. //depot/projects/uart/net/netisr.h#4 integrate .. //depot/projects/uart/net/route.c#15 integrate .. //depot/projects/uart/net/route.h#8 integrate .. //depot/projects/uart/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/uart/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/uart/net80211/ieee80211_input.c#23 integrate .. //depot/projects/uart/net80211/ieee80211_radiotap.h#8 integrate .. //depot/projects/uart/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/uart/netgraph/netflow/netflow.c#12 integrate .. //depot/projects/uart/netgraph/netflow/ng_netflow.c#9 integrate .. //depot/projects/uart/netgraph/netgraph.h#14 integrate .. //depot/projects/uart/netgraph/ng_base.c#21 integrate .. //depot/projects/uart/netgraph/ng_bpf.c#6 integrate .. //depot/projects/uart/netgraph/ng_car.c#3 integrate .. //depot/projects/uart/netgraph/ng_car.h#2 integrate .. //depot/projects/uart/netgraph/ng_iface.c#11 integrate .. //depot/projects/uart/netgraph/ng_ksocket.c#12 integrate .. //depot/projects/uart/netgraph/ng_l2tp.c#8 integrate .. //depot/projects/uart/netgraph/ng_nat.c#6 integrate .. //depot/projects/uart/netgraph/ng_nat.h#3 integrate .. //depot/projects/uart/netgraph/ng_ppp.c#10 integrate .. //depot/projects/uart/netgraph/ng_pppoe.c#12 integrate .. //depot/projects/uart/netgraph/ng_pppoe.h#7 integrate .. //depot/projects/uart/netgraph/ng_pred1.c#2 integrate .. //depot/projects/uart/netgraph/ng_socket.c#17 integrate .. //depot/projects/uart/netgraph/ng_tee.c#6 integrate .. //depot/projects/uart/netinet/if_ether.c#21 integrate .. //depot/projects/uart/netinet/if_ether.h#5 integrate .. //depot/projects/uart/netinet/in.c#18 integrate .. //depot/projects/uart/netinet/in.h#13 integrate .. //depot/projects/uart/netinet/in_pcb.c#28 integrate .. //depot/projects/uart/netinet/in_rmx.c#10 integrate .. //depot/projects/uart/netinet/ip_carp.c#13 integrate .. //depot/projects/uart/netinet/ip_dummynet.c#21 integrate .. //depot/projects/uart/netinet/ip_fw.h#17 integrate .. //depot/projects/uart/netinet/ip_fw2.c#35 integrate .. //depot/projects/uart/netinet/ip_fw_nat.c#1 branch .. //depot/projects/uart/netinet/ip_fw_pfil.c#11 integrate .. //depot/projects/uart/netinet/ip_id.c#6 integrate .. //depot/projects/uart/netinet/ip_options.c#5 integrate .. //depot/projects/uart/netinet/ip_output.c#25 integrate .. //depot/projects/uart/netinet/libalias/alias.c#5 integrate .. //depot/projects/uart/netinet/libalias/alias.h#4 integrate .. //depot/projects/uart/netinet/libalias/alias_db.c#6 integrate .. //depot/projects/uart/netinet/libalias/alias_ftp.c#5 integrate .. //depot/projects/uart/netinet/libalias/alias_irc.c#5 integrate .. //depot/projects/uart/netinet/libalias/alias_local.h#5 integrate .. //depot/projects/uart/netinet/libalias/alias_old.c#3 delete .. //depot/projects/uart/netinet/libalias/alias_proxy.c#7 integrate .. //depot/projects/uart/netinet/libalias/alias_smedia.c#5 integrate .. //depot/projects/uart/netinet/sctp_auth.c#7 integrate .. //depot/projects/uart/netinet/sctp_bsd_addr.c#6 integrate .. //depot/projects/uart/netinet/sctp_indata.c#9 integrate .. //depot/projects/uart/netinet/sctp_input.c#9 integrate .. //depot/projects/uart/netinet/sctp_output.c#9 integrate .. //depot/projects/uart/netinet/sctp_pcb.c#9 integrate .. //depot/projects/uart/netinet/sctp_peeloff.c#7 integrate .. //depot/projects/uart/netinet/sctputil.c#9 integrate .. //depot/projects/uart/netinet/tcp.h#12 integrate .. //depot/projects/uart/netinet/tcp_input.c#37 integrate .. //depot/projects/uart/netinet/tcp_offload.c#1 branch .. //depot/projects/uart/netinet/tcp_offload.h#1 branch .. //depot/projects/uart/netinet/tcp_output.c#19 integrate .. //depot/projects/uart/netinet/tcp_subr.c#32 integrate .. //depot/projects/uart/netinet/tcp_syncache.c#26 integrate .. //depot/projects/uart/netinet/tcp_syncache.h#2 integrate .. //depot/projects/uart/netinet/tcp_usrreq.c#24 integrate .. //depot/projects/uart/netinet/tcp_var.h#22 integrate .. //depot/projects/uart/netinet/toedev.h#1 branch .. //depot/projects/uart/netinet6/dest6.c#5 integrate .. //depot/projects/uart/netinet6/frag6.c#12 integrate .. //depot/projects/uart/netinet6/icmp6.c#16 integrate .. //depot/projects/uart/netinet6/in6.c#19 integrate .. //depot/projects/uart/netinet6/in6.h#10 integrate .. //depot/projects/uart/netinet6/in6_cksum.c#11 integrate .. //depot/projects/uart/netinet6/in6_gif.c#11 integrate .. //depot/projects/uart/netinet6/in6_gif.h#4 integrate .. //depot/projects/uart/netinet6/in6_ifattach.c#14 integrate .. //depot/projects/uart/netinet6/in6_ifattach.h#5 integrate .. //depot/projects/uart/netinet6/in6_pcb.c#19 integrate .. //depot/projects/uart/netinet6/in6_pcb.h#7 integrate .. //depot/projects/uart/netinet6/in6_proto.c#14 integrate .. //depot/projects/uart/netinet6/in6_rmx.c#9 integrate .. //depot/projects/uart/netinet6/in6_src.c#17 integrate .. //depot/projects/uart/netinet6/in6_var.h#11 integrate .. //depot/projects/uart/netinet6/ip6_ecn.h#4 integrate .. //depot/projects/uart/netinet6/ip6_forward.c#14 integrate .. //depot/projects/uart/netinet6/ip6_id.c#5 integrate .. //depot/projects/uart/netinet6/ip6_input.c#17 integrate .. //depot/projects/uart/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/uart/netinet6/ip6_ipsec.h#2 integrate .. //depot/projects/uart/netinet6/ip6_mroute.c#12 integrate .. //depot/projects/uart/netinet6/ip6_mroute.h#7 integrate .. //depot/projects/uart/netinet6/ip6_output.c#17 integrate .. //depot/projects/uart/netinet6/ip6_var.h#11 integrate .. //depot/projects/uart/netinet6/ip6protosw.h#6 integrate .. //depot/projects/uart/netinet6/mld6.c#12 integrate .. //depot/projects/uart/netinet6/mld6_var.h#6 integrate .. //depot/projects/uart/netinet6/nd6.c#20 integrate .. //depot/projects/uart/netinet6/nd6.h#7 integrate .. //depot/projects/uart/netinet6/nd6_nbr.c#13 integrate .. //depot/projects/uart/netinet6/nd6_rtr.c#13 integrate .. //depot/projects/uart/netinet6/pim6.h#3 integrate .. //depot/projects/uart/netinet6/pim6_var.h#4 integrate .. //depot/projects/uart/netinet6/raw_ip6.c#17 integrate .. //depot/projects/uart/netinet6/raw_ip6.h#3 integrate .. //depot/projects/uart/netinet6/route6.c#8 integrate .. //depot/projects/uart/netinet6/scope6.c#8 integrate .. //depot/projects/uart/netinet6/scope6_var.h#5 integrate .. //depot/projects/uart/netinet6/sctp6_usrreq.c#9 integrate .. //depot/projects/uart/netinet6/sctp6_var.h#6 integrate .. //depot/projects/uart/netinet6/tcp6_var.h#4 integrate .. //depot/projects/uart/netinet6/udp6_usrreq.c#20 integrate .. //depot/projects/uart/netinet6/udp6_var.h#5 integrate .. //depot/projects/uart/netipsec/ipsec.c#19 integrate .. //depot/projects/uart/netipsec/ipsec.h#11 integrate .. //depot/projects/uart/netipsec/ipsec6.h#4 integrate .. //depot/projects/uart/netipsec/key.c#11 integrate .. //depot/projects/uart/netipsec/key_debug.c#6 integrate .. //depot/projects/uart/netncp/ncp_conn.c#8 integrate .. //depot/projects/uart/netncp/ncp_conn.h#3 integrate .. //depot/projects/uart/netncp/ncp_rq.c#4 integrate .. //depot/projects/uart/netncp/ncp_sock.c#7 integrate .. //depot/projects/uart/netncp/ncp_sock.h#3 integrate .. //depot/projects/uart/netsmb/smb_conn.c#9 integrate .. //depot/projects/uart/netsmb/smb_conn.h#5 integrate .. //depot/projects/uart/netsmb/smb_iod.c#7 integrate .. //depot/projects/uart/netsmb/smb_trantcp.c#7 integrate .. //depot/projects/uart/nfs4client/nfs4_idmap.c#3 integrate .. //depot/projects/uart/nfs4client/nfs4_vfsops.c#13 integrate .. //depot/projects/uart/nfs4client/nfs4_vnops.c#11 integrate .. //depot/projects/uart/nfsclient/nfs_bio.c#19 integrate .. //depot/projects/uart/nfsclient/nfs_diskless.c#10 integrate .. //depot/projects/uart/nfsclient/nfs_node.c#16 integrate .. //depot/projects/uart/nfsclient/nfs_socket.c#21 integrate .. //depot/projects/uart/nfsclient/nfs_subs.c#14 integrate .. //depot/projects/uart/nfsclient/nfs_vfsops.c#21 integrate .. //depot/projects/uart/nfsclient/nfs_vnops.c#24 integrate .. //depot/projects/uart/nfsclient/nfsm_subs.h#5 integrate .. //depot/projects/uart/nfsclient/nfsnode.h#11 integrate .. //depot/projects/uart/nfsserver/nfs_serv.c#18 integrate .. //depot/projects/uart/nfsserver/nfs_srvsubs.c#17 integrate .. //depot/projects/uart/opencrypto/cryptodev.c#14 integrate .. //depot/projects/uart/pc98/cbus/gdc.c#3 integrate .. //depot/projects/uart/pc98/cbus/pckbd.c#5 integrate .. //depot/projects/uart/pc98/cbus/scgdcrndr.c#2 integrate .. //depot/projects/uart/pc98/cbus/sio.c#9 integrate .. //depot/projects/uart/pc98/conf/DEFAULTS#7 integrate .. //depot/projects/uart/pc98/conf/GENERIC#25 integrate .. //depot/projects/uart/pc98/pc98/machdep.c#17 integrate .. //depot/projects/uart/pci/amdsmb.c#5 integrate .. //depot/projects/uart/pci/if_rl.c#25 integrate .. //depot/projects/uart/pci/if_rlreg.h#23 integrate .. //depot/projects/uart/pci/if_sf.c#17 delete .. //depot/projects/uart/pci/if_sfreg.h#9 delete .. //depot/projects/uart/pci/if_vr.c#16 delete .. //depot/projects/uart/pci/if_vrreg.h#10 delete .. //depot/projects/uart/pci/if_wb.c#14 integrate .. //depot/projects/uart/pci/nfsmb.c#7 integrate .. //depot/projects/uart/powerpc/aim/clock.c#1 branch .. //depot/projects/uart/powerpc/aim/copyinout.c#1 branch .. //depot/projects/uart/powerpc/aim/interrupt.c#1 branch .. //depot/projects/uart/powerpc/aim/locore.S#1 branch .. //depot/projects/uart/powerpc/aim/machdep.c#1 branch .. //depot/projects/uart/powerpc/aim/mmu_oea.c#1 branch .. //depot/projects/uart/powerpc/aim/nexus.c#1 branch .. //depot/projects/uart/powerpc/aim/ofw_machdep.c#1 branch .. //depot/projects/uart/powerpc/aim/ofwmagic.S#1 branch .. //depot/projects/uart/powerpc/aim/swtch.S#1 branch .. //depot/projects/uart/powerpc/aim/trap.c#1 branch .. //depot/projects/uart/powerpc/aim/trap_subr.S#1 branch .. //depot/projects/uart/powerpc/aim/uio_machdep.c#1 branch .. //depot/projects/uart/powerpc/aim/uma_machdep.c#1 branch .. //depot/projects/uart/powerpc/aim/vm_machdep.c#1 branch .. //depot/projects/uart/powerpc/booke/clock.c#1 branch .. //depot/projects/uart/powerpc/booke/copyinout.c#1 branch .. //depot/projects/uart/powerpc/booke/interrupt.c#1 branch .. //depot/projects/uart/powerpc/booke/locore.S#1 branch .. //depot/projects/uart/powerpc/booke/machdep.c#1 branch .. //depot/projects/uart/powerpc/booke/pmap.c#1 branch .. //depot/projects/uart/powerpc/booke/support.S#1 branch .. //depot/projects/uart/powerpc/booke/swtch.S#1 branch .. //depot/projects/uart/powerpc/booke/trap.c#1 branch .. //depot/projects/uart/powerpc/booke/trap_subr.S#1 branch .. //depot/projects/uart/powerpc/booke/uio_machdep.c#1 branch .. //depot/projects/uart/powerpc/booke/vm_machdep.c#1 branch .. //depot/projects/uart/powerpc/conf/DEFAULTS#6 integrate .. //depot/projects/uart/powerpc/conf/GENERIC#20 integrate .. //depot/projects/uart/powerpc/conf/MPC85XX#1 branch .. //depot/projects/uart/powerpc/conf/NOTES#8 integrate .. //depot/projects/uart/powerpc/fpu/fpu_add.c#1 branch .. //depot/projects/uart/powerpc/fpu/fpu_arith.h#1 branch .. //depot/projects/uart/powerpc/fpu/fpu_compare.c#1 branch .. //depot/projects/uart/powerpc/fpu/fpu_div.c#1 branch .. //depot/projects/uart/powerpc/fpu/fpu_emu.c#1 branch .. //depot/projects/uart/powerpc/fpu/fpu_emu.h#1 branch .. //depot/projects/uart/powerpc/fpu/fpu_explode.c#1 branch .. //depot/projects/uart/powerpc/fpu/fpu_extern.h#1 branch .. //depot/projects/uart/powerpc/fpu/fpu_implode.c#1 branch .. //depot/projects/uart/powerpc/fpu/fpu_instr.h#1 branch .. //depot/projects/uart/powerpc/fpu/fpu_mul.c#1 branch .. //depot/projects/uart/powerpc/fpu/fpu_sqrt.c#1 branch .. //depot/projects/uart/powerpc/fpu/fpu_subr.c#1 branch .. //depot/projects/uart/powerpc/include/_bus.h#2 integrate .. //depot/projects/uart/powerpc/include/bootinfo.h#3 integrate .. //depot/projects/uart/powerpc/include/bus.h#10 integrate .. //depot/projects/uart/powerpc/include/float.h#4 integrate .. //depot/projects/uart/powerpc/include/fpu.h#2 integrate .. //depot/projects/uart/powerpc/include/frame.h#5 integrate .. //depot/projects/uart/powerpc/include/hid.h#4 integrate .. //depot/projects/uart/powerpc/include/intr_machdep.h#7 integrate .. //depot/projects/uart/powerpc/include/kdb.h#4 integrate .. //depot/projects/uart/powerpc/include/md_var.h#6 integrate .. //depot/projects/uart/powerpc/include/metadata.h#3 integrate .. //depot/projects/uart/powerpc/include/mmuvar.h#2 integrate .. //depot/projects/uart/powerpc/include/ocpbus.h#1 branch .. //depot/projects/uart/powerpc/include/openpicreg.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 13 04:46:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCC521065674; Thu, 13 Mar 2008 04:46:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9C4541065671 for ; Thu, 13 Mar 2008 04:46:23 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A09518FC23 for ; Thu, 13 Mar 2008 04:46:23 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2D4kNIM082962 for ; Thu, 13 Mar 2008 04:46:23 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2D4kNLw082960 for perforce@freebsd.org; Thu, 13 Mar 2008 04:46:23 GMT (envelope-from marcel@freebsd.org) Date: Thu, 13 Mar 2008 04:46:23 GMT Message-Id: <200803130446.m2D4kNLw082960@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 137578 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, 13 Mar 2008 04:46:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=137578 Change 137578 by marcel@marcel_fbsdvm on 2008/03/13 04:45:21 Save... Affected files ... .. //depot/projects/bdb/usr.bin/bdb/Makefile#2 edit .. //depot/projects/bdb/usr.bin/bdb/bdb.c#2 edit .. //depot/projects/bdb/usr.bin/bdb/session.h#1 add Differences ... ==== //depot/projects/bdb/usr.bin/bdb/Makefile#2 (text+ko) ==== @@ -8,6 +8,6 @@ NO_MAN= -WARNS?= 6 +WARNS?= 3 .include ==== //depot/projects/bdb/usr.bin/bdb/bdb.c#2 (text+ko) ==== @@ -4,8 +4,12 @@ #include #include #include +#include #include +#include +#include "session.h" + static void usage(void) { @@ -13,24 +17,51 @@ exit(EX_USAGE); } +static void +disasm(u_char *base, Elf64_Addr va, Elf64_Xword sz, Elf64_Addr ip) +{ +} + static int -workon(Elf *elf) +workon(struct session *sess) { GElf_Ehdr ehdr; + GElf_Phdr phdr; + char *data; + size_t datasz; + int c, ph; - if (gelf_getehdr(elf, &ehdr) == NULL) { - warnx(elf_errmsg(-1)); + if (gelf_getehdr(sess->elf, &ehdr) == NULL) { + warnx("%s: %s", sess->file, elf_errmsg(-1)); return (EX_NOINPUT); } + data = elf_rawfile(sess->elf, &datasz); + + for (ph = 0; ph < ehdr.e_phnum; ph++) { + if (gelf_getphdr(sess->elf, ph, &phdr) == NULL) { + warnx("%s: %s", sess->file, elf_errmsg(-1)); + continue; + } + if (phdr.p_type != PT_LOAD) + continue; + if (phdr.p_vaddr > ehdr.e_entry || + phdr.p_vaddr + phdr.p_filesz <= ehdr.e_entry) + continue; + + for (c = 0; c < 8; c++) + disasm(data + phdr.p_offset, phdr.p_vaddr, + phdr.p_filesz, ehdr.e_entry + (c << 4)); + } + return (EX_OK); } int main(int argc, char *argv[]) { - Elf *elf; - int errc, fd; + struct session sess; + int errcode; if (elf_version(EV_CURRENT) == EV_NONE) errx(EX_SOFTWARE, elf_errmsg(-1)); @@ -38,19 +69,21 @@ if (argc != 2) usage(); - fd = open(argv[1], O_RDONLY); - if (fd == -1) - err(EX_NOINPUT, "unable to open %s", argv[1]); + sess.file = strdup(argv[1]); + sess.fd = open(sess.file, O_RDONLY); + if (sess.fd == -1) + err(EX_NOINPUT, "%s: Unable to open", sess.file); - elf = elf_begin(fd, ELF_C_READ, NULL); - if (elf == NULL) { - close(fd); - errx(EX_NOINPUT, elf_errmsg(-1)); + sess.elf = elf_begin(sess.fd, ELF_C_READ, NULL); + if (sess.elf == NULL) { + close(sess.fd); + errx(EX_NOINPUT, "%s: %s", sess.file, elf_errmsg(-1)); } - errc = workon(elf); + errcode = workon(&sess); - elf_end(elf); - close(fd); - return (errc); + elf_end(sess.elf); + close(sess.fd); + free(sess.file); + return (errcode); } From owner-p4-projects@FreeBSD.ORG Thu Mar 13 04:50:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AD021065674; Thu, 13 Mar 2008 04:50:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 173041065672 for ; Thu, 13 Mar 2008 04:50:30 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 10F118FC16 for ; Thu, 13 Mar 2008 04:50:30 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2D4oUMO092147 for ; Thu, 13 Mar 2008 04:50:30 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2D4oSEG092145 for perforce@freebsd.org; Thu, 13 Mar 2008 04:50:28 GMT (envelope-from marcel@freebsd.org) Date: Thu, 13 Mar 2008 04:50:28 GMT Message-Id: <200803130450.m2D4oSEG092145@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 137579 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, 13 Mar 2008 04:50:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=137579 Change 137579 by marcel@marcel_xcllnt on 2008/03/13 04:49:43 IFC @137564 Affected files ... .. //depot/projects/tty/Makefile.inc1#38 integrate .. //depot/projects/tty/ObsoleteFiles.inc#15 integrate .. //depot/projects/tty/UPDATING#40 integrate .. //depot/projects/tty/bin/chflags/chflags.1#12 integrate .. //depot/projects/tty/bin/chflags/chflags.c#6 integrate .. //depot/projects/tty/bin/cp/cp.1#10 integrate .. //depot/projects/tty/bin/cp/cp.c#11 integrate .. //depot/projects/tty/bin/cp/utils.c#9 integrate .. //depot/projects/tty/bin/ps/ps.1#10 integrate .. //depot/projects/tty/bin/realpath/realpath.1#4 integrate .. //depot/projects/tty/bin/realpath/realpath.c#3 integrate .. //depot/projects/tty/bin/sh/cd.c#5 integrate .. //depot/projects/tty/bin/uuidgen/Makefile#1 branch .. //depot/projects/tty/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/tty/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/tty/contrib/bsnmp/snmpd/main.c#11 integrate .. //depot/projects/tty/contrib/tcpdump/print-802_11.c#9 integrate .. //depot/projects/tty/contrib/tcsh/sh.lex.c#6 integrate .. //depot/projects/tty/etc/Makefile#22 integrate .. //depot/projects/tty/etc/ddb.conf#1 branch .. //depot/projects/tty/etc/defaults/rc.conf#29 integrate .. //depot/projects/tty/etc/rc.d/Makefile#21 integrate .. //depot/projects/tty/etc/rc.d/ddb#1 branch .. //depot/projects/tty/etc/rc.d/mountcritlocal#8 integrate .. //depot/projects/tty/etc/rc.d/mountlate#3 integrate .. //depot/projects/tty/etc/rc.d/root#8 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes#33 integrate .. //depot/projects/tty/gnu/lib/libgcc/Makefile#9 integrate .. //depot/projects/tty/gnu/usr.bin/binutils/ar/Makefile#6 integrate .. //depot/projects/tty/gnu/usr.bin/binutils/ranlib/Makefile#7 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/kgdb.h#8 integrate .. //depot/projects/tty/gnu/usr.bin/groff/tmac/mdoc.local#16 integrate .. //depot/projects/tty/include/pthread_np.h#5 integrate .. //depot/projects/tty/include/unistd.h#11 integrate .. //depot/projects/tty/lib/Makefile#28 integrate .. //depot/projects/tty/lib/libalias/libalias/Makefile#3 integrate .. //depot/projects/tty/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/tty/lib/libarchive/archive_entry.3#8 integrate .. //depot/projects/tty/lib/libarchive/archive_entry.c#14 integrate .. //depot/projects/tty/lib/libarchive/archive_read.3#13 integrate .. //depot/projects/tty/lib/libarchive/archive_read.c#12 integrate .. //depot/projects/tty/lib/libarchive/archive_read_private.h#4 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_ar.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_zip.c#9 integrate .. //depot/projects/tty/lib/libarchive/archive_util.3#7 integrate .. //depot/projects/tty/lib/libarchive/archive_write.3#9 integrate .. //depot/projects/tty/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/tty/lib/libarchive/archive_write_disk.c#7 integrate .. //depot/projects/tty/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/tty/lib/libarchive/test/main.c#5 integrate .. //depot/projects/tty/lib/libarchive/test/test.h#5 integrate .. //depot/projects/tty/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_entry.c#3 integrate .. //depot/projects/tty/lib/libarchive/test/test_read_format_ar.c#4 integrate .. //depot/projects/tty/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/tty/lib/libarchive/test/test_write_format_ar.c#4 integrate .. //depot/projects/tty/lib/libc/gen/Makefile.inc#20 integrate .. //depot/projects/tty/lib/libc/gen/sem_timedwait.3#1 branch .. //depot/projects/tty/lib/libc/gen/sem_wait.3#4 integrate .. //depot/projects/tty/lib/libc/gen/sysconf.c#3 integrate .. //depot/projects/tty/lib/libc/posix1e/mac.c#6 integrate .. //depot/projects/tty/lib/libc/posix1e/mac_exec.c#3 integrate .. //depot/projects/tty/lib/libc/posix1e/mac_get.c#5 integrate .. //depot/projects/tty/lib/libc/posix1e/mac_set.c#3 integrate .. //depot/projects/tty/lib/libc/powerpc/gen/flt_rounds.c#2 integrate .. //depot/projects/tty/lib/libc/powerpc/gen/fpgetmask.c#2 integrate .. //depot/projects/tty/lib/libc/powerpc/gen/fpgetround.c#2 integrate .. //depot/projects/tty/lib/libc/powerpc/gen/fpgetsticky.c#2 integrate .. //depot/projects/tty/lib/libc/powerpc/gen/fpsetmask.c#2 integrate .. //depot/projects/tty/lib/libc/powerpc/gen/fpsetround.c#2 integrate .. //depot/projects/tty/lib/libc/stdio/fdopen.c#3 integrate .. //depot/projects/tty/lib/libc/stdio/fopen.c#3 integrate .. //depot/projects/tty/lib/libc/stdio/freopen.c#5 integrate .. //depot/projects/tty/lib/libc/stdlib/getenv.c#6 integrate .. //depot/projects/tty/lib/libc/stdlib/malloc.c#22 integrate .. //depot/projects/tty/lib/libc/sys/Makefile.inc#16 integrate .. //depot/projects/tty/lib/libc/sys/Symbol.map#6 integrate .. //depot/projects/tty/lib/libc/sys/clock_gettime.2#9 integrate .. //depot/projects/tty/lib/libc/sys/fcntl.2#6 integrate .. //depot/projects/tty/lib/libc/sys/kldunload.2#3 integrate .. //depot/projects/tty/lib/libc/sys/mq_close.2#5 integrate .. //depot/projects/tty/lib/libc/sys/mq_getattr.2#5 integrate .. //depot/projects/tty/lib/libc/sys/mq_notify.2#5 integrate .. //depot/projects/tty/lib/libc/sys/mq_open.2#5 integrate .. //depot/projects/tty/lib/libc/sys/mq_receive.2#5 integrate .. //depot/projects/tty/lib/libc/sys/mq_send.2#5 integrate .. //depot/projects/tty/lib/libc/sys/mq_setattr.2#5 integrate .. //depot/projects/tty/lib/libc/sys/readlink.2#4 integrate .. //depot/projects/tty/lib/libelf/elf_update.c#3 integrate .. //depot/projects/tty/lib/libelf/gelf_rel.c#2 integrate .. //depot/projects/tty/lib/libelf/gelf_rela.c#2 integrate .. //depot/projects/tty/lib/libkvm/kvm_proc.c#17 integrate .. //depot/projects/tty/lib/libpmc/libpmc.c#9 integrate .. //depot/projects/tty/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/tty/lib/libsdp/sdp.h#6 integrate .. //depot/projects/tty/lib/libthr/pthread.map#11 integrate .. //depot/projects/tty/lib/libthr/thread/Makefile.inc#8 integrate .. //depot/projects/tty/lib/libthr/thread/thr_affinity.c#1 branch .. //depot/projects/tty/lib/libthr/thread/thr_attr.c#8 integrate .. //depot/projects/tty/lib/libthr/thread/thr_create.c#14 integrate .. //depot/projects/tty/lib/libthr/thread/thr_exit.c#12 integrate .. //depot/projects/tty/lib/libthr/thread/thr_init.c#16 integrate .. //depot/projects/tty/lib/libthr/thread/thr_private.h#19 integrate .. //depot/projects/tty/lib/libthr/thread/thr_sem.c#10 integrate .. //depot/projects/tty/lib/libthr/thread/thr_sig.c#11 integrate .. //depot/projects/tty/lib/libthread_db/Makefile#6 integrate .. //depot/projects/tty/lib/libutil/humanize_number.c#3 integrate .. //depot/projects/tty/lib/msun/Makefile#14 integrate .. //depot/projects/tty/lib/msun/Symbol.map#5 integrate .. //depot/projects/tty/lib/msun/amd64/Makefile.inc#4 integrate .. //depot/projects/tty/lib/msun/amd64/e_sqrtl.S#1 branch .. //depot/projects/tty/lib/msun/bsdsrc/b_exp.c#4 integrate .. //depot/projects/tty/lib/msun/bsdsrc/b_log.c#4 integrate .. //depot/projects/tty/lib/msun/bsdsrc/b_tgamma.c#5 integrate .. //depot/projects/tty/lib/msun/i387/Makefile.inc#5 integrate .. //depot/projects/tty/lib/msun/i387/e_sqrtl.S#1 branch .. //depot/projects/tty/lib/msun/ld128/s_nanl.c#2 integrate .. //depot/projects/tty/lib/msun/man/sqrt.3#5 integrate .. //depot/projects/tty/lib/msun/powerpc/fenv.h#4 integrate .. //depot/projects/tty/lib/msun/src/e_acos.c#4 integrate .. //depot/projects/tty/lib/msun/src/e_acosf.c#2 integrate .. //depot/projects/tty/lib/msun/src/e_acosh.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_acoshf.c#2 integrate .. //depot/projects/tty/lib/msun/src/e_asin.c#4 integrate .. //depot/projects/tty/lib/msun/src/e_asinf.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_atan2.c#4 integrate .. //depot/projects/tty/lib/msun/src/e_atan2f.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_atanh.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_atanhf.c#2 integrate .. //depot/projects/tty/lib/msun/src/e_cosh.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_coshf.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_exp.c#5 integrate .. //depot/projects/tty/lib/msun/src/e_expf.c#5 integrate .. //depot/projects/tty/lib/msun/src/e_fmod.c#4 integrate .. //depot/projects/tty/lib/msun/src/e_fmodf.c#2 integrate .. //depot/projects/tty/lib/msun/src/e_gamma.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_gamma_r.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_gammaf.c#2 integrate .. //depot/projects/tty/lib/msun/src/e_gammaf_r.c#2 integrate .. //depot/projects/tty/lib/msun/src/e_j0.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_j0f.c#2 integrate .. //depot/projects/tty/lib/msun/src/e_j1.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_j1f.c#2 integrate .. //depot/projects/tty/lib/msun/src/e_jn.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_jnf.c#2 integrate .. //depot/projects/tty/lib/msun/src/e_lgamma.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_lgamma_r.c#4 integrate .. //depot/projects/tty/lib/msun/src/e_lgammaf.c#2 integrate .. //depot/projects/tty/lib/msun/src/e_lgammaf_r.c#4 integrate .. //depot/projects/tty/lib/msun/src/e_log.c#6 integrate .. //depot/projects/tty/lib/msun/src/e_log10.c#4 integrate .. //depot/projects/tty/lib/msun/src/e_log10f.c#2 integrate .. //depot/projects/tty/lib/msun/src/e_logf.c#4 integrate .. //depot/projects/tty/lib/msun/src/e_rem_pio2.c#4 integrate .. //depot/projects/tty/lib/msun/src/e_rem_pio2f.c#5 integrate .. //depot/projects/tty/lib/msun/src/e_scalb.c#6 integrate .. //depot/projects/tty/lib/msun/src/e_scalbf.c#6 integrate .. //depot/projects/tty/lib/msun/src/e_sinh.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_sinhf.c#3 integrate .. //depot/projects/tty/lib/msun/src/e_sqrt.c#4 integrate .. //depot/projects/tty/lib/msun/src/e_sqrtl.c#1 branch .. //depot/projects/tty/lib/msun/src/k_cosf.c#4 integrate .. //depot/projects/tty/lib/msun/src/k_rem_pio2.c#4 integrate .. //depot/projects/tty/lib/msun/src/k_sinf.c#4 integrate .. //depot/projects/tty/lib/msun/src/k_tan.c#5 integrate .. //depot/projects/tty/lib/msun/src/k_tanf.c#5 integrate .. //depot/projects/tty/lib/msun/src/math.h#14 integrate .. //depot/projects/tty/lib/msun/src/math_private.h#8 integrate .. //depot/projects/tty/lib/msun/src/s_asinh.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_asinhf.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_atan.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_atanf.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_cbrt.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_cbrtf.c#4 integrate .. //depot/projects/tty/lib/msun/src/s_ceilf.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_copysign.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_copysignf.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_cosf.c#4 integrate .. //depot/projects/tty/lib/msun/src/s_erf.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_erff.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_exp2.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_exp2f.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_fabsf.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_finite.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_finitef.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_floorf.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_frexp.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_frexpf.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_ilogb.c#4 integrate .. //depot/projects/tty/lib/msun/src/s_ilogbf.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_ilogbl.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_logbf.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_modff.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_nextafter.c#4 integrate .. //depot/projects/tty/lib/msun/src/s_nextafterf.c#4 integrate .. //depot/projects/tty/lib/msun/src/s_nextafterl.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_nexttoward.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_nexttowardf.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_rint.c#6 integrate .. //depot/projects/tty/lib/msun/src/s_rintf.c#5 integrate .. //depot/projects/tty/lib/msun/src/s_rintl.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_significand.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_significandf.c#2 integrate .. //depot/projects/tty/lib/msun/src/s_sinf.c#4 integrate .. //depot/projects/tty/lib/msun/src/s_tanf.c#4 integrate .. //depot/projects/tty/lib/msun/src/s_tanh.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_tanhf.c#3 integrate .. //depot/projects/tty/lib/msun/src/s_trunc.c#3 integrate .. //depot/projects/tty/lib/msun/src/w_cabs.c#3 integrate .. //depot/projects/tty/release/doc/share/misc/dev.archlist.txt#20 integrate .. //depot/projects/tty/rescue/rescue/Makefile#17 integrate .. //depot/projects/tty/sbin/ddb/ddb.8#2 integrate .. //depot/projects/tty/sbin/ddb/ddb.c#2 integrate .. //depot/projects/tty/sbin/fsck_ffs/main.c#11 integrate .. //depot/projects/tty/sbin/fsck_ffs/pass1.c#6 integrate .. //depot/projects/tty/sbin/fsck_ffs/pass2.c#6 integrate .. //depot/projects/tty/sbin/fsck_ffs/setup.c#9 integrate .. //depot/projects/tty/sbin/geom/Makefile#3 integrate .. //depot/projects/tty/sbin/geom/class/label/geom_label.c#8 integrate .. //depot/projects/tty/sbin/geom/class/multipath/gmultipath.8#3 integrate .. //depot/projects/tty/sbin/geom/core/geom.8#8 integrate .. //depot/projects/tty/sbin/geom/core/geom.c#14 integrate .. //depot/projects/tty/sbin/ifconfig/ifconfig.8#26 integrate .. //depot/projects/tty/sbin/ipfw/ipfw.8#32 integrate .. //depot/projects/tty/sbin/ipfw/ipfw2.c#29 integrate .. //depot/projects/tty/sbin/mount/mount.8#18 integrate .. //depot/projects/tty/sbin/newfs/mkfs.c#18 integrate .. //depot/projects/tty/sbin/ping6/ping6.c#10 integrate .. //depot/projects/tty/secure/usr.bin/ssh/Makefile#11 integrate .. //depot/projects/tty/secure/usr.sbin/sshd/Makefile#13 integrate .. //depot/projects/tty/share/man/man3/Makefile#12 integrate .. //depot/projects/tty/share/man/man4/Makefile#36 integrate .. //depot/projects/tty/share/man/man4/cmx.4#1 branch .. //depot/projects/tty/share/man/man4/ddb.4#14 integrate .. //depot/projects/tty/share/man/man4/fwohci.4#13 integrate .. //depot/projects/tty/share/man/man4/ip6.4#7 integrate .. //depot/projects/tty/share/man/man4/ng_nat.4#4 integrate .. //depot/projects/tty/share/man/man4/uart.4#6 integrate .. //depot/projects/tty/share/man/man4/uchcom.4#1 branch .. //depot/projects/tty/share/man/man4/ucom.4#6 integrate .. //depot/projects/tty/share/man/man4/ucycom.4#4 integrate .. //depot/projects/tty/share/man/man4/uscanner.4#12 integrate .. //depot/projects/tty/share/man/man4/uslcom.4#1 branch .. //depot/projects/tty/share/man/man4/vr.4#10 integrate .. //depot/projects/tty/share/man/man5/rc.conf.5#35 integrate .. //depot/projects/tty/share/man/man9/DEVICE_PROBE.9#7 integrate .. //depot/projects/tty/share/man/man9/Makefile#26 integrate .. //depot/projects/tty/share/man/man9/VOP_LOCK.9#7 integrate .. //depot/projects/tty/share/man/man9/bus_space.9#5 integrate .. //depot/projects/tty/share/man/man9/insmntque.9#1 branch .. //depot/projects/tty/share/man/man9/lock.9#9 integrate .. //depot/projects/tty/share/man/man9/vfs_mountedfrom.9#1 branch .. //depot/projects/tty/share/man/man9/vgone.9#4 integrate .. //depot/projects/tty/share/man/man9/vhold.9#4 integrate .. //depot/projects/tty/share/man/man9/vput.9#4 integrate .. //depot/projects/tty/share/man/man9/vref.9#6 integrate .. //depot/projects/tty/share/man/man9/vrefcnt.9#1 branch .. //depot/projects/tty/share/man/man9/vrele.9#4 integrate .. //depot/projects/tty/share/misc/bsd-family-tree#27 integrate .. //depot/projects/tty/share/misc/committers-doc.dot#4 integrate .. //depot/projects/tty/share/misc/committers-ports.dot#6 integrate .. //depot/projects/tty/share/mk/bsd.cpu.mk#14 integrate .. //depot/projects/tty/share/mk/sys.mk#15 integrate .. //depot/projects/tty/share/zoneinfo/leapseconds#10 integrate .. //depot/projects/tty/share/zoneinfo/southamerica#12 integrate .. //depot/projects/tty/sys/amd64/amd64/amd64_mem.c#6 integrate .. //depot/projects/tty/sys/amd64/amd64/identcpu.c#19 integrate .. //depot/projects/tty/sys/amd64/amd64/legacy.c#9 integrate .. //depot/projects/tty/sys/amd64/amd64/machdep.c#27 integrate .. //depot/projects/tty/sys/amd64/amd64/mem.c#7 integrate .. //depot/projects/tty/sys/amd64/amd64/mp_machdep.c#22 integrate .. //depot/projects/tty/sys/amd64/amd64/pmap.c#27 integrate .. //depot/projects/tty/sys/amd64/amd64/trap.c#24 integrate .. //depot/projects/tty/sys/amd64/amd64/vm_machdep.c#16 integrate .. //depot/projects/tty/sys/amd64/conf/DEFAULTS#8 integrate .. //depot/projects/tty/sys/amd64/conf/GENERIC#29 integrate .. //depot/projects/tty/sys/amd64/include/pmap.h#17 integrate .. //depot/projects/tty/sys/amd64/include/smp.h#13 integrate .. //depot/projects/tty/sys/amd64/include/specialreg.h#16 integrate .. //depot/projects/tty/sys/amd64/linux32/linux32_sysvec.c#14 integrate .. //depot/projects/tty/sys/arm/arm/busdma_machdep.c#16 integrate .. //depot/projects/tty/sys/arm/arm/nexus.c#8 integrate .. //depot/projects/tty/sys/arm/arm/pmap.c#25 integrate .. //depot/projects/tty/sys/arm/arm/trap.c#15 integrate .. //depot/projects/tty/sys/arm/arm/uio_machdep.c#3 integrate .. //depot/projects/tty/sys/arm/conf/AVILA#4 integrate .. //depot/projects/tty/sys/arm/include/_bus.h#2 integrate .. //depot/projects/tty/sys/arm/include/pmap.h#17 integrate .. //depot/projects/tty/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/tty/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/tty/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/tty/sys/boot/common/bootstrap.h#6 integrate .. //depot/projects/tty/sys/boot/common/dev_net.c#5 integrate .. //depot/projects/tty/sys/boot/common/load_elf.c#10 integrate .. //depot/projects/tty/sys/boot/i386/boot2/boot2.c#14 integrate .. //depot/projects/tty/sys/boot/i386/btx/btx/Makefile#4 integrate .. //depot/projects/tty/sys/boot/i386/btx/btx/btx.S#5 integrate .. //depot/projects/tty/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/tty/sys/boot/i386/libi386/biosdisk.c#11 integrate .. //depot/projects/tty/sys/boot/i386/pxeldr/pxeldr.S#4 integrate .. //depot/projects/tty/sys/boot/pc98/btx/btx/Makefile#5 integrate .. //depot/projects/tty/sys/boot/pc98/btx/btx/btx.S#5 integrate .. //depot/projects/tty/sys/boot/pc98/libpc98/Makefile#9 integrate .. //depot/projects/tty/sys/boot/pc98/libpc98/biosdisk.c#9 integrate .. //depot/projects/tty/sys/boot/powerpc/Makefile#3 integrate .. //depot/projects/tty/sys/boot/powerpc/ofw/Makefile#2 integrate .. //depot/projects/tty/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/tty/sys/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/tty/sys/boot/powerpc/uboot/metadata.c#2 integrate .. //depot/projects/tty/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/tty/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/tty/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/tty/sys/boot/uboot/lib/api_public.h#2 integrate .. //depot/projects/tty/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/tty/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/tty/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/tty/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/tty/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/tty/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/tty/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/tty/sys/cam/cam_xpt.c#25 integrate .. //depot/projects/tty/sys/compat/freebsd32/freebsd32_proto.h#18 integrate .. //depot/projects/tty/sys/compat/freebsd32/freebsd32_syscall.h#18 integrate .. //depot/projects/tty/sys/compat/freebsd32/freebsd32_syscalls.c#18 integrate .. //depot/projects/tty/sys/compat/freebsd32/freebsd32_sysent.c#18 integrate .. //depot/projects/tty/sys/compat/freebsd32/syscalls.master#18 integrate .. //depot/projects/tty/sys/compat/linux/linux_futex.c#4 integrate .. //depot/projects/tty/sys/compat/linux/linux_misc.c#28 integrate .. //depot/projects/tty/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_sysvec.c#12 integrate .. //depot/projects/tty/sys/conf/NOTES#44 integrate .. //depot/projects/tty/sys/conf/files#55 integrate .. //depot/projects/tty/sys/conf/files.powerpc#20 integrate .. //depot/projects/tty/sys/conf/kmod.mk#24 integrate .. //depot/projects/tty/sys/conf/ldscript.powerpc#2 integrate .. //depot/projects/tty/sys/conf/options#42 integrate .. //depot/projects/tty/sys/conf/options.powerpc#8 integrate .. //depot/projects/tty/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/tty/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/tty/sys/ddb/db_command.c#15 integrate .. //depot/projects/tty/sys/ddb/db_examine.c#6 integrate .. //depot/projects/tty/sys/ddb/db_input.c#7 integrate .. //depot/projects/tty/sys/dev/acpica/acpi.c#27 integrate .. //depot/projects/tty/sys/dev/acpica/acpi_cpu.c#13 integrate .. //depot/projects/tty/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/tty/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/tty/sys/dev/ata/ata-chipset.c#36 integrate .. //depot/projects/tty/sys/dev/ata/ata-pci.h#27 integrate .. //depot/projects/tty/sys/dev/atkbdc/psm.c#6 integrate .. //depot/projects/tty/sys/dev/bge/if_bge.c#37 integrate .. //depot/projects/tty/sys/dev/bge/if_bgereg.h#26 integrate .. //depot/projects/tty/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/tty/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/tty/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/tty/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/tty/sys/dev/cpufreq/ichss.c#3 integrate .. //depot/projects/tty/sys/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_ctl_defs.h#4 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_firmware_exports.h#3 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_mc5.c#5 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_regs.h#3 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_t3_cpl.h#6 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_t3_hw.c#6 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_tcb.h#3 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_version.h#4 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_vsc8211.c#4 integrate .. //depot/projects/tty/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_ioctl.h#4 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_l2t.c#5 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_l2t.h#4 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_offload.c#5 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_osdep.h#6 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/tty/sys/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/tty/sys/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/tty/sys/dev/cxgb/sys/cxgb_support.c#2 integrate .. //depot/projects/tty/sys/dev/cxgb/sys/mbufq.h#4 integrate .. //depot/projects/tty/sys/dev/cxgb/sys/mvec.h#5 integrate .. //depot/projects/tty/sys/dev/cxgb/sys/uipc_mvec.c#6 integrate .. //depot/projects/tty/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/tty/sys/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/tty/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/tty/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/tty/sys/dev/cxgb/t3cdev.h#2 integrate .. //depot/projects/tty/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete .. //depot/projects/tty/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/tty/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/tty/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate .. //depot/projects/tty/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch .. //depot/projects/tty/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/tty/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate .. //depot/projects/tty/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/tty/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#2 delete .. //depot/projects/tty/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#2 delete .. //depot/projects/tty/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/tty/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate .. //depot/projects/tty/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/tty/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate .. //depot/projects/tty/sys/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch .. //depot/projects/tty/sys/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch .. //depot/projects/tty/sys/dev/drm/drm_pciids.h#8 integrate .. //depot/projects/tty/sys/dev/em/LICENSE#6 integrate .. //depot/projects/tty/sys/dev/em/e1000_80003es2lan.c#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_80003es2lan.h#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_82540.c#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_82541.c#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_82541.h#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_82542.c#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_82543.c#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_82543.h#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_82571.c#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_82571.h#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_82575.c#3 delete .. //depot/projects/tty/sys/dev/em/e1000_82575.h#3 delete .. //depot/projects/tty/sys/dev/em/e1000_api.c#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_api.h#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_defines.h#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_hw.h#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_ich8lan.c#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_ich8lan.h#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_mac.c#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_mac.h#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_manage.c#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_manage.h#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_nvm.c#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_nvm.h#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_osdep.h#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_phy.c#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_phy.h#3 integrate .. //depot/projects/tty/sys/dev/em/e1000_regs.h#3 integrate .. //depot/projects/tty/sys/dev/em/if_em.c#27 integrate .. //depot/projects/tty/sys/dev/em/if_em.h#19 integrate .. //depot/projects/tty/sys/dev/gem/if_gem.c#20 integrate .. //depot/projects/tty/sys/dev/hptrr/hptrr_os_bsd.c#2 integrate .. //depot/projects/tty/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/tty/sys/dev/hptrr/ldm.h#2 integrate .. //depot/projects/tty/sys/dev/hptrr/osm.h#2 integrate .. //depot/projects/tty/sys/dev/ic/quicc.h#1 branch .. //depot/projects/tty/sys/dev/igb/e1000_82575.c#1 branch .. //depot/projects/tty/sys/dev/igb/e1000_82575.h#1 branch .. //depot/projects/tty/sys/dev/igb/e1000_api.c#1 branch .. //depot/projects/tty/sys/dev/igb/e1000_api.h#1 branch .. //depot/projects/tty/sys/dev/igb/e1000_defines.h#1 branch .. //depot/projects/tty/sys/dev/igb/e1000_hw.h#1 branch .. //depot/projects/tty/sys/dev/igb/e1000_mac.c#1 branch .. //depot/projects/tty/sys/dev/igb/e1000_mac.h#1 branch .. //depot/projects/tty/sys/dev/igb/e1000_manage.c#1 branch .. //depot/projects/tty/sys/dev/igb/e1000_manage.h#1 branch .. //depot/projects/tty/sys/dev/igb/e1000_nvm.c#1 branch .. //depot/projects/tty/sys/dev/igb/e1000_nvm.h#1 branch .. //depot/projects/tty/sys/dev/igb/e1000_osdep.h#1 branch .. //depot/projects/tty/sys/dev/igb/e1000_phy.c#1 branch .. //depot/projects/tty/sys/dev/igb/e1000_phy.h#1 branch .. //depot/projects/tty/sys/dev/igb/e1000_regs.h#1 branch .. //depot/projects/tty/sys/dev/igb/if_igb.c#1 branch .. //depot/projects/tty/sys/dev/igb/if_igb.h#1 branch .. //depot/projects/tty/sys/dev/lge/if_lge.c#22 integrate .. //depot/projects/tty/sys/dev/md/md.c#24 integrate .. //depot/projects/tty/sys/dev/mii/brgphy.c#20 integrate .. //depot/projects/tty/sys/dev/mii/ciphy.c#8 integrate .. //depot/projects/tty/sys/dev/mii/miidevs#14 integrate .. //depot/projects/tty/sys/dev/mii/rgephy.c#10 integrate .. //depot/projects/tty/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/tty/sys/dev/msk/if_mskreg.h#5 integrate .. //depot/projects/tty/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/tty/sys/dev/nfe/if_nfe.c#7 integrate .. //depot/projects/tty/sys/dev/nfe/if_nfereg.h#5 integrate .. //depot/projects/tty/sys/dev/nfe/if_nfevar.h#4 integrate .. //depot/projects/tty/sys/dev/pccard/pccarddevs#19 integrate .. //depot/projects/tty/sys/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/tty/sys/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/tty/sys/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/tty/sys/dev/quicc/quicc_core.c#1 branch .. //depot/projects/tty/sys/dev/re/if_re.c#25 integrate .. //depot/projects/tty/sys/dev/scc/scc_bfe.h#3 integrate .. //depot/projects/tty/sys/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/tty/sys/dev/scc/scc_bus.h#2 integrate .. //depot/projects/tty/sys/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/tty/sys/dev/tsec/if_tsec.c#1 branch .. //depot/projects/tty/sys/dev/tsec/if_tsec.h#1 branch .. //depot/projects/tty/sys/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/tty/sys/dev/uart/uart.h#6 integrate .. //depot/projects/tty/sys/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/tty/sys/dev/uart/uart_bus_scc.c#2 integrate .. //depot/projects/tty/sys/dev/uart/uart_cpu_powerpc.c#5 integrate .. //depot/projects/tty/sys/dev/uart/uart_dev_ns8250.c#8 integrate .. //depot/projects/tty/sys/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/tty/sys/dev/usb/ehci.c#17 integrate .. //depot/projects/tty/sys/dev/usb/ehci_pci.c#17 integrate .. //depot/projects/tty/sys/dev/usb/if_axe.c#20 integrate .. //depot/projects/tty/sys/dev/usb/ubsa.c#13 integrate .. //depot/projects/tty/sys/dev/usb/ucom.c#14 integrate .. //depot/projects/tty/sys/dev/usb/ums.c#16 integrate .. //depot/projects/tty/sys/dev/usb/usbdevs#31 integrate .. //depot/projects/tty/sys/dev/usb/uscanner.c#15 integrate .. //depot/projects/tty/sys/dev/usb/uslcom.c#1 branch .. //depot/projects/tty/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/tty/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/tty/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/tty/sys/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/tty/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/tty/sys/fs/coda/TODO#3 integrate .. //depot/projects/tty/sys/fs/devfs/devfs_vnops.c#26 integrate .. //depot/projects/tty/sys/fs/fdescfs/fdesc_vnops.c#14 integrate .. //depot/projects/tty/sys/fs/fifofs/fifo_vnops.c#19 integrate .. //depot/projects/tty/sys/fs/nullfs/null_vfsops.c#19 integrate .. //depot/projects/tty/sys/fs/nullfs/null_vnops.c#15 integrate .. //depot/projects/tty/sys/fs/nwfs/nwfs_node.c#10 integrate .. //depot/projects/tty/sys/fs/nwfs/nwfs_subr.c#8 integrate .. //depot/projects/tty/sys/fs/procfs/procfs_ctl.c#9 integrate .. //depot/projects/tty/sys/fs/procfs/procfs_dbregs.c#8 integrate .. //depot/projects/tty/sys/fs/procfs/procfs_status.c#12 integrate .. //depot/projects/tty/sys/fs/pseudofs/pseudofs_vncache.c#14 integrate .. //depot/projects/tty/sys/fs/smbfs/smbfs.h#5 integrate .. //depot/projects/tty/sys/fs/smbfs/smbfs_io.c#17 integrate .. //depot/projects/tty/sys/fs/smbfs/smbfs_node.c#15 integrate .. //depot/projects/tty/sys/fs/smbfs/smbfs_vfsops.c#18 integrate .. //depot/projects/tty/sys/fs/tmpfs/tmpfs_subr.c#4 integrate .. //depot/projects/tty/sys/fs/tmpfs/tmpfs_vnops.c#4 integrate .. //depot/projects/tty/sys/fs/unionfs/union_vfsops.c#16 integrate .. //depot/projects/tty/sys/fs/unionfs/union_vnops.c#17 integrate .. //depot/projects/tty/sys/gdb/gdb_main.c#6 integrate .. //depot/projects/tty/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/tty/sys/geom/part/g_part_vtoc8.c#1 branch .. //depot/projects/tty/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#4 integrate .. //depot/projects/tty/sys/i386/conf/DEFAULTS#8 integrate .. //depot/projects/tty/sys/i386/conf/GENERIC#34 integrate .. //depot/projects/tty/sys/i386/cpufreq/est.c#5 integrate .. //depot/projects/tty/sys/i386/i386/i686_mem.c#6 integrate .. //depot/projects/tty/sys/i386/i386/identcpu.c#23 integrate .. //depot/projects/tty/sys/i386/i386/initcpu.c#11 integrate .. //depot/projects/tty/sys/i386/i386/k6_mem.c#3 integrate .. //depot/projects/tty/sys/i386/i386/legacy.c#9 integrate .. //depot/projects/tty/sys/i386/i386/mp_machdep.c#31 integrate .. //depot/projects/tty/sys/i386/i386/sys_machdep.c#18 integrate .. //depot/projects/tty/sys/i386/i386/trap.c#27 integrate .. //depot/projects/tty/sys/i386/i386/vm_machdep.c#24 integrate .. //depot/projects/tty/sys/i386/ibcs2/imgact_coff.c#13 integrate .. //depot/projects/tty/sys/i386/include/_types.h#8 integrate .. //depot/projects/tty/sys/i386/include/float.h#6 integrate .. //depot/projects/tty/sys/i386/include/smp.h#16 integrate .. //depot/projects/tty/sys/i386/include/specialreg.h#13 integrate .. //depot/projects/tty/sys/i386/linux/linux_sysvec.c#20 integrate .. //depot/projects/tty/sys/ia64/conf/DEFAULTS#8 integrate .. //depot/projects/tty/sys/ia64/ia64/machdep.c#26 integrate .. //depot/projects/tty/sys/ia64/ia64/mp_machdep.c#14 integrate .. //depot/projects/tty/sys/ia64/ia64/trap.c#24 integrate .. //depot/projects/tty/sys/ia64/include/ucontext.h#6 integrate .. //depot/projects/tty/sys/kern/imgact_elf.c#20 integrate .. //depot/projects/tty/sys/kern/init_main.c#26 integrate .. //depot/projects/tty/sys/kern/init_sysent.c#24 integrate .. //depot/projects/tty/sys/kern/kern_clock.c#23 integrate .. //depot/projects/tty/sys/kern/kern_condvar.c#17 integrate .. //depot/projects/tty/sys/kern/kern_cpuset.c#1 branch .. //depot/projects/tty/sys/kern/kern_descrip.c#28 integrate .. //depot/projects/tty/sys/kern/kern_exec.c#32 integrate .. //depot/projects/tty/sys/kern/kern_fork.c#23 integrate .. //depot/projects/tty/sys/kern/kern_intr.c#25 integrate .. //depot/projects/tty/sys/kern/kern_kse.c#12 delete .. //depot/projects/tty/sys/kern/kern_ktrace.c#24 integrate .. //depot/projects/tty/sys/kern/kern_lock.c#18 integrate .. //depot/projects/tty/sys/kern/kern_priv.c#3 integrate .. //depot/projects/tty/sys/kern/kern_proc.c#23 integrate .. //depot/projects/tty/sys/kern/kern_resource.c#23 integrate .. //depot/projects/tty/sys/kern/kern_shutdown.c#17 integrate .. //depot/projects/tty/sys/kern/kern_sig.c#29 integrate .. //depot/projects/tty/sys/kern/kern_switch.c#26 integrate .. //depot/projects/tty/sys/kern/kern_sx.c#13 integrate .. //depot/projects/tty/sys/kern/kern_synch.c#26 integrate .. //depot/projects/tty/sys/kern/kern_thread.c#27 integrate .. //depot/projects/tty/sys/kern/kern_timeout.c#17 integrate .. //depot/projects/tty/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/tty/sys/kern/sched_4bsd.c#21 integrate .. //depot/projects/tty/sys/kern/sched_ule.c#25 integrate .. //depot/projects/tty/sys/kern/subr_bus.c#25 integrate .. //depot/projects/tty/sys/kern/subr_sleepqueue.c#14 integrate .. //depot/projects/tty/sys/kern/subr_smp.c#18 integrate .. //depot/projects/tty/sys/kern/subr_trap.c#21 integrate .. //depot/projects/tty/sys/kern/subr_witness.c#29 integrate .. //depot/projects/tty/sys/kern/sys_process.c#17 integrate .. //depot/projects/tty/sys/kern/syscalls.c#24 integrate .. //depot/projects/tty/sys/kern/syscalls.master#26 integrate .. //depot/projects/tty/sys/kern/systrace_args.c#5 integrate .. //depot/projects/tty/sys/kern/uipc_syscalls.c#29 integrate .. //depot/projects/tty/sys/kern/vfs_bio.c#31 integrate .. //depot/projects/tty/sys/kern/vfs_cache.c#18 integrate .. //depot/projects/tty/sys/kern/vfs_default.c#24 integrate .. //depot/projects/tty/sys/kern/vfs_lookup.c#17 integrate .. //depot/projects/tty/sys/kern/vfs_subr.c#37 integrate .. //depot/projects/tty/sys/kern/vfs_syscalls.c#33 integrate .. //depot/projects/tty/sys/kern/vnode_if.src#14 integrate .. //depot/projects/tty/sys/libkern/cmpdi2.c#1 branch .. //depot/projects/tty/sys/libkern/quad.h#4 integrate .. //depot/projects/tty/sys/modules/Makefile#38 integrate .. //depot/projects/tty/sys/modules/cmx/Makefile#1 branch .. //depot/projects/tty/sys/modules/cxgb/Makefile#7 integrate .. //depot/projects/tty/sys/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/projects/tty/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/tty/sys/modules/cxgb/tom/Makefile#2 integrate .. //depot/projects/tty/sys/modules/em/Makefile#5 integrate .. //depot/projects/tty/sys/modules/geom/Makefile#11 integrate .. //depot/projects/tty/sys/modules/geom/geom_apple/Makefile#2 delete .. //depot/projects/tty/sys/modules/geom/geom_gpt/Makefile#2 delete .. //depot/projects/tty/sys/modules/geom/geom_part/Makefile#1 branch .. //depot/projects/tty/sys/modules/igb/Makefile#1 branch .. //depot/projects/tty/sys/modules/ipfw_nat/Makefile#1 branch .. //depot/projects/tty/sys/modules/uslcom/Makefile#1 branch .. //depot/projects/tty/sys/modules/vr/Makefile#3 integrate .. //depot/projects/tty/sys/modules/zfs/Makefile#6 integrate .. //depot/projects/tty/sys/net/bpf_filter.c#8 integrate .. //depot/projects/tty/sys/net/if.c#32 integrate .. //depot/projects/tty/sys/net/if_ethersubr.c#27 integrate .. //depot/projects/tty/sys/net/if_gif.c#19 integrate .. //depot/projects/tty/sys/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/tty/sys/netgraph/netgraph.h#18 integrate .. //depot/projects/tty/sys/netgraph/ng_base.c#23 integrate .. //depot/projects/tty/sys/netgraph/ng_ksocket.c#15 integrate .. //depot/projects/tty/sys/netgraph/ng_l2tp.c#11 integrate .. //depot/projects/tty/sys/netgraph/ng_nat.c#7 integrate .. //depot/projects/tty/sys/netgraph/ng_nat.h#3 integrate .. //depot/projects/tty/sys/netgraph/ng_pppoe.c#13 integrate .. //depot/projects/tty/sys/netgraph/ng_socket.c#21 integrate .. //depot/projects/tty/sys/netinet/in.h#15 integrate .. //depot/projects/tty/sys/netinet/in_pcb.c#26 integrate .. //depot/projects/tty/sys/netinet/ip_dummynet.c#22 integrate .. //depot/projects/tty/sys/netinet/ip_fw.h#21 integrate .. //depot/projects/tty/sys/netinet/ip_fw2.c#37 integrate .. //depot/projects/tty/sys/netinet/ip_fw_nat.c#1 branch .. //depot/projects/tty/sys/netinet/ip_fw_pfil.c#8 integrate .. //depot/projects/tty/sys/netinet/libalias/alias.c#6 integrate .. //depot/projects/tty/sys/netinet/libalias/alias.h#5 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_db.c#7 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_ftp.c#6 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_irc.c#6 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_local.h#6 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_old.c#4 delete .. //depot/projects/tty/sys/netinet/libalias/alias_proxy.c#7 integrate .. //depot/projects/tty/sys/netinet/libalias/alias_smedia.c#6 integrate .. //depot/projects/tty/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/tty/sys/netinet/sctp_pcb.c#8 integrate .. //depot/projects/tty/sys/netinet/tcp_input.c#34 integrate .. //depot/projects/tty/sys/netinet/tcp_output.c#21 integrate .. //depot/projects/tty/sys/netinet/tcp_var.h#28 integrate .. //depot/projects/tty/sys/netipsec/key.c#13 integrate .. //depot/projects/tty/sys/netipsec/key_debug.c#6 integrate .. //depot/projects/tty/sys/netncp/ncp_conn.c#12 integrate .. //depot/projects/tty/sys/netncp/ncp_conn.h#4 integrate .. //depot/projects/tty/sys/netsmb/smb_conn.c#12 integrate .. //depot/projects/tty/sys/netsmb/smb_conn.h#5 integrate .. //depot/projects/tty/sys/netsmb/smb_iod.c#9 integrate .. //depot/projects/tty/sys/nfs4client/nfs4_idmap.c#5 integrate .. //depot/projects/tty/sys/nfs4client/nfs4_vfsops.c#12 integrate .. //depot/projects/tty/sys/nfsclient/nfs_node.c#15 integrate .. //depot/projects/tty/sys/nfsclient/nfs_subs.c#19 integrate .. //depot/projects/tty/sys/nfsclient/nfs_vfsops.c#26 integrate .. //depot/projects/tty/sys/nfsserver/nfs_serv.c#20 integrate .. //depot/projects/tty/sys/pc98/cbus/sio.c#10 integrate .. //depot/projects/tty/sys/pc98/conf/DEFAULTS#7 integrate .. //depot/projects/tty/sys/pc98/conf/GENERIC#27 integrate .. //depot/projects/tty/sys/pc98/pc98/machdep.c#18 integrate .. //depot/projects/tty/sys/pci/if_rl.c#22 integrate .. //depot/projects/tty/sys/pci/if_rlreg.h#22 integrate .. //depot/projects/tty/sys/pci/if_vr.c#21 delete .. //depot/projects/tty/sys/pci/if_vrreg.h#13 delete .. //depot/projects/tty/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/tty/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/tty/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/tty/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/tty/sys/powerpc/aim/trap_subr.S#2 integrate .. //depot/projects/tty/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/tty/sys/powerpc/booke/clock.c#1 branch .. //depot/projects/tty/sys/powerpc/booke/copyinout.c#1 branch .. //depot/projects/tty/sys/powerpc/booke/interrupt.c#1 branch .. //depot/projects/tty/sys/powerpc/booke/locore.S#1 branch .. //depot/projects/tty/sys/powerpc/booke/machdep.c#1 branch .. //depot/projects/tty/sys/powerpc/booke/pmap.c#1 branch .. //depot/projects/tty/sys/powerpc/booke/support.S#1 branch .. //depot/projects/tty/sys/powerpc/booke/swtch.S#1 branch .. //depot/projects/tty/sys/powerpc/booke/trap.c#1 branch .. //depot/projects/tty/sys/powerpc/booke/trap_subr.S#1 branch .. //depot/projects/tty/sys/powerpc/booke/uio_machdep.c#1 branch .. //depot/projects/tty/sys/powerpc/booke/vm_machdep.c#1 branch .. //depot/projects/tty/sys/powerpc/conf/DEFAULTS#5 integrate .. //depot/projects/tty/sys/powerpc/conf/MPC85XX#1 branch .. //depot/projects/tty/sys/powerpc/conf/NOTES#6 integrate .. //depot/projects/tty/sys/powerpc/fpu/fpu_add.c#1 branch .. //depot/projects/tty/sys/powerpc/fpu/fpu_arith.h#1 branch .. //depot/projects/tty/sys/powerpc/fpu/fpu_compare.c#1 branch .. //depot/projects/tty/sys/powerpc/fpu/fpu_div.c#1 branch .. //depot/projects/tty/sys/powerpc/fpu/fpu_emu.c#1 branch .. //depot/projects/tty/sys/powerpc/fpu/fpu_emu.h#1 branch .. //depot/projects/tty/sys/powerpc/fpu/fpu_explode.c#1 branch .. //depot/projects/tty/sys/powerpc/fpu/fpu_extern.h#1 branch .. //depot/projects/tty/sys/powerpc/fpu/fpu_implode.c#1 branch .. //depot/projects/tty/sys/powerpc/fpu/fpu_instr.h#1 branch .. //depot/projects/tty/sys/powerpc/fpu/fpu_mul.c#1 branch .. //depot/projects/tty/sys/powerpc/fpu/fpu_sqrt.c#1 branch .. //depot/projects/tty/sys/powerpc/fpu/fpu_subr.c#1 branch .. //depot/projects/tty/sys/powerpc/include/bootinfo.h#3 integrate .. //depot/projects/tty/sys/powerpc/include/float.h#6 integrate .. //depot/projects/tty/sys/powerpc/include/frame.h#5 integrate .. //depot/projects/tty/sys/powerpc/include/hid.h#4 integrate .. //depot/projects/tty/sys/powerpc/include/intr_machdep.h#10 integrate .. //depot/projects/tty/sys/powerpc/include/kdb.h#4 integrate .. //depot/projects/tty/sys/powerpc/include/md_var.h#7 integrate .. //depot/projects/tty/sys/powerpc/include/metadata.h#4 integrate .. //depot/projects/tty/sys/powerpc/include/mmuvar.h#2 integrate .. //depot/projects/tty/sys/powerpc/include/ocpbus.h#1 branch .. //depot/projects/tty/sys/powerpc/include/openpicvar.h#7 integrate .. //depot/projects/tty/sys/powerpc/include/pcb.h#4 integrate .. //depot/projects/tty/sys/powerpc/include/pcpu.h#6 integrate .. //depot/projects/tty/sys/powerpc/include/pmap.h#9 integrate .. //depot/projects/tty/sys/powerpc/include/psl.h#3 integrate .. //depot/projects/tty/sys/powerpc/include/pte.h#3 integrate .. //depot/projects/tty/sys/powerpc/include/sf_buf.h#3 integrate .. //depot/projects/tty/sys/powerpc/include/spr.h#6 integrate .. //depot/projects/tty/sys/powerpc/include/tlb.h#1 branch .. //depot/projects/tty/sys/powerpc/include/trap.h#4 integrate .. //depot/projects/tty/sys/powerpc/include/trap_aim.h#1 branch .. //depot/projects/tty/sys/powerpc/include/trap_booke.h#1 branch .. //depot/projects/tty/sys/powerpc/include/vmparam.h#9 integrate .. //depot/projects/tty/sys/powerpc/mpc85xx/nexus.c#1 branch .. //depot/projects/tty/sys/powerpc/mpc85xx/ocpbus.c#1 branch .. //depot/projects/tty/sys/powerpc/mpc85xx/ocpbus.h#1 branch .. //depot/projects/tty/sys/powerpc/mpc85xx/opic.c#1 branch .. //depot/projects/tty/sys/powerpc/mpc85xx/pci_ocp.c#1 branch .. //depot/projects/tty/sys/powerpc/powermac/openpic_macio.c#6 integrate .. //depot/projects/tty/sys/powerpc/powerpc/autoconf.c#6 integrate .. //depot/projects/tty/sys/powerpc/powerpc/cpu.c#7 integrate .. //depot/projects/tty/sys/powerpc/powerpc/db_trace.c#10 integrate .. //depot/projects/tty/sys/powerpc/powerpc/gdb_machdep.c#2 integrate .. //depot/projects/tty/sys/powerpc/powerpc/genassym.c#10 integrate .. //depot/projects/tty/sys/powerpc/powerpc/intr_machdep.c#13 integrate .. //depot/projects/tty/sys/powerpc/powerpc/mp_machdep.c#6 integrate .. //depot/projects/tty/sys/powerpc/powerpc/openpic.c#12 integrate .. //depot/projects/tty/sys/powerpc/powerpc/pic_if.m#6 integrate .. //depot/projects/tty/sys/powerpc/psim/openpic_iobus.c#6 integrate .. //depot/projects/tty/sys/security/audit/audit.c#10 integrate .. //depot/projects/tty/sys/security/audit/audit_arg.c#9 integrate .. //depot/projects/tty/sys/security/audit/audit_bsm.c#10 integrate .. //depot/projects/tty/sys/security/audit/audit_bsm_klib.c#8 integrate .. //depot/projects/tty/sys/security/audit/audit_private.h#6 integrate .. //depot/projects/tty/sys/security/audit/audit_syscalls.c#10 integrate .. //depot/projects/tty/sys/security/audit/audit_trigger.c#5 integrate .. //depot/projects/tty/sys/security/audit/audit_worker.c#9 integrate .. //depot/projects/tty/sys/sparc64/conf/DEFAULTS#6 integrate .. //depot/projects/tty/sys/sparc64/conf/GENERIC#29 integrate .. //depot/projects/tty/sys/sparc64/include/tlb.h#3 integrate .. //depot/projects/tty/sys/sparc64/sparc64/cache.c#7 integrate .. //depot/projects/tty/sys/sparc64/sparc64/cheetah.c#4 integrate .. //depot/projects/tty/sys/sparc64/sparc64/iommu.c#12 integrate .. //depot/projects/tty/sys/sparc64/sparc64/mp_machdep.c#13 integrate .. //depot/projects/tty/sys/sparc64/sparc64/pmap.c#26 integrate .. //depot/projects/tty/sys/sparc64/sparc64/spitfire.c#4 integrate .. //depot/projects/tty/sys/sparc64/sparc64/tlb.c#4 integrate .. //depot/projects/tty/sys/sparc64/sparc64/trap.c#20 integrate .. //depot/projects/tty/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/tty/sys/sys/_types.h#9 integrate .. //depot/projects/tty/sys/sys/buf.h#22 integrate .. //depot/projects/tty/sys/sys/bufobj.h#8 integrate .. //depot/projects/tty/sys/sys/bus.h#16 integrate .. //depot/projects/tty/sys/sys/condvar.h#6 integrate .. //depot/projects/tty/sys/sys/cpuset.h#1 branch .. //depot/projects/tty/sys/sys/disklabel.h#10 integrate .. //depot/projects/tty/sys/sys/fcntl.h#5 integrate .. //depot/projects/tty/sys/sys/kse.h#8 delete .. //depot/projects/tty/sys/sys/ktrace.h#9 integrate .. //depot/projects/tty/sys/sys/lockmgr.h#12 integrate .. //depot/projects/tty/sys/sys/mount.h#21 integrate .. //depot/projects/tty/sys/sys/param.h#34 integrate .. //depot/projects/tty/sys/sys/pcpu.h#11 integrate .. //depot/projects/tty/sys/sys/proc.h#31 integrate .. //depot/projects/tty/sys/sys/sched.h#15 integrate .. //depot/projects/tty/sys/sys/sleepqueue.h#6 integrate .. //depot/projects/tty/sys/sys/smp.h#10 integrate .. //depot/projects/tty/sys/sys/syscall.h#24 integrate .. //depot/projects/tty/sys/sys/syscall.mk#24 integrate .. //depot/projects/tty/sys/sys/sysproto.h#25 integrate .. //depot/projects/tty/sys/sys/systm.h#21 integrate .. //depot/projects/tty/sys/sys/types.h#13 integrate .. //depot/projects/tty/sys/sys/vnode.h#26 integrate .. //depot/projects/tty/sys/sys/vtoc.h#1 branch .. //depot/projects/tty/sys/ufs/ffs/ffs_rawread.c#15 integrate .. //depot/projects/tty/sys/ufs/ffs/ffs_softdep.c#24 integrate .. //depot/projects/tty/sys/ufs/ffs/ffs_vfsops.c#28 integrate .. //depot/projects/tty/sys/ufs/ffs/ffs_vnops.c#22 integrate .. //depot/projects/tty/sys/ufs/ufs/extattr.h#5 integrate .. //depot/projects/tty/sys/ufs/ufs/ufs_extattr.c#16 integrate .. //depot/projects/tty/sys/vm/vm_fault.c#25 integrate .. //depot/projects/tty/sys/vm/vm_glue.c#19 integrate .. //depot/projects/tty/sys/vm/vm_map.c#26 integrate .. //depot/projects/tty/sys/vm/vm_map.h#13 integrate .. //depot/projects/tty/sys/vm/vm_meter.c#17 integrate .. //depot/projects/tty/sys/vm/vm_object.c#27 integrate .. //depot/projects/tty/tools/build/mk/OptionalObsoleteFiles.inc#6 integrate .. //depot/projects/tty/tools/regression/bin/sh/builtins/cd1.0#1 branch .. //depot/projects/tty/tools/regression/environ/envctl.c#2 integrate .. //depot/projects/tty/tools/regression/file/dup/dup.c#2 integrate .. //depot/projects/tty/tools/regression/lib/msun/test-trig.c#2 integrate .. //depot/projects/tty/tools/tools/tinybsd/tinybsd#4 integrate .. //depot/projects/tty/usr.bin/Makefile#26 integrate .. //depot/projects/tty/usr.bin/ar/Makefile#4 integrate .. //depot/projects/tty/usr.bin/ar/ar.1#4 integrate .. //depot/projects/tty/usr.bin/ar/ar.c#4 integrate .. //depot/projects/tty/usr.bin/ar/ar.h#2 integrate .. //depot/projects/tty/usr.bin/ar/write.c#2 integrate .. //depot/projects/tty/usr.bin/awk/Makefile#8 integrate .. //depot/projects/tty/usr.bin/calendar/calendars/calendar.freebsd#26 integrate .. //depot/projects/tty/usr.bin/chat/chat.c#4 integrate .. //depot/projects/tty/usr.bin/cpuset/Makefile#1 branch .. //depot/projects/tty/usr.bin/cpuset/cpuset.1#1 branch .. //depot/projects/tty/usr.bin/cpuset/cpuset.c#1 branch .. //depot/projects/tty/usr.bin/du/du.1#8 integrate .. //depot/projects/tty/usr.bin/du/du.c#11 integrate .. //depot/projects/tty/usr.bin/find/extern.h#6 integrate .. //depot/projects/tty/usr.bin/find/find.1#12 integrate .. //depot/projects/tty/usr.bin/find/find.h#5 integrate .. //depot/projects/tty/usr.bin/find/function.c#10 integrate .. //depot/projects/tty/usr.bin/find/main.c#3 integrate .. //depot/projects/tty/usr.bin/find/option.c#7 integrate .. //depot/projects/tty/usr.bin/gzip/gzip.c#4 integrate .. //depot/projects/tty/usr.bin/kdump/kdump.1#7 integrate .. //depot/projects/tty/usr.bin/kdump/kdump.c#13 integrate .. //depot/projects/tty/usr.bin/kdump/kdump_subr.h#3 integrate .. //depot/projects/tty/usr.bin/kdump/mksubr#6 integrate .. //depot/projects/tty/usr.bin/ktrace/ktrace.1#4 integrate .. //depot/projects/tty/usr.bin/ktrace/ktrace.h#2 integrate .. //depot/projects/tty/usr.bin/ktrace/subr.c#4 integrate .. //depot/projects/tty/usr.bin/make/Makefile#12 integrate .. //depot/projects/tty/usr.bin/make/Makefile.dist#5 integrate .. //depot/projects/tty/usr.bin/make/arch.c#7 integrate .. //depot/projects/tty/usr.bin/make/globals.h#7 integrate .. //depot/projects/tty/usr.bin/make/hash_tables.c#4 integrate .. //depot/projects/tty/usr.bin/make/job.c#14 integrate .. //depot/projects/tty/usr.bin/make/main.c#23 integrate .. //depot/projects/tty/usr.bin/make/make.1#16 integrate .. //depot/projects/tty/usr.bin/make/parse.c#15 integrate .. //depot/projects/tty/usr.bin/ministat/ministat.1#2 integrate .. //depot/projects/tty/usr.bin/unifdef/unifdef.c#6 integrate .. //depot/projects/tty/usr.sbin/Makefile#30 integrate .. //depot/projects/tty/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#10 integrate .. //depot/projects/tty/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#6 integrate .. //depot/projects/tty/usr.sbin/bluetooth/sdpd/Makefile#3 integrate .. //depot/projects/tty/usr.sbin/bluetooth/sdpd/gn.c#1 branch .. //depot/projects/tty/usr.sbin/bluetooth/sdpd/nap.c#1 branch .. //depot/projects/tty/usr.sbin/bluetooth/sdpd/panu.c#1 branch .. //depot/projects/tty/usr.sbin/bluetooth/sdpd/profile.c#3 integrate .. //depot/projects/tty/usr.sbin/bluetooth/sdpd/profile.h#2 integrate .. //depot/projects/tty/usr.sbin/fifolog/Makefile#1 branch .. //depot/projects/tty/usr.sbin/fifolog/Makefile.inc#1 branch .. //depot/projects/tty/usr.sbin/fifolog/fifolog_create/Makefile#1 branch .. //depot/projects/tty/usr.sbin/fifolog/fifolog_create/fifolog.1#1 branch .. //depot/projects/tty/usr.sbin/fifolog/fifolog_create/fifolog_create.c#1 branch .. //depot/projects/tty/usr.sbin/fifolog/fifolog_reader/Makefile#1 branch .. //depot/projects/tty/usr.sbin/fifolog/fifolog_reader/fifolog_reader.c#1 branch .. //depot/projects/tty/usr.sbin/fifolog/fifolog_writer/Makefile#1 branch .. //depot/projects/tty/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#1 branch .. //depot/projects/tty/usr.sbin/fifolog/flint.lnt#1 branch .. //depot/projects/tty/usr.sbin/fifolog/lib/Makefile#1 branch .. //depot/projects/tty/usr.sbin/fifolog/lib/fifolog.h#1 branch .. //depot/projects/tty/usr.sbin/fifolog/lib/fifolog_create.c#1 branch .. //depot/projects/tty/usr.sbin/fifolog/lib/fifolog_int.c#1 branch .. //depot/projects/tty/usr.sbin/fifolog/lib/fifolog_reader.c#1 branch .. //depot/projects/tty/usr.sbin/fifolog/lib/fifolog_write.h#1 branch .. //depot/projects/tty/usr.sbin/fifolog/lib/fifolog_write_poll.c#1 branch .. //depot/projects/tty/usr.sbin/fifolog/lib/getdate.y#1 branch .. //depot/projects/tty/usr.sbin/fifolog/lib/libfifolog.h#1 branch .. //depot/projects/tty/usr.sbin/fifolog/lib/libfifolog_int.h#1 branch .. //depot/projects/tty/usr.sbin/fifolog/lib/miniobj.h#1 branch .. //depot/projects/tty/usr.sbin/fwcontrol/fwcontrol.8#11 integrate .. //depot/projects/tty/usr.sbin/fwcontrol/fwcontrol.c#10 integrate .. //depot/projects/tty/usr.sbin/mountd/mountd.c#17 integrate .. //depot/projects/tty/usr.sbin/moused/Makefile#5 integrate .. //depot/projects/tty/usr.sbin/moused/moused.c#15 integrate .. //depot/projects/tty/usr.sbin/pkg_install/add/main.c#14 integrate .. //depot/projects/tty/usr.sbin/pmcstat/Makefile#5 integrate .. //depot/projects/tty/usr.sbin/ppp/command.c#10 integrate .. //depot/projects/tty/usr.sbin/ppp/ipcp.c#5 integrate .. //depot/projects/tty/usr.sbin/ppp/main.c#4 integrate .. //depot/projects/tty/usr.sbin/ppp/nat_cmd.c#5 integrate .. //depot/projects/tty/usr.sbin/pw/pw.8#8 integrate .. //depot/projects/tty/usr.sbin/pw/pw.c#5 integrate .. //depot/projects/tty/usr.sbin/pw/pw_group.c#3 integrate Differences ... ==== //depot/projects/tty/Makefile.inc1#38 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.598 2008/02/05 15:41:58 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -203,6 +203,9 @@ GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac +.if ${OSRELDATE} < 700044 +CROSSENV+= AR=gnu-ar RANLIB=gnu-ranlib +.endif # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -872,6 +875,14 @@ .endif .endif +.if ${BOOTSTRAPPING} >= 700044 && ${BOOTSTRAPPING} < 800022 +_ar= usr.bin/ar +.endif + +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -881,18 +892,15 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 800013 -_mklocale= usr.bin/mklocale -.endif - bootstrap-tools: .for _tool in \ - ${_mklocale} \ ${_strfile} \ ${_gperf} \ ${_groff} \ + ${_ar} \ usr.bin/lorder \ usr.bin/makewhatis \ + ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ ==== //depot/projects/tty/ObsoleteFiles.inc#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.131 2008/02/20 11:28:28 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -32,6 +32,11 @@ OLD_FILES+=usr/lib/libkse.a OLD_FILES+=usr/lib/libkse_p.a OLD_FILES+=usr/lib/libkse_pic.a +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libkse.a +OLD_FILES+=usr/lib32/libkse_p.a +OLD_FILES+=usr/lib32/libkse_pic.a +.endif .endif # 20071129: Removed a Solaris compatibility header OLD_FILES+=usr/include/sys/_elf_solaris.h @@ -134,6 +139,12 @@ OLD_DIRS+=usr/include/netatm/uni OLD_DIRS+=usr/include/netatm OLD_DIRS+=usr/share/examples/atm +.if ${TARGET_ARCH} == "amd64" +OLD_FILES+=usr/lib32/libatm.a +OLD_FILES+=usr/lib32/libatm.so +OLD_LIBS+=usr/lib32/libatm.so.5 +OLD_FILES+=usr/lib32/libatm_p.a +.endif # 20070705: I4B headers repo-copied to include/i4b/ .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/include/machine/i4b_cause.h @@ -224,6 +235,42 @@ OLD_LIBS+=usr/lib/snmp_mibII.so.4 OLD_LIBS+=usr/lib/snmp_netgraph.so.4 OLD_LIBS+=usr/lib/snmp_pf.so.4 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libalias.so.5 +OLD_LIBS+=usr/lib32/libbsnmp.so.3 +OLD_LIBS+=usr/lib32/libdialog.so.5 +OLD_LIBS+=usr/lib32/libgnuregex.so.3 +OLD_LIBS+=usr/lib32/libhistory.so.6 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 13 05:15:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1CEB1065670; Thu, 13 Mar 2008 05:15:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81AED1065674 for ; Thu, 13 Mar 2008 05:15:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D0338FC1E for ; Thu, 13 Mar 2008 05:15:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2D5Fwmx094081 for ; Thu, 13 Mar 2008 05:15:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2D5FwHa094079 for perforce@freebsd.org; Thu, 13 Mar 2008 05:15:58 GMT (envelope-from sam@freebsd.org) Date: Thu, 13 Mar 2008 05:15:58 GMT Message-Id: <200803130515.m2D5FwHa094079@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 137581 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, 13 Mar 2008 05:15:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=137581 Change 137581 by sam@sam_ebb on 2008/03/13 05:15:23 count rx frames Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#43 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#43 (text+ko) ==== @@ -4023,6 +4023,7 @@ m->m_pkthdr.len = len; } + ifp->if_ipackets++; sc->sc_stats.ast_ant_rx[rs->rs_antenna]++; if (bpf_peers_present(ifp->if_bpf) && From owner-p4-projects@FreeBSD.ORG Thu Mar 13 07:59:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F32C91065672; Thu, 13 Mar 2008 07:59:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B2DDF1065670 for ; Thu, 13 Mar 2008 07:59:47 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AF6A38FC17 for ; Thu, 13 Mar 2008 07:59:47 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2D7xlQg003235 for ; Thu, 13 Mar 2008 07:59:47 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2D7xlCr003233 for perforce@freebsd.org; Thu, 13 Mar 2008 07:59:47 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Thu, 13 Mar 2008 07:59:47 GMT Message-Id: <200803130759.m2D7xlCr003233@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 137584 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, 13 Mar 2008 07:59:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=137584 Change 137584 by zhouzhouyi@zhouzhouyi_mactest on 2008/03/13 07:59:33 test the MAC Framework stuffs for socket Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tcpconnect.c#5 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/netinet/04.t#1 add Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tcpconnect.c#5 (text+ko) ==== @@ -206,7 +206,9 @@ err(1, "waiter: semop +1"); while (keepaccept) { + char * buf[10]; accept_sock = accept(listen_sock, NULL, NULL); + read(accept_sock, buf, 6); close(accept_sock); count++; if (count == 1) @@ -254,11 +256,12 @@ } for (i = 0; i < count; i++) { + sock = socket(PF_INET, SOCK_STREAM, 0); if (sock == -1) errx(-1, "socket: %s", strerror(errno)); -#ifdef NONBLOCK +#if 0 /*NONBLOCK */ if (fcntl(sock, F_SETFL, O_NONBLOCK) != 0) errx(-1, "fcntl(F_SETFL): %s", strerror(errno)); @@ -269,7 +272,7 @@ if (connect(sock, (struct sockaddr *)&sin, sizeof(sin)) == -1) errx(-1, "connect: %s", strerror(errno)); #endif - + write(sock, "hello", 6); close(sock); } } From owner-p4-projects@FreeBSD.ORG Thu Mar 13 11:24:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44EDF1065674; Thu, 13 Mar 2008 11:24:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 03A561065671 for ; Thu, 13 Mar 2008 11:24:28 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E06328FC24 for ; Thu, 13 Mar 2008 11:24:27 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DBORXf031102 for ; Thu, 13 Mar 2008 11:24:27 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DBORqH031100 for perforce@freebsd.org; Thu, 13 Mar 2008 11:24:27 GMT (envelope-from piso@freebsd.org) Date: Thu, 13 Mar 2008 11:24:27 GMT Message-Id: <200803131124.m2DBORqH031100@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 137596 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, 13 Mar 2008 11:24:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=137596 Change 137596 by piso@piso_ferret on 2008/03/13 11:23:51 IFC@137593 Affected files ... .. //depot/projects/soc2005/libalias/contrib/tcsh/sh.lex.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libalias/libalias/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_ar.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_ar.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/test_write_format_ar.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/sem_timedwait.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/sem_wait.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/kldunload.2#3 integrate .. //depot/projects/soc2005/libalias/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/uart.4#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/amd64_mem.c#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/machdep.c#16 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/specialreg.h#9 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysvec.c#11 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/nexus.c#5 integrate .. //depot/projects/soc2005/libalias/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/powerpc/uboot/metadata.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mxge/if_mxge.c#13 integrate .. //depot/projects/soc2005/libalias/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/uart/uart.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ehci_pci.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/ums.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/i686_mem.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/k6_mem.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/machdep.c#18 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/specialreg.h#8 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_sysvec.c#8 integrate .. //depot/projects/soc2005/libalias/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/machdep.c#11 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_sleepqueue.c#8 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#69 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#17 integrate .. //depot/projects/soc2005/libalias/sys/pc98/pc98/machdep.c#15 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/bootinfo.h#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/mpc85xx/ocpbus.c#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/cpuset.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/disklabel.h#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/cpuset/cpuset.1#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/cpuset/cpuset.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/kdump/kdump.c#8 integrate .. //depot/projects/soc2005/libalias/usr.bin/kdump/kdump_subr.h#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/kdump/mksubr#8 integrate .. //depot/projects/soc2005/libalias/usr.bin/make/globals.h#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/make/hash_tables.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/make/main.c#9 integrate .. //depot/projects/soc2005/libalias/usr.bin/make/make.1#8 integrate .. //depot/projects/soc2005/libalias/usr.bin/make/parse.c#5 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ppp/command.c#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ppp/ipcp.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ppp/main.c#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ppp/nat_cmd.c#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/contrib/tcsh/sh.lex.c#4 (text+ko) ==== @@ -851,7 +851,8 @@ return (en); } slhs.len = 0; - Strbuf_append(&slhs, lhsb.s); + if (lhsb.s != NULL && lhsb.len != 0) + Strbuf_append(&slhs, lhsb.s); Strbuf_terminate(&slhs); if (exclc) en = dosub(sc, en, global); ==== //depot/projects/soc2005/libalias/lib/libalias/libalias/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.4 2007/06/18 18:47:53 rafan Exp $ +# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.5 2008/03/12 11:58:28 piso Exp $ .PATH: ${.CURDIR}/../../../sys/netinet/libalias ==== //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_ar.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.8 2008/02/19 05:54:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.9 2008/03/12 21:10:26 kaiw Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -83,8 +83,7 @@ struct archive_entry *e); static uint64_t ar_atol8(const char *p, unsigned char_cnt); static uint64_t ar_atol10(const char *p, unsigned char_cnt); -static int ar_parse_gnu_filename_table(struct archive_read *, struct ar *, - const void *, size_t); +static int ar_parse_gnu_filename_table(struct archive_read *a); static int ar_parse_common_header(struct ar *ar, struct archive_entry *, const char *h); @@ -167,8 +166,8 @@ struct ar *ar; uint64_t number; /* Used to hold parsed numbers before validation. */ ssize_t bytes_read; - size_t bsd_name_length, entry_size; - char *p; + size_t bsd_name_length, entry_size, s; + char *p, *st; const void *b; const char *h; int r; @@ -277,22 +276,42 @@ return (ARCHIVE_FATAL); } entry_size = (size_t)number; + if (entry_size == 0) { + archive_set_error(&a->archive, EINVAL, + "Invalid string table"); + return (ARCHIVE_WARN); + } + if (ar->strtab != NULL) { + archive_set_error(&a->archive, EINVAL, + "More than one string tables exist"); + return (ARCHIVE_WARN); + } + /* Read the filename table into memory. */ - bytes_read = (a->decompressor->read_ahead)(a, &b, entry_size); - if (bytes_read <= 0) + st = malloc(entry_size); + if (st == NULL) { + archive_set_error(&a->archive, ENOMEM, + "Can't allocate filename table buffer"); return (ARCHIVE_FATAL); - if ((size_t)bytes_read < entry_size) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Truncated input file"); - return (ARCHIVE_FATAL); + } + ar->strtab = st; + ar->strtab_size = entry_size; + for (s = entry_size; s > 0; s -= bytes_read) { + bytes_read = (a->decompressor->read_ahead)(a, &b, s); + if (bytes_read <= 0) + return (ARCHIVE_FATAL); + if (bytes_read > (ssize_t)s) + bytes_read = s; + memcpy(st, b, bytes_read); + st += bytes_read; + (a->decompressor->consume)(a, bytes_read); } - /* - * Don't consume the contents, so the client will - * also get a shot at reading it. - */ + /* All contents are consumed. */ + ar->entry_bytes_remaining = 0; + archive_entry_set_size(entry, ar->entry_bytes_remaining); /* Parse the filename table. */ - return (ar_parse_gnu_filename_table(a, ar, b, entry_size)); + return (ar_parse_gnu_filename_table(a)); } /* @@ -492,31 +511,15 @@ } static int -ar_parse_gnu_filename_table(struct archive_read *a, struct ar *ar, - const void *h, size_t size) +ar_parse_gnu_filename_table(struct archive_read *a) { + struct ar *ar; char *p; + size_t size; - if (ar->strtab != NULL) { - archive_set_error(&a->archive, EINVAL, - "More than one string tables exist"); - return (ARCHIVE_WARN); - } - - if (size == 0) { - archive_set_error(&a->archive, EINVAL, "Invalid string table"); - return (ARCHIVE_WARN); - } + ar = (struct ar*)(a->format->data); + size = ar->strtab_size; - ar->strtab_size = size; - ar->strtab = malloc(size); - if (ar->strtab == NULL) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate string table buffer"); - return (ARCHIVE_FATAL); - } - - (void)memcpy(ar->strtab, h, size); for (p = ar->strtab; p < ar->strtab + size - 1; ++p) { if (*p == '/') { *p++ = '\0'; ==== //depot/projects/soc2005/libalias/lib/libarchive/test/test_read_format_ar.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_ar.c,v 1.4 2007/07/06 15:43:11 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_ar.c,v 1.5 2008/03/12 21:10:26 kaiw Exp $"); #if ARCHIVE_VERSION_STAMP >= 1009000 /* @@ -75,9 +75,7 @@ assertEqualInt(0, archive_entry_mtime(ae)); assertEqualInt(0, archive_entry_uid(ae)); assertEqualInt(0, archive_entry_gid(ae)); - assertEqualInt(40, archive_entry_size(ae)); - assertEqualIntA(a, 40, archive_read_data(a, buff, 50)); - assert(0 == memcmp(buff, "yyytttsssaaafff.o/\nhhhhjjjjkkkkllll.o/\n\n", 40)); + assertEqualInt(0, archive_entry_size(ae)); /* First Entry */ assertA(0 == archive_read_next_header(a, &ae)); ==== //depot/projects/soc2005/libalias/lib/libarchive/test/test_write_format_ar.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_ar.c,v 1.5 2007/07/06 15:43:11 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_ar.c,v 1.6 2008/03/12 21:10:26 kaiw Exp $"); char buff[4096]; char buff2[64]; @@ -119,9 +119,7 @@ assertA(0 == archive_read_next_header(a, &ae)); assertEqualInt(0, archive_entry_mtime(ae)); assertEqualString("//", archive_entry_pathname(ae)); - assertEqualInt(strlen(strtab), archive_entry_size(ae)); - assertEqualIntA(a, strlen(strtab), archive_read_data(a, buff2, 100)); - assert(0 == memcmp(buff2, strtab, strlen(strtab))); + assertEqualInt(0, archive_entry_size(ae)); assertA(0 == archive_read_next_header(a, &ae)); assert(1 == archive_entry_mtime(ae)); ==== //depot/projects/soc2005/libalias/lib/libc/gen/sem_timedwait.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_timedwait.3,v 1.2 2008/03/12 02:37:31 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_timedwait.3,v 1.4 2008/03/13 10:26:17 ru Exp $ .\" .Dd March 3, 2008 .Dt SEM_TIMEDWAIT 3 @@ -106,17 +106,15 @@ A signal interrupted this function. .El .Sh SEE ALSO -.Xr semctl 2 , -.Xr semget 2 , -.Xr semop 2 , .Xr sem_post 3 , .Xr sem_trywait 3 , -.Xr sem_wait 3 +.Xr sem_wait 3 , +.Xr sem 4 .Sh STANDARDS The .Fn sem_timedwait function conforms to .St -p1003.1-2004 . .Sh HISTORY -The function first appeared in +The function first appeared in .Fx 5.0 . ==== //depot/projects/soc2005/libalias/lib/libc/gen/sem_wait.3#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_wait.3,v 1.13 2005/07/13 13:15:22 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_wait.3,v 1.15 2008/03/13 10:25:30 ru Exp $ .\" .Dd February 15, 2000 .Dt SEM_WAIT 3 @@ -84,6 +84,7 @@ .Sh SEE ALSO .Xr sem_getvalue 3 , .Xr sem_post 3 , +.Xr sem_timedwait 3 , .Xr sem 4 .Sh STANDARDS The ==== //depot/projects/soc2005/libalias/lib/libc/sys/kldunload.2#3 (text+ko) ==== @@ -23,14 +23,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kldunload.2,v 1.19 2008/03/10 09:54:13 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/sys/kldunload.2,v 1.20 2008/03/13 10:33:24 ru Exp $ .\" .Dd March 10, 2008 .Dt KLDUNLOAD 2 .Os .Sh NAME -.Nm kldunload -.Nm kldunloadf +.Nm kldunload , kldunloadf .Nd unload kld files .Sh LIBRARY .Lb libc @@ -40,7 +39,7 @@ .Ft int .Fn kldunload "int fileid" .Ft int -.Fn kldunload "int fileid" "int flags" +.Fn kldunloadf "int fileid" "int flags" .Sh DESCRIPTION The .Fn kldunload ==== //depot/projects/soc2005/libalias/lib/libpmc/libpmc.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003-2006 Joseph Koshy + * Copyright (c) 2003-2008 Joseph Koshy * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.12 2007/12/07 13:52:51 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.13 2008/03/12 15:51:32 jkoshy Exp $"); #include #include @@ -1731,7 +1731,8 @@ *caps = cpu_info.pm_classes[i].pm_caps; return (0); } - return (EINVAL); + errno = EINVAL; + return (-1); } int @@ -2194,7 +2195,8 @@ *width = cpu_info.pm_classes[i].pm_width; return (0); } - return (EINVAL); + errno = EINVAL; + return (-1); } int ==== //depot/projects/soc2005/libalias/lib/libpmc/pmc_capabilities.3#2 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc_capabilities.3,v 1.1 2007/11/25 06:38:55 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc_capabilities.3,v 1.2 2008/03/12 15:48:59 jkoshy Exp $ .\" .Dd November 24, 2007 .Os @@ -157,7 +157,10 @@ .Fn pmc_ncpu and .Fn pmc_npmc -returns a positive integer if successful or -1 in case of an error. +returns a positive integer if successful; otherwise the value -1 is +returned and the global variable +.Va errno +is set to indicate the error. .Pp Functions .Fn pmc_capabilities , ==== //depot/projects/soc2005/libalias/share/man/man4/uart.4#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uart.4,v 1.11 2006/09/18 15:24:19 ru Exp $ +.\" $FreeBSD: src/share/man/man4/uart.4,v 1.12 2008/03/12 19:09:58 sam Exp $ .\" -.Dd March 29, 2006 +.Dd March 12, 2008 .Dt UART 4 .Os .\" @@ -41,6 +41,33 @@ .Pp .Cd "device scc" .Cd "device uart" +.Pp +.Bd -ragged offset -compact +In +.Pa /boot/device.hints : +.Cd hint.uart.0.disabled="1" +.Cd hint.uart.0.baud="38400" +.Cd hint.uart.0.port="0x3f8" +.Cd hint.uart.0.flags="0x10" +.Ed +.Pp +With +.Ar flags +encoded as: +.Bl -tag -compact -width 0x000000 +.It 0x00010 +device is potential system console +.It 0x00080 +use this port for remote kernel debugging +.It 0x00100 +set RX FIFO trigger level to ``low'' (NS8250 only) +.It 0x00200 +set RX FIFO trigger level to ``medium low'' (NS8250 only) +.It 0x00400 +set RX FIFO trigger level to ``medium high'' (default, NS8250 only) +.It 0x00800 +set RX FIFO trigger level to ``high'' (NS8250 only) +.El .\" .Sh DESCRIPTION The ==== //depot/projects/soc2005/libalias/sys/amd64/amd64/amd64_mem.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.27 2008/03/11 21:41:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.29 2008/03/12 22:09:19 jhb Exp $"); #include #include @@ -57,7 +57,7 @@ #define mrvalid(base, len) \ ((!(base & ((1 << 12) - 1))) && /* base is multiple of 4k */ \ ((len) >= (1 << 12)) && /* length is >= 4k */ \ - powerof2((len)) && /* ... and power of two */ \ + powerof2((len)) && /* ... and power of two */ \ !((base) & ((len) - 1))) /* range is not discontiuous */ #define mrcopyflags(curr, new) \ @@ -82,6 +82,9 @@ /* XXX for AP startup hook */ static u_int64_t mtrrcap, mtrrdef; +/* The bitmask for the PhysBase and PhysMask fields of the variable MTRRs. */ +static u_int64_t mtrr_physmask; + static struct mem_range_desc *mem_range_match(struct mem_range_softc *sc, struct mem_range_desc *mrd); static void amd64_mrfetch(struct mem_range_softc *sc); @@ -110,11 +113,6 @@ #define MTRRTOMRTLEN (sizeof(amd64_mtrrtomrt) / sizeof(amd64_mtrrtomrt[0])) -/* - * Used in /dev/mem drivers and elsewhere - */ -MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); - static int amd64_mtrr2mrt(int val) { @@ -219,15 +217,15 @@ msrv = rdmsr(msr); mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | amd64_mtrr2mrt(msrv & MTRR_PHYSBASE_TYPE); - mrd->mr_base = msrv & MTRR_PHYSBASE_PHYSBASE; + mrd->mr_base = msrv & mtrr_physmask; msrv = rdmsr(msr + 1); mrd->mr_flags = (msrv & MTRR_PHYSMASK_VALID) ? (mrd->mr_flags | MDF_ACTIVE) : (mrd->mr_flags & ~MDF_ACTIVE); /* Compute the range from the mask. Ick. */ - mrd->mr_len = (~(msrv & MTRR_PHYSMASK_PHYSMASK) - & (MTRR_PHYSMASK_PHYSMASK | 0xfffL)) + 1; + mrd->mr_len = (~(msrv & mtrr_physmask) & + (mtrr_physmask | 0xfffL)) + 1; if (!mrvalid(mrd->mr_base, mrd->mr_len)) mrd->mr_flags |= MDF_BOGUS; @@ -366,7 +364,7 @@ /* base/type register */ omsrv = rdmsr(msr); if (mrd->mr_flags & MDF_ACTIVE) { - msrv = mrd->mr_base & MTRR_PHYSBASE_PHYSBASE; + msrv = mrd->mr_base & mtrr_physmask; msrv |= amd64_mrt2mtrr(mrd->mr_flags, omsrv); } else { msrv = 0; @@ -376,7 +374,7 @@ /* mask/active register */ if (mrd->mr_flags & MDF_ACTIVE) { msrv = MTRR_PHYSMASK_VALID | - (~(mrd->mr_len - 1) & MTRR_PHYSMASK_PHYSMASK); + (~(mrd->mr_len - 1) & mtrr_physmask); } else { msrv = 0; } @@ -479,14 +477,17 @@ /* Exact match? */ if ((curr_md->mr_base == mrd->mr_base) && (curr_md->mr_len == mrd->mr_len)) { + /* Whoops, owned by someone. */ if (curr_md->mr_flags & MDF_BUSY) return (EBUSY); + /* Check that we aren't doing something risky */ if (!(mrd->mr_flags & MDF_FORCE) && ((curr_md->mr_flags & MDF_ATTRMASK) == MDF_UNKNOWN)) return (EACCES); + /* Ok, just hijack this entry. */ free_md = curr_md; break; @@ -580,7 +581,8 @@ amd64_mrinit(struct mem_range_softc *sc) { struct mem_range_desc *mrd; - int i, nmdesc = 0; + u_int regs[4]; + int i, nmdesc = 0, pabits; mtrrcap = rdmsr(MSR_MTRRcap); mtrrdef = rdmsr(MSR_MTRRdefType); @@ -593,6 +595,20 @@ } nmdesc = mtrrcap & MTRR_CAP_VCNT; + /* + * Determine the size of the PhysMask and PhysBase fields in + * the variable range MTRRs. If the extended CPUID 0x80000008 + * is present, use that to figure out how many physical + * address bits the CPU supports. Otherwise, default to 36 + * address bits. + */ + if (cpu_exthigh >= 0x80000008) { + do_cpuid(0x80000008, regs); + pabits = regs[0] & 0xff; + } else + pabits = 36; + mtrr_physmask = ((1UL << pabits) - 1) & ~0xfffUL; + /* If fixed MTRRs supported and enabled. */ if ((mtrrcap & MTRR_CAP_FIXED) && (mtrrdef & MTRR_DEF_FIXED_ENABLE)) { sc->mr_cap = MR686_FIXMTRR; ==== //depot/projects/soc2005/libalias/sys/amd64/amd64/machdep.c#16 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.681 2008/03/12 10:11:54 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.682 2008/03/13 10:54:36 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -357,7 +357,7 @@ regs->tf_rsp = (long)sfp; regs->tf_rip = PS_STRINGS - *(p->p_sysent->sv_szsigcode); - regs->tf_rflags &= ~PSL_T; + regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; PROC_LOCK(p); mtx_lock(&psp->ps_mtx); ==== //depot/projects/soc2005/libalias/sys/amd64/amd64/mem.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.121 2004/08/07 06:21:37 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.122 2008/03/12 21:43:50 jhb Exp $"); /* * Memory special file @@ -67,6 +67,11 @@ #include +/* + * Used in /dev/mem drivers and elsewhere + */ +MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); + /* ARGSUSED */ int memrw(struct cdev *dev, struct uio *uio, int flags) ==== //depot/projects/soc2005/libalias/sys/amd64/ia32/ia32_signal.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.15 2006/10/05 01:56:10 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.16 2008/03/13 10:54:37 kib Exp $"); #include "opt_compat.h" @@ -391,7 +391,7 @@ regs->tf_rsp = (uintptr_t)sfp; regs->tf_rip = FREEBSD32_PS_STRINGS - sz_freebsd4_ia32_sigcode; - regs->tf_rflags &= ~PSL_T; + regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucode32sel; regs->tf_ss = _udatasel; load_ds(_udatasel); @@ -511,7 +511,7 @@ regs->tf_rsp = (uintptr_t)sfp; regs->tf_rip = FREEBSD32_PS_STRINGS - *(p->p_sysent->sv_szsigcode); - regs->tf_rflags &= ~PSL_T; + regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucode32sel; regs->tf_ss = _udatasel; load_ds(_udatasel); ==== //depot/projects/soc2005/libalias/sys/amd64/include/specialreg.h#9 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.44 2008/03/11 20:10:37 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.45 2008/03/12 22:09:19 jhb Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -275,9 +275,9 @@ #define MTRR_DEF_ENABLE 0x0000000000000800UL #define MTRR_DEF_FIXED_ENABLE 0x0000000000000400UL #define MTRR_DEF_TYPE 0x00000000000000ffUL -#define MTRR_PHYSBASE_PHYSBASE 0x000000fffffff000UL +#define MTRR_PHYSBASE_PHYSBASE 0x000ffffffffff000UL #define MTRR_PHYSBASE_TYPE 0x00000000000000ffUL -#define MTRR_PHYSMASK_PHYSMASK 0x000000fffffff000UL +#define MTRR_PHYSMASK_PHYSMASK 0x000ffffffffff000UL #define MTRR_PHYSMASK_VALID 0x0000000000000800UL /* Performance Control Register (5x86 only). */ ==== //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysvec.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.32 2008/03/12 10:11:55 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.33 2008/03/13 10:54:37 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -401,7 +401,7 @@ regs->tf_rsp = PTROUT(fp); regs->tf_rip = LINUX32_PS_STRINGS - *(p->p_sysent->sv_szsigcode) + linux_sznonrtsigcode; - regs->tf_rflags &= ~PSL_T; + regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucode32sel; regs->tf_ss = _udatasel; load_ds(_udatasel); @@ -523,7 +523,7 @@ */ regs->tf_rsp = PTROUT(fp); regs->tf_rip = LINUX32_PS_STRINGS - *(p->p_sysent->sv_szsigcode); - regs->tf_rflags &= ~PSL_T; + regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucode32sel; regs->tf_ss = _udatasel; load_ds(_udatasel); ==== //depot/projects/soc2005/libalias/sys/arm/arm/busdma_machdep.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.37 2007/11/28 22:21:17 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.38 2008/03/12 15:31:37 raj Exp $"); /* * ARM bus dma support routines @@ -755,7 +755,9 @@ * XXX in user address space. */ if (__predict_true(pmap == pmap_kernel())) { - (void) pmap_get_pde_pte(pmap, vaddr, &pde, &ptep); + if (pmap_get_pde_pte(pmap, vaddr, &pde, &ptep) == FALSE) + return (EFAULT); + if (__predict_false(pmap_pde_section(pde))) { if (*pde & L1_S_SUPERSEC) curaddr = (*pde & L1_SUP_FRAME) | @@ -903,7 +905,7 @@ CTR5(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d nsegs %d", __func__, dmat, dmat->flags, nsegs + 1, error); - return (0); + return (error); } /* ==== //depot/projects/soc2005/libalias/sys/arm/arm/nexus.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.11 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.12 2008/03/12 15:46:25 raj Exp $"); #include #include @@ -129,6 +129,9 @@ { int i; + if ((rman_get_flags(res) & RF_SHAREABLE) == 0) + flags |= INTR_EXCL; + for (i = rman_get_start(res); i <= rman_get_end(res); i++) arm_setup_irqhandler(device_get_nameunit(child), filt, intr, arg, i, flags, cookiep); ==== //depot/projects/soc2005/libalias/sys/boot/common/dev_net.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.15 2004/07/08 22:35:33 brian Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.16 2008/03/12 16:01:33 raj Exp $"); /*- * This module implements a "raw device" interface suitable for @@ -144,7 +144,6 @@ return (error); } } - netdev_opens++; } netdev_opens++; f->f_devdata = &netdev_sock; @@ -245,7 +244,8 @@ printf("net_open: bootparam/whoami RPC failed\n"); return (EIO); } - printf("net_open: client name: %s\n", hostname); + if (debug) + printf("net_open: client name: %s\n", hostname); /* * Ignore the gateway from whoami (unreliable). @@ -259,10 +259,11 @@ } if (smask) { netmask = smask; - printf("net_open: subnet mask: %s\n", intoa(netmask)); + if (debug) + printf("net_open: subnet mask: %s\n", intoa(netmask)); } - if (gateip.s_addr) - printf("net_open: net gateway: %s\n", inet_ntoa(gateip)); + if (gateip.s_addr && debug) + printf("net_open: net gateway: %s\n", inet_ntoa(gateip)); /* Get the root server and pathname. */ if (bp_getfile(sock, "root", &rootip, rootpath)) { @@ -270,7 +271,7 @@ return (EIO); } exit: - /* + /* * If present, strip the server's address off of the rootpath * before passing it along. This allows us to be compatible with * the kernel's diskless (BOOTP_NFSROOT) booting conventions @@ -285,8 +286,10 @@ bcopy(&rootpath[i], &temp[0], strlen(&rootpath[i])+1); bcopy(&temp[0], &rootpath[0], strlen(&rootpath[i])+1); } - printf("net_open: server addr: %s\n", inet_ntoa(rootip)); - printf("net_open: server path: %s\n", rootpath); + if (debug) { + printf("net_open: server addr: %s\n", inet_ntoa(rootip)); + printf("net_open: server path: %s\n", rootpath); + } d = socktodesc(sock); sprintf(temp, "%6D", d->myea, ":"); ==== //depot/projects/soc2005/libalias/sys/boot/powerpc/uboot/metadata.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/powerpc/uboot/metadata.c,v 1.3 2008/02/23 19:43:29 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/powerpc/uboot/metadata.c,v 1.4 2008/03/12 16:12:48 raj Exp $"); #include #include @@ -267,7 +267,7 @@ const char *env; void *ptr; u_int8_t tmp_addr[6]; - int i, mr_no, eth_no, size; + int i, n, mr_no, eth_no, size; if ((si = ub_get_sys_info()) == NULL) panic("can't retrieve U-Boot sysinfo"); @@ -301,15 +301,32 @@ if (strncmp(env, "eth", 3) == 0 && strncmp(env + (strlen(env) - 4), "addr", 4) == 0) { + /* Extract interface number */ + i = strtol(env + 3, &end, 10); + if (end == (env + 3)) + /* 'ethaddr' means interface 0 address */ + n = 0; + else + n = i; + + if (n >= TMP_MAX_MR) { + printf("Ethernet interface number too high: %d. " + "Skipping...\n"); + continue; + } + str = ub_env_get(env); for (i = 0; i < 6; i++) { tmp_addr[i] = str ? strtol(str, &end, 16) : 0; if (str) str = (*end) ? end + 1 : end; - tmp_eth[eth_no].mac_addr[i] = tmp_addr[i]; + tmp_eth[n].mac_addr[i] = tmp_addr[i]; } - eth_no++; + + /* eth_no is 1-based number of all interfaces defined */ + if (n + 1 > eth_no) + eth_no = n + 1; } } ==== //depot/projects/soc2005/libalias/sys/boot/uboot/lib/console.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/console.c,v 1.1 2008/02/16 22:13:11 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/console.c,v 1.2 2008/03/12 16:01:34 raj Exp $"); #include #include "bootstrap.h" @@ -52,18 +52,21 @@ static void uboot_cons_probe(struct console *cp) { + cp->c_flags |= (C_PRESENTIN | C_PRESENTOUT); } static int uboot_cons_init(int arg) { + return 0; } static void uboot_cons_putchar(int c) { + if (c == '\n') ub_putc('\r'); @@ -73,11 +76,13 @@ static int uboot_cons_getchar() { + return (ub_getc()); } static int uboot_cons_poll() { + return (ub_tstc()); } ==== //depot/projects/soc2005/libalias/sys/boot/uboot/lib/copy.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/copy.c,v 1.1 2008/02/16 22:13:11 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/copy.c,v 1.2 2008/03/12 16:01:34 raj Exp $"); #include @@ -39,6 +39,7 @@ ssize_t uboot_copyin(const void *src, vm_offset_t dest, const size_t len) { + bcopy(src, (void *)dest, len); return (len); } @@ -46,6 +47,7 @@ ssize_t uboot_copyout(const vm_offset_t src, void *dest, const size_t len) { + bcopy((void *)src, dest, len); return (len); } @@ -53,5 +55,6 @@ ssize_t uboot_readin(const int fd, vm_offset_t dest, const size_t len) { + return (read(fd, (void *) dest, len)); } ==== //depot/projects/soc2005/libalias/sys/boot/uboot/lib/glue.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.2 2008/02/23 17:56:17 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.3 2008/03/12 16:01:34 raj Exp $"); #include #include "api_public.h" @@ -112,7 +112,7 @@ struct api_signature s; if (sig == NULL) - return 0; + return (0); /* * Clear the checksum field (in the local copy) so as to calculate the >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 13 15:27:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7E5F1065678; Thu, 13 Mar 2008 15:27:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 855961065670 for ; Thu, 13 Mar 2008 15:27:43 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6B4E38FC19 for ; Thu, 13 Mar 2008 15:27:43 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DFRh2c071056 for ; Thu, 13 Mar 2008 15:27:43 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DFRgHZ071054 for perforce@freebsd.org; Thu, 13 Mar 2008 15:27:42 GMT (envelope-from imp@freebsd.org) Date: Thu, 13 Mar 2008 15:27:42 GMT Message-Id: <200803131527.m2DFRgHZ071054@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 137612 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, 13 Mar 2008 15:27:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=137612 Change 137612 by imp@imp_paco-paco on 2008/03/13 15:26:48 IFC @137558 Affected files ... .. //depot/projects/mips2/src/UPDATING#12 integrate .. //depot/projects/mips2/src/bin/cp/cp.1#3 integrate .. //depot/projects/mips2/src/bin/cp/cp.c#5 integrate .. //depot/projects/mips2/src/bin/cp/utils.c#3 integrate .. //depot/projects/mips2/src/bin/ps/ps.1#3 integrate .. //depot/projects/mips2/src/contrib/tcsh/sh.lex.c#5 integrate .. //depot/projects/mips2/src/etc/rc.d/mountlate#4 integrate .. //depot/projects/mips2/src/etc/rc.d/root#4 integrate .. //depot/projects/mips2/src/lib/Makefile#11 integrate .. //depot/projects/mips2/src/lib/libalias/libalias/Makefile#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_entry.c#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read.c#6 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_private.h#4 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_ar.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/mips2/src/lib/libarchive/test/main.c#6 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test.h#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_ar.c#4 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_read_format_gtar_sparse.c#5 integrate .. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_ar.c#4 integrate .. //depot/projects/mips2/src/lib/libc/gen/Makefile.inc#6 integrate .. //depot/projects/mips2/src/lib/libc/gen/sem_timedwait.3#1 branch .. //depot/projects/mips2/src/lib/libc/sys/Makefile.inc#7 integrate .. //depot/projects/mips2/src/lib/libc/sys/Symbol.map#7 integrate .. //depot/projects/mips2/src/lib/libkvm/kvm_proc.c#6 integrate .. //depot/projects/mips2/src/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/mips2/src/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/mips2/src/lib/libsdp/sdp.h#3 integrate .. //depot/projects/mips2/src/lib/libthr/thread/thr_sem.c#6 integrate .. //depot/projects/mips2/src/lib/libthread_db/Makefile#4 integrate .. //depot/projects/mips2/src/release/doc/share/misc/dev.archlist.txt#9 integrate .. //depot/projects/mips2/src/sbin/mount/mount.8#8 integrate .. //depot/projects/mips2/src/share/man/man4/uart.4#3 integrate .. //depot/projects/mips2/src/share/man/man4/vr.4#3 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/legacy.c#4 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/trap.c#9 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/mips2/src/sys/amd64/conf/DEFAULTS#5 integrate .. //depot/projects/mips2/src/sys/amd64/include/specialreg.h#8 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/mips2/src/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/mips2/src/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/mips2/src/sys/arm/arm/trap.c#7 integrate .. //depot/projects/mips2/src/sys/arm/conf/AVILA#6 integrate .. //depot/projects/mips2/src/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/mips2/src/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/mips2/src/sys/boot/i386/btx/btx/btx.S#4 integrate .. //depot/projects/mips2/src/sys/boot/powerpc/uboot/metadata.c#2 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/mips2/src/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/mips2/src/sys/compat/freebsd32/syscalls.master#8 integrate .. //depot/projects/mips2/src/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/mips2/src/sys/conf/files#19 integrate .. //depot/projects/mips2/src/sys/conf/options#13 integrate .. //depot/projects/mips2/src/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/mips2/src/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/mips2/src/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/mips2/src/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/mips2/src/sys/dev/msk/if_msk.c#8 integrate .. //depot/projects/mips2/src/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/mips2/src/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/mips2/src/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/mips2/src/sys/dev/uart/uart.h#4 integrate .. //depot/projects/mips2/src/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/mips2/src/sys/dev/usb/ehci_pci.c#6 integrate .. //depot/projects/mips2/src/sys/dev/usb/ums.c#6 integrate .. //depot/projects/mips2/src/sys/dev/vr/if_vr.c#2 integrate .. //depot/projects/mips2/src/sys/dev/vr/if_vrreg.h#2 integrate .. //depot/projects/mips2/src/sys/dev/wpi/if_wpi.c#6 integrate .. //depot/projects/mips2/src/sys/dev/wpi/if_wpireg.h#3 integrate .. //depot/projects/mips2/src/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/mips2/src/sys/fs/fifofs/fifo_vnops.c#7 integrate .. //depot/projects/mips2/src/sys/fs/procfs/procfs_ctl.c#3 integrate .. //depot/projects/mips2/src/sys/fs/procfs/procfs_dbregs.c#3 integrate .. //depot/projects/mips2/src/sys/fs/procfs/procfs_status.c#5 integrate .. //depot/projects/mips2/src/sys/i386/conf/DEFAULTS#5 integrate .. //depot/projects/mips2/src/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/mips2/src/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/mips2/src/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/mips2/src/sys/i386/i386/legacy.c#4 integrate .. //depot/projects/mips2/src/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/i386/i386/trap.c#10 integrate .. //depot/projects/mips2/src/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/mips2/src/sys/i386/ibcs2/imgact_coff.c#6 integrate .. //depot/projects/mips2/src/sys/i386/include/specialreg.h#7 integrate .. //depot/projects/mips2/src/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/mips2/src/sys/ia64/conf/DEFAULTS#6 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/mips2/src/sys/ia64/ia64/trap.c#6 integrate .. //depot/projects/mips2/src/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/mips2/src/sys/kern/imgact_elf.c#8 integrate .. //depot/projects/mips2/src/sys/kern/init_sysent.c#9 integrate .. //depot/projects/mips2/src/sys/kern/kern_clock.c#8 integrate .. //depot/projects/mips2/src/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/mips2/src/sys/kern/kern_exec.c#8 integrate .. //depot/projects/mips2/src/sys/kern/kern_fork.c#7 integrate .. //depot/projects/mips2/src/sys/kern/kern_intr.c#7 integrate .. //depot/projects/mips2/src/sys/kern/kern_kse.c#8 delete .. //depot/projects/mips2/src/sys/kern/kern_proc.c#11 integrate .. //depot/projects/mips2/src/sys/kern/kern_resource.c#6 integrate .. //depot/projects/mips2/src/sys/kern/kern_sig.c#8 integrate .. //depot/projects/mips2/src/sys/kern/kern_switch.c#8 integrate .. //depot/projects/mips2/src/sys/kern/kern_sx.c#9 integrate .. //depot/projects/mips2/src/sys/kern/kern_synch.c#8 integrate .. //depot/projects/mips2/src/sys/kern/kern_thread.c#10 integrate .. //depot/projects/mips2/src/sys/kern/kern_timeout.c#8 integrate .. //depot/projects/mips2/src/sys/kern/p1003_1b.c#4 integrate .. //depot/projects/mips2/src/sys/kern/sched_4bsd.c#9 integrate .. //depot/projects/mips2/src/sys/kern/sched_ule.c#12 integrate .. //depot/projects/mips2/src/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/mips2/src/sys/kern/subr_trap.c#7 integrate .. //depot/projects/mips2/src/sys/kern/subr_witness.c#10 integrate .. //depot/projects/mips2/src/sys/kern/sys_process.c#6 integrate .. //depot/projects/mips2/src/sys/kern/syscalls.c#9 integrate .. //depot/projects/mips2/src/sys/kern/syscalls.master#10 integrate .. //depot/projects/mips2/src/sys/kern/systrace_args.c#6 integrate .. //depot/projects/mips2/src/sys/modules/vr/Makefile#2 integrate .. //depot/projects/mips2/src/sys/netgraph/netgraph.h#7 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_socket.c#7 integrate .. //depot/projects/mips2/src/sys/netinet/libalias/alias.c#4 integrate .. //depot/projects/mips2/src/sys/netinet/libalias/alias.h#3 integrate .. //depot/projects/mips2/src/sys/netinet/libalias/alias_old.c#3 delete .. //depot/projects/mips2/src/sys/pc98/conf/DEFAULTS#4 integrate .. //depot/projects/mips2/src/sys/pc98/pc98/machdep.c#9 integrate .. //depot/projects/mips2/src/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/mips2/src/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/mips2/src/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/conf/DEFAULTS#4 integrate .. //depot/projects/mips2/src/sys/powerpc/include/bootinfo.h#3 integrate .. //depot/projects/mips2/src/sys/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/mips2/src/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/intr_machdep.c#9 integrate .. //depot/projects/mips2/src/sys/sparc64/conf/DEFAULTS#5 integrate .. //depot/projects/mips2/src/sys/sparc64/conf/GENERIC#9 integrate .. //depot/projects/mips2/src/sys/sparc64/sparc64/trap.c#6 integrate .. //depot/projects/mips2/src/sys/sys/condvar.h#3 integrate .. //depot/projects/mips2/src/sys/sys/disklabel.h#3 integrate .. //depot/projects/mips2/src/sys/sys/kse.h#2 delete .. //depot/projects/mips2/src/sys/sys/param.h#13 integrate .. //depot/projects/mips2/src/sys/sys/proc.h#13 integrate .. //depot/projects/mips2/src/sys/sys/sched.h#5 integrate .. //depot/projects/mips2/src/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/mips2/src/sys/sys/syscall.h#9 integrate .. //depot/projects/mips2/src/sys/sys/syscall.mk#9 integrate .. //depot/projects/mips2/src/sys/sys/sysproto.h#9 integrate .. //depot/projects/mips2/src/sys/sys/systm.h#9 integrate .. //depot/projects/mips2/src/sys/vm/vm_glue.c#5 integrate .. //depot/projects/mips2/src/sys/vm/vm_map.c#9 integrate .. //depot/projects/mips2/src/sys/vm/vm_meter.c#6 integrate .. //depot/projects/mips2/src/usr.bin/ar/ar.1#2 integrate .. //depot/projects/mips2/src/usr.bin/ar/ar.c#2 integrate .. //depot/projects/mips2/src/usr.bin/ar/ar.h#2 integrate .. //depot/projects/mips2/src/usr.bin/ar/write.c#3 integrate .. //depot/projects/mips2/src/usr.bin/cpuset/cpuset.1#2 integrate .. //depot/projects/mips2/src/usr.bin/kdump/kdump.c#8 integrate .. //depot/projects/mips2/src/usr.bin/kdump/kdump_subr.h#4 integrate .. //depot/projects/mips2/src/usr.bin/kdump/mksubr#6 integrate .. //depot/projects/mips2/src/usr.bin/make/globals.h#3 integrate .. //depot/projects/mips2/src/usr.bin/make/hash_tables.c#2 integrate .. //depot/projects/mips2/src/usr.bin/make/main.c#8 integrate .. //depot/projects/mips2/src/usr.bin/make/make.1#5 integrate .. //depot/projects/mips2/src/usr.bin/make/parse.c#5 integrate .. //depot/projects/mips2/src/usr.bin/ministat/ministat.1#2 integrate .. //depot/projects/mips2/src/usr.sbin/bluetooth/sdpd/Makefile#2 integrate .. //depot/projects/mips2/src/usr.sbin/bluetooth/sdpd/gn.c#1 branch .. //depot/projects/mips2/src/usr.sbin/bluetooth/sdpd/nap.c#1 branch .. //depot/projects/mips2/src/usr.sbin/bluetooth/sdpd/panu.c#1 branch .. //depot/projects/mips2/src/usr.sbin/bluetooth/sdpd/profile.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/bluetooth/sdpd/profile.h#2 integrate .. //depot/projects/mips2/src/usr.sbin/ppp/command.c#4 integrate .. //depot/projects/mips2/src/usr.sbin/ppp/ipcp.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/ppp/main.c#2 integrate .. //depot/projects/mips2/src/usr.sbin/ppp/nat_cmd.c#2 integrate Differences ... ==== //depot/projects/mips2/src/UPDATING#12 (text+ko) ==== @@ -22,6 +22,16 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080312: + Support for KSE threading has been removed from the kernel. To + run legacy applications linked against KSE libmap.conf may + be used. The following libmap.conf may be used to ensure + compatibility with any prior release: + + libpthread.so.1 libthr.so.1 + libpthread.so.2 libthr.so.2 + libkse.so.3 libthr.so.3 + 20080301: The layout of struct vmspace has changed. This affects libkvm and any executables that link against libkvm and use the @@ -997,4 +1007,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ ==== //depot/projects/mips2/src/bin/cp/cp.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $ .\" .Dd October 27, 2006 .Dt CP 1 @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -116,6 +116,10 @@ or .Xr pax 1 instead. +.It Fl a +Archive mode. +Same as +.Fl RpP . .It Fl f For each existing destination pathname, remove it and create a new file, without prompting for confirmation ==== //depot/projects/mips2/src/bin/cp/cp.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); /* * Cp copies source files to target files. @@ -102,7 +102,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -119,6 +119,12 @@ case 'R': Rflag = 1; break; + case 'a': + Pflag = 1; + pflag = 1; + Rflag = 1; + Hflag = Lflag = 0; + break; case 'f': fflag = 1; iflag = nflag = 0; ==== //depot/projects/mips2/src/bin/cp/utils.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.53 2008/03/10 19:58:41 jhb Exp $"); #include #include @@ -429,8 +429,8 @@ { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " "target_directory"); exit(EX_USAGE); } ==== //depot/projects/mips2/src/bin/ps/ps.1#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.90 2008/03/12 10:01:34 jeff Exp $ .\" .Dd August 21, 2006 .Dt PS 1 @@ -290,7 +290,6 @@ .It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us" .It Dv "P_WEXIT" Ta No "0x02000 Working on exiting" .It Dv "P_EXEC" Ta No "0x04000 Process called exec" -.It Dv "P_SA" Ta No "0x08000 Using scheduler activations" .It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state" .It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP" .It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing" ==== //depot/projects/mips2/src/contrib/tcsh/sh.lex.c#5 (text+ko) ==== @@ -851,7 +851,8 @@ return (en); } slhs.len = 0; - Strbuf_append(&slhs, lhsb.s); + if (lhsb.s != NULL && lhsb.len != 0) + Strbuf_append(&slhs, lhsb.s); Strbuf_terminate(&slhs); if (exclc) en = dosub(sc, en, global); ==== //depot/projects/mips2/src/etc/rc.d/mountlate#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.3 2008/03/06 14:39:33 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.5 2008/03/11 17:21:55 delphij Exp $ # # PROVIDE: mountlate @@ -33,6 +33,12 @@ stop_boot true ;; esac + + # If we booted a special kernel remove the record + # so we will boot the default kernel next time. + if [ -x /sbin/nextboot ]; then + /sbin/nextboot -D + fi } load_rc_config $name ==== //depot/projects/mips2/src/etc/rc.d/root#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/root,v 1.16 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.17 2008/03/11 17:21:14 delphij Exp $ # # PROVIDE: root @@ -34,7 +34,7 @@ # If we booted a special kernel remove the record # so we will boot the default kernel next time. if [ -x /sbin/nextboot ]; then - /sbin/nextboot -D + /sbin/nextboot -D > /dev/null 2>&1 fi } ==== //depot/projects/mips2/src/lib/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $ .include @@ -34,7 +34,7 @@ ${_libgssapi} libipsec \ ${_libipx} libkiconv ${_libmagic} libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ + libpmc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -108,10 +108,6 @@ _libsmb= libsmb .endif -.if ${MK_LIBKSE} != "no" && ${MACHINE_ARCH} != "mips" -_libkse= libkse -.endif - .if ${MK_LIBTHR} != "no" _libthr= libthr .endif ==== //depot/projects/mips2/src/lib/libalias/libalias/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.4 2007/06/18 18:47:53 rafan Exp $ +# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.5 2008/03/12 11:58:28 piso Exp $ .PATH: ${.CURDIR}/../../../sys/netinet/libalias @@ -6,7 +6,7 @@ SHLIBDIR?= /lib SHLIB_MAJOR= 6 MAN= libalias.3 -SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c +SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c INCS= alias.h WARNS?= 6 NO_WERROR= ==== //depot/projects/mips2/src/lib/libarchive/archive_entry.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.45 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.47 2008/03/12 04:47:37 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -1124,6 +1124,11 @@ entry->acl_p = entry->acl_p->next; if (entry->acl_p == NULL) { entry->acl_state = 0; + *type = 0; + *permset = 0; + *tag = 0; + *id = -1; + *name = NULL; return (ARCHIVE_EOF); /* End of ACL entries. */ } *type = entry->acl_p->type; @@ -1505,7 +1510,7 @@ return (ARCHIVE_OK); } else { *name = NULL; - *name = NULL; + *value = NULL; *size = (size_t)0; return (ARCHIVE_WARN); } ==== //depot/projects/mips2/src/lib/libarchive/archive_read.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.37 2008/01/03 17:54:26 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.38 2008/03/12 04:58:32 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -64,26 +64,13 @@ archive_read_new(void) { struct archive_read *a; - unsigned char *nulls; a = (struct archive_read *)malloc(sizeof(*a)); if (a == NULL) return (NULL); memset(a, 0, sizeof(*a)); a->archive.magic = ARCHIVE_READ_MAGIC; - a->bytes_per_block = ARCHIVE_DEFAULT_BYTES_PER_BLOCK; - a->null_length = 1024; - nulls = (unsigned char *)malloc(a->null_length); - if (nulls == NULL) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate archive object 'nulls' element"); - free(a); - return (NULL); - } - memset(nulls, 0, a->null_length); - a->nulls = nulls; - a->archive.state = ARCHIVE_STATE_NEW; a->entry = archive_entry_new(); @@ -660,8 +647,6 @@ (a->formats[i].cleanup)(a); } - /* Casting a pointer to int allows us to remove 'const.' */ - free((void *)(uintptr_t)(const void *)a->nulls); archive_string_free(&a->archive.error_string); if (a->entry) archive_entry_free(a->entry); ==== //depot/projects/mips2/src/lib/libarchive/archive_read_private.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.4 2008/01/03 17:54:26 des Exp $ + * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.5 2008/03/12 04:58:32 kientzle Exp $ */ #ifndef ARCHIVE_READ_PRIVATE_H_INCLUDED @@ -41,10 +41,6 @@ dev_t skip_file_dev; ino_t skip_file_ino; - /* Utility: Pointer to a block of nulls. */ - const unsigned char *nulls; - size_t null_length; - /* * Used by archive_read_data() to track blocks and copy * data to client buffers, filling gaps with zero bytes. @@ -58,30 +54,9 @@ archive_open_callback *client_opener; archive_read_callback *client_reader; archive_skip_callback *client_skipper; - archive_write_callback *client_writer; archive_close_callback *client_closer; void *client_data; - /* - * Blocking information. Note that bytes_in_last_block is - * misleadingly named; I should find a better name. These - * control the final output from all compressors, including - * compression_none. - */ - int bytes_per_block; - int bytes_in_last_block; - - /* - * These control whether data within a gzip/bzip2 compressed - * stream gets padded or not. If pad_uncompressed is set, - * the data will be padded to a full block before being - * compressed. The pad_uncompressed_byte determines the value - * that will be used for padding. Note that these have no - * effect on compression "none." - */ - int pad_uncompressed; - int pad_uncompressed_byte; /* TODO: Support this. */ - /* File offset of beginning of most recently-read header. */ off_t header_position; @@ -142,18 +117,6 @@ struct archive_format_descriptor *format; /* Active format. */ /* - * Pointers to format-specific functions for writing. They're - * initialized by archive_write_set_format_XXX() calls. - */ - int (*format_init)(struct archive *); /* Only used on write. */ - int (*format_finish)(struct archive *); - int (*format_finish_entry)(struct archive *); - int (*format_write_header)(struct archive *, - struct archive_entry *); - ssize_t (*format_write_data)(struct archive *, - const void *buff, size_t); - - /* * Various information needed by archive_extract. */ struct extract *extract; ==== //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_ar.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.8 2008/02/19 05:54:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.9 2008/03/12 21:10:26 kaiw Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -83,8 +83,7 @@ struct archive_entry *e); static uint64_t ar_atol8(const char *p, unsigned char_cnt); static uint64_t ar_atol10(const char *p, unsigned char_cnt); -static int ar_parse_gnu_filename_table(struct archive_read *, struct ar *, - const void *, size_t); +static int ar_parse_gnu_filename_table(struct archive_read *a); static int ar_parse_common_header(struct ar *ar, struct archive_entry *, const char *h); @@ -167,8 +166,8 @@ struct ar *ar; uint64_t number; /* Used to hold parsed numbers before validation. */ ssize_t bytes_read; - size_t bsd_name_length, entry_size; - char *p; + size_t bsd_name_length, entry_size, s; + char *p, *st; const void *b; const char *h; int r; @@ -277,22 +276,42 @@ return (ARCHIVE_FATAL); } entry_size = (size_t)number; + if (entry_size == 0) { + archive_set_error(&a->archive, EINVAL, + "Invalid string table"); + return (ARCHIVE_WARN); + } + if (ar->strtab != NULL) { + archive_set_error(&a->archive, EINVAL, + "More than one string tables exist"); + return (ARCHIVE_WARN); + } + /* Read the filename table into memory. */ - bytes_read = (a->decompressor->read_ahead)(a, &b, entry_size); - if (bytes_read <= 0) + st = malloc(entry_size); + if (st == NULL) { + archive_set_error(&a->archive, ENOMEM, + "Can't allocate filename table buffer"); return (ARCHIVE_FATAL); - if ((size_t)bytes_read < entry_size) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Truncated input file"); - return (ARCHIVE_FATAL); + } + ar->strtab = st; + ar->strtab_size = entry_size; + for (s = entry_size; s > 0; s -= bytes_read) { + bytes_read = (a->decompressor->read_ahead)(a, &b, s); + if (bytes_read <= 0) + return (ARCHIVE_FATAL); + if (bytes_read > (ssize_t)s) + bytes_read = s; + memcpy(st, b, bytes_read); + st += bytes_read; + (a->decompressor->consume)(a, bytes_read); } - /* - * Don't consume the contents, so the client will - * also get a shot at reading it. - */ + /* All contents are consumed. */ + ar->entry_bytes_remaining = 0; + archive_entry_set_size(entry, ar->entry_bytes_remaining); /* Parse the filename table. */ - return (ar_parse_gnu_filename_table(a, ar, b, entry_size)); + return (ar_parse_gnu_filename_table(a)); } /* @@ -492,31 +511,15 @@ } static int -ar_parse_gnu_filename_table(struct archive_read *a, struct ar *ar, - const void *h, size_t size) +ar_parse_gnu_filename_table(struct archive_read *a) { + struct ar *ar; char *p; + size_t size; - if (ar->strtab != NULL) { - archive_set_error(&a->archive, EINVAL, - "More than one string tables exist"); - return (ARCHIVE_WARN); - } - - if (size == 0) { - archive_set_error(&a->archive, EINVAL, "Invalid string table"); - return (ARCHIVE_WARN); - } + ar = (struct ar*)(a->format->data); + size = ar->strtab_size; - ar->strtab_size = size; - ar->strtab = malloc(size); - if (ar->strtab == NULL) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate string table buffer"); - return (ARCHIVE_FATAL); - } - - (void)memcpy(ar->strtab, h, size); for (p = ar->strtab; p < ar->strtab + size - 1; ++p) { if (*p == '/') { *p++ = '\0'; ==== //depot/projects/mips2/src/lib/libarchive/test/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.14 2008/01/31 07:47:38 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.15 2008/03/12 05:12:23 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -7,17 +7,6 @@ # Get a list of all libarchive source files LA_SRCS!=make -f ${LA_SRCDIR}/Makefile -V SRCS -TESTFILES= \ - test_compat_gtar_1.tgz \ - test_compat_tar_hardlink_1.tar \ - test_compat_zip_1.zip \ - test_read_format_gtar_sparse_1_13.tgz \ - test_read_format_gtar_sparse_1_17.tgz \ - test_read_format_gtar_sparse_1_17_posix00.tgz \ - test_read_format_gtar_sparse_1_17_posix01.tgz \ - test_read_format_gtar_sparse_1_17_posix10.tgz \ - test_read_format_gtar_sparse_1_17_posix10_modified.tar - TESTS= \ test_acl_basic.c \ test_acl_pax.c \ @@ -104,13 +93,8 @@ WARNS=6 # Build libarchive_test and run it. -check test: libarchive_test ${TESTFILES} - ./libarchive_test - -.for f in ${TESTFILES} -${f}: ${f}.uu - uudecode -p ${.CURDIR}/${f}.uu >${f} -.endfor +check test: libarchive_test + ./libarchive_test -k -r ${.CURDIR} INCS=archive.h list.h ==== //depot/projects/mips2/src/lib/libarchive/test/main.c#6 (text+ko) ==== @@ -24,23 +24,26 @@ */ /* - * This same file is used pretty much verbatim for all test harnesses. - * - * The next line is used to define various environment variables, etc. - * - * The tar and cpio test harnesses are identical except for this line; - * the libarchive test harness omits some code that is needed only for - * testing standalone executables. + * Various utility routines useful for test programs. + * Each test program is linked against this file. */ -#define PROGRAM "LIBARCHIVE" - #include #include #include #include #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.10 2008/02/19 05:52:30 kientzle Exp $"); + +/* + * This same file is used pretty much verbatim for all test harnesses. + * + * The next few lines are the only differences. + */ +#undef PROGRAM /* Testing a library, not a program. */ +#define ENVBASE "LIBARCHIVE" /* Prefix for environment variables. */ +#define EXTRA_DUMP(x) archive_error_string((struct archive *)(x)) +#define EXTRA_VERSION archive_version() +__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.11 2008/03/12 05:12:23 kientzle Exp $"); /* * "list.h" is simply created by "grep DEFINE_TEST"; it has @@ -51,7 +54,7 @@ * test functions. */ #undef DEFINE_TEST -#define DEFINE_TEST(name) void name(void); +#define DEFINE_TEST(name) void name(void); #include "list.h" /* Interix doesn't define these in a standard header. */ @@ -71,6 +74,9 @@ /* Cumulative count of assertions. */ static int assertions = 0; +/* Directory where uuencoded reference files can be found. */ +static char *refdir; + /* * My own implementation of the standard assert() macro emits the * message in the same format as GCC (file:line: message). @@ -90,7 +96,7 @@ * For each test source file, we remember how many times each * failure was reported. */ -static const char *failed_filename; +static const char *failed_filename = NULL; static struct line { int line; int count; @@ -163,9 +169,13 @@ fprintf(stderr, " Description: %s\n", msg); msg[0] = '\0'; } - if (extra != NULL) { - fprintf(stderr, " archive error: %s\n", archive_error_string((struct archive *)extra)); - } + +#ifdef EXTRA_DUMP + if (extra != NULL) + fprintf(stderr, " detail: %s\n", EXTRA_DUMP(extra)); +#else + (void)extra; /* UNUSED */ +#endif if (dump_on_failure) { fprintf(stderr, @@ -241,27 +251,28 @@ } /* assertEqualInt() displays the values of the two integers. */ -void +int test_assert_equal_int(const char *file, int line, int v1, const char *e1, int v2, const char *e2, void *extra) { ++assertions; if (v1 == v2) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: Ints not equal\n", file, line); fprintf(stderr, " %s=%d\n", e1, v1); fprintf(stderr, " %s=%d\n", e2, v2); report_failure(extra); + return (0); } /* assertEqualString() displays the values of the two strings. */ -void +int test_assert_equal_string(const char *file, int line, const char *v1, const char *e1, const char *v2, const char *e2, @@ -271,24 +282,25 @@ if (v1 == NULL || v2 == NULL) { if (v1 == v2) { msg[0] = '\0'; - return; + return (1); } } else if (strcmp(v1, v2) == 0) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: Strings not equal\n", file, line); fprintf(stderr, " %s = \"%s\"\n", e1, v1); fprintf(stderr, " %s = \"%s\"\n", e2, v2); report_failure(extra); + return (0); } /* assertEqualWString() displays the values of the two strings. */ -void +int test_assert_equal_wstring(const char *file, int line, const wchar_t *v1, const char *e1, const wchar_t *v2, const char *e2, @@ -297,16 +309,17 @@ ++assertions; if (wcscmp(v1, v2) == 0) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: Unicode strings not equal\n", file, line); fwprintf(stderr, L" %s = \"%ls\"\n", e1, v1); fwprintf(stderr, L" %s = \"%ls\"\n", e2, v2); report_failure(extra); + return (0); } /* @@ -326,7 +339,7 @@ for (j = 0; j < 16 && i + j < l; j++) { if (ref != NULL && p[i + j] != ref[i + j]) sep = '_'; - fprintf(stderr, "%c%02x", sep, p[i+j]); + fprintf(stderr, "%c%02x", sep, 0xff & (int)p[i+j]); if (ref != NULL && p[i + j] == ref[i + j]) sep = ' '; } @@ -348,7 +361,7 @@ /* assertEqualMem() displays the values of the two memory blocks. */ /* TODO: For long blocks, hexdump the first bytes that actually differ. */ -void +int test_assert_equal_mem(const char *file, int line, const char *v1, const char *e1, const char *v2, const char *e2, @@ -358,15 +371,15 @@ if (v1 == NULL || v2 == NULL) { if (v1 == v2) { msg[0] = '\0'; - return; + return (1); } } else if (memcmp(v1, v2, l) == 0) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: memory not equal\n", file, line); fprintf(stderr, " size %s = %d\n", ld, (int)l); @@ -376,14 +389,19 @@ hexdump(v2, v1, l < 32 ? l : 32, 0); fprintf(stderr, "\n"); report_failure(extra); + return (0); } -void +int test_assert_empty_file(const char *f1fmt, ...) { + char buff[1024]; char f1[1024]; struct stat st; va_list ap; + ssize_t s; + int fd; + va_start(ap, f1fmt); vsprintf(f1, f1fmt, ap); @@ -392,16 +410,32 @@ if (stat(f1, &st) != 0) { fprintf(stderr, "%s:%d: Could not stat: %s\n", test_filename, test_line, f1); report_failure(NULL); - } else if (st.st_size > 0) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 13 15:30:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F8F01065673; Thu, 13 Mar 2008 15:30:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE66C1065671 for ; Thu, 13 Mar 2008 15:30:47 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C50078FC15 for ; Thu, 13 Mar 2008 15:30:47 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DFUlts071190 for ; Thu, 13 Mar 2008 15:30:47 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DFUl3E071188 for perforce@freebsd.org; Thu, 13 Mar 2008 15:30:47 GMT (envelope-from imp@freebsd.org) Date: Thu, 13 Mar 2008 15:30:47 GMT Message-Id: <200803131530.m2DFUl3E071188@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 137614 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, 13 Mar 2008 15:30:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=137614 Change 137614 by imp@imp_paco-paco on 2008/03/13 15:30:23 IFC @137612 Affected files ... .. //depot/projects/arm/src/lib/libc/gen/sem_timedwait.3#2 integrate .. //depot/projects/arm/src/lib/libc/gen/sem_wait.3#2 integrate .. //depot/projects/arm/src/lib/libc/sys/kldunload.2#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#27 integrate .. //depot/projects/arm/src/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#19 integrate .. //depot/projects/arm/src/sys/dev/tdfx/tdfx_pci.c#5 integrate .. //depot/projects/arm/src/sys/i386/i386/k6_mem.c#3 integrate .. //depot/projects/arm/src/sys/i386/i386/machdep.c#32 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysvec.c#14 integrate .. //depot/projects/arm/src/sys/i386/svr4/svr4_machdep.c#3 integrate .. //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#18 integrate .. //depot/projects/arm/src/sys/pc98/pc98/machdep.c#22 integrate .. //depot/projects/arm/src/sys/sys/cpuset.h#2 integrate .. //depot/projects/arm/src/usr.bin/cpuset/cpuset.1#3 integrate .. //depot/projects/arm/src/usr.bin/cpuset/cpuset.c#2 integrate Differences ... ==== //depot/projects/arm/src/lib/libc/gen/sem_timedwait.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_timedwait.3,v 1.2 2008/03/12 02:37:31 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_timedwait.3,v 1.4 2008/03/13 10:26:17 ru Exp $ .\" .Dd March 3, 2008 .Dt SEM_TIMEDWAIT 3 @@ -106,17 +106,15 @@ A signal interrupted this function. .El .Sh SEE ALSO -.Xr semctl 2 , -.Xr semget 2 , -.Xr semop 2 , .Xr sem_post 3 , .Xr sem_trywait 3 , -.Xr sem_wait 3 +.Xr sem_wait 3 , +.Xr sem 4 .Sh STANDARDS The .Fn sem_timedwait function conforms to .St -p1003.1-2004 . .Sh HISTORY -The function first appeared in +The function first appeared in .Fx 5.0 . ==== //depot/projects/arm/src/lib/libc/gen/sem_wait.3#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_wait.3,v 1.13 2005/07/13 13:15:22 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_wait.3,v 1.15 2008/03/13 10:25:30 ru Exp $ .\" .Dd February 15, 2000 .Dt SEM_WAIT 3 @@ -84,6 +84,7 @@ .Sh SEE ALSO .Xr sem_getvalue 3 , .Xr sem_post 3 , +.Xr sem_timedwait 3 , .Xr sem 4 .Sh STANDARDS The ==== //depot/projects/arm/src/lib/libc/sys/kldunload.2#3 (text+ko) ==== @@ -23,14 +23,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kldunload.2,v 1.19 2008/03/10 09:54:13 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/sys/kldunload.2,v 1.20 2008/03/13 10:33:24 ru Exp $ .\" .Dd March 10, 2008 .Dt KLDUNLOAD 2 .Os .Sh NAME -.Nm kldunload -.Nm kldunloadf +.Nm kldunload , kldunloadf .Nd unload kld files .Sh LIBRARY .Lb libc @@ -40,7 +39,7 @@ .Ft int .Fn kldunload "int fileid" .Ft int -.Fn kldunload "int fileid" "int flags" +.Fn kldunloadf "int fileid" "int flags" .Sh DESCRIPTION The .Fn kldunload ==== //depot/projects/arm/src/sys/amd64/amd64/machdep.c#27 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.681 2008/03/12 10:11:54 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.682 2008/03/13 10:54:36 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -357,7 +357,7 @@ regs->tf_rsp = (long)sfp; regs->tf_rip = PS_STRINGS - *(p->p_sysent->sv_szsigcode); - regs->tf_rflags &= ~PSL_T; + regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; PROC_LOCK(p); mtx_lock(&psp->ps_mtx); ==== //depot/projects/arm/src/sys/amd64/ia32/ia32_signal.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.15 2006/10/05 01:56:10 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.16 2008/03/13 10:54:37 kib Exp $"); #include "opt_compat.h" @@ -391,7 +391,7 @@ regs->tf_rsp = (uintptr_t)sfp; regs->tf_rip = FREEBSD32_PS_STRINGS - sz_freebsd4_ia32_sigcode; - regs->tf_rflags &= ~PSL_T; + regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucode32sel; regs->tf_ss = _udatasel; load_ds(_udatasel); @@ -511,7 +511,7 @@ regs->tf_rsp = (uintptr_t)sfp; regs->tf_rip = FREEBSD32_PS_STRINGS - *(p->p_sysent->sv_szsigcode); - regs->tf_rflags &= ~PSL_T; + regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucode32sel; regs->tf_ss = _udatasel; load_ds(_udatasel); ==== //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#19 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.32 2008/03/12 10:11:55 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.33 2008/03/13 10:54:37 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -401,7 +401,7 @@ regs->tf_rsp = PTROUT(fp); regs->tf_rip = LINUX32_PS_STRINGS - *(p->p_sysent->sv_szsigcode) + linux_sznonrtsigcode; - regs->tf_rflags &= ~PSL_T; + regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucode32sel; regs->tf_ss = _udatasel; load_ds(_udatasel); @@ -523,7 +523,7 @@ */ regs->tf_rsp = PTROUT(fp); regs->tf_rip = LINUX32_PS_STRINGS - *(p->p_sysent->sv_szsigcode); - regs->tf_rflags &= ~PSL_T; + regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucode32sel; regs->tf_ss = _udatasel; load_ds(_udatasel); ==== //depot/projects/arm/src/sys/dev/tdfx/tdfx_pci.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/tdfx/tdfx_pci.c,v 1.39 2006/03/03 21:37:36 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/tdfx/tdfx_pci.c,v 1.40 2008/03/13 14:08:41 cokane Exp $"); /* 3dfx driver for FreeBSD 4.x - Finished 11 May 2000, 12:25AM ET * @@ -823,4 +823,5 @@ /* Tell Mr. Kernel about us! */ DRIVER_MODULE(tdfx, pci, tdfx_driver, tdfx_devclass, 0, 0); +MODULE_DEPEND(tdfx, mem, 1, 1, 1); MODULE_VERSION(tdfx, 1); ==== //depot/projects/arm/src/sys/i386/i386/k6_mem.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/k6_mem.c,v 1.13 2008/03/12 21:44:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/k6_mem.c,v 1.14 2008/03/13 09:52:48 kib Exp $"); #include #include @@ -180,7 +180,7 @@ if ((cpu_id & 0xf00) != 0x500) return; if ((cpu_id & 0xf0) < 0x80 || - (cpu_id & 0xf0) == 0x80 && (cpu_id & 0xf) <= 0x7) + ((cpu_id & 0xf0) == 0x80 && (cpu_id & 0xf) <= 0x7)) return; mem_range_softc.mr_op = &k6_mrops; } ==== //depot/projects/arm/src/sys/i386/i386/machdep.c#32 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.665 2007/12/31 21:12:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.666 2008/03/13 10:54:37 kib Exp $"); #include "opt_apic.h" #include "opt_atalk.h" @@ -417,7 +417,7 @@ regs->tf_esp = (int)fp; regs->tf_eip = PS_STRINGS - szosigcode; - regs->tf_eflags &= ~PSL_T; + regs->tf_eflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; @@ -538,7 +538,7 @@ regs->tf_esp = (int)sfp; regs->tf_eip = PS_STRINGS - szfreebsd4_sigcode; - regs->tf_eflags &= ~PSL_T; + regs->tf_eflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; @@ -674,7 +674,7 @@ regs->tf_esp = (int)sfp; regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode); - regs->tf_eflags &= ~PSL_T; + regs->tf_eflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; ==== //depot/projects/arm/src/sys/i386/linux/linux_sysvec.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.151 2008/03/12 10:11:58 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.152 2008/03/13 10:54:37 kib Exp $"); #include #include @@ -388,7 +388,7 @@ regs->tf_esp = (int)fp; regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode) + linux_sznonrtsigcode; - regs->tf_eflags &= ~(PSL_T | PSL_VM); + regs->tf_eflags &= ~(PSL_T | PSL_VM | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; @@ -507,7 +507,7 @@ */ regs->tf_esp = (int)fp; regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode); - regs->tf_eflags &= ~(PSL_T | PSL_VM); + regs->tf_eflags &= ~(PSL_T | PSL_VM | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; ==== //depot/projects/arm/src/sys/i386/svr4/svr4_machdep.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/svr4/svr4_machdep.c,v 1.38 2005/10/19 14:59:54 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/svr4/svr4_machdep.c,v 1.39 2008/03/13 10:54:37 kib Exp $"); #include #include @@ -497,13 +497,13 @@ svr4_szsigcode); tf->tf_cs = GSEL(GUSERLDT_SEL, SEL_UPL); - tf->tf_eflags &= ~(PSL_T|PSL_VM|PSL_AC); + tf->tf_eflags &= ~(PSL_T|PSL_VM|PSL_AC|PSL_D); tf->tf_esp = (int)fp; tf->tf_ss = GSEL(GUSERLDT_SEL, SEL_UPL); #else tf->tf_esp = (int)fp; tf->tf_eip = (int)(((char *)PS_STRINGS) - *(p->p_sysent->sv_szsigcode)); - tf->tf_eflags &= ~PSL_T; + tf->tf_eflags &= ~(PSL_T | PSL_D); tf->tf_cs = _ucodesel; tf->tf_ds = _udatasel; tf->tf_es = _udatasel; ==== //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#18 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.47 2008/03/12 10:11:59 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.48 2008/03/13 00:46:12 jeff Exp $"); #include "opt_sleepqueue_profiling.h" #include "opt_ddb.h" @@ -403,12 +403,15 @@ mtx_unlock(&ps->ps_mtx); } /* - * Lock sleepq chain before unlocking proc - * without this, we could lose a race. + * Lock the per-process spinlock prior to dropping the PROC_LOCK + * to avoid a signal delivery race. PROC_LOCK, PROC_SLOCK, and + * thread_lock() are currently held in tdsignal(). */ + PROC_SLOCK(p); mtx_lock_spin(&sc->sc_lock); PROC_UNLOCK(p); thread_lock(td); + PROC_SUNLOCK(p); if (ret == 0) { sleepq_switch(wchan, pri); return (0); ==== //depot/projects/arm/src/sys/pc98/pc98/machdep.c#22 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.401 2008/03/12 10:12:00 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.402 2008/03/13 10:54:38 kib Exp $"); #include "opt_atalk.h" #include "opt_compat.h" @@ -385,7 +385,7 @@ regs->tf_esp = (int)fp; regs->tf_eip = PS_STRINGS - szosigcode; - regs->tf_eflags &= ~PSL_T; + regs->tf_eflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; @@ -506,7 +506,7 @@ regs->tf_esp = (int)sfp; regs->tf_eip = PS_STRINGS - szfreebsd4_sigcode; - regs->tf_eflags &= ~PSL_T; + regs->tf_eflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; @@ -642,7 +642,7 @@ regs->tf_esp = (int)sfp; regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode); - regs->tf_eflags &= ~PSL_T; + regs->tf_eflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; ==== //depot/projects/arm/src/sys/sys/cpuset.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/cpuset.h,v 1.2 2008/03/05 01:49:20 jeff Exp $ + * $FreeBSD: src/sys/sys/cpuset.h,v 1.3 2008/03/13 02:56:11 davidxu Exp $ */ #ifndef _SYS_CPUSET_H_ @@ -162,7 +162,7 @@ int cpuset_setid(cpuwhich_t, id_t, cpusetid_t); int cpuset_getid(cpulevel_t, cpuwhich_t, id_t, cpusetid_t *); int cpuset_getaffinity(cpulevel_t, cpuwhich_t, id_t, int, cpuset_t *); -int cpuset_setaffinity(cpulevel_t, cpuwhich_t, id_t, int, cpuset_t *); +int cpuset_setaffinity(cpulevel_t, cpuwhich_t, id_t, int, const cpuset_t *); __END_DECLS #endif #endif /* !_SYS_CPUSET_H_ */ ==== //depot/projects/arm/src/usr.bin/cpuset/cpuset.1#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.bin/cpuset/cpuset.1,v 1.2 2008/03/11 14:48:59 joel Exp $ +.\" $FreeBSD: src/usr.bin/cpuset/cpuset.1,v 1.3 2008/03/12 23:54:40 jeff Exp $ .\" .Dd March 11, 2008 .Dt CPUSET 1 @@ -89,8 +89,12 @@ When running a command it may join a set specified with .Fl s otherwise a new set is created. -In addition, a mask for the set may be specified using +In addition, a mask for the command may be specified using .Fl l . +When used in conjunction with +.Fl c +the mask modifies the supplied or created set rather than the private mask +for the thread. .Pp The options are as follows: .Bl -tag -width ".Fl l Ar cpu-list" @@ -127,7 +131,7 @@ Create a new group with CPUs 0-4 inclusive and run .Pa /bin/sh on it: -.Dl cpuset -l 0-4 /bin/sh +.Dl cpuset -c -l 0-4 /bin/sh .Pp Query the mask of CPUs the .Aq sh pid ==== //depot/projects/arm/src/usr.bin/cpuset/cpuset.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/cpuset/cpuset.c,v 1.3 2008/03/05 02:10:43 jeff Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/cpuset/cpuset.c,v 1.4 2008/03/12 23:54:40 jeff Exp $"); #include #include @@ -257,7 +257,7 @@ * The user wants to run a command with a set and possibly cpumask. */ if (argc) { - if (pflag | rflag | tflag || cflag) + if (pflag | rflag | tflag) usage(); if (sflag) { if (cpuset_setid(CPU_WHICH_PID, -1, setid)) @@ -267,7 +267,7 @@ err(argc, "newid"); } if (lflag) { - if (cpuset_setaffinity(CPU_LEVEL_CPUSET, CPU_WHICH_PID, + if (cpuset_setaffinity(level, CPU_WHICH_PID, -1, sizeof(mask), &mask) != 0) err(EXIT_FAILURE, "setaffinity"); } From owner-p4-projects@FreeBSD.ORG Thu Mar 13 15:31:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 975A41065674; Thu, 13 Mar 2008 15:31:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 339DF1065671 for ; Thu, 13 Mar 2008 15:31:49 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1A44F8FC26 for ; Thu, 13 Mar 2008 15:31:48 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DFVmEC071236 for ; Thu, 13 Mar 2008 15:31:48 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DFVmeY071234 for perforce@freebsd.org; Thu, 13 Mar 2008 15:31:48 GMT (envelope-from imp@freebsd.org) Date: Thu, 13 Mar 2008 15:31:48 GMT Message-Id: <200803131531.m2DFVmeY071234@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 137615 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, 13 Mar 2008 15:31:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=137615 Change 137615 by imp@imp_paco-paco on 2008/03/13 15:31:19 IFC @137612 Affected files ... .. //depot/projects/mips2/src/lib/libc/gen/sem_timedwait.3#2 integrate .. //depot/projects/mips2/src/lib/libc/gen/sem_wait.3#2 integrate .. //depot/projects/mips2/src/lib/libc/sys/kldunload.2#3 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/mips2/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/mips2/src/sys/amd64/linux32/linux32_sysvec.c#6 integrate .. //depot/projects/mips2/src/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/mips2/src/sys/i386/i386/k6_mem.c#3 integrate .. //depot/projects/mips2/src/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/mips2/src/sys/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/mips2/src/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/mips2/src/sys/kern/subr_sleepqueue.c#8 integrate .. //depot/projects/mips2/src/sys/pc98/pc98/machdep.c#10 integrate .. //depot/projects/mips2/src/sys/sys/cpuset.h#2 integrate .. //depot/projects/mips2/src/usr.bin/cpuset/cpuset.1#3 integrate .. //depot/projects/mips2/src/usr.bin/cpuset/cpuset.c#2 integrate Differences ... ==== //depot/projects/mips2/src/lib/libc/gen/sem_timedwait.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_timedwait.3,v 1.2 2008/03/12 02:37:31 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_timedwait.3,v 1.4 2008/03/13 10:26:17 ru Exp $ .\" .Dd March 3, 2008 .Dt SEM_TIMEDWAIT 3 @@ -106,17 +106,15 @@ A signal interrupted this function. .El .Sh SEE ALSO -.Xr semctl 2 , -.Xr semget 2 , -.Xr semop 2 , .Xr sem_post 3 , .Xr sem_trywait 3 , -.Xr sem_wait 3 +.Xr sem_wait 3 , +.Xr sem 4 .Sh STANDARDS The .Fn sem_timedwait function conforms to .St -p1003.1-2004 . .Sh HISTORY -The function first appeared in +The function first appeared in .Fx 5.0 . ==== //depot/projects/mips2/src/lib/libc/gen/sem_wait.3#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_wait.3,v 1.13 2005/07/13 13:15:22 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_wait.3,v 1.15 2008/03/13 10:25:30 ru Exp $ .\" .Dd February 15, 2000 .Dt SEM_WAIT 3 @@ -84,6 +84,7 @@ .Sh SEE ALSO .Xr sem_getvalue 3 , .Xr sem_post 3 , +.Xr sem_timedwait 3 , .Xr sem 4 .Sh STANDARDS The ==== //depot/projects/mips2/src/lib/libc/sys/kldunload.2#3 (text+ko) ==== @@ -23,14 +23,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kldunload.2,v 1.19 2008/03/10 09:54:13 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/sys/kldunload.2,v 1.20 2008/03/13 10:33:24 ru Exp $ .\" .Dd March 10, 2008 .Dt KLDUNLOAD 2 .Os .Sh NAME -.Nm kldunload -.Nm kldunloadf +.Nm kldunload , kldunloadf .Nd unload kld files .Sh LIBRARY .Lb libc @@ -40,7 +39,7 @@ .Ft int .Fn kldunload "int fileid" .Ft int -.Fn kldunload "int fileid" "int flags" +.Fn kldunloadf "int fileid" "int flags" .Sh DESCRIPTION The .Fn kldunload ==== //depot/projects/mips2/src/sys/amd64/amd64/machdep.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.681 2008/03/12 10:11:54 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.682 2008/03/13 10:54:36 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -357,7 +357,7 @@ regs->tf_rsp = (long)sfp; regs->tf_rip = PS_STRINGS - *(p->p_sysent->sv_szsigcode); - regs->tf_rflags &= ~PSL_T; + regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; PROC_LOCK(p); mtx_lock(&psp->ps_mtx); ==== //depot/projects/mips2/src/sys/amd64/ia32/ia32_signal.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.15 2006/10/05 01:56:10 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.16 2008/03/13 10:54:37 kib Exp $"); #include "opt_compat.h" @@ -391,7 +391,7 @@ regs->tf_rsp = (uintptr_t)sfp; regs->tf_rip = FREEBSD32_PS_STRINGS - sz_freebsd4_ia32_sigcode; - regs->tf_rflags &= ~PSL_T; + regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucode32sel; regs->tf_ss = _udatasel; load_ds(_udatasel); @@ -511,7 +511,7 @@ regs->tf_rsp = (uintptr_t)sfp; regs->tf_rip = FREEBSD32_PS_STRINGS - *(p->p_sysent->sv_szsigcode); - regs->tf_rflags &= ~PSL_T; + regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucode32sel; regs->tf_ss = _udatasel; load_ds(_udatasel); ==== //depot/projects/mips2/src/sys/amd64/linux32/linux32_sysvec.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.32 2008/03/12 10:11:55 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.33 2008/03/13 10:54:37 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -401,7 +401,7 @@ regs->tf_rsp = PTROUT(fp); regs->tf_rip = LINUX32_PS_STRINGS - *(p->p_sysent->sv_szsigcode) + linux_sznonrtsigcode; - regs->tf_rflags &= ~PSL_T; + regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucode32sel; regs->tf_ss = _udatasel; load_ds(_udatasel); @@ -523,7 +523,7 @@ */ regs->tf_rsp = PTROUT(fp); regs->tf_rip = LINUX32_PS_STRINGS - *(p->p_sysent->sv_szsigcode); - regs->tf_rflags &= ~PSL_T; + regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucode32sel; regs->tf_ss = _udatasel; load_ds(_udatasel); ==== //depot/projects/mips2/src/sys/dev/tdfx/tdfx_pci.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/tdfx/tdfx_pci.c,v 1.39 2006/03/03 21:37:36 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/tdfx/tdfx_pci.c,v 1.40 2008/03/13 14:08:41 cokane Exp $"); /* 3dfx driver for FreeBSD 4.x - Finished 11 May 2000, 12:25AM ET * @@ -823,4 +823,5 @@ /* Tell Mr. Kernel about us! */ DRIVER_MODULE(tdfx, pci, tdfx_driver, tdfx_devclass, 0, 0); +MODULE_DEPEND(tdfx, mem, 1, 1, 1); MODULE_VERSION(tdfx, 1); ==== //depot/projects/mips2/src/sys/i386/i386/k6_mem.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/k6_mem.c,v 1.13 2008/03/12 21:44:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/k6_mem.c,v 1.14 2008/03/13 09:52:48 kib Exp $"); #include #include @@ -180,7 +180,7 @@ if ((cpu_id & 0xf00) != 0x500) return; if ((cpu_id & 0xf0) < 0x80 || - (cpu_id & 0xf0) == 0x80 && (cpu_id & 0xf) <= 0x7) + ((cpu_id & 0xf0) == 0x80 && (cpu_id & 0xf) <= 0x7)) return; mem_range_softc.mr_op = &k6_mrops; } ==== //depot/projects/mips2/src/sys/i386/i386/machdep.c#10 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.665 2007/12/31 21:12:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.666 2008/03/13 10:54:37 kib Exp $"); #include "opt_apic.h" #include "opt_atalk.h" @@ -417,7 +417,7 @@ regs->tf_esp = (int)fp; regs->tf_eip = PS_STRINGS - szosigcode; - regs->tf_eflags &= ~PSL_T; + regs->tf_eflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; @@ -538,7 +538,7 @@ regs->tf_esp = (int)sfp; regs->tf_eip = PS_STRINGS - szfreebsd4_sigcode; - regs->tf_eflags &= ~PSL_T; + regs->tf_eflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; @@ -674,7 +674,7 @@ regs->tf_esp = (int)sfp; regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode); - regs->tf_eflags &= ~PSL_T; + regs->tf_eflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; ==== //depot/projects/mips2/src/sys/i386/linux/linux_sysvec.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.151 2008/03/12 10:11:58 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.152 2008/03/13 10:54:37 kib Exp $"); #include #include @@ -388,7 +388,7 @@ regs->tf_esp = (int)fp; regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode) + linux_sznonrtsigcode; - regs->tf_eflags &= ~(PSL_T | PSL_VM); + regs->tf_eflags &= ~(PSL_T | PSL_VM | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; @@ -507,7 +507,7 @@ */ regs->tf_esp = (int)fp; regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode); - regs->tf_eflags &= ~(PSL_T | PSL_VM); + regs->tf_eflags &= ~(PSL_T | PSL_VM | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; ==== //depot/projects/mips2/src/sys/i386/svr4/svr4_machdep.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/svr4/svr4_machdep.c,v 1.38 2005/10/19 14:59:54 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/svr4/svr4_machdep.c,v 1.39 2008/03/13 10:54:37 kib Exp $"); #include #include @@ -497,13 +497,13 @@ svr4_szsigcode); tf->tf_cs = GSEL(GUSERLDT_SEL, SEL_UPL); - tf->tf_eflags &= ~(PSL_T|PSL_VM|PSL_AC); + tf->tf_eflags &= ~(PSL_T|PSL_VM|PSL_AC|PSL_D); tf->tf_esp = (int)fp; tf->tf_ss = GSEL(GUSERLDT_SEL, SEL_UPL); #else tf->tf_esp = (int)fp; tf->tf_eip = (int)(((char *)PS_STRINGS) - *(p->p_sysent->sv_szsigcode)); - tf->tf_eflags &= ~PSL_T; + tf->tf_eflags &= ~(PSL_T | PSL_D); tf->tf_cs = _ucodesel; tf->tf_ds = _udatasel; tf->tf_es = _udatasel; ==== //depot/projects/mips2/src/sys/kern/subr_sleepqueue.c#8 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.47 2008/03/12 10:11:59 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.48 2008/03/13 00:46:12 jeff Exp $"); #include "opt_sleepqueue_profiling.h" #include "opt_ddb.h" @@ -403,12 +403,15 @@ mtx_unlock(&ps->ps_mtx); } /* - * Lock sleepq chain before unlocking proc - * without this, we could lose a race. + * Lock the per-process spinlock prior to dropping the PROC_LOCK + * to avoid a signal delivery race. PROC_LOCK, PROC_SLOCK, and + * thread_lock() are currently held in tdsignal(). */ + PROC_SLOCK(p); mtx_lock_spin(&sc->sc_lock); PROC_UNLOCK(p); thread_lock(td); + PROC_SUNLOCK(p); if (ret == 0) { sleepq_switch(wchan, pri); return (0); ==== //depot/projects/mips2/src/sys/pc98/pc98/machdep.c#10 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.401 2008/03/12 10:12:00 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.402 2008/03/13 10:54:38 kib Exp $"); #include "opt_atalk.h" #include "opt_compat.h" @@ -385,7 +385,7 @@ regs->tf_esp = (int)fp; regs->tf_eip = PS_STRINGS - szosigcode; - regs->tf_eflags &= ~PSL_T; + regs->tf_eflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; @@ -506,7 +506,7 @@ regs->tf_esp = (int)sfp; regs->tf_eip = PS_STRINGS - szfreebsd4_sigcode; - regs->tf_eflags &= ~PSL_T; + regs->tf_eflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; @@ -642,7 +642,7 @@ regs->tf_esp = (int)sfp; regs->tf_eip = PS_STRINGS - *(p->p_sysent->sv_szsigcode); - regs->tf_eflags &= ~PSL_T; + regs->tf_eflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; regs->tf_es = _udatasel; ==== //depot/projects/mips2/src/sys/sys/cpuset.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/cpuset.h,v 1.2 2008/03/05 01:49:20 jeff Exp $ + * $FreeBSD: src/sys/sys/cpuset.h,v 1.3 2008/03/13 02:56:11 davidxu Exp $ */ #ifndef _SYS_CPUSET_H_ @@ -162,7 +162,7 @@ int cpuset_setid(cpuwhich_t, id_t, cpusetid_t); int cpuset_getid(cpulevel_t, cpuwhich_t, id_t, cpusetid_t *); int cpuset_getaffinity(cpulevel_t, cpuwhich_t, id_t, int, cpuset_t *); -int cpuset_setaffinity(cpulevel_t, cpuwhich_t, id_t, int, cpuset_t *); +int cpuset_setaffinity(cpulevel_t, cpuwhich_t, id_t, int, const cpuset_t *); __END_DECLS #endif #endif /* !_SYS_CPUSET_H_ */ ==== //depot/projects/mips2/src/usr.bin/cpuset/cpuset.1#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.bin/cpuset/cpuset.1,v 1.2 2008/03/11 14:48:59 joel Exp $ +.\" $FreeBSD: src/usr.bin/cpuset/cpuset.1,v 1.3 2008/03/12 23:54:40 jeff Exp $ .\" .Dd March 11, 2008 .Dt CPUSET 1 @@ -89,8 +89,12 @@ When running a command it may join a set specified with .Fl s otherwise a new set is created. -In addition, a mask for the set may be specified using +In addition, a mask for the command may be specified using .Fl l . +When used in conjunction with +.Fl c +the mask modifies the supplied or created set rather than the private mask +for the thread. .Pp The options are as follows: .Bl -tag -width ".Fl l Ar cpu-list" @@ -127,7 +131,7 @@ Create a new group with CPUs 0-4 inclusive and run .Pa /bin/sh on it: -.Dl cpuset -l 0-4 /bin/sh +.Dl cpuset -c -l 0-4 /bin/sh .Pp Query the mask of CPUs the .Aq sh pid ==== //depot/projects/mips2/src/usr.bin/cpuset/cpuset.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/cpuset/cpuset.c,v 1.3 2008/03/05 02:10:43 jeff Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/cpuset/cpuset.c,v 1.4 2008/03/12 23:54:40 jeff Exp $"); #include #include @@ -257,7 +257,7 @@ * The user wants to run a command with a set and possibly cpumask. */ if (argc) { - if (pflag | rflag | tflag || cflag) + if (pflag | rflag | tflag) usage(); if (sflag) { if (cpuset_setid(CPU_WHICH_PID, -1, setid)) @@ -267,7 +267,7 @@ err(argc, "newid"); } if (lflag) { - if (cpuset_setaffinity(CPU_LEVEL_CPUSET, CPU_WHICH_PID, + if (cpuset_setaffinity(level, CPU_WHICH_PID, -1, sizeof(mask), &mask) != 0) err(EXIT_FAILURE, "setaffinity"); } From owner-p4-projects@FreeBSD.ORG Thu Mar 13 15:46:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDE2A106567A; Thu, 13 Mar 2008 15:46:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 917361065671 for ; Thu, 13 Mar 2008 15:46:04 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 782D68FC13 for ; Thu, 13 Mar 2008 15:46:04 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DFk4g6071781 for ; Thu, 13 Mar 2008 15:46:04 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DFk36D071779 for perforce@freebsd.org; Thu, 13 Mar 2008 15:46:03 GMT (envelope-from imp@freebsd.org) Date: Thu, 13 Mar 2008 15:46:03 GMT Message-Id: <200803131546.m2DFk36D071779@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 137619 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, 13 Mar 2008 15:46:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=137619 Change 137619 by imp@imp_paco-paco on 2008/03/13 15:45:44 IFC @137615 Affected files ... .. //depot/projects/mips2-jnpr/src/UPDATING#4 integrate .. //depot/projects/mips2-jnpr/src/bin/cp/cp.1#2 integrate .. //depot/projects/mips2-jnpr/src/bin/cp/cp.c#2 integrate .. //depot/projects/mips2-jnpr/src/bin/cp/utils.c#2 integrate .. //depot/projects/mips2-jnpr/src/bin/ps/ps.1#2 integrate .. //depot/projects/mips2-jnpr/src/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/mountlate#3 integrate .. //depot/projects/mips2-jnpr/src/etc/rc.d/root#2 integrate .. //depot/projects/mips2-jnpr/src/lib/Makefile#5 integrate .. //depot/projects/mips2-jnpr/src/lib/libalias/libalias/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_private.h#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_support_format_ar.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/Makefile#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/main.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test.h#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/gen/sem_timedwait.3#1 branch .. //depot/projects/mips2-jnpr/src/lib/libc/gen/sem_wait.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libc/sys/kldunload.2#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libsdp/sdp.h#2 integrate .. //depot/projects/mips2-jnpr/src/lib/libthr/thread/thr_sem.c#3 integrate .. //depot/projects/mips2-jnpr/src/lib/libthread_db/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/mips2-jnpr/src/sbin/mount/mount.8#3 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/uart.4#2 integrate .. //depot/projects/mips2-jnpr/src/share/man/man4/vr.4#2 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/conf/AVILA#3 integrate .. //depot/projects/mips2-jnpr/src/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/powerpc/uboot/metadata.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/mips2-jnpr/src/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/files#6 integrate .. //depot/projects/mips2-jnpr/src/sys/conf/options#4 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/uart/uart.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/usb/ums.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/vr/if_vr.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/vr/if_vrreg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/ibcs2/imgact_coff.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/mips2-jnpr/src/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/init_sysent.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_kse.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_resource.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_sig.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_switch.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_synch.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/p1003_1b.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/sched_ule.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/subr_trap.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/sys_process.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/syscalls.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/syscalls.master#4 integrate .. //depot/projects/mips2-jnpr/src/sys/kern/systrace_args.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/modules/vr/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/mips2-jnpr/src/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/netinet/libalias/alias_old.c#2 delete .. //depot/projects/mips2-jnpr/src/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/mips2-jnpr/src/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/bootinfo.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/powerpc/powerpc/intr_machdep.c#4 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/condvar.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/cpuset.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/disklabel.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/kse.h#2 delete .. //depot/projects/mips2-jnpr/src/sys/sys/param.h#5 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/proc.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/sched.h#3 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/syscall.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/syscall.mk#4 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/sysproto.h#4 integrate .. //depot/projects/mips2-jnpr/src/sys/sys/systm.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/vm/vm_glue.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/mips2-jnpr/src/sys/vm/vm_meter.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/ar/ar.1#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/ar/ar.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/ar/ar.h#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/ar/write.c#3 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/cpuset/cpuset.1#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/cpuset/cpuset.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/kdump/kdump.c#3 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/kdump/kdump_subr.h#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/kdump/mksubr#3 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/make/globals.h#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/make/hash_tables.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/make/main.c#3 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/make/make.1#3 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/make/parse.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.bin/ministat/ministat.1#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/bluetooth/sdpd/Makefile#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/bluetooth/sdpd/gn.c#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/bluetooth/sdpd/nap.c#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/bluetooth/sdpd/panu.c#1 branch .. //depot/projects/mips2-jnpr/src/usr.sbin/bluetooth/sdpd/profile.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/bluetooth/sdpd/profile.h#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/ppp/command.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/ppp/ipcp.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/ppp/main.c#2 integrate .. //depot/projects/mips2-jnpr/src/usr.sbin/ppp/nat_cmd.c#2 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/UPDATING#4 (text+ko) ==== @@ -22,6 +22,16 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080312: + Support for KSE threading has been removed from the kernel. To + run legacy applications linked against KSE libmap.conf may + be used. The following libmap.conf may be used to ensure + compatibility with any prior release: + + libpthread.so.1 libthr.so.1 + libpthread.so.2 libthr.so.2 + libkse.so.3 libthr.so.3 + 20080301: The layout of struct vmspace has changed. This affects libkvm and any executables that link against libkvm and use the @@ -997,4 +1007,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ ==== //depot/projects/mips2-jnpr/src/bin/cp/cp.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $ .\" .Dd October 27, 2006 .Dt CP 1 @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -116,6 +116,10 @@ or .Xr pax 1 instead. +.It Fl a +Archive mode. +Same as +.Fl RpP . .It Fl f For each existing destination pathname, remove it and create a new file, without prompting for confirmation ==== //depot/projects/mips2-jnpr/src/bin/cp/cp.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); /* * Cp copies source files to target files. @@ -102,7 +102,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -119,6 +119,12 @@ case 'R': Rflag = 1; break; + case 'a': + Pflag = 1; + pflag = 1; + Rflag = 1; + Hflag = Lflag = 0; + break; case 'f': fflag = 1; iflag = nflag = 0; ==== //depot/projects/mips2-jnpr/src/bin/cp/utils.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.53 2008/03/10 19:58:41 jhb Exp $"); #include #include @@ -429,8 +429,8 @@ { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " "target_directory"); exit(EX_USAGE); } ==== //depot/projects/mips2-jnpr/src/bin/ps/ps.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.90 2008/03/12 10:01:34 jeff Exp $ .\" .Dd August 21, 2006 .Dt PS 1 @@ -290,7 +290,6 @@ .It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us" .It Dv "P_WEXIT" Ta No "0x02000 Working on exiting" .It Dv "P_EXEC" Ta No "0x04000 Process called exec" -.It Dv "P_SA" Ta No "0x08000 Using scheduler activations" .It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state" .It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP" .It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing" ==== //depot/projects/mips2-jnpr/src/contrib/tcsh/sh.lex.c#2 (text+ko) ==== @@ -851,7 +851,8 @@ return (en); } slhs.len = 0; - Strbuf_append(&slhs, lhsb.s); + if (lhsb.s != NULL && lhsb.len != 0) + Strbuf_append(&slhs, lhsb.s); Strbuf_terminate(&slhs); if (exclc) en = dosub(sc, en, global); ==== //depot/projects/mips2-jnpr/src/etc/rc.d/mountlate#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.3 2008/03/06 14:39:33 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.5 2008/03/11 17:21:55 delphij Exp $ # # PROVIDE: mountlate @@ -33,6 +33,12 @@ stop_boot true ;; esac + + # If we booted a special kernel remove the record + # so we will boot the default kernel next time. + if [ -x /sbin/nextboot ]; then + /sbin/nextboot -D + fi } load_rc_config $name ==== //depot/projects/mips2-jnpr/src/etc/rc.d/root#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/root,v 1.16 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.17 2008/03/11 17:21:14 delphij Exp $ # # PROVIDE: root @@ -34,7 +34,7 @@ # If we booted a special kernel remove the record # so we will boot the default kernel next time. if [ -x /sbin/nextboot ]; then - /sbin/nextboot -D + /sbin/nextboot -D > /dev/null 2>&1 fi } ==== //depot/projects/mips2-jnpr/src/lib/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $ .include @@ -34,7 +34,7 @@ ${_libgssapi} libipsec \ ${_libipx} libkiconv ${_libmagic} libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ + libpmc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -108,10 +108,6 @@ _libsmb= libsmb .endif -.if ${MK_LIBKSE} != "no" && ${MACHINE_ARCH} != "mips" -_libkse= libkse -.endif - .if ${MK_LIBTHR} != "no" _libthr= libthr .endif ==== //depot/projects/mips2-jnpr/src/lib/libalias/libalias/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.4 2007/06/18 18:47:53 rafan Exp $ +# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.5 2008/03/12 11:58:28 piso Exp $ .PATH: ${.CURDIR}/../../../sys/netinet/libalias @@ -6,7 +6,7 @@ SHLIBDIR?= /lib SHLIB_MAJOR= 6 MAN= libalias.3 -SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c +SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c INCS= alias.h WARNS?= 6 NO_WERROR= ==== //depot/projects/mips2-jnpr/src/lib/libarchive/archive_entry.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.45 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.47 2008/03/12 04:47:37 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -1124,6 +1124,11 @@ entry->acl_p = entry->acl_p->next; if (entry->acl_p == NULL) { entry->acl_state = 0; + *type = 0; + *permset = 0; + *tag = 0; + *id = -1; + *name = NULL; return (ARCHIVE_EOF); /* End of ACL entries. */ } *type = entry->acl_p->type; @@ -1505,7 +1510,7 @@ return (ARCHIVE_OK); } else { *name = NULL; - *name = NULL; + *value = NULL; *size = (size_t)0; return (ARCHIVE_WARN); } ==== //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.37 2008/01/03 17:54:26 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.38 2008/03/12 04:58:32 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -64,26 +64,13 @@ archive_read_new(void) { struct archive_read *a; - unsigned char *nulls; a = (struct archive_read *)malloc(sizeof(*a)); if (a == NULL) return (NULL); memset(a, 0, sizeof(*a)); a->archive.magic = ARCHIVE_READ_MAGIC; - a->bytes_per_block = ARCHIVE_DEFAULT_BYTES_PER_BLOCK; - a->null_length = 1024; - nulls = (unsigned char *)malloc(a->null_length); - if (nulls == NULL) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate archive object 'nulls' element"); - free(a); - return (NULL); - } - memset(nulls, 0, a->null_length); - a->nulls = nulls; - a->archive.state = ARCHIVE_STATE_NEW; a->entry = archive_entry_new(); @@ -660,8 +647,6 @@ (a->formats[i].cleanup)(a); } - /* Casting a pointer to int allows us to remove 'const.' */ - free((void *)(uintptr_t)(const void *)a->nulls); archive_string_free(&a->archive.error_string); if (a->entry) archive_entry_free(a->entry); ==== //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_private.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.4 2008/01/03 17:54:26 des Exp $ + * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.5 2008/03/12 04:58:32 kientzle Exp $ */ #ifndef ARCHIVE_READ_PRIVATE_H_INCLUDED @@ -41,10 +41,6 @@ dev_t skip_file_dev; ino_t skip_file_ino; - /* Utility: Pointer to a block of nulls. */ - const unsigned char *nulls; - size_t null_length; - /* * Used by archive_read_data() to track blocks and copy * data to client buffers, filling gaps with zero bytes. @@ -58,30 +54,9 @@ archive_open_callback *client_opener; archive_read_callback *client_reader; archive_skip_callback *client_skipper; - archive_write_callback *client_writer; archive_close_callback *client_closer; void *client_data; - /* - * Blocking information. Note that bytes_in_last_block is - * misleadingly named; I should find a better name. These - * control the final output from all compressors, including - * compression_none. - */ - int bytes_per_block; - int bytes_in_last_block; - - /* - * These control whether data within a gzip/bzip2 compressed - * stream gets padded or not. If pad_uncompressed is set, - * the data will be padded to a full block before being - * compressed. The pad_uncompressed_byte determines the value - * that will be used for padding. Note that these have no - * effect on compression "none." - */ - int pad_uncompressed; - int pad_uncompressed_byte; /* TODO: Support this. */ - /* File offset of beginning of most recently-read header. */ off_t header_position; @@ -142,18 +117,6 @@ struct archive_format_descriptor *format; /* Active format. */ /* - * Pointers to format-specific functions for writing. They're - * initialized by archive_write_set_format_XXX() calls. - */ - int (*format_init)(struct archive *); /* Only used on write. */ - int (*format_finish)(struct archive *); - int (*format_finish_entry)(struct archive *); - int (*format_write_header)(struct archive *, - struct archive_entry *); - ssize_t (*format_write_data)(struct archive *, - const void *buff, size_t); - - /* * Various information needed by archive_extract. */ struct extract *extract; ==== //depot/projects/mips2-jnpr/src/lib/libarchive/archive_read_support_format_ar.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.8 2008/02/19 05:54:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.9 2008/03/12 21:10:26 kaiw Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -83,8 +83,7 @@ struct archive_entry *e); static uint64_t ar_atol8(const char *p, unsigned char_cnt); static uint64_t ar_atol10(const char *p, unsigned char_cnt); -static int ar_parse_gnu_filename_table(struct archive_read *, struct ar *, - const void *, size_t); +static int ar_parse_gnu_filename_table(struct archive_read *a); static int ar_parse_common_header(struct ar *ar, struct archive_entry *, const char *h); @@ -167,8 +166,8 @@ struct ar *ar; uint64_t number; /* Used to hold parsed numbers before validation. */ ssize_t bytes_read; - size_t bsd_name_length, entry_size; - char *p; + size_t bsd_name_length, entry_size, s; + char *p, *st; const void *b; const char *h; int r; @@ -277,22 +276,42 @@ return (ARCHIVE_FATAL); } entry_size = (size_t)number; + if (entry_size == 0) { + archive_set_error(&a->archive, EINVAL, + "Invalid string table"); + return (ARCHIVE_WARN); + } + if (ar->strtab != NULL) { + archive_set_error(&a->archive, EINVAL, + "More than one string tables exist"); + return (ARCHIVE_WARN); + } + /* Read the filename table into memory. */ - bytes_read = (a->decompressor->read_ahead)(a, &b, entry_size); - if (bytes_read <= 0) + st = malloc(entry_size); + if (st == NULL) { + archive_set_error(&a->archive, ENOMEM, + "Can't allocate filename table buffer"); return (ARCHIVE_FATAL); - if ((size_t)bytes_read < entry_size) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Truncated input file"); - return (ARCHIVE_FATAL); + } + ar->strtab = st; + ar->strtab_size = entry_size; + for (s = entry_size; s > 0; s -= bytes_read) { + bytes_read = (a->decompressor->read_ahead)(a, &b, s); + if (bytes_read <= 0) + return (ARCHIVE_FATAL); + if (bytes_read > (ssize_t)s) + bytes_read = s; + memcpy(st, b, bytes_read); + st += bytes_read; + (a->decompressor->consume)(a, bytes_read); } - /* - * Don't consume the contents, so the client will - * also get a shot at reading it. - */ + /* All contents are consumed. */ + ar->entry_bytes_remaining = 0; + archive_entry_set_size(entry, ar->entry_bytes_remaining); /* Parse the filename table. */ - return (ar_parse_gnu_filename_table(a, ar, b, entry_size)); + return (ar_parse_gnu_filename_table(a)); } /* @@ -492,31 +511,15 @@ } static int -ar_parse_gnu_filename_table(struct archive_read *a, struct ar *ar, - const void *h, size_t size) +ar_parse_gnu_filename_table(struct archive_read *a) { + struct ar *ar; char *p; + size_t size; - if (ar->strtab != NULL) { - archive_set_error(&a->archive, EINVAL, - "More than one string tables exist"); - return (ARCHIVE_WARN); - } - - if (size == 0) { - archive_set_error(&a->archive, EINVAL, "Invalid string table"); - return (ARCHIVE_WARN); - } + ar = (struct ar*)(a->format->data); + size = ar->strtab_size; - ar->strtab_size = size; - ar->strtab = malloc(size); - if (ar->strtab == NULL) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate string table buffer"); - return (ARCHIVE_FATAL); - } - - (void)memcpy(ar->strtab, h, size); for (p = ar->strtab; p < ar->strtab + size - 1; ++p) { if (*p == '/') { *p++ = '\0'; ==== //depot/projects/mips2-jnpr/src/lib/libarchive/test/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.14 2008/01/31 07:47:38 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.15 2008/03/12 05:12:23 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -7,17 +7,6 @@ # Get a list of all libarchive source files LA_SRCS!=make -f ${LA_SRCDIR}/Makefile -V SRCS -TESTFILES= \ - test_compat_gtar_1.tgz \ - test_compat_tar_hardlink_1.tar \ - test_compat_zip_1.zip \ - test_read_format_gtar_sparse_1_13.tgz \ - test_read_format_gtar_sparse_1_17.tgz \ - test_read_format_gtar_sparse_1_17_posix00.tgz \ - test_read_format_gtar_sparse_1_17_posix01.tgz \ - test_read_format_gtar_sparse_1_17_posix10.tgz \ - test_read_format_gtar_sparse_1_17_posix10_modified.tar - TESTS= \ test_acl_basic.c \ test_acl_pax.c \ @@ -104,13 +93,8 @@ WARNS=6 # Build libarchive_test and run it. -check test: libarchive_test ${TESTFILES} - ./libarchive_test - -.for f in ${TESTFILES} -${f}: ${f}.uu - uudecode -p ${.CURDIR}/${f}.uu >${f} -.endfor +check test: libarchive_test + ./libarchive_test -k -r ${.CURDIR} INCS=archive.h list.h ==== //depot/projects/mips2-jnpr/src/lib/libarchive/test/main.c#3 (text+ko) ==== @@ -24,23 +24,26 @@ */ /* - * This same file is used pretty much verbatim for all test harnesses. - * - * The next line is used to define various environment variables, etc. - * - * The tar and cpio test harnesses are identical except for this line; - * the libarchive test harness omits some code that is needed only for - * testing standalone executables. + * Various utility routines useful for test programs. + * Each test program is linked against this file. */ -#define PROGRAM "LIBARCHIVE" - #include #include #include #include #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.10 2008/02/19 05:52:30 kientzle Exp $"); + +/* + * This same file is used pretty much verbatim for all test harnesses. + * + * The next few lines are the only differences. + */ +#undef PROGRAM /* Testing a library, not a program. */ +#define ENVBASE "LIBARCHIVE" /* Prefix for environment variables. */ +#define EXTRA_DUMP(x) archive_error_string((struct archive *)(x)) +#define EXTRA_VERSION archive_version() +__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.11 2008/03/12 05:12:23 kientzle Exp $"); /* * "list.h" is simply created by "grep DEFINE_TEST"; it has @@ -51,7 +54,7 @@ * test functions. */ #undef DEFINE_TEST -#define DEFINE_TEST(name) void name(void); +#define DEFINE_TEST(name) void name(void); #include "list.h" /* Interix doesn't define these in a standard header. */ @@ -71,6 +74,9 @@ /* Cumulative count of assertions. */ static int assertions = 0; +/* Directory where uuencoded reference files can be found. */ +static char *refdir; + /* * My own implementation of the standard assert() macro emits the * message in the same format as GCC (file:line: message). @@ -90,7 +96,7 @@ * For each test source file, we remember how many times each * failure was reported. */ -static const char *failed_filename; +static const char *failed_filename = NULL; static struct line { int line; int count; @@ -163,9 +169,13 @@ fprintf(stderr, " Description: %s\n", msg); msg[0] = '\0'; } - if (extra != NULL) { - fprintf(stderr, " archive error: %s\n", archive_error_string((struct archive *)extra)); - } + +#ifdef EXTRA_DUMP + if (extra != NULL) + fprintf(stderr, " detail: %s\n", EXTRA_DUMP(extra)); +#else + (void)extra; /* UNUSED */ +#endif if (dump_on_failure) { fprintf(stderr, @@ -241,27 +251,28 @@ } /* assertEqualInt() displays the values of the two integers. */ -void +int test_assert_equal_int(const char *file, int line, int v1, const char *e1, int v2, const char *e2, void *extra) { ++assertions; if (v1 == v2) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: Ints not equal\n", file, line); fprintf(stderr, " %s=%d\n", e1, v1); fprintf(stderr, " %s=%d\n", e2, v2); report_failure(extra); + return (0); } /* assertEqualString() displays the values of the two strings. */ -void +int test_assert_equal_string(const char *file, int line, const char *v1, const char *e1, const char *v2, const char *e2, @@ -271,24 +282,25 @@ if (v1 == NULL || v2 == NULL) { if (v1 == v2) { msg[0] = '\0'; - return; + return (1); } } else if (strcmp(v1, v2) == 0) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: Strings not equal\n", file, line); fprintf(stderr, " %s = \"%s\"\n", e1, v1); fprintf(stderr, " %s = \"%s\"\n", e2, v2); report_failure(extra); + return (0); } /* assertEqualWString() displays the values of the two strings. */ -void +int test_assert_equal_wstring(const char *file, int line, const wchar_t *v1, const char *e1, const wchar_t *v2, const char *e2, @@ -297,16 +309,17 @@ ++assertions; if (wcscmp(v1, v2) == 0) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: Unicode strings not equal\n", file, line); fwprintf(stderr, L" %s = \"%ls\"\n", e1, v1); fwprintf(stderr, L" %s = \"%ls\"\n", e2, v2); report_failure(extra); + return (0); } /* @@ -326,7 +339,7 @@ for (j = 0; j < 16 && i + j < l; j++) { if (ref != NULL && p[i + j] != ref[i + j]) sep = '_'; - fprintf(stderr, "%c%02x", sep, p[i+j]); + fprintf(stderr, "%c%02x", sep, 0xff & (int)p[i+j]); if (ref != NULL && p[i + j] == ref[i + j]) sep = ' '; } @@ -348,7 +361,7 @@ /* assertEqualMem() displays the values of the two memory blocks. */ /* TODO: For long blocks, hexdump the first bytes that actually differ. */ -void +int test_assert_equal_mem(const char *file, int line, const char *v1, const char *e1, const char *v2, const char *e2, @@ -358,15 +371,15 @@ if (v1 == NULL || v2 == NULL) { if (v1 == v2) { msg[0] = '\0'; - return; + return (1); } } else if (memcmp(v1, v2, l) == 0) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: memory not equal\n", file, line); fprintf(stderr, " size %s = %d\n", ld, (int)l); @@ -376,14 +389,19 @@ hexdump(v2, v1, l < 32 ? l : 32, 0); fprintf(stderr, "\n"); report_failure(extra); + return (0); } -void +int test_assert_empty_file(const char *f1fmt, ...) { + char buff[1024]; char f1[1024]; struct stat st; va_list ap; + ssize_t s; + int fd; + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 13 17:42:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98687106567C; Thu, 13 Mar 2008 17:42:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5788C1065672 for ; Thu, 13 Mar 2008 17:42:03 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4173B8FC1A for ; Thu, 13 Mar 2008 17:42:03 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DHg3Zh087626 for ; Thu, 13 Mar 2008 17:42:03 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DHg3si087624 for perforce@freebsd.org; Thu, 13 Mar 2008 17:42:03 GMT (envelope-from rrs@cisco.com) Date: Thu, 13 Mar 2008 17:42:03 GMT Message-Id: <200803131742.m2DHg3si087624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 137622 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, 13 Mar 2008 17:42:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=137622 Change 137622 by rrs@rrs-mips2-jnpr on 2008/03/13 17:42:02 We need not 4 bytes to the stack, but a divisiable by 8. Change it all to 16. Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/sbrk.S#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/sys/sbrk.S#2 (text+ko) ==== @@ -55,7 +55,7 @@ .cpload t9 .set reorder #endif - addu sp, sp, -4 + addu sp, sp, -16 sw s0, 0(sp) # Preserve s0 value in stack # it should be the same on return # We can't use v1 as temporary @@ -71,13 +71,13 @@ nop move v0, s0 # return old val of curbrk from above lw s0, 0(sp) - addu sp, sp, 4 + addu sp, sp, 16 sw a0, _C_LABEL(__curbrk) # save current val of curbrk from above j ra 1: lw s0, 0(sp) - addu sp, sp, 4 + addu sp, sp, 16 la t9, _C_LABEL(__cerror) jr t9 END(__sys_sbrk) From owner-p4-projects@FreeBSD.ORG Thu Mar 13 17:44:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D8601065672; Thu, 13 Mar 2008 17:44:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E13561065670 for ; Thu, 13 Mar 2008 17:44:05 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CAD2F8FC26 for ; Thu, 13 Mar 2008 17:44:05 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DHi5IT087679 for ; Thu, 13 Mar 2008 17:44:05 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DHi57M087677 for perforce@freebsd.org; Thu, 13 Mar 2008 17:44:05 GMT (envelope-from rrs@cisco.com) Date: Thu, 13 Mar 2008 17:44:05 GMT Message-Id: <200803131744.m2DHi57M087677@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 137623 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, 13 Mar 2008 17:44:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=137623 Change 137623 by rrs@rrs-mips2-jnpr on 2008/03/13 17:43:53 CALLFRAME_RA is a reference value, not one to be used as a size, CALLFRAME_SIZE is needed. Also we need to assure a 8 byte divisible value, so we change the SZREG to 2 * SZREG. That will give us 8 or 16. Affected files ... .. //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/setjmp.S#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/lib/libc/mips/gen/setjmp.S#4 (text+ko) ==== @@ -55,7 +55,7 @@ * and a struct sigcontext, see */ -#define SETJMP_FRAME_SIZE (CALLFRAME_SIZ + SZREG) +#define SETJMP_FRAME_SIZE (CALLFRAME_SIZ + (SZREG * 2)) NESTED(setjmp, SETJMP_FRAME_SIZE, ra) @@ -101,7 +101,7 @@ j ra END(setjmp) -#define LONGJMP_FRAME_SIZE CALLFRAME_RA + SZREG * 2 +#define LONGJMP_FRAME_SIZE (CALLFRAME_SIZ + (SZREG * 2)) NESTED(longjmp, LONGJMP_FRAME_SIZE, ra) .mask 0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ) From owner-p4-projects@FreeBSD.ORG Thu Mar 13 17:45:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 807911065676; Thu, 13 Mar 2008 17:45:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38CBA1065673 for ; Thu, 13 Mar 2008 17:45:07 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0872E8FC20 for ; Thu, 13 Mar 2008 17:45:07 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DHj6HT087737 for ; Thu, 13 Mar 2008 17:45:06 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DHj6uJ087735 for perforce@freebsd.org; Thu, 13 Mar 2008 17:45:06 GMT (envelope-from rrs@cisco.com) Date: Thu, 13 Mar 2008 17:45:06 GMT Message-Id: <200803131745.m2DHj6uJ087735@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 137624 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, 13 Mar 2008 17:45:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=137624 Change 137624 by rrs@rrs-mips2-jnpr on 2008/03/13 17:44:59 Add SOFTFLOAT as an option. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/conf/options.mips#5 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/conf/options.mips#5 (text+ko) ==== @@ -20,6 +20,7 @@ KERNPHYSADDR opt_global.h KERNVIRTADDR opt_global.h PHYSADDR opt_global.h +SOFTFLOAT opt_global.h TARGET_OCTEON opt_global.h TARGET_EMULATOR opt_ddb.h From owner-p4-projects@FreeBSD.ORG Thu Mar 13 17:48:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42F7F1065673; Thu, 13 Mar 2008 17:48:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01562106566B for ; Thu, 13 Mar 2008 17:48:11 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DEC778FC15 for ; Thu, 13 Mar 2008 17:48:10 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DHmAUC087876 for ; Thu, 13 Mar 2008 17:48:10 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DHmA1B087874 for perforce@freebsd.org; Thu, 13 Mar 2008 17:48:10 GMT (envelope-from rrs@cisco.com) Date: Thu, 13 Mar 2008 17:48:10 GMT Message-Id: <200803131748.m2DHmA1B087874@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 137626 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, 13 Mar 2008 17:48:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=137626 Change 137626 by rrs@rrs-mips2-jnpr on 2008/03/13 17:47:17 Disable interupts right away after DO_AST and then use k1. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#22 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#22 (text+ko) ==== @@ -714,38 +714,29 @@ * k0 or k1 to store the PCB pointer. This is because k0 and k1 * are not preserved across interrupts. */ - GET_CPU_PCPU(a1) - lw a1, PC_CURPCB(a1) - RESTORE_U_PCB_REG(s0, S0, a1) - RESTORE_U_PCB_REG(s1, S1, a1) - RESTORE_U_PCB_REG(s2, S2, a1) - RESTORE_U_PCB_REG(s3, S3, a1) - RESTORE_U_PCB_REG(s4, S4, a1) - RESTORE_U_PCB_REG(s5, S5, a1) - RESTORE_U_PCB_REG(s6, S6, a1) - RESTORE_U_PCB_REG(s7, S7, a1) - RESTORE_U_PCB_REG(s8, S8, a1) - mtc0 zero, COP_0_STATUS_REG ITLBNOPFIX li v0, SR_EXL mtc0 v0, COP_0_STATUS_REG # set exeption level bit. ITLBNOPFIX - RESTORE_U_PCB_REG(t0, MULLO, a1) - RESTORE_U_PCB_REG(t1, MULHI, a1) - RESTORE_U_PCB_REG(t2, PC, a1) + GET_CPU_PCPU(k1) + lw a1, PC_CURPCB(k1) + RESTORE_U_PCB_REG(s0, S0, k1) + RESTORE_U_PCB_REG(s1, S1, k1) + RESTORE_U_PCB_REG(s2, S2, k1) + RESTORE_U_PCB_REG(s3, S3, k1) + RESTORE_U_PCB_REG(s4, S4, k1) + RESTORE_U_PCB_REG(s5, S5, k1) + RESTORE_U_PCB_REG(s6, S6, k1) + RESTORE_U_PCB_REG(s7, S7, k1) + RESTORE_U_PCB_REG(s8, S8, k1) + RESTORE_U_PCB_REG(t0, MULLO, k1) + RESTORE_U_PCB_REG(t1, MULHI, k1) + RESTORE_U_PCB_REG(t2, PC, k1) mtlo t0 mthi t1 _MTC0 t2, COP_0_EXC_PC # set return address - -/* - * The use of k1 to store the PCB pointer must be done only - * after interrupts are disabled. Otherwise it will get overwritten - * by the interrUpt code. - */ - move k1, a1 - RESTORE_U_PCB_REG(v0, V0, k1) RESTORE_U_PCB_REG(v1, V1, k1) RESTORE_U_PCB_REG(a0, A0, k1) @@ -769,7 +760,7 @@ #ifdef TARGET_OCTEON and k0, k0, ~(MIPS_SR_KX | MIPS_SR_SX | MIPS_SR_UX) #endif - or k0, k0, (MIPS_SR_INT_IE) + or k0, k0, (MIPS_SR_INT_IE|SR_EXL) .set noat RESTORE_U_PCB_REG(AT, AST, k1) From owner-p4-projects@FreeBSD.ORG Thu Mar 13 17:48:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17D111065717; Thu, 13 Mar 2008 17:48:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E04C1065671 for ; Thu, 13 Mar 2008 17:48:11 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0DB9A8FC16 for ; Thu, 13 Mar 2008 17:48:11 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DHmADw087881 for ; Thu, 13 Mar 2008 17:48:10 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DHmAuW087879 for perforce@freebsd.org; Thu, 13 Mar 2008 17:48:10 GMT (envelope-from rrs@cisco.com) Date: Thu, 13 Mar 2008 17:48:10 GMT Message-Id: <200803131748.m2DHmAuW087879@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 137627 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, 13 Mar 2008 17:48:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=137627 Change 137627 by rrs@rrs-mips2-jnpr on 2008/03/13 17:48:03 SOFTFLOAT is required for octeon. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/std.octeon32#7 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/std.octeon32#7 (text+ko) ==== @@ -7,6 +7,7 @@ # cpu CPU_MIPS4KC options TARGET_OCTEON +options SOFTFLOAT # XXX The Cavium compiler is built for Linux, so define __FreeBSD__ # XXX here for the moment. Altq is bitten by it, since it looks # XXX for __FreeBSD__ From owner-p4-projects@FreeBSD.ORG Thu Mar 13 17:50:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE97D1065671; Thu, 13 Mar 2008 17:50:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D9C5106566B for ; Thu, 13 Mar 2008 17:50:13 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D1CA8FC14 for ; Thu, 13 Mar 2008 17:50:13 +0000 (UTC) (envelope-from rrs@cisco.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DHoDkx087967 for ; Thu, 13 Mar 2008 17:50:13 GMT (envelope-from rrs@cisco.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DHoDj9087965 for perforce@freebsd.org; Thu, 13 Mar 2008 17:50:13 GMT (envelope-from rrs@cisco.com) Date: Thu, 13 Mar 2008 17:50:13 GMT Message-Id: <200803131750.m2DHoDj9087965@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rrs@cisco.com using -f From: "Randall R. Stewart" To: Perforce Change Reviews Cc: Subject: PERFORCE change 137628 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, 13 Mar 2008 17:50:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=137628 Change 137628 by rrs@rrs-mips2-jnpr on 2008/03/13 17:49:36 Get opt_global.h in so we can pick up SOFTFLOAT Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/trap.c#16 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/trap.c#16 (text+ko) ==== @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" +#include "opt_global.h" #define NO_REG_DEFS 1 /* Prevent asm.h from including regdef.h */ #include From owner-p4-projects@FreeBSD.ORG Thu Mar 13 20:25:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2778C106567A; Thu, 13 Mar 2008 20:25:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D869D106566C for ; Thu, 13 Mar 2008 20:25:02 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C3E4F8FC24 for ; Thu, 13 Mar 2008 20:25:02 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DKP2CF008732 for ; Thu, 13 Mar 2008 20:25:02 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DKP2Hj008730 for perforce@freebsd.org; Thu, 13 Mar 2008 20:25:02 GMT (envelope-from marcel@freebsd.org) Date: Thu, 13 Mar 2008 20:25:02 GMT Message-Id: <200803132025.m2DKP2Hj008730@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 137641 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, 13 Mar 2008 20:25:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=137641 Change 137641 by marcel@marcel_jnpr on 2008/03/13 20:24:52 Revert to vendor. The implementation is in sys/powerpc/booke/machdep.c Affected files ... .. //depot/projects/e500/sys/powerpc/powerpc/cpu.c#5 edit Differences ... ==== //depot/projects/e500/sys/powerpc/powerpc/cpu.c#5 (text+ko) ==== @@ -112,9 +112,6 @@ static void cpu_print_speed(void); static void cpu_config_l2cr(u_int, uint16_t); -extern void icache_enable(void); -extern void dcache_enable(void); - void cpu_setup(u_int cpuid) { @@ -266,28 +263,6 @@ printf("\n"); cpu_config_l2cr(cpuid, vers); break; - case FSL_E500v1: - case FSL_E500v2: -#if 0 - /* - * Cache enable sequence according - * to section 2.16 of E500CORE RM. - */ - printf("L1 CSR0 (d): 0x%08x\n", mfspr(SPR_L1CSR0)); - printf("L1 CSR1 (i): 0x%08x\n", mfspr(SPR_L1CSR1)); - - printf("Enable i/d-cache...\n"); - - /* Enable d-cache */ - dcache_enable(); - - /* Enable i-cache */ - icache_enable(); - printf("L1 CSR0 (d): 0x%08x\n", mfspr(SPR_L1CSR0)); - printf("L1 CSR1 (i): 0x%08x\n", mfspr(SPR_L1CSR1)); -#endif - printf("\n"); - break; default: printf("\n"); break; From owner-p4-projects@FreeBSD.ORG Thu Mar 13 20:36:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20DD21065672; Thu, 13 Mar 2008 20:36:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3A03106566B for ; Thu, 13 Mar 2008 20:36:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BFC5A8FC20 for ; Thu, 13 Mar 2008 20:36:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DKaEa4009115 for ; Thu, 13 Mar 2008 20:36:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DKaEhQ009113 for perforce@freebsd.org; Thu, 13 Mar 2008 20:36:14 GMT (envelope-from sam@freebsd.org) Date: Thu, 13 Mar 2008 20:36:14 GMT Message-Id: <200803132036.m2DKaEhQ009113@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 137642 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, 13 Mar 2008 20:36:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=137642 Change 137642 by sam@sam_ebb on 2008/03/13 20:35:32 identify ifnet in 802.11 msgs Affected files ... .. //depot/projects/vap/tools/tools/net80211/wlanwatch/wlanwatch.c#5 edit Differences ... ==== //depot/projects/vap/tools/tools/net80211/wlanwatch/wlanwatch.c#5 (text+ko) ==== @@ -338,7 +338,7 @@ case RTM_IEEE80211: #define V(type) ((struct type *)(&ifan[1])) ifan = (struct if_announcemsghdr *)rtm; - printf("%.19s RTM_IEEE80211: ", cnow); + printf("%.19s RTM_IEEE80211: if# %d, ", cnow, ifan->ifan_index); switch (ifan->ifan_what) { case RTM_IEEE80211_ASSOC: printf("associate with %s", @@ -435,8 +435,7 @@ ether_sprintf(V(ieee80211_auth_event)->iev_addr)); break; default: - printf("if# %d, what: #%d", - ifan->ifan_index, ifan->ifan_what); + printf("what: #%d", ifan->ifan_what); break; } printf("\n"); From owner-p4-projects@FreeBSD.ORG Thu Mar 13 20:39:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80C001065705; Thu, 13 Mar 2008 20:39:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 405341065704 for ; Thu, 13 Mar 2008 20:39:18 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0D46A8FC20 for ; Thu, 13 Mar 2008 20:39:18 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DKdHwa009438 for ; Thu, 13 Mar 2008 20:39:17 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DKdHUp009436 for perforce@freebsd.org; Thu, 13 Mar 2008 20:39:17 GMT (envelope-from marcel@freebsd.org) Date: Thu, 13 Mar 2008 20:39:17 GMT Message-Id: <200803132039.m2DKdHUp009436@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 137643 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, 13 Mar 2008 20:39:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=137643 Change 137643 by marcel@marcel_jnpr on 2008/03/13 20:38:29 Resolve integ mishap. Affected files ... .. //depot/projects/tty/contrib/pf/pflogd/pidfile.c#7 add .. //depot/projects/tty/contrib/pf/pflogd/pidfile.h#5 add .. //depot/projects/tty/libexec/rtld-aout/support.c#5 add .. //depot/projects/tty/libexec/rtld-aout/support.h#5 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Mar 13 21:35:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE0731065674; Thu, 13 Mar 2008 21:35:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 483E0106566C for ; Thu, 13 Mar 2008 21:35:27 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 325508FC12 for ; Thu, 13 Mar 2008 21:35:27 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DLZRnx024397 for ; Thu, 13 Mar 2008 21:35:27 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DLZHGN024395 for perforce@freebsd.org; Thu, 13 Mar 2008 21:35:17 GMT (envelope-from jhb@freebsd.org) Date: Thu, 13 Mar 2008 21:35:17 GMT Message-Id: <200803132135.m2DLZHGN024395@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 137651 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, 13 Mar 2008 21:35:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=137651 Change 137651 by jhb@jhb_mutex on 2008/03/13 21:35:00 IFC @137644 Affected files ... .. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#10 integrate .. //depot/projects/smpng/sys/amd64/acpica/madt.c#15 integrate .. //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#7 integrate .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#27 integrate .. //depot/projects/smpng/sys/amd64/amd64/dump_machdep.c#5 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#25 integrate .. //depot/projects/smpng/sys/amd64/amd64/legacy.c#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#69 integrate .. //depot/projects/smpng/sys/amd64/amd64/mem.c#11 integrate .. //depot/projects/smpng/sys/amd64/amd64/minidump_machdep.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#45 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#28 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#78 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#61 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#37 integrate .. //depot/projects/smpng/sys/amd64/conf/DEFAULTS#9 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#61 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#41 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#16 integrate .. //depot/projects/smpng/sys/amd64/include/nexusvar.h#1 branch .. //depot/projects/smpng/sys/amd64/include/pmap.h#28 integrate .. //depot/projects/smpng/sys/amd64/include/proc.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#17 integrate .. //depot/projects/smpng/sys/amd64/include/specialreg.h#14 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#26 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#29 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#23 integrate .. //depot/projects/smpng/sys/arm/arm/dump_machdep.c#3 integrate .. //depot/projects/smpng/sys/arm/arm/genassym.c#10 integrate .. //depot/projects/smpng/sys/arm/arm/locore.S#16 integrate .. //depot/projects/smpng/sys/arm/arm/nexus.c#11 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#42 integrate .. //depot/projects/smpng/sys/arm/arm/swtch.S#16 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#29 integrate .. //depot/projects/smpng/sys/arm/arm/uio_machdep.c#5 integrate .. //depot/projects/smpng/sys/arm/conf/AVILA#4 integrate .. //depot/projects/smpng/sys/arm/include/_bus.h#2 integrate .. //depot/projects/smpng/sys/arm/include/asmacros.h#7 integrate .. //depot/projects/smpng/sys/arm/include/atomic.h#29 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#24 integrate .. //depot/projects/smpng/sys/arm/include/sysarch.h#4 integrate .. //depot/projects/smpng/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425.c#6 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/smpng/sys/boot/Makefile#25 integrate .. //depot/projects/smpng/sys/boot/common/bootstrap.h#12 integrate .. //depot/projects/smpng/sys/boot/common/dev_net.c#6 integrate .. //depot/projects/smpng/sys/boot/common/load_elf.c#17 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#33 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btx/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btx/btx.S#7 integrate .. //depot/projects/smpng/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#16 integrate .. //depot/projects/smpng/sys/boot/i386/pxeldr/pxeldr.S#6 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_console.c#8 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/btx/Makefile#9 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/btx/btx.S#7 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/Makefile#15 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/biosdisk.c#14 integrate .. //depot/projects/smpng/sys/boot/powerpc/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/powerpc/ofw/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/powerpc/ofw/conf.c#2 integrate .. //depot/projects/smpng/sys/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/smpng/sys/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/smpng/sys/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/smpng/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/smpng/sys/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/smpng/sys/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/smpng/sys/boot/powerpc/uboot/version#1 branch .. //depot/projects/smpng/sys/boot/uboot/Makefile#1 branch .. //depot/projects/smpng/sys/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/smpng/sys/boot/uboot/common/main.c#1 branch .. //depot/projects/smpng/sys/boot/uboot/lib/Makefile#1 branch .. //depot/projects/smpng/sys/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/smpng/sys/boot/uboot/lib/console.c#1 branch .. //depot/projects/smpng/sys/boot/uboot/lib/copy.c#1 branch .. //depot/projects/smpng/sys/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/smpng/sys/boot/uboot/lib/disk.c#1 branch .. //depot/projects/smpng/sys/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/smpng/sys/boot/uboot/lib/glue.c#1 branch .. //depot/projects/smpng/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/smpng/sys/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/smpng/sys/boot/uboot/lib/module.c#1 branch .. //depot/projects/smpng/sys/boot/uboot/lib/net.c#1 branch .. //depot/projects/smpng/sys/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/smpng/sys/boot/uboot/lib/time.c#1 branch .. //depot/projects/smpng/sys/cam/cam_periph.c#26 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#49 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#17 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#40 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#40 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#40 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#40 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#44 integrate .. //depot/projects/smpng/sys/compat/linux/linux_futex.c#6 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#85 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.h#3 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#38 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#23 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#28 integrate .. //depot/projects/smpng/sys/conf/NOTES#147 integrate .. //depot/projects/smpng/sys/conf/files#211 integrate .. //depot/projects/smpng/sys/conf/files.amd64#53 integrate .. //depot/projects/smpng/sys/conf/files.i386#109 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#38 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#64 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#60 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#58 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#67 integrate .. //depot/projects/smpng/sys/conf/ldscript.powerpc#3 integrate .. //depot/projects/smpng/sys/conf/options#146 integrate .. //depot/projects/smpng/sys/conf/options.powerpc#11 integrate .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 integrate .. //depot/projects/smpng/sys/ddb/db_capture.c#2 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#39 integrate .. //depot/projects/smpng/sys/ddb/db_examine.c#9 integrate .. //depot/projects/smpng/sys/ddb/db_input.c#10 integrate .. //depot/projects/smpng/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#104 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#41 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#42 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#68 integrate .. //depot/projects/smpng/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/smpng/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#27 integrate .. //depot/projects/smpng/sys/dev/amr/amrreg.h#10 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#83 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#53 integrate .. //depot/projects/smpng/sys/dev/atkbdc/psm.c#9 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#19 integrate .. //depot/projects/smpng/sys/dev/bce/if_bcefw.h#5 integrate .. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#10 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#28 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfereg.h#9 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#96 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#57 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#55 integrate .. //depot/projects/smpng/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/smpng/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/smpng/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/smpng/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/smpng/sys/dev/coretemp/coretemp.c#3 integrate .. //depot/projects/smpng/sys/dev/cpufreq/ichss.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_firmware_exports.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_regs.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_cpl.h#4 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_tcb.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_version.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_ioctl.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_l2t.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_l2t.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/smpng/sys/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/smpng/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/sys/mvec.h#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/smpng/sys/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/smpng/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/smpng/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/smpng/sys/dev/cxgb/t3cdev.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete .. //depot/projects/smpng/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_defs.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#2 delete .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#2 delete .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch .. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#7 integrate .. //depot/projects/smpng/sys/dev/em/LICENSE#6 integrate .. //depot/projects/smpng/sys/dev/em/e1000_80003es2lan.c#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_80003es2lan.h#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82540.c#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82541.c#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82541.h#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82542.c#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82543.c#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82543.h#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82571.c#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82571.h#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82575.c#4 delete .. //depot/projects/smpng/sys/dev/em/e1000_82575.h#4 delete .. //depot/projects/smpng/sys/dev/em/e1000_api.c#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_api.h#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_defines.h#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_hw.h#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_ich8lan.c#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_ich8lan.h#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_mac.c#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_mac.h#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_manage.c#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_manage.h#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_nvm.c#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_nvm.h#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_osdep.h#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_phy.c#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_phy.h#4 integrate .. //depot/projects/smpng/sys/dev/em/e1000_regs.h#4 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#85 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#43 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#34 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#18 integrate .. //depot/projects/smpng/sys/dev/hptiop/hptiop.c#3 integrate .. //depot/projects/smpng/sys/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/smpng/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/smpng/sys/dev/hptrr/array.h#2 integrate .. //depot/projects/smpng/sys/dev/hptrr/him.h#2 integrate .. //depot/projects/smpng/sys/dev/hptrr/himfuncs.h#2 integrate .. //depot/projects/smpng/sys/dev/hptrr/hptintf.h#2 integrate .. //depot/projects/smpng/sys/dev/hptrr/hptrr_config.c#2 integrate .. //depot/projects/smpng/sys/dev/hptrr/hptrr_config.h#2 integrate .. //depot/projects/smpng/sys/dev/hptrr/hptrr_os_bsd.c#2 integrate .. //depot/projects/smpng/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate .. //depot/projects/smpng/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#2 integrate .. //depot/projects/smpng/sys/dev/hptrr/ldm.h#2 integrate .. //depot/projects/smpng/sys/dev/hptrr/list.h#2 integrate .. //depot/projects/smpng/sys/dev/hptrr/os_bsd.h#2 integrate .. //depot/projects/smpng/sys/dev/hptrr/osm.h#2 integrate .. //depot/projects/smpng/sys/dev/ic/quicc.h#1 branch .. //depot/projects/smpng/sys/dev/igb/e1000_82575.c#1 branch .. //depot/projects/smpng/sys/dev/igb/e1000_82575.h#1 branch .. //depot/projects/smpng/sys/dev/igb/e1000_api.c#1 branch .. //depot/projects/smpng/sys/dev/igb/e1000_api.h#1 branch .. //depot/projects/smpng/sys/dev/igb/e1000_defines.h#1 branch .. //depot/projects/smpng/sys/dev/igb/e1000_hw.h#1 branch .. //depot/projects/smpng/sys/dev/igb/e1000_mac.c#1 branch .. //depot/projects/smpng/sys/dev/igb/e1000_mac.h#1 branch .. //depot/projects/smpng/sys/dev/igb/e1000_manage.c#1 branch .. //depot/projects/smpng/sys/dev/igb/e1000_manage.h#1 branch .. //depot/projects/smpng/sys/dev/igb/e1000_nvm.c#1 branch .. //depot/projects/smpng/sys/dev/igb/e1000_nvm.h#1 branch .. //depot/projects/smpng/sys/dev/igb/e1000_osdep.h#1 branch .. //depot/projects/smpng/sys/dev/igb/e1000_phy.c#1 branch .. //depot/projects/smpng/sys/dev/igb/e1000_phy.h#1 branch .. //depot/projects/smpng/sys/dev/igb/e1000_regs.h#1 branch .. //depot/projects/smpng/sys/dev/igb/if_igb.c#1 branch .. //depot/projects/smpng/sys/dev/igb/if_igb.h#1 branch .. //depot/projects/smpng/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#39 integrate .. //depot/projects/smpng/sys/dev/md/md.c#83 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#20 integrate .. //depot/projects/smpng/sys/dev/mfi/mfireg.h#9 integrate .. //depot/projects/smpng/sys/dev/mii/amphy.c#17 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#45 integrate .. //depot/projects/smpng/sys/dev/mii/ciphy.c#8 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#27 integrate .. //depot/projects/smpng/sys/dev/mii/nsphy.c#17 integrate .. //depot/projects/smpng/sys/dev/mii/nsphyter.c#1 branch .. //depot/projects/smpng/sys/dev/mii/nsphyterreg.h#1 branch .. //depot/projects/smpng/sys/dev/mii/rgephy.c#13 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#10 integrate .. //depot/projects/smpng/sys/dev/msk/if_mskreg.h#5 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#21 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#10 integrate .. //depot/projects/smpng/sys/dev/mxge/mxge_lro.c#3 integrate .. //depot/projects/smpng/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/smpng/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#11 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfereg.h#6 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfevar.h#4 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_rx.c#9 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#58 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#96 integrate .. //depot/projects/smpng/sys/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/smpng/sys/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/smpng/sys/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/smpng/sys/dev/quicc/quicc_core.c#1 branch .. //depot/projects/smpng/sys/dev/ral/rt2560.c#11 integrate .. //depot/projects/smpng/sys/dev/ral/rt2560reg.h#3 integrate .. //depot/projects/smpng/sys/dev/ral/rt2560var.h#4 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#58 integrate .. //depot/projects/smpng/sys/dev/rr232x/LICENSE#2 delete .. //depot/projects/smpng/sys/dev/rr232x/README#2 delete .. //depot/projects/smpng/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/smpng/sys/dev/rr232x/array.h#2 delete .. //depot/projects/smpng/sys/dev/rr232x/him.h#2 delete .. //depot/projects/smpng/sys/dev/rr232x/himfuncs.h#2 delete .. //depot/projects/smpng/sys/dev/rr232x/hptintf.h#2 delete .. //depot/projects/smpng/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/smpng/sys/dev/rr232x/ldm.h#2 delete .. //depot/projects/smpng/sys/dev/rr232x/list.h#2 delete .. //depot/projects/smpng/sys/dev/rr232x/os_bsd.c#2 delete .. //depot/projects/smpng/sys/dev/rr232x/os_bsd.h#3 delete .. //depot/projects/smpng/sys/dev/rr232x/osm.h#2 delete .. //depot/projects/smpng/sys/dev/rr232x/osm_bsd.c#6 delete .. //depot/projects/smpng/sys/dev/rr232x/rr232x_config.c#2 delete .. //depot/projects/smpng/sys/dev/rr232x/rr232x_config.h#2 delete .. //depot/projects/smpng/sys/dev/scc/scc_bfe.h#4 integrate .. //depot/projects/smpng/sys/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/smpng/sys/dev/scc/scc_bus.h#2 integrate .. //depot/projects/smpng/sys/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/smpng/sys/dev/sk/if_sk.c#15 integrate .. //depot/projects/smpng/sys/dev/sk/if_skreg.h#8 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#21 integrate .. //depot/projects/smpng/sys/dev/ti/if_ti.c#10 integrate .. //depot/projects/smpng/sys/dev/tsec/if_tsec.c#1 branch .. //depot/projects/smpng/sys/dev/tsec/if_tsec.h#1 branch .. //depot/projects/smpng/sys/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/smpng/sys/dev/twe/twe.c#15 integrate .. //depot/projects/smpng/sys/dev/uart/uart.h#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/smpng/sys/dev/uart/uart_bus_scc.c#2 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_powerpc.c#5 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#18 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/smpng/sys/dev/usb/ehci.c#31 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#33 integrate .. //depot/projects/smpng/sys/dev/usb/uark.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/ubsa.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/ucom.c#28 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#64 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#108 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#37 integrate .. //depot/projects/smpng/sys/dev/usb/uslcom.c#1 branch .. //depot/projects/smpng/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/smpng/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/smpng/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/smpng/sys/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/smpng/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/smpng/sys/fs/coda/TODO#2 integrate .. //depot/projects/smpng/sys/fs/coda/cnode.h#3 integrate .. //depot/projects/smpng/sys/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/smpng/sys/fs/coda/coda_io.h#2 integrate .. //depot/projects/smpng/sys/fs/coda/coda_kernel.h#2 delete .. //depot/projects/smpng/sys/fs/coda/coda_namecache.c#2 delete .. //depot/projects/smpng/sys/fs/coda/coda_namecache.h#3 delete .. //depot/projects/smpng/sys/fs/coda/coda_opstats.h#2 integrate .. //depot/projects/smpng/sys/fs/coda/coda_pioctl.h#2 integrate .. //depot/projects/smpng/sys/fs/coda/coda_psdev.c#3 integrate .. //depot/projects/smpng/sys/fs/coda/coda_psdev.h#2 integrate .. //depot/projects/smpng/sys/fs/coda/coda_subr.c#2 integrate .. //depot/projects/smpng/sys/fs/coda/coda_subr.h#2 integrate .. //depot/projects/smpng/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/smpng/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/smpng/sys/fs/coda/coda_vfsops.c#3 integrate .. //depot/projects/smpng/sys/fs/coda/coda_vfsops.h#2 integrate .. //depot/projects/smpng/sys/fs/coda/coda_vnops.c#4 integrate .. //depot/projects/smpng/sys/fs/coda/coda_vnops.h#2 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#67 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#28 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#45 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#56 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#27 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#29 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#34 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_node.c#22 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_subr.c#11 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#26 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_dbregs.c#17 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_status.c#28 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#28 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs.h#11 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#28 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#29 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#39 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#34 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#38 integrate .. //depot/projects/smpng/sys/gdb/gdb_main.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#51 integrate .. //depot/projects/smpng/sys/geom/linux_lvm/g_linux_lvm.c#1 branch .. //depot/projects/smpng/sys/geom/linux_lvm/g_linux_lvm.h#1 branch .. //depot/projects/smpng/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/smpng/sys/geom/part/g_part_vtoc8.c#1 branch .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#4 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#4 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#28 integrate .. //depot/projects/smpng/sys/i386/acpica/madt.c#22 integrate .. //depot/projects/smpng/sys/i386/conf/DEFAULTS#10 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#92 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#130 integrate .. //depot/projects/smpng/sys/i386/cpufreq/est.c#8 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#44 integrate .. //depot/projects/smpng/sys/i386/i386/dump_machdep.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/geode.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/i686_mem.c#11 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#56 integrate .. //depot/projects/smpng/sys/i386/i386/initcpu.c#30 integrate .. //depot/projects/smpng/sys/i386/i386/k6_mem.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/legacy.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#130 integrate .. //depot/projects/smpng/sys/i386/i386/minidump_machdep.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#110 integrate .. //depot/projects/smpng/sys/i386/i386/nexus.c#29 integrate .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#51 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#109 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#84 integrate .. //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#25 integrate .. //depot/projects/smpng/sys/i386/include/_types.h#12 integrate .. //depot/projects/smpng/sys/i386/include/float.h#9 integrate .. //depot/projects/smpng/sys/i386/include/nexusvar.h#4 branch .. //depot/projects/smpng/sys/i386/include/proc.h#17 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#25 integrate .. //depot/projects/smpng/sys/i386/include/specialreg.h#17 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#48 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#58 integrate .. //depot/projects/smpng/sys/i386/svr4/svr4_machdep.c#19 integrate .. //depot/projects/smpng/sys/ia64/conf/DEFAULTS#10 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#59 integrate .. //depot/projects/smpng/sys/ia64/ia64/dump_machdep.c#9 integrate .. //depot/projects/smpng/sys/ia64/ia64/locore.S#9 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#113 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#36 integrate .. //depot/projects/smpng/sys/ia64/ia64/nexus.c#17 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#88 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#94 integrate .. //depot/projects/smpng/sys/ia64/include/md_var.h#23 integrate .. //depot/projects/smpng/sys/ia64/include/ucontext.h#7 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#59 integrate .. //depot/projects/smpng/sys/kern/init_main.c#71 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#82 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#58 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#50 integrate .. //depot/projects/smpng/sys/kern/kern_cpuset.c#1 branch .. //depot/projects/smpng/sys/kern/kern_descrip.c#110 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#109 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#127 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#111 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#89 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#39 delete .. //depot/projects/smpng/sys/kern/kern_ktrace.c#65 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#67 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#35 integrate .. //depot/projects/smpng/sys/kern/kern_module.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#152 integrate .. //depot/projects/smpng/sys/kern/kern_priv.c#3 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#92 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#75 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#69 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#136 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#70 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#52 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#120 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#104 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#36 integrate .. //depot/projects/smpng/sys/kern/p1003_1b.c#4 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#70 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#81 integrate .. //depot/projects/smpng/sys/kern/subr_autoconf.c#11 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#67 integrate .. //depot/projects/smpng/sys/kern/subr_lock.c#11 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#36 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#48 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#86 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#40 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#166 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#59 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#82 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#88 integrate .. //depot/projects/smpng/sys/kern/systrace_args.c#9 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#40 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#51 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#21 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#57 integrate .. //depot/projects/smpng/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/smpng/sys/kern/uipc_sockbuf.c#10 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#108 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#109 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#81 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#107 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#37 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#53 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#46 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#77 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#146 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#132 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#34 integrate .. //depot/projects/smpng/sys/libkern/cmpdi2.c#3 branch .. //depot/projects/smpng/sys/libkern/quad.h#8 integrate .. //depot/projects/smpng/sys/modules/Makefile#143 integrate .. //depot/projects/smpng/sys/modules/cmx/Makefile#1 branch .. //depot/projects/smpng/sys/modules/coda/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/coda5/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/cxgb/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/smpng/sys/modules/cxgb/tom/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/em/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/geom/Makefile#18 integrate .. //depot/projects/smpng/sys/modules/geom/geom_apple/Makefile#2 delete .. //depot/projects/smpng/sys/modules/geom/geom_eli/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/geom/geom_gpt/Makefile#2 delete .. //depot/projects/smpng/sys/modules/geom/geom_linux_lvm/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_part/Makefile#1 branch .. //depot/projects/smpng/sys/modules/hwpmc/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/igb/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ipfw_nat/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mii/Makefile#12 integrate .. //depot/projects/smpng/sys/modules/rr232x/Makefile#3 delete .. //depot/projects/smpng/sys/modules/sound/driver/emu10kx/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/uslcom/Makefile#1 branch .. //depot/projects/smpng/sys/modules/vr/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/zfs/Makefile#4 integrate .. //depot/projects/smpng/sys/net/bpf.c#72 integrate .. //depot/projects/smpng/sys/net/bpf_filter.c#13 integrate .. //depot/projects/smpng/sys/net/if.c#97 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#85 integrate .. //depot/projects/smpng/sys/net/if_gif.c#41 integrate .. //depot/projects/smpng/sys/net/route.c#34 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#39 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/smpng/sys/netgraph/netflow/netflow.c#15 integrate .. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.c#11 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#29 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#52 integrate .. //depot/projects/smpng/sys/netgraph/ng_bpf.c#8 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#27 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#32 integrate .. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_nat.c#8 integrate .. //depot/projects/smpng/sys/netgraph/ng_nat.h#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#26 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#33 integrate .. //depot/projects/smpng/sys/netgraph/ng_pred1.c#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#46 integrate .. //depot/projects/smpng/sys/netgraph/ng_tee.c#14 integrate .. //depot/projects/smpng/sys/netinet/in.h#40 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#78 integrate .. //depot/projects/smpng/sys/netinet/in_rmx.c#16 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#24 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#49 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#38 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#89 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_nat.c#1 branch .. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#19 integrate .. //depot/projects/smpng/sys/netinet/ip_id.c#9 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#94 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias.c#6 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias.h#4 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_db.c#6 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_ftp.c#5 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_irc.c#5 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_local.h#5 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_old.c#3 delete .. //depot/projects/smpng/sys/netinet/libalias/alias_proxy.c#7 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_smedia.c#5 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.c#12 integrate .. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.c#8 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.c#16 integrate .. //depot/projects/smpng/sys/netinet/sctp_input.c#16 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#16 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#16 integrate .. //depot/projects/smpng/sys/netinet/sctp_peeloff.c#11 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#18 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#110 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#53 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#56 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#51 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#22 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.h#12 integrate .. //depot/projects/smpng/sys/netipsec/ipsec6.h#4 integrate .. //depot/projects/smpng/sys/netipsec/key.c#19 integrate .. //depot/projects/smpng/sys/netipsec/key_debug.c#6 integrate .. //depot/projects/smpng/sys/netncp/ncp_conn.c#17 integrate .. //depot/projects/smpng/sys/netncp/ncp_conn.h#5 integrate .. //depot/projects/smpng/sys/netsmb/smb_conn.c#19 integrate .. //depot/projects/smpng/sys/netsmb/smb_conn.h#10 integrate .. //depot/projects/smpng/sys/netsmb/smb_iod.c#17 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_idmap.c#7 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#21 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#25 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#51 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#16 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_node.c#29 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#54 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#33 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#62 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#69 integrate .. //depot/projects/smpng/sys/nfsclient/nfsm_subs.h#10 integrate .. //depot/projects/smpng/sys/nfsclient/nfsnode.h#20 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#55 integrate .. //depot/projects/smpng/sys/pc98/cbus/sio.c#12 integrate .. //depot/projects/smpng/sys/pc98/conf/DEFAULTS#10 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#73 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#26 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#71 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#39 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#49 delete .. //depot/projects/smpng/sys/pci/if_vrreg.h#15 delete .. //depot/projects/smpng/sys/pci/if_wb.c#42 integrate .. //depot/projects/smpng/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/smpng/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/smpng/sys/powerpc/aim/ofw_machdep.c#2 integrate .. //depot/projects/smpng/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap_subr.S#2 integrate .. //depot/projects/smpng/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/smpng/sys/powerpc/booke/clock.c#1 branch .. //depot/projects/smpng/sys/powerpc/booke/copyinout.c#1 branch .. //depot/projects/smpng/sys/powerpc/booke/interrupt.c#1 branch .. //depot/projects/smpng/sys/powerpc/booke/locore.S#1 branch .. //depot/projects/smpng/sys/powerpc/booke/machdep.c#1 branch .. //depot/projects/smpng/sys/powerpc/booke/pmap.c#1 branch .. //depot/projects/smpng/sys/powerpc/booke/support.S#1 branch .. //depot/projects/smpng/sys/powerpc/booke/swtch.S#1 branch .. //depot/projects/smpng/sys/powerpc/booke/trap.c#1 branch .. //depot/projects/smpng/sys/powerpc/booke/trap_subr.S#1 branch .. //depot/projects/smpng/sys/powerpc/booke/uio_machdep.c#1 branch .. //depot/projects/smpng/sys/powerpc/booke/vm_machdep.c#1 branch .. //depot/projects/smpng/sys/powerpc/conf/DEFAULTS#9 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#46 integrate .. //depot/projects/smpng/sys/powerpc/conf/MPC85XX#1 branch .. //depot/projects/smpng/sys/powerpc/conf/NOTES#9 integrate .. //depot/projects/smpng/sys/powerpc/fpu/fpu_add.c#1 branch .. //depot/projects/smpng/sys/powerpc/fpu/fpu_arith.h#1 branch .. //depot/projects/smpng/sys/powerpc/fpu/fpu_compare.c#1 branch .. //depot/projects/smpng/sys/powerpc/fpu/fpu_div.c#1 branch .. //depot/projects/smpng/sys/powerpc/fpu/fpu_emu.c#1 branch .. //depot/projects/smpng/sys/powerpc/fpu/fpu_emu.h#1 branch .. //depot/projects/smpng/sys/powerpc/fpu/fpu_explode.c#1 branch .. //depot/projects/smpng/sys/powerpc/fpu/fpu_extern.h#1 branch .. //depot/projects/smpng/sys/powerpc/fpu/fpu_implode.c#1 branch .. //depot/projects/smpng/sys/powerpc/fpu/fpu_instr.h#1 branch .. //depot/projects/smpng/sys/powerpc/fpu/fpu_mul.c#1 branch .. //depot/projects/smpng/sys/powerpc/fpu/fpu_sqrt.c#1 branch .. //depot/projects/smpng/sys/powerpc/fpu/fpu_subr.c#1 branch .. //depot/projects/smpng/sys/powerpc/include/bootinfo.h#4 integrate .. //depot/projects/smpng/sys/powerpc/include/float.h#8 integrate .. //depot/projects/smpng/sys/powerpc/include/frame.h#11 integrate .. //depot/projects/smpng/sys/powerpc/include/hid.h#4 integrate .. //depot/projects/smpng/sys/powerpc/include/intr_machdep.h#9 integrate .. //depot/projects/smpng/sys/powerpc/include/kdb.h#5 integrate .. //depot/projects/smpng/sys/powerpc/include/md_var.h#11 integrate .. //depot/projects/smpng/sys/powerpc/include/metadata.h#4 integrate .. //depot/projects/smpng/sys/powerpc/include/mmuvar.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/ocpbus.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/openpicreg.h#4 integrate .. //depot/projects/smpng/sys/powerpc/include/openpicvar.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/pcb.h#9 integrate .. //depot/projects/smpng/sys/powerpc/include/pcpu.h#9 integrate .. //depot/projects/smpng/sys/powerpc/include/pmap.h#19 integrate .. //depot/projects/smpng/sys/powerpc/include/psl.h#5 integrate .. //depot/projects/smpng/sys/powerpc/include/pte.h#6 integrate .. //depot/projects/smpng/sys/powerpc/include/sf_buf.h#3 integrate .. //depot/projects/smpng/sys/powerpc/include/spr.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/tlb.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/trap.h#6 integrate .. //depot/projects/smpng/sys/powerpc/include/trap_aim.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/trap_booke.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/vmparam.h#9 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/nexus.c#1 branch .. //depot/projects/smpng/sys/powerpc/mpc85xx/ocpbus.c#1 branch .. //depot/projects/smpng/sys/powerpc/mpc85xx/ocpbus.h#1 branch .. //depot/projects/smpng/sys/powerpc/mpc85xx/opic.c#1 branch .. //depot/projects/smpng/sys/powerpc/mpc85xx/pci_ocp.c#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powermac/hrowpic.c#12 integrate .. //depot/projects/smpng/sys/powerpc/powermac/openpic_macio.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/autoconf.c#13 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/cpu.c#8 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#18 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/gdb_machdep.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#29 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#12 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mp_machdep.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#12 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pic_if.m#5 integrate .. //depot/projects/smpng/sys/powerpc/psim/openpic_iobus.c#8 integrate .. //depot/projects/smpng/sys/security/audit/audit.c#11 integrate .. //depot/projects/smpng/sys/security/audit/audit_arg.c#12 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm.c#9 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_klib.c#8 integrate .. //depot/projects/smpng/sys/security/audit/audit_private.h#9 integrate .. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#13 integrate .. //depot/projects/smpng/sys/security/audit/audit_trigger.c#6 integrate .. //depot/projects/smpng/sys/security/audit/audit_worker.c#7 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#43 integrate .. //depot/projects/smpng/sys/sparc64/conf/DEFAULTS#8 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#80 integrate .. //depot/projects/smpng/sys/sparc64/include/md_var.h#15 integrate .. //depot/projects/smpng/sys/sparc64/include/tlb.h#17 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/ata_machdep.c#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/cache.c#16 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/cheetah.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/dump_machdep.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#32 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#31 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#73 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/spitfire.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tlb.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#79 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/mp_machdep.c#6 integrate .. //depot/projects/smpng/sys/sys/_types.h#15 integrate .. //depot/projects/smpng/sys/sys/buf.h#49 integrate .. //depot/projects/smpng/sys/sys/bufobj.h#9 integrate .. //depot/projects/smpng/sys/sys/bus.h#30 integrate .. //depot/projects/smpng/sys/sys/condvar.h#11 integrate .. //depot/projects/smpng/sys/sys/conf.h#49 integrate .. //depot/projects/smpng/sys/sys/cpuset.h#1 branch .. //depot/projects/smpng/sys/sys/disklabel.h#32 integrate .. //depot/projects/smpng/sys/sys/fcntl.h#8 integrate .. //depot/projects/smpng/sys/sys/ipc.h#11 integrate .. //depot/projects/smpng/sys/sys/kse.h#20 delete .. //depot/projects/smpng/sys/sys/ktrace.h#14 integrate .. //depot/projects/smpng/sys/sys/lock.h#48 integrate .. //depot/projects/smpng/sys/sys/lockmgr.h#24 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#74 integrate .. //depot/projects/smpng/sys/sys/module.h#10 integrate .. //depot/projects/smpng/sys/sys/mount.h#63 integrate .. //depot/projects/smpng/sys/sys/param.h#122 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#21 integrate .. //depot/projects/smpng/sys/sys/priv.h#10 integrate .. //depot/projects/smpng/sys/sys/proc.h#183 integrate .. //depot/projects/smpng/sys/sys/rwlock.h#12 integrate .. //depot/projects/smpng/sys/sys/sched.h#28 integrate .. //depot/projects/smpng/sys/sys/shm.h#10 integrate .. //depot/projects/smpng/sys/sys/sleepqueue.h#13 integrate .. //depot/projects/smpng/sys/sys/smp.h#18 integrate .. //depot/projects/smpng/sys/sys/socket.h#33 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#59 integrate .. //depot/projects/smpng/sys/sys/syscall.h#81 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#81 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#53 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#85 integrate .. //depot/projects/smpng/sys/sys/systm.h#85 integrate .. //depot/projects/smpng/sys/sys/types.h#34 integrate .. //depot/projects/smpng/sys/sys/user.h#30 integrate .. //depot/projects/smpng/sys/sys/vnode.h#83 integrate .. //depot/projects/smpng/sys/sys/vtoc.h#1 branch .. //depot/projects/smpng/sys/tools/embed_mfs.sh#1 branch .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#21 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#67 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#98 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#57 integrate .. //depot/projects/smpng/sys/ufs/ufs/extattr.h#9 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#43 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#70 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#63 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#89 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#37 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#34 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#97 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#10 (text+ko) ==== @@ -25,14 +25,18 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.17 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.18 2008/03/13 20:39:02 jhb Exp $"); #include #include +#include +#include #include #include +#include + static int intr_model = ACPI_INTR_PIC; int @@ -67,3 +71,43 @@ { __asm __volatile("sti; hlt"); } + +/* + * ACPI nexus(4) driver. + */ +static int +nexus_acpi_probe(device_t dev) +{ + int error; + + error = acpi_identify(); + if (error) + return (error); + + return (BUS_PROBE_DEFAULT); +} + +static int +nexus_acpi_attach(device_t dev) +{ + + nexus_init_resources(); + bus_generic_probe(dev); + if (BUS_ADD_CHILD(dev, 10, "acpi", 0) == NULL) + panic("failed to add acpi0 device"); + + return (bus_generic_attach(dev)); +} + +static device_method_t nexus_acpi_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, nexus_acpi_probe), + DEVMETHOD(device_attach, nexus_acpi_attach), + + { 0, 0 } +}; + +DEFINE_CLASS_1(nexus, nexus_acpi_driver, nexus_acpi_methods, 1, nexus_driver); +static devclass_t nexus_devclass; + +DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, nexus_devclass, 0, 0); ==== //depot/projects/smpng/sys/amd64/acpica/madt.c#15 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.24 2007/05/08 22:01:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.25 2008/01/31 16:51:42 jhb Exp $"); #include #include @@ -109,9 +109,11 @@ /* * Code to abuse the crashdump map to map in the tables for the early * probe. We cheat and make the following assumptions about how we - * use this KVA: page 0 is used to map in the first page of each table - * found via the RSDT or XSDT and pages 1 to n are used to map in the - * RSDT or XSDT. The offset is in pages; the length is in bytes. + * use this KVA: pages 0 and 1 are used to map in the header of each + * table found via the RSDT or XSDT and pages 2 to n are used to map + * in the RSDT or XSDT. We have to use 2 pages for the table headers + * in case a header spans a page boundary. The offset is in pages; + * the length is in bytes. */ static void * madt_map(vm_paddr_t pa, int offset, vm_offset_t length) @@ -232,7 +234,7 @@ printf("MADT: RSDP failed extended checksum\n"); return (ENXIO); } - xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, + xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 2, ACPI_SIG_XSDT); if (xsdt == NULL) { if (bootverbose) @@ -246,7 +248,7 @@ break; madt_unmap_table(xsdt); } else { - rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, + rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 2, ACPI_SIG_RSDT); if (rsdt == NULL) { if (bootverbose) ==== //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.25 2004/08/07 06:21:37 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.29 2008/03/12 22:09:19 jhb Exp $"); #include #include @@ -47,31 +47,31 @@ static char *mem_owner_bios = "BIOS"; -#define MR686_FIXMTRR (1<<0) +#define MR686_FIXMTRR (1<<0) -#define mrwithin(mr, a) \ - (((a) >= (mr)->mr_base) && ((a) < ((mr)->mr_base + (mr)->mr_len))) -#define mroverlap(mra, mrb) \ - (mrwithin(mra, mrb->mr_base) || mrwithin(mrb, mra->mr_base)) +#define mrwithin(mr, a) \ + (((a) >= (mr)->mr_base) && ((a) < ((mr)->mr_base + (mr)->mr_len))) +#define mroverlap(mra, mrb) \ + (mrwithin(mra, mrb->mr_base) || mrwithin(mrb, mra->mr_base)) -#define mrvalid(base, len) \ - ((!(base & ((1 << 12) - 1))) && /* base is multiple of 4k */ \ - ((len) >= (1 << 12)) && /* length is >= 4k */ \ - powerof2((len)) && /* ... and power of two */ \ - !((base) & ((len) - 1))) /* range is not discontiuous */ +#define mrvalid(base, len) \ + ((!(base & ((1 << 12) - 1))) && /* base is multiple of 4k */ \ + ((len) >= (1 << 12)) && /* length is >= 4k */ \ + powerof2((len)) && /* ... and power of two */ \ + !((base) & ((len) - 1))) /* range is not discontiuous */ -#define mrcopyflags(curr, new) (((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK)) +#define mrcopyflags(curr, new) \ + (((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK)) -static int mtrrs_disabled; +static int mtrrs_disabled; TUNABLE_INT("machdep.disable_mtrrs", &mtrrs_disabled); SYSCTL_INT(_machdep, OID_AUTO, disable_mtrrs, CTLFLAG_RDTUN, - &mtrrs_disabled, 0, "Disable amd64 MTRRs."); + &mtrrs_disabled, 0, "Disable amd64 MTRRs."); -static void amd64_mrinit(struct mem_range_softc *sc); -static int amd64_mrset(struct mem_range_softc *sc, - struct mem_range_desc *mrd, - int *arg); -static void amd64_mrAPinit(struct mem_range_softc *sc); +static void amd64_mrinit(struct mem_range_softc *sc); +static int amd64_mrset(struct mem_range_softc *sc, + struct mem_range_desc *mrd, int *arg); +static void amd64_mrAPinit(struct mem_range_softc *sc); static struct mem_range_ops amd64_mrops = { amd64_mrinit, @@ -80,157 +80,159 @@ }; /* XXX for AP startup hook */ -static u_int64_t mtrrcap, mtrrdef; +static u_int64_t mtrrcap, mtrrdef; + +/* The bitmask for the PhysBase and PhysMask fields of the variable MTRRs. */ +static u_int64_t mtrr_physmask; -static struct mem_range_desc *mem_range_match(struct mem_range_softc *sc, - struct mem_range_desc *mrd); -static void amd64_mrfetch(struct mem_range_softc *sc); -static int amd64_mtrrtype(int flags); -static int amd64_mrt2mtrr(int flags, int oldval); -static int amd64_mtrrconflict(int flag1, int flag2); -static void amd64_mrstore(struct mem_range_softc *sc); -static void amd64_mrstoreone(void *arg); -static struct mem_range_desc *amd64_mtrrfixsearch(struct mem_range_softc *sc, - u_int64_t addr); -static int amd64_mrsetlow(struct mem_range_softc *sc, - struct mem_range_desc *mrd, - int *arg); -static int amd64_mrsetvariable(struct mem_range_softc *sc, - struct mem_range_desc *mrd, - int *arg); +static struct mem_range_desc *mem_range_match(struct mem_range_softc *sc, + struct mem_range_desc *mrd); +static void amd64_mrfetch(struct mem_range_softc *sc); +static int amd64_mtrrtype(int flags); +static int amd64_mrt2mtrr(int flags, int oldval); +static int amd64_mtrrconflict(int flag1, int flag2); +static void amd64_mrstore(struct mem_range_softc *sc); +static void amd64_mrstoreone(void *arg); +static struct mem_range_desc *amd64_mtrrfixsearch(struct mem_range_softc *sc, + u_int64_t addr); +static int amd64_mrsetlow(struct mem_range_softc *sc, + struct mem_range_desc *mrd, int *arg); +static int amd64_mrsetvariable(struct mem_range_softc *sc, + struct mem_range_desc *mrd, int *arg); /* amd64 MTRR type to memory range type conversion */ static int amd64_mtrrtomrt[] = { - MDF_UNCACHEABLE, - MDF_WRITECOMBINE, - MDF_UNKNOWN, - MDF_UNKNOWN, - MDF_WRITETHROUGH, - MDF_WRITEPROTECT, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 13 23:08:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B09301065674; Thu, 13 Mar 2008 23:08:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 553691065670 for ; Thu, 13 Mar 2008 23:08:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4104F8FC15 for ; Thu, 13 Mar 2008 23:08:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DN8ECC033825 for ; Thu, 13 Mar 2008 23:08:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DN8EHK033823 for perforce@freebsd.org; Thu, 13 Mar 2008 23:08:14 GMT (envelope-from sam@freebsd.org) Date: Thu, 13 Mar 2008 23:08:14 GMT Message-Id: <200803132308.m2DN8EHK033823@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 137658 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, 13 Mar 2008 23:08:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=137658 Change 137658 by sam@sam_ebb on 2008/03/13 23:07:52 syslog support under -s cmd line option and CONFIG_DEBUG_SYSLOG compile-time option Affected files ... .. //depot/projects/vap/contrib/wpa_supplicant/Makefile#4 edit .. //depot/projects/vap/contrib/wpa_supplicant/common.c#4 edit .. //depot/projects/vap/contrib/wpa_supplicant/defconfig#4 edit .. //depot/projects/vap/contrib/wpa_supplicant/main.c#4 edit .. //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant.c#4 edit .. //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant_i.h#4 edit Differences ... ==== //depot/projects/vap/contrib/wpa_supplicant/Makefile#4 (text+ko) ==== @@ -745,6 +745,10 @@ CFLAGS += -DCONFIG_DEBUG_FILE endif +ifdef CONFIG_DEBUG_SYSLOG +CFLAGS += -DCONFIG_DEBUG_SYSLOG +endif + OBJS += wpa_supplicant.o events.o OBJS_t := $(OBJS) eapol_test.o radius.o radius_client.o OBJS_t2 := $(OBJS) preauth_test.o ==== //depot/projects/vap/contrib/wpa_supplicant/common.c#4 (text+ko) ==== @@ -16,13 +16,18 @@ #include "common.h" +#ifdef CONFIG_DEBUG_SYSLOG +#include +#endif /* CONFIG_DEBUG_SYSLOG */ + #ifdef CONFIG_DEBUG_FILE static FILE *out_file = NULL; #endif /* CONFIG_DEBUG_FILE */ int wpa_debug_level = MSG_INFO; int wpa_debug_show_keys = 0; int wpa_debug_timestamp = 0; +int wpa_debug_syslog = 0; static int hex2num(char c) @@ -161,7 +166,41 @@ printf("%ld.%06u: ", (long) tv.sec, (unsigned int) tv.usec); } +void wpa_debug_open_syslog(void) +{ +#ifdef CONFIG_DEBUG_SYSLOG + openlog("wpa_supplicant", LOG_PID | LOG_NDELAY, LOG_DAEMON); + wpa_debug_syslog++; +#endif +} + +void wpa_debug_close_syslog(void) +{ +#ifdef CONFIG_DEBUG_SYSLOG + if (wpa_debug_syslog) + closelog(); +#endif +} +#ifdef CONFIG_DEBUG_SYSLOG +static int syslog_priority(int level) +{ + switch (level) { + case MSG_MSGDUMP: + case MSG_DEBUG: + return LOG_DEBUG; + case MSG_INFO: + return LOG_NOTICE; + case MSG_WARNING: + return LOG_WARNING; + case MSG_ERROR: + return LOG_ERR; + } + return LOG_INFO; +} +#endif /* CONFIG_DEBUG_SYSLOG */ + + /** * wpa_printf - conditional printf * @level: priority level (MSG_*) of the message @@ -179,6 +218,11 @@ va_start(ap, fmt); if (level >= wpa_debug_level) { +#ifdef CONFIG_DEBUG_SYSLOG + if (wpa_debug_syslog) { + vsyslog(syslog_priority(level), fmt, ap); + } else { +#endif /* CONFIG_DEBUG_SYSLOG */ wpa_debug_print_timestamp(); #ifdef CONFIG_DEBUG_FILE if (out_file) { @@ -191,6 +235,9 @@ #ifdef CONFIG_DEBUG_FILE } #endif /* CONFIG_DEBUG_FILE */ +#ifdef CONFIG_DEBUG_SYSLOG + } +#endif /* CONFIG_DEBUG_SYSLOG */ } va_end(ap); } ==== //depot/projects/vap/contrib/wpa_supplicant/defconfig#4 (text+ko) ==== @@ -321,3 +321,6 @@ # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) #CONFIG_DEBUG_FILE=y + +# Add support for logging via syslog +#CONFIG_DEBUG_SYSLOG=y ==== //depot/projects/vap/contrib/wpa_supplicant/main.c#4 (text) ==== @@ -39,7 +39,7 @@ int i; printf("%s\n\n%s\n" "usage:\n" - " wpa_supplicant [-BddhKLqqtuvwW] [-P] " + " wpa_supplicant [-BddhKLqqstuvwW] [-P] " "[-g] \\\n" " -i -c [-C] [-D] " "[-p] \\\n" @@ -77,6 +77,9 @@ printf(" -p = driver parameters\n" " -P = PID file\n" " -q = decrease debugging verbosity (-qq even less)\n" +#ifdef CONFIG_DEBUG_SYSLOG + " -s = log output to syslog instead of stdout\n" +#endif /* CONFIG_DEBUG_SYSLOG */ #ifdef CONFIG_CTRL_IFACE_DBUS " -u = enable DBus control interface\n" #endif /* CONFIG_CTRL_IFACE_DBUS */ @@ -147,7 +150,7 @@ wpa_supplicant_fd_workaround(); for (;;) { - c = getopt(argc, argv, "b:Bc:C:D:df:g:hi:KLNp:P:qtuvwW"); + c = getopt(argc, argv, "b:Bc:C:D:df:g:hi:KLNp:P:qstuvwW"); if (c < 0) break; switch (c) { @@ -208,6 +211,11 @@ case 'q': params.wpa_debug_level++; break; +#ifdef CONFIG_DEBUG_SYSLOG + case 's': + params.wpa_debug_syslog++; + break; +#endif /* CONFIG_DEBUG_SYSLOG */ case 't': params.wpa_debug_timestamp++; break; ==== //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant.c#4 (text+ko) ==== @@ -2488,6 +2488,8 @@ return NULL; wpa_debug_open_file(params->wpa_debug_file_path); + if (params->wpa_debug_syslog) + wpa_debug_open_syslog(); ret = eap_peer_register_methods(); if (ret) { @@ -2612,5 +2614,6 @@ os_free(global->params.ctrl_interface); os_free(global); + wpa_debug_close_syslog(); wpa_debug_close_file(); } ==== //depot/projects/vap/contrib/wpa_supplicant/wpa_supplicant_i.h#4 (text+ko) ==== @@ -161,6 +161,11 @@ * wpa_debug_file_path - Path of debug file or %NULL to use stdout */ const char *wpa_debug_file_path; + + /** + * wpa_debug_syslog - Enable log output through syslog + */ + const char *wpa_debug_syslog; }; /** From owner-p4-projects@FreeBSD.ORG Thu Mar 13 23:09:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8B1D1065671; Thu, 13 Mar 2008 23:09:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9832B106566B for ; Thu, 13 Mar 2008 23:09:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6A6578FC25 for ; Thu, 13 Mar 2008 23:09:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2DN9F6c033845 for ; Thu, 13 Mar 2008 23:09:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2DN9Fvu033843 for perforce@freebsd.org; Thu, 13 Mar 2008 23:09:15 GMT (envelope-from sam@freebsd.org) Date: Thu, 13 Mar 2008 23:09:15 GMT Message-Id: <200803132309.m2DN9Fvu033843@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 137659 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, 13 Mar 2008 23:09:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=137659 Change 137659 by sam@sam_ebb on 2008/03/13 23:09:01 enable syslog support Affected files ... .. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/Makefile#4 edit Differences ... ==== //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/Makefile#4 (text+ko) ==== @@ -27,6 +27,7 @@ CFLAGS+= -DCONFIG_CTRL_IFACE CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX CFLAGS+= -DCONFIG_TERMINATE_ONLASTIF +CFLAGS+= -DCONFIG_DEBUG_SYSLOG CFLAGS+= -g DPADD+= ${LIBPCAP} LDADD+= -lpcap From owner-p4-projects@FreeBSD.ORG Fri Mar 14 01:42:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BF1F1065671; Fri, 14 Mar 2008 01:42:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED92D106566B for ; Fri, 14 Mar 2008 01:42:02 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D6E688FC1A for ; Fri, 14 Mar 2008 01:42:02 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E1g2eQ071046 for ; Fri, 14 Mar 2008 01:42:02 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E1fpif071040 for perforce@freebsd.org; Fri, 14 Mar 2008 01:41:51 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 14 Mar 2008 01:41:51 GMT Message-Id: <200803140141.m2E1fpif071040@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137662 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, 14 Mar 2008 01:42:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=137662 Change 137662 by peter@peter_overcee on 2008/03/14 01:41:26 IFC @137657 Affected files ... .. //depot/projects/bike_sched/sys/Makefile#4 integrate .. //depot/projects/bike_sched/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/bike_sched/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/db_trace.c#4 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/legacy.c#3 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/minidump_machdep.c#3 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/mp_watchdog.c#3 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/bike_sched/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/bike_sched/sys/amd64/amd64/vm_machdep.c#7 integrate .. //depot/projects/bike_sched/sys/amd64/conf/DEFAULTS#5 integrate .. //depot/projects/bike_sched/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/bike_sched/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/bike_sched/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/bike_sched/sys/amd64/include/_types.h#2 integrate .. //depot/projects/bike_sched/sys/amd64/include/float.h#2 integrate .. //depot/projects/bike_sched/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/bike_sched/sys/amd64/include/nexusvar.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/bike_sched/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/bike_sched/sys/amd64/include/proc.h#2 integrate .. //depot/projects/bike_sched/sys/amd64/include/smp.h#3 integrate .. //depot/projects/bike_sched/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/bike_sched/sys/amd64/include/stack.h#1 branch .. //depot/projects/bike_sched/sys/amd64/include/vmparam.h#3 integrate .. //depot/projects/bike_sched/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/bike_sched/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/bike_sched/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/bike_sched/sys/arm/arm/db_trace.c#3 integrate .. //depot/projects/bike_sched/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/bike_sched/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/bike_sched/sys/arm/arm/locore.S#4 integrate .. //depot/projects/bike_sched/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/bike_sched/sys/arm/arm/nexus_io.c#3 delete .. //depot/projects/bike_sched/sys/arm/arm/nexus_io_asm.S#2 delete .. //depot/projects/bike_sched/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/bike_sched/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/bike_sched/sys/arm/arm/support.S#3 integrate .. //depot/projects/bike_sched/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/bike_sched/sys/arm/arm/trap.c#5 integrate .. //depot/projects/bike_sched/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/bike_sched/sys/arm/at91/at91.c#3 integrate .. //depot/projects/bike_sched/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/bike_sched/sys/arm/at91/kb920x_machdep.c#8 integrate .. //depot/projects/bike_sched/sys/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/bike_sched/sys/arm/conf/AVILA#3 integrate .. //depot/projects/bike_sched/sys/arm/conf/BWCT#2 integrate .. //depot/projects/bike_sched/sys/arm/conf/CRB#2 integrate .. //depot/projects/bike_sched/sys/arm/conf/EP80219#2 integrate .. //depot/projects/bike_sched/sys/arm/conf/HL200#2 integrate .. //depot/projects/bike_sched/sys/arm/conf/IQ31244#4 integrate .. //depot/projects/bike_sched/sys/arm/conf/KB920X#5 integrate .. //depot/projects/bike_sched/sys/arm/conf/SIMICS#4 integrate .. //depot/projects/bike_sched/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/bike_sched/sys/arm/include/_bus.h#2 integrate .. //depot/projects/bike_sched/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/bike_sched/sys/arm/include/atomic.h#3 integrate .. //depot/projects/bike_sched/sys/arm/include/pmap.h#4 integrate .. //depot/projects/bike_sched/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/bike_sched/sys/arm/include/stack.h#1 branch .. //depot/projects/bike_sched/sys/arm/include/sysarch.h#2 integrate .. //depot/projects/bike_sched/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/bike_sched/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/bike_sched/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/bike_sched/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/bike_sched/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/bike_sched/sys/arm/xscale/ixp425/ixp425_iic.c#2 integrate .. //depot/projects/bike_sched/sys/boot/Makefile#4 integrate .. //depot/projects/bike_sched/sys/boot/arm/at91/boot2/bwct_board.c#2 integrate .. //depot/projects/bike_sched/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/bike_sched/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/bike_sched/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/bike_sched/sys/boot/common/load_elf.c#3 integrate .. //depot/projects/bike_sched/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/bike_sched/sys/boot/forth/support.4th#3 integrate .. //depot/projects/bike_sched/sys/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/bike_sched/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/bike_sched/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/bike_sched/sys/boot/i386/gptboot/gptboot.c#2 integrate .. //depot/projects/bike_sched/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/bike_sched/sys/boot/i386/pxeldr/pxeldr.S#3 integrate .. //depot/projects/bike_sched/sys/boot/ofw/libofw/ofw_console.c#3 integrate .. //depot/projects/bike_sched/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/bike_sched/sys/boot/pc98/btx/btx/btx.S#3 integrate .. //depot/projects/bike_sched/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/bike_sched/sys/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/bike_sched/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/bike_sched/sys/boot/powerpc/loader/Makefile#2 delete .. //depot/projects/bike_sched/sys/boot/powerpc/loader/conf.c#2 delete .. //depot/projects/bike_sched/sys/boot/powerpc/loader/help.ofw#2 delete .. //depot/projects/bike_sched/sys/boot/powerpc/loader/ldscript.powerpc#2 delete .. //depot/projects/bike_sched/sys/boot/powerpc/loader/metadata.c#2 delete .. //depot/projects/bike_sched/sys/boot/powerpc/loader/start.c#2 delete .. //depot/projects/bike_sched/sys/boot/powerpc/loader/version#2 delete .. //depot/projects/bike_sched/sys/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/ofw/version#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/uboot/metadata.c#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/bike_sched/sys/boot/powerpc/uboot/version#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/common/main.c#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/lib/Makefile#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/lib/console.c#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/lib/copy.c#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/lib/disk.c#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/lib/glue.c#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/lib/module.c#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/lib/net.c#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/bike_sched/sys/boot/uboot/lib/time.c#1 branch .. //depot/projects/bike_sched/sys/cam/cam_periph.c#3 integrate .. //depot/projects/bike_sched/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/bike_sched/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/bike_sched/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/bike_sched/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32.h#3 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/bike_sched/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/bike_sched/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/bike_sched/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/bike_sched/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/bike_sched/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/bike_sched/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/bike_sched/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/bike_sched/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/bike_sched/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/bike_sched/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/bike_sched/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/bike_sched/sys/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/bike_sched/sys/compat/pecoff/imgact_pecoff.c#3 integrate .. //depot/projects/bike_sched/sys/compat/svr4/imgact_svr4.c#3 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_stream.c#4 integrate .. //depot/projects/bike_sched/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/bike_sched/sys/conf/Makefile.amd64#3 integrate .. //depot/projects/bike_sched/sys/conf/Makefile.arm#4 integrate .. //depot/projects/bike_sched/sys/conf/NOTES#5 integrate .. //depot/projects/bike_sched/sys/conf/files#7 integrate .. //depot/projects/bike_sched/sys/conf/files.amd64#4 integrate .. //depot/projects/bike_sched/sys/conf/files.arm#5 integrate .. //depot/projects/bike_sched/sys/conf/files.i386#4 integrate .. //depot/projects/bike_sched/sys/conf/files.ia64#4 integrate .. //depot/projects/bike_sched/sys/conf/files.pc98#3 integrate .. //depot/projects/bike_sched/sys/conf/files.powerpc#4 integrate .. //depot/projects/bike_sched/sys/conf/files.sparc64#3 integrate .. //depot/projects/bike_sched/sys/conf/files.sun4v#2 integrate .. //depot/projects/bike_sched/sys/conf/kern.post.mk#4 integrate .. //depot/projects/bike_sched/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/bike_sched/sys/conf/kmod.mk#4 integrate .. //depot/projects/bike_sched/sys/conf/ldscript.powerpc#2 integrate .. //depot/projects/bike_sched/sys/conf/options#5 integrate .. //depot/projects/bike_sched/sys/conf/options.powerpc#2 integrate .. //depot/projects/bike_sched/sys/contrib/dev/acpica/evgpe.c#3 integrate .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/bike_sched/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/bike_sched/sys/crypto/rijndael/rijndael-api.c#2 integrate .. //depot/projects/bike_sched/sys/crypto/rijndael/test00.c#2 integrate .. //depot/projects/bike_sched/sys/ddb/db_capture.c#1 branch .. //depot/projects/bike_sched/sys/ddb/db_command.c#4 integrate .. //depot/projects/bike_sched/sys/ddb/db_command.h#2 integrate .. //depot/projects/bike_sched/sys/ddb/db_examine.c#3 integrate .. //depot/projects/bike_sched/sys/ddb/db_input.c#2 integrate .. //depot/projects/bike_sched/sys/ddb/db_lex.c#2 integrate .. //depot/projects/bike_sched/sys/ddb/db_lex.h#2 integrate .. //depot/projects/bike_sched/sys/ddb/db_main.c#3 integrate .. //depot/projects/bike_sched/sys/ddb/db_output.c#4 integrate .. //depot/projects/bike_sched/sys/ddb/db_script.c#1 branch .. //depot/projects/bike_sched/sys/ddb/db_textdump.c#1 branch .. //depot/projects/bike_sched/sys/ddb/ddb.h#3 integrate .. //depot/projects/bike_sched/sys/dev/aac/aac.c#3 integrate .. //depot/projects/bike_sched/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/bike_sched/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/bike_sched/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/bike_sched/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/bike_sched/sys/dev/acpica/Osd/OsdDebug.c#3 integrate .. //depot/projects/bike_sched/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/bike_sched/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/bike_sched/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/bike_sched/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/bike_sched/sys/dev/acpica/acpi_hpet.h#1 branch .. //depot/projects/bike_sched/sys/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/bike_sched/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/bike_sched/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/bike_sched/sys/dev/agp/agp_nvidia.c#2 integrate .. //depot/projects/bike_sched/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/bike_sched/sys/dev/amr/amr.c#3 integrate .. //depot/projects/bike_sched/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/bike_sched/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/bike_sched/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/bike_sched/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/bike_sched/sys/dev/an/if_an.c#3 integrate .. //depot/projects/bike_sched/sys/dev/an/if_an_pci.c#3 integrate .. //depot/projects/bike_sched/sys/dev/an/if_anreg.h#3 integrate .. //depot/projects/bike_sched/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/bike_sched/sys/dev/arcmsr/arcmsr.h#3 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/bike_sched/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/bike_sched/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/bike_sched/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/bike_sched/sys/dev/atkbdc/atkbd_atkbdc.c#3 integrate .. //depot/projects/bike_sched/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/bike_sched/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/bike_sched/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/bike_sched/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/bike_sched/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/bike_sched/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/bike_sched/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/bike_sched/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/bike_sched/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/bike_sched/sys/dev/cmx/cmx.c#1 branch .. //depot/projects/bike_sched/sys/dev/cmx/cmx_pccard.c#1 branch .. //depot/projects/bike_sched/sys/dev/cmx/cmxreg.h#1 branch .. //depot/projects/bike_sched/sys/dev/cmx/cmxvar.h#1 branch .. //depot/projects/bike_sched/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/bin2h.pl#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/common/cxgb_version.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_ioctl.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_l2t.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_multiq.c#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_t3fw.c#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/cxgb_t3fw.h#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/sys/cxgb_support.c#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/bike_sched/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete .. //depot/projects/bike_sched/sys/dev/cxgb/t3b_protocol_sram.h#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete .. //depot/projects/bike_sched/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/t3cdev.h#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/toecore/toedev.c#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/toecore/toedev.h#2 delete .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/tom/cxgb_defs.h#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/tom/cxgb_listen.c#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/tom/cxgb_tom.c#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/tom/cxgb_tom.h#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/tom/cxgb_vm.c#1 branch .. //depot/projects/bike_sched/sys/dev/cxgb/ulp/tom/cxgb_vm.h#1 branch .. //depot/projects/bike_sched/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/bike_sched/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/bike_sched/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/bike_sched/sys/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ed/if_ed_rtl80x9.c#2 integrate .. //depot/projects/bike_sched/sys/dev/em/LICENSE#3 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_82540.c#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_82541.c#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_82541.h#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_82542.c#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_82543.c#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_82543.h#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_82571.c#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_82571.h#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_82575.c#2 delete .. //depot/projects/bike_sched/sys/dev/em/e1000_82575.h#2 delete .. //depot/projects/bike_sched/sys/dev/em/e1000_api.c#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_api.h#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_defines.h#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_hw.h#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_mac.c#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_mac.h#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_manage.c#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_manage.h#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_phy.c#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_phy.h#2 integrate .. //depot/projects/bike_sched/sys/dev/em/e1000_regs.h#2 integrate .. //depot/projects/bike_sched/sys/dev/em/if_em.c#4 integrate .. //depot/projects/bike_sched/sys/dev/em/if_em.h#3 integrate .. //depot/projects/bike_sched/sys/dev/fb/creator.c#3 integrate .. //depot/projects/bike_sched/sys/dev/fb/fb.c#2 integrate .. //depot/projects/bike_sched/sys/dev/fb/fbreg.h#3 integrate .. //depot/projects/bike_sched/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/bike_sched/sys/dev/fb/splash_bmp.c#3 integrate .. //depot/projects/bike_sched/sys/dev/fb/splash_pcx.c#2 integrate .. //depot/projects/bike_sched/sys/dev/fb/vga.c#2 integrate .. //depot/projects/bike_sched/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/bike_sched/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/bike_sched/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/bike_sched/sys/dev/gem/if_gemreg.h#3 integrate .. //depot/projects/bike_sched/sys/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/bike_sched/sys/dev/hatm/if_hatm_intr.c#3 integrate .. //depot/projects/bike_sched/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/bike_sched/sys/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/bike_sched/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/bike_sched/sys/dev/hptrr/array.h#1 branch .. //depot/projects/bike_sched/sys/dev/hptrr/him.h#1 branch .. //depot/projects/bike_sched/sys/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/bike_sched/sys/dev/hptrr/hptintf.h#1 branch .. //depot/projects/bike_sched/sys/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/bike_sched/sys/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/bike_sched/sys/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/bike_sched/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/bike_sched/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/bike_sched/sys/dev/hptrr/ldm.h#1 branch .. //depot/projects/bike_sched/sys/dev/hptrr/list.h#1 branch .. //depot/projects/bike_sched/sys/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/bike_sched/sys/dev/hptrr/osm.h#1 branch .. //depot/projects/bike_sched/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/bike_sched/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/bike_sched/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/bike_sched/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/bike_sched/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/bike_sched/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/bike_sched/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/bike_sched/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/bike_sched/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/bike_sched/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ic/quicc.h#1 branch .. //depot/projects/bike_sched/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/bike_sched/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/bike_sched/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/bike_sched/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/bike_sched/sys/dev/igb/e1000_82575.c#1 branch .. //depot/projects/bike_sched/sys/dev/igb/e1000_82575.h#1 branch .. //depot/projects/bike_sched/sys/dev/igb/e1000_api.c#1 branch .. //depot/projects/bike_sched/sys/dev/igb/e1000_api.h#1 branch .. //depot/projects/bike_sched/sys/dev/igb/e1000_defines.h#1 branch .. //depot/projects/bike_sched/sys/dev/igb/e1000_hw.h#1 branch .. //depot/projects/bike_sched/sys/dev/igb/e1000_mac.c#1 branch .. //depot/projects/bike_sched/sys/dev/igb/e1000_mac.h#1 branch .. //depot/projects/bike_sched/sys/dev/igb/e1000_manage.c#1 branch .. //depot/projects/bike_sched/sys/dev/igb/e1000_manage.h#1 branch .. //depot/projects/bike_sched/sys/dev/igb/e1000_nvm.c#1 branch .. //depot/projects/bike_sched/sys/dev/igb/e1000_nvm.h#1 branch .. //depot/projects/bike_sched/sys/dev/igb/e1000_osdep.h#1 branch .. //depot/projects/bike_sched/sys/dev/igb/e1000_phy.c#1 branch .. //depot/projects/bike_sched/sys/dev/igb/e1000_phy.h#1 branch .. //depot/projects/bike_sched/sys/dev/igb/e1000_regs.h#1 branch .. //depot/projects/bike_sched/sys/dev/igb/if_igb.c#1 branch .. //depot/projects/bike_sched/sys/dev/igb/if_igb.h#1 branch .. //depot/projects/bike_sched/sys/dev/iir/iir.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ipw/if_ipw.c#4 integrate .. //depot/projects/bike_sched/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/bike_sched/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/bike_sched/sys/dev/kbd/kbd.c#3 integrate .. //depot/projects/bike_sched/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/bike_sched/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/bike_sched/sys/dev/le/am7990.c#3 integrate .. //depot/projects/bike_sched/sys/dev/le/am79900.c#3 integrate .. //depot/projects/bike_sched/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/bike_sched/sys/dev/md/md.c#3 integrate .. //depot/projects/bike_sched/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/bike_sched/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/bike_sched/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/bike_sched/sys/dev/mii/amphy.c#4 integrate .. //depot/projects/bike_sched/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/bike_sched/sys/dev/mii/ciphy.c#4 integrate .. //depot/projects/bike_sched/sys/dev/mii/miidevs#3 integrate .. //depot/projects/bike_sched/sys/dev/mii/nsphy.c#4 integrate .. //depot/projects/bike_sched/sys/dev/mii/nsphyter.c#1 branch .. //depot/projects/bike_sched/sys/dev/mii/nsphyterreg.h#1 branch .. //depot/projects/bike_sched/sys/dev/mii/rgephy.c#5 integrate .. //depot/projects/bike_sched/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/bike_sched/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/bike_sched/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/bike_sched/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/bike_sched/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/bike_sched/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/bike_sched/sys/dev/mxge/mxge_lro.c#2 integrate .. //depot/projects/bike_sched/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/bike_sched/sys/dev/mxge/mxge_rss_eth_z8e.c#1 branch .. //depot/projects/bike_sched/sys/dev/mxge/mxge_rss_ethp_z8e.c#1 branch .. //depot/projects/bike_sched/sys/dev/mxge/rss_eth_z8e.h#1 branch .. //depot/projects/bike_sched/sys/dev/mxge/rss_ethp_z8e.h#1 branch .. //depot/projects/bike_sched/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/bike_sched/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/bike_sched/sys/dev/nfe/if_nfevar.h#3 integrate .. //depot/projects/bike_sched/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/bike_sched/sys/dev/patm/if_patm_rx.c#2 integrate .. //depot/projects/bike_sched/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/bike_sched/sys/dev/pci/pci.c#4 integrate .. //depot/projects/bike_sched/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/bike_sched/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/bike_sched/sys/dev/ppbus/ppbconf.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/bike_sched/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/bike_sched/sys/dev/quicc/quicc_bfe.h#1 branch .. //depot/projects/bike_sched/sys/dev/quicc/quicc_bfe_ocp.c#1 branch .. //depot/projects/bike_sched/sys/dev/quicc/quicc_bus.h#1 branch .. //depot/projects/bike_sched/sys/dev/quicc/quicc_core.c#1 branch .. //depot/projects/bike_sched/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/bike_sched/sys/dev/ral/rt2560reg.h#3 integrate .. //depot/projects/bike_sched/sys/dev/ral/rt2560var.h#3 integrate .. //depot/projects/bike_sched/sys/dev/re/if_re.c#4 integrate .. //depot/projects/bike_sched/sys/dev/rr232x/LICENSE#2 delete .. //depot/projects/bike_sched/sys/dev/rr232x/README#2 delete .. //depot/projects/bike_sched/sys/dev/rr232x/amd64-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/bike_sched/sys/dev/rr232x/array.h#2 delete .. //depot/projects/bike_sched/sys/dev/rr232x/him.h#2 delete .. //depot/projects/bike_sched/sys/dev/rr232x/himfuncs.h#2 delete .. //depot/projects/bike_sched/sys/dev/rr232x/hptintf.h#2 delete .. //depot/projects/bike_sched/sys/dev/rr232x/i386-elf.rr232x_lib.o.uu#2 delete .. //depot/projects/bike_sched/sys/dev/rr232x/ldm.h#2 delete .. //depot/projects/bike_sched/sys/dev/rr232x/list.h#2 delete .. //depot/projects/bike_sched/sys/dev/rr232x/os_bsd.c#2 delete .. //depot/projects/bike_sched/sys/dev/rr232x/os_bsd.h#2 delete .. //depot/projects/bike_sched/sys/dev/rr232x/osm.h#2 delete .. //depot/projects/bike_sched/sys/dev/rr232x/osm_bsd.c#3 delete .. //depot/projects/bike_sched/sys/dev/rr232x/rr232x_config.c#2 delete .. //depot/projects/bike_sched/sys/dev/rr232x/rr232x_config.h#2 delete .. //depot/projects/bike_sched/sys/dev/scc/scc_bfe.h#3 integrate .. //depot/projects/bike_sched/sys/dev/scc/scc_bfe_quicc.c#1 branch .. //depot/projects/bike_sched/sys/dev/scc/scc_bus.h#2 integrate .. //depot/projects/bike_sched/sys/dev/scc/scc_dev_quicc.c#1 branch .. //depot/projects/bike_sched/sys/dev/sf/if_sf.c#1 branch .. //depot/projects/bike_sched/sys/dev/sf/if_sfreg.h#1 branch .. //depot/projects/bike_sched/sys/dev/sf/starfire_rx.h#1 branch .. //depot/projects/bike_sched/sys/dev/sf/starfire_tx.h#1 branch .. //depot/projects/bike_sched/sys/dev/sio/sio.c#4 integrate .. //depot/projects/bike_sched/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/bike_sched/sys/dev/sk/if_skreg.h#3 integrate .. //depot/projects/bike_sched/sys/dev/snp/snp.c#3 integrate .. //depot/projects/bike_sched/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/bike_sched/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/bike_sched/sys/dev/sound/pci/maestro.c#4 integrate .. //depot/projects/bike_sched/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/bike_sched/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/bike_sched/sys/dev/stge/if_stgereg.h#2 integrate .. //depot/projects/bike_sched/sys/dev/streams/streams.c#3 integrate .. //depot/projects/bike_sched/sys/dev/syscons/blank/blank_saver.c#2 integrate .. //depot/projects/bike_sched/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/bike_sched/sys/dev/syscons/dragon/dragon_saver.c#2 integrate .. //depot/projects/bike_sched/sys/dev/syscons/fade/fade_saver.c#2 integrate .. //depot/projects/bike_sched/sys/dev/syscons/fire/fire_saver.c#3 integrate .. //depot/projects/bike_sched/sys/dev/syscons/green/green_saver.c#2 integrate .. //depot/projects/bike_sched/sys/dev/syscons/logo/logo_saver.c#3 integrate .. //depot/projects/bike_sched/sys/dev/syscons/rain/rain_saver.c#3 integrate .. //depot/projects/bike_sched/sys/dev/syscons/scgfbrndr.c#3 integrate .. //depot/projects/bike_sched/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/bike_sched/sys/dev/syscons/scvidctl.c#3 integrate .. //depot/projects/bike_sched/sys/dev/syscons/snake/snake_saver.c#2 integrate .. //depot/projects/bike_sched/sys/dev/syscons/star/star_saver.c#2 integrate .. //depot/projects/bike_sched/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/bike_sched/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/bike_sched/sys/dev/syscons/warp/warp_saver.c#3 integrate .. //depot/projects/bike_sched/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/bike_sched/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/bike_sched/sys/dev/tsec/if_tsec.c#1 branch .. //depot/projects/bike_sched/sys/dev/tsec/if_tsec.h#1 branch .. //depot/projects/bike_sched/sys/dev/tsec/if_tsecreg.h#1 branch .. //depot/projects/bike_sched/sys/dev/twe/twe.c#2 integrate .. //depot/projects/bike_sched/sys/dev/uart/uart.h#3 integrate .. //depot/projects/bike_sched/sys/dev/uart/uart_bus_ocp.c#1 branch .. //depot/projects/bike_sched/sys/dev/uart/uart_bus_scc.c#2 integrate .. //depot/projects/bike_sched/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/bike_sched/sys/dev/uart/uart_cpu_powerpc.c#3 integrate .. //depot/projects/bike_sched/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/bike_sched/sys/dev/uart/uart_dev_quicc.c#1 branch .. //depot/projects/bike_sched/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/bike_sched/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/bike_sched/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/bike_sched/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/bike_sched/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/bike_sched/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/bike_sched/sys/dev/usb/uark.c#2 integrate .. //depot/projects/bike_sched/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/bike_sched/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/bike_sched/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/bike_sched/sys/dev/usb/uftdireg.h#2 integrate .. //depot/projects/bike_sched/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/bike_sched/sys/dev/usb/umass.c#3 integrate .. //depot/projects/bike_sched/sys/dev/usb/ums.c#3 integrate .. //depot/projects/bike_sched/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/bike_sched/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/bike_sched/sys/dev/usb/usbdi.c#3 integrate .. //depot/projects/bike_sched/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/bike_sched/sys/dev/usb/uslcom.c#1 branch .. //depot/projects/bike_sched/sys/dev/utopia/utopia.c#3 integrate .. //depot/projects/bike_sched/sys/dev/vkbd/vkbd.c#3 integrate .. //depot/projects/bike_sched/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/bike_sched/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/bike_sched/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/bike_sched/sys/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/bike_sched/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/bike_sched/sys/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/bike_sched/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/bike_sched/sys/fs/coda/TODO#2 integrate .. //depot/projects/bike_sched/sys/fs/coda/cnode.h#2 integrate .. //depot/projects/bike_sched/sys/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/bike_sched/sys/fs/coda/coda_io.h#2 integrate .. //depot/projects/bike_sched/sys/fs/coda/coda_kernel.h#2 delete .. //depot/projects/bike_sched/sys/fs/coda/coda_namecache.c#2 delete .. //depot/projects/bike_sched/sys/fs/coda/coda_namecache.h#2 delete .. //depot/projects/bike_sched/sys/fs/coda/coda_opstats.h#2 integrate .. //depot/projects/bike_sched/sys/fs/coda/coda_pioctl.h#2 integrate .. //depot/projects/bike_sched/sys/fs/coda/coda_psdev.c#2 integrate .. //depot/projects/bike_sched/sys/fs/coda/coda_psdev.h#2 integrate .. //depot/projects/bike_sched/sys/fs/coda/coda_subr.c#2 integrate .. //depot/projects/bike_sched/sys/fs/coda/coda_subr.h#2 integrate .. //depot/projects/bike_sched/sys/fs/coda/coda_venus.c#2 integrate .. //depot/projects/bike_sched/sys/fs/coda/coda_venus.h#2 integrate .. //depot/projects/bike_sched/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/bike_sched/sys/fs/coda/coda_vfsops.h#2 integrate .. //depot/projects/bike_sched/sys/fs/coda/coda_vnops.c#2 integrate .. //depot/projects/bike_sched/sys/fs/coda/coda_vnops.h#2 integrate .. //depot/projects/bike_sched/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/bike_sched/sys/fs/devfs/devfs_vfsops.c#4 integrate .. //depot/projects/bike_sched/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/bike_sched/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/fdescfs/fdesc_vnops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/hpfs/hpfs_subr.h#2 integrate .. //depot/projects/bike_sched/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/msdosfs/msdosfs_denode.c#3 integrate .. //depot/projects/bike_sched/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/bike_sched/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/bike_sched/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/bike_sched/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/nwfs/nwfs_node.c#3 integrate .. //depot/projects/bike_sched/sys/fs/nwfs/nwfs_subr.c#3 integrate .. //depot/projects/bike_sched/sys/fs/nwfs/nwfs_vfsops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/bike_sched/sys/fs/portalfs/portal_vfsops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/portalfs/portal_vnops.c#4 integrate .. //depot/projects/bike_sched/sys/fs/procfs/procfs.c#4 integrate .. //depot/projects/bike_sched/sys/fs/procfs/procfs_ctl.c#3 integrate .. //depot/projects/bike_sched/sys/fs/procfs/procfs_dbregs.c#3 integrate .. //depot/projects/bike_sched/sys/fs/procfs/procfs_map.c#3 integrate .. //depot/projects/bike_sched/sys/fs/procfs/procfs_status.c#4 integrate .. //depot/projects/bike_sched/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/bike_sched/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/bike_sched/sys/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/bike_sched/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/bike_sched/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/bike_sched/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/bike_sched/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/bike_sched/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/bike_sched/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/bike_sched/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/bike_sched/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/bike_sched/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/bike_sched/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/bike_sched/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/bike_sched/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/bike_sched/sys/geom/geom_dev.c#4 integrate .. //depot/projects/bike_sched/sys/geom/geom_disk.c#3 integrate .. //depot/projects/bike_sched/sys/geom/geom_io.c#4 integrate .. //depot/projects/bike_sched/sys/geom/linux_lvm/g_linux_lvm.c#1 branch .. //depot/projects/bike_sched/sys/geom/linux_lvm/g_linux_lvm.h#1 branch .. //depot/projects/bike_sched/sys/geom/part/g_part.c#2 integrate .. //depot/projects/bike_sched/sys/geom/part/g_part.h#2 integrate .. //depot/projects/bike_sched/sys/geom/part/g_part_bsd.c#1 branch .. //depot/projects/bike_sched/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/bike_sched/sys/geom/part/g_part_vtoc8.c#1 branch .. //depot/projects/bike_sched/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/bike_sched/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/bike_sched/sys/gnu/fs/ext2fs/fs.h#2 integrate .. //depot/projects/bike_sched/sys/gnu/fs/reiserfs/reiserfs_inode.c#3 integrate .. //depot/projects/bike_sched/sys/gnu/fs/reiserfs/reiserfs_namei.c#3 integrate .. //depot/projects/bike_sched/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#3 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#3 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#4 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#4 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#3 integrate .. //depot/projects/bike_sched/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate .. //depot/projects/bike_sched/sys/i386/acpica/acpi_machdep.c#4 integrate .. //depot/projects/bike_sched/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/bike_sched/sys/i386/bios/apm.c#3 integrate .. //depot/projects/bike_sched/sys/i386/conf/DEFAULTS#5 integrate .. //depot/projects/bike_sched/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/bike_sched/sys/i386/conf/GENERIC.hints#3 integrate .. //depot/projects/bike_sched/sys/i386/conf/NOTES#4 integrate .. //depot/projects/bike_sched/sys/i386/conf/PAE#4 integrate .. //depot/projects/bike_sched/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/bike_sched/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/bike_sched/sys/i386/i386/db_trace.c#5 integrate .. //depot/projects/bike_sched/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/bike_sched/sys/i386/i386/exception.s#3 integrate .. //depot/projects/bike_sched/sys/i386/i386/geode.c#3 integrate .. //depot/projects/bike_sched/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/bike_sched/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/bike_sched/sys/i386/i386/initcpu.c#4 integrate .. //depot/projects/bike_sched/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/bike_sched/sys/i386/i386/legacy.c#3 integrate .. //depot/projects/bike_sched/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/bike_sched/sys/i386/i386/minidump_machdep.c#4 integrate .. //depot/projects/bike_sched/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/bike_sched/sys/i386/i386/mp_watchdog.c#3 integrate .. //depot/projects/bike_sched/sys/i386/i386/nexus.c#3 integrate .. //depot/projects/bike_sched/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/bike_sched/sys/i386/i386/stack_machdep.c#1 branch .. //depot/projects/bike_sched/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/bike_sched/sys/i386/i386/trap.c#5 integrate .. //depot/projects/bike_sched/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/ibcs2_misc.c#4 integrate .. //depot/projects/bike_sched/sys/i386/ibcs2/imgact_coff.c#4 integrate .. //depot/projects/bike_sched/sys/i386/include/_types.h#2 integrate .. //depot/projects/bike_sched/sys/i386/include/float.h#2 integrate .. //depot/projects/bike_sched/sys/i386/include/ieeefp.h#2 integrate .. //depot/projects/bike_sched/sys/i386/include/nexusvar.h#1 branch .. //depot/projects/bike_sched/sys/i386/include/pmap.h#3 integrate .. //depot/projects/bike_sched/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/bike_sched/sys/i386/include/proc.h#3 integrate .. //depot/projects/bike_sched/sys/i386/include/smp.h#3 integrate .. //depot/projects/bike_sched/sys/i386/include/specialreg.h#5 integrate .. //depot/projects/bike_sched/sys/i386/include/stack.h#1 branch .. //depot/projects/bike_sched/sys/i386/include/vmparam.h#3 integrate .. //depot/projects/bike_sched/sys/i386/isa/clock.c#3 integrate .. //depot/projects/bike_sched/sys/i386/linux/imgact_linux.c#3 integrate .. //depot/projects/bike_sched/sys/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/bike_sched/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/bike_sched/sys/i386/pci/pci_pir.c#3 integrate .. //depot/projects/bike_sched/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/bike_sched/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/bike_sched/sys/ia64/conf/DEFAULTS#5 integrate .. //depot/projects/bike_sched/sys/ia64/conf/GENERIC#5 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/db_machdep.c#4 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/locore.S#3 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/machdep.c#7 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/mp_machdep.c#3 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/nexus.c#3 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/bike_sched/sys/ia64/ia64/stack_machdep.c#1 branch .. //depot/projects/bike_sched/sys/ia64/ia64/trap.c#5 integrate .. //depot/projects/bike_sched/sys/ia64/include/md_var.h#4 integrate .. //depot/projects/bike_sched/sys/ia64/include/pmc_mdep.h#2 integrate .. //depot/projects/bike_sched/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/bike_sched/sys/ia64/include/vmparam.h#3 integrate .. //depot/projects/bike_sched/sys/isa/vga_isa.c#2 integrate .. //depot/projects/bike_sched/sys/kern/Makefile#3 integrate .. //depot/projects/bike_sched/sys/kern/genassym.sh#2 integrate .. //depot/projects/bike_sched/sys/kern/imgact_aout.c#3 integrate .. //depot/projects/bike_sched/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/bike_sched/sys/kern/imgact_gzip.c#3 integrate .. //depot/projects/bike_sched/sys/kern/init_main.c#5 integrate .. //depot/projects/bike_sched/sys/kern/init_sysent.c#7 integrate .. //depot/projects/bike_sched/sys/kern/kern_acct.c#4 integrate .. //depot/projects/bike_sched/sys/kern/kern_alq.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_clock.c#5 integrate .. //depot/projects/bike_sched/sys/kern/kern_condvar.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_conf.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_cpu.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_cpuset.c#1 branch .. //depot/projects/bike_sched/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/bike_sched/sys/kern/kern_event.c#4 integrate .. //depot/projects/bike_sched/sys/kern/kern_exec.c#4 integrate .. //depot/projects/bike_sched/sys/kern/kern_exit.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_fork.c#8 integrate .. //depot/projects/bike_sched/sys/kern/kern_intr.c#7 integrate .. //depot/projects/bike_sched/sys/kern/kern_jail.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_ktrace.c#4 integrate .. //depot/projects/bike_sched/sys/kern/kern_linker.c#5 integrate .. //depot/projects/bike_sched/sys/kern/kern_lock.c#5 integrate .. //depot/projects/bike_sched/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/bike_sched/sys/kern/kern_mib.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_module.c#4 integrate .. //depot/projects/bike_sched/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_priv.c#2 integrate .. //depot/projects/bike_sched/sys/kern/kern_proc.c#5 integrate .. //depot/projects/bike_sched/sys/kern/kern_resource.c#5 integrate .. //depot/projects/bike_sched/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_sig.c#6 integrate .. //depot/projects/bike_sched/sys/kern/kern_switch.c#12 integrate .. //depot/projects/bike_sched/sys/kern/kern_sx.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_synch.c#8 integrate .. //depot/projects/bike_sched/sys/kern/kern_tc.c#4 integrate .. //depot/projects/bike_sched/sys/kern/kern_thread.c#12 integrate .. //depot/projects/bike_sched/sys/kern/kern_time.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/bike_sched/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/bike_sched/sys/kern/link_elf.c#4 integrate .. //depot/projects/bike_sched/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/bike_sched/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#20 integrate .. //depot/projects/bike_sched/sys/kern/subr_autoconf.c#3 integrate .. //depot/projects/bike_sched/sys/kern/subr_bus.c#5 integrate .. //depot/projects/bike_sched/sys/kern/subr_kdb.c#4 integrate .. //depot/projects/bike_sched/sys/kern/subr_lock.c#3 integrate .. //depot/projects/bike_sched/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/bike_sched/sys/kern/subr_smp.c#3 integrate .. //depot/projects/bike_sched/sys/kern/subr_stack.c#3 integrate .. //depot/projects/bike_sched/sys/kern/subr_trap.c#7 integrate .. //depot/projects/bike_sched/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/bike_sched/sys/kern/subr_witness.c#4 integrate .. //depot/projects/bike_sched/sys/kern/sys_generic.c#4 integrate .. //depot/projects/bike_sched/sys/kern/sys_pipe.c#4 integrate .. //depot/projects/bike_sched/sys/kern/sys_process.c#4 integrate .. //depot/projects/bike_sched/sys/kern/sys_socket.c#3 integrate .. //depot/projects/bike_sched/sys/kern/syscalls.c#6 integrate .. //depot/projects/bike_sched/sys/kern/syscalls.master#8 integrate .. //depot/projects/bike_sched/sys/kern/systrace_args.c#3 integrate .. //depot/projects/bike_sched/sys/kern/sysv_shm.c#4 integrate .. //depot/projects/bike_sched/sys/kern/tty.c#4 integrate .. //depot/projects/bike_sched/sys/kern/tty_cons.c#3 integrate .. //depot/projects/bike_sched/sys/kern/tty_pty.c#3 integrate .. //depot/projects/bike_sched/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/bike_sched/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/bike_sched/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/bike_sched/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/bike_sched/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/bike_sched/sys/kern/uipc_shm.c#1 branch .. //depot/projects/bike_sched/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/bike_sched/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/bike_sched/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/bike_sched/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/bike_sched/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/bike_sched/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/bike_sched/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/bike_sched/sys/kern/vfs_cache.c#4 integrate .. //depot/projects/bike_sched/sys/kern/vfs_default.c#3 integrate .. //depot/projects/bike_sched/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/bike_sched/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/bike_sched/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/bike_sched/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/bike_sched/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/bike_sched/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/bike_sched/sys/kern/vnode_if.src#3 integrate .. //depot/projects/bike_sched/sys/libkern/cmpdi2.c#1 branch .. //depot/projects/bike_sched/sys/libkern/quad.h#2 integrate .. //depot/projects/bike_sched/sys/modules/Makefile#4 integrate .. //depot/projects/bike_sched/sys/modules/amr/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/cmx/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/coda/Makefile#3 integrate .. //depot/projects/bike_sched/sys/modules/coda5/Makefile#3 integrate .. //depot/projects/bike_sched/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/cxgb/cxgb/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/cxgb/toecore/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/cxgb/tom/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/em/Makefile#3 integrate .. //depot/projects/bike_sched/sys/modules/geom/Makefile#3 integrate .. //depot/projects/bike_sched/sys/modules/geom/geom_apple/Makefile#2 delete .. //depot/projects/bike_sched/sys/modules/geom/geom_eli/Makefile#3 integrate .. //depot/projects/bike_sched/sys/modules/geom/geom_gpt/Makefile#2 delete .. //depot/projects/bike_sched/sys/modules/geom/geom_linux_lvm/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/geom/geom_part/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/hptrr/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/hwpmc/Makefile#3 integrate .. //depot/projects/bike_sched/sys/modules/igb/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/ipfw_nat/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/mii/Makefile#3 integrate .. //depot/projects/bike_sched/sys/modules/mxge/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/rr232x/Makefile#2 delete .. //depot/projects/bike_sched/sys/modules/sf/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/uslcom/Makefile#1 branch .. //depot/projects/bike_sched/sys/modules/vr/Makefile#2 integrate .. //depot/projects/bike_sched/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/bike_sched/sys/net/bpf.c#5 integrate .. //depot/projects/bike_sched/sys/net/bpf.h#4 integrate .. //depot/projects/bike_sched/sys/net/bpf_filter.c#3 integrate .. //depot/projects/bike_sched/sys/net/bridgestp.c#3 integrate .. //depot/projects/bike_sched/sys/net/bridgestp.h#2 integrate .. //depot/projects/bike_sched/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/bike_sched/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/bike_sched/sys/net/if.c#5 integrate .. //depot/projects/bike_sched/sys/net/if.h#4 integrate .. //depot/projects/bike_sched/sys/net/if_bridge.c#5 integrate .. //depot/projects/bike_sched/sys/net/if_enc.c#5 integrate .. //depot/projects/bike_sched/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/bike_sched/sys/net/if_gif.c#5 integrate .. //depot/projects/bike_sched/sys/net/if_lagg.c#2 integrate .. //depot/projects/bike_sched/sys/net/if_var.h#4 integrate .. //depot/projects/bike_sched/sys/net/netisr.h#2 integrate .. //depot/projects/bike_sched/sys/net/route.c#4 integrate .. //depot/projects/bike_sched/sys/net/route.h#2 integrate .. //depot/projects/bike_sched/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/bike_sched/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/bike_sched/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/bike_sched/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/bike_sched/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/bike_sched/sys/net80211/ieee80211_radiotap.h#3 integrate .. //depot/projects/bike_sched/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/bike_sched/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/bike_sched/sys/netgraph/netflow/ng_netflow.c#3 integrate .. //depot/projects/bike_sched/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_bpf.c#3 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_car.c#2 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_car.h#2 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_ksocket.c#3 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_nat.c#3 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_nat.h#3 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_pppoe.h#3 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_pred1.c#2 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/bike_sched/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/if_ether.c#4 integrate .. //depot/projects/bike_sched/sys/netinet/if_ether.h#2 integrate .. //depot/projects/bike_sched/sys/netinet/in.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/in.h#3 integrate .. //depot/projects/bike_sched/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/bike_sched/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/bike_sched/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/bike_sched/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/bike_sched/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/bike_sched/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/bike_sched/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/bike_sched/sys/netinet/ip_fw_nat.c#1 branch .. //depot/projects/bike_sched/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/ip_id.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/ip_input.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/ip_options.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/ip_output.c#4 integrate .. //depot/projects/bike_sched/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/libalias/alias.h#3 integrate .. //depot/projects/bike_sched/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/libalias/alias_ftp.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/libalias/alias_irc.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/libalias/alias_local.h#3 integrate .. //depot/projects/bike_sched/sys/netinet/libalias/alias_old.c#3 delete .. //depot/projects/bike_sched/sys/netinet/libalias/alias_proxy.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/libalias/alias_smedia.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/libalias/alias_util.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/sctp.h#2 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/bike_sched/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/sctputil.c#2 integrate .. //depot/projects/bike_sched/sys/netinet/tcp.h#3 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_offload.c#1 branch .. //depot/projects/bike_sched/sys/netinet/tcp_offload.h#1 branch .. //depot/projects/bike_sched/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/bike_sched/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/bike_sched/sys/netinet/toedev.h#1 branch .. //depot/projects/bike_sched/sys/netinet6/dest6.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/frag6.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/in6.c#4 integrate .. //depot/projects/bike_sched/sys/netinet6/in6.h#3 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_cksum.c#4 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_gif.h#2 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_ifattach.h#2 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_pcb.h#3 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_rmx.c#4 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/in6_var.h#4 integrate .. //depot/projects/bike_sched/sys/netinet6/ip6_ecn.h#2 integrate .. //depot/projects/bike_sched/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/ip6_id.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/bike_sched/sys/netinet6/ip6_ipsec.h#2 integrate .. //depot/projects/bike_sched/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/ip6_mroute.h#3 integrate .. //depot/projects/bike_sched/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/bike_sched/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/bike_sched/sys/netinet6/mld6.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/mld6_var.h#2 integrate .. //depot/projects/bike_sched/sys/netinet6/nd6.c#4 integrate .. //depot/projects/bike_sched/sys/netinet6/nd6.h#2 integrate .. //depot/projects/bike_sched/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/pim6.h#2 integrate .. //depot/projects/bike_sched/sys/netinet6/pim6_var.h#2 integrate .. //depot/projects/bike_sched/sys/netinet6/raw_ip6.c#4 integrate .. //depot/projects/bike_sched/sys/netinet6/raw_ip6.h#2 integrate .. //depot/projects/bike_sched/sys/netinet6/route6.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/scope6.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/scope6_var.h#2 integrate .. //depot/projects/bike_sched/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/bike_sched/sys/netinet6/sctp6_var.h#2 integrate .. //depot/projects/bike_sched/sys/netinet6/tcp6_var.h#2 integrate .. //depot/projects/bike_sched/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/bike_sched/sys/netinet6/udp6_var.h#3 integrate .. //depot/projects/bike_sched/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/bike_sched/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/bike_sched/sys/netipsec/ipsec6.h#3 integrate .. //depot/projects/bike_sched/sys/netipsec/key.c#3 integrate .. //depot/projects/bike_sched/sys/netipsec/key_debug.c#3 integrate .. //depot/projects/bike_sched/sys/netncp/ncp_conn.c#3 integrate .. //depot/projects/bike_sched/sys/netncp/ncp_conn.h#2 integrate .. //depot/projects/bike_sched/sys/netncp/ncp_rq.c#2 integrate .. //depot/projects/bike_sched/sys/netncp/ncp_sock.c#3 integrate .. //depot/projects/bike_sched/sys/netncp/ncp_sock.h#2 integrate .. //depot/projects/bike_sched/sys/netsmb/smb_conn.c#3 integrate .. //depot/projects/bike_sched/sys/netsmb/smb_conn.h#2 integrate .. //depot/projects/bike_sched/sys/netsmb/smb_iod.c#3 integrate .. //depot/projects/bike_sched/sys/netsmb/smb_trantcp.c#3 integrate .. //depot/projects/bike_sched/sys/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/bike_sched/sys/nfs4client/nfs4_vfsops.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 14 01:55:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B579D1065677; Fri, 14 Mar 2008 01:55:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74B52106566B for ; Fri, 14 Mar 2008 01:55:20 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F0208FC13 for ; Fri, 14 Mar 2008 01:55:20 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E1tK8B071436 for ; Fri, 14 Mar 2008 01:55:20 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E1tKUH071429 for perforce@freebsd.org; Fri, 14 Mar 2008 01:55:20 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 14 Mar 2008 01:55:20 GMT Message-Id: <200803140155.m2E1tKUH071429@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137663 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, 14 Mar 2008 01:55:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=137663 Change 137663 by peter@peter_overcee on 2008/03/14 01:54:48 hack job at finishing the merge Affected files ... .. //depot/projects/bike_sched/sys/kern/sched_ule.c#20 integrate .. //depot/projects/bike_sched/sys/powerpc/powerpc/machdep.c#6 delete .. //depot/projects/bike_sched/sys/powerpc/powerpc/trap.c#4 delete .. //depot/projects/bike_sched/sys/powerpc/powerpc/vm_machdep.c#4 delete Differences ... ==== //depot/projects/bike_sched/sys/kern/sched_ule.c#20 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.217 2007/11/14 06:21:23 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.232 2008/03/12 10:11:59 jeff Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_sched.h" @@ -59,6 +59,7 @@ #include #include #include +#include #ifdef KTRACE #include #include @@ -85,16 +86,13 @@ struct runq *ts_runq; /* Run-queue we're queued on. */ short ts_flags; /* TSF_* flags. */ u_char ts_cpu; /* CPU that we have affinity for. */ + int ts_rltick; /* Real last tick, for affinity. */ int ts_slice; /* Ticks of slice remaining. */ u_int ts_slptime; /* Number of ticks we vol. slept */ u_int ts_runtime; /* Number of ticks we were running */ - /* The following variables are only used for pctcpu calculation */ int ts_ltick; /* Last tick that we were running on */ int ts_ftick; /* First tick that we were running on */ int ts_ticks; /* Tick count */ -#ifdef SMP - int ts_rltick; /* Real last tick, for affinity. */ -#endif }; /* flags kept in ts_flags */ #define TSF_BOUND 0x0001 /* Thread can not migrate. */ @@ -102,6 +100,10 @@ #define TD_TO_TS(td) ((struct td_sched *)(&(td)[1])) +#define THREAD_CAN_MIGRATE(td) ((td)->td_pinned == 0) +#define THREAD_CAN_SCHED(td, cpu) \ + CPU_ISSET((cpu), &(td)->td_cpuset->cs_mask) + static struct { struct thread initial_thread; struct td_sched initial_sched; @@ -175,7 +177,7 @@ static int sched_interact = SCHED_INTERACT_THRESH; static int realstathz; static int tickincr; -static int sched_slice; +static int sched_slice = 1; #ifdef PREEMPTION #ifdef FULL_PREEMPTION static int preempt_thresh = PRI_MAX_IDLE; @@ -185,6 +187,7 @@ #else static int preempt_thresh = 0; #endif +static int static_boost = 1; /* * tdq - per processor runqs and statistics. All fields are protected by the @@ -192,80 +195,51 @@ * locking in sched_pickcpu(); */ struct tdq { - struct mtx *tdq_lock; /* Pointer to group lock. */ + /* Ordered to improve efficiency of cpu_search() and switch(). */ + struct mtx tdq_lock; /* run queue lock. */ + struct cpu_group *tdq_cg; /* Pointer to cpu topology. */ + int tdq_load; /* Aggregate load. */ + int tdq_sysload; /* For loadavg, !ITHD load. */ + int tdq_transferable; /* Transferable thread count. */ + u_char tdq_lowpri; /* Lowest priority thread. */ + u_char tdq_ipipending; /* IPI pending. */ + u_char tdq_idx; /* Current insert index. */ + u_char tdq_ridx; /* Current removal index. */ struct runq tdq_realtime; /* real-time run queue. */ struct runq tdq_timeshare; /* timeshare run queue. */ struct runq tdq_idle; /* Queue of IDLE threads. */ - int tdq_load; /* Aggregate load. */ - u_char tdq_idx; /* Current insert index. */ - u_char tdq_ridx; /* Current removal index. */ -#ifdef SMP - u_char tdq_lowpri; /* Lowest priority thread. */ - int tdq_transferable; /* Transferable thread count. */ - LIST_ENTRY(tdq) tdq_siblings; /* Next in tdq group. */ - struct tdq_group *tdq_group; /* Our processor group. */ -#else - int tdq_sysload; /* For loadavg, !ITHD load. */ -#endif + char tdq_name[sizeof("sched lock") + 6]; } __aligned(64); #ifdef SMP -/* - * tdq groups are groups of processors which can cheaply share threads. When - * one processor in the group goes idle it will check the runqs of the other - * processors in its group prior to halting and waiting for an interrupt. - * These groups are suitable for SMT (Symetric Multi-Threading) and not NUMA. - * In a numa environment we'd want an idle bitmap per group and a two tiered - * load balancer. - */ -struct tdq_group { - struct mtx tdg_lock; /* Protects all fields below. */ - int tdg_cpus; /* Count of CPUs in this tdq group. */ - cpumask_t tdg_cpumask; /* Mask of cpus in this group. */ - cpumask_t tdg_idlemask; /* Idle cpus in this group. */ - cpumask_t tdg_mask; /* Bit mask for first cpu. */ - int tdg_load; /* Total load of this group. */ - int tdg_transferable; /* Transferable load of this group. */ - LIST_HEAD(, tdq) tdg_members; /* Linked list of all members. */ - char tdg_name[16]; /* lock name. */ -} __aligned(64); +struct cpu_group *cpu_top; -#define SCHED_AFFINITY_DEFAULT (max(1, hz / 300)) -#define SCHED_AFFINITY(ts) ((ts)->ts_rltick > ticks - affinity) +#define SCHED_AFFINITY_DEFAULT (max(1, hz / 1000)) +#define SCHED_AFFINITY(ts, t) ((ts)->ts_rltick > ticks - ((t) * affinity)) /* * Run-time tunables. */ static int rebalance = 1; static int balance_interval = 128; /* Default set in sched_initticks(). */ -static int pick_pri = 1; static int affinity; -static int tryself = 1; static int steal_htt = 1; static int steal_idle = 1; static int steal_thresh = 2; -static int topology = 0; /* * One thread queue per processor. */ -static volatile cpumask_t tdq_idle; -static int tdg_maxid; static struct tdq tdq_cpu[MAXCPU]; -static struct tdq_group tdq_groups[MAXCPU]; static struct tdq *balance_tdq; -static int balance_group_ticks; static int balance_ticks; #define TDQ_SELF() (&tdq_cpu[PCPU_GET(cpuid)]) #define TDQ_CPU(x) (&tdq_cpu[(x)]) #define TDQ_ID(x) ((int)((x) - tdq_cpu)) -#define TDQ_GROUP(x) (&tdq_groups[(x)]) -#define TDG_ID(x) ((int)((x) - tdq_groups)) #else /* !SMP */ static struct tdq tdq_cpu; -static struct mtx tdq_lock; #define TDQ_ID(x) (0) #define TDQ_SELF() (&tdq_cpu) @@ -276,7 +250,7 @@ #define TDQ_LOCK(t) mtx_lock_spin(TDQ_LOCKPTR((t))) #define TDQ_LOCK_FLAGS(t, f) mtx_lock_spin_flags(TDQ_LOCKPTR((t)), (f)) #define TDQ_UNLOCK(t) mtx_unlock_spin(TDQ_LOCKPTR((t))) -#define TDQ_LOCKPTR(t) ((t)->tdq_lock) +#define TDQ_LOCKPTR(t) (&(t)->tdq_lock) static void sched_priority(struct thread *); static void sched_thread_priority(struct thread *, u_char); @@ -292,26 +266,23 @@ static void tdq_load_rem(struct tdq *, struct thread *); static __inline void tdq_runq_add(struct tdq *, struct thread *, int); static __inline void tdq_runq_rem(struct tdq *, struct thread *); +static inline int sched_shouldpreempt(int, int, int); void tdq_print(int cpu); static void runq_print(struct runq *rq); static void tdq_add(struct tdq *, struct thread *, int); #ifdef SMP -static void tdq_move(struct tdq *, struct tdq *); +static int tdq_move(struct tdq *, struct tdq *); static int tdq_idled(struct tdq *); -static void tdq_notify(struct thread *); -static struct thread *tdq_steal(struct tdq *); +static void tdq_notify(struct tdq *, struct thread *); +static struct thread *tdq_steal(struct tdq *, int); static struct thread *runq_steal(struct runq *); static int sched_pickcpu(struct thread *, int); static void sched_balance(void); -static void sched_balance_groups(void); -static void sched_balance_group(struct tdq_group *); -static void sched_balance_pair(struct tdq *, struct tdq *); +static int sched_balance_pair(struct tdq *, struct tdq *); static inline struct tdq *sched_setcpu(struct thread *, int, int); static inline struct mtx *thread_block_switch(struct thread *); static inline void thread_unblock_switch(struct thread *, struct mtx *); static struct mtx *sched_switch_migrate(struct tdq *, struct thread *, int); - -#define THREAD_CAN_MIGRATE(td) ((td)->td_pinned == 0) #endif static void sched_setup(void *dummy); @@ -358,7 +329,8 @@ tdq = TDQ_CPU(cpu); printf("tdq %d:\n", TDQ_ID(tdq)); - printf("\tlockptr %p\n", TDQ_LOCKPTR(tdq)); + printf("\tlock %p\n", TDQ_LOCKPTR(tdq)); + printf("\tLock name: %s\n", tdq->tdq_name); printf("\tload: %d\n", tdq->tdq_load); printf("\ttimeshare idx: %d\n", tdq->tdq_idx); printf("\ttimeshare ridx: %d\n", tdq->tdq_ridx); @@ -368,12 +340,41 @@ runq_print(&tdq->tdq_timeshare); printf("\tidle runq:\n"); runq_print(&tdq->tdq_idle); -#ifdef SMP printf("\tload transferable: %d\n", tdq->tdq_transferable); printf("\tlowest priority: %d\n", tdq->tdq_lowpri); - printf("\tgroup: %d\n", TDG_ID(tdq->tdq_group)); - printf("\tLock name: %s\n", tdq->tdq_group->tdg_name); -#endif +} + +static inline int +sched_shouldpreempt(int pri, int cpri, int remote) +{ + /* + * If the new priority is not better than the current priority there is + * nothing to do. + */ + if (pri >= cpri) + return (0); + /* + * Always preempt idle. + */ + if (cpri >= PRI_MIN_IDLE) + return (1); + /* + * If preemption is disabled don't preempt others. + */ + if (preempt_thresh == 0) + return (0); + /* + * Preempt if we exceed the threshold. + */ + if (pri <= preempt_thresh) + return (1); + /* + * If we're realtime or better and there is timeshare or worse running + * preempt only remote processors. + */ + if (remote && pri <= PRI_MAX_REALTIME && cpri > PRI_MAX_REALTIME) + return (1); + return (0); } #define TS_RQ_PPQ (((PRI_MAX_TIMESHARE - PRI_MIN_TIMESHARE) + 1) / RQ_NQS) @@ -385,20 +386,22 @@ static __inline void tdq_runq_add(struct tdq *tdq, struct thread *td, int flags) { + u_char pri; struct td_sched *ts = TD_TO_TS(td); + TDQ_LOCK_ASSERT(tdq, MA_OWNED); THREAD_LOCK_ASSERT(td, MA_OWNED); -#ifdef SMP + + TD_SET_RUNQ(ts->ts_thread); if (THREAD_CAN_MIGRATE(td)) { tdq->tdq_transferable++; - tdq->tdq_group->tdg_transferable++; ts->ts_flags |= TSF_XFERABLE; } -#endif - if (ts->ts_runq == &tdq->tdq_timeshare) { - u_char pri; - - pri = td->td_priority; + pri = td->td_priority; + if (pri <= PRI_MAX_REALTIME) { + ts->ts_runq = &tdq->tdq_realtime; + } else if (pri <= PRI_MAX_TIMESHARE) { + ts->ts_runq = &tdq->tdq_timeshare; KASSERT(pri <= PRI_MAX_TIMESHARE && pri >= PRI_MIN_TIMESHARE, ("Invalid priority %d on timeshare runq", pri)); /* @@ -419,8 +422,10 @@ } else pri = tdq->tdq_ridx; runq_add_pri(ts->ts_runq, ts, pri, flags); + return; } else - runq_add(ts->ts_runq, ts, flags); + ts->ts_runq = &tdq->tdq_idle; + runq_add(ts->ts_runq, ts, flags); } /* @@ -435,25 +440,15 @@ TDQ_LOCK_ASSERT(tdq, MA_OWNED); KASSERT(ts->ts_runq != NULL, ("tdq_runq_remove: thread %p null ts_runq", td)); -#ifdef SMP if (ts->ts_flags & TSF_XFERABLE) { tdq->tdq_transferable--; - tdq->tdq_group->tdg_transferable--; ts->ts_flags &= ~TSF_XFERABLE; } -#endif if (ts->ts_runq == &tdq->tdq_timeshare) { if (tdq->tdq_idx != tdq->tdq_ridx) runq_remove_idx(ts->ts_runq, td, &tdq->tdq_ridx); else runq_remove_idx(ts->ts_runq, td, NULL); - /* - * For timeshare threads we update the priority here so - * the priority reflects the time we've been sleeping. - */ - ts->ts_ltick = ticks; - sched_pctcpu_update(td); - sched_priority(td); } else runq_remove(ts->ts_runq, ts); } @@ -474,11 +469,7 @@ CTR2(KTR_SCHED, "cpu %d load: %d", TDQ_ID(tdq), tdq->tdq_load); if (class != PRI_ITHD && (td->td_proc->p_flag & P_NOLOAD) == 0) -#ifdef SMP - tdq->tdq_group->tdg_load++; -#else tdq->tdq_sysload++; -#endif } /* @@ -495,11 +486,7 @@ class = PRI_BASE(td->td_pri_class); if (class != PRI_ITHD && (td->td_proc->p_flag & P_NOLOAD) == 0) -#ifdef SMP - tdq->tdq_group->tdg_load--; -#else tdq->tdq_sysload--; -#endif KASSERT(tdq->tdq_load != 0, ("tdq_load_rem: Removing with 0 load on queue %d", TDQ_ID(tdq))); tdq->tdq_load--; @@ -507,112 +494,282 @@ TD_TO_TS(td)->ts_runq = NULL; } +/* + * Set lowpri to its exact value by searching the run-queue and + * evaluating curthread. curthread may be passed as an optimization. + */ +static void +tdq_setlowpri(struct tdq *tdq, struct thread *ctd) +{ + struct td_sched *ts; + struct thread *td; + + TDQ_LOCK_ASSERT(tdq, MA_OWNED); + if (ctd == NULL) + ctd = pcpu_find(TDQ_ID(tdq))->pc_curthread; + ts = tdq_choose(tdq); + if (ts) + td = ts->ts_thread; + if (ts == NULL || td->td_priority > ctd->td_priority) + tdq->tdq_lowpri = ctd->td_priority; + else + tdq->tdq_lowpri = td->td_priority; +} + #ifdef SMP +struct cpu_search { + cpumask_t cs_mask; /* Mask of valid cpus. */ + u_int cs_load; + u_int cs_cpu; + int cs_limit; /* Min priority for low min load for high. */ +}; + +#define CPU_SEARCH_LOWEST 0x1 +#define CPU_SEARCH_HIGHEST 0x2 +#define CPU_SEARCH_BOTH (CPU_SEARCH_LOWEST|CPU_SEARCH_HIGHEST) + +#define CPUMASK_FOREACH(cpu, mask) \ + for ((cpu) = 0; (cpu) < sizeof((mask)) * 8; (cpu)++) \ + if ((mask) & 1 << (cpu)) + +__inline int cpu_search(struct cpu_group *cg, struct cpu_search *low, + struct cpu_search *high, const int match); +int cpu_search_lowest(struct cpu_group *cg, struct cpu_search *low); +int cpu_search_highest(struct cpu_group *cg, struct cpu_search *high); +int cpu_search_both(struct cpu_group *cg, struct cpu_search *low, + struct cpu_search *high); + +/* + * This routine compares according to the match argument and should be + * reduced in actual instantiations via constant propagation and dead code + * elimination. + */ +static __inline int +cpu_compare(int cpu, struct cpu_search *low, struct cpu_search *high, + const int match) +{ + struct tdq *tdq; + + tdq = TDQ_CPU(cpu); + if (match & CPU_SEARCH_LOWEST) + if (low->cs_mask & (1 << cpu) && + tdq->tdq_load < low->cs_load && + tdq->tdq_lowpri > low->cs_limit) { + low->cs_cpu = cpu; + low->cs_load = tdq->tdq_load; + } + if (match & CPU_SEARCH_HIGHEST) + if (high->cs_mask & (1 << cpu) && + tdq->tdq_load >= high->cs_limit && + tdq->tdq_load > high->cs_load && + tdq->tdq_transferable) { + high->cs_cpu = cpu; + high->cs_load = tdq->tdq_load; + } + return (tdq->tdq_load); +} + /* - * sched_balance is a simple CPU load balancing algorithm. It operates by - * finding the least loaded and most loaded cpu and equalizing their load - * by migrating some processes. + * Search the tree of cpu_groups for the lowest or highest loaded cpu + * according to the match argument. This routine actually compares the + * load on all paths through the tree and finds the least loaded cpu on + * the least loaded path, which may differ from the least loaded cpu in + * the system. This balances work among caches and busses. * - * Dealing only with two CPUs at a time has two advantages. Firstly, most - * installations will only have 2 cpus. Secondly, load balancing too much at - * once can have an unpleasant effect on the system. The scheduler rarely has - * enough information to make perfect decisions. So this algorithm chooses - * simplicity and more gradual effects on load in larger systems. - * + * This inline is instantiated in three forms below using constants for the + * match argument. It is reduced to the minimum set for each case. It is + * also recursive to the depth of the tree. + */ +static inline int +cpu_search(struct cpu_group *cg, struct cpu_search *low, + struct cpu_search *high, const int match) +{ + int total; + + total = 0; + if (cg->cg_children) { + struct cpu_search lgroup; + struct cpu_search hgroup; + struct cpu_group *child; + u_int lload; + int hload; + int load; + int i; + + lload = -1; + hload = -1; + for (i = 0; i < cg->cg_children; i++) { + child = &cg->cg_child[i]; + if (match & CPU_SEARCH_LOWEST) { + lgroup = *low; + lgroup.cs_load = -1; + } + if (match & CPU_SEARCH_HIGHEST) { + hgroup = *high; + lgroup.cs_load = 0; + } + switch (match) { + case CPU_SEARCH_LOWEST: + load = cpu_search_lowest(child, &lgroup); + break; + case CPU_SEARCH_HIGHEST: + load = cpu_search_highest(child, &hgroup); + break; + case CPU_SEARCH_BOTH: + load = cpu_search_both(child, &lgroup, &hgroup); + break; + } + total += load; + if (match & CPU_SEARCH_LOWEST) + if (load < lload || low->cs_cpu == -1) { + *low = lgroup; + lload = load; + } + if (match & CPU_SEARCH_HIGHEST) + if (load > hload || high->cs_cpu == -1) { + hload = load; + *high = hgroup; + } + } + } else { + int cpu; + + CPUMASK_FOREACH(cpu, cg->cg_mask) + total += cpu_compare(cpu, low, high, match); + } + return (total); +} + +/* + * cpu_search instantiations must pass constants to maintain the inline + * optimization. + */ +int +cpu_search_lowest(struct cpu_group *cg, struct cpu_search *low) +{ + return cpu_search(cg, low, NULL, CPU_SEARCH_LOWEST); +} + +int +cpu_search_highest(struct cpu_group *cg, struct cpu_search *high) +{ + return cpu_search(cg, NULL, high, CPU_SEARCH_HIGHEST); +} + +int +cpu_search_both(struct cpu_group *cg, struct cpu_search *low, + struct cpu_search *high) +{ + return cpu_search(cg, low, high, CPU_SEARCH_BOTH); +} + +/* + * Find the cpu with the least load via the least loaded path that has a + * lowpri greater than pri pri. A pri of -1 indicates any priority is + * acceptable. + */ +static inline int +sched_lowest(struct cpu_group *cg, cpumask_t mask, int pri) +{ + struct cpu_search low; + + low.cs_cpu = -1; + low.cs_load = -1; + low.cs_mask = mask; + low.cs_limit = pri; + cpu_search_lowest(cg, &low); + return low.cs_cpu; +} + +/* + * Find the cpu with the highest load via the highest loaded path. + */ +static inline int +sched_highest(struct cpu_group *cg, cpumask_t mask, int minload) +{ + struct cpu_search high; + + high.cs_cpu = -1; + high.cs_load = 0; + high.cs_mask = mask; + high.cs_limit = minload; + cpu_search_highest(cg, &high); + return high.cs_cpu; +} + +/* + * Simultaneously find the highest and lowest loaded cpu reachable via + * cg. */ +static inline void +sched_both(struct cpu_group *cg, cpumask_t mask, int *lowcpu, int *highcpu) +{ + struct cpu_search high; + struct cpu_search low; + + low.cs_cpu = -1; + low.cs_limit = -1; + low.cs_load = -1; + low.cs_mask = mask; + high.cs_load = 0; + high.cs_cpu = -1; + high.cs_limit = -1; + high.cs_mask = mask; + cpu_search_both(cg, &low, &high); + *lowcpu = low.cs_cpu; + *highcpu = high.cs_cpu; + return; +} + static void -sched_balance() +sched_balance_group(struct cpu_group *cg) { - struct tdq_group *high; - struct tdq_group *low; - struct tdq_group *tdg; - struct tdq *tdq; - int cnt; + cpumask_t mask; + int high; + int low; int i; - /* - * Select a random time between .5 * balance_interval and - * 1.5 * balance_interval. - */ - balance_ticks = max(balance_interval / 2, 1); - balance_ticks += random() % balance_interval; - if (smp_started == 0 || rebalance == 0) - return; - tdq = TDQ_SELF(); - TDQ_UNLOCK(tdq); - low = high = NULL; - i = random() % (tdg_maxid + 1); - for (cnt = 0; cnt <= tdg_maxid; cnt++) { - tdg = TDQ_GROUP(i); + mask = -1; + for (;;) { + sched_both(cg, mask, &low, &high); + if (low == high || low == -1 || high == -1) + break; + if (sched_balance_pair(TDQ_CPU(high), TDQ_CPU(low))) + break; /* - * Find the CPU with the highest load that has some - * threads to transfer. - */ - if ((high == NULL || tdg->tdg_load > high->tdg_load) - && tdg->tdg_transferable) - high = tdg; - if (low == NULL || tdg->tdg_load < low->tdg_load) - low = tdg; - if (++i > tdg_maxid) - i = 0; + * If we failed to move any threads determine which cpu + * to kick out of the set and try again. + */ + if (TDQ_CPU(high)->tdq_transferable == 0) + mask &= ~(1 << high); + else + mask &= ~(1 << low); } - if (low != NULL && high != NULL && high != low) - sched_balance_pair(LIST_FIRST(&high->tdg_members), - LIST_FIRST(&low->tdg_members)); - TDQ_LOCK(tdq); + + for (i = 0; i < cg->cg_children; i++) + sched_balance_group(&cg->cg_child[i]); } -/* - * Balance load between CPUs in a group. Will only migrate within the group. - */ static void -sched_balance_groups() +sched_balance() { struct tdq *tdq; - int i; /* * Select a random time between .5 * balance_interval and * 1.5 * balance_interval. */ - balance_group_ticks = max(balance_interval / 2, 1); - balance_group_ticks += random() % balance_interval; + balance_ticks = max(balance_interval / 2, 1); + balance_ticks += random() % balance_interval; if (smp_started == 0 || rebalance == 0) return; tdq = TDQ_SELF(); TDQ_UNLOCK(tdq); - for (i = 0; i <= tdg_maxid; i++) - sched_balance_group(TDQ_GROUP(i)); + sched_balance_group(cpu_top); TDQ_LOCK(tdq); } /* - * Finds the greatest imbalance between two tdqs in a group. - */ -static void -sched_balance_group(struct tdq_group *tdg) -{ - struct tdq *tdq; - struct tdq *high; - struct tdq *low; - int load; - - if (tdg->tdg_transferable == 0) - return; - low = NULL; - high = NULL; - LIST_FOREACH(tdq, &tdg->tdg_members, tdq_siblings) { - load = tdq->tdq_load; - if (high == NULL || load > high->tdq_load) - high = tdq; - if (low == NULL || load < low->tdq_load) - low = tdq; - } - if (high != NULL && low != NULL && high != low) - sched_balance_pair(high, low); -} - -/* * Lock two thread queues using their address to maintain lock order. */ static void @@ -640,31 +797,22 @@ /* * Transfer load between two imbalanced thread queues. */ -static void +static int sched_balance_pair(struct tdq *high, struct tdq *low) { int transferable; int high_load; int low_load; + int moved; int move; int diff; int i; tdq_lock_pair(high, low); - /* - * If we're transfering within a group we have to use this specific - * tdq's transferable count, otherwise we can steal from other members - * of the group. - */ - if (high->tdq_group == low->tdq_group) { - transferable = high->tdq_transferable; - high_load = high->tdq_load; - low_load = low->tdq_load; - } else { - transferable = high->tdq_group->tdg_transferable; - high_load = high->tdq_group->tdg_load; - low_load = low->tdq_group->tdg_load; - } + transferable = high->tdq_transferable; + high_load = high->tdq_load; + low_load = low->tdq_load; + moved = 0; /* * Determine what the imbalance is and then adjust that to how many * threads we actually have to give up (transferable). @@ -676,7 +824,7 @@ move++; move = min(move, transferable); for (i = 0; i < move; i++) - tdq_move(high, low); + moved += tdq_move(high, low); /* * IPI the target cpu to force it to reschedule with the new * workload. @@ -684,13 +832,13 @@ ipi_selected(1 << TDQ_ID(low), IPI_PREEMPT); } tdq_unlock_pair(high, low); - return; + return (moved); } /* * Move a thread from one thread queue to another. */ -static void +static int tdq_move(struct tdq *from, struct tdq *to) { struct thread *td; @@ -703,22 +851,9 @@ tdq = from; cpu = TDQ_ID(to); - td = tdq_steal(tdq); - if (td == NULL) { - struct tdq_group *tdg; - - tdg = tdq->tdq_group; - LIST_FOREACH(tdq, &tdg->tdg_members, tdq_siblings) { - if (tdq == from || tdq->tdq_transferable == 0) - continue; - td = tdq_steal(tdq); - break; - } - if (td == NULL) - return; - } - if (tdq == to) - return; + td = tdq_steal(tdq, cpu); + if (td == NULL) + return (0); /* * Although the run queue is locked the thread may be blocked. Lock * it to clear this and acquire the run-queue lock. @@ -730,6 +865,7 @@ TD_TO_TS(ts)->ts_cpu = cpu; td->td_lock = TDQ_LOCKPTR(to); tdq_add(to, td, SRQ_YIELDING); + return (1); } /* @@ -739,116 +875,72 @@ static int tdq_idled(struct tdq *tdq) { - struct tdq_group *tdg; + struct cpu_group *cg; struct tdq *steal; - int highload; - int highcpu; + cpumask_t mask; + int thresh; int cpu; if (smp_started == 0 || steal_idle == 0) return (1); - /* We don't want to be preempted while we're iterating over tdqs */ + mask = -1; + mask &= ~PCPU_GET(cpumask); + /* We don't want to be preempted while we're iterating. */ spinlock_enter(); - tdg = tdq->tdq_group; - /* - * If we're in a cpu group, try and steal threads from another cpu in - * the group before idling. In a HTT group all cpus share the same - * run-queue lock, however, we still need a recursive lock to - * call tdq_move(). - */ - if (steal_htt && tdg->tdg_cpus > 1 && tdg->tdg_transferable) { - TDQ_LOCK(tdq); - LIST_FOREACH(steal, &tdg->tdg_members, tdq_siblings) { - if (steal == tdq || steal->tdq_transferable == 0) - continue; - TDQ_LOCK(steal); - goto steal; + for (cg = tdq->tdq_cg; cg != NULL; ) { + if ((cg->cg_flags & (CG_FLAG_HTT | CG_FLAG_THREAD)) == 0) + thresh = steal_thresh; + else + thresh = 1; + cpu = sched_highest(cg, mask, thresh); + if (cpu == -1) { + cg = cg->cg_parent; + continue; + } + steal = TDQ_CPU(cpu); + mask &= ~(1 << cpu); + tdq_lock_pair(tdq, steal); + if (steal->tdq_load < thresh || steal->tdq_transferable == 0) { + tdq_unlock_pair(tdq, steal); + continue; } - TDQ_UNLOCK(tdq); - } - /* - * Find the least loaded CPU with a transferable thread and attempt - * to steal it. We make a lockless pass and then verify that the - * thread is still available after locking. - */ - for (;;) { - highcpu = 0; - highload = 0; - for (cpu = 0; cpu <= mp_maxid; cpu++) { - if (CPU_ABSENT(cpu)) - continue; - steal = TDQ_CPU(cpu); - if (steal->tdq_transferable == 0) - continue; - if (steal->tdq_load < highload) - continue; - highload = steal->tdq_load; - highcpu = cpu; + /* + * If a thread was added while interrupts were disabled don't + * steal one here. If we fail to acquire one due to affinity + * restrictions loop again with this cpu removed from the + * set. + */ + if (tdq->tdq_load == 0 && tdq_move(steal, tdq) == 0) { + tdq_unlock_pair(tdq, steal); + continue; } - if (highload < steal_thresh) - break; - steal = TDQ_CPU(highcpu); - if (steal == tdq) - break; - tdq_lock_pair(tdq, steal); - if (steal->tdq_load >= steal_thresh && steal->tdq_transferable) - goto steal; - tdq_unlock_pair(tdq, steal); + spinlock_exit(); + TDQ_UNLOCK(steal); + mi_switch(SW_VOL, NULL); + thread_unlock(curthread); + + return (0); } spinlock_exit(); return (1); -steal: - spinlock_exit(); - tdq_move(steal, tdq); - TDQ_UNLOCK(steal); - mi_switch(SW_VOL, NULL); - thread_unlock(curthread); - - return (0); } /* * Notify a remote cpu of new work. Sends an IPI if criteria are met. */ static void -tdq_notify(struct thread *td) +tdq_notify(struct tdq *tdq, struct thread *td) { - struct thread *ctd; - struct pcpu *pcpu; int cpri; int pri; int cpu; - cpu = TD_TO_TS(ts)->ts_cpu; - pri = td->td_priority; - pcpu = pcpu_find(cpu); - ctd = pcpu->pc_curthread; - cpri = ctd->td_priority; - - /* - * If our priority is not better than the current priority there is - * nothing to do. - */ - if (pri > cpri) + if (tdq->tdq_ipipending) return; - /* - * Always IPI idle. - */ - if (cpri > PRI_MIN_IDLE) - goto sendipi; - /* - * If we're realtime or better and there is timeshare or worse running - * send an IPI. - */ - if (pri < PRI_MAX_REALTIME && cpri > PRI_MAX_REALTIME) - goto sendipi; - /* - * Otherwise only IPI if we exceed the threshold. - */ - if (pri > preempt_thresh) + cpri = pcpu_find(cpu)->pc_curthread->td_priority; + if (!sched_shouldpreempt(pri, cpri, 1)) return; -sendipi: - ctd->td_flags |= TDF_NEEDRESCHED; + tdq->tdq_ipipending = 1; ipi_selected(1 << cpu, IPI_PREEMPT); } @@ -857,7 +949,7 @@ * index. */ static struct thread * -runq_steal_from(struct runq *rq, u_char start) +runq_steal_from(struct runq *rq, int cpu, u_char start) { struct thread *td; struct rqbits *rqb; @@ -886,7 +978,8 @@ pri += (i << RQB_L2BPW); rqh = &rq->rq_queues[pri]; TAILQ_FOREACH(td, rqh, td_procq) { - if (first && THREAD_CAN_MIGRATE(td)) + if (first && THREAD_CAN_MIGRATE(td) && + THREAD_CAN_SCHED(td, cpu)) return (td); first = 1; } @@ -903,7 +996,7 @@ * Steals load from a standard linear queue. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 14 02:56:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45F5610656C6; Fri, 14 Mar 2008 02:56:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 048E710656C4 for ; Fri, 14 Mar 2008 02:56:26 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E3FD78FC22 for ; Fri, 14 Mar 2008 02:56:25 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E2uP8W075020 for ; Fri, 14 Mar 2008 02:56:25 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E2uPUo075018 for perforce@freebsd.org; Fri, 14 Mar 2008 02:56:25 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 14 Mar 2008 02:56:25 GMT Message-Id: <200803140256.m2E2uPUo075018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137665 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, 14 Mar 2008 02:56:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=137665 Change 137665 by peter@peter_overcee on 2008/03/14 02:56:09 Sigh. sched_userret() diverged. Affected files ... .. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#21 edit .. //depot/projects/bike_sched/sys/kern/sched_ule.c#21 edit .. //depot/projects/bike_sched/sys/kern/subr_trap.c#8 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/sched_4bsd.c#21 (text+ko) ==== @@ -1246,7 +1246,6 @@ thread_unlock(td); } -/* XXX removed */ void sched_userret(struct thread *td) { ==== //depot/projects/bike_sched/sys/kern/sched_ule.c#21 (text+ko) ==== @@ -2023,9 +2023,28 @@ thread_unlock(td); } -MISMERGE! -p4 - you suck! /* + * Fix priorities on return to user-space. Priorities may be elevated due + * to static priorities in msleep() or similar. + */ +void +sched_userret(struct thread *td) +{ + /* + * XXX we cheat slightly on the locking here to avoid locking in + * the usual case. Setting td_priority here is essentially an + * incomplete workaround for not setting it properly elsewhere. + * Now that some interrupt handlers are threads, not setting it + * properly elsewhere can clobber it in the window between setting + * it here and returning to user mode, so don't waste time setting + * it perfectly here. + */ + KASSERT((td->td_flags & TDF_BORROWING) == 0, + ("thread with borrowed priority returning to userland")); + if (td->td_priority != td->td_user_pri) { + thread_lock(td); + td->td_priority = td->td_user_pri; + td->td_base_pri = td->td_user_pri; tdq_setlowpri(TDQ_SELF(), td); thread_unlock(td); } ==== //depot/projects/bike_sched/sys/kern/subr_trap.c#8 (text+ko) ==== @@ -124,26 +124,11 @@ */ if (p->p_flag & P_PROFIL) addupc_task(td, TRAPF_PC(frame), td->td_pticks * psratio); + /* - * Fix priorities on return to user-space. Priorities may be elevated due - * to static priorities in msleep() or similar. - * - * XXX we cheat slightly on the locking here to avoid locking in - * the usual case. Setting td_priority here is essentially an - * incomplete workaround for not setting it properly elsewhere. - * Now that some interrupt handlers are threads, not setting it - * properly elsewhere can clobber it in the window between setting - * it here and returning to user mode, so don't waste time setting - * it perfectly here. + * Let the scheduler adjust our priority etc. */ - KASSERT((td->td_flags & TDF_BORROWING) == 0, - ("userret: thread with borrowed priority returning to userland")); - if (td->td_priority != td->td_user_pri) { - thread_lock(td); - td->td_priority = td->td_user_pri; - td->td_base_pri = td->td_user_pri; - thread_unlock(td); - } + sched_userret(td); KASSERT(td->td_locks == 0, ("userret: Returning with %d locks held.", td->td_locks)); } From owner-p4-projects@FreeBSD.ORG Fri Mar 14 02:57:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A78D31065678; Fri, 14 Mar 2008 02:57:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 64B6A1065671 for ; Fri, 14 Mar 2008 02:57:27 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 37E088FC15 for ; Fri, 14 Mar 2008 02:57:27 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E2vQO7075069 for ; Fri, 14 Mar 2008 02:57:26 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E2vQIg075067 for perforce@freebsd.org; Fri, 14 Mar 2008 02:57:26 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 14 Mar 2008 02:57:26 GMT Message-Id: <200803140257.m2E2vQIg075067@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137666 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, 14 Mar 2008 02:57:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=137666 Change 137666 by peter@peter_overcee on 2008/03/14 02:56:51 bring back prototype Affected files ... .. //depot/projects/bike_sched/sys/sys/sched.h#9 edit Differences ... ==== //depot/projects/bike_sched/sys/sys/sched.h#9 (text+ko) ==== @@ -99,6 +99,7 @@ void sched_unlend_prio(struct thread *td, u_char prio); void sched_unlend_user_prio(struct thread *td, u_char pri); void sched_user_prio(struct thread *td, u_char prio); +void sched_userret(struct thread *td); void sched_wakeup(struct thread *td); void sched_preempt(struct thread *td); From owner-p4-projects@FreeBSD.ORG Fri Mar 14 03:04:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA89D1065674; Fri, 14 Mar 2008 03:04:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 956121065671 for ; Fri, 14 Mar 2008 03:04:34 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 810988FC26 for ; Fri, 14 Mar 2008 03:04:34 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E34YU7076591 for ; Fri, 14 Mar 2008 03:04:34 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E34YOs076589 for perforce@freebsd.org; Fri, 14 Mar 2008 03:04:34 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Fri, 14 Mar 2008 03:04:34 GMT Message-Id: <200803140304.m2E34YOs076589@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 137667 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, 14 Mar 2008 03:04:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=137667 Change 137667 by zhouzhouyi@zhouzhouyi_mactest on 2008/03/14 03:03:53 prepare the program to test vn_poll for MAC Framework Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#17 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#17 (text+ko) ==== @@ -45,7 +45,7 @@ #include #include #include "mactest.h" - +#include #ifndef HAS_TRUNCATE64 #define truncate64 truncate @@ -88,6 +88,7 @@ ACTION_TRUNCATE, ACTION_STAT, ACTION_LSTAT, + ACTION_VNPOLL, }; #define SIGUSER1 30 #define TYPE_NONE 0x0000 @@ -131,6 +132,7 @@ { "truncate", ACTION_TRUNCATE, { TYPE_STRING, TYPE_NUMBER, TYPE_NONE } }, { "stat", ACTION_STAT, { TYPE_STRING, TYPE_STRING, TYPE_NONE } }, { "lstat", ACTION_LSTAT, { TYPE_STRING, TYPE_STRING, TYPE_NONE } }, + { "vnpoll", ACTION_VNPOLL, { TYPE_STRING, TYPE_NONE } }, { NULL, -1, { TYPE_NONE } } }; @@ -528,6 +530,22 @@ return (i); } break; + case ACTION_VNPOLL: + { + + struct pollfd pfd; + int fd; + fd = open("/root/pf.conf", O_RDWR); + if (fd <= 0) + goto erropen; + pfd.fd = fd; + pfd.events = POLLWRNORM; + pfd.revents = 0; + poll(&pfd, 1, 1); + close(fd); + erropen: + break; + } default: fprintf(stderr, "unsupported syscall\n"); close(logfd); From owner-p4-projects@FreeBSD.ORG Fri Mar 14 03:09:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 770341065674; Fri, 14 Mar 2008 03:09:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36A6C1065672 for ; Fri, 14 Mar 2008 03:09:40 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 21E818FC15 for ; Fri, 14 Mar 2008 03:09:40 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E39dq1076746 for ; Fri, 14 Mar 2008 03:09:39 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E39dh2076744 for perforce@freebsd.org; Fri, 14 Mar 2008 03:09:39 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 14 Mar 2008 03:09:39 GMT Message-Id: <200803140309.m2E39dh2076744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137668 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, 14 Mar 2008 03:09:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=137668 Change 137668 by peter@peter_overcee on 2008/03/14 03:09:21 tidy loose ends Affected files ... .. //depot/projects/bike_sched/sys/kern/kern_fork.c#9 edit .. //depot/projects/bike_sched/sys/kern/kern_synch.c#9 edit .. //depot/projects/bike_sched/sys/kern/kern_thread.c#13 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/kern_fork.c#9 (text+ko) ==== @@ -763,7 +763,7 @@ p = td->td_proc; KASSERT(p->p_state == PRS_NORMAL, ("executing process is still new")); - CTR4(KTR_PROC, "fork_exit: new thread %p (pid %d, %s)", + CTR3(KTR_PROC, "fork_exit: new thread %p (pid %d, %s)", td, p->p_pid, td->td_name); sched_fork_exit(td); ==== //depot/projects/bike_sched/sys/kern/kern_synch.c#9 (text+ko) ==== @@ -412,7 +412,7 @@ td->td_generation++; /* bump preempt-detect counter */ PCPU_INC(cnt.v_swtch); PCPU_SET(switchticks, ticks); - CTR4(KTR_PROC, "mi_switch: old thread %ld (pid %ld, %s)", + CTR3(KTR_PROC, "mi_switch: old thread %ld (pid %ld, %s)", td->td_tid, p->p_pid, td->td_name); #if (KTR_COMPILE & KTR_SCHED) != 0 if (TD_IS_IDLETHREAD(td)) @@ -433,7 +433,7 @@ CTR3(KTR_SCHED, "mi_switch: running %p(%s) prio %d", td, td->td_name, td->td_priority); - CTR4(KTR_PROC, "mi_switch: new thread %ld (pid %ld, %s)", + CTR3(KTR_PROC, "mi_switch: new thread %ld (pid %ld, %s)", td->td_tid, p->p_pid, td->td_name); /* ==== //depot/projects/bike_sched/sys/kern/kern_thread.c#13 (text+ko) ==== @@ -288,6 +288,7 @@ } } } +#endif /* * Allocate a thread. From owner-p4-projects@FreeBSD.ORG Fri Mar 14 03:30:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E12A31065672; Fri, 14 Mar 2008 03:30:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86598106566C for ; Fri, 14 Mar 2008 03:30:03 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6FE478FC14 for ; Fri, 14 Mar 2008 03:30:03 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E3U3jg077523 for ; Fri, 14 Mar 2008 03:30:03 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E3U2OZ077521 for perforce@freebsd.org; Fri, 14 Mar 2008 03:30:02 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 14 Mar 2008 03:30:02 GMT Message-Id: <200803140330.m2E3U2OZ077521@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 137670 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, 14 Mar 2008 03:30:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=137670 Change 137670 by kmacy@pandemonium:kmacy:iwarp on 2008/03/14 03:29:23 IFC 137655 Affected files ... .. //depot/projects/iwarp/ObsoleteFiles.inc#11 integrate .. //depot/projects/iwarp/UPDATING#9 integrate .. //depot/projects/iwarp/bin/Makefile#2 integrate .. //depot/projects/iwarp/bin/ps/ps.1#2 integrate .. //depot/projects/iwarp/bin/uuidgen/Makefile#2 integrate .. //depot/projects/iwarp/contrib/tcsh/sh.lex.c#3 integrate .. //depot/projects/iwarp/etc/rc.d/mountlate#3 integrate .. //depot/projects/iwarp/etc/rc.d/root#3 integrate .. //depot/projects/iwarp/lib/Makefile#5 integrate .. //depot/projects/iwarp/lib/libalias/libalias/Makefile#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_private.h#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_ar.c#4 integrate .. //depot/projects/iwarp/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/iwarp/lib/libarchive/test/main.c#4 integrate .. //depot/projects/iwarp/lib/libarchive/test/test.h#4 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/iwarp/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/iwarp/lib/libc/gen/sem_timedwait.3#1 branch .. //depot/projects/iwarp/lib/libc/gen/sem_wait.3#2 integrate .. //depot/projects/iwarp/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/iwarp/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/iwarp/lib/libc/sys/kldunload.2#3 integrate .. //depot/projects/iwarp/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/iwarp/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/iwarp/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/iwarp/lib/libthread_db/Makefile#2 integrate .. //depot/projects/iwarp/release/doc/share/misc/dev.archlist.txt#5 integrate .. //depot/projects/iwarp/sbin/geom/class/multipath/gmultipath.8#3 integrate .. //depot/projects/iwarp/sbin/mount/mount.8#5 integrate .. //depot/projects/iwarp/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/iwarp/share/man/man4/uart.4#2 integrate .. //depot/projects/iwarp/share/man/man4/vr.4#2 integrate .. //depot/projects/iwarp/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/legacy.c#3 integrate .. //depot/projects/iwarp/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/iwarp/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/iwarp/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/iwarp/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/iwarp/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/iwarp/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/iwarp/sys/amd64/include/nexusvar.h#1 branch .. //depot/projects/iwarp/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/iwarp/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/iwarp/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/iwarp/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/iwarp/sys/arm/arm/trap.c#3 integrate .. //depot/projects/iwarp/sys/arm/conf/AVILA#4 integrate .. //depot/projects/iwarp/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/iwarp/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/iwarp/sys/boot/powerpc/uboot/metadata.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/Makefile#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/api_public.h#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/module.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/iwarp/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/iwarp/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/iwarp/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/iwarp/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/iwarp/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/iwarp/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/iwarp/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/iwarp/sys/conf/files#14 integrate .. //depot/projects/iwarp/sys/conf/options#7 integrate .. //depot/projects/iwarp/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/iwarp/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/iwarp/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/iwarp/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/iwarp/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/iwarp/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/iwarp/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/iwarp/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/iwarp/sys/dev/uart/uart.h#3 integrate .. //depot/projects/iwarp/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/iwarp/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/iwarp/sys/dev/usb/ums.c#3 integrate .. //depot/projects/iwarp/sys/dev/vr/if_vr.c#2 integrate .. //depot/projects/iwarp/sys/dev/vr/if_vrreg.h#2 integrate .. //depot/projects/iwarp/sys/dev/wpi/if_wpi.c#7 integrate .. //depot/projects/iwarp/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/iwarp/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/iwarp/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/iwarp/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/iwarp/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/iwarp/sys/i386/conf/DEFAULTS#4 integrate .. //depot/projects/iwarp/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/iwarp/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/iwarp/sys/i386/i386/legacy.c#3 integrate .. //depot/projects/iwarp/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/iwarp/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/iwarp/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/iwarp/sys/i386/i386/trap.c#4 integrate .. //depot/projects/iwarp/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/iwarp/sys/i386/ibcs2/imgact_coff.c#4 integrate .. //depot/projects/iwarp/sys/i386/include/nexusvar.h#1 branch .. //depot/projects/iwarp/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/iwarp/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/iwarp/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/iwarp/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/iwarp/sys/ia64/ia64/machdep.c#7 integrate .. //depot/projects/iwarp/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/iwarp/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/iwarp/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/iwarp/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/iwarp/sys/kern/init_sysent.c#5 integrate .. //depot/projects/iwarp/sys/kern/kern_clock.c#5 integrate .. //depot/projects/iwarp/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/iwarp/sys/kern/kern_exec.c#7 integrate .. //depot/projects/iwarp/sys/kern/kern_fork.c#5 integrate .. //depot/projects/iwarp/sys/kern/kern_intr.c#5 integrate .. //depot/projects/iwarp/sys/kern/kern_kse.c#4 delete .. //depot/projects/iwarp/sys/kern/kern_proc.c#7 integrate .. //depot/projects/iwarp/sys/kern/kern_resource.c#4 integrate .. //depot/projects/iwarp/sys/kern/kern_sig.c#7 integrate .. //depot/projects/iwarp/sys/kern/kern_switch.c#5 integrate .. //depot/projects/iwarp/sys/kern/kern_sx.c#4 integrate .. //depot/projects/iwarp/sys/kern/kern_synch.c#5 integrate .. //depot/projects/iwarp/sys/kern/kern_thread.c#8 integrate .. //depot/projects/iwarp/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/iwarp/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/iwarp/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/iwarp/sys/kern/sched_ule.c#7 integrate .. //depot/projects/iwarp/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/iwarp/sys/kern/subr_trap.c#4 integrate .. //depot/projects/iwarp/sys/kern/subr_witness.c#7 integrate .. //depot/projects/iwarp/sys/kern/sys_process.c#3 integrate .. //depot/projects/iwarp/sys/kern/syscalls.c#5 integrate .. //depot/projects/iwarp/sys/kern/syscalls.master#6 integrate .. //depot/projects/iwarp/sys/kern/systrace_args.c#5 integrate .. //depot/projects/iwarp/sys/netgraph/netgraph.h#5 integrate .. //depot/projects/iwarp/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/iwarp/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/iwarp/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/iwarp/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/iwarp/sys/netinet/libalias/alias_old.c#2 delete .. //depot/projects/iwarp/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/iwarp/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/iwarp/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/iwarp/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/iwarp/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/iwarp/sys/powerpc/include/bootinfo.h#3 integrate .. //depot/projects/iwarp/sys/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/iwarp/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/iwarp/sys/powerpc/powerpc/intr_machdep.c#5 integrate .. //depot/projects/iwarp/sys/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/iwarp/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/iwarp/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/iwarp/sys/sys/condvar.h#2 integrate .. //depot/projects/iwarp/sys/sys/cpuset.h#2 integrate .. //depot/projects/iwarp/sys/sys/disklabel.h#3 integrate .. //depot/projects/iwarp/sys/sys/kse.h#2 delete .. //depot/projects/iwarp/sys/sys/param.h#12 integrate .. //depot/projects/iwarp/sys/sys/proc.h#11 integrate .. //depot/projects/iwarp/sys/sys/sched.h#3 integrate .. //depot/projects/iwarp/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/iwarp/sys/sys/syscall.h#5 integrate .. //depot/projects/iwarp/sys/sys/syscall.mk#5 integrate .. //depot/projects/iwarp/sys/sys/sysproto.h#5 integrate .. //depot/projects/iwarp/sys/sys/systm.h#3 integrate .. //depot/projects/iwarp/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/iwarp/sys/vm/vm_glue.c#3 integrate .. //depot/projects/iwarp/sys/vm/vm_map.c#5 integrate .. //depot/projects/iwarp/sys/vm/vm_meter.c#2 integrate .. //depot/projects/iwarp/tools/tools/editing/freebsd.vim#1 branch .. //depot/projects/iwarp/usr.bin/Makefile#6 integrate .. //depot/projects/iwarp/usr.bin/ar/ar.1#2 integrate .. //depot/projects/iwarp/usr.bin/ar/ar.c#2 integrate .. //depot/projects/iwarp/usr.bin/ar/ar.h#2 integrate .. //depot/projects/iwarp/usr.bin/ar/write.c#3 integrate .. //depot/projects/iwarp/usr.bin/cpuset/cpuset.1#2 integrate .. //depot/projects/iwarp/usr.bin/cpuset/cpuset.c#2 integrate .. //depot/projects/iwarp/usr.bin/kdump/kdump.c#5 integrate .. //depot/projects/iwarp/usr.bin/kdump/kdump_subr.h#2 integrate .. //depot/projects/iwarp/usr.bin/kdump/mksubr#4 integrate .. //depot/projects/iwarp/usr.bin/make/globals.h#2 integrate .. //depot/projects/iwarp/usr.bin/make/hash_tables.c#2 integrate .. //depot/projects/iwarp/usr.bin/make/main.c#4 integrate .. //depot/projects/iwarp/usr.bin/make/make.1#4 integrate .. //depot/projects/iwarp/usr.bin/make/parse.c#2 integrate .. //depot/projects/iwarp/usr.bin/ministat/ministat.1#2 integrate .. //depot/projects/iwarp/usr.bin/uuidgen/Makefile#2 delete .. //depot/projects/iwarp/usr.bin/uuidgen/uuidgen.1#2 delete .. //depot/projects/iwarp/usr.bin/uuidgen/uuidgen.c#2 delete .. //depot/projects/iwarp/usr.sbin/bluetooth/sdpd/Makefile#2 integrate .. //depot/projects/iwarp/usr.sbin/bluetooth/sdpd/gn.c#1 branch .. //depot/projects/iwarp/usr.sbin/bluetooth/sdpd/nap.c#1 branch .. //depot/projects/iwarp/usr.sbin/bluetooth/sdpd/panu.c#1 branch .. //depot/projects/iwarp/usr.sbin/bluetooth/sdpd/profile.c#2 integrate .. //depot/projects/iwarp/usr.sbin/bluetooth/sdpd/profile.h#2 integrate .. //depot/projects/iwarp/usr.sbin/ppp/command.c#2 integrate .. //depot/projects/iwarp/usr.sbin/ppp/ipcp.c#2 integrate .. //depot/projects/iwarp/usr.sbin/ppp/main.c#2 integrate .. //depot/projects/iwarp/usr.sbin/ppp/nat_cmd.c#2 integrate Differences ... ==== //depot/projects/iwarp/ObsoleteFiles.inc#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.133 2008/03/13 18:17:46 brueffer Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -27,6 +27,8 @@ # 20071207: Merged with fortunes-o.real OLD_FILES+=usr/share/games/fortune/fortunes2-o OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat +# 20071201: Removal of XRPU driver +OLD_FILES+=usr/include/sys/xrpuio.h # 20071129: Disabled static versions of libkse by default .if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" OLD_FILES+=usr/lib/libkse.a ==== //depot/projects/iwarp/UPDATING#9 (text+ko) ==== @@ -22,6 +22,16 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080312: + Support for KSE threading has been removed from the kernel. To + run legacy applications linked against KSE libmap.conf may + be used. The following libmap.conf may be used to ensure + compatibility with any prior release: + + libpthread.so.1 libthr.so.1 + libpthread.so.2 libthr.so.2 + libkse.so.3 libthr.so.3 + 20080301: The layout of struct vmspace has changed. This affects libkvm and any executables that link against libkvm and use the @@ -997,4 +1007,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ ==== //depot/projects/iwarp/bin/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.26 2006/03/17 18:54:20 ru Exp $ +# $FreeBSD: src/bin/Makefile,v 1.27 2008/03/13 17:38:06 obrien Exp $ .include @@ -37,7 +37,8 @@ sleep \ stty \ sync \ - test + test \ + uuidgen .if ${MK_RCMDS} != "no" _rcp= rcp ==== //depot/projects/iwarp/bin/ps/ps.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.90 2008/03/12 10:01:34 jeff Exp $ .\" .Dd August 21, 2006 .Dt PS 1 @@ -290,7 +290,6 @@ .It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us" .It Dv "P_WEXIT" Ta No "0x02000 Working on exiting" .It Dv "P_EXEC" Ta No "0x04000 Process called exec" -.It Dv "P_SA" Ta No "0x08000 Using scheduler activations" .It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state" .It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP" .It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing" ==== //depot/projects/iwarp/bin/uuidgen/Makefile#2 (text+ko) ==== @@ -1,6 +1,4 @@ -# $FreeBSD: src/bin/uuidgen/Makefile,v 1.3 2007/04/09 19:16:48 pjd Exp $ - -BINDIR= /bin +# $FreeBSD: src/bin/uuidgen/Makefile,v 1.4 2008/03/13 17:38:06 obrien Exp $ PROG= uuidgen WARNS?= 6 ==== //depot/projects/iwarp/contrib/tcsh/sh.lex.c#3 (text+ko) ==== @@ -851,7 +851,8 @@ return (en); } slhs.len = 0; - Strbuf_append(&slhs, lhsb.s); + if (lhsb.s != NULL && lhsb.len != 0) + Strbuf_append(&slhs, lhsb.s); Strbuf_terminate(&slhs); if (exclc) en = dosub(sc, en, global); ==== //depot/projects/iwarp/etc/rc.d/mountlate#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.3 2008/03/06 14:39:33 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.5 2008/03/11 17:21:55 delphij Exp $ # # PROVIDE: mountlate @@ -33,6 +33,12 @@ stop_boot true ;; esac + + # If we booted a special kernel remove the record + # so we will boot the default kernel next time. + if [ -x /sbin/nextboot ]; then + /sbin/nextboot -D + fi } load_rc_config $name ==== //depot/projects/iwarp/etc/rc.d/root#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/root,v 1.16 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.17 2008/03/11 17:21:14 delphij Exp $ # # PROVIDE: root @@ -34,7 +34,7 @@ # If we booted a special kernel remove the record # so we will boot the default kernel next time. if [ -x /sbin/nextboot ]; then - /sbin/nextboot -D + /sbin/nextboot -D > /dev/null 2>&1 fi } ==== //depot/projects/iwarp/lib/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $ .include @@ -34,7 +34,7 @@ ${_libgssapi} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ + libpmc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -104,10 +104,6 @@ _libsmb= libsmb .endif -.if ${MK_LIBKSE} != "no" -_libkse= libkse -.endif - .if ${MK_LIBTHR} != "no" _libthr= libthr .endif ==== //depot/projects/iwarp/lib/libalias/libalias/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.4 2007/06/18 18:47:53 rafan Exp $ +# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.5 2008/03/12 11:58:28 piso Exp $ .PATH: ${.CURDIR}/../../../sys/netinet/libalias @@ -6,7 +6,7 @@ SHLIBDIR?= /lib SHLIB_MAJOR= 6 MAN= libalias.3 -SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c +SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c INCS= alias.h WARNS?= 6 NO_WERROR= ==== //depot/projects/iwarp/lib/libarchive/archive_entry.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.45 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.47 2008/03/12 04:47:37 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -1124,6 +1124,11 @@ entry->acl_p = entry->acl_p->next; if (entry->acl_p == NULL) { entry->acl_state = 0; + *type = 0; + *permset = 0; + *tag = 0; + *id = -1; + *name = NULL; return (ARCHIVE_EOF); /* End of ACL entries. */ } *type = entry->acl_p->type; @@ -1505,7 +1510,7 @@ return (ARCHIVE_OK); } else { *name = NULL; - *name = NULL; + *value = NULL; *size = (size_t)0; return (ARCHIVE_WARN); } ==== //depot/projects/iwarp/lib/libarchive/archive_read.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.37 2008/01/03 17:54:26 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.38 2008/03/12 04:58:32 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -64,26 +64,13 @@ archive_read_new(void) { struct archive_read *a; - unsigned char *nulls; a = (struct archive_read *)malloc(sizeof(*a)); if (a == NULL) return (NULL); memset(a, 0, sizeof(*a)); a->archive.magic = ARCHIVE_READ_MAGIC; - a->bytes_per_block = ARCHIVE_DEFAULT_BYTES_PER_BLOCK; - a->null_length = 1024; - nulls = (unsigned char *)malloc(a->null_length); - if (nulls == NULL) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate archive object 'nulls' element"); - free(a); - return (NULL); - } - memset(nulls, 0, a->null_length); - a->nulls = nulls; - a->archive.state = ARCHIVE_STATE_NEW; a->entry = archive_entry_new(); @@ -660,8 +647,6 @@ (a->formats[i].cleanup)(a); } - /* Casting a pointer to int allows us to remove 'const.' */ - free((void *)(uintptr_t)(const void *)a->nulls); archive_string_free(&a->archive.error_string); if (a->entry) archive_entry_free(a->entry); ==== //depot/projects/iwarp/lib/libarchive/archive_read_private.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.4 2008/01/03 17:54:26 des Exp $ + * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.5 2008/03/12 04:58:32 kientzle Exp $ */ #ifndef ARCHIVE_READ_PRIVATE_H_INCLUDED @@ -41,10 +41,6 @@ dev_t skip_file_dev; ino_t skip_file_ino; - /* Utility: Pointer to a block of nulls. */ - const unsigned char *nulls; - size_t null_length; - /* * Used by archive_read_data() to track blocks and copy * data to client buffers, filling gaps with zero bytes. @@ -58,30 +54,9 @@ archive_open_callback *client_opener; archive_read_callback *client_reader; archive_skip_callback *client_skipper; - archive_write_callback *client_writer; archive_close_callback *client_closer; void *client_data; - /* - * Blocking information. Note that bytes_in_last_block is - * misleadingly named; I should find a better name. These - * control the final output from all compressors, including - * compression_none. - */ - int bytes_per_block; - int bytes_in_last_block; - - /* - * These control whether data within a gzip/bzip2 compressed - * stream gets padded or not. If pad_uncompressed is set, - * the data will be padded to a full block before being - * compressed. The pad_uncompressed_byte determines the value - * that will be used for padding. Note that these have no - * effect on compression "none." - */ - int pad_uncompressed; - int pad_uncompressed_byte; /* TODO: Support this. */ - /* File offset of beginning of most recently-read header. */ off_t header_position; @@ -142,18 +117,6 @@ struct archive_format_descriptor *format; /* Active format. */ /* - * Pointers to format-specific functions for writing. They're - * initialized by archive_write_set_format_XXX() calls. - */ - int (*format_init)(struct archive *); /* Only used on write. */ - int (*format_finish)(struct archive *); - int (*format_finish_entry)(struct archive *); - int (*format_write_header)(struct archive *, - struct archive_entry *); - ssize_t (*format_write_data)(struct archive *, - const void *buff, size_t); - - /* * Various information needed by archive_extract. */ struct extract *extract; ==== //depot/projects/iwarp/lib/libarchive/archive_read_support_format_ar.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.8 2008/02/19 05:54:24 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_ar.c,v 1.9 2008/03/12 21:10:26 kaiw Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -83,8 +83,7 @@ struct archive_entry *e); static uint64_t ar_atol8(const char *p, unsigned char_cnt); static uint64_t ar_atol10(const char *p, unsigned char_cnt); -static int ar_parse_gnu_filename_table(struct archive_read *, struct ar *, - const void *, size_t); +static int ar_parse_gnu_filename_table(struct archive_read *a); static int ar_parse_common_header(struct ar *ar, struct archive_entry *, const char *h); @@ -167,8 +166,8 @@ struct ar *ar; uint64_t number; /* Used to hold parsed numbers before validation. */ ssize_t bytes_read; - size_t bsd_name_length, entry_size; - char *p; + size_t bsd_name_length, entry_size, s; + char *p, *st; const void *b; const char *h; int r; @@ -277,22 +276,42 @@ return (ARCHIVE_FATAL); } entry_size = (size_t)number; + if (entry_size == 0) { + archive_set_error(&a->archive, EINVAL, + "Invalid string table"); + return (ARCHIVE_WARN); + } + if (ar->strtab != NULL) { + archive_set_error(&a->archive, EINVAL, + "More than one string tables exist"); + return (ARCHIVE_WARN); + } + /* Read the filename table into memory. */ - bytes_read = (a->decompressor->read_ahead)(a, &b, entry_size); - if (bytes_read <= 0) + st = malloc(entry_size); + if (st == NULL) { + archive_set_error(&a->archive, ENOMEM, + "Can't allocate filename table buffer"); return (ARCHIVE_FATAL); - if ((size_t)bytes_read < entry_size) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Truncated input file"); - return (ARCHIVE_FATAL); + } + ar->strtab = st; + ar->strtab_size = entry_size; + for (s = entry_size; s > 0; s -= bytes_read) { + bytes_read = (a->decompressor->read_ahead)(a, &b, s); + if (bytes_read <= 0) + return (ARCHIVE_FATAL); + if (bytes_read > (ssize_t)s) + bytes_read = s; + memcpy(st, b, bytes_read); + st += bytes_read; + (a->decompressor->consume)(a, bytes_read); } - /* - * Don't consume the contents, so the client will - * also get a shot at reading it. - */ + /* All contents are consumed. */ + ar->entry_bytes_remaining = 0; + archive_entry_set_size(entry, ar->entry_bytes_remaining); /* Parse the filename table. */ - return (ar_parse_gnu_filename_table(a, ar, b, entry_size)); + return (ar_parse_gnu_filename_table(a)); } /* @@ -492,31 +511,15 @@ } static int -ar_parse_gnu_filename_table(struct archive_read *a, struct ar *ar, - const void *h, size_t size) +ar_parse_gnu_filename_table(struct archive_read *a) { + struct ar *ar; char *p; + size_t size; - if (ar->strtab != NULL) { - archive_set_error(&a->archive, EINVAL, - "More than one string tables exist"); - return (ARCHIVE_WARN); - } - - if (size == 0) { - archive_set_error(&a->archive, EINVAL, "Invalid string table"); - return (ARCHIVE_WARN); - } + ar = (struct ar*)(a->format->data); + size = ar->strtab_size; - ar->strtab_size = size; - ar->strtab = malloc(size); - if (ar->strtab == NULL) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate string table buffer"); - return (ARCHIVE_FATAL); - } - - (void)memcpy(ar->strtab, h, size); for (p = ar->strtab; p < ar->strtab + size - 1; ++p) { if (*p == '/') { *p++ = '\0'; ==== //depot/projects/iwarp/lib/libarchive/test/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.14 2008/01/31 07:47:38 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.15 2008/03/12 05:12:23 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -7,17 +7,6 @@ # Get a list of all libarchive source files LA_SRCS!=make -f ${LA_SRCDIR}/Makefile -V SRCS -TESTFILES= \ - test_compat_gtar_1.tgz \ - test_compat_tar_hardlink_1.tar \ - test_compat_zip_1.zip \ - test_read_format_gtar_sparse_1_13.tgz \ - test_read_format_gtar_sparse_1_17.tgz \ - test_read_format_gtar_sparse_1_17_posix00.tgz \ - test_read_format_gtar_sparse_1_17_posix01.tgz \ - test_read_format_gtar_sparse_1_17_posix10.tgz \ - test_read_format_gtar_sparse_1_17_posix10_modified.tar - TESTS= \ test_acl_basic.c \ test_acl_pax.c \ @@ -104,13 +93,8 @@ WARNS=6 # Build libarchive_test and run it. -check test: libarchive_test ${TESTFILES} - ./libarchive_test - -.for f in ${TESTFILES} -${f}: ${f}.uu - uudecode -p ${.CURDIR}/${f}.uu >${f} -.endfor +check test: libarchive_test + ./libarchive_test -k -r ${.CURDIR} INCS=archive.h list.h ==== //depot/projects/iwarp/lib/libarchive/test/main.c#4 (text+ko) ==== @@ -24,23 +24,26 @@ */ /* - * This same file is used pretty much verbatim for all test harnesses. - * - * The next line is used to define various environment variables, etc. - * - * The tar and cpio test harnesses are identical except for this line; - * the libarchive test harness omits some code that is needed only for - * testing standalone executables. + * Various utility routines useful for test programs. + * Each test program is linked against this file. */ -#define PROGRAM "LIBARCHIVE" - #include #include #include #include #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.10 2008/02/19 05:52:30 kientzle Exp $"); + +/* + * This same file is used pretty much verbatim for all test harnesses. + * + * The next few lines are the only differences. + */ +#undef PROGRAM /* Testing a library, not a program. */ +#define ENVBASE "LIBARCHIVE" /* Prefix for environment variables. */ +#define EXTRA_DUMP(x) archive_error_string((struct archive *)(x)) +#define EXTRA_VERSION archive_version() +__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.11 2008/03/12 05:12:23 kientzle Exp $"); /* * "list.h" is simply created by "grep DEFINE_TEST"; it has @@ -51,7 +54,7 @@ * test functions. */ #undef DEFINE_TEST -#define DEFINE_TEST(name) void name(void); +#define DEFINE_TEST(name) void name(void); #include "list.h" /* Interix doesn't define these in a standard header. */ @@ -71,6 +74,9 @@ /* Cumulative count of assertions. */ static int assertions = 0; +/* Directory where uuencoded reference files can be found. */ +static char *refdir; + /* * My own implementation of the standard assert() macro emits the * message in the same format as GCC (file:line: message). @@ -90,7 +96,7 @@ * For each test source file, we remember how many times each * failure was reported. */ -static const char *failed_filename; +static const char *failed_filename = NULL; static struct line { int line; int count; @@ -163,9 +169,13 @@ fprintf(stderr, " Description: %s\n", msg); msg[0] = '\0'; } - if (extra != NULL) { - fprintf(stderr, " archive error: %s\n", archive_error_string((struct archive *)extra)); - } + +#ifdef EXTRA_DUMP + if (extra != NULL) + fprintf(stderr, " detail: %s\n", EXTRA_DUMP(extra)); +#else + (void)extra; /* UNUSED */ +#endif if (dump_on_failure) { fprintf(stderr, @@ -241,27 +251,28 @@ } /* assertEqualInt() displays the values of the two integers. */ -void +int test_assert_equal_int(const char *file, int line, int v1, const char *e1, int v2, const char *e2, void *extra) { ++assertions; if (v1 == v2) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: Ints not equal\n", file, line); fprintf(stderr, " %s=%d\n", e1, v1); fprintf(stderr, " %s=%d\n", e2, v2); report_failure(extra); + return (0); } /* assertEqualString() displays the values of the two strings. */ -void +int test_assert_equal_string(const char *file, int line, const char *v1, const char *e1, const char *v2, const char *e2, @@ -271,24 +282,25 @@ if (v1 == NULL || v2 == NULL) { if (v1 == v2) { msg[0] = '\0'; - return; + return (1); } } else if (strcmp(v1, v2) == 0) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: Strings not equal\n", file, line); fprintf(stderr, " %s = \"%s\"\n", e1, v1); fprintf(stderr, " %s = \"%s\"\n", e2, v2); report_failure(extra); + return (0); } /* assertEqualWString() displays the values of the two strings. */ -void +int test_assert_equal_wstring(const char *file, int line, const wchar_t *v1, const char *e1, const wchar_t *v2, const char *e2, @@ -297,16 +309,17 @@ ++assertions; if (wcscmp(v1, v2) == 0) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: Unicode strings not equal\n", file, line); fwprintf(stderr, L" %s = \"%ls\"\n", e1, v1); fwprintf(stderr, L" %s = \"%ls\"\n", e2, v2); report_failure(extra); + return (0); } /* @@ -326,7 +339,7 @@ for (j = 0; j < 16 && i + j < l; j++) { if (ref != NULL && p[i + j] != ref[i + j]) sep = '_'; - fprintf(stderr, "%c%02x", sep, p[i+j]); + fprintf(stderr, "%c%02x", sep, 0xff & (int)p[i+j]); if (ref != NULL && p[i + j] == ref[i + j]) sep = ' '; } @@ -348,7 +361,7 @@ /* assertEqualMem() displays the values of the two memory blocks. */ /* TODO: For long blocks, hexdump the first bytes that actually differ. */ -void +int test_assert_equal_mem(const char *file, int line, const char *v1, const char *e1, const char *v2, const char *e2, @@ -358,15 +371,15 @@ if (v1 == NULL || v2 == NULL) { if (v1 == v2) { msg[0] = '\0'; - return; + return (1); } } else if (memcmp(v1, v2, l) == 0) { msg[0] = '\0'; - return; + return (1); } failures ++; if (previous_failures(file, line)) - return; + return (0); fprintf(stderr, "%s:%d: Assertion failed: memory not equal\n", file, line); fprintf(stderr, " size %s = %d\n", ld, (int)l); @@ -376,14 +389,19 @@ hexdump(v2, v1, l < 32 ? l : 32, 0); fprintf(stderr, "\n"); report_failure(extra); + return (0); } -void +int test_assert_empty_file(const char *f1fmt, ...) { + char buff[1024]; char f1[1024]; struct stat st; va_list ap; + ssize_t s; + int fd; + va_start(ap, f1fmt); vsprintf(f1, f1fmt, ap); @@ -392,16 +410,32 @@ if (stat(f1, &st) != 0) { fprintf(stderr, "%s:%d: Could not stat: %s\n", test_filename, test_line, f1); report_failure(NULL); - } else if (st.st_size > 0) { - fprintf(stderr, "%s:%d: File not empty: %s\n", test_filename, test_line, f1); - fprintf(stderr, " File size: %d\n", (int)st.st_size); - report_failure(NULL); + } + if (st.st_size == 0) + return (1); + + failures ++; + if (previous_failures(test_filename, test_line)) + return (0); + + fprintf(stderr, "%s:%d: File not empty: %s\n", test_filename, test_line, f1); + fprintf(stderr, " File size: %d\n", (int)st.st_size); + fprintf(stderr, " Contents:\n"); + fd = open(f1, O_RDONLY); + if (fd < 0) { + fprintf(stderr, " Unable to open %s\n", f1); + } else { + s = sizeof(buff) < st.st_size ? sizeof(buff) : st.st_size; + s = read(fd, buff, s); + hexdump(buff, NULL, s, 0); } + report_failure(NULL); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 14 03:54:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B939106566C; Fri, 14 Mar 2008 03:54:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B3591065671 for ; Fri, 14 Mar 2008 03:54:33 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA9788FC1C for ; Fri, 14 Mar 2008 03:54:32 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E3sW4L078621 for ; Fri, 14 Mar 2008 03:54:32 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E3sWhO078619 for perforce@freebsd.org; Fri, 14 Mar 2008 03:54:32 GMT (envelope-from jhb@freebsd.org) Date: Fri, 14 Mar 2008 03:54:32 GMT Message-Id: <200803140354.m2E3sWhO078619@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 137672 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, 14 Mar 2008 03:54:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=137672 Change 137672 by jhb@jhb_mutex on 2008/03/14 03:53:40 IFC @137671 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#28 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#28 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#28 (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.35 2007/11/21 04:03:50 scottl Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.36 2008/03/14 03:44:41 jhb Exp $ */ /* @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -536,7 +537,7 @@ /* The BSP is always a valid target. */ static cpumask_t intr_cpus = (1 << 0); -static int current_cpu, num_cpus = 1; +static int current_cpu; static void intr_assign_next_cpu(struct intsrc *isrc) @@ -552,7 +553,7 @@ pic->pic_assign_cpu(isrc, apic_id); do { current_cpu++; - if (current_cpu >= num_cpus) + if (current_cpu > mp_maxid) current_cpu = 0; } while (!(intr_cpus & (1 << current_cpu))); } @@ -572,7 +573,6 @@ cpu_apic_ids[cpu]); intr_cpus |= (1 << cpu); - num_cpus++; } /* @@ -586,7 +586,7 @@ int i; /* Don't bother on UP. */ - if (num_cpus <= 1) + if (mp_ncpus == 1) return; /* Round-robin assign a CPU to each enabled source. */ ==== //depot/projects/smpng/sys/i386/i386/intr_machdep.c#28 (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/intr_machdep.c,v 1.30 2007/11/21 04:03:50 scottl Exp $ + * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.31 2008/03/14 03:44:42 jhb Exp $ */ /* @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -512,7 +513,7 @@ /* The BSP is always a valid target. */ static cpumask_t intr_cpus = (1 << 0); -static int current_cpu, num_cpus = 1; +static int current_cpu; static void intr_assign_next_cpu(struct intsrc *isrc) @@ -528,7 +529,7 @@ pic->pic_assign_cpu(isrc, apic_id); do { current_cpu++; - if (current_cpu >= num_cpus) + if (current_cpu > mp_maxid) current_cpu = 0; } while (!(intr_cpus & (1 << current_cpu))); } @@ -548,7 +549,6 @@ cpu_apic_ids[cpu]); intr_cpus |= (1 << cpu); - num_cpus++; } /* @@ -562,7 +562,7 @@ int i; /* Don't bother on UP. */ - if (num_cpus <= 1) + if (mp_ncpus == 1) return; /* Round-robin assign a CPU to each enabled source. */ From owner-p4-projects@FreeBSD.ORG Fri Mar 14 04:01:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50F0E1065673; Fri, 14 Mar 2008 04:01:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10A7F1065671 for ; Fri, 14 Mar 2008 04:01:43 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D61368FC1E for ; Fri, 14 Mar 2008 04:01:42 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E41g8f079377 for ; Fri, 14 Mar 2008 04:01:42 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E41eGH079375 for perforce@freebsd.org; Fri, 14 Mar 2008 04:01:40 GMT (envelope-from marcel@freebsd.org) Date: Fri, 14 Mar 2008 04:01:40 GMT Message-Id: <200803140401.m2E41eGH079375@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 137676 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, 14 Mar 2008 04:01:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=137676 Change 137676 by marcel@marcel_xcllnt on 2008/03/14 04:01:29 WITNESS_KDB is bad, m'kay... Affected files ... .. //depot/projects/powerpc/sys/powerpc/conf/XSERVE#6 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/conf/XSERVE#6 (text+ko) ==== @@ -34,7 +34,7 @@ options SYSVSHM options UFS_DIRHASH options WITNESS -options WITNESS_KDB +#options WITNESS_KDB options WITNESS_SKIPSPIN options _KPOSIX_PRIORITY_SCHEDULING From owner-p4-projects@FreeBSD.ORG Fri Mar 14 04:05:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DCEB1065675; Fri, 14 Mar 2008 04:05:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3CFDF106566B for ; Fri, 14 Mar 2008 04:05:47 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2802A8FC1B for ; Fri, 14 Mar 2008 04:05:47 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E45lp4080716 for ; Fri, 14 Mar 2008 04:05:47 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E45k1V080714 for perforce@freebsd.org; Fri, 14 Mar 2008 04:05:46 GMT (envelope-from marcel@freebsd.org) Date: Fri, 14 Mar 2008 04:05:46 GMT Message-Id: <200803140405.m2E45k1V080714@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 137677 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, 14 Mar 2008 04:05:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=137677 Change 137677 by marcel@marcel_xcllnt on 2008/03/14 04:05:23 In mp_announce(), print the pc->pc_hwref (OFW phandle). Always print in hex. Affected files ... .. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#16 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#16 (text+ko) ==== @@ -140,7 +140,7 @@ pc = pcpu_find(i); if (pc == NULL) continue; - printf("cpu%d", i); + printf("cpu%d: dev=%x", i, pc->pc_hwref); if (pc->pc_bsp) printf(" (BSP)"); printf("\n"); @@ -166,7 +166,7 @@ SLIST_FOREACH(pc, &cpuhead, pc_allcpu) { cpus++; if (!pc->pc_bsp) { - printf("Waking up CPU %d (dev=%u)\n", pc->pc_cpuid, + printf("Waking up CPU %d (dev=%x)\n", pc->pc_cpuid, pc->pc_hwref); powerpc_smp_start_cpu(pc); } else From owner-p4-projects@FreeBSD.ORG Fri Mar 14 04:07:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB3301065671; Fri, 14 Mar 2008 04:07:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A136106566C for ; Fri, 14 Mar 2008 04:07:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 552358FC15 for ; Fri, 14 Mar 2008 04:07:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E47nSC080756 for ; Fri, 14 Mar 2008 04:07:49 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E47nBX080754 for perforce@freebsd.org; Fri, 14 Mar 2008 04:07:49 GMT (envelope-from marcel@freebsd.org) Date: Fri, 14 Mar 2008 04:07:49 GMT Message-Id: <200803140407.m2E47nBX080754@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 137678 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, 14 Mar 2008 04:07:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=137678 Change 137678 by marcel@marcel_xcllnt on 2008/03/14 04:07:16 Install rstcode at the EXC_RST vector. It now saves some critical information and goes into an infinite loop, but will be fleshed out to get the AP into a usable state. Affected files ... .. //depot/projects/powerpc/sys/powerpc/aim/machdep.c#7 edit .. //depot/projects/powerpc/sys/powerpc/aim/trap_subr.S#3 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/aim/machdep.c#7 (text+ko) ==== @@ -241,6 +241,7 @@ extern char kernel_text[], _end[]; +extern void *rstcode, *rstsize; extern void *trapcode, *trapsize; extern void *alitrap, *alisize; extern void *dsitrap, *dsisize; @@ -326,7 +327,7 @@ */ mtmsr(mfmsr() & ~(PSL_IR | PSL_DR)); isync(); - bcopy(&trapcode, (void *)EXC_RST, (size_t)&trapsize); + bcopy(&rstcode, (void *)EXC_RST, (size_t)&rstsize); bcopy(&trapcode, (void *)EXC_MCHK, (size_t)&trapsize); bcopy(&dsitrap, (void *)EXC_DSI, (size_t)&dsisize); bcopy(&trapcode, (void *)EXC_ISI, (size_t)&trapsize); @@ -343,7 +344,6 @@ bcopy(&trapcode, (void *)EXC_THRM, (size_t)&trapsize); bcopy(&trapcode, (void *)EXC_BPT, (size_t)&trapsize); #ifdef KDB - bcopy(&dblow, (void *)EXC_RST, (size_t)&dbsize); bcopy(&dblow, (void *)EXC_MCHK, (size_t)&dbsize); bcopy(&dblow, (void *)EXC_PGM, (size_t)&dbsize); bcopy(&dblow, (void *)EXC_TRC, (size_t)&dbsize); ==== //depot/projects/powerpc/sys/powerpc/aim/trap_subr.S#3 (text+ko) ==== @@ -242,6 +242,26 @@ * (except ISI/DSI, ALI, and the interrupts) */ .text + + .globl CNAME(rstcode), CNAME(rstsize) +CNAME(rstcode): + bl 1f + + .long 0 + .long 0 + .long 0 + .long 0 + +1: + mflr %r3 + stw %r3, 0(%r3) + stw %r1, 4(%r3) + stw %r2, 8(%r3) + mfmsr %r4 + stw %r4, 12(%r3) +9: b 9b +CNAME(rstsize) = . - CNAME(rstcode) + .globl CNAME(trapcode),CNAME(trapsize) CNAME(trapcode): mtsprg1 %r1 /* save SP */ From owner-p4-projects@FreeBSD.ORG Fri Mar 14 04:12:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6798A1065676; Fri, 14 Mar 2008 04:12:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 270601065673 for ; Fri, 14 Mar 2008 04:12:55 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0B9078FC21 for ; Fri, 14 Mar 2008 04:12:54 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E4Cs2l080924 for ; Fri, 14 Mar 2008 04:12:54 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E4CsWW080922 for perforce@freebsd.org; Fri, 14 Mar 2008 04:12:54 GMT (envelope-from marcel@freebsd.org) Date: Fri, 14 Mar 2008 04:12:54 GMT Message-Id: <200803140412.m2E4CsWW080922@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 137679 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, 14 Mar 2008 04:12:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=137679 Change 137679 by marcel@marcel_xcllnt on 2008/03/14 04:12:39 Make the soft reset of the AP work. We actually get to the EXC_RST vector on the second CPU: Waking up CPU 1 (dev=ff880bc8) XXX: 48000015 00000000 00000000 00000000 00000000 7c6802a6 XXX: 48000015 00000104 00043010 0000c000 00001000 7c6802a6 Most importantly: MSR=PSL_ME Affected files ... .. //depot/projects/powerpc/sys/powerpc/aim/mp_cpudep.c#2 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/aim/mp_cpudep.c#2 (text+ko) ==== @@ -38,10 +38,13 @@ #include #include #include +#include #include #include +extern void *rstcode; + static int powerpc_smp_fill_cpuref(struct cpuref *cpuref, phandle_t cpu) { @@ -127,10 +130,25 @@ return (powerpc_smp_fill_cpuref(cpuref, bsp)); } +static void +dump_rstvec(void) +{ + uint32_t buf[6]; + + mtmsr(mfmsr() & ~(PSL_IR | PSL_DR)); + isync(); + bcopy((void *)EXC_RST, buf, sizeof(buf)); + mtmsr(mfmsr() | PSL_IR | PSL_DR); + + printf("XXX: %08x %08x %08x %08x %08x %08x\n", buf[0], buf[1], buf[2], + buf[3], buf[4], buf[5]); +} + int powerpc_smp_start_cpu(struct pcpu *pc) { phandle_t cpu; + volatile uint8_t *rstvec; int res, reset; cpu = pc->pc_hwref; @@ -138,8 +156,19 @@ if (res < 0) return (ENXIO); - printf("XXX: reset=%d\n", reset); - *(u_char *)(0x80000000 + reset) = 4; - *(u_char *)(0x80000000 + reset) = 5; + dump_rstvec(); + + rstvec = (uint8_t *)(0x80000000 + reset); + + *rstvec = 4; + __asm __volatile("sync"); + DELAY(1); + *rstvec = 0; + __asm __volatile("sync"); + + DELAY(1000); + + dump_rstvec(); + return (0); } From owner-p4-projects@FreeBSD.ORG Fri Mar 14 05:16:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C9301065674; Fri, 14 Mar 2008 05:16:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 32597106566C for ; Fri, 14 Mar 2008 05:16:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1E1B48FC17 for ; Fri, 14 Mar 2008 05:16:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E5G1Aw096333 for ; Fri, 14 Mar 2008 05:16:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E5G1t0096331 for perforce@freebsd.org; Fri, 14 Mar 2008 05:16:01 GMT (envelope-from sam@freebsd.org) Date: Fri, 14 Mar 2008 05:16:01 GMT Message-Id: <200803140516.m2E5G1t0096331@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 137682 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, 14 Mar 2008 05:16:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=137682 Change 137682 by sam@sam_ebb on 2008/03/14 05:15:28 expose net.wlan.X sysctl mib tree for adjust modules like rate control to hook up to Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#22 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#31 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#22 (text+ko) ==== @@ -238,6 +238,7 @@ &vap->iv_ampdu_mintraffic[WME_AC_VI], 0, "VI traffic tx aggr threshold (pps)"); vap->iv_sysctl = ctx; + vap->iv_oid = oid; } void ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#31 (text+ko) ==== @@ -278,6 +278,7 @@ struct ifnet *iv_ifp; /* associated device */ struct bpf_if *iv_rawbpf; /* packet filter structure */ struct sysctl_ctx_list *iv_sysctl; /* dynamic sysctl context */ + struct sysctl_oid *iv_oid; /* net.wlan.X sysctl oid */ TAILQ_ENTRY(ieee80211vap) iv_next; /* list of vap instances */ struct ieee80211com *iv_ic; /* back ptr to common state */ From owner-p4-projects@FreeBSD.ORG Fri Mar 14 05:24:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E50E61065673; Fri, 14 Mar 2008 05:24:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89846106566C for ; Fri, 14 Mar 2008 05:24:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 75A2F8FC12 for ; Fri, 14 Mar 2008 05:24:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E5OCeD096714 for ; Fri, 14 Mar 2008 05:24:12 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E5OCwY096712 for perforce@freebsd.org; Fri, 14 Mar 2008 05:24:12 GMT (envelope-from sam@freebsd.org) Date: Fri, 14 Mar 2008 05:24:12 GMT Message-Id: <200803140524.m2E5OCwY096712@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 137686 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, 14 Mar 2008 05:24:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=137686 Change 137686 by sam@sam_ebb on 2008/03/14 05:24:04 Major overhaul: o consolidate various driver-specific hacks by refining the api's; drivers can accumulate stats on each tx done or through periodic polling (e.g. ural which collects stats through cmds) and effect rate selection according to a sampling interval o do the initial tx rate selection in ieee80211_amrr_node_init (probably need to refine for 11b rate sets to start 5.5 instead of 11) o de-obfuscate some of the code o eliminate dependence on ni_txrate for tracking the current rate index since it's now for reporting current tx rate o handle ni_txrate updates o automatically add sysctl knobs to net.wlan.X o fix rate downshifting so it requires "is_enough" frames; otherwise this can happen if 1 frame is sent successfully with a retransmit (algorithm is stil utter crap but this at least eliminates one of the major causes of rapid rate oscillation) Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_amrr.c#7 edit .. //depot/projects/vap/sys/net80211/ieee80211_amrr.h#5 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_amrr.c#7 (text+ko) ==== @@ -53,68 +53,87 @@ ((amn)->amn_retrycnt > (amn)->amn_txcnt / 3) #define is_enough(amn) \ ((amn)->amn_txcnt > 10) -#define is_min_rate(ni) \ - ((ni)->ni_txrate == 0) -#define is_max_rate(ni) \ - ((ni)->ni_txrate == (ni)->ni_rates.rs_nrates - 1) -#define increase_rate(ni) \ - ((ni)->ni_txrate++) -#define decrease_rate(ni) \ - ((ni)->ni_txrate--) -#define reset_cnt(amn) \ - do { (amn)->amn_txcnt = (amn)->amn_retrycnt = 0; } while (0) + +static void amrr_sysctlattach(struct ieee80211_amrr *amrr, + struct sysctl_ctx_list *ctx, struct sysctl_oid *tree); /* number of references from net80211 layer */ static int nrefs = 0; void +ieee80211_amrr_setinterval(struct ieee80211_amrr *amrr, int msecs) +{ + int t; + + if (msecs < 100) + msecs = 100; + t = msecs_to_ticks(msecs); + amrr->amrr_interval = (t < 1) ? 1 : t; +} + +void ieee80211_amrr_init(struct ieee80211_amrr *amrr, - struct ieee80211vap *vap, int amin, int amax) + struct ieee80211vap *vap, int amin, int amax, int interval) { /* XXX bounds check? */ amrr->amrr_min_success_threshold = amin; amrr->amrr_max_success_threshold = amax; - amrr->amrr_vap = vap; + ieee80211_amrr_setinterval(amrr, interval); + + amrr_sysctlattach(amrr, vap->iv_sysctl, vap->iv_oid); +} + +void +ieee80211_amrr_cleanup(struct ieee80211_amrr *amrr) +{ } void ieee80211_amrr_node_init(struct ieee80211_amrr *amrr, - struct ieee80211_amrr_node *amn) + struct ieee80211_amrr_node *amn, struct ieee80211_node *ni) { + const struct ieee80211_rateset *rs = &ni->ni_rates; + + amn->amn_amrr = amrr; amn->amn_success = 0; amn->amn_recovery = 0; amn->amn_txcnt = amn->amn_retrycnt = 0; amn->amn_success_threshold = amrr->amrr_min_success_threshold; + + /* pick initial rate */ + for (amn->amn_rix = rs->rs_nrates - 1; + amn->amn_rix > 0 && (rs->rs_rates[amn->amn_rix] & IEEE80211_RATE_VAL) > 72; + amn->amn_rix--) + ; + ni->ni_txrate = rs->rs_rates[amn->amn_rix] & IEEE80211_RATE_VAL; + amn->amn_ticks = ticks; } -/* - * Update ni->ni_txrate. - */ -void -ieee80211_amrr_choose(struct ieee80211_amrr *amrr, struct ieee80211_node *ni, - struct ieee80211_amrr_node *amn) +static int +amrr_update(struct ieee80211_amrr *amrr, struct ieee80211_amrr_node *amn, + struct ieee80211_node *ni) { - int need_change = 0; + int rix = amn->amn_rix; + + KASSERT(is_enough(amn), ("txcnt %d", amn->amn_txcnt)); - if (is_success(amn) && is_enough(amn)) { + if (is_success(amn)) { amn->amn_success++; if (amn->amn_success >= amn->amn_success_threshold && - !is_max_rate(ni)) { + rix + 1 < ni->ni_rates.rs_nrates) { amn->amn_recovery = 1; amn->amn_success = 0; - increase_rate(ni); - IEEE80211_DPRINTF(amrr->amrr_vap, IEEE80211_MSG_RATECTL, + rix++; + IEEE80211_DPRINTF(ni->ni_vap, IEEE80211_MSG_RATECTL, "AMRR increasing rate %d (txcnt=%d retrycnt=%d)\n", - ni->ni_rates.rs_rates[ni->ni_txrate] & - IEEE80211_RATE_VAL, + ni->ni_rates.rs_rates[rix] & IEEE80211_RATE_VAL, amn->amn_txcnt, amn->amn_retrycnt); - need_change = 1; } else { amn->amn_recovery = 0; } } else if (is_failure(amn)) { amn->amn_success = 0; - if (!is_min_rate(ni)) { + if (rix > 0) { if (amn->amn_recovery) { amn->amn_success_threshold *= 2; if (amn->amn_success_threshold > @@ -125,19 +144,76 @@ amn->amn_success_threshold = amrr->amrr_min_success_threshold; } - decrease_rate(ni); - IEEE80211_DPRINTF(amrr->amrr_vap, IEEE80211_MSG_RATECTL, + rix--; + IEEE80211_DPRINTF(ni->ni_vap, IEEE80211_MSG_RATECTL, "AMRR decreasing rate %d (txcnt=%d retrycnt=%d)\n", - ni->ni_rates.rs_rates[ni->ni_txrate] & - IEEE80211_RATE_VAL, + ni->ni_rates.rs_rates[rix] & IEEE80211_RATE_VAL, amn->amn_txcnt, amn->amn_retrycnt); - need_change = 1; } amn->amn_recovery = 0; } - if (is_enough(amn) || need_change) - reset_cnt(amn); + /* reset counters */ + amn->amn_txcnt = 0; + amn->amn_retrycnt = 0; + + return rix; +} + +/* + * Return the rate index to use in sending a data frame. + * Update our internal state if it's been long enough. + * If the rate changes we also update ni_txrate to match. + */ +int +ieee80211_amrr_choose(struct ieee80211_node *ni, + struct ieee80211_amrr_node *amn) +{ + struct ieee80211_amrr *amrr = amn->amn_amrr; + int rix; + + if (is_enough(amn) && ticks - amn->amn_ticks > amrr->amrr_interval) { + rix = amrr_update(amrr, amn, ni); + if (rix != amn->amn_rix) { + /* update public rate */ + ni->ni_txrate = + ni->ni_rates.rs_rates[rix] & IEEE80211_RATE_VAL; + amn->amn_rix = rix; + } + } else + rix = amn->amn_rix; + return rix; +} + +static int +amrr_sysctl_interval(SYSCTL_HANDLER_ARGS) +{ + struct ieee80211_amrr *amrr = arg1; + int msecs = ticks_to_msecs(amrr->amrr_interval); + int error; + + error = sysctl_handle_int(oidp, &msecs, 0, req); + if (error || !req->newptr) + return error; + ieee80211_amrr_setinterval(amrr, msecs); + return 0; +} + +static void +amrr_sysctlattach(struct ieee80211_amrr *amrr, + struct sysctl_ctx_list *ctx, struct sysctl_oid *tree) +{ + + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "amrr_rate_interval", CTLTYPE_INT | CTLFLAG_RW, amrr, + 0, amrr_sysctl_interval, "I", "amrr operation interval (ms)"); + /* XXX bounds check values */ + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "amrr_max_sucess_threshold", CTLFLAG_RW, + &amrr->amrr_max_success_threshold, 0, ""); + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "amrr_min_sucess_threshold", CTLFLAG_RW, + &amrr->amrr_min_success_threshold, 0, ""); } /* ==== //depot/projects/vap/sys/net80211/ieee80211_amrr.h#5 (text+ko) ==== @@ -37,7 +37,7 @@ struct ieee80211_amrr { u_int amrr_min_success_threshold; u_int amrr_max_success_threshold; - struct ieee80211vap *amrr_vap; + int amrr_interval; /* update interval (ticks) */ }; #define IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD 1 @@ -47,18 +47,55 @@ * Rate control state for a given node. */ struct ieee80211_amrr_node { + struct ieee80211_amrr *amn_amrr;/* backpointer */ + int amn_rix; /* current rate index */ + int amn_ticks; /* time of last update */ + /* statistics */ + u_int amn_txcnt; u_int amn_success; + u_int amn_success_threshold; u_int amn_recovery; - u_int amn_success_threshold; - u_int amn_txcnt; u_int amn_retrycnt; }; -void ieee80211_amrr_init(struct ieee80211_amrr *, - struct ieee80211vap *, int, int); +void ieee80211_amrr_init(struct ieee80211_amrr *, struct ieee80211vap *, + int, int, int); +void ieee80211_amrr_cleanup(struct ieee80211_amrr *); +void ieee80211_amrr_setinterval(struct ieee80211_amrr *, int); void ieee80211_amrr_node_init(struct ieee80211_amrr *, + struct ieee80211_amrr_node *, struct ieee80211_node *); +int ieee80211_amrr_choose(struct ieee80211_node *, struct ieee80211_amrr_node *); -void ieee80211_amrr_choose(struct ieee80211_amrr *, struct ieee80211_node *, - struct ieee80211_amrr_node *); + +#define IEEE80211_AMRR_SUCCESS 1 +#define IEEE80211_AMRR_FAILURE 0 + +/* + * Update statistics with tx complete status. Ok is non-zero + * if the packet is known to be ACK'd. Retries has the number + * retransmissions (i.e. xmit attempts - 1). + */ +static __inline void +ieee80211_amrr_tx_complete(struct ieee80211_amrr_node *amn, + int ok, int retries) +{ + amn->amn_txcnt++; + if (ok) + amn->amn_success++; + amn->amn_retrycnt += retries; +} +/* + * Set tx count/retry statistics explicitly. Intended for + * drivers that poll the device for statistics maintained + * in the device. + */ +static __inline void +ieee80211_amrr_tx_update(struct ieee80211_amrr_node *amn, + int txcnt, int success, int retrycnt) +{ + amn->amn_txcnt = txcnt; + amn->amn_success = success; + amn->amn_retrycnt = retrycnt; +} #endif /* _NET80211_IEEE80211_AMRR_H_ */ From owner-p4-projects@FreeBSD.ORG Fri Mar 14 05:28:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26BF11065672; Fri, 14 Mar 2008 05:28:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9807106566B for ; Fri, 14 Mar 2008 05:28:16 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C614D8FC1D for ; Fri, 14 Mar 2008 05:28:16 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E5SGRL096860 for ; Fri, 14 Mar 2008 05:28:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E5SGXU096858 for perforce@freebsd.org; Fri, 14 Mar 2008 05:28:16 GMT (envelope-from sam@freebsd.org) Date: Fri, 14 Mar 2008 05:28:16 GMT Message-Id: <200803140528.m2E5SGXU096858@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 137687 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, 14 Mar 2008 05:28:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=137687 Change 137687 by sam@sam_ebb on 2008/03/14 05:27:25 o track amrr changes o add gross hack for dealing with newstate broken-ness (must be fixed before stuff moves to cvs) o reorder code in detach to avoid races Affected files ... .. //depot/projects/vap/sys/dev/usb/if_rum.c#9 edit .. //depot/projects/vap/sys/dev/usb/if_rumvar.h#6 edit .. //depot/projects/vap/sys/dev/usb/if_ural.c#11 edit .. //depot/projects/vap/sys/dev/usb/if_uralvar.h#8 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_rum.c#9 (text+ko) ==== @@ -195,6 +195,8 @@ struct ieee80211vap *); static int rum_raw_xmit(struct ieee80211_node *, struct mbuf *, const struct ieee80211_bpf_params *); +static struct ieee80211_node *rum_node_alloc(struct ieee80211_node_table *); +static void rum_newassoc(struct ieee80211_node *, int); static void rum_scan_start(struct ieee80211com *); static void rum_scan_end(struct ieee80211com *); static void rum_set_channel(struct ieee80211com *); @@ -512,7 +514,9 @@ ieee80211_init_channels(ic, NULL, &bands); ieee80211_ifattach(ic); + ic->ic_newassoc = rum_newassoc; ic->ic_raw_xmit = rum_raw_xmit; + ic->ic_node_alloc = rum_node_alloc; ic->ic_scan_start = rum_scan_start; ic->ic_scan_end = rum_scan_end; ic->ic_set_channel = rum_set_channel; @@ -545,6 +549,9 @@ struct ifnet *ifp = ic->ic_ifp; rum_stop(sc); + bpfdetach(ifp); + ieee80211_ifdetach(ic); + usb_rem_task(sc->sc_udev, &sc->sc_task); usb_rem_task(sc->sc_udev, &sc->sc_scantask); callout_stop(&sc->watchdog_ch); @@ -566,10 +573,7 @@ rum_free_rx_list(sc); rum_free_tx_list(sc); - bpfdetach(ifp); - ieee80211_ifdetach(ic); if_free(ifp); - mtx_destroy(&sc->sc_mtx); return 0; @@ -602,7 +606,8 @@ callout_init(&rvp->amrr_ch, 0); ieee80211_amrr_init(&rvp->amrr, vap, IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD, - IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD); + IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD, + 1000 /* 1 sec */); /* complete setup */ ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); @@ -616,6 +621,7 @@ struct rum_vap *rvp = RUM_VAP(vap); callout_stop(&rvp->amrr_ch); + ieee80211_amrr_cleanup(&rvp->amrr); ieee80211_vap_detach(vap); free(rvp, M_80211_VAP); } @@ -784,10 +790,9 @@ if (vap->iv_opmode != IEEE80211_M_MONITOR) rum_enable_tsf_sync(sc); - /* enable automatic rate adaptation in STA mode */ + /* enable automatic rate adaptation */ tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_bsschan)]; - if (vap->iv_opmode == IEEE80211_M_STA && - tp->ucastrate == IEEE80211_FIXED_RATE_NONE) + if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE) rum_amrr_start(sc, ni); break; default: @@ -796,7 +801,14 @@ RUM_UNLOCK(sc); + IEEE80211_LOCK(ic); /*XXX*/ rvp->newstate(vap, sc->sc_state, sc->sc_arg); + if (sc->sc_state == IEEE80211_S_RUN) { + /* XXX compensate for deferred handling of newstate */ + vap->iv_ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + if_start(vap->iv_ifp); + } + IEEE80211_UNLOCK(ic); } static int @@ -1300,8 +1312,10 @@ rate = tp->mcastrate; else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) rate = tp->ucastrate; - else - rate = ni->ni_rates.rs_rates[ni->ni_txrate]; + else { + (void) ieee80211_amrr_choose(ni, &RUM_NODE(ni)->amn); + rate = ni->ni_txrate; + } rate &= IEEE80211_RATE_VAL; @@ -2303,19 +2317,12 @@ { struct ieee80211vap *vap = ni->ni_vap; struct rum_vap *rvp = RUM_VAP(vap); - int i; /* clear statistic registers (STA_CSR0 to STA_CSR5) */ rum_read_multi(sc, RT2573_STA_CSR0, sc->sta, sizeof sc->sta); - ieee80211_amrr_node_init(&rvp->amrr, &rvp->amn); + ieee80211_amrr_node_init(&rvp->amrr, &RUM_NODE(ni)->amn, ni); - /* set rate to some reasonable initial value */ - for (i = ni->ni_rates.rs_nrates - 1; - i > 0 && (ni->ni_rates.rs_rates[i] & IEEE80211_RATE_VAL) > 72; - i--); - ni->ni_txrate = i; - callout_reset(&rvp->amrr_ch, hz, rum_amrr_timeout, vap); } @@ -2349,6 +2356,7 @@ struct rum_vap *rvp = RUM_VAP(vap); struct ifnet *ifp = vap->iv_ic->ic_ifp; struct rum_softc *sc = ifp->if_softc; + int ok, fail; if (status != USBD_NORMAL_COMPLETION) { device_printf(sc->sc_dev, "could not retrieve Tx statistics - " @@ -2356,21 +2364,34 @@ return; } - /* count TX retry-fail as Tx errors */ - ifp->if_oerrors += le32toh(sc->sta[5]) >> 16; + ok = (le32toh(sc->sta[4]) >> 16) + /* TX ok w/o retry */ + (le32toh(sc->sta[5]) & 0xffff); /* TX ok w/ retry */ + fail = (le32toh(sc->sta[5]) >> 16); /* TX retry-fail count */ + + ieee80211_amrr_tx_update(&RUM_NODE(vap->iv_bss)->amn, + ok+fail, ok, (le32toh(sc->sta[5]) & 0xffff) + fail); + + ifp->if_oerrors += fail; /* count TX retry-fail as Tx errors */ + + callout_reset(&rvp->amrr_ch, hz, rum_amrr_timeout, vap); +} - rvp->amn.amn_retrycnt = - (le32toh(sc->sta[4]) >> 16) + /* TX one-retry ok count */ - (le32toh(sc->sta[5]) & 0xffff) + /* TX more-retry ok count */ - (le32toh(sc->sta[5]) >> 16); /* TX retry-fail count */ +/* ARGUSED */ +static struct ieee80211_node * +rum_node_alloc(struct ieee80211_node_table *nt __unused) +{ + struct rum_node *rn; - rvp->amn.amn_txcnt = - rvp->amn.amn_retrycnt + - (le32toh(sc->sta[4]) & 0xffff); /* TX no-retry ok count */ + rn = malloc(sizeof(struct rum_node), M_80211_NODE, M_NOWAIT | M_ZERO); + return rn != NULL ? &rn->ni : NULL; +} - ieee80211_amrr_choose(&rvp->amrr, vap->iv_bss, &rvp->amn); +static void +rum_newassoc(struct ieee80211_node *ni, int isnew) +{ + struct ieee80211vap *vap = ni->ni_vap; - callout_reset(&rvp->amrr_ch, hz, rum_amrr_timeout, vap); + ieee80211_amrr_node_init(&RUM_VAP(vap)->amrr, &RUM_NODE(ni)->amn, ni); } static void ==== //depot/projects/vap/sys/dev/usb/if_rumvar.h#6 (text+ko) ==== @@ -69,11 +69,16 @@ struct mbuf *m; }; +struct rum_node { + struct ieee80211_node ni; + struct ieee80211_amrr_node amn; +}; +#define RUM_NODE(ni) ((struct rum_node *)(ni)) + struct rum_vap { struct ieee80211vap vap; struct ieee80211_beacon_offsets bo; struct ieee80211_amrr amrr; - struct ieee80211_amrr_node amn; struct callout amrr_ch; int (*newstate)(struct ieee80211vap *, ==== //depot/projects/vap/sys/dev/usb/if_ural.c#11 (text+ko) ==== @@ -159,6 +159,8 @@ static void ural_bbp_write(struct ural_softc *, uint8_t, uint8_t); static uint8_t ural_bbp_read(struct ural_softc *, uint8_t); static void ural_rf_write(struct ural_softc *, uint8_t, uint32_t); +static struct ieee80211_node *ural_node_alloc(struct ieee80211_node_table *); +static void ural_newassoc(struct ieee80211_node *, int); static void ural_scan_start(struct ieee80211com *); static void ural_scan_end(struct ieee80211com *); static void ural_set_channel(struct ieee80211com *); @@ -501,7 +503,9 @@ ieee80211_init_channels(ic, NULL, &bands); ieee80211_ifattach(ic); + ic->ic_newassoc = ural_newassoc; ic->ic_raw_xmit = ural_raw_xmit; + ic->ic_node_alloc = ural_node_alloc; ic->ic_scan_start = ural_scan_start; ic->ic_scan_end = ural_scan_end; ic->ic_set_channel = ural_set_channel; @@ -534,6 +538,9 @@ struct ifnet *ifp = ic->ic_ifp; ural_stop(sc); + bpfdetach(ifp); + ieee80211_ifdetach(ic); + usb_rem_task(sc->sc_udev, &sc->sc_task); callout_stop(&sc->watchdog_ch); @@ -555,10 +562,7 @@ ural_free_rx_list(sc); ural_free_tx_list(sc); - bpfdetach(ifp); - ieee80211_ifdetach(ic); if_free(ifp); - mtx_destroy(&sc->sc_mtx); return 0; @@ -591,7 +595,8 @@ callout_init(&uvp->amrr_ch, 0); ieee80211_amrr_init(&uvp->amrr, vap, IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD, - IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD); + IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD, + 1000 /* 1 sec */); /* complete setup */ ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); @@ -605,6 +610,7 @@ struct ural_vap *uvp = URAL_VAP(vap); callout_stop(&uvp->amrr_ch); + ieee80211_amrr_cleanup(&uvp->amrr); ieee80211_vap_detach(vap); free(uvp, M_80211_VAP); } @@ -789,10 +795,9 @@ if (vap->iv_opmode != IEEE80211_M_MONITOR) ural_enable_tsf_sync(sc); - /* enable automatic rate adaptation in STA mode */ + /* enable automatic rate adaptation */ tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_bsschan)]; - if (vap->iv_opmode == IEEE80211_M_STA && - tp->ucastrate == IEEE80211_FIXED_RATE_NONE) + if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE) ural_amrr_start(sc, ni); break; @@ -805,6 +810,11 @@ IEEE80211_LOCK(ic); /*XXX*/ uvp->newstate(vap, sc->sc_state, sc->sc_arg); + if (sc->sc_state == IEEE80211_S_RUN) { + /* XXX compensate for deferred handling of newstate */ + vap->iv_ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + if_start(vap->iv_ifp); + } IEEE80211_UNLOCK(ic); } @@ -1406,8 +1416,7 @@ else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) rate = tp->ucastrate; else - rate = ni->ni_rates.rs_rates[ni->ni_txrate]; - rate &= IEEE80211_RATE_VAL; + rate = ni->ni_txrate; if (wh->i_fc[1] & IEEE80211_FC1_WEP) { k = ieee80211_crypto_encap(ni, m0); @@ -1751,7 +1760,25 @@ DPRINTFN(15, ("RF R[%u] <- 0x%05x\n", reg & 0x3, val & 0xfffff)); } +/* ARGUSED */ +static struct ieee80211_node * +ural_node_alloc(struct ieee80211_node_table *nt __unused) +{ + struct ural_node *un; + + un = malloc(sizeof(struct ural_node), M_80211_NODE, M_NOWAIT | M_ZERO); + return un != NULL ? &un->ni : NULL; +} + static void +ural_newassoc(struct ieee80211_node *ni, int isnew) +{ + struct ieee80211vap *vap = ni->ni_vap; + + ieee80211_amrr_node_init(&URAL_VAP(vap)->amrr, &URAL_NODE(ni)->amn, ni); +} + +static void ural_scan_start(struct ieee80211com *ic) { struct ural_softc *sc = ic->ic_ifp->if_softc; @@ -2403,19 +2430,12 @@ { struct ieee80211vap *vap = ni->ni_vap; struct ural_vap *uvp = URAL_VAP(vap); - int i; /* clear statistic registers (STA_CSR0 to STA_CSR10) */ ural_read_multi(sc, RAL_STA_CSR0, sc->sta, sizeof sc->sta); - ieee80211_amrr_node_init(&uvp->amrr, &uvp->amn); + ieee80211_amrr_node_init(&uvp->amrr, &URAL_NODE(ni)->amn, ni); - /* set rate to some reasonable initial value */ - for (i = ni->ni_rates.rs_nrates - 1; - i > 0 && (ni->ni_rates.rs_rates[i] & IEEE80211_RATE_VAL) > 72; - i--); - ni->ni_txrate = i; - callout_reset(&uvp->amrr_ch, hz, ural_amrr_timeout, vap); } @@ -2449,6 +2469,8 @@ struct ural_vap *uvp = URAL_VAP(vap); struct ifnet *ifp = vap->iv_ic->ic_ifp; struct ural_softc *sc = ifp->if_softc; + struct ieee80211_node *ni = vap->iv_bss; + int ok, fail; if (status != USBD_NORMAL_COMPLETION) { device_printf(sc->sc_dev, "could not retrieve Tx statistics - " @@ -2456,19 +2478,15 @@ return; } - /* count TX retry-fail as Tx errors */ - ifp->if_oerrors += sc->sta[9]; + ok = sc->sta[7] + /* TX ok w/o retry */ + sc->sta[8]; /* TX ok w/ retry */ + fail = sc->sta[9]; /* TX retry-fail count */ - uvp->amn.amn_retrycnt = - sc->sta[7] + /* TX one-retry ok count */ - sc->sta[8] + /* TX more-retry ok count */ - sc->sta[9]; /* TX retry-fail count */ + ieee80211_amrr_tx_update(&URAL_NODE(ni)->amn, + ok+fail, ok, sc->sta[8] + fail); + (void) ieee80211_amrr_choose(ni, &URAL_NODE(ni)->amn); - uvp->amn.amn_txcnt = - uvp->amn.amn_retrycnt + - sc->sta[6]; /* TX no-retry ok count */ - - ieee80211_amrr_choose(&uvp->amrr, vap->iv_bss, &uvp->amn); + ifp->if_oerrors += fail; /* count TX retry-fail as Tx errors */ callout_reset(&uvp->amrr_ch, hz, ural_amrr_timeout, vap); } ==== //depot/projects/vap/sys/dev/usb/if_uralvar.h#8 (text+ko) ==== @@ -74,11 +74,16 @@ struct mbuf *m; }; +struct ural_node { + struct ieee80211_node ni; + struct ieee80211_amrr_node amn; +}; +#define URAL_NODE(ni) ((struct ural_node *)(ni)) + struct ural_vap { struct ieee80211vap vap; struct ieee80211_beacon_offsets bo; struct ieee80211_amrr amrr; - struct ieee80211_amrr_node amn; struct callout amrr_ch; int (*newstate)(struct ieee80211vap *, From owner-p4-projects@FreeBSD.ORG Fri Mar 14 05:31:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C45E1065675; Fri, 14 Mar 2008 05:31:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B5981065673 for ; Fri, 14 Mar 2008 05:31:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 085818FC13 for ; Fri, 14 Mar 2008 05:31:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E5VJB0096973 for ; Fri, 14 Mar 2008 05:31:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E5VJDM096971 for perforce@freebsd.org; Fri, 14 Mar 2008 05:31:19 GMT (envelope-from sam@freebsd.org) Date: Fri, 14 Mar 2008 05:31:19 GMT Message-Id: <200803140531.m2E5VJDM096971@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 137688 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, 14 Mar 2008 05:31:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=137688 Change 137688 by sam@sam_ebb on 2008/03/14 05:30:19 o reorder code in detach to avoid teardown races o track amrr changes o fix scanning so scan stop restores the previous bssid w/o touching the bss node as that may change concurrently o replace callout thread for amrr work by inline calls to ieee80211_amrr_choose on xmit o replace IFQ_POLL/IFQ_DEQUEUE by deq/prepend on q full; this is not right but makes the driver consistent with the other usb drivers so we can fix 'em all at once Affected files ... .. //depot/projects/vap/sys/dev/usb/if_zyd.c#10 edit .. //depot/projects/vap/sys/dev/usb/if_zydreg.h#6 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_zyd.c#10 (text+ko) ==== @@ -65,10 +65,7 @@ #include #include -#ifdef USB_DEBUG #define ZYD_DEBUG -#endif - #ifdef ZYD_DEBUG #define DPRINTF(x) do { if (zyddebug > 0) printf x; } while (0) #define DPRINTFN(n, x) do { if (zyddebug > (n)) printf x; } while (0) @@ -228,8 +225,6 @@ static void zyd_init(void *); static void zyd_stop(struct zyd_softc *, int); static int zyd_loadfirmware(struct zyd_softc *, u_char *, size_t); -static void zyd_iter_func(void *, struct ieee80211_node *); -static void zyd_amrr_timeout(void *); static void zyd_newassoc(struct ieee80211_node *, int); static void zyd_scantask(void *); static void zyd_scan_start(struct ieee80211com *); @@ -384,6 +379,8 @@ sc->fw_rev >> 8, sc->fw_rev & 0xff, zyd_rf_name(sc->rf_rev), sc->pa_rev, ether_sprintf(ic->ic_myaddr)); + IEEE80211_ADDR_COPY(sc->sc_bssid, ic->ic_myaddr); + ic->ic_ifp = ifp; ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ ic->ic_opmode = IEEE80211_M_STA; @@ -451,16 +448,16 @@ ifp->if_flags &= ~IFF_UP; zyd_stop(sc, 1); + bpfdetach(ifp); + ieee80211_ifdetach(ic); + usb_rem_task(sc->sc_udev, &sc->sc_scantask); usb_rem_task(sc->sc_udev, &sc->sc_task); callout_stop(&sc->sc_watchdog_ch); zyd_close_pipes(sc); - bpfdetach(ifp); - ieee80211_ifdetach(ic); if_free(ifp); - mtx_destroy(&sc->sc_mtx); usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev); @@ -492,10 +489,10 @@ zvp->newstate = vap->iv_newstate; vap->iv_newstate = zyd_newstate; - callout_init(&zvp->amrr_ch, 0); ieee80211_amrr_init(&zvp->amrr, vap, IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD, - IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD); + IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD, + 1000 /* 1 sec */); /* complete setup */ ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); @@ -508,7 +505,7 @@ { struct zyd_vap *zvp = ZYD_VAP(vap); - callout_stop(&zvp->amrr_ch); + ieee80211_amrr_cleanup(&zvp->amrr); ieee80211_vap_detach(vap); free(zvp, M_80211_VAP); } @@ -719,7 +716,6 @@ case IEEE80211_S_RUN: { struct ieee80211_node *ni = vap->iv_bss; - const struct ieee80211_txparam *tp; zyd_set_chan(sc, ic->ic_curchan); @@ -730,19 +726,14 @@ /* make data LED blink upon Tx */ zyd_write32(sc, sc->fwbase + ZYD_FW_LINK_STATUS, 1); - zyd_set_bssid(sc, ni->ni_bssid); + IEEE80211_ADDR_COPY(sc->sc_bssid, ni->ni_bssid); + zyd_set_bssid(sc, sc->sc_bssid); } if (vap->iv_opmode == IEEE80211_M_STA) { /* fake a join to init the tx rate */ zyd_newassoc(ni, 1); } - - /* start automatic rate control timer */ - tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; - if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE) - callout_reset(&zvp->amrr_ch, hz, zyd_amrr_timeout, vap); - break; } default: @@ -751,6 +742,11 @@ IEEE80211_LOCK(ic); /*XXX*/ zvp->newstate(vap, sc->sc_state, sc->sc_arg); + if (sc->sc_state == IEEE80211_S_RUN) { + /* XXX compensate for deferred handling of newstate */ + vap->iv_ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + if_start(vap->iv_ifp); + } IEEE80211_UNLOCK(ic); } @@ -762,7 +758,6 @@ struct zyd_softc *sc = ic->ic_ifp->if_softc; usb_rem_task(sc->sc_udev, &sc->sc_task); - callout_stop(&zvp->amrr_ch); /* do it in a process context */ sc->sc_state = nstate; @@ -1902,7 +1897,8 @@ */ ni = ieee80211_find_txnode(vap, retry->macaddr); if (ni != NULL) { - ZYD_NODE(ni)->amn.amn_retrycnt++; + ieee80211_amrr_tx_complete(&ZYD_NODE(ni)->amn, + IEEE80211_AMRR_FAILURE, 1); ieee80211_free_node(ni); } if (le16toh(retry->count) & 0x100) @@ -2230,7 +2226,8 @@ ni = data->ni; /* update rate control statistics */ - ZYD_NODE(ni)->amn.amn_txcnt++; + ieee80211_amrr_tx_complete(&ZYD_NODE(ni)->amn, + IEEE80211_AMRR_SUCCESS, 0); /* * Do any tx complete callback. Note this must @@ -2278,11 +2275,12 @@ if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { rate = tp->mcastrate; desc->flags |= ZYD_TX_FLAG_MULTICAST; - } else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) + } else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) { rate = tp->ucastrate; - else - rate = ni->ni_rates.rs_rates[ni->ni_txrate]; - rate &= IEEE80211_RATE_VAL; + } else { + (void) ieee80211_amrr_choose(ni, &ZYD_NODE(ni)->amn); + rate = ni->ni_txrate; + } if (wh->i_fc[1] & IEEE80211_FC1_WEP) { k = ieee80211_crypto_encap(ni, m0); @@ -2385,14 +2383,14 @@ struct mbuf *m; for (;;) { - IFQ_POLL(&ifp->if_snd, m); + IFQ_DRV_DEQUEUE(&ifp->if_snd, m); if (m == NULL) break; if (sc->tx_queued >= ZYD_TX_LIST_CNT) { + IFQ_DRV_PREPEND(&ifp->if_snd, m); ifp->if_drv_flags |= IFF_DRV_OACTIVE; break; } - IFQ_DEQUEUE(&ifp->if_snd, m); ni = (struct ieee80211_node *)m->m_pkthdr.rcvif; m = ieee80211_encap(ni, m); if (m == NULL) { @@ -2686,44 +2684,11 @@ } static void -zyd_iter_func(void *arg, struct ieee80211_node *ni) -{ - struct ieee80211vap *vap = ni->ni_vap; - struct zyd_node *zn = (struct zyd_node *)ni; - - ieee80211_amrr_choose(&ZYD_VAP(vap)->amrr, ni, &zn->amn); -} - -static void -zyd_amrr_timeout(void *arg) -{ - struct ieee80211vap *vap = arg; - struct ieee80211com *ic = vap->iv_ic; - struct zyd_softc *sc = ic->ic_ifp->if_softc; - - ZYD_LOCK(sc); - if (vap->iv_opmode == IEEE80211_M_STA) - zyd_iter_func(sc, vap->iv_bss); - else - ieee80211_iterate_nodes(&ic->ic_sta, zyd_iter_func, sc); - ZYD_UNLOCK(sc); - - callout_reset(&ZYD_VAP(vap)->amrr_ch, hz, zyd_amrr_timeout, vap); -} - -static void zyd_newassoc(struct ieee80211_node *ni, int isnew) { struct ieee80211vap *vap = ni->ni_vap; - int i; - ieee80211_amrr_node_init(&ZYD_VAP(vap)->amrr, &ZYD_NODE(ni)->amn); - - /* set rate to some reasonable initial value */ - for (i = ni->ni_rates.rs_nrates - 1; - i > 0 && (ni->ni_rates.rs_rates[i] & IEEE80211_RATE_VAL) > 72; - i--); - ni->ni_txrate = i; + ieee80211_amrr_node_init(&ZYD_VAP(vap)->amrr, &ZYD_NODE(ni)->amn, ni); } static void @@ -2767,18 +2732,19 @@ { struct zyd_softc *sc = arg; struct ieee80211com *ic = &sc->sc_ic; - struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); struct ifnet *ifp = ic->ic_ifp; ZYD_LOCK(sc); switch (sc->sc_scan_action) { case ZYD_SCAN_START: + /* want broadcast address while scanning */ zyd_set_bssid(sc, ifp->if_broadcastaddr); break; case ZYD_SCAN_END: - zyd_set_bssid(sc, vap->iv_bss->ni_bssid); + /* restore previous bssid */ + zyd_set_bssid(sc, sc->sc_bssid); break; case ZYD_SET_CHANNEL: ==== //depot/projects/vap/sys/dev/usb/if_zydreg.h#6 (text+ko) ==== @@ -1200,7 +1200,7 @@ int sc_flags; int sc_if_flags; #define ZD1211_FWLOADED (1 << 0) - + uint8_t sc_bssid[IEEE80211_ADDR_LEN]; enum ieee80211_state sc_state; int sc_arg; From owner-p4-projects@FreeBSD.ORG Fri Mar 14 05:33:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 525651065673; Fri, 14 Mar 2008 05:33:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11E52106566B for ; Fri, 14 Mar 2008 05:33:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F39C98FC14 for ; Fri, 14 Mar 2008 05:33:21 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E5XLmj097051 for ; Fri, 14 Mar 2008 05:33:21 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E5XLQI097049 for perforce@freebsd.org; Fri, 14 Mar 2008 05:33:21 GMT (envelope-from sam@freebsd.org) Date: Fri, 14 Mar 2008 05:33:21 GMT Message-Id: <200803140533.m2E5XLQI097049@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 137689 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, 14 Mar 2008 05:33:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=137689 Change 137689 by sam@sam_ebb on 2008/03/14 05:33:17 o track amrr changes o replace amrr update work from callout with inline rate choosing to avoid races o with amrr updates no longer done from a callout the only left in the callout is the calibration work so set the callout interval to 60 seconds and eliminate the counter o purge some dead obsd code Affected files ... .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#10 edit Differences ... ==== //depot/projects/vap/sys/dev/wpi/if_wpi.c#10 (text+ko) ==== @@ -226,7 +226,6 @@ static void wpi_init_locked(struct wpi_softc *, int); static void wpi_stop(struct wpi_softc *); static void wpi_stop_locked(struct wpi_softc *); -static void wpi_iter_func(void *, struct ieee80211_node *); static void wpi_newassoc(struct ieee80211_node *, int); static int wpi_set_txpower(struct wpi_softc *, struct ieee80211_channel *, @@ -784,7 +783,8 @@ ieee80211_amrr_init(&wvp->amrr, vap, IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD, - IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD); + IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD, + 500 /*ms*/); /* complete setup */ ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); @@ -797,6 +797,7 @@ { struct wpi_vap *wvp = WPI_VAP(vap); + ieee80211_amrr_cleanup(&wvp->amrr); ieee80211_vap_detach(vap); free(wvp, M_80211_VAP); } @@ -1884,8 +1885,8 @@ } else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) { rate = tp->ucastrate; } else { - rate = ni->ni_rates.rs_rates[ni->ni_txrate]; - rate &= IEEE80211_RATE_VAL; + (void) ieee80211_amrr_choose(ni, &WPI_NODE(ni)->amn); + rate = ni->ni_txrate; } tx->rate = wpi_plcp_signal(rate); @@ -2448,7 +2449,7 @@ wpi_set_led(sc, WPI_LED_LINK, 0, 1); /* start automatic rate control timer */ - callout_reset(&sc->calib_to, hz/2, wpi_calib_timeout, sc); + callout_reset(&sc->calib_to, 60*hz, wpi_calib_timeout, sc); return (error); } @@ -3144,62 +3145,27 @@ } static void -wpi_iter_func(void *arg, struct ieee80211_node *ni) -{ - struct ieee80211vap *vap = ni->ni_vap; - struct wpi_vap *wvp = WPI_VAP(vap); - - ieee80211_amrr_choose(&wvp->amrr, ni, &WPI_NODE(ni)->amn); -} - -static void wpi_newassoc(struct ieee80211_node *ni, int isnew) { struct ieee80211vap *vap = ni->ni_vap; struct wpi_vap *wvp = WPI_VAP(vap); - int i; - ieee80211_amrr_node_init(&wvp->amrr, &WPI_NODE(ni)->amn); - - for (i = ni->ni_rates.rs_nrates - 1; - i > 0 && (ni->ni_rates.rs_rates[i] & IEEE80211_RATE_VAL) > 72; - i--); - ni->ni_txrate = i; + ieee80211_amrr_node_init(&wvp->amrr, &WPI_NODE(ni)->amn, ni); } static void wpi_calib_timeout(void *arg) { struct wpi_softc *sc = arg; - struct ieee80211com *ic = &sc->sc_ic; - struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); - const struct ieee80211_txparam *tp; int temp; - /* automatic rate control triggered every 500ms */ - tp = &vap->iv_txparms[ieee80211_chan2mode(vap->iv_bss->ni_chan)]; - if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE) { - if (vap->iv_opmode == IEEE80211_M_STA) - wpi_iter_func(sc, vap->iv_bss); - else - ieee80211_iterate_nodes(&ic->ic_sta, wpi_iter_func, sc); - } - /* update sensor data */ temp = (int)WPI_READ(sc, WPI_TEMPERATURE); DPRINTFN(WPI_DEBUG_TEMP,("Temp in calibration is: %d\n", temp)); -#if 0 - //XXX Used by OpenBSD Sensor Framework - sc->sensor.value = temp + 260; -#endif - /* automatic power calibration every 60s */ - if (++sc->calib_cnt >= 120) { - wpi_power_calibration(sc, temp); - sc->calib_cnt = 0; - } + wpi_power_calibration(sc, temp); - callout_reset(&sc->calib_to, hz/2, wpi_calib_timeout, sc); + callout_reset(&sc->calib_to, 60*hz, wpi_calib_timeout, sc); } /* From owner-p4-projects@FreeBSD.ORG Fri Mar 14 05:35:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C0141065672; Fri, 14 Mar 2008 05:35:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D51DF1065670 for ; Fri, 14 Mar 2008 05:35:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C34178FC19 for ; Fri, 14 Mar 2008 05:35:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E5ZObL097155 for ; Fri, 14 Mar 2008 05:35:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E5ZOaA097153 for perforce@freebsd.org; Fri, 14 Mar 2008 05:35:24 GMT (envelope-from sam@freebsd.org) Date: Fri, 14 Mar 2008 05:35:24 GMT Message-Id: <200803140535.m2E5ZOaA097153@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 137690 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, 14 Mar 2008 05:35:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=137690 Change 137690 by sam@sam_ebb on 2008/03/14 05:34:39 o track amrr changes o replace callout thread to update amrr state by inline calls to ieee80211_amrr_choose Affected files ... .. //depot/projects/vap/sys/dev/bwi/if_bwi.c#5 edit .. //depot/projects/vap/sys/dev/bwi/if_bwivar.h#3 edit Differences ... ==== //depot/projects/vap/sys/dev/bwi/if_bwi.c#5 (text+ko) ==== @@ -113,7 +113,6 @@ static void bwi_updateslot(struct ifnet *); static struct ieee80211_node *bwi_node_alloc(struct ieee80211_node_table *); static void bwi_newassoc(struct ieee80211_node *, int); -static void bwi_amrr_timeout(void *); static int bwi_media_change(struct ifnet *); static void bwi_calibrate(void *); @@ -600,7 +599,6 @@ const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t mac[IEEE80211_ADDR_LEN]) { - struct bwi_softc *sc = ic->ic_ifp->if_softc; struct bwi_vap *bvp; struct ieee80211vap *vap; @@ -621,10 +619,10 @@ #if 0 vap->iv_update_beacon = bwi_beacon_update; #endif - callout_init_mtx(&bvp->bv_amrr_ch, &sc->sc_mtx, 0); ieee80211_amrr_init(&bvp->bv_amrr, vap, IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD, - IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD); + IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD, + 500 /*ms*/); /* complete setup */ ieee80211_vap_attach(vap, bwi_media_change, ieee80211_media_status); @@ -637,7 +635,7 @@ { struct bwi_vap *bvp = BWI_VAP(vap); - callout_drain(&bvp->bv_amrr_ch); + ieee80211_amrr_cleanup(&bvp->bv_amrr); ieee80211_vap_detach(vap); free(bvp, M_80211_VAP); } @@ -1749,14 +1747,12 @@ struct bwi_vap *bvp = BWI_VAP(vap); struct ifnet *ifp = vap->iv_ic->ic_ifp; struct bwi_softc *sc = ifp->if_softc; - const struct ieee80211_txparam *tp; struct bwi_mac *mac; struct ieee80211_node *ni; int error; BWI_LOCK(sc); - callout_stop(&bvp->bv_amrr_ch); callout_stop(&sc->sc_calib_ch); if (nstate == IEEE80211_S_INIT) @@ -1791,12 +1787,6 @@ bwi_newassoc(ni, 1); } - /* start automatic rate control timer */ - tp = &vap->iv_txparms[ieee80211_chan2mode(ni->ni_chan)]; - if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE) - callout_reset(&bvp->bv_amrr_ch, hz / 2, - bwi_amrr_timeout, vap); - callout_reset(&sc->sc_calib_ch, hz, bwi_calibrate, sc); } else { bwi_set_bssid(sc, bwi_zero_addr); @@ -1821,41 +1811,11 @@ bwi_newassoc(struct ieee80211_node *ni, int isnew) { struct ieee80211vap *vap = ni->ni_vap; - int i; - ieee80211_amrr_node_init(&BWI_VAP(vap)->bv_amrr, &BWI_NODE(ni)->amn); - - /* set rate to some reasonable initial value */ - for (i = ni->ni_rates.rs_nrates - 1; - i > 0 && (ni->ni_rates.rs_rates[i] & IEEE80211_RATE_VAL) > 72; - i--); - ni->ni_txrate = i; -} - -static void -bwi_iter_func(void *arg, struct ieee80211_node *ni) -{ - struct ieee80211vap *vap = arg; - struct bwi_node *bn = BWI_NODE(ni); - - ieee80211_amrr_choose(&BWI_VAP(vap)->bv_amrr, ni, &bn->amn); + ieee80211_amrr_node_init(&BWI_VAP(vap)->bv_amrr, + &BWI_NODE(ni)->amn, ni); } -static void -bwi_amrr_timeout(void *arg) -{ - struct ieee80211vap *vap = arg; - struct ieee80211com *ic = vap->iv_ic; - - BWI_ASSERT_LOCKED(sc); - - if (vap->iv_opmode == IEEE80211_M_STA) - bwi_iter_func(vap, vap->iv_bss); - else - ieee80211_iterate_nodes(&ic->ic_sta, bwi_iter_func, vap); - callout_reset(&BWI_VAP(vap)->bv_amrr_ch, hz / 2, bwi_amrr_timeout, vap); -} - static int bwi_media_change(struct ifnet *ifp) { @@ -3039,14 +2999,14 @@ else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) rate = rate_fb = tp->ucastrate; else { - rate = ni->ni_rates.rs_rates[ni->ni_txrate] & - IEEE80211_RATE_VAL; - tb->tb_rate_idx[0] = ni->ni_txrate; + tb->tb_rate_idx[0] = + ieee80211_amrr_choose(ni, &BWI_NODE(ni)->amn); + rate = ni->ni_txrate; - if (ni->ni_txrate > 0) { - rate_fb = ni->ni_rates.rs_rates[ni->ni_txrate - 1] & + if (tb->tb_rate_idx[0] > 0) { + tb->tb_rate_idx[1] = tb->tb_rate_idx[0] - 1; + rate_fb = ni->ni_rates.rs_rates[tb->tb_rate_idx[1]] & IEEE80211_RATE_VAL; - tb->tb_rate_idx[1] = ni->ni_txrate - 1; } else { rate_fb = rate; tb->tb_rate_idx[1] = tb->tb_rate_idx[0]; @@ -3424,12 +3384,11 @@ /* NB: update rate control only for unicast frames */ if (hdr->txh_mac_ctrl & htole32(BWI_TXH_MAC_C_ACK)) { /* Feed back 'acked and data_txcnt' */ - if (acked && + ieee80211_amrr_tx_complete(&bn->amn, + (acked && (data_txcnt <= BWI_SHRETRY_FB || - tb->tb_rate_idx[0] == tb->tb_rate_idx[1])) - bn->amn.amn_success++; - bn->amn.amn_txcnt++; - bn->amn.amn_retrycnt += data_txcnt-1; + tb->tb_rate_idx[0] == tb->tb_rate_idx[1])), + data_txcnt-1); } /* ==== //depot/projects/vap/sys/dev/bwi/if_bwivar.h#3 (text+ko) ==== @@ -539,7 +539,6 @@ struct bwi_vap { struct ieee80211vap bv_vap; struct ieee80211_amrr bv_amrr; - struct callout bv_amrr_ch; int (*bv_newstate)(struct ieee80211vap *, enum ieee80211_state, int); }; From owner-p4-projects@FreeBSD.ORG Fri Mar 14 11:14:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6F29106567A; Fri, 14 Mar 2008 11:14:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74C0E1065675 for ; Fri, 14 Mar 2008 11:14:48 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6FAE58FC1E for ; Fri, 14 Mar 2008 11:14:48 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2EBEmYo041137 for ; Fri, 14 Mar 2008 11:14:48 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2EBEmaF041135 for perforce@freebsd.org; Fri, 14 Mar 2008 11:14:48 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 14 Mar 2008 11:14:48 GMT Message-Id: <200803141114.m2EBEmaF041135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 137705 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, 14 Mar 2008 11:14:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=137705 Change 137705 by gonzo@gonzo_jeeves on 2008/03/14 11:14:41 o MALTA should use SOFTFLOAT Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/std.malta#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/std.malta#4 (text+ko) ==== @@ -3,6 +3,7 @@ cpu CPU_MIPS4KC options ISA_MIPS32 +options SOFTFLOAT device pci device ata device atadisk From owner-p4-projects@FreeBSD.ORG Fri Mar 14 14:04:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 420841065673; Fri, 14 Mar 2008 14:04:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01E1D1065671 for ; Fri, 14 Mar 2008 14:04:59 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F27578FC14 for ; Fri, 14 Mar 2008 14:04:58 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2EE4wTj061332 for ; Fri, 14 Mar 2008 14:04:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2EE4wEm061330 for perforce@freebsd.org; Fri, 14 Mar 2008 14:04:58 GMT (envelope-from imp@freebsd.org) Date: Fri, 14 Mar 2008 14:04:58 GMT Message-Id: <200803141404.m2EE4wEm061330@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 137713 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, 14 Mar 2008 14:04:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=137713 Change 137713 by imp@imp_lighthouse on 2008/03/14 14:04:30 Tweaks to get this building until we can do a proper merge/review of what's going on. cross endian builds seem to be failing in libmagic. Plus a silly tweak for a program that should be there. Must investigate why. Affected files ... .. //depot/projects/arm/src/lib/Makefile#12 edit .. //depot/projects/arm/src/sbin/Makefile#10 edit .. //depot/projects/arm/src/usr.bin/Makefile#10 edit Differences ... ==== //depot/projects/arm/src/lib/Makefile#12 (text+ko) ==== @@ -32,7 +32,7 @@ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libexpat libfetch libftpio libgeom ${_libgpib} \ ${_libgssapi} libipsec \ - ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ + ${_libipx} libkiconv libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ libpmc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ==== //depot/projects/arm/src/sbin/Makefile#10 (text+ko) ==== @@ -108,7 +108,7 @@ _pfctl= pfctl _pflogd= pflogd .endif - +_pflogd= .if ${MK_INET6} != "no" _ping6= ping6 _rtsol= rtsol ==== //depot/projects/arm/src/usr.bin/Makefile#10 (text+ko) ==== @@ -59,7 +59,6 @@ expand \ false \ fetch \ - file \ file2c \ find \ finger \ From owner-p4-projects@FreeBSD.ORG Fri Mar 14 18:39:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FC111065672; Fri, 14 Mar 2008 18:39:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E9F01065670 for ; Fri, 14 Mar 2008 18:39:46 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2E3CF8FC14 for ; Fri, 14 Mar 2008 18:39:46 +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.14.1/8.14.1) with ESMTP id m2EIdkOS015571 for ; Fri, 14 Mar 2008 18:39:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2EIdjKr015569 for perforce@freebsd.org; Fri, 14 Mar 2008 18:39:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Mar 2008 18:39:45 GMT Message-Id: <200803141839.m2EIdjKr015569@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 137734 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, 14 Mar 2008 18:39:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=137734 Change 137734 by rwatson@rwatson_cinnamon on 2008/03/14 18:39:45 Integrate zero-copy BPF branch. Affected files ... .. //depot/projects/zcopybpf/src/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/legacy.c#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/nexus.c#6 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/nexusvar.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/specialreg.h#7 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_sysvec.c#6 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/trap.c#6 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/AVILA#7 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/powerpc/uboot/metadata.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/uboot/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/api_public.h#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/module.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_proto.h#8 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/syscalls.master#8 integrate .. //depot/projects/zcopybpf/src/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/files#21 integrate .. //depot/projects/zcopybpf/src/sys/conf/options#16 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi.c#11 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/zcopybpf/src/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/if_mxge.c#12 integrate .. //depot/projects/zcopybpf/src/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ehci_pci.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ums.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usb_quirks.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/zcopybpf/src/sys/dev/wpi/if_wpi.c#7 integrate .. //depot/projects/zcopybpf/src/sys/fs/fifofs/fifo_vnops.c#10 integrate .. //depot/projects/zcopybpf/src/sys/fs/procfs/procfs_ctl.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/procfs/procfs_dbregs.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/procfs/procfs_status.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/acpica/acpi_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/DEFAULTS#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/legacy.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/nexus.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/sys_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/trap.c#7 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/vm_machdep.c#7 integrate .. //depot/projects/zcopybpf/src/sys/i386/ibcs2/imgact_coff.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/nexusvar.h#1 branch .. //depot/projects/zcopybpf/src/sys/i386/include/specialreg.h#6 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/conf/DEFAULTS#5 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/nexus.c#5 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/trap.c#5 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/imgact_elf.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/init_sysent.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_clock.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_condvar.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_exec.c#11 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_fork.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_intr.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_kse.c#8 delete .. //depot/projects/zcopybpf/src/sys/kern/kern_proc.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_resource.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sig.c#11 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_switch.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sx.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_synch.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_thread.c#11 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_timeout.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/p1003_1b.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_4bsd.c#11 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_ule.c#17 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_trap.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_witness.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_process.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/syscalls.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/syscalls.master#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/systrace_args.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_socket.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_ipsec.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/libalias/alias_old.c#2 delete .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_ipsec.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_ipsec.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_output.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/ipsec_output.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/key.c#4 integrate .. //depot/projects/zcopybpf/src/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/zcopybpf/src/sys/pc98/include/nexusvar.h#1 branch .. //depot/projects/zcopybpf/src/sys/pc98/pc98/machdep.c#9 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/conf/DEFAULTS#4 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/bootinfo.h#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/intr_machdep.c#7 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/conf/DEFAULTS#4 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/trap.c#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/condvar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/cpuset.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/disklabel.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/kse.h#2 delete .. //depot/projects/zcopybpf/src/sys/sys/param.h#15 integrate .. //depot/projects/zcopybpf/src/sys/sys/proc.h#13 integrate .. //depot/projects/zcopybpf/src/sys/sys/sched.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/sleepqueue.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/syscall.h#7 integrate .. //depot/projects/zcopybpf/src/sys/sys/syscall.mk#7 integrate .. //depot/projects/zcopybpf/src/sys/sys/sysproto.h#7 integrate .. //depot/projects/zcopybpf/src/sys/sys/systm.h#8 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_softdep.c#12 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_glue.c#5 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_map.c#10 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_meter.c#4 integrate Differences ... ==== //depot/projects/zcopybpf/src/sys/amd64/acpica/acpi_machdep.c#2 (text+ko) ==== @@ -25,14 +25,18 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.17 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.18 2008/03/13 20:39:02 jhb Exp $"); #include #include +#include +#include #include #include +#include + static int intr_model = ACPI_INTR_PIC; int @@ -67,3 +71,43 @@ { __asm __volatile("sti; hlt"); } + +/* + * ACPI nexus(4) driver. + */ +static int +nexus_acpi_probe(device_t dev) +{ + int error; + + error = acpi_identify(); + if (error) + return (error); + + return (BUS_PROBE_DEFAULT); +} + +static int +nexus_acpi_attach(device_t dev) +{ + + nexus_init_resources(); + bus_generic_probe(dev); + if (BUS_ADD_CHILD(dev, 10, "acpi", 0) == NULL) + panic("failed to add acpi0 device"); + + return (bus_generic_attach(dev)); +} + +static device_method_t nexus_acpi_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, nexus_acpi_probe), + DEVMETHOD(device_attach, nexus_acpi_attach), + + { 0, 0 } +}; + +DEFINE_CLASS_1(nexus, nexus_acpi_driver, nexus_acpi_methods, 1, nexus_driver); +static devclass_t nexus_devclass; + +DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, nexus_devclass, 0, 0); ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/amd64_mem.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.25 2004/08/07 06:21:37 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.29 2008/03/12 22:09:19 jhb Exp $"); #include #include @@ -47,31 +47,31 @@ static char *mem_owner_bios = "BIOS"; -#define MR686_FIXMTRR (1<<0) +#define MR686_FIXMTRR (1<<0) -#define mrwithin(mr, a) \ - (((a) >= (mr)->mr_base) && ((a) < ((mr)->mr_base + (mr)->mr_len))) -#define mroverlap(mra, mrb) \ - (mrwithin(mra, mrb->mr_base) || mrwithin(mrb, mra->mr_base)) +#define mrwithin(mr, a) \ + (((a) >= (mr)->mr_base) && ((a) < ((mr)->mr_base + (mr)->mr_len))) +#define mroverlap(mra, mrb) \ + (mrwithin(mra, mrb->mr_base) || mrwithin(mrb, mra->mr_base)) -#define mrvalid(base, len) \ - ((!(base & ((1 << 12) - 1))) && /* base is multiple of 4k */ \ - ((len) >= (1 << 12)) && /* length is >= 4k */ \ - powerof2((len)) && /* ... and power of two */ \ - !((base) & ((len) - 1))) /* range is not discontiuous */ +#define mrvalid(base, len) \ + ((!(base & ((1 << 12) - 1))) && /* base is multiple of 4k */ \ + ((len) >= (1 << 12)) && /* length is >= 4k */ \ + powerof2((len)) && /* ... and power of two */ \ + !((base) & ((len) - 1))) /* range is not discontiuous */ -#define mrcopyflags(curr, new) (((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK)) +#define mrcopyflags(curr, new) \ + (((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK)) -static int mtrrs_disabled; +static int mtrrs_disabled; TUNABLE_INT("machdep.disable_mtrrs", &mtrrs_disabled); SYSCTL_INT(_machdep, OID_AUTO, disable_mtrrs, CTLFLAG_RDTUN, - &mtrrs_disabled, 0, "Disable amd64 MTRRs."); + &mtrrs_disabled, 0, "Disable amd64 MTRRs."); -static void amd64_mrinit(struct mem_range_softc *sc); -static int amd64_mrset(struct mem_range_softc *sc, - struct mem_range_desc *mrd, - int *arg); -static void amd64_mrAPinit(struct mem_range_softc *sc); +static void amd64_mrinit(struct mem_range_softc *sc); +static int amd64_mrset(struct mem_range_softc *sc, + struct mem_range_desc *mrd, int *arg); +static void amd64_mrAPinit(struct mem_range_softc *sc); static struct mem_range_ops amd64_mrops = { amd64_mrinit, @@ -80,157 +80,159 @@ }; /* XXX for AP startup hook */ -static u_int64_t mtrrcap, mtrrdef; +static u_int64_t mtrrcap, mtrrdef; + +/* The bitmask for the PhysBase and PhysMask fields of the variable MTRRs. */ +static u_int64_t mtrr_physmask; -static struct mem_range_desc *mem_range_match(struct mem_range_softc *sc, - struct mem_range_desc *mrd); -static void amd64_mrfetch(struct mem_range_softc *sc); -static int amd64_mtrrtype(int flags); -static int amd64_mrt2mtrr(int flags, int oldval); -static int amd64_mtrrconflict(int flag1, int flag2); -static void amd64_mrstore(struct mem_range_softc *sc); -static void amd64_mrstoreone(void *arg); -static struct mem_range_desc *amd64_mtrrfixsearch(struct mem_range_softc *sc, - u_int64_t addr); -static int amd64_mrsetlow(struct mem_range_softc *sc, - struct mem_range_desc *mrd, - int *arg); -static int amd64_mrsetvariable(struct mem_range_softc *sc, - struct mem_range_desc *mrd, - int *arg); +static struct mem_range_desc *mem_range_match(struct mem_range_softc *sc, + struct mem_range_desc *mrd); +static void amd64_mrfetch(struct mem_range_softc *sc); +static int amd64_mtrrtype(int flags); +static int amd64_mrt2mtrr(int flags, int oldval); +static int amd64_mtrrconflict(int flag1, int flag2); +static void amd64_mrstore(struct mem_range_softc *sc); +static void amd64_mrstoreone(void *arg); +static struct mem_range_desc *amd64_mtrrfixsearch(struct mem_range_softc *sc, + u_int64_t addr); +static int amd64_mrsetlow(struct mem_range_softc *sc, + struct mem_range_desc *mrd, int *arg); +static int amd64_mrsetvariable(struct mem_range_softc *sc, + struct mem_range_desc *mrd, int *arg); /* amd64 MTRR type to memory range type conversion */ static int amd64_mtrrtomrt[] = { - MDF_UNCACHEABLE, - MDF_WRITECOMBINE, - MDF_UNKNOWN, - MDF_UNKNOWN, - MDF_WRITETHROUGH, - MDF_WRITEPROTECT, - MDF_WRITEBACK + MDF_UNCACHEABLE, + MDF_WRITECOMBINE, + MDF_UNKNOWN, + MDF_UNKNOWN, + MDF_WRITETHROUGH, + MDF_WRITEPROTECT, + MDF_WRITEBACK }; -#define MTRRTOMRTLEN (sizeof(amd64_mtrrtomrt) / sizeof(amd64_mtrrtomrt[0])) - -/* - * Used in /dev/mem drivers and elsewhere - */ -MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); +#define MTRRTOMRTLEN (sizeof(amd64_mtrrtomrt) / sizeof(amd64_mtrrtomrt[0])) static int amd64_mtrr2mrt(int val) { + if (val < 0 || val >= MTRRTOMRTLEN) - return MDF_UNKNOWN; - return amd64_mtrrtomrt[val]; + return (MDF_UNKNOWN); + return (amd64_mtrrtomrt[val]); } -/* +/* * amd64 MTRR conflicts. Writeback and uncachable may overlap. */ static int amd64_mtrrconflict(int flag1, int flag2) { + flag1 &= MDF_ATTRMASK; flag2 &= MDF_ATTRMASK; if ((flag1 & MDF_UNKNOWN) || (flag2 & MDF_UNKNOWN)) - return 1; + return (1); if (flag1 == flag2 || (flag1 == MDF_WRITEBACK && flag2 == MDF_UNCACHEABLE) || (flag2 == MDF_WRITEBACK && flag1 == MDF_UNCACHEABLE)) - return 0; - return 1; + return (0); + return (1); } /* * Look for an exactly-matching range. */ static struct mem_range_desc * -mem_range_match(struct mem_range_softc *sc, struct mem_range_desc *mrd) +mem_range_match(struct mem_range_softc *sc, struct mem_range_desc *mrd) { - struct mem_range_desc *cand; - int i; - - for (i = 0, cand = sc->mr_desc; i < sc->mr_ndesc; i++, cand++) - if ((cand->mr_base == mrd->mr_base) && - (cand->mr_len == mrd->mr_len)) - return(cand); - return(NULL); + struct mem_range_desc *cand; + int i; + + for (i = 0, cand = sc->mr_desc; i < sc->mr_ndesc; i++, cand++) + if ((cand->mr_base == mrd->mr_base) && + (cand->mr_len == mrd->mr_len)) + return (cand); + return (NULL); } /* - * Fetch the current mtrr settings from the current CPU (assumed to all - * be in sync in the SMP case). Note that if we are here, we assume - * that MTRRs are enabled, and we may or may not have fixed MTRRs. + * Fetch the current mtrr settings from the current CPU (assumed to + * all be in sync in the SMP case). Note that if we are here, we + * assume that MTRRs are enabled, and we may or may not have fixed + * MTRRs. */ static void amd64_mrfetch(struct mem_range_softc *sc) { - struct mem_range_desc *mrd; - u_int64_t msrv; - int i, j, msr; + struct mem_range_desc *mrd; + u_int64_t msrv; + int i, j, msr; - mrd = sc->mr_desc; + mrd = sc->mr_desc; - /* Get fixed-range MTRRs */ - if (sc->mr_cap & MR686_FIXMTRR) { - msr = MSR_MTRR64kBase; - for (i = 0; i < (MTRR_N64K / 8); i++, msr++) { - msrv = rdmsr(msr); - for (j = 0; j < 8; j++, mrd++) { - mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | - amd64_mtrr2mrt(msrv & 0xff) | - MDF_ACTIVE; - if (mrd->mr_owner[0] == 0) - strcpy(mrd->mr_owner, mem_owner_bios); - msrv = msrv >> 8; - } + /* Get fixed-range MTRRs. */ + if (sc->mr_cap & MR686_FIXMTRR) { + msr = MSR_MTRR64kBase; + for (i = 0; i < (MTRR_N64K / 8); i++, msr++) { + msrv = rdmsr(msr); + for (j = 0; j < 8; j++, mrd++) { + mrd->mr_flags = + (mrd->mr_flags & ~MDF_ATTRMASK) | + amd64_mtrr2mrt(msrv & 0xff) | MDF_ACTIVE; + if (mrd->mr_owner[0] == 0) + strcpy(mrd->mr_owner, mem_owner_bios); + msrv = msrv >> 8; + } + } + msr = MSR_MTRR16kBase; + for (i = 0; i < (MTRR_N16K / 8); i++, msr++) { + msrv = rdmsr(msr); + for (j = 0; j < 8; j++, mrd++) { + mrd->mr_flags = + (mrd->mr_flags & ~MDF_ATTRMASK) | + amd64_mtrr2mrt(msrv & 0xff) | MDF_ACTIVE; + if (mrd->mr_owner[0] == 0) + strcpy(mrd->mr_owner, mem_owner_bios); + msrv = msrv >> 8; + } + } + msr = MSR_MTRR4kBase; + for (i = 0; i < (MTRR_N4K / 8); i++, msr++) { + msrv = rdmsr(msr); + for (j = 0; j < 8; j++, mrd++) { + mrd->mr_flags = + (mrd->mr_flags & ~MDF_ATTRMASK) | + amd64_mtrr2mrt(msrv & 0xff) | MDF_ACTIVE; + if (mrd->mr_owner[0] == 0) + strcpy(mrd->mr_owner, mem_owner_bios); + msrv = msrv >> 8; + } + } } - msr = MSR_MTRR16kBase; - for (i = 0; i < (MTRR_N16K / 8); i++, msr++) { - msrv = rdmsr(msr); - for (j = 0; j < 8; j++, mrd++) { + + /* Get remainder which must be variable MTRRs. */ + msr = MSR_MTRRVarBase; + for (; (mrd - sc->mr_desc) < sc->mr_ndesc; msr += 2, mrd++) { + msrv = rdmsr(msr); mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | - amd64_mtrr2mrt(msrv & 0xff) | - MDF_ACTIVE; - if (mrd->mr_owner[0] == 0) - strcpy(mrd->mr_owner, mem_owner_bios); - msrv = msrv >> 8; - } + amd64_mtrr2mrt(msrv & MTRR_PHYSBASE_TYPE); + mrd->mr_base = msrv & mtrr_physmask; + msrv = rdmsr(msr + 1); + mrd->mr_flags = (msrv & MTRR_PHYSMASK_VALID) ? + (mrd->mr_flags | MDF_ACTIVE) : + (mrd->mr_flags & ~MDF_ACTIVE); + + /* Compute the range from the mask. Ick. */ + mrd->mr_len = (~(msrv & mtrr_physmask) & + (mtrr_physmask | 0xfffL)) + 1; + if (!mrvalid(mrd->mr_base, mrd->mr_len)) + mrd->mr_flags |= MDF_BOGUS; + + /* If unclaimed and active, must be the BIOS. */ + if ((mrd->mr_flags & MDF_ACTIVE) && (mrd->mr_owner[0] == 0)) + strcpy(mrd->mr_owner, mem_owner_bios); } - msr = MSR_MTRR4kBase; - for (i = 0; i < (MTRR_N4K / 8); i++, msr++) { - msrv = rdmsr(msr); - for (j = 0; j < 8; j++, mrd++) { - mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | - amd64_mtrr2mrt(msrv & 0xff) | - MDF_ACTIVE; - if (mrd->mr_owner[0] == 0) - strcpy(mrd->mr_owner, mem_owner_bios); - msrv = msrv >> 8; - } - } - } - - /* Get remainder which must be variable MTRRs */ - msr = MSR_MTRRVarBase; - for (; (mrd - sc->mr_desc) < sc->mr_ndesc; msr += 2, mrd++) { - msrv = rdmsr(msr); - mrd->mr_flags = (mrd->mr_flags & ~MDF_ATTRMASK) | - amd64_mtrr2mrt(msrv & 0xff); - mrd->mr_base = msrv & 0x000000fffffff000L; - msrv = rdmsr(msr + 1); - mrd->mr_flags = (msrv & 0x800) ? - (mrd->mr_flags | MDF_ACTIVE) : - (mrd->mr_flags & ~MDF_ACTIVE); - /* Compute the range from the mask. Ick. */ - mrd->mr_len = (~(msrv & 0x000000fffffff000L) & 0x000000ffffffffffL) + 1; - if (!mrvalid(mrd->mr_base, mrd->mr_len)) - mrd->mr_flags |= MDF_BOGUS; - /* If unclaimed and active, must be the BIOS */ - if ((mrd->mr_flags & MDF_ACTIVE) && (mrd->mr_owner[0] == 0)) - strcpy(mrd->mr_owner, mem_owner_bios); - } } /* @@ -239,17 +241,17 @@ static int amd64_mtrrtype(int flags) { - int i; + int i; - flags &= MDF_ATTRMASK; + flags &= MDF_ATTRMASK; - for (i = 0; i < MTRRTOMRTLEN; i++) { - if (amd64_mtrrtomrt[i] == MDF_UNKNOWN) - continue; - if (flags == amd64_mtrrtomrt[i]) - return(i); - } - return(-1); + for (i = 0; i < MTRRTOMRTLEN; i++) { + if (amd64_mtrrtomrt[i] == MDF_UNKNOWN) + continue; + if (flags == amd64_mtrrtomrt[i]) + return (i); + } + return (-1); } static int @@ -258,8 +260,8 @@ int val; if ((val = amd64_mtrrtype(flags)) == -1) - return oldval & 0xff; - return val & 0xff; + return (oldval & 0xff); + return (val & 0xff); } /* @@ -272,105 +274,124 @@ amd64_mrstore(struct mem_range_softc *sc) { #ifdef SMP - /* - * We should use ipi_all_but_self() to call other CPUs into a - * locking gate, then call a target function to do this work. - * The "proper" solution involves a generalised locking gate - * implementation, not ready yet. - */ - smp_rendezvous(NULL, amd64_mrstoreone, NULL, (void *)sc); + /* + * We should use ipi_all_but_self() to call other CPUs into a + * locking gate, then call a target function to do this work. + * The "proper" solution involves a generalised locking gate + * implementation, not ready yet. + */ + smp_rendezvous(NULL, amd64_mrstoreone, NULL, sc); #else - disable_intr(); /* disable interrupts */ - amd64_mrstoreone((void *)sc); - enable_intr(); + disable_intr(); /* disable interrupts */ + amd64_mrstoreone(sc); + enable_intr(); #endif } /* * Update the current CPU's MTRRs with those represented in the - * descriptor list. Note that we do this wholesale rather than - * just stuffing one entry; this is simpler (but slower, of course). + * descriptor list. Note that we do this wholesale rather than just + * stuffing one entry; this is simpler (but slower, of course). */ static void amd64_mrstoreone(void *arg) { - struct mem_range_softc *sc = (struct mem_range_softc *)arg; - struct mem_range_desc *mrd; - u_int64_t omsrv, msrv; - int i, j, msr; - u_int cr4save; + struct mem_range_softc *sc = arg; + struct mem_range_desc *mrd; + u_int64_t omsrv, msrv; + int i, j, msr; + u_int cr4save; + + mrd = sc->mr_desc; + + /* Disable PGE. */ + cr4save = rcr4(); + if (cr4save & CR4_PGE) + load_cr4(cr4save & ~CR4_PGE); + + /* Disable caches (CD = 1, NW = 0). */ + load_cr0((rcr0() & ~CR0_NW) | CR0_CD); - mrd = sc->mr_desc; + /* Flushes caches and TLBs. */ + wbinvd(); - cr4save = rcr4(); /* save cr4 */ - if (cr4save & CR4_PGE) - load_cr4(cr4save & ~CR4_PGE); - load_cr0((rcr0() & ~CR0_NW) | CR0_CD); /* disable caches (CD = 1, NW = 0) */ - wbinvd(); /* flush caches, TLBs */ - wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) & ~0x800); /* disable MTRRs (E = 0) */ + /* Disable MTRRs (E = 0). */ + wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) & ~MTRR_DEF_ENABLE); - /* Set fixed-range MTRRs */ - if (sc->mr_cap & MR686_FIXMTRR) { - msr = MSR_MTRR64kBase; - for (i = 0; i < (MTRR_N64K / 8); i++, msr++) { - msrv = 0; - omsrv = rdmsr(msr); - for (j = 7; j >= 0; j--) { - msrv = msrv << 8; - msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, omsrv >> (j*8)); - } - wrmsr(msr, msrv); - mrd += 8; + /* Set fixed-range MTRRs. */ + if (sc->mr_cap & MR686_FIXMTRR) { + msr = MSR_MTRR64kBase; + for (i = 0; i < (MTRR_N64K / 8); i++, msr++) { + msrv = 0; + omsrv = rdmsr(msr); + for (j = 7; j >= 0; j--) { + msrv = msrv << 8; + msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, + omsrv >> (j * 8)); + } + wrmsr(msr, msrv); + mrd += 8; + } + msr = MSR_MTRR16kBase; + for (i = 0; i < (MTRR_N16K / 8); i++, msr++) { + msrv = 0; + omsrv = rdmsr(msr); + for (j = 7; j >= 0; j--) { + msrv = msrv << 8; + msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, + omsrv >> (j * 8)); + } + wrmsr(msr, msrv); + mrd += 8; + } + msr = MSR_MTRR4kBase; + for (i = 0; i < (MTRR_N4K / 8); i++, msr++) { + msrv = 0; + omsrv = rdmsr(msr); + for (j = 7; j >= 0; j--) { + msrv = msrv << 8; + msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, + omsrv >> (j * 8)); + } + wrmsr(msr, msrv); + mrd += 8; + } } - msr = MSR_MTRR16kBase; - for (i = 0; i < (MTRR_N16K / 8); i++, msr++) { - msrv = 0; - omsrv = rdmsr(msr); - for (j = 7; j >= 0; j--) { - msrv = msrv << 8; - msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, omsrv >> (j*8)); - } - wrmsr(msr, msrv); - mrd += 8; + + /* Set remainder which must be variable MTRRs. */ + msr = MSR_MTRRVarBase; + for (; (mrd - sc->mr_desc) < sc->mr_ndesc; msr += 2, mrd++) { + /* base/type register */ + omsrv = rdmsr(msr); + if (mrd->mr_flags & MDF_ACTIVE) { + msrv = mrd->mr_base & mtrr_physmask; + msrv |= amd64_mrt2mtrr(mrd->mr_flags, omsrv); + } else { + msrv = 0; + } + wrmsr(msr, msrv); + + /* mask/active register */ + if (mrd->mr_flags & MDF_ACTIVE) { + msrv = MTRR_PHYSMASK_VALID | + (~(mrd->mr_len - 1) & mtrr_physmask); + } else { + msrv = 0; + } + wrmsr(msr + 1, msrv); } - msr = MSR_MTRR4kBase; - for (i = 0; i < (MTRR_N4K / 8); i++, msr++) { - msrv = 0; - omsrv = rdmsr(msr); - for (j = 7; j >= 0; j--) { - msrv = msrv << 8; - msrv |= amd64_mrt2mtrr((mrd + j)->mr_flags, omsrv >> (j*8)); - } - wrmsr(msr, msrv); - mrd += 8; - } - } + + /* Flush caches, TLBs. */ + wbinvd(); + + /* Enable MTRRs. */ + wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) | MTRR_DEF_ENABLE); + + /* Enable caches (CD = 0, NW = 0). */ + load_cr0(rcr0() & ~(CR0_CD | CR0_NW)); - /* Set remainder which must be variable MTRRs */ - msr = MSR_MTRRVarBase; - for (; (mrd - sc->mr_desc) < sc->mr_ndesc; msr += 2, mrd++) { - /* base/type register */ - omsrv = rdmsr(msr); - if (mrd->mr_flags & MDF_ACTIVE) { - msrv = mrd->mr_base & 0x000000fffffff000L; - msrv |= amd64_mrt2mtrr(mrd->mr_flags, omsrv); - } else { - msrv = 0; - } - wrmsr(msr, msrv); - - /* mask/active register */ - if (mrd->mr_flags & MDF_ACTIVE) { - msrv = 0x800 | (~(mrd->mr_len - 1) & 0x000000fffffff000L); - } else { - msrv = 0; - } - wrmsr(msr + 1, msrv); - } - wbinvd(); /* flush caches, TLBs */ - wrmsr(MSR_MTRRdefType, rdmsr(MSR_MTRRdefType) | 0x800); /* restore MTRR state */ - load_cr0(rcr0() & ~(CR0_CD | CR0_NW)); /* enable caches CD = 0 and NW = 0 */ - load_cr4(cr4save); /* restore cr4 */ + /* Restore PGE. */ + load_cr4(cr4save); } /* @@ -379,227 +400,260 @@ static struct mem_range_desc * amd64_mtrrfixsearch(struct mem_range_softc *sc, u_int64_t addr) { - struct mem_range_desc *mrd; - int i; - - for (i = 0, mrd = sc->mr_desc; i < (MTRR_N64K + MTRR_N16K + MTRR_N4K); i++, mrd++) - if ((addr >= mrd->mr_base) && (addr < (mrd->mr_base + mrd->mr_len))) - return(mrd); - return(NULL); + struct mem_range_desc *mrd; + int i; + + for (i = 0, mrd = sc->mr_desc; i < (MTRR_N64K + MTRR_N16K + MTRR_N4K); + i++, mrd++) + if ((addr >= mrd->mr_base) && + (addr < (mrd->mr_base + mrd->mr_len))) + return (mrd); + return (NULL); } /* - * Try to satisfy the given range request by manipulating the fixed MTRRs that - * cover low memory. + * Try to satisfy the given range request by manipulating the fixed + * MTRRs that cover low memory. * - * Note that we try to be generous here; we'll bloat the range out to the - * next higher/lower boundary to avoid the consumer having to know too much - * about the mechanisms here. + * Note that we try to be generous here; we'll bloat the range out to + * the next higher/lower boundary to avoid the consumer having to know + * too much about the mechanisms here. * - * XXX note that this will have to be updated when we start supporting "busy" ranges. + * XXX note that this will have to be updated when we start supporting + * "busy" ranges. */ static int amd64_mrsetlow(struct mem_range_softc *sc, struct mem_range_desc *mrd, int *arg) { - struct mem_range_desc *first_md, *last_md, *curr_md; + struct mem_range_desc *first_md, *last_md, *curr_md; + + /* Range check. */ + if (((first_md = amd64_mtrrfixsearch(sc, mrd->mr_base)) == NULL) || + ((last_md = amd64_mtrrfixsearch(sc, mrd->mr_base + mrd->mr_len - 1)) == NULL)) + return (EINVAL); - /* range check */ - if (((first_md = amd64_mtrrfixsearch(sc, mrd->mr_base)) == NULL) || - ((last_md = amd64_mtrrfixsearch(sc, mrd->mr_base + mrd->mr_len - 1)) == NULL)) - return(EINVAL); + /* Check that we aren't doing something risky. */ + if (!(mrd->mr_flags & MDF_FORCE)) + for (curr_md = first_md; curr_md <= last_md; curr_md++) { + if ((curr_md->mr_flags & MDF_ATTRMASK) == MDF_UNKNOWN) + return (EACCES); + } - /* check we aren't doing something risky */ - if (!(mrd->mr_flags & MDF_FORCE)) + /* Set flags, clear set-by-firmware flag. */ for (curr_md = first_md; curr_md <= last_md; curr_md++) { - if ((curr_md->mr_flags & MDF_ATTRMASK) == MDF_UNKNOWN) - return (EACCES); + curr_md->mr_flags = mrcopyflags(curr_md->mr_flags & + ~MDF_FIRMWARE, mrd->mr_flags); + bcopy(mrd->mr_owner, curr_md->mr_owner, sizeof(mrd->mr_owner)); } - /* set flags, clear set-by-firmware flag */ - for (curr_md = first_md; curr_md <= last_md; curr_md++) { - curr_md->mr_flags = mrcopyflags(curr_md->mr_flags & ~MDF_FIRMWARE, mrd->mr_flags); - bcopy(mrd->mr_owner, curr_md->mr_owner, sizeof(mrd->mr_owner)); - } - - return(0); + return (0); } - /* * Modify/add a variable MTRR to satisfy the request. * * XXX needs to be updated to properly support "busy" ranges. */ static int -amd64_mrsetvariable(struct mem_range_softc *sc, struct mem_range_desc *mrd, int *arg) +amd64_mrsetvariable(struct mem_range_softc *sc, struct mem_range_desc *mrd, + int *arg) { - struct mem_range_desc *curr_md, *free_md; - int i; - - /* - * Scan the currently active variable descriptors, look for - * one we exactly match (straight takeover) and for possible - * accidental overlaps. - * Keep track of the first empty variable descriptor in case we - * can't perform a takeover. - */ - i = (sc->mr_cap & MR686_FIXMTRR) ? MTRR_N64K + MTRR_N16K + MTRR_N4K : 0; - curr_md = sc->mr_desc + i; - free_md = NULL; - for (; i < sc->mr_ndesc; i++, curr_md++) { - if (curr_md->mr_flags & MDF_ACTIVE) { - /* exact match? */ - if ((curr_md->mr_base == mrd->mr_base) && - (curr_md->mr_len == mrd->mr_len)) { - /* whoops, owned by someone */ - if (curr_md->mr_flags & MDF_BUSY) - return(EBUSY); - /* check we aren't doing something risky */ - if (!(mrd->mr_flags & MDF_FORCE) && - ((curr_md->mr_flags & MDF_ATTRMASK) == MDF_UNKNOWN)) - return (EACCES); - /* Ok, just hijack this entry */ - free_md = curr_md; - break; - } - /* non-exact overlap ? */ - if (mroverlap(curr_md, mrd)) { - /* between conflicting region types? */ - if (amd64_mtrrconflict(curr_md->mr_flags, mrd->mr_flags)) - return(EINVAL); - } - } else if (free_md == NULL) { - free_md = curr_md; + struct mem_range_desc *curr_md, *free_md; + int i; + + /* + * Scan the currently active variable descriptors, look for + * one we exactly match (straight takeover) and for possible + * accidental overlaps. + * + * Keep track of the first empty variable descriptor in case + * we can't perform a takeover. + */ + i = (sc->mr_cap & MR686_FIXMTRR) ? MTRR_N64K + MTRR_N16K + MTRR_N4K : 0; + curr_md = sc->mr_desc + i; + free_md = NULL; + for (; i < sc->mr_ndesc; i++, curr_md++) { + if (curr_md->mr_flags & MDF_ACTIVE) { + /* Exact match? */ + if ((curr_md->mr_base == mrd->mr_base) && + (curr_md->mr_len == mrd->mr_len)) { + + /* Whoops, owned by someone. */ + if (curr_md->mr_flags & MDF_BUSY) + return (EBUSY); + + /* Check that we aren't doing something risky */ + if (!(mrd->mr_flags & MDF_FORCE) && + ((curr_md->mr_flags & MDF_ATTRMASK) == + MDF_UNKNOWN)) + return (EACCES); + + /* Ok, just hijack this entry. */ + free_md = curr_md; + break; + } + + /* Non-exact overlap? */ + if (mroverlap(curr_md, mrd)) { + /* Between conflicting region types? */ + if (amd64_mtrrconflict(curr_md->mr_flags, + mrd->mr_flags)) + return (EINVAL); + } + } else if (free_md == NULL) { + free_md = curr_md; + } } - } - /* got somewhere to put it? */ - if (free_md == NULL) - return(ENOSPC); + + /* Got somewhere to put it? */ + if (free_md == NULL) + return (ENOSPC); - /* Set up new descriptor */ - free_md->mr_base = mrd->mr_base; - free_md->mr_len = mrd->mr_len; - free_md->mr_flags = mrcopyflags(MDF_ACTIVE, mrd->mr_flags); - bcopy(mrd->mr_owner, free_md->mr_owner, sizeof(mrd->mr_owner)); - return(0); + /* Set up new descriptor. */ + free_md->mr_base = mrd->mr_base; + free_md->mr_len = mrd->mr_len; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 14 18:41:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0F2A106567B; Fri, 14 Mar 2008 18:41:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8EC47106566B for ; Fri, 14 Mar 2008 18:41:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 66CC78FC1E for ; Fri, 14 Mar 2008 18:41:48 +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.14.1/8.14.1) with ESMTP id m2EIfm9J015668 for ; Fri, 14 Mar 2008 18:41:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2EIfm5P015666 for perforce@freebsd.org; Fri, 14 Mar 2008 18:41:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Mar 2008 18:41:48 GMT Message-Id: <200803141841.m2EIfm5P015666@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 137735 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, 14 Mar 2008 18:41:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=137735 Change 137735 by rwatson@rwatson_cinnamon on 2008/03/14 18:41:43 No reason to include kernel configs now. Affected files ... .. //depot/projects/zcopybpf/filelist#2 edit Differences ... ==== //depot/projects/zcopybpf/filelist#2 (text+ko) ==== @@ -1,10 +1,5 @@ README -src/sys/amd64/conf/BPF_ZEROCOPY -src/sys/i386/conf/BPF_ZEROCOPY src/sys/net/bpf_buffer.c src/sys/net/bpf_buffer.h src/sys/net/bpf_zerocopy.c src/sys/net/bpf_zerocopy.h -utils/bpfnull -utils/zbuf_ioctl -utils/zbuf_tap From owner-p4-projects@FreeBSD.ORG Fri Mar 14 19:00:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAF5E106567B; Fri, 14 Mar 2008 19:00:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7EB91106566B for ; Fri, 14 Mar 2008 19:00:07 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 709988FC19 for ; Fri, 14 Mar 2008 19:00:07 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2EJ07LQ017785 for ; Fri, 14 Mar 2008 19:00:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2EJ07VN017783 for perforce@freebsd.org; Fri, 14 Mar 2008 19:00:07 GMT (envelope-from jhb@freebsd.org) Date: Fri, 14 Mar 2008 19:00:07 GMT Message-Id: <200803141900.m2EJ07VN017783@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 137736 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, 14 Mar 2008 19:00:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=137736 Change 137736 by jhb@jhb_mutex on 2008/03/14 18:59:26 IFC @137732 Affected files ... .. //depot/projects/smpng/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#109 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#82 integrate .. //depot/projects/smpng/sys/netinet/ip_ipsec.c#6 integrate .. //depot/projects/smpng/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/smpng/sys/netinet6/ip6_ipsec.h#2 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#52 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_output.c#13 integrate .. //depot/projects/smpng/sys/netipsec/key.c#20 integrate .. //depot/projects/smpng/sys/pc98/include/nexusvar.h#1 branch Differences ... ==== //depot/projects/smpng/sys/dev/hwpmc/pmc_events.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/dev/hwpmc/pmc_events.h,v 1.1 2005/06/09 19:45:07 jkoshy Exp $ + * $FreeBSD: src/sys/dev/hwpmc/pmc_events.h,v 1.2 2008/03/14 06:16:18 jkoshy Exp $ */ #ifndef _DEV_HWPMC_PMC_EVENTS_H_ @@ -386,7 +386,11 @@ #define PMC_EV_K8_LAST PMC_EV_K8_NB_HT_BUS2_BANDWIDTH -/* Intel Pentium Events */ +/* + * Intel Pentium and Pentium MMX Events, from the "Intel 64 and IA-32 + * Intel(R) Architectures Software Developer's Manual, Volume 3B: + * System Programming Guide, Part 2, August 2007". + */ #define __PMC_EV_P5() \ __PMC_EV(P5, DATA_READ, p5-data-read) \ __PMC_EV(P5, DATA_WRITE, p5-data-write) \ @@ -396,7 +400,7 @@ __PMC_EV(P5, WRITE_HIT_TO_M_OR_E_STATE_LINES, \ p5-write-hit-to-m-or-e-state-lines) \ __PMC_EV(P5, DATA_CACHE_LINES_WRITTEN_BACK, \ - p4-data-cache-lines-written-back) \ + p5-data-cache-lines-written-back) \ __PMC_EV(P5, EXTERNAL_SNOOPS, p5-external-snoops) \ __PMC_EV(P5, EXTERNAL_DATA_CACHE_SNOOP_HITS, \ p5-external-data-cache-snoop-hits) \ ==== //depot/projects/smpng/sys/dev/usb/usb_quirks.c#25 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.64 2007/11/11 20:57:08 brix Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.65 2008/03/14 15:59:30 jkim Exp $"); #include #include @@ -94,6 +94,8 @@ /* Devices which should be ignored by uhid */ { USB_VENDOR_APC, USB_PRODUCT_APC_UPS, ANY, { UQ_HID_IGNORE }}, + { USB_VENDOR_ASUS, USB_PRODUCT_ASUS_LCM, + ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C550AVR, ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE, ==== //depot/projects/smpng/sys/dev/usb/usbdevs#109 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.341 2008/03/05 14:13:30 rink Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.342 2008/03/14 15:59:30 jkim Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -872,6 +872,7 @@ product ASUS A9T_WIFI 0x171b A9T wireless product ASUS RT2573_1 0x1723 RT2573 product ASUS RT2573_2 0x1724 RT2573 +product ASUS LCM 0x1726 LCM display /* ATen products */ product ATEN UC1284 0x2001 Parallel printer ==== //depot/projects/smpng/sys/kern/sched_ule.c#82 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.232 2008/03/12 10:11:59 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.233 2008/03/14 15:22:38 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_sched.h" @@ -528,7 +528,7 @@ for ((cpu) = 0; (cpu) < sizeof((mask)) * 8; (cpu)++) \ if ((mask) & 1 << (cpu)) -__inline int cpu_search(struct cpu_group *cg, struct cpu_search *low, +static __inline int cpu_search(struct cpu_group *cg, struct cpu_search *low, struct cpu_search *high, const int match); int cpu_search_lowest(struct cpu_group *cg, struct cpu_search *low); int cpu_search_highest(struct cpu_group *cg, struct cpu_search *high); @@ -576,7 +576,7 @@ * match argument. It is reduced to the minimum set for each case. It is * also recursive to the depth of the tree. */ -static inline int +static __inline int cpu_search(struct cpu_group *cg, struct cpu_search *low, struct cpu_search *high, const int match) { ==== //depot/projects/smpng/sys/netinet/ip_ipsec.c#6 (text+ko) ==== @@ -28,12 +28,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ip_ipsec.c,v 1.8 2007/10/07 20:44:23 silby Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_ipsec.c,v 1.9 2008/03/14 16:38:10 bz Exp $"); #include "opt_ipsec.h" #include #include +#include #include #include #include @@ -329,6 +330,17 @@ /* NB: callee frees mbuf */ *error = ipsec4_process_packet(*m, sp->req, *flags, 0); + if (*error == EJUSTRETURN) { + /* + * We had a SP with a level of 'use' and no SA. We + * will just continue to process the packet without + * IPsec processing and return without error. + */ + *error = 0; + ip->ip_len = ntohs(ip->ip_len); + ip->ip_off = ntohs(ip->ip_off); + goto done; + } /* * Preserve KAME behaviour: ENOENT can be returned * when an SA acquire is in progress. Don't propagate ==== //depot/projects/smpng/sys/netinet6/ip6_ipsec.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/ip6_ipsec.c,v 1.7 2007/12/10 16:03:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/ip6_ipsec.c,v 1.9 2008/03/14 11:55:04 bz Exp $"); #include "opt_ipsec.h" @@ -257,7 +257,7 @@ * NB: null pointer to avoid free at * done: below. */ - KEY_FREESP(sp), sp = NULL; + KEY_FREESP(sp), *sp = NULL; /* XXX splx(s); */ goto done; } @@ -298,21 +298,16 @@ } } done: - if (sp != NULL) - if (*sp != NULL) - KEY_FREESP(sp); return 0; do_ipsec: return -1; bad: - if (sp != NULL) - if (*sp != NULL) - KEY_FREESP(sp); return 1; #endif /* IPSEC */ return 0; } +#if 0 /* * Compute the MTU for a forwarded packet that gets IPSEC encapsulated. * Called from ip_forward(). @@ -328,16 +323,15 @@ * tunnel MTU = if MTU - sizeof(IP) - ESP/AH hdrsiz * XXX quickhack!!! */ +#ifdef IPSEC struct secpolicy *sp = NULL; int ipsecerror; int ipsechdr; struct route *ro; -#ifdef IPSEC sp = ipsec_getpolicybyaddr(m, IPSEC_DIR_OUTBOUND, IP_FORWARDING, &ipsecerror); -#endif /* IPSEC */ if (sp != NULL) { /* count IPsec header size */ ipsechdr = ipsec4_hdrsiz(m, @@ -360,10 +354,10 @@ mtu -= ipsechdr; } } -#ifdef IPSEC KEY_FREESP(&sp); + } #endif /* IPSEC */ - } + /* XXX else case missing. */ return mtu; } - +#endif ==== //depot/projects/smpng/sys/netinet6/ip6_ipsec.h#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/netinet6/ip6_ipsec.h,v 1.3 2007/12/10 16:03:38 obrien Exp $ + * $FreeBSD: src/sys/netinet6/ip6_ipsec.h,v 1.4 2008/03/14 11:44:30 bz Exp $ */ #ifndef _NETINET_IP6_IPSEC_H_ @@ -35,7 +35,9 @@ int ip6_ipsec_filtertunnel(struct mbuf *); int ip6_ipsec_fwd(struct mbuf *); int ip6_ipsec_input(struct mbuf *, int); -int ip6_ipsec_mtu(struct mbuf *); int ip6_ipsec_output(struct mbuf **, struct inpcb *, int *, int *, struct ifnet **, struct secpolicy **sp); +#if 0 +int ip6_ipsec_mtu(struct mbuf *); +#endif #endif ==== //depot/projects/smpng/sys/netinet6/ip6_output.c#52 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet6/ip6_output.c,v 1.114 2008/02/02 14:11:31 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/ip6_output.c,v 1.117 2008/03/14 16:38:11 bz Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -384,7 +384,14 @@ error = ipsec6_output_trans(&state, nexthdrp, mprev, sp, flags, &needipsectun); m = state.m; - if (error) { + if (error == EJUSTRETURN) { + /* + * We had a SP with a level of 'use' and no SA. We + * will just continue to process the packet without + * IPsec processing. + */ + ; + } else if (error) { /* mbuf is already reclaimed in ipsec6_output_trans. */ m = NULL; switch (error) { @@ -395,7 +402,8 @@ case ENOMEM: break; default: - printf("ip6_output (ipsec): error code %d\n", error); + printf("[%s:%d] (ipsec): error code %d\n", + __func__, __LINE__, error); /* FALLTHROUGH */ case ENOENT: /* don't show these error codes to the user */ @@ -550,7 +558,14 @@ m = state.m; ro = (struct route_in6 *)state.ro; dst = (struct sockaddr_in6 *)state.dst; - if (error) { + if (error == EJUSTRETURN) { + /* + * We had a SP with a level of 'use' and no SA. We + * will just continue to process the packet without + * IPsec processing. + */ + ; + } else if (error) { /* mbuf is already reclaimed in ipsec6_output_tunnel. */ m0 = m = NULL; m = NULL; @@ -562,7 +577,8 @@ case ENOMEM: break; default: - printf("ip6_output (ipsec): error code %d\n", error); + printf("[%s:%d] (ipsec): error code %d\n", + __func__, __LINE__, error); /* FALLTHROUGH */ case ENOENT: /* don't show these error codes to the user */ @@ -1080,6 +1096,10 @@ } else if (ro_pmtu == &ip6route && ro_pmtu->ro_rt) { RTFREE(ro_pmtu->ro_rt); } +#ifdef IPSEC + if (sp != NULL) + KEY_FREESP(&sp); +#endif return (error); ==== //depot/projects/smpng/sys/netipsec/ipsec_output.c#13 (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/netipsec/ipsec_output.c,v 1.17 2007/11/28 22:33:52 bz Exp $ + * $FreeBSD: src/sys/netipsec/ipsec_output.c,v 1.18 2008/03/14 16:38:11 bz Exp $ */ /* @@ -286,17 +286,19 @@ goto bad; } sav = isr->sav; - if (sav == NULL) { /* XXX valid return */ + if (sav == NULL) { IPSEC_ASSERT(ipsec_get_reqlevel(isr) == IPSEC_LEVEL_USE, ("no SA found, but required; level %u", ipsec_get_reqlevel(isr))); IPSECREQUEST_UNLOCK(isr); isr = isr->next; - if (isr == NULL) { - /*XXXstatistic??*/ - *error = EINVAL; /*XXX*/ + /* + * If isr is NULL, we found a 'use' policy w/o SA. + * Return w/o error and w/o isr so we can drop out + * and continue w/o IPsec processing. + */ + if (isr == NULL) return isr; - } IPSECREQUEST_LOCK(isr); goto again; } @@ -356,8 +358,11 @@ IPSECREQUEST_LOCK(isr); /* insure SA contents don't change */ isr = ipsec_nextisr(m, isr, AF_INET, &saidx, &error); - if (isr == NULL) - goto bad; + if (isr == NULL) { + if (error != 0) + goto bad; + return EJUSTRETURN; + } sav = isr->sav; @@ -581,21 +586,24 @@ IPSECREQUEST_LOCK(isr); /* insure SA contents don't change */ isr = ipsec_nextisr(m, isr, AF_INET6, &saidx, &error); if (isr == NULL) { + if (error != 0) { #ifdef notdef - /* XXX should notification be done for all errors ? */ - /* - * Notify the fact that the packet is discarded - * to ourselves. I believe this is better than - * just silently discarding. (jinmei@kame.net) - * XXX: should we restrict the error to TCP packets? - * XXX: should we directly notify sockets via - * pfctlinputs? - */ - icmp6_error(m, ICMP6_DST_UNREACH, - ICMP6_DST_UNREACH_ADMIN, 0); - m = NULL; /* NB: icmp6_error frees mbuf */ + /* XXX should notification be done for all errors ? */ + /* + * Notify the fact that the packet is discarded + * to ourselves. I believe this is better than + * just silently discarding. (jinmei@kame.net) + * XXX: should we restrict the error to TCP packets? + * XXX: should we directly notify sockets via + * pfctlinputs? + */ + icmp6_error(m, ICMP6_DST_UNREACH, + ICMP6_DST_UNREACH_ADMIN, 0); + m = NULL; /* NB: icmp6_error frees mbuf */ #endif - goto bad; + goto bad; + } + return EJUSTRETURN; } error = (*isr->sav->tdb_xform->xf_output)(m, isr, NULL, @@ -712,8 +720,11 @@ IPSECREQUEST_LOCK(isr); /* insure SA contents don't change */ isr = ipsec_nextisr(m, isr, AF_INET6, &saidx, &error); - if (isr == NULL) - goto bad; + if (isr == NULL) { + if (error != 0) + goto bad; + return EJUSTRETURN; + } #ifdef DEV_ENC /* pass the mbuf to enc0 for bpf processing */ ==== //depot/projects/smpng/sys/netipsec/key.c#20 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/key.c,v 1.29 2008/03/02 17:12:28 bz Exp $ */ +/* $FreeBSD: src/sys/netipsec/key.c,v 1.30 2008/03/14 16:25:40 bz Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ /*- @@ -7122,7 +7122,7 @@ /* initialize key statistics */ keystat.getspi_count = 1; - printf("Fast IPsec: Initialized Security Association Processing.\n"); + printf("IPsec: Initialized Security Association Processing.\n"); return; } From owner-p4-projects@FreeBSD.ORG Fri Mar 14 19:53:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06EB71065677; Fri, 14 Mar 2008 19:53:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B56781065674 for ; Fri, 14 Mar 2008 19:53:07 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9F7B88FC14 for ; Fri, 14 Mar 2008 19:53:07 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2EJr7Iq020998 for ; Fri, 14 Mar 2008 19:53:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2EJr7PZ020996 for perforce@freebsd.org; Fri, 14 Mar 2008 19:53:07 GMT (envelope-from jhb@freebsd.org) Date: Fri, 14 Mar 2008 19:53:07 GMT Message-Id: <200803141953.m2EJr7PZ020996@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 137740 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, 14 Mar 2008 19:53:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=137740 Change 137740 by jhb@jhb_mutex on 2008/03/14 19:53:02 IFC @137739 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#29 integrate .. //depot/projects/smpng/sys/amd64/include/intr_machdep.h#17 integrate .. //depot/projects/smpng/sys/arm/arm/intr.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#29 integrate .. //depot/projects/smpng/sys/i386/include/intr_machdep.h#19 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#39 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#90 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#13 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#27 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/intr_machdep.c#7 integrate .. //depot/projects/smpng/sys/sys/interrupt.h#23 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#29 (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.36 2008/03/14 03:44:41 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.37 2008/03/14 19:41:46 jhb Exp $ */ /* @@ -89,6 +89,7 @@ static void intr_assign_next_cpu(struct intsrc *isrc); #endif +static int intr_assign_cpu(void *arg, u_char cpu); static void intr_init(void *__dummy); static int intr_pic_registered(struct pic *pic); static void intrcnt_setname(const char *name, int index); @@ -146,10 +147,12 @@ #ifdef INTR_FILTER error = intr_event_create(&isrc->is_event, isrc, 0, (mask_fn)isrc->is_pic->pic_enable_source, - intr_eoi_src, intr_disab_eoi_src, "irq%d:", vector); + intr_eoi_src, intr_disab_eoi_src, intr_assign_cpu, "irq%d:", + vector); #else error = intr_event_create(&isrc->is_event, isrc, 0, - (mask_fn)isrc->is_pic->pic_enable_source, "irq%d:", vector); + (mask_fn)isrc->is_pic->pic_enable_source, intr_assign_cpu, "irq%d:", + vector); #endif if (error) return (error); @@ -431,6 +434,28 @@ sx_xunlock(&intr_table_lock); } +static int +intr_assign_cpu(void *arg, u_char cpu) +{ +#ifdef SMP + struct intsrc *isrc; + + /* + * Don't do anything during early boot. We will pick up the + * assignment once the APs are started. + */ + if (assign_cpu && cpu != NOCPU) { + isrc = arg; + sx_xlock(&intr_table_lock); + isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[cpu]); + sx_xunlock(&intr_table_lock); + } + return (0); +#else + return (EOPNOTSUPP); +#endif +} + static void intrcnt_setname(const char *name, int index) { @@ -542,15 +567,11 @@ static void intr_assign_next_cpu(struct intsrc *isrc) { - struct pic *pic; - u_int apic_id; /* * Assign this source to a local APIC in a round-robin fashion. */ - pic = isrc->is_pic; - apic_id = cpu_apic_ids[current_cpu]; - pic->pic_assign_cpu(isrc, apic_id); + isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[current_cpu]); do { current_cpu++; if (current_cpu > mp_maxid) @@ -558,6 +579,18 @@ } while (!(intr_cpus & (1 << current_cpu))); } +/* Attempt to bind the specified IRQ to the specified CPU. */ +int +intr_bind(u_int vector, u_char cpu) +{ + struct intsrc *isrc; + + isrc = intr_lookup_source(vector); + if (isrc == NULL) + return (EINVAL); + return (intr_event_bind(isrc->is_event, cpu)); +} + /* * Add a CPU to our mask of valid CPUs that can be destinations of * interrupts. @@ -594,8 +627,18 @@ assign_cpu = 1; for (i = 0; i < NUM_IO_INTS; i++) { isrc = interrupt_sources[i]; - if (isrc != NULL && isrc->is_handlers > 0) - intr_assign_next_cpu(isrc); + if (isrc != NULL && isrc->is_handlers > 0) { + /* + * If this event is already bound to a CPU, + * then assign the source to that CPU instead + * of picking one via round-robin. + */ + if (isrc->is_event->ie_cpu != NOCPU) + isrc->is_pic->pic_assign_cpu(isrc, + cpu_apic_ids[isrc->is_event->ie_cpu]); + else + intr_assign_next_cpu(isrc); + } } sx_xunlock(&intr_table_lock); } ==== //depot/projects/smpng/sys/amd64/include/intr_machdep.h#17 (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/intr_machdep.h,v 1.18 2007/05/08 21:29:13 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.19 2008/03/14 19:41:46 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -137,6 +137,9 @@ int intr_add_handler(const char *name, int vector, driver_filter_t filter, driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep); +#ifdef SMP +int intr_bind(u_int vector, u_char cpu); +#endif int intr_config_intr(int vector, enum intr_trigger trig, enum intr_polarity pol); void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame); ==== //depot/projects/smpng/sys/arm/arm/intr.c#16 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.17 2007/07/27 14:26:42 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.18 2008/03/14 19:41:46 jhb Exp $"); #include #include #include @@ -92,10 +92,10 @@ #ifdef INTR_FILTER error = intr_event_create(&event, (void *)irq, 0, (void (*)(void *))arm_unmask_irq, intr_eoi_src, - intr_disab_eoi_src, "intr%d:", irq); + intr_disab_eoi_src, NULL, "intr%d:", irq); #else error = intr_event_create(&event, (void *)irq, 0, - (void (*)(void *))arm_unmask_irq, "intr%d:", irq); + (void (*)(void *))arm_unmask_irq, NULL, "intr%d:", irq); #endif if (error) return; ==== //depot/projects/smpng/sys/i386/i386/intr_machdep.c#29 (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/intr_machdep.c,v 1.31 2008/03/14 03:44:42 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.32 2008/03/14 19:41:46 jhb Exp $ */ /* @@ -80,6 +80,7 @@ static void intr_assign_next_cpu(struct intsrc *isrc); #endif +static int intr_assign_cpu(void *arg, u_char cpu); static void intr_init(void *__dummy); static int intr_pic_registered(struct pic *pic); static void intrcnt_setname(const char *name, int index); @@ -137,10 +138,12 @@ #ifdef INTR_FILTER error = intr_event_create(&isrc->is_event, isrc, 0, (mask_fn)isrc->is_pic->pic_enable_source, - intr_eoi_src, intr_disab_eoi_src, "irq%d:", vector); + intr_eoi_src, intr_disab_eoi_src, intr_assign_cpu, "irq%d:", + vector); #else error = intr_event_create(&isrc->is_event, isrc, 0, - (mask_fn)isrc->is_pic->pic_enable_source, "irq%d:", vector); + (mask_fn)isrc->is_pic->pic_enable_source, intr_assign_cpu, "irq%d:", + vector); #endif if (error) return (error); @@ -429,6 +432,28 @@ sx_xunlock(&intr_table_lock); } +static int +intr_assign_cpu(void *arg, u_char cpu) +{ +#ifdef SMP + struct intsrc *isrc; + + /* + * Don't do anything during early boot. We will pick up the + * assignment once the APs are started. + */ + if (assign_cpu && cpu != NOCPU) { + isrc = arg; + sx_xlock(&intr_table_lock); + isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[cpu]); + sx_xunlock(&intr_table_lock); + } + return (0); +#else + return (EOPNOTSUPP); +#endif +} + static void intrcnt_setname(const char *name, int index) { @@ -518,15 +543,11 @@ static void intr_assign_next_cpu(struct intsrc *isrc) { - struct pic *pic; - u_int apic_id; /* * Assign this source to a local APIC in a round-robin fashion. */ - pic = isrc->is_pic; - apic_id = cpu_apic_ids[current_cpu]; - pic->pic_assign_cpu(isrc, apic_id); + isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[current_cpu]); do { current_cpu++; if (current_cpu > mp_maxid) @@ -534,6 +555,18 @@ } while (!(intr_cpus & (1 << current_cpu))); } +/* Attempt to bind the specified IRQ to the specified CPU. */ +int +intr_bind(u_int vector, u_char cpu) +{ + struct intsrc *isrc; + + isrc = intr_lookup_source(vector); + if (isrc == NULL) + return (EINVAL); + return (intr_event_bind(isrc->is_event, cpu)); +} + /* * Add a CPU to our mask of valid CPUs that can be destinations of * interrupts. @@ -570,8 +603,18 @@ assign_cpu = 1; for (i = 0; i < NUM_IO_INTS; i++) { isrc = interrupt_sources[i]; - if (isrc != NULL && isrc->is_handlers > 0) - intr_assign_next_cpu(isrc); + if (isrc != NULL && isrc->is_handlers > 0) { + /* + * If this event is already bound to a CPU, + * then assign the source to that CPU instead + * of picking one via round-robin. + */ + if (isrc->is_event->ie_cpu != NOCPU) + isrc->is_pic->pic_assign_cpu(isrc, + cpu_apic_ids[isrc->is_event->ie_cpu]); + else + intr_assign_next_cpu(isrc); + } } sx_xunlock(&intr_table_lock); } ==== //depot/projects/smpng/sys/i386/include/intr_machdep.h#19 (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/i386/include/intr_machdep.h,v 1.20 2007/05/08 21:29:14 jhb Exp $ + * $FreeBSD: src/sys/i386/include/intr_machdep.h,v 1.21 2008/03/14 19:41:46 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -133,6 +133,9 @@ #endif int intr_add_handler(const char *name, int vector, driver_filter_t filter, driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep); +#ifdef SMP +int intr_bind(u_int vector, u_char cpu); +#endif int intr_config_intr(int vector, enum intr_trigger trig, enum intr_polarity pol); void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame); ==== //depot/projects/smpng/sys/ia64/ia64/interrupt.c#39 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.62 2007/11/21 04:03:50 scottl Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.63 2008/03/14 19:41:47 jhb Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /*- @@ -344,7 +344,7 @@ #ifdef INTR_FILTER ia64_intr_eoi, ia64_intr_mask, #endif - "irq%u:", irq); + NULL, "irq%u:", irq); if (error) { free(i, M_DEVBUF); return (error); ==== //depot/projects/smpng/sys/kern/kern_intr.c#90 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.154 2008/03/12 10:11:59 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.155 2008/03/14 19:41:47 jhb Exp $"); #include "opt_ddb.h" @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -240,7 +241,8 @@ #ifndef INTR_FILTER int intr_event_create(struct intr_event **event, void *source, int flags, - void (*enable)(void *), const char *fmt, ...) + void (*enable)(void *), int (*assign_cpu)(void *, u_char), const char *fmt, + ...) { struct intr_event *ie; va_list ap; @@ -251,7 +253,9 @@ ie = malloc(sizeof(struct intr_event), M_ITHREAD, M_WAITOK | M_ZERO); ie->ie_source = source; ie->ie_enable = enable; + ie->ie_assign_cpu = assign_cpu; ie->ie_flags = flags; + ie->ie_cpu = NOCPU; TAILQ_INIT(&ie->ie_handlers); mtx_init(&ie->ie_lock, "intr event", NULL, MTX_DEF); @@ -271,7 +275,7 @@ int intr_event_create(struct intr_event **event, void *source, int flags, void (*enable)(void *), void (*eoi)(void *), void (*disab)(void *), - const char *fmt, ...) + int (*assign_cpu)(void *, u_char), const char *fmt, ...) { struct intr_event *ie; va_list ap; @@ -282,9 +286,11 @@ ie = malloc(sizeof(struct intr_event), M_ITHREAD, M_WAITOK | M_ZERO); ie->ie_source = source; ie->ie_enable = enable; + ie->ie_assign_cpu = assign_cpu; ie->ie_eoi = eoi; ie->ie_disab = disab; ie->ie_flags = flags; + ie->ie_cpu = NOCPU; TAILQ_INIT(&ie->ie_handlers); mtx_init(&ie->ie_lock, "intr event", NULL, MTX_DEF); @@ -302,6 +308,52 @@ } #endif +/* + * Bind an interrupt event to the specified CPU. Note that not all + * platforms support binding an interrupt to a CPU. For those + * platforms this request will fail. For supported platforms, any + * associated ithreads as well as the primary interrupt context will + * be bound to the specificed CPU. Using a cpu id of NOCPU unbinds + * the interrupt event. + */ +int +intr_event_bind(struct intr_event *ie, u_char cpu) +{ + struct thread *td; + int error; + + /* Need a CPU to bind to. */ + if (cpu != NOCPU && CPU_ABSENT(cpu)) + return (EINVAL); + + if (ie->ie_assign_cpu == NULL) + return (EOPNOTSUPP); + + /* Don't allow a bind request if the interrupt is already bound. */ + mtx_lock(&ie->ie_lock); + if (ie->ie_cpu != NOCPU && cpu != NOCPU) { + mtx_unlock(&ie->ie_lock); + return (EBUSY); + } + mtx_unlock(&ie->ie_lock); + + error = ie->ie_assign_cpu(ie->ie_source, cpu); + if (error) + return (error); + mtx_lock(&ie->ie_lock); + if (ie->ie_thread != NULL) + td = ie->ie_thread->it_thread; + else + td = NULL; + if (td != NULL) + thread_lock(td); + ie->ie_cpu = cpu; + if (td != NULL) + thread_unlock(td); + mtx_unlock(&ie->ie_lock); + return (0); +} + int intr_event_destroy(struct intr_event *ie) { @@ -893,10 +945,10 @@ } else { #ifdef INTR_FILTER error = intr_event_create(&ie, NULL, IE_SOFT, - NULL, NULL, NULL, "swi%d:", pri); + NULL, NULL, NULL, NULL, "swi%d:", pri); #else error = intr_event_create(&ie, NULL, IE_SOFT, - NULL, "swi%d:", pri); + NULL, NULL, "swi%d:", pri); #endif if (error) return (error); @@ -1078,6 +1130,7 @@ struct intr_event *ie; struct thread *td; struct proc *p; + u_char cpu; td = curthread; p = td->td_proc; @@ -1086,6 +1139,7 @@ ("%s: ithread and proc linkage out of sync", __func__)); ie = ithd->it_event; ie->ie_count = 0; + cpu = NOCPU; /* * As long as we have interrupts outstanding, go through the @@ -1131,6 +1185,21 @@ ie->ie_count = 0; mi_switch(SW_VOL, NULL); } + +#ifdef SMP + /* + * Ensure we are bound to the correct CPU. We can't + * move ithreads until SMP is running however, so just + * leave interrupts on the boor CPU during boot. + */ + if (ie->ie_cpu != cpu && smp_started) { + cpu = ie->ie_cpu; + if (cpu == NOCPU) + sched_unbind(td); + else + sched_bind(td, cpu); + } +#endif thread_unlock(td); } } @@ -1147,6 +1216,7 @@ struct thread *td; struct proc *p; int priv; + u_char cpu; td = curthread; p = td->td_proc; @@ -1157,6 +1227,7 @@ ("%s: ithread and proc linkage out of sync", __func__)); ie = ithd->it_event; ie->ie_count = 0; + cpu = NOCPU; /* * As long as we have interrupts outstanding, go through the @@ -1205,6 +1276,21 @@ ie->ie_count = 0; mi_switch(SW_VOL, NULL); } + +#ifdef SMP + /* + * Ensure we are bound to the correct CPU. We can't + * move ithreads until SMP is running however, so just + * leave interrupts on the boor CPU during boot. + */ + if (!priv && ie->ie_cpu != cpu && smp_started) { + cpu = ie->ie_cpu; + if (cpu == NOCPU) + sched_unbind(td); + else + sched_bind(td, cpu); + } +#endif thread_unlock(td); } } @@ -1440,6 +1526,8 @@ db_printf("(pid %d)", it->it_thread->td_proc->p_pid); else db_printf("(no thread)"); + if (ie->ie_cpu != NOCPU) + db_printf(" (CPU %d)", ie->ie_cpu); if ((ie->ie_flags & (IE_SOFT | IE_ENTROPY | IE_ADDING_THREAD)) != 0 || (it != NULL && it->it_need)) { db_printf(" {"); ==== //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#13 (text+ko) ==== @@ -57,7 +57,7 @@ * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 * form: src/sys/i386/isa/intr_machdep.c,v 1.57 2001/07/20 * - * $FreeBSD: src/sys/powerpc/powerpc/intr_machdep.c,v 1.17 2008/03/11 19:58:52 marcel Exp $ + * $FreeBSD: src/sys/powerpc/powerpc/intr_machdep.c,v 1.18 2008/03/14 19:41:47 jhb Exp $ */ #include @@ -233,7 +233,7 @@ #ifdef INTR_FILTER powerpc_intr_eoi, powerpc_intr_mask, #endif - "irq%u:", irq); + NULL, "irq%u:", irq); if (error) return (error); ==== //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#27 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/intr_machdep.c,v 1.28 2007/11/21 04:03:51 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/intr_machdep.c,v 1.29 2008/03/14 19:41:47 jhb Exp $"); #include #include @@ -331,9 +331,9 @@ */ error = intr_event_create(&ie, iv, 0, intr_enable_eoi, #ifdef INTR_FILTER - ic->ic_eoi, ic->ic_disable, "vec%d:", vec); + ic->ic_eoi, ic->ic_disable, NULL, "vec%d:", vec); #else - "vec%d:", vec); + NULL, "vec%d:", vec); #endif if (error != 0) return (error); ==== //depot/projects/smpng/sys/sun4v/sun4v/intr_machdep.c#7 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/intr_machdep.c,v 1.7 2007/05/31 19:25:35 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/intr_machdep.c,v 1.8 2008/03/14 19:41:47 jhb Exp $"); #include #include @@ -359,7 +359,7 @@ mtx_unlock_spin(&intr_table_lock); if (ie == NULL) { errcode = intr_event_create(&ie, (void *)(intptr_t)vec, 0, NULL, - "vec%d:", vec); + NULL, "vec%d:", vec); if (errcode) return (errcode); mtx_lock_spin(&intr_table_lock); ==== //depot/projects/smpng/sys/sys/interrupt.h#23 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/interrupt.h,v 1.37 2007/05/06 17:02:50 piso Exp $ + * $FreeBSD: src/sys/sys/interrupt.h,v 1.38 2008/03/14 19:41:48 jhb Exp $ */ #ifndef _SYS_INTERRUPT_H_ @@ -73,6 +73,7 @@ void *ie_source; /* Cookie used by MD code. */ struct intr_thread *ie_thread; /* Thread we are connected to. */ void (*ie_enable)(void *); + int (*ie_assign_cpu)(void *, u_char); #ifdef INTR_FILTER void (*ie_eoi)(void *); void (*ie_disab)(void *); @@ -81,6 +82,7 @@ int ie_count; /* Loop counter. */ int ie_warncnt; /* Rate-check interrupt storm warns. */ struct timeval ie_warntm; + u_char ie_cpu; /* CPU this event is bound to. */ }; /* Interrupt event flags kept in ie_flags. */ @@ -127,15 +129,18 @@ int intr_event_add_handler(struct intr_event *ie, const char *name, driver_filter_t filter, driver_intr_t handler, void *arg, u_char pri, enum intr_type flags, void **cookiep); +int intr_event_bind(struct intr_event *ie, u_char cpu); #ifndef INTR_FILTER int intr_event_create(struct intr_event **event, void *source, - int flags, void (*enable)(void *), const char *fmt, ...) - __printflike(5, 6); + int flags, void (*enable)(void *), + int (*assign_cpu)(void *, u_char), const char *fmt, ...) + __printflike(6, 7); #else int intr_event_create(struct intr_event **event, void *source, int flags, void (*enable)(void *), void (*eoi)(void *), - void (*disab)(void *), const char *fmt, ...) - __printflike(7, 8); + void (*disab)(void *), int (*assign_cpu)(void *, u_char), + const char *fmt, ...) + __printflike(8, 9); #endif int intr_event_destroy(struct intr_event *ie); int intr_event_remove_handler(void *cookie); From owner-p4-projects@FreeBSD.ORG Sat Mar 15 01:06:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A78341065672; Sat, 15 Mar 2008 01:06:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 654F4106566C for ; Sat, 15 Mar 2008 01:06:54 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 466B68FC1A for ; Sat, 15 Mar 2008 01:06:54 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2F16shM061471 for ; Sat, 15 Mar 2008 01:06:54 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2F16s9V061469 for perforce@freebsd.org; Sat, 15 Mar 2008 01:06:54 GMT (envelope-from marcel@freebsd.org) Date: Sat, 15 Mar 2008 01:06:54 GMT Message-Id: <200803150106.m2F16s9V061469@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 137758 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, 15 Mar 2008 01:06:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=137758 Change 137758 by marcel@marcel_xcllnt on 2008/03/15 01:06:50 Revert. See trap_subr.S. Affected files ... .. //depot/projects/powerpc/sys/powerpc/aim/locore.S#6 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/aim/locore.S#6 (text+ko) ==== @@ -186,23 +186,6 @@ b OF_exit /* - * Kernel entry point for application/auxiliary - * processors (APs). - */ - .globl __start_ap -__start_ap: -#if 0 - li 0,0 - mtmsr 0 - - isync - - bl powerpc_smp_ap_init -#endif -9: - b 9b - -/* * int setfault() * * Similar to setjmp to setup for handling faults on accesses to user memory. From owner-p4-projects@FreeBSD.ORG Sat Mar 15 01:43:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC1B21065673; Sat, 15 Mar 2008 01:43:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8BB75106566C for ; Sat, 15 Mar 2008 01:43:32 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B0A68FC1A for ; Sat, 15 Mar 2008 01:43:32 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2F1hWsK062659 for ; Sat, 15 Mar 2008 01:43:32 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2F1hW1t062657 for perforce@freebsd.org; Sat, 15 Mar 2008 01:43:32 GMT (envelope-from marcel@freebsd.org) Date: Sat, 15 Mar 2008 01:43:32 GMT Message-Id: <200803150143.m2F1hW1t062657@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 137760 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, 15 Mar 2008 01:43:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=137760 Change 137760 by marcel@marcel_xcllnt on 2008/03/15 01:42:48 __start_ap is no more. Affected files ... .. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#17 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#17 (text+ko) ==== @@ -42,8 +42,6 @@ #include "pic_if.h" -extern void __start_ap(void *); - MALLOC_DEFINE(M_SMP, "smp", "SMP specific datastructures"); volatile static int ap_awake; From owner-p4-projects@FreeBSD.ORG Sat Mar 15 03:30:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CEF81065671; Sat, 15 Mar 2008 03:30:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BB67106566C for ; Sat, 15 Mar 2008 03:30:31 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1076B8FC13 for ; Sat, 15 Mar 2008 03:30:31 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2F3UUap070130 for ; Sat, 15 Mar 2008 03:30:30 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2F3UURb070125 for perforce@freebsd.org; Sat, 15 Mar 2008 03:30:30 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 15 Mar 2008 03:30:30 GMT Message-Id: <200803150330.m2F3UURb070125@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 137766 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, 15 Mar 2008 03:30:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=137766 Change 137766 by pgj@disznohal on 2008/03/15 03:30:26 Add initial Hungarian translation of Chapter 27: Network Servers. Affected files ... .. //depot/projects/docproj_hu/books/handbook/network-servers/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/network-servers/chapter.sgml#3 (text+ko) ==== @@ -4,90 +4,115 @@ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.102 2007/11/28 21:26:59 remko Exp $ --> - + + + - Murray + Murray Stokely - Reorganized by + Újraszervezte: - - Network Servers + Hálózati szerverek - Synopsis + Áttekintés - This chapter will cover some of the more frequently used - network services on &unix; systems. We will cover how to - install, configure, test, and maintain many different types of - network services. Example configuration files are included - throughout this chapter for you to benefit from. + Ebben a fejezetben a &unix; típusú rendszerekben + leggyakrabban alkalmazott hálózati + szolgáltatások közül fogunk + néhányat bemutatni. Ennek során + megismerjük a hálózati + szolgáltatások különbözõ + típusainak telepítését, + beállítását, tesztelését + és karbantartását. A fejezet + tartalmát folyamatosan példákkal + igyekszünk illusztrálni. - After reading this chapter, you will know: + A fejezet elolvasása során + megismerjük: - How to manage the inetd - daemon. + hogyan dolgozzunk az inetd + démonnal - How to set up a network file system. + hogyan állítsuk be a hálózati + állományrendszereket - How to set up a network information server for sharing - user accounts. + hogyan állítsunk be egy + hálózati információs szervert a + felhasználói hozzáférések + megosztására - How to set up automatic network settings using DHCP. + hogyan állítsuk be automatikusan a + hálózati hozzáférésünket + a DHCP használatával - How to set up a domain name server. + hogyan állítsunk be névfeloldó + szervereket - How to set up the Apache HTTP Server. + hogyan állítsuk be az + Apache webszervert - How to set up a File Transfer Protocol (FTP) Server. + hogyan állítsuk be az + állományok átviteléért + felelõs (FTP) szervert - How to set up a file and print server for &windows; - clients using Samba. + a Samba + használatával hogyan állítsunk be + &windows;-os kliensek számára + állomány- és + nyomtatószervert - How to synchronize the time and date, and set up a - time server, with the NTP protocol. + az NTP protokoll segítségével hogyan + egyeztessük az idõt és dátumot, hogyan + állítsunk be egy idõszervert - Before reading this chapter, you should: + A fejezet elolvasásához ajánlott: - Understand the basics of the - /etc/rc scripts. + az /etc/rc szkriptek alapjainak + ismerete - Be familiar with basic network terminology. + az alapvetõ hálózati fogalmak + ismerete - Know how to install additional third-party - software (). + a külsõ fejlesztésû szoftverek + telepítésének ismerete () @@ -96,233 +121,298 @@ - - Chern - Lee - Contributed by - + + Chern + Lee + Készítette: + - Updated for &os; 6.1-RELEASE by - The &os; Documentation Project + A &os; 6.1-RELEASE változatához + igazította: + A &os; dokumentációs + projekt - The <application>inetd</application> <quote>Super-Server</quote> + Az <application>inetd</application> + <quote>szuperszerver</quote> - Overview + Áttekintés - &man.inetd.8; is sometimes referred to as the Internet - Super-Server because it manages connections for - several services. When a - connection is received by inetd, it - determines which program the connection is destined for, spawns - the particular process and delegates the socket to it (the program - is invoked with the service socket as its standard input, output - and error descriptors). Running - inetd for servers that are not heavily used can reduce the - overall system load, when compared to running each daemon - individually in stand-alone mode. + Az &man.inetd.8; démont gyakran csak internet + szuperszerverként nevezik, mivel a helyi + szolgáltatások kapcsolatainak + kezeléséért felelõs. Amikor az + inetd fogad egy csatlakozási + kérelmet, akkor eldönti róla, hogy ez melyik + programhoz tartozik és elindít egy + példányt belõle, majd átadja neki a + csatlakozást (az így meghívott program a + szabvány bemenetéhez, kimenetéhez és + hibajelzési csatornájához kapja meg a + csatlakozás leíróit). Az + inetd használatával + úgy tudjuk csökkenteni a rendszerünk + terhelését, hogy a csak alkalmanként + meghívott szolgáltatásokat nem futtatjuk + teljesen független önálló + módban. - Primarily, inetd is used to - spawn other daemons, but several trivial protocols are handled - directly, such as chargen, - auth, and + Az inetd démont + elsõsorban más démonok + elindítására használjuk, de + néhány triviális protokollt + közvetlenül is képes beszélni, mint + például a chargen, + auth és a daytime. - This section will cover the basics in configuring - inetd through its command-line - options and its configuration file, - /etc/inetd.conf. + Ebben a fejezetben az inetd + beállításának alapjait foglaljuk + össze mind parancssoros módban, mind pedig az + /etc/inetd.conf konfigurációs + állományon keresztül. + - Settings + Beállítások - inetd is initialized through - the &man.rc.8; system. The - inetd_enable option is set to - NO by default, but may be turned on - by sysinstall during installation, - depending on the configuration chosen by the user. - Placing: + Az inetd + mûködése az &man.rc.8; rendszeren keresztül + inicializálható. Az + inetd_enable ugyan alapból a + NO értéket veszi fel, vagyis + tiltott, de a sysinstall + használatával már akár a + telepítés során bekapcsolható + attól függõen, hogy a felhasználó + milyen konfigurációt választott. Ha + tehát a: - inetd_enable="YES" + inetd_enable="YES" - or + vagy - inetd_enable="NO" + inetd_enable="NO" - into - /etc/rc.conf will enable or disable - inetd starting at boot time. - The command: + sort tesszük az /etc/rc.conf + állományba, akkor azzal rendre az + inetd démont + indíthatjuk el vagy tilthatjuk le a rendszer + indítása során. Az &prompt.root; /etc/rc.d/inetd rcvar - - can be run to display the current effective setting. + paranccsal lekérdezhetjük a pillanatnyilag + érvényes beállítást. + + Emellett még az inetd + démonnak az inetd_flags + változón keresztül + különbözõ parancssori paramétereket + is át tudunk adni. - Additionally, different command-line options can be passed - to inetd via the - inetd_flags option. - Command-Line Options + Parancssori paraméterek - Like most server daemons, inetd - has a number of options that it can be passed in order to - modify its behaviour. The full list of options reads: + Hasonlóan a legtöbb szerverhez, az + inetd viselkedését is + befolyásolni tudjuk a parancssorban + átadható különbözõ + paraméterekkel. Ezek teljes listája a + következõ: - inetd + inetd - Options can be passed to inetd using the - inetd_flags option in - /etc/rc.conf. By default, - inetd_flags is set to - -wW -C 60, which turns on TCP wrapping for - inetd's services, and prevents any - single IP address from requesting any service more than 60 times - in any given minute. + Ezek a paraméterek az + /etc/rc.conf állományban az + inetd_flags segítségével + adhatóak meg az inetd + részére. Alapértelmezés szerint az + inetd_flags értéke -wW + -C 60, ami az inetd + által biztosított szolgáltatások TCP + burkolását kapcsolja be, illetve egy + IP-címrõl nem engedi a felkínált + szolgáltatások elérését + percenként hatvannál többször. - Novice users may be pleased to note that - these parameters usually do not need to be modified, - although we mention the rate-limiting options below as - they be useful should you find that you are receiving an - excessive amount of connections. A full list of options - can be found in the &man.inetd.8; manual. + A kezdõ felhasználók örömmel + nyugtázhatják, hogy ezeket az + alapbeállításokat nem szükséges + módosítaniuk, habár a + késõbbiekben majd fény derül arra, hogy + a kiszolgálás gyakoriságának + szabályozása remek védekezést + nyújthat túlzottan nagy mennyiségû + kapcsolódási kérelem ellen. A + megadható paraméterek teljes listája az + &man.inetd.8; man oldalán olvasható. - -c maximum + -c maximum - Specify the default maximum number of simultaneous - invocations of each service; the default is unlimited. - May be overridden on a per-service basis with the - parameter. + Az egyes szolgáltatásokhoz egyszerre + felépíthetõ kapcsolatok + alapértelmezett maximális + számát adja meg. Alapból ezt a + démont nem korlátozza. A + + beállítással ez akár + szolgáltatásonként külön is + megadható. - -C rate + -C arány - Specify the default maximum number of times a - service can be invoked from a single IP address in one - minute; the default is unlimited. May be overridden on a - per-service basis with the + Korlátozza, hogy egyetlen IP-címrõl + alapból hányszor hívhatóak meg + az egyes szolgáltatások egy percen + belül. Ez az érték alapból + korlátlan. A - parameter. + beállítással ez + szolgáltatásonként is + definiálható. - -R rate + -R arány - Specify the maximum number of times a service can be - invoked in one minute; the default is 256. A rate of 0 - allows an unlimited number of invocations. + Megadja, hogy egy szolgáltatást egy perc + alatt mennyiszer lehet meghívni. Ez az + érték alapértelmezés szerint + 256. A 0 megadásával + eltöröljük ezt a típusú + korlátozást. - -s maximum + -s maximum - Specify the maximum number of times a service can be - invoked from a single IP address at any one time; the - default is unlimited. May be overridden on a per-service - basis with the - parameter. + Annak maximumát adja meg, hogy egyetlen + IP-címrõl egyszerre az egyes + szolgáltatásokat mennyiszer tudjuk + elérni. Alapból ez korlátlan. + Szolgáltatásonként ezt a + paraméterrel + tudjuk felülbírálni. - - <filename>inetd.conf</filename> + Az <filename>inetd.conf</filename> + állomány - Configuration of inetd is - done via the file /etc/inetd.conf. + Az inetd + beállítását az + /etc/inetd.conf konfigurációs + állományon keresztül végezhetjük + el. - When a modification is made to - /etc/inetd.conf, - inetd can be forced to re-read its - configuration file by running the command: + Amikor az /etc/inetd.conf + állományban módosítunk valamit, az + inetd démont a + következõ paranccsal meg kell kérnünk, + hogy olvassa újra: - Reloading the <application>inetd</application> - configuration file + Az <application>inetd</application> + konfigurációs állományának + újraolvasása &prompt.root; /etc/rc.d/inetd reload - Each line of the configuration file specifies an - individual daemon. Comments in the file are preceded by a - #. The format of each entry in - /etc/inetd.conf is as follows: + A konfigurációs állomány minden + egyes sora egy-egy démont ír le. A + megjegyzéseket egy # jel vezeti be. Az + /etc/inetd.conf állomány + bejegyzéseinek formátuma az alábbi: - service-name -socket-type -protocol + szolgáltatás-neve +csatlakozás-típusa +protokoll {wait|nowait}[/max-child[/max-connections-per-ip-per-minute[/max-child-per-ip]]] -user[:group][/login-class] -server-program -server-program-arguments +felhasználó[:csoport][/bejelentkezési-osztály] +szerver-program +szerver-program-paraméterei - An example entry for the &man.ftpd.8; daemon - using IPv4 might read: + Az IPv4 protokollt használó &man.ftpd.8; + démon bejegyzése például így + néz ki: ftp stream tcp nowait root /usr/libexec/ftpd ftpd -l - service-name + szolgáltatás-neve - This is the service name of the particular daemon. - It must correspond to a service listed in - /etc/services. This determines - which port inetd must listen - to. If a new service is being created, it must be - placed in /etc/services - first. + Ez az adott démon által képviselt + szolgáltatást nevezi meg, aminek szerepelnie + kell az /etc/services + állományban. Ez határozza meg, hogy + az inetd milyen porton figyelje + a beérkezõ kapcsolatokat. Ha egy új + szolgáltatást hozunk létre, akkor azt + elõször az /etc/services + állományba kell felvennünk. - socket-type + csatlakozás-típusa - Either stream, - dgram, raw, or - seqpacket. stream - must be used for connection-based, TCP daemons, while - dgram is used for daemons utilizing - the UDP transport protocol. + Ennek az értéke + stream, dgram, + raw, vagy seqpacket + lehet. A stream típust + használja a legtöbb kapcsolat-orientált + TCP démon, miközben a dgram + típus az UDP + szállítási protokollt + alkalmazó démonok esetében + használatos. - protocol + protokoll - One of the following: + Valamelyik a következõk + közül: - Protocol - Explanation + Protokoll + Magyarázat @@ -344,11 +434,11 @@ tcp46 - Both TCP IPv4 and v6 + TCP IPv4 és v6 udp46 - Both UDP IPv4 and v6 + UDP IPv4 és v6 @@ -360,246 +450,340 @@ {wait|nowait}[/max-child[/max-connections-per-ip-per-minute[/max-child-per-ip]]] - indicates whether the - daemon invoked from inetd is - able to handle its own socket or not. - socket types must use the - option, while stream socket - daemons, which are usually multi-threaded, should use - . usually - hands off multiple sockets to a single daemon, while - spawns a child daemon for each - new socket. + A + beállítás mondja meg, hogy az + inetd démonból + meghívott démon saját maga + képes-e kezelni kapcsolatokat. A + típusú kapcsolatok + esetében egyértelmûen a + beállítást kell + használni, miközben a + használatánál, ami + általában több szálon + történik, a + megadása javasolt. A + hatására általában egyetlen + démonnak adunk át több + csatlakozást, míg a + minden kapcsolathoz egy újabb + példányt indít el. - The maximum number of child daemons - inetd may spawn can be set - using the option. If a limit - of ten instances of a particular daemon is needed, a - /10 would be placed after - . Specifying /0 - allows an unlimited number of children + Az inetd által + indítható példányokat a + megadásával + korlátozhatjuk. Ha tehát mondjuk az adott + démon számára legfeljebb + példány létrehozását + engedélyezzük, akkor a + után /10 + beállítást kell megadnunk. A + /0 használatával + korlátlan mennyiségû + példányt + engedélyezhetünk. - In addition to , two other - options which limit the maximum connections from a single - place to a particular daemon can be enabled. - limits - the number of connections from any particular IP address - per minutes, e.g. a value of ten would limit any particular - IP address connecting to a particular service to ten - attempts per minute. - limits the number of children that can be started on - behalf on any single IP address at any moment. These - options are useful to prevent intentional or unintentional - excessive resource consumption and Denial of Service (DoS) - attacks to a machine. + A mellett még + további két másik + beállítás jöhet + számításba az egyes démonok + által kezelhetõ kapcsolatok maximális + számának + korlátozásában. A + az + egyes IP-címekrõl befutó + lekezelhetõ kapcsolatok percenkénti + számát szabályozza, így pl. + ha itt a tizes értéket adjuk meg, akkor az + adott szolgáltatáshoz egy + IP-címrõl percenként csak + tízszer férhetünk hozzá. A + az egyes + IP-címekhez egyszerre elindítható + példányok számára ír + elõ egy korlátot. Ezek a paraméterek + segítenek megóvni rendszerünket az + erõforrások akaratos vagy akaratlan + kimerítésétõl és a DoS + (Denial of Service) típusú + támadásoktól. - In this field, either of or - is mandatory. - , - and - are - optional. + Ebben a mezõben a vagy + valamelyikét + kötelezõ megadni. A , + + és + paraméterek ellenben elhagyhatóak. - A stream-type multi-threaded daemon without any + A típusú + több szálon futó démonok a , - or - limits - would simply be: nowait. + vagy + + korlátozása nélkül + egyszerûen csak így adhatóak meg: + nowait. - The same daemon with a maximum limit of ten daemons - would read: nowait/10. + Ha ugyanezt a démont tíz kapcsolatra + lekorlátozzuk, akkor a következõt kell + megadnunk: nowait/10. - The same setup with a limit of twenty - connections per IP address per minute and a maximum - total limit of ten child daemons would read: + Amikor pedig IP-címenként 20 kapcsolatot + engedélyezünk percenként és + mindössze 10 példányt, akkor: nowait/10/20. - These options are utilized by the default - settings of the &man.fingerd.8; daemon, - as seen here: + Az iménti beállítások a + &man.fingerd.8; démon alapértelmezett + paramétereinél is + megtalálhatóak: finger stream tcp nowait/3/10 nobody /usr/libexec/fingerd fingerd -s - Finally, an example of this field with a maximum of - 100 children in total, with a maximum of 5 for any one - IP address would read: + Végezetül engedélyezzük 100 + példányt, melyek közül + IP-címenként 5 használható: nowait/100/0/5. - user + felhasználó - This is the username that the particular daemon - should run as. Most commonly, daemons run as the - root user. For security purposes, it is - common to find some servers running as the - daemon user, or the least privileged - nobody user. + Ezzel azt a felhasználót adjuk meg, + akinek a nevében az adott démon futni fog. Az + esetek túlnyomó részében a + démonokat a root + felhasználó futtatja. Láthatjuk + azonban, hogy biztonsági okokból bizonyos + démonok a daemon vagy a + legkevesebb joggal rendelkezõ + nobody felhasználóval + futnak. - server-program + szerver-program - The full path of the daemon to be executed when a - connection is received. If the daemon is a service - provided by inetd internally, - then should be - used. + A kapcsolat felépülésekor az itt + teljes elérési úttal megadott + démon indul el. Ha ezt a + szolgáltatást maga az + inetd belsõleg + valósítja meg, akkor ebben a mezõben az + értéket adjuk + meg. - server-program-arguments + szerver-program-paraméterei - This works in conjunction with - by specifying the - arguments, starting with argv[0], - passed to the daemon on invocation. If - mydaemon -d is the command line, - mydaemon -d would be the value of - . Again, if - the daemon is an internal service, use - here. + Ez a + beállítással együtt + mûködik, és ebben a mezõben a + démon meghívásakor + alkalmazandó paramétereket tudjuk + rögzíteni, amit a démon nevével + kezdünk. Ha a démont a parancssorból a + sajatdemon -d paranccsal + hívnánk meg, akkor a sajatdemon + -d lesz + + beállítás helyes értéke + is. Természetesen, ha a démon egy + belsõleg képviselt szolgáltatás, + akkor ebben a mezõben is az + fog megjelenni. - Security + Védelem + + Attól függõen, hogy a + telepítés során mit választottunk, az + inetd által támogatott + szolgáltatások egyes része talán + alapból engedélyezett is. Amennyiben egy adott + démont konkrétan nem használunk, akkor + érdemes megfontolni a letiltását. A + kérdéses démon sorába tegyünk + egy # jelet az + /etc/inetd.conf állományba, + majd olvastassuk + újra az inetd beállításait. + Egyes démonok, mint mondjuk az + fingerd használata + egyáltalán nem ajánlott, mivel a + támadók számára hasznos + információkat tudnak + kiszivárogtatni. - Depending on the choices made at install time, many - of inetd's services may be enabled - by default. If there is no apparent need for a particular - daemon, consider disabling it. Place a # in front of the - daemon in question in /etc/inetd.conf, - and then reload the - inetd configuration. Some daemons, such as - fingerd, may not be desired at all - because they provide - information that may be useful to an attacker. + Más démonok nem ügyelnek a + védelemre, és a kapcsolatokhoz rendelt + lejárati idejük túlságosan + hosszú vagy éppen nincs is. Ezzel a + támadónak lehetõsége van lassú + kapcsolatokkal leterhelni az adott démont, ezátal + kimeríteni a rendszer erõforrásait. Ha + úgy találjuk, hogy túlságosan sok az + ilyen kapcsolat, akkor jó ötletnek bizonyulhat a + démonok számára a + , + vagy + korlátozások + elrendelése. - Some daemons are not security-conscious and have long, or - non-existent, timeouts for connection attempts. This allows an - attacker to slowly send connections to a particular daemon, - thus saturating available resources. It may be a good idea to - place , - or limitations on certain - daemons if you find that you have too many connections. + Alapértelmezés szerint a TCP kapcsolatok + burkolása engedélyezett. A &man.hosts.access.5; man + oldalon találhatjuk meg az + inetd által + meghívható különféle + démonok TCP alapú korlátozásainak + lehetõségeit. - By default, TCP wrapping is turned on. Consult the - &man.hosts.access.5; manual page for more information on placing - TCP restrictions on various inetd - invoked daemons. - Miscellaneous + Egyéb lehetõségek - daytime, + A daytime, time, echo, discard, - chargen, and - auth are all internally provided - services of inetd. + chargen és + auth szolgáltatások + feladatainak mindegyikét maga az + inetd is képes + ellátni. + + Az auth + szolgáltatás a hálózati keresztül + azonosítást teszi lehetõvé és + bizonyos mértékig + beállítható. A többit egyszerûen + csak kapcsoljuk ki vagy be. - The auth service provides - identity - network services, and is - configurable to a certain degree, whilst the others are simply on or off. + A témában az &man.inetd.8; man oldalán + tudunk elmerülni még jobban. - Consult the &man.inetd.8; manual page for more in-depth - information. - - Tom - Rhodes - Reorganized and enhanced by - + + Tom + Rhodes + Újraszervezte és feljavította: + + - - Bill - Swingle - Written by - + + Bill + Swingle + Írta: + - Network File System (NFS) + + A hálózati állományrendszer + (NFS) NFS - Among the many different file systems that FreeBSD supports - is the Network File System, also known as NFS. NFS allows a system to share directories and - files with others over a network. By using NFS, users and programs can - access files on remote systems almost as if they were local - files. + + A &os; több állományrendszert ismer, + köztük a hálózati + állományrendszert (Network File System, NFS) is. Az NFS állományok + és könyvtárak megosztását teszi + lehetõvé a hálózaton keresztül. Az + NFS + használatával a felhasználók és + a programok képesek majdnem úgy elérni a + távoli rendszereken található + állományokat, mintha helyben + léteznének. - Some of the most notable benefits that - NFS can provide are: + Íme az NFS néhány >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 15 03:36:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4224D1065676; Sat, 15 Mar 2008 03:36:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F3AAB106566B for ; Sat, 15 Mar 2008 03:36:37 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D98038FC21 for ; Sat, 15 Mar 2008 03:36:37 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2F3ab7i070329 for ; Sat, 15 Mar 2008 03:36:37 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2F3abG1070327 for perforce@freebsd.org; Sat, 15 Mar 2008 03:36:37 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 15 Mar 2008 03:36:37 GMT Message-Id: <200803150336.m2F3abG1070327@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 137767 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, 15 Mar 2008 03:36:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=137767 Change 137767 by pgj@disznohal on 2008/03/15 03:35:50 IFC before translation Affected files ... .. //depot/projects/docproj_hu/books/handbook/ppp-and-slip/chapter.sgml#2 integrate Differences ... ==== //depot/projects/docproj_hu/books/handbook/ppp-and-slip/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1366,14 +1366,14 @@ all 3 stages automatic: #!/bin/sh -ps ax |grep pppd |grep -v grep -pid=`ps ax |grep pppd |grep -v grep|awk '{print $1;}'` +pgrep -l pppd +pid=`pgrep pppd` if [ "X${pid}" != "X" ] ; then echo 'killing pppd, PID=' ${pid} kill ${pid} fi -ps ax |grep kermit |grep -v grep -pid=`ps ax |grep kermit |grep -v grep|awk '{print $1;}'` +pgrep -l kermit +pid=`pgrep kermit` if [ "X${pid}" != "X" ] ; then echo 'killing kermit, PID=' ${pid} kill -9 ${pid} @@ -1395,14 +1395,14 @@ to disconnect the PPP line: #!/bin/sh -pid=`ps ax |grep pppd |grep -v grep|awk '{print $1;}'` +pid=`pgrep pppd` if [ X${pid} != "X" ] ; then echo 'killing pppd, PID=' ${pid} kill -TERM ${pid} fi -ps ax |grep kermit |grep -v grep -pid=`ps ax |grep kermit |grep -v grep|awk '{print $1;}'` +pgrep -l kermit +pid=`pgrep kermit` if [ "X${pid}" != "X" ] ; then echo 'killing kermit, PID=' ${pid} kill -9 ${pid} @@ -1418,7 +1418,7 @@ this: #!/bin/sh -pid=`ps ax| grep pppd |grep -v grep|awk '{print $1;}'` +pid=`pgrep pppd` if [ X${pid} != "X" ] ; then echo 'pppd running: PID=' ${pid-NONE} else @@ -1517,14 +1517,14 @@ server: #!/bin/sh -ps ax |grep pppd |grep -v grep -pid=`ps ax |grep pppd |grep -v grep|awk '{print $1;}'` +pgrep -l pppd +pid=`pgrep pppd` if [ "X${pid}" != "X" ] ; then echo 'killing pppd, PID=' ${pid} kill ${pid} fi -ps ax |grep kermit |grep -v grep -pid=`ps ax |grep kermit |grep -v grep|awk '{print $1;}'` +pgrep -l kermit +pid=`pgrep kermit` if [ "X${pid}" != "X" ] ; then echo 'killing kermit, PID=' ${pid} kill -9 ${pid} @@ -1544,14 +1544,14 @@ stop the server: #!/bin/sh -ps ax |grep pppd |grep -v grep -pid=`ps ax |grep pppd |grep -v grep|awk '{print $1;}'` +pgrep -l pppd +pid=`pgrep pppd` if [ "X${pid}" != "X" ] ; then echo 'killing pppd, PID=' ${pid} kill ${pid} fi -ps ax |grep kermit |grep -v grep -pid=`ps ax |grep kermit |grep -v grep|awk '{print $1;}'` +pgrep -l kermit +pid=`pgrep kermit` if [ "X${pid}" != "X" ] ; then echo 'killing kermit, PID=' ${pid} kill -9 ${pid} From owner-p4-projects@FreeBSD.ORG Sat Mar 15 03:56:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 603341065670; Sat, 15 Mar 2008 03:56:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E177D106566B for ; Sat, 15 Mar 2008 03:55:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C655F8FC14 for ; Sat, 15 Mar 2008 03:55:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2F3tw2s071132 for ; Sat, 15 Mar 2008 03:55:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2F3twc8071130 for perforce@freebsd.org; Sat, 15 Mar 2008 03:55:58 GMT (envelope-from sam@freebsd.org) Date: Sat, 15 Mar 2008 03:55:58 GMT Message-Id: <200803150355.m2F3twc8071130@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 137770 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, 15 Mar 2008 03:56:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=137770 Change 137770 by sam@sam_ebb on 2008/03/15 03:54:57 driver for the Marvell 88W8363 (requires firmware not included) Sponsored by: marvell Affected files ... .. //depot/projects/vap/sys/conf/files#24 edit .. //depot/projects/vap/sys/conf/options#15 edit .. //depot/projects/vap/sys/contrib/dev/mwl/Makefile#1 add .. //depot/projects/vap/sys/dev/mwl/if_mwl.c#1 add .. //depot/projects/vap/sys/dev/mwl/if_mwl_pci.c#1 add .. //depot/projects/vap/sys/dev/mwl/if_mwlioctl.h#1 add .. //depot/projects/vap/sys/dev/mwl/if_mwlvar.h#1 add .. //depot/projects/vap/sys/dev/mwl/mwldiag.h#1 add .. //depot/projects/vap/sys/dev/mwl/mwlhal.c#1 add .. //depot/projects/vap/sys/dev/mwl/mwlhal.h#1 add .. //depot/projects/vap/sys/dev/mwl/mwlreg.h#1 add .. //depot/projects/vap/sys/modules/Makefile#16 edit .. //depot/projects/vap/sys/modules/mwl/Makefile#1 add .. //depot/projects/vap/sys/modules/mwlfw/Makefile#1 add Differences ... ==== //depot/projects/vap/sys/conf/files#24 (text+ko) ==== @@ -848,6 +848,9 @@ dev/mpt/mpt_pci.c optional mpt pci dev/mpt/mpt_raid.c optional mpt dev/msk/if_msk.c optional msk +dev/mwl/if_mwl.c optional mwl +dev/mwl/if_mwl_pci.c optional mwl pci +dev/mwl/mwlhal.c optional mwl dev/mxge/if_mxge.c optional mxge pci dev/mxge/mxge_lro.c optional mxge pci dev/mxge/mxge_eth_z8e.c optional mxge pci ==== //depot/projects/vap/sys/conf/options#15 (text+ko) ==== @@ -738,6 +738,15 @@ MALO_TXBUF opt_malo.h MALO_RXBUF opt_malo.h +# options for the Marvell wireless driver +MWL_DEBUG opt_mwl.h +MWL_TXBUF opt_mwl.h +MWL_RXBUF opt_mwl.h +MWL_DIAGAPI opt_mwl.h +MWL_TSO_SUPPORT opt_mwl.h +MWL_AGGR_SIZE opt_mwl.h +MWL_TX_NODROP opt_mwl.h + # dcons options DCONS_BUF_SIZE opt_dcons.h DCONS_POLL_HZ opt_dcons.h ==== //depot/projects/vap/sys/modules/Makefile#16 (text+ko) ==== @@ -177,6 +177,7 @@ ${_mse} \ msk \ malo \ + mwl \ mxge \ my \ ${_ncp} \ From owner-p4-projects@FreeBSD.ORG Sat Mar 15 04:04:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A9BD1065673; Sat, 15 Mar 2008 04:04:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 704A0106566C for ; Sat, 15 Mar 2008 04:04:07 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 22C578FC13 for ; Sat, 15 Mar 2008 04:04:07 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2F447vU072562 for ; Sat, 15 Mar 2008 04:04:07 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2F447Lt072560 for perforce@freebsd.org; Sat, 15 Mar 2008 04:04:07 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 15 Mar 2008 04:04:07 GMT Message-Id: <200803150404.m2F447Lt072560@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 137771 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, 15 Mar 2008 04:04:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=137771 Change 137771 by pgj@disznohal on 2008/03/15 04:03:34 Fix typos, misinterpretations and reworded some sentences. Submitted by: Miklos QUARTUS Affected files ... .. //depot/projects/docproj_hu/books/handbook/firewalls/chapter.sgml#6 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/firewalls/chapter.sgml#6 (text+ko) ==== @@ -268,13 +268,13 @@ minõsége (Quality of Service, QoS) alapján, aminek köszönhetõen a különbözõ szolgáltatások a - szûrési szabályok mentén garanált - sávszélességhez juthatnak. Az OpenBSD - projekt kiváló munkát végez a PF - felhasználói útmutatójának - karbantartásával, amit így most nem is - teszük be a kézikönyvbe, mivel ezzel csak - feleslegesen másolnánk. + szûrési szabályok mentén + garantált sávszélességhez juthatnak. + Az OpenBSD projekt kiváló munkát végez + a PF felhasználói útmutatójának + karbantartásával, amely így most nem lesz + része a kézikönyvnek, hiszen ez csak az + erõforrások kétszerezése lenne. A PF &os;-n történõ használatáról a A nyílt forrású IPFilter - levelezési list kereshetõ archívumait a címen találjuk (angolul). @@ -750,7 +750,7 @@ viselkedést, tehát minden olyan csomag, ami nem illeszkedik a tûzfal valamelyik pass típusú (átengedõ) - szabályára, blokkolódni fog. + szabályára, blokkolásra kerül. Ezek a beállítások csak azt követõen érvényesülnek, ha @@ -1651,7 +1651,7 @@ amelyek nem adhatóak meg kényelmesen a maszk hosszával. A hálózati maszkok hosszának megállapításban - segíhet a következõ (angol nyelvû) + segíthet a következõ (angol nyelvû) honlap: . @@ -1791,7 +1791,7 @@ illeszkedik az aktív kapcsolatban következõként várt csomagra, akkor átmegy a tûzfalon és a dinamikus - állapottáblában frissül kapcsolat + állapottáblában frissül a kapcsolat állapota, a fennmaradó csomagok pedig a kimenõ szabályrendszer szerint kerülnek ellenõrzésre. @@ -2878,10 +2878,10 @@ Ezek a beállítások teljesen megegyeznek az IPv4 alapú társaikkal, csak ezek az IPv6-ra - vonatkoznak. Ha az IPV6FIREWALL beállítás - mellett nem adunk meg szabályokat, az összes IPv6-os - csomag eldobódik. Ezen a módon tiltani tudjuk az - IPv6 használatát. + vonatkoznak. Ha nem akarunk IPV6-ot használni, akkor ne + adjunk meg az IPV6FIREWALL beállításhoz + szabályokat, és így az összes IPv6 + csomag blokkolásra kerül. a rendszermag @@ -3318,12 +3318,13 @@ illeszkedik, akkor a rendszernaplóban egy üzenet keletkezik a security (biztonság) funkción keresztül. A naplóba - tényleges csak akkor kerül bele az üzenet, - ha az adott szabály még nem haladta meg a - hozzátartozó logamount - paraméter értékét. Ha ezt nem - adtuk meg, akkor az itt érvényes korlát - a net.inet.ip.fw.verbose_limit sysctl + ténylegesen csak akkor kerül bele az + üzenet, ha az adott szabály még nem + haladta meg a hozzátartozó + logamount paraméter + értékét. Ha ezt nem adtuk meg, akkor + az itt érvényes korlát a + net.inet.ip.fw.verbose_limit sysctl változóból fog származni. A nulla érték mind a két esetben megszûnteti ezt a korlátozást. Ha @@ -3958,8 +3959,8 @@ $cmd 00231 allow tcp from any to any 110 out via $pif setup keep-state # Kifelé engedélyezzük a FreeBSD (a make install és a CVSUP) -# funkcióit. Ezzel lényegében a rendszeradminisztrátor -# "ISTENI" jogait adjuk át. +# funkcióit. Ezzel lényegében a rendszeradminisztrátornak +# ,,ISTENI'' jogokat adunk. $cmd 00240 allow tcp from me to any out via $pif setup keep-state uid root # Kifelé engedélyezzük a pinget. @@ -4356,8 +4357,7 @@ $cmd 061 $skip tcp from any to any 110 out via $pif setup keep-state # Kifelé engedélyezzük a FreeBSD (make install és CVSUP) funkcióit. -# Ezzel alapvetõen a rendszeradminisztrátor "ISTEN" jogait -# adjuk meg. +# Ezzel a rendszeradminisztrátornak ,,ISTENI'' jogokat adunk. $cmd 070 $skip tcp from me to any out via $pif setup keep-state uid root # Kifelé engedélyezzük a pinget. From owner-p4-projects@FreeBSD.ORG Sat Mar 15 04:40:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 377661065674; Sat, 15 Mar 2008 04:40:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD6D0106566B for ; Sat, 15 Mar 2008 04:40:44 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B104B8FC17 for ; Sat, 15 Mar 2008 04:40:44 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2F4eiuf073783 for ; Sat, 15 Mar 2008 04:40:44 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2F4eimE073781 for perforce@freebsd.org; Sat, 15 Mar 2008 04:40:44 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 15 Mar 2008 04:40:44 GMT Message-Id: <200803150440.m2F4eimE073781@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 137772 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, 15 Mar 2008 04:40:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=137772 Change 137772 by pgj@disznohal on 2008/03/15 04:40:38 (install) MFen: 1.384 --> 1.388 Affected files ... .. //depot/projects/docproj_hu/books/handbook/install/chapter.sgml#4 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/install/chapter.sgml#4 (text+ko) ==== @@ -1,12 +1,12 @@ + Original Revision: 1.388 --> @@ -2479,17 +2479,17 @@ a / - 128 MB + 512 MB Ez a rendszerindításhoz használt, más néven a gyökér állományrendszer. Minden további állományrendszer ehhez csatlakozik valahol. Ennek az - állományrendszernek 128 MB + állományrendszernek 512 MB elfogadható, mivel nem fogunk túlságosan sok adatot tárolni rajta, a &os; telepítõje is csak kb. - 40 MB adatot fog idepakolni. Az így + 128 MB adatot fog idepakolni. Az így fennmaradó lemezterület felhasználható átmeneti adatok tárolására, illetve a @@ -2544,7 +2544,7 @@ e /var - 256 MB + 256 MB-tl 1024 MB-ig A /var könyvtár foglalja magában az állandó változó @@ -2568,7 +2568,8 @@ f /usr - A lemez többi része + A lemez többi része (legalább + 2 GB) Az összes többi állomány többnyire a /usr könyvtárban és annak @@ -2578,6 +2579,18 @@ + + Az imént megadott értékeket csak + példaként adtuk meg és csak a tapasztalt + felhasználók számára + ajánljuk. A többi felhasználónak + inkább a partíciók automatikus + kiosztását javasoljuk a &os; + partíciószerkesztõjében + található Auto Defaults + opció használatával. + + Ha a &os;-t egynél több lemezre telepítjük, akkor a korábban megadott többi slice-ban is létre kell hoznunk @@ -2731,16 +2744,20 @@ A Disklabel képes magától partíciókat készíteni a nekik megfelelõ - alapértelmezett méretekkel. - Próbáljuk most mi is ezt ki, és nyomjuk - lesz az A billentyût. Ekkor a szerint illusztráltaknak - megfelelõ képernyõt tapasztalhatunk. A - használt lemez méretétõl - függõen az alapértelmezett - értékek megfelelõek lesznek vagy sem. Ez - igazából nem számít, hiszen nem kell - feltétlenül elfogadnunk az alapértelmezetten + alapértelmezett méretekkel. A + partíciók automatikus méretét egy + belsõ partícióméretezõ algoritmus + számítja ki a lemez összmérete + alapján. Próbáljuk most mi is ezt ki, + és nyomjuk lesz az A billentyût. + Ekkor a szerint + illusztráltaknak megfelelõ képernyõt + tapasztalhatunk. A használt lemez + méretétõl függõen az + alapértelmezett értékek megfelelõek + lesznek vagy sem. Ez igazából nem + számít, hiszen nem kell feltétlenül + elfogadnunk az alapértelmezetten megállapított értékeket. @@ -2833,7 +2850,7 @@ Backspace billentyû használatával töröljük ki az így megadott értéket, és helyette - gépeljük be, hogy 128M, ahogy + gépeljük be, hogy 512M, ahogy ez a segítségével is látható. A bevitelt zárjuk a &gui.ok; gomb @@ -5826,11 +5843,37 @@ Agent elindításával tehetjük meg. - A &os; támogatja az &ms-dos; alapú (FAT16 - és FAT32) állományrendszereket. Ehhez a - &man.mount.8; parancsnak át kell adni bizonyos - paramétereket, általában valahogy - így: + A &os; támogatja az &ms-dos; alapú (gyakran + csak FAT típusúnak nevezett) + állományrendszereket. A &man.mount.msdosfs.8; + parancs segítségével az ilyen rendszerek + könnyedén beolthatóak a már + létezõ könyvtárszerkezetbe, amivel + így el tudjuk érni a tartalmát. A + &man.mount.msdosfs.8; programot általában nem + közvetlenül hívjuk meg, hanem az + /etc/fstab vagy a &man.mount.8; + segédprogram megfelelõ + paraméterezésével. + + Az /etc/fstab állományban + általában így néz ki egy ilyen + sor: + + /dev/ad0sN /dos msdosfs rw 0 0 + + + A mûvelet végrehajtásához a + /dos könyvtárnak már + léteznie kell. Az /etc/fstab + pontos formátumával kapcsolatban a &man.fstab.5; + man oldalt olvassuk el. + + + + Az &ms-dos; állományrendszerek esetében + a &man.mount.8; parancsot többnyire így adjuk + ki: &prompt.root; mount -t msdosfs /dev/ad0s1 /mnt @@ -5847,19 +5890,17 @@ kiosztásáról. - A kiterjesztett &ms-dos; állományrendszerek - általában a &os; partíciói - után jelennek meg. Másképpen: a - hozzájuk tartozó slice sorszáma - valószínûleg nagyobb, mint annak, amit a - &os; használ. Például a - /dev/ad0s1 lehet az elsõ &ms-dos; - partíció, a /dev/ad0s2 a - &os; partíciója, a kiterjesztett &ms-dos; - partíciói pedig a - /dev/ad0s3 partíción - helyezkedik el. Némelyeknek elsõre ez - zavaró lehet. + Elõfordulhat, hogy a &os; a többi + operációs rendszertõl eltérõ + módon számozza a slice-okat (vagyis az &ms-dos; + partíciókat). Konkrétan a kiterjesztett + &ms-dos; partíciók általában + nagyobb sorszámot kapnak, mint az elsõdleges + &ms-dos; partíciók. A &man.fdisk.8; + segédprogram segíthet + megállapítani, hogy mely slice-ok tartoznak a + &os;-hez és melyek más operációs + rendszerekhez. A &man.mount.ntfs.8; parancs használatával az From owner-p4-projects@FreeBSD.ORG Sat Mar 15 05:02:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 933A91065672; Sat, 15 Mar 2008 05:02:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38ADF1065670 for ; Sat, 15 Mar 2008 05:02:08 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C1738FC1F for ; Sat, 15 Mar 2008 05:02:08 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2F5280h083481 for ; Sat, 15 Mar 2008 05:02:08 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2F527WD083479 for perforce@freebsd.org; Sat, 15 Mar 2008 05:02:07 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 15 Mar 2008 05:02:07 GMT Message-Id: <200803150502.m2F527WD083479@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 137774 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, 15 Mar 2008 05:02:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=137774 Change 137774 by pgj@disznohal on 2008/03/15 05:01:06 (jails) MFen: 1.13 --> 1.14 Affected files ... .. //depot/projects/docproj_hu/books/handbook/jails/chapter.sgml#4 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/jails/chapter.sgml#4 (text+ko) ==== @@ -1,12 +1,12 @@ + Original Revision: 1.14 --> @@ -358,7 +358,7 @@ &prompt.root; cd /usr/src &prompt.root; make world DESTDIR=$D &prompt.root; cd etc/ Ez a -lépés nem szükséges a &os; 6.0-ás vagy annál újabb verziójában. +lépés nem szükséges a &os; 6.0-ás vagy annál újabb verziójában. &prompt.root; make distribution DESTDIR=$D &prompt.root; mount_devfs devfs $D/dev @@ -1085,22 +1085,50 @@ jail_list="ns mail www" jail_ns_hostname="ns.example.org" jail_ns_ip="192.168.3.17" -jail_ns_rootdir="/home/j/ns" +jail_ns_rootdir="/usr/home/j/ns" jail_ns_devfs_enable="YES" jail_mail_hostname="mail.example.org" jail_mail_ip="192.168.3.18" -jail_mail_rootdir="/home/j/mail" +jail_mail_rootdir="/usr/home/j/mail" jail_mail_devfs_enable="YES" jail_www_hostname="www.example.org" jail_www_ip="62.123.43.14" -jail_www_rootdir="/home/j/www" +jail_www_rootdir="/usr/home/j/www" jail_www_devfs_enable="YES" + + + Azért állítottuk a + jail_név_rootdir + változó értékét a + /usr/home + könyvtárra a /home könyvtár + helyett, mert a &os; + alaptelepítésében a /home könyvtár + fizikailag a /usr/home + könyvtárral egyezik meg. A + jail_név_rootdir + változó értékeként + megadott könyvtár nem + tartalmazhat szimbolikus linket, + máskülönben az elzárások + nem lesznek hajlandóak létrejönni. + Ennek megállapításában a + &man.realpath.1; segédprogram lehet + segítségünkre. A + korlátozás részleteirõl a + &os;-SA-07:01.jail biztonsági + figyelmeztetésben olvashatunk. + + Hozzuk létre az egyes elzárások - csatlakozási pontjait az írásvédett - állományrendszerben: + állományrendszereihez szükséges + csatlakozási pontokat: &prompt.root; mkdir /home/j/ns /home/j/mail /home/j/www From owner-p4-projects@FreeBSD.ORG Sat Mar 15 05:10:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C42C31065673; Sat, 15 Mar 2008 05:10:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8330F1065671 for ; Sat, 15 Mar 2008 05:10:16 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 671218FC13 for ; Sat, 15 Mar 2008 05:10:16 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2F5AGQp085014 for ; Sat, 15 Mar 2008 05:10:16 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2F5AGET085012 for perforce@freebsd.org; Sat, 15 Mar 2008 05:10:16 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 15 Mar 2008 05:10:16 GMT Message-Id: <200803150510.m2F5AGET085012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 137775 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, 15 Mar 2008 05:10:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=137775 Change 137775 by pgj@disznohal on 2008/03/15 05:10:11 (linuxemu) MFen: 1.134 --> 1.135 Affected files ... .. //depot/projects/docproj_hu/books/handbook/linuxemu/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/linuxemu/chapter.sgml#3 (text+ko) ==== @@ -1,12 +1,12 @@ + Original Revision: 1.135 --> @@ -3151,11 +3151,13 @@ alábbi csomagokat kell még telepítenünk: - compat-libs-5.2-2.i386.rpm - compat-glibc-5.2-2.0.7.2.i386.rpm - compat-egcs-5.2-1.0.3a.1.i386.rpm - compat-egcs-c++-5.2-1.0.3a.1.i386.rpm - compat-binutils-5.2-2.9.1.0.23.1.i386.rpm + + compat-libs-5.2-2.i386.rpm + compat-glibc-5.2-2.0.7.2.i386.rpm + compat-egcs-5.2-1.0.3a.1.i386.rpm + compat-egcs-c++-5.2-1.0.3a.1.i386.rpm + compat-binutils-5.2-2.9.1.0.23.1.i386.rpm + A részleteket ld. az &sap; füzeteiben vagy az &oracle; Readme From owner-p4-projects@FreeBSD.ORG Sat Mar 15 06:52:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 764D01065672; Sat, 15 Mar 2008 06:52:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 347781065670 for ; Sat, 15 Mar 2008 06:52:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1556B8FC19 for ; Sat, 15 Mar 2008 06:52:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2F6q4Y9089275 for ; Sat, 15 Mar 2008 06:52:04 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2F6q3f1089273 for perforce@freebsd.org; Sat, 15 Mar 2008 06:52:03 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Mar 2008 06:52:03 GMT Message-Id: <200803150652.m2F6q3f1089273@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 137778 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, 15 Mar 2008 06:52:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=137778 Change 137778 by kmacy@pandemonium:kmacy:iwarp on 2008/03/15 06:51:07 IFC 137757 Affected files ... .. //depot/projects/iwarp/lib/libarchive/Makefile#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_entry.3#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_entry.c#4 integrate .. //depot/projects/iwarp/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_tar.c#5 integrate .. //depot/projects/iwarp/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_set_compression_compress.c#1 branch .. //depot/projects/iwarp/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_archive_api_feature.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_entry.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_write_compress.c#1 branch .. //depot/projects/iwarp/lib/libpmc/pmc.3#4 integrate .. //depot/projects/iwarp/share/man/man9/Makefile#10 integrate .. //depot/projects/iwarp/share/man/man9/stack.9#2 integrate .. //depot/projects/iwarp/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/iwarp/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/iwarp/sys/arm/arm/intr.c#2 integrate .. //depot/projects/iwarp/sys/dev/aac/aac.c#6 integrate .. //depot/projects/iwarp/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/iwarp/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/iwarp/sys/dev/usb/usbdevs#11 integrate .. //depot/projects/iwarp/sys/i386/i386/intr_machdep.c#4 edit .. //depot/projects/iwarp/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/iwarp/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/iwarp/sys/kern/kern_intr.c#6 integrate .. //depot/projects/iwarp/sys/kern/sched_ule.c#8 integrate .. //depot/projects/iwarp/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/iwarp/sys/netinet6/ip6_ipsec.c#3 integrate .. //depot/projects/iwarp/sys/netinet6/ip6_ipsec.h#3 integrate .. //depot/projects/iwarp/sys/netinet6/ip6_output.c#6 integrate .. //depot/projects/iwarp/sys/netipsec/ipsec_output.c#3 integrate .. //depot/projects/iwarp/sys/netipsec/key.c#3 integrate .. //depot/projects/iwarp/sys/pc98/include/nexusvar.h#1 branch .. //depot/projects/iwarp/sys/powerpc/powerpc/intr_machdep.c#6 integrate .. //depot/projects/iwarp/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/iwarp/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/iwarp/sys/sys/interrupt.h#2 integrate .. //depot/projects/iwarp/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#3 integrate Differences ... ==== //depot/projects/iwarp/lib/libarchive/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.80 2008/01/23 05:48:07 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.82 2008/03/14 23:00:53 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -81,6 +81,7 @@ archive_write_open_filename.c \ archive_write_open_memory.c \ archive_write_set_compression_bzip2.c \ + archive_write_set_compression_compress.c \ archive_write_set_compression_gzip.c \ archive_write_set_compression_none.c \ archive_write_set_compression_program.c \ @@ -120,6 +121,8 @@ MLINKS+= archive_entry.3 archive_entry_copy_gname.3 MLINKS+= archive_entry.3 archive_entry_copy_gname_w.3 MLINKS+= archive_entry.3 archive_entry_copy_hardlink_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_link.3 +MLINKS+= archive_entry.3 archive_entry_copy_link_w.3 MLINKS+= archive_entry.3 archive_entry_copy_pathname_w.3 MLINKS+= archive_entry.3 archive_entry_copy_stat.3 MLINKS+= archive_entry.3 archive_entry_copy_symlink_w.3 ==== //depot/projects/iwarp/lib/libarchive/archive.h.in#3 (text+ko) ==== @@ -22,18 +22,12 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.47 2007/12/30 04:58:21 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.49 2008/03/14 22:19:50 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED #define ARCHIVE_H_INCLUDED -/* - * This header file corresponds to: - * Library version @ARCHIVE_VERSION@ - * Shared library version @SHLIB_MAJOR@ - */ - #include /* Linux requires this for off_t */ @ARCHIVE_H_INCLUDE_INTTYPES_H@ #include /* For FILE * */ @@ -51,58 +45,59 @@ #endif /* - * Each of the version identifiers comes as a macro and a function. + * The version number is provided as both a macro and a function. * The macro identifies the installed header; the function identifies * the library version (which may not be the same if you're using a * dynamically-linked version of the library). */ /* - * Textual name/version of the library, useful for version displays. - */ -#define ARCHIVE_LIBRARY_VERSION "libarchive @LIBARCHIVE_VERSION_STRING@" -const char * archive_version(void); - -/* - * The "version stamp" is a single integer that makes it easy to check - * the exact version: for version a.b.c, the version stamp is - * printf("%d%03d%03d",a,b,c). For example, version 2.12.108 has - * version stamp 2012108. + * The version number is expressed as a single integer that makes it + * easy to compare versions at build time: for version a.b.c, the + * version number is printf("%d%03d%03d",a,b,c). For example, if you + * know your application requires version 2.12.108 or later, you can + * assert that ARCHIVE_VERSION >= 2012108. * - * This was introduced with libarchive 1.9.0 in the libarchive 1.x family - * and libarchive 2.2.4 in the libarchive 2.x family. The following - * may be useful if you really want to do feature detection for earlier - * libarchive versions (which defined API_VERSION and API_FEATURE): + * This single-number format was introduced with libarchive 1.9.0 in + * the libarchive 1.x family and libarchive 2.2.4 in the libarchive + * 2.x family. The following may be useful if you really want to do + * feature detection for earlier libarchive versions (which defined + * ARCHIVE_API_VERSION and ARCHIVE_API_FEATURE instead): * - * #ifndef ARCHIVE_VERSION_STAMP - * #define ARCHIVE_VERSION_STAMP \ + * #ifndef ARCHIVE_VERSION_NUMBER + * #define ARCHIVE_VERSION_NUMBER \ * (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000) * #endif */ -#define ARCHIVE_VERSION_STAMP @LIBARCHIVE_VERSION@ -int archive_version_stamp(void); +#define ARCHIVE_VERSION_NUMBER @LIBARCHIVE_VERSION@ +int archive_version_number(void); /* - * Major version number: If ARCHIVE_API_VERSION != - * archive_api_version(), then the library you were linked with is - * using an incompatible API to the one you were compiled with. This - * is almost certainly a fatal problem. - * This is deprecated and will be removed; use ARCHIVE_VERSION_STAMP - * instead. + * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_API_VERSION (ARCHIVE_VERSION_STAMP / 1000000) -int archive_api_version(void); +const char * archive_version_string(void); +#if ARCHIVE_VERSION_NUMBER < 3000000 /* - * Minor version number. This is deprecated and will be removed. - * Use ARCHIVE_VERSION_STAMP to adapt to libarchive API variations. + * Deprecated; these are older names that will be removed in favor of + * the simpler definitions above. */ -#define ARCHIVE_API_FEATURE ((ARCHIVE_VERSION_STAMP / 1000) % 1000) +#define ARCHIVE_VERSION_STAMP ARCHIVE_VERSION_NUMBER +int archive_version_stamp(void); +#define ARCHIVE_LIBRARY_VERSION "libarchive @LIBARCHIVE_VERSION_STRING@" +const char * archive_version(void); +#define ARCHIVE_API_VERSION (ARCHIVE_VERSION_NUMBER / 1000000) +int archive_api_version(void); +#define ARCHIVE_API_FEATURE ((ARCHIVE_VERSION_NUMBER / 1000) % 1000) int archive_api_feature(void); +#endif - +#if ARCHIVE_VERSION_NUMBER < 3000000 +/* This should never have been here in the first place. */ +/* Legacy of old tar assumptions, will be removed in libarchive 3.0. */ #define ARCHIVE_BYTES_PER_RECORD 512 #define ARCHIVE_DEFAULT_BYTES_PER_BLOCK 10240 +#endif /* Declare our basic types. */ struct archive; @@ -119,6 +114,7 @@ #define ARCHIVE_WARN (-20) /* Partial success. */ /* For example, if write_header "fails", then you can't push data. */ #define ARCHIVE_FAILED (-25) /* Current operation cannot complete. */ +/* But if write_header is "fatal," then this archive is dead and useless. */ #define ARCHIVE_FATAL (-30) /* No more operations are possible. */ /* @@ -146,7 +142,7 @@ typedef ssize_t archive_read_callback(struct archive *, void *_client_data, const void **_buffer); /* Skips at most request bytes from archive and returns the skipped amount */ -#if ARCHIVE_API_VERSION < 2 +#if ARCHIVE_VERSION_NUMBER < 2000000 typedef ssize_t archive_skip_callback(struct archive *, void *_client_data, size_t request); #else @@ -370,7 +366,7 @@ int archive_read_close(struct archive *); /* Release all resources and destroy the object. */ /* Note that archive_read_finish will call archive_read_close for you. */ -#if ARCHIVE_API_VERSION > 1 +#if ARCHIVE_VERSION_NUMBER >= 2000000 int archive_read_finish(struct archive *); #else /* Temporarily allow library to compile with either 1.x or 2.0 API. */ @@ -407,6 +403,7 @@ int archive_write_set_skip_file(struct archive *, dev_t, ino_t); int archive_write_set_compression_bzip2(struct archive *); +int archive_write_set_compression_compress(struct archive *); int archive_write_set_compression_gzip(struct archive *); int archive_write_set_compression_none(struct archive *); int archive_write_set_compression_program(struct archive *, @@ -445,7 +442,7 @@ */ int archive_write_header(struct archive *, struct archive_entry *); -#if ARCHIVE_API_VERSION > 1 +#if ARCHIVE_VERSION_NUMBER >= 2000000 ssize_t archive_write_data(struct archive *, const void *, size_t); #else /* Temporarily allow library to compile with either 1.x or 2.0 API. */ @@ -455,7 +452,7 @@ ssize_t archive_write_data_block(struct archive *, const void *, size_t, off_t); int archive_write_finish_entry(struct archive *); int archive_write_close(struct archive *); -#if ARCHIVE_API_VERSION > 1 +#if ARCHIVE_VERSION_NUMBER >= 2000000 int archive_write_finish(struct archive *); #else /* Temporarily allow library to compile with either 1.x or 2.0 API. */ ==== //depot/projects/iwarp/lib/libarchive/archive_entry.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.16 2008/03/10 14:44:40 jkoshy Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.17 2008/03/14 23:00:53 kientzle Exp $ .\" .Dd December 15, 2003 .Dt archive_entry 3 @@ -45,6 +45,8 @@ .Nm archive_entry_copy_gname_w , .Nm archive_entry_copy_hardlink , .Nm archive_entry_copy_hardlink_w , +.Nm archive_entry_copy_link , +.Nm archive_entry_copy_link_w , .Nm archive_entry_copy_pathname_w , .Nm archive_entry_copy_stat , .Nm archive_entry_copy_symlink , ==== //depot/projects/iwarp/lib/libarchive/archive_entry.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.47 2008/03/12 04:47:37 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.51 2008/03/14 23:19:46 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -207,6 +207,8 @@ static const wchar_t * aes_get_wcs(struct aes *aes) { + int r; + if (aes->aes_wcs == NULL && aes->aes_mbs == NULL) return NULL; if (aes->aes_wcs == NULL && aes->aes_mbs != NULL) { @@ -221,8 +223,13 @@ aes->aes_wcs = aes->aes_wcs_alloc; if (aes->aes_wcs == NULL) __archive_errx(1, "No memory for aes_get_wcs()"); - mbstowcs(aes->aes_wcs_alloc, aes->aes_mbs, wcs_length); + r = mbstowcs(aes->aes_wcs_alloc, aes->aes_mbs, wcs_length); aes->aes_wcs_alloc[wcs_length] = 0; + if (r == -1) { + /* Conversion failed, don't lie to our clients. */ + free(aes->aes_wcs_alloc); + aes->aes_wcs = aes->aes_wcs_alloc = NULL; + } } return (aes->aes_wcs); } @@ -307,6 +314,8 @@ struct archive_entry * archive_entry_clear(struct archive_entry *entry) { + if (entry == NULL) + return (NULL); aes_clean(&entry->ae_fflags_text); aes_clean(&entry->ae_gname); aes_clean(&entry->ae_hardlink); @@ -752,7 +761,29 @@ aes_set_mbs(&entry->ae_hardlink, target); } +/* Set symlink if symlink is already set, else set hardlink. */ void +archive_entry_copy_link(struct archive_entry *entry, const char *target) +{ + if (entry->ae_symlink.aes_mbs != NULL || + entry->ae_symlink.aes_wcs != NULL) + aes_copy_mbs(&entry->ae_symlink, target); + else + aes_copy_mbs(&entry->ae_hardlink, target); +} + +/* Set symlink if symlink is already set, else set hardlink. */ +void +archive_entry_copy_link_w(struct archive_entry *entry, const wchar_t *target) +{ + if (entry->ae_symlink.aes_mbs != NULL || + entry->ae_symlink.aes_wcs != NULL) + aes_copy_wcs(&entry->ae_symlink, target); + else + aes_copy_wcs(&entry->ae_hardlink, target); +} + +void archive_entry_set_mode(struct archive_entry *entry, mode_t m) { entry->stat_valid = 0; @@ -1148,7 +1179,7 @@ archive_entry_acl_text_w(struct archive_entry *entry, int flags) { int count; - int length; + size_t length; const wchar_t *wname; const wchar_t *prefix; wchar_t separator; ==== //depot/projects/iwarp/lib/libarchive/archive_entry.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.24 2007/12/30 04:58:21 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.26 2008/03/14 23:00:53 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -57,7 +57,25 @@ struct archive_entry; /* - * File-type constants. These are returned from archive_entry_filetype(). + * File-type constants. These are returned from archive_entry_filetype() + * and passed to archive_entry_set_filetype(). + * + * These values match S_XXX defines on every platform I've checked, + * including Windows, AIX, Linux, Solaris, and BSD. They're + * (re)defined here because platforms generally don't define the ones + * they don't support. For example, Windows doesn't define S_IFLNK or + * S_IFBLK. Instead of having a mass of conditional logic and system + * checks to define any S_XXX values that aren't supported locally, + * I've just defined a new set of such constants so that + * libarchive-based applications can manipulate and identify archive + * entries properly even if the hosting platform can't store them on + * disk. + * + * These values are also used directly within some portable formats, + * such as cpio. If you find a platform that varies from these, the + * correct solution is to leave these alone and translate from these + * portable values to platform-native values when entries are read from + * or written to disk. */ #define AE_IFMT 0170000 #define AE_IFREG 0100000 @@ -91,7 +109,8 @@ dev_t archive_entry_devminor(struct archive_entry *); mode_t archive_entry_filetype(struct archive_entry *); void archive_entry_fflags(struct archive_entry *, - unsigned long *set, unsigned long *clear); + unsigned long * /* set */, + unsigned long * /* clear */); const char *archive_entry_fflags_text(struct archive_entry *); gid_t archive_entry_gid(struct archive_entry *); const char *archive_entry_gname(struct archive_entry *); @@ -130,7 +149,7 @@ void archive_entry_set_devminor(struct archive_entry *, dev_t); void archive_entry_set_filetype(struct archive_entry *, unsigned int); void archive_entry_set_fflags(struct archive_entry *, - unsigned long set, unsigned long clear); + unsigned long /* set */, unsigned long /* clear */); /* Returns pointer to start of first invalid token, or NULL if none. */ /* Note that all recognized tokens are processed, regardless. */ const wchar_t *archive_entry_copy_fflags_text_w(struct archive_entry *, @@ -144,6 +163,8 @@ void archive_entry_copy_hardlink_w(struct archive_entry *, const wchar_t *); void archive_entry_set_ino(struct archive_entry *, unsigned long); void archive_entry_set_link(struct archive_entry *, const char *); +void archive_entry_copy_link(struct archive_entry *, const char *); +void archive_entry_copy_link_w(struct archive_entry *, const wchar_t *); void archive_entry_set_mode(struct archive_entry *, mode_t); void archive_entry_set_mtime(struct archive_entry *, time_t, long); void archive_entry_set_nlink(struct archive_entry *, unsigned int); @@ -182,6 +203,13 @@ * = there are many different ACL text formats * = would like to be able to read/convert archives containing ACLs * on platforms that lack ACL libraries + * + * This last point, in particular, forces me to implement a reasonably + * complete set of ACL support routines. + * + * TODO: Extend this to support NFSv4/NTFS permissions. That should + * allow full ACL support on Mac OS, in particular, which uses + * POSIX.1e-style interfaces to manipulate NFSv4/NTFS permissions. */ /* @@ -216,21 +244,24 @@ */ void archive_entry_acl_clear(struct archive_entry *); void archive_entry_acl_add_entry(struct archive_entry *, - int type, int permset, int tag, int qual, const char *name); + int /* type */, int /* permset */, int /* tag */, + int /* qual */, const char * /* name */); void archive_entry_acl_add_entry_w(struct archive_entry *, - int type, int permset, int tag, int qual, const wchar_t *name); + int /* type */, int /* permset */, int /* tag */, + int /* qual */, const wchar_t * /* name */); /* * To retrieve the ACL, first "reset", then repeatedly ask for the * "next" entry. The want_type parameter allows you to request only * access entries or only default entries. */ -int archive_entry_acl_reset(struct archive_entry *, int want_type); -int archive_entry_acl_next(struct archive_entry *, int want_type, - int *type, int *permset, int *tag, int *qual, const char **name); -int archive_entry_acl_next_w(struct archive_entry *, int want_type, - int *type, int *permset, int *tag, int *qual, - const wchar_t **name); +int archive_entry_acl_reset(struct archive_entry *, int /* want_type */); +int archive_entry_acl_next(struct archive_entry *, int /* want_type */, + int * /* type */, int * /* permset */, int * /* tag */, + int * /* qual */, const char ** /* name */); +int archive_entry_acl_next_w(struct archive_entry *, int /* want_type */, + int * /* type */, int * /* permset */, int * /* tag */, + int * /* qual */, const wchar_t ** /* name */); /* * Construct a text-format ACL. The flags argument is a bitmask that @@ -245,10 +276,11 @@ */ #define ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID 1024 #define ARCHIVE_ENTRY_ACL_STYLE_MARK_DEFAULT 2048 -const wchar_t *archive_entry_acl_text_w(struct archive_entry *, int flags); +const wchar_t *archive_entry_acl_text_w(struct archive_entry *, + int /* flags */); /* Return a count of entries matching 'want_type' */ -int archive_entry_acl_count(struct archive_entry *, int want_type); +int archive_entry_acl_count(struct archive_entry *, int /* want_type */); /* * Private ACL parser. This is private because it handles some @@ -259,9 +291,12 @@ * this interface are likely to be surprised when it changes. * * You were warned! + * + * TODO: Move this declaration out of the public header and into + * a private header. Warnings above are silly. */ int __archive_entry_acl_parse_w(struct archive_entry *, - const wchar_t *, int type); + const wchar_t *, int /* type */); /* * extended attributes @@ -269,7 +304,8 @@ void archive_entry_xattr_clear(struct archive_entry *); void archive_entry_xattr_add_entry(struct archive_entry *, - const char *name, const void *value, size_t size); + const char * /* name */, const void * /* value */, + size_t /* size */); /* * To retrieve the xattr list, first "reset", then repeatedly ask for the @@ -279,7 +315,7 @@ int archive_entry_xattr_count(struct archive_entry *); int archive_entry_xattr_reset(struct archive_entry *); int archive_entry_xattr_next(struct archive_entry *, - const char **name, const void **value, size_t *); + const char ** /* name */, const void ** /* value */, size_t *); /* * Utility to detect hardlinks. ==== //depot/projects/iwarp/lib/libarchive/archive_read_support_format_tar.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.65 2008/01/31 07:41:45 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.66 2008/03/14 20:32:20 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -714,7 +714,7 @@ { unsigned i; - for (i = 0; i < ARCHIVE_BYTES_PER_RECORD / sizeof(*p); i++) + for (i = 0; i < 512; i++) if (*p++) return (0); return (1); ==== //depot/projects/iwarp/lib/libarchive/archive_string.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_string.h,v 1.9 2007/05/29 01:00:19 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_string.h,v 1.10 2008/03/14 22:00:09 kientzle Exp $ * */ @@ -116,4 +116,7 @@ va_list); #define archive_string_vsprintf __archive_string_vsprintf +void __archive_string_sprintf(struct archive_string *, const char *, ...); +#define archive_string_sprintf __archive_string_sprintf + #endif ==== //depot/projects/iwarp/lib/libarchive/archive_string_sprintf.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_string_sprintf.c,v 1.9 2007/07/15 19:13:59 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_string_sprintf.c,v 1.10 2008/03/14 22:00:09 kientzle Exp $"); /* * The use of printf()-family functions can be troublesome @@ -44,6 +44,16 @@ #include "archive_string.h" #include "archive_private.h" +void +__archive_string_sprintf(struct archive_string *as, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + archive_string_vsprintf(as, fmt, ap); + va_end(ap); +} + /* * Like 'vsprintf', but ensures the target is big enough, resizing if * necessary. ==== //depot/projects/iwarp/lib/libarchive/archive_util.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.16 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.17 2008/03/14 22:31:57 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -38,29 +38,71 @@ #include "archive.h" #include "archive_private.h" +#include "archive_string.h" +#if ARCHIVE_VERSION_NUMBER < 3000000 +/* These disappear in libarchive 3.0 */ +/* Deprecated. */ int archive_api_feature(void) { return (ARCHIVE_API_FEATURE); } +/* Deprecated. */ int archive_api_version(void) { return (ARCHIVE_API_VERSION); } +/* Deprecated synonym for archive_version_number() */ int archive_version_stamp(void) { - return (ARCHIVE_VERSION_STAMP); + return (archive_version_number()); } +/* Deprecated synonym for archive_version_string() */ const char * archive_version(void) { - return (ARCHIVE_LIBRARY_VERSION); + return (archive_version_string()); +} +#endif + +int +archive_version_number(void) +{ + return (ARCHIVE_VERSION_NUMBER); +} + +/* + * Format a version string of the form "libarchive x.y.z", where x, y, + * z are the correct parts of the version ID from + * archive_version_number(). + * + * I used to do all of this at build time in shell scripts but that + * proved to be a portability headache. + */ + +const char * +archive_version_string(void) +{ + static char buff[128]; + struct archive_string as; + int n; + + if (buff[0] == '\0') { + n = archive_version_number(); + memset(&as, 0, sizeof(as)); + archive_string_sprintf(&as, "libarchive %d.%d.%d", + n / 1000000, (n / 1000) % 1000, n % 1000); + strncpy(buff, as.s, sizeof(buff)); + buff[sizeof(buff) - 1] = '\0'; + archive_string_free(&as); + } + return (buff); } int ==== //depot/projects/iwarp/lib/libarchive/archive_write.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.26 2007/05/29 01:00:19 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.27 2008/03/14 23:09:02 kientzle Exp $"); /* * This file contains the "essential" portions of the write API, that @@ -97,7 +97,12 @@ a->archive.magic = ARCHIVE_WRITE_MAGIC; a->archive.state = ARCHIVE_STATE_NEW; a->archive.vtable = archive_write_vtable(); - a->bytes_per_block = ARCHIVE_DEFAULT_BYTES_PER_BLOCK; + /* + * The value 10240 here matches the traditional tar default, + * but is otherwise arbitrary. + * TODO: Set the default block size from the format selected. + */ + a->bytes_per_block = 10240; a->bytes_in_last_block = -1; /* Default */ /* Initialize a block of nulls for padding purposes. */ ==== //depot/projects/iwarp/lib/libarchive/test/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.15 2008/03/12 05:12:23 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.16 2008/03/14 20:35:38 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -48,6 +48,7 @@ test_tar_filenames.c \ test_tar_large.c \ test_write_compress_program.c \ + test_write_compress.c \ test_write_disk.c \ test_write_disk_hardlink.c \ test_write_disk_perms.c \ ==== //depot/projects/iwarp/lib/libarchive/test/test_archive_api_feature.c#2 (text+ko) ==== @@ -23,10 +23,23 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_archive_api_feature.c,v 1.3 2007/07/06 15:43:11 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_archive_api_feature.c,v 1.4 2008/03/14 22:31:57 kientzle Exp $"); DEFINE_TEST(test_archive_api_feature) { + char buff[128]; + + /* This is the (hopefully) final versioning API. */ + assertEqualInt(ARCHIVE_VERSION_NUMBER, archive_version_number()); + sprintf(buff, "libarchive %d.%d.%d", + archive_version_number() / 1000000, + (archive_version_number() / 1000) % 1000, + archive_version_number() % 1000); + assertEqualString(buff, archive_version_string()); + +/* This is all scheduled to disappear in libarchive 3.0 */ +#if ARCHIVE_VERSION_NUMBER < 3000000 + assertEqualInt(ARCHIVE_VERSION_STAMP, ARCHIVE_VERSION_NUMBER); assertEqualInt(ARCHIVE_API_FEATURE, archive_api_feature()); assertEqualInt(ARCHIVE_API_VERSION, archive_api_version()); /* @@ -48,4 +61,5 @@ skipping("archive_version_stamp()"); #endif assertEqualString(ARCHIVE_LIBRARY_VERSION, archive_version()); +#endif } ==== //depot/projects/iwarp/lib/libarchive/test/test_entry.c#3 (text+ko) ==== @@ -23,7 +23,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_entry.c,v 1.3 2008/03/12 04:47:37 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_entry.c,v 1.5 2008/03/14 23:19:46 kientzle Exp $"); + +#include /* * Most of these tests are system-independent, though a few depend on @@ -120,8 +122,37 @@ #else skipping("archive_entry_ino()"); #endif + /* link */ - /* TODO: implement these tests. */ + archive_entry_set_hardlink(e, "hardlinkname"); + archive_entry_set_symlink(e, NULL); + archive_entry_set_link(e, "link"); + assertEqualString(archive_entry_hardlink(e), "link"); + assertEqualString(archive_entry_symlink(e), NULL); + archive_entry_copy_link(e, "link2"); + assertEqualString(archive_entry_hardlink(e), "link2"); + assertEqualString(archive_entry_symlink(e), NULL); + archive_entry_copy_link_w(e, L"link3"); + assertEqualString(archive_entry_hardlink(e), "link3"); + assertEqualString(archive_entry_symlink(e), NULL); + archive_entry_set_hardlink(e, NULL); + archive_entry_set_symlink(e, "symlink"); + archive_entry_set_link(e, "link"); + assertEqualString(archive_entry_hardlink(e), NULL); + assertEqualString(archive_entry_symlink(e), "link"); + archive_entry_copy_link(e, "link2"); + assertEqualString(archive_entry_hardlink(e), NULL); + assertEqualString(archive_entry_symlink(e), "link2"); + archive_entry_copy_link_w(e, L"link3"); + assertEqualString(archive_entry_hardlink(e), NULL); + assertEqualString(archive_entry_symlink(e), "link3"); + /* Arbitrarily override hardlink if both hardlink and symlink set. */ + archive_entry_set_hardlink(e, "hardlink"); + archive_entry_set_symlink(e, "symlink"); + archive_entry_set_link(e, "link"); + assertEqualString(archive_entry_hardlink(e), "hardlink"); + assertEqualString(archive_entry_symlink(e), "link"); + /* mode */ archive_entry_set_mode(e, 0123456); assertEqualInt(archive_entry_mode(e), 0123456); @@ -692,6 +723,39 @@ #endif #endif + /* + * Exercise the character-conversion logic, if we can. + */ + failure("Can't exercise charset-conversion logic."); + if (assert(NULL != setlocale(LC_ALL, "de_DE.UTF-8"))) { + /* A filename that cannot be converted to wide characters. */ + archive_entry_copy_pathname(e, "abc\314\214mno\374xyz"); + failure("Converting invalid chars to Unicode should fail."); + assert(NULL == archive_entry_pathname_w(e)); + //failure("Converting invalid chars to UTF-8 should fail."); + //assert(NULL == archive_entry_pathname_utf8(e)); + + /* A group name that cannot be converted. */ + archive_entry_copy_gname(e, "abc\314\214mno\374xyz"); + failure("Converting invalid chars to Unicode should fail."); + assert(NULL == archive_entry_gname_w(e)); + + /* A user name that cannot be converted. */ + archive_entry_copy_uname(e, "abc\314\214mno\374xyz"); + failure("Converting invalid chars to Unicode should fail."); + assert(NULL == archive_entry_uname_w(e)); + + /* A hardlink target that cannot be converted. */ + archive_entry_copy_hardlink(e, "abc\314\214mno\374xyz"); + failure("Converting invalid chars to Unicode should fail."); + assert(NULL == archive_entry_hardlink_w(e)); + + /* A symlink target that cannot be converted. */ + archive_entry_copy_symlink(e, "abc\314\214mno\374xyz"); + failure("Converting invalid chars to Unicode should fail."); + assert(NULL == archive_entry_symlink_w(e)); + } + /* Release the experimental entry. */ archive_entry_free(e); } ==== //depot/projects/iwarp/lib/libpmc/pmc.3#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2003-2007 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2003-2008 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.16 2008/02/03 06:04:38 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.17 2008/03/14 06:22:03 jkoshy Exp $ .\" -.Dd November 25, 2007 +.Dd March 14, 2008 .Os .Dt PMC 3 .Sh NAME @@ -136,6 +136,10 @@ .It PMC_CPU_AMD_K8 .Tn "AMD Athlon64" CPUs. +.It PMC_CPU_INTEL_P5 +.Tn Intel +.Tn "Pentium" +CPUs. .It PMC_CPU_INTEL_P6 .Tn Intel .Tn "Pentium Pro" @@ -169,6 +173,11 @@ Programmable hardware counters present in .Tn "AMD Athlon64" CPUs. +.It PMC_CLASS_P5 +Programmable hardware counters present in +.Tn Intel +.Tn Pentium +CPUs. .It PMC_CLASS_P6 Programmable hardware counters present in .Tn Intel @@ -1198,6 +1207,333 @@ .Pp The default is to count all types of messages. .El +.Ss Intel Pentium PMCS +Intel Pentium PMCs are present in Intel +.Tn Pentium +and +.Tn "Pentium MMX" +processors. +.Pp +These CPUs have two counters. +Some events may only be used on specific counters and some events +are defined only on processors supporting the MMX instruction set. +.Pp +These PMCs are documented in +.Rs +.%B "Intel 64 and IA-32 Intel(R) Architectures Software Developer's Manual" +.%T "Volume 3B: System Programming Guide, Part 2" +.%N "Order Number 253669-024US" +.%D "August 2007" +.%Q "Intel Corporation" +.Re +.Pp +Event specifiers for Intel Pentium PMCs can have the following common +qualifiers: +.Bl -tag -width indent +.It Li duration +Count duration (in clocks) of events. +The default is to count events. +.It Li os +Measure events at privilege levels 0, 1 and 2. +.It Li overflow +Assert the external processor pin associated with a counter on counter +overflow. +.It Li usr +Measure events at privilege level 3. +.El +.Pp +Note that these PMCs do not have the ability to interrupt the CPU. +.Pp +The event specifiers supported by Intel Pentium PMCs are: +.Bl -tag -width indent +.It Li p5-any-segment-register-loaded +The number of writes to any segment register, including the LDTR, +GDTR, TR and IDTR. +Far control transfers and task switches that involve privilege +level changes will count this event twice. +.It Li p5-bank-conflicts +The number of actual bank conflicts. +.It Li p5-branches +The number of taken and not taken branches including branches, jumps, calls, +software interrupts and interrupt returns. +.It Li p5-breakpoint-match-on-dr0-register +The number of matches on the DR0 breakpoint register. +.It Li p5-breakpoint-match-on-dr1-register +The number of matches on the DR1 breakpoint register. +.It Li p5-breakpoint-match-on-dr2-register +The number of matches on the DR2 breakpoint register. +.It Li p5-breakpoint-match-on-dr3-register +The number of matches on the DR3 breakpoint register. +.It Li p5-btb-false-entries +.Pq Tn Pentium MMX +The number of false entries in the BTB. +This event is only allocated on counter 0. +.It Li p5-btb-hits +The number of branches executed that hit in the branch table buffer. +.It Li p5-btb-miss-prediction-on-not-taken-branch +.Pq Tn Pentium MMX +The number of times the BTB predicted a not-taken branch as taken. +This event is only allocated on counter 1. +.It Li p5-bus-cycle-duration +The number of cycles while a bus cycle was in progress. +.It Li p5-bus-ownership-latency +.Pq Tn Pentium MMX +The time from bus ownership being requested to ownership being granted. +This event is only allocated on counter 0. +.It Li p5-bus-ownership-transfers +.Pq Tn Pentium MMX +The number of bus ownership transfers. +This event is only allocated on counter 1. +.It Li p5-bus-utilization-due-to-processor-activity +.Pq Tn Pentium MMX +The number of clocks the bus is busy due to the processor's own +activity. +This event is only allocated on counter 0. +.It Li p5-cache-line-sharing +.Pq Tn Pentium MMX +The number of shared data lines in L1 cache. +This event is only allocated on counter 1. +.It Li p5-cache-m-state-line-sharing +.Pq Tn Pentium MMX +The number of hits to an M- state line due to a memory access by +another processor. +This event is only allocated on counter 0. +.It Li p5-code-cache-miss +The number of instruction reads that miss the internal code cache. +Both cacheable and uncacheable misses are counted. +.It Li p5-code-read +The number of instruction reads to both cacheable and uncacheable regions. +.It Li p5-code-tlb-miss +The number of instruction reads that miss the instruction TLB. +Both cacheable and uncacheable unreads are counted. +.It Li p5-d1-starvation-and-fifo-is-empty +.Pq Tn Pentium MMX +The number of times the D1 stage cannot issue any instructions because +the FIFO was empty. +This event is only allocated on counter 0. +.It Li p5-d1-starvation-and-only-one-instruction-in-fifo +.Pq Tn Pentium MMX +The number of times the D1 stage could issue only one instruction +because the FIFO had one instruction ready. +This event is only allocated on counter 1. +.It Li p5-data-cache-lines-written-back +The number of data cache lines that are written back, including +those caused by internal and external snoops. +.It Li p5-data-cache-tlb-miss-stall-duration +.Pq Tn Pentium MMX +The number of clocks the pipeline is stalled due to a data cache +TLB miss. +This event is only allocated on counter 1. +.It Li p5-data-read >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 15 18:47:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BAE6106567A; Sat, 15 Mar 2008 18:47:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B1FA106566C for ; Sat, 15 Mar 2008 18:47:48 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 62CD88FC13 for ; Sat, 15 Mar 2008 18:47:48 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FIlmTq061800 for ; Sat, 15 Mar 2008 18:47:48 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FIlmvF061798 for perforce@freebsd.org; Sat, 15 Mar 2008 18:47:48 GMT (envelope-from csjp@freebsd.org) Date: Sat, 15 Mar 2008 18:47:48 GMT Message-Id: <200803151847.m2FIlmvF061798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 137790 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, 15 Mar 2008 18:47:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=137790 Change 137790 by csjp@ibm01 on 2008/03/15 18:47:15 - Add a pad element to inform users that this space is not being used as the compiler will align subsequent intgers to a 4 byte boundary since the structure is not packed. - Change the counters from unsigned to explicitly 64 bits Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpfdesc.h#11 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpfdesc.h#11 (text+ko) ==== @@ -75,8 +75,8 @@ #ifdef BPF_JITTER bpf_jit_filter *bd_bfilter; /* binary filter code */ #endif - u_long bd_rcount; /* number of packets received */ - u_long bd_dcount; /* number of packets dropped */ + u_int64_t bd_rcount; /* number of packets received */ + u_int64_t bd_dcount; /* number of packets dropped */ u_char bd_promisc; /* true if listening promiscuously */ u_char bd_state; /* idle, waiting, or timed out */ @@ -91,14 +91,14 @@ struct mtx bd_mtx; /* mutex for this descriptor */ struct callout bd_callout; /* for BPF timeouts with select */ struct label *bd_label; /* MAC label for descriptor */ - u_long bd_fcount; /* number of packets which matched filter */ + u_int64_t bd_fcount; /* number of packets which matched filter */ pid_t bd_pid; /* PID which created descriptor */ int bd_locked; /* true if descriptor is locked */ u_int bd_bufmode; /* Current buffer mode. */ - u_long bd_wcount; /* number of packets written */ - u_long bd_wfcount; /* number of packets that matched write filter */ - u_long bd_wdcount; /* number of packets dropped during a write */ - u_long bd_zcopy; /* number of zero copy operations */ + u_int64_t bd_wcount; /* number of packets written */ + u_int64_t bd_wfcount; /* number of packets that matched write filter */ + u_int64_t bd_wdcount; /* number of packets dropped during a write */ + u_int64_t bd_zcopy; /* number of zero copy operations */ }; /* Values for bd_state */ @@ -117,13 +117,14 @@ u_int bd_structsize; /* Size of this structure. */ u_char bd_promisc; u_char bd_immediate; + u_char __bd_pad[6]; int bd_hdrcmplt; int bd_direction; int bd_feedback; int bd_async; - u_long bd_rcount; - u_long bd_dcount; - u_long bd_fcount; + u_int64_t bd_rcount; + u_int64_t bd_dcount; + u_int64_t bd_fcount; int bd_sig; int bd_slen; int bd_hlen; @@ -131,10 +132,14 @@ pid_t bd_pid; char bd_ifname[IFNAMSIZ]; int bd_locked; - u_long bd_wcount; - u_long bd_wfcount; - u_long bd_wdcount; - u_long bd_zcopy; + u_int64_t bd_wcount; + u_int64_t bd_wfcount; + u_int64_t bd_wdcount; + u_int64_t bd_zcopy; + /* + * Spare 64 bit integers for future expansion. + */ + u_int64_t bd_spare[4]; }; #define BPFIF_LOCK(bif) mtx_lock(&(bif)->bif_mtx) From owner-p4-projects@FreeBSD.ORG Sat Mar 15 18:49:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C77971065677; Sat, 15 Mar 2008 18:49:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87A59106564A for ; Sat, 15 Mar 2008 18:49:50 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8FED38FC26 for ; Sat, 15 Mar 2008 18:49:50 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FInoZE061867 for ; Sat, 15 Mar 2008 18:49:50 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FInoK0061865 for perforce@freebsd.org; Sat, 15 Mar 2008 18:49:50 GMT (envelope-from csjp@freebsd.org) Date: Sat, 15 Mar 2008 18:49:50 GMT Message-Id: <200803151849.m2FInoK0061865@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 137791 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, 15 Mar 2008 18:49:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=137791 Change 137791 by csjp@ibm01 on 2008/03/15 18:49:28 Add a bufmode entry to the structure Affected files ... .. //depot/projects/zcopybpf/src/sys/net/bpf.c#50 edit .. //depot/projects/zcopybpf/src/sys/net/bpfdesc.h#12 edit Differences ... ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#50 (text+ko) ==== @@ -1981,6 +1981,7 @@ d->bd_wdcount = bd->bd_wdcount; d->bd_wfcount = bd->bd_wfcount; d->bd_zcopy = bd->bd_zcopy; + d->bd_bufmode = bd->bd_bufmode; } static int ==== //depot/projects/zcopybpf/src/sys/net/bpfdesc.h#12 (text+ko) ==== @@ -136,6 +136,7 @@ u_int64_t bd_wfcount; u_int64_t bd_wdcount; u_int64_t bd_zcopy; + int bd_bufmode; /* * Spare 64 bit integers for future expansion. */ From owner-p4-projects@FreeBSD.ORG Sat Mar 15 19:02:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6EAC1065672; Sat, 15 Mar 2008 19:02:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94FB41065670 for ; Sat, 15 Mar 2008 19:02:03 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9C1148FC1D for ; Sat, 15 Mar 2008 19:02:03 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FJ23Sw062265 for ; Sat, 15 Mar 2008 19:02:03 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FJ23Jh062263 for perforce@freebsd.org; Sat, 15 Mar 2008 19:02:03 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Mar 2008 19:02:03 GMT Message-Id: <200803151902.m2FJ23Jh062263@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 137792 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, 15 Mar 2008 19:02:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=137792 Change 137792 by kmacy@pandemonium:kmacy:iwarp on 2008/03/15 19:01:02 IFC 137789 Affected files ... .. //depot/projects/iwarp/lib/libarchive/archive_read_private.h#4 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_mtree.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_read_support_format_tar.c#6 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_disk.c#5 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_private.h#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_set_format_ar.c#4 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_set_format_cpio.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_set_format_cpio_newc.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_set_format_pax.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_set_format_shar.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/archive_write_set_format_ustar.c#3 integrate .. //depot/projects/iwarp/lib/libarchive/config_freebsd.h#3 integrate .. //depot/projects/iwarp/lib/libarchive/test/.cvsignore#1 branch .. //depot/projects/iwarp/lib/libarchive/test/Makefile#6 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_empty_write.c#2 integrate .. //depot/projects/iwarp/lib/libarchive/test/test_pax_filename_encoding.c#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu#1 branch .. //depot/projects/iwarp/lib/libarchive/test/test_write_compress.c#2 integrate .. //depot/projects/iwarp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate .. //depot/projects/iwarp/sys/ia64/isa/isa_dma.c#2 integrate .. //depot/projects/iwarp/sys/kern/link_elf.c#4 integrate .. //depot/projects/iwarp/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/iwarp/sys/sys/bus_dma.h#2 integrate .. //depot/projects/iwarp/usr.bin/tar/bsdtar.1#3 integrate .. //depot/projects/iwarp/usr.bin/tar/bsdtar.c#3 integrate .. //depot/projects/iwarp/usr.bin/tar/bsdtar.h#3 integrate .. //depot/projects/iwarp/usr.bin/tar/config_freebsd.h#3 integrate .. //depot/projects/iwarp/usr.bin/tar/read.c#3 integrate .. //depot/projects/iwarp/usr.bin/tar/write.c#3 integrate .. //depot/projects/iwarp/usr.sbin/mixer/mixer.8#2 integrate .. //depot/projects/iwarp/usr.sbin/mixer/mixer.c#2 integrate Differences ... ==== //depot/projects/iwarp/lib/libarchive/archive_read_private.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.5 2008/03/12 04:58:32 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.6 2008/03/15 11:09:16 kientzle Exp $ */ #ifndef ARCHIVE_READ_PRIVATE_H_INCLUDED @@ -93,17 +93,10 @@ /* * Format detection is mostly the same as compression - * detection, with two significant differences: The bidders + * detection, with one significant difference: The bidders * use the read_ahead calls above to examine the stream rather * than having the supervisor hand them a block of data to - * examine, and the auction is repeated for every header. - * Winning bidders should set the archive_format and - * archive_format_name appropriately. Bid routines should - * check archive_format and decline to bid if the format of - * the last header was incompatible. - * - * Again, write support is considerably simpler because there's - * no need for an auction. + * examine. */ struct archive_format_descriptor { ==== //depot/projects/iwarp/lib/libarchive/archive_read_support_format_mtree.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.2 2008/02/19 06:07:10 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.4 2008/03/15 11:02:47 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -76,12 +76,18 @@ struct mtree_entry *this_entry; struct archive_string current_dir; struct archive_string contents_name; + + off_t cur_size, cur_offset; }; static int cleanup(struct archive_read *); static int mtree_bid(struct archive_read *); +static int parse_file(struct archive_read *, struct archive_entry *, + struct mtree *, struct mtree_entry *); static void parse_escapes(char *, struct mtree_entry *); -static int parse_setting(struct archive_read *, struct mtree *, +static int parse_line(struct archive_read *, struct archive_entry *, + struct mtree *, struct mtree_entry *); +static int parse_keyword(struct archive_read *, struct mtree *, struct archive_entry *, char *, char *); static int read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset); @@ -252,14 +258,16 @@ } } +/* + * Read in the entire mtree file into memory on the first request. + * Then use the next unused file to satisfy each header request. + */ static int read_header(struct archive_read *a, struct archive_entry *entry) { - struct stat st; struct mtree *mtree; - struct mtree_entry *mentry, *mentry2; - char *p, *q; - int r = ARCHIVE_OK, r1; + char *p; + int r; mtree = (struct mtree *)(a->format->data); @@ -278,16 +286,10 @@ a->archive.archive_format_name = mtree->archive_format_name; for (;;) { - mentry = mtree->this_entry; - if (mentry == NULL) { - mtree->this_entry = NULL; + if (mtree->this_entry == NULL) return (ARCHIVE_EOF); - } - mtree->this_entry = mentry->next; - if (mentry->used) - continue; - mentry->used = 1; - if (strcmp(mentry->name, "..") == 0) { + if (strcmp(mtree->this_entry->name, "..") == 0) { + mtree->this_entry->used = 1; if (archive_strlen(&mtree->current_dir) > 0) { /* Roll back current path. */ p = mtree->current_dir.s @@ -299,117 +301,165 @@ mtree->current_dir.length = p - mtree->current_dir.s + 1; } - continue; + } + if (!mtree->this_entry->used) { + r = parse_file(a, entry, mtree, mtree->this_entry); + return (r); } + mtree->this_entry = mtree->this_entry->next; + } +} + +/* + * A single file can have multiple lines contribute specifications. + * Parse as many lines as necessary, then pull additional information + * from a backing file on disk as necessary. + */ +static int +parse_file(struct archive_read *a, struct archive_entry *entry, + struct mtree *mtree, struct mtree_entry *mentry) +{ + struct stat st; + struct mtree_entry *mp; + int r = ARCHIVE_OK, r1; - mtree->filetype = AE_IFREG; + mentry->used = 1; - /* Parse options. */ - p = mentry->option_start; - while (p < mentry->option_end) { - q = p + strlen(p); - r1 = parse_setting(a, mtree, entry, p, q); - if (r1 != ARCHIVE_OK) - r = r1; - p = q + 1; - } + /* Initialize reasonable defaults. */ + mtree->filetype = AE_IFREG; + archive_entry_set_size(entry, 0); - if (mentry->full) { - archive_entry_copy_pathname(entry, mentry->name); - /* - * "Full" entries are allowed to have multiple - * lines and those lines aren't required to be - * adjacent. We don't support multiple lines - * for "relative" entries nor do we make any - * attempt to merge data from separate - * "relative" and "full" entries. (Merging - * "relative" and "full" entries would require - * dealing with pathname canonicalization, - * which is a very tricky subject.) - */ - mentry2 = mentry->next; - while (mentry2 != NULL) { - if (mentry2->full - && !mentry2->used - && strcmp(mentry->name, mentry2->name) == 0) { - /* - * Add those options as well; - * later lines override - * earlier ones. - */ - p = mentry2->option_start; - while (p < mentry2->option_end) { - q = p + strlen(p); - r1 = parse_setting(a, mtree, entry, p, q); - if (r1 != ARCHIVE_OK) - r = r1; - p = q + 1; - } - mentry2->used = 1; - } - mentry2 = mentry2->next; - } - } else { - /* - * Relative entries require us to construct - * the full path and possibly update the - * current directory. - */ - size_t n = archive_strlen(&mtree->current_dir); - if (n > 0) - archive_strcat(&mtree->current_dir, "/"); - archive_strcat(&mtree->current_dir, mentry->name); - archive_entry_copy_pathname(entry, mtree->current_dir.s); - if (archive_entry_filetype(entry) != AE_IFDIR) - mtree->current_dir.length = n; - } + /* Parse options from this line. */ + r = parse_line(a, entry, mtree, mentry); + if (mentry->full) { + archive_entry_copy_pathname(entry, mentry->name); /* - * Try to open and stat the file to get the real size. - * It would be nice to avoid this here so that getting - * a listing of an mtree wouldn't require opening - * every referenced contents file. But then we - * wouldn't know the actual contents size, so I don't - * see a really viable way around this. (Also, we may - * want to someday pull other unspecified info from - * the contents file on disk.) + * "Full" entries are allowed to have multiple lines + * and those lines aren't required to be adjacent. We + * don't support multiple lines for "relative" entries + * nor do we make any attempt to merge data from + * separate "relative" and "full" entries. (Merging + * "relative" and "full" entries would require dealing + * with pathname canonicalization, which is a very + * tricky subject.) */ - if (archive_strlen(&mtree->contents_name) > 0) { - mtree->fd = open(mtree->contents_name.s, - O_RDONLY | O_BINARY); - if (mtree->fd < 0) { - archive_set_error(&a->archive, errno, - "Can't open content=\"%s\"", - mtree->contents_name.s); - r = ARCHIVE_WARN; + for (mp = mentry->next; mp != NULL; mp = mp->next) { + if (mp->full && !mp->used + && strcmp(mentry->name, mp->name) == 0) { + /* Later lines override earlier ones. */ + mp->used = 1; + r1 = parse_line(a, entry, mtree, mp); + if (r1 < r) + r = r1; } - } else { - /* If the specified path opens, use it. */ - mtree->fd = open(mtree->current_dir.s, - O_RDONLY | O_BINARY); - /* But don't fail if it's not there. */ } - + } else { /* - * If there is a contents file on disk, use that size; - * otherwise leave it as-is (it might have been set from - * the mtree size= keyword). + * Relative entries require us to construct + * the full path and possibly update the + * current directory. */ - if (mtree->fd >= 0) { - fstat(mtree->fd, &st); + size_t n = archive_strlen(&mtree->current_dir); + if (n > 0) + archive_strcat(&mtree->current_dir, "/"); + archive_strcat(&mtree->current_dir, mentry->name); + archive_entry_copy_pathname(entry, mtree->current_dir.s); + if (archive_entry_filetype(entry) != AE_IFDIR) + mtree->current_dir.length = n; + } + + /* + * Try to open and stat the file to get the real size + * and other file info. It would be nice to avoid + * this here so that getting a listing of an mtree + * wouldn't require opening every referenced contents + * file. But then we wouldn't know the actual + * contents size, so I don't see a really viable way + * around this. (Also, we may want to someday pull + * other unspecified info from the contents file on + * disk.) + */ + mtree->fd = -1; + if (archive_strlen(&mtree->contents_name) > 0) { + mtree->fd = open(mtree->contents_name.s, + O_RDONLY | O_BINARY); + if (mtree->fd < 0) { + archive_set_error(&a->archive, errno, + "Can't open content=\"%s\"", + mtree->contents_name.s); + r = ARCHIVE_WARN; + } + } else if (archive_entry_filetype(entry) == AE_IFREG) { + mtree->fd = open(archive_entry_pathname(entry), + O_RDONLY | O_BINARY); + } + + /* + * If there is a contents file on disk, use that size; + * otherwise leave it as-is (it might have been set from + * the mtree size= keyword). + */ + if (mtree->fd >= 0) { + if (fstat(mtree->fd, &st) != 0) { + archive_set_error(&a->archive, errno, + "could not stat %s", + archive_entry_pathname(entry)); + r = ARCHIVE_WARN; + /* If we can't stat it, don't keep it open. */ + close(mtree->fd); + mtree->fd = -1; + } else if ((st.st_mode & S_IFMT) != S_IFREG) { + archive_set_error(&a->archive, errno, + "%s is not a regular file", + archive_entry_pathname(entry)); + r = ARCHIVE_WARN; + /* Don't hold a non-regular file open. */ + close(mtree->fd); + mtree->fd = -1; + } else { archive_entry_set_size(entry, st.st_size); + archive_entry_set_ino(entry, st.st_ino); + archive_entry_set_dev(entry, st.st_dev); + archive_entry_set_nlink(entry, st.st_nlink); } + } + mtree->cur_size = archive_entry_size(entry); + mtree->offset = 0; - return r; + return r; +} + +/* + * Each line contains a sequence of keywords. + */ +static int +parse_line(struct archive_read *a, struct archive_entry *entry, + struct mtree *mtree, struct mtree_entry *mp) +{ + char *p, *q; + int r = ARCHIVE_OK, r1; + + p = mp->option_start; + while (p < mp->option_end) { + q = p + strlen(p); + r1 = parse_keyword(a, mtree, entry, p, q); + if (r1 < r) + r = r1; + p = q + 1; } + return (r); } +/* + * Parse a single keyword and its value. + */ static int -parse_setting(struct archive_read *a, struct mtree *mtree, struct archive_entry *entry, char *key, char *end) +parse_keyword(struct archive_read *a, struct mtree *mtree, + struct archive_entry *entry, char *key, char *end) { char *val; - if (end == key) return (ARCHIVE_OK); if (*key == '\0') @@ -427,7 +477,8 @@ switch (key[0]) { case 'c': - if (strcmp(key, "content") == 0) { + if (strcmp(key, "content") == 0 + || strcmp(key, "contents") == 0) { parse_escapes(val, NULL); archive_strcpy(&mtree->contents_name, val); break; @@ -441,6 +492,11 @@ archive_entry_copy_gname(entry, val); break; } + case 'l': + if (strcmp(key, "link") == 0) { + archive_entry_set_link(entry, val); + break; + } case 'm': if (strcmp(key, "mode") == 0) { if (val[0] == '0') { @@ -452,6 +508,11 @@ "Symbolic mode \"%s\" unsupported", val); break; } + case 's': + if (strcmp(key, "size") == 0) { + archive_entry_set_size(entry, mtree_atol10(&val)); + break; + } case 't': if (strcmp(key, "type") == 0) { switch (val[0]) { @@ -517,6 +578,7 @@ static int read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset) { + size_t bytes_to_read; ssize_t bytes_read; struct mtree *mtree; @@ -538,7 +600,11 @@ *buff = mtree->buff; *offset = mtree->offset; - bytes_read = read(mtree->fd, mtree->buff, mtree->buffsize); + if ((off_t)mtree->buffsize > mtree->cur_size - mtree->offset) + bytes_to_read = mtree->cur_size - mtree->offset; + else + bytes_to_read = mtree->buffsize; + bytes_read = read(mtree->fd, mtree->buff, bytes_to_read); if (bytes_read < 0) { archive_set_error(&a->archive, errno, "Can't read"); return (ARCHIVE_WARN); @@ -548,7 +614,7 @@ return (ARCHIVE_EOF); } mtree->offset += bytes_read; - *size = (size_t)bytes_read; + *size = bytes_read; return (ARCHIVE_OK); } ==== //depot/projects/iwarp/lib/libarchive/archive_read_support_format_tar.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.66 2008/03/14 20:32:20 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.67 2008/03/15 01:43:58 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -144,8 +144,8 @@ struct tar { struct archive_string acl_text; - struct archive_string entry_name; - struct archive_string entry_linkname; + struct archive_string entry_pathname; + struct archive_string entry_linkpath; struct archive_string entry_uname; struct archive_string entry_gname; struct archive_string longlink; @@ -153,6 +153,7 @@ struct archive_string pax_header; struct archive_string pax_global; struct archive_string line; + int pax_hdrcharset_binary; wchar_t *pax_entry; size_t pax_entry_length; int header_recursion_depth; @@ -169,9 +170,9 @@ char sparse_gnu_pending; }; -static size_t UTF8_mbrtowc(wchar_t *pwc, const char *s, size_t n); +static ssize_t UTF8_mbrtowc(wchar_t *pwc, const char *s, size_t n); static int archive_block_is_null(const unsigned char *p); -static char *base64_decode(const wchar_t *, size_t, size_t *); +static char *base64_decode(const char *, size_t, size_t *); static void gnu_add_sparse_entry(struct tar *, off_t offset, off_t remaining); static void gnu_clear_sparse_list(struct tar *); @@ -179,7 +180,7 @@ const struct archive_entry_header_gnutar *header); static void gnu_sparse_old_parse(struct tar *, const struct gnu_sparse *sparse, int length); -static int gnu_sparse_01_parse(struct tar *, const wchar_t *); +static int gnu_sparse_01_parse(struct tar *, const char *); static ssize_t gnu_sparse_10_read(struct archive_read *, struct tar *); static int header_Solaris_ACL(struct archive_read *, struct tar *, struct archive_entry *, const void *); @@ -210,24 +211,23 @@ struct archive_entry *); static int checksum(struct archive_read *, const void *); static int pax_attribute(struct tar *, struct archive_entry *, - wchar_t *key, wchar_t *value); + char *key, char *value); static int pax_header(struct archive_read *, struct tar *, struct archive_entry *, char *attr); -static void pax_time(const wchar_t *, int64_t *sec, long *nanos); +static void pax_time(const char *, int64_t *sec, long *nanos); static ssize_t readline(struct archive_read *, struct tar *, const char **, ssize_t limit); static int read_body_to_string(struct archive_read *, struct tar *, struct archive_string *, const void *h); static int64_t tar_atol(const char *, unsigned); -static int64_t tar_atol10(const wchar_t *, unsigned); +static int64_t tar_atol10(const char *, unsigned); static int64_t tar_atol256(const char *, unsigned); static int64_t tar_atol8(const char *, unsigned); static int tar_read_header(struct archive_read *, struct tar *, struct archive_entry *); static int tohex(int c); static char *url_decode(const char *); -static int utf8_decode(wchar_t *, const char *, size_t length); -static char *wide_to_narrow(const wchar_t *wval); +static wchar_t *utf8_decode(struct tar *, const char *, size_t length); int archive_read_support_format_gnutar(struct archive *a) @@ -271,8 +271,8 @@ tar = (struct tar *)(a->format->data); gnu_clear_sparse_list(tar); archive_string_free(&tar->acl_text); - archive_string_free(&tar->entry_name); - archive_string_free(&tar->entry_linkname); + archive_string_free(&tar->entry_pathname); + archive_string_free(&tar->entry_linkpath); archive_string_free(&tar->entry_uname); archive_string_free(&tar->entry_gname); archive_string_free(&tar->line); @@ -766,16 +766,9 @@ while (*p != '\0' && p < acl + size) p++; - wp = (wchar_t *)malloc((p - acl + 1) * sizeof(wchar_t)); - if (wp == NULL) { - archive_set_error(&a->archive, ENOMEM, - "Can't allocate work buffer for ACL parsing"); - return (ARCHIVE_FATAL); - } - utf8_decode(wp, acl, p - acl); + wp = utf8_decode(tar, acl, p - acl); err = __archive_entry_acl_parse_w(entry, wp, ARCHIVE_ENTRY_ACL_TYPE_ACCESS); - free(wp); return (err); } @@ -795,7 +788,7 @@ if ((err != ARCHIVE_OK) && (err != ARCHIVE_WARN)) return (err); /* Set symlink if symlink already set, else hardlink. */ - archive_entry_set_link(entry, tar->longlink.s); + archive_entry_copy_link(entry, tar->longlink.s); return (ARCHIVE_OK); } @@ -815,7 +808,7 @@ err = tar_read_header(a, tar, entry); if ((err != ARCHIVE_OK) && (err != ARCHIVE_WARN)) return (err); - archive_entry_set_pathname(entry, tar->longname.s); + archive_entry_copy_pathname(entry, tar->longname.s); return (ARCHIVE_OK); } @@ -907,10 +900,10 @@ header = (const struct archive_entry_header_ustar *)h; if (header->linkname[0]) - archive_strncpy(&(tar->entry_linkname), header->linkname, + archive_strncpy(&(tar->entry_linkpath), header->linkname, sizeof(header->linkname)); else - archive_string_empty(&(tar->entry_linkname)); + archive_string_empty(&(tar->entry_linkpath)); /* Parse out the numeric fields (all are octal) */ archive_entry_set_mode(entry, tar_atol(header->mode, sizeof(header->mode))); @@ -926,7 +919,7 @@ switch (tartype) { case '1': /* Hard link */ - archive_entry_set_hardlink(entry, tar->entry_linkname.s); + archive_entry_copy_hardlink(entry, tar->entry_linkpath.s); /* * The following may seem odd, but: Technically, tar * does not store the file type for a "hard link" @@ -988,7 +981,7 @@ archive_entry_set_filetype(entry, AE_IFLNK); archive_entry_set_size(entry, 0); tar->entry_bytes_remaining = 0; - archive_entry_set_symlink(entry, tar->entry_linkname.s); + archive_entry_copy_symlink(entry, tar->entry_linkpath.s); break; case '3': /* Character device */ archive_entry_set_filetype(entry, AE_IFCHR); @@ -1060,8 +1053,8 @@ /* Copy filename over (to ensure null termination). */ header = (const struct archive_entry_header_ustar *)h; - archive_strncpy(&(tar->entry_name), header->name, sizeof(header->name)); - archive_entry_set_pathname(entry, tar->entry_name.s); + archive_strncpy(&(tar->entry_pathname), header->name, sizeof(header->name)); + archive_entry_copy_pathname(entry, tar->entry_pathname.s); /* Grab rest of common fields */ header_common(a, tar, entry, h); @@ -1132,7 +1125,7 @@ header = (const struct archive_entry_header_ustar *)h; /* Copy name into an internal buffer to ensure null-termination. */ - as = &(tar->entry_name); + as = &(tar->entry_pathname); if (header->prefix[0]) { archive_strncpy(as, header->prefix, sizeof(header->prefix)); if (as->s[archive_strlen(as) - 1] != '/') @@ -1141,7 +1134,7 @@ } else archive_strncpy(as, header->name, sizeof(header->name)); - archive_entry_set_pathname(entry, as->s); + archive_entry_copy_pathname(entry, as->s); /* Handle rest of common fields. */ header_common(a, tar, entry, h); @@ -1149,11 +1142,11 @@ /* Handle POSIX ustar fields. */ archive_strncpy(&(tar->entry_uname), header->uname, sizeof(header->uname)); - archive_entry_set_uname(entry, tar->entry_uname.s); + archive_entry_copy_uname(entry, tar->entry_uname.s); archive_strncpy(&(tar->entry_gname), header->gname, sizeof(header->gname)); - archive_entry_set_gname(entry, tar->entry_gname.s); + archive_entry_copy_gname(entry, tar->entry_gname.s); /* Parse out device numbers only for char and block specials. */ if (header->typeflag[0] == '3' || header->typeflag[0] == '4') { @@ -1180,10 +1173,16 @@ { size_t attr_length, l, line_length; char *line, *p; - wchar_t *key, *wp, *value; + char *key, *value; + wchar_t *wp; int err, err2; attr_length = strlen(attr); + tar->pax_hdrcharset_binary = 0; + archive_string_empty(&(tar->entry_gname)); + archive_string_empty(&(tar->entry_linkpath)); + archive_string_empty(&(tar->entry_pathname)); + archive_string_empty(&(tar->entry_uname)); err = ARCHIVE_OK; while (attr_length > 0) { /* Parse decimal length field at start of line. */ @@ -1226,49 +1225,24 @@ return (ARCHIVE_WARN); } - /* Ensure pax_entry buffer is big enough. */ - if (tar->pax_entry_length <= line_length) { - wchar_t *old_entry = tar->pax_entry; + /* Null-terminate the line. */ + attr[line_length - 1] = '\0'; - if (tar->pax_entry_length <= 0) - tar->pax_entry_length = 1024; - while (tar->pax_entry_length <= line_length + 1) - tar->pax_entry_length *= 2; - - old_entry = tar->pax_entry; - tar->pax_entry = (wchar_t *)realloc(tar->pax_entry, - tar->pax_entry_length * sizeof(wchar_t)); - if (tar->pax_entry == NULL) { - free(old_entry); - archive_set_error(&a->archive, ENOMEM, - "No memory"); - return (ARCHIVE_FATAL); - } - } - - /* Decode UTF-8 to wchar_t, null-terminate result. */ - if (utf8_decode(tar->pax_entry, p, - line_length - (p - attr) - 1)) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Invalid UTF8 character in pax extended attribute"); - err = err_combine(err, ARCHIVE_WARN); - } - - /* Null-terminate 'key' value. */ - wp = key = tar->pax_entry; - if (key[0] == L'=') + /* Find end of key and null terminate it. */ + key = p; + if (key[0] == '=') return (-1); - while (*wp && *wp != L'=') - ++wp; - if (*wp == L'\0') { + while (*p && *p != '=') + ++p; + if (*p == '\0') { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Invalid pax extended attributes"); return (ARCHIVE_WARN); } - *wp = 0; + *p = '\0'; /* Identify null-terminated 'value' portion. */ - value = wp + 1; + value = p + 1; /* Identify this attribute and set it in the entry. */ err2 = pax_attribute(tar, entry, key, value); @@ -1278,33 +1252,85 @@ attr += line_length; attr_length -= line_length; } + if (archive_strlen(&(tar->entry_gname)) > 0) { + value = tar->entry_gname.s; + if (tar->pax_hdrcharset_binary) + archive_entry_copy_gname(entry, value); + else { + wp = utf8_decode(tar, value, strlen(value)); + if (wp == NULL) { + archive_entry_copy_gname(entry, value); + if (err > ARCHIVE_WARN) + err = ARCHIVE_WARN; + } else + archive_entry_copy_gname_w(entry, wp); + } + } + if (archive_strlen(&(tar->entry_linkpath)) > 0) { + value = tar->entry_linkpath.s; + if (tar->pax_hdrcharset_binary) + archive_entry_copy_link(entry, value); + else { + wp = utf8_decode(tar, value, strlen(value)); + if (wp == NULL) { + archive_entry_copy_link(entry, value); + if (err > ARCHIVE_WARN) + err = ARCHIVE_WARN; + } else + archive_entry_copy_link_w(entry, wp); + } + } + if (archive_strlen(&(tar->entry_pathname)) > 0) { + value = tar->entry_pathname.s; + if (tar->pax_hdrcharset_binary) + archive_entry_copy_pathname(entry, value); + else { + wp = utf8_decode(tar, value, strlen(value)); + if (wp == NULL) { + archive_entry_copy_pathname(entry, value); + if (err > ARCHIVE_WARN) + err = ARCHIVE_WARN; + } else + archive_entry_copy_pathname_w(entry, wp); + } + } + if (archive_strlen(&(tar->entry_uname)) > 0) { + value = tar->entry_uname.s; + if (tar->pax_hdrcharset_binary) + archive_entry_copy_uname(entry, value); + else { + wp = utf8_decode(tar, value, strlen(value)); + if (wp == NULL) { + archive_entry_copy_uname(entry, value); + if (err > ARCHIVE_WARN) + err = ARCHIVE_WARN; + } else + archive_entry_copy_uname_w(entry, wp); + } + } return (err); } static int pax_attribute_xattr(struct archive_entry *entry, - wchar_t *name, wchar_t *value) + char *name, char *value) { - char *name_decoded, *name_narrow; + char *name_decoded; void *value_decoded; size_t value_len; - if (wcslen(name) < 18 || (wcsncmp(name, L"LIBARCHIVE.xattr.", 17)) != 0) + if (strlen(name) < 18 || (strncmp(name, "LIBARCHIVE.xattr.", 17)) != 0) return 3; name += 17; /* URL-decode name */ - name_narrow = wide_to_narrow(name); - if (name_narrow == NULL) - return 2; - name_decoded = url_decode(name_narrow); - free(name_narrow); + name_decoded = url_decode(name); if (name_decoded == NULL) return 2; /* Base-64 decode value */ - value_decoded = base64_decode(value, wcslen(value), &value_len); + value_decoded = base64_decode(value, strlen(value), &value_len); if (value_decoded == NULL) { free(name_decoded); return 1; @@ -1333,22 +1359,23 @@ */ static int pax_attribute(struct tar *tar, struct archive_entry *entry, - wchar_t *key, wchar_t *value) + char *key, char *value) { int64_t s; long n; + wchar_t *wp; switch (key[0]) { case 'G': /* GNU "0.0" sparse pax format. */ - if (wcscmp(key, L"GNU.sparse.numblocks") == 0) { + if (strcmp(key, "GNU.sparse.numblocks") == 0) { tar->sparse_offset = -1; tar->sparse_numbytes = -1; tar->sparse_gnu_major = 0; tar->sparse_gnu_minor = 0; } - if (wcscmp(key, L"GNU.sparse.offset") == 0) { - tar->sparse_offset = tar_atol10(value, wcslen(value)); + if (strcmp(key, "GNU.sparse.offset") == 0) { + tar->sparse_offset = tar_atol10(value, strlen(value)); if (tar->sparse_numbytes != -1) { gnu_add_sparse_entry(tar, tar->sparse_offset, tar->sparse_numbytes); @@ -1356,8 +1383,8 @@ tar->sparse_numbytes = -1; } } - if (wcscmp(key, L"GNU.sparse.numbytes") == 0) { - tar->sparse_numbytes = tar_atol10(value, wcslen(value)); + if (strcmp(key, "GNU.sparse.numbytes") == 0) { + tar->sparse_numbytes = tar_atol10(value, strlen(value)); if (tar->sparse_numbytes != -1) { gnu_add_sparse_entry(tar, tar->sparse_offset, tar->sparse_numbytes); @@ -1365,13 +1392,13 @@ tar->sparse_numbytes = -1; } } - if (wcscmp(key, L"GNU.sparse.size") == 0) { - tar->realsize = tar_atol10(value, wcslen(value)); + if (strcmp(key, "GNU.sparse.size") == 0) { + tar->realsize = tar_atol10(value, strlen(value)); archive_entry_set_size(entry, tar->realsize); } /* GNU "0.1" sparse pax format. */ - if (wcscmp(key, L"GNU.sparse.map") == 0) { + if (strcmp(key, "GNU.sparse.map") == 0) { tar->sparse_gnu_major = 0; tar->sparse_gnu_minor = 1; if (gnu_sparse_01_parse(tar, value) != ARCHIVE_OK) @@ -1379,18 +1406,23 @@ } /* GNU "1.0" sparse pax format */ - if (wcscmp(key, L"GNU.sparse.major") == 0) { - tar->sparse_gnu_major = tar_atol10(value, wcslen(value)); + if (strcmp(key, "GNU.sparse.major") == 0) { + tar->sparse_gnu_major = tar_atol10(value, strlen(value)); tar->sparse_gnu_pending = 1; } - if (wcscmp(key, L"GNU.sparse.minor") == 0) { - tar->sparse_gnu_minor = tar_atol10(value, wcslen(value)); + if (strcmp(key, "GNU.sparse.minor") == 0) { + tar->sparse_gnu_minor = tar_atol10(value, strlen(value)); tar->sparse_gnu_pending = 1; } - if (wcscmp(key, L"GNU.sparse.name") == 0) - archive_entry_copy_pathname_w(entry, value); - if (wcscmp(key, L"GNU.sparse.realsize") == 0) { - tar->realsize = tar_atol10(value, wcslen(value)); + if (strcmp(key, "GNU.sparse.name") == 0) { + wp = utf8_decode(tar, value, strlen(value)); + if (wp != NULL) + archive_entry_copy_pathname_w(entry, wp); + else + archive_entry_copy_pathname(entry, value); + } + if (strcmp(key, "GNU.sparse.realsize") == 0) { + tar->realsize = tar_atol10(value, strlen(value)); archive_entry_set_size(entry, tar->realsize); } break; @@ -1401,85 +1433,107 @@ if (strcmp(key, "LIBARCHIVE.xxxxxxx")==0) archive_entry_set_xxxxxx(entry, value); */ - if (wcsncmp(key, L"LIBARCHIVE.xattr.", 17)==0) + if (strncmp(key, "LIBARCHIVE.xattr.", 17)==0) pax_attribute_xattr(entry, key, value); break; case 'S': /* We support some keys used by the "star" archiver */ - if (wcscmp(key, L"SCHILY.acl.access")==0) - __archive_entry_acl_parse_w(entry, value, + if (strcmp(key, "SCHILY.acl.access")==0) { + wp = utf8_decode(tar, value, strlen(value)); + /* TODO: if (wp == NULL) */ + __archive_entry_acl_parse_w(entry, wp, ARCHIVE_ENTRY_ACL_TYPE_ACCESS); - else if (wcscmp(key, L"SCHILY.acl.default")==0) - __archive_entry_acl_parse_w(entry, value, + } else if (strcmp(key, "SCHILY.acl.default")==0) { + wp = utf8_decode(tar, value, strlen(value)); + /* TODO: if (wp == NULL) */ + __archive_entry_acl_parse_w(entry, wp, ARCHIVE_ENTRY_ACL_TYPE_DEFAULT); - else if (wcscmp(key, L"SCHILY.devmajor")==0) - archive_entry_set_rdevmajor(entry, tar_atol10(value, wcslen(value))); - else if (wcscmp(key, L"SCHILY.devminor")==0) - archive_entry_set_rdevminor(entry, tar_atol10(value, wcslen(value))); - else if (wcscmp(key, L"SCHILY.fflags")==0) - archive_entry_copy_fflags_text_w(entry, value); - else if (wcscmp(key, L"SCHILY.dev")==0) - archive_entry_set_dev(entry, tar_atol10(value, wcslen(value))); - else if (wcscmp(key, L"SCHILY.ino")==0) - archive_entry_set_ino(entry, tar_atol10(value, wcslen(value))); - else if (wcscmp(key, L"SCHILY.nlink")==0) - archive_entry_set_nlink(entry, tar_atol10(value, wcslen(value))); - else if (wcscmp(key, L"SCHILY.realsize")==0) { - tar->realsize = tar_atol10(value, wcslen(value)); + } else if (strcmp(key, "SCHILY.devmajor")==0) { + archive_entry_set_rdevmajor(entry, + tar_atol10(value, strlen(value))); + } else if (strcmp(key, "SCHILY.devminor")==0) { + archive_entry_set_rdevminor(entry, + tar_atol10(value, strlen(value))); + } else if (strcmp(key, "SCHILY.fflags")==0) { + wp = utf8_decode(tar, value, strlen(value)); + /* TODO: if (wp == NULL) */ + archive_entry_copy_fflags_text_w(entry, wp); + } else if (strcmp(key, "SCHILY.dev")==0) { + archive_entry_set_dev(entry, + tar_atol10(value, strlen(value))); + } else if (strcmp(key, "SCHILY.ino")==0) { + archive_entry_set_ino(entry, + tar_atol10(value, strlen(value))); + } else if (strcmp(key, "SCHILY.nlink")==0) { + archive_entry_set_nlink(entry, + tar_atol10(value, strlen(value))); + } else if (strcmp(key, "SCHILY.realsize")==0) { + tar->realsize = tar_atol10(value, strlen(value)); archive_entry_set_size(entry, tar->realsize); } break; case 'a': - if (wcscmp(key, L"atime")==0) { + if (strcmp(key, "atime")==0) { pax_time(value, &s, &n); archive_entry_set_atime(entry, s, n); } break; case 'c': - if (wcscmp(key, L"ctime")==0) { + if (strcmp(key, "ctime")==0) { pax_time(value, &s, &n); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 15 19:14:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A3DE1065678; Sat, 15 Mar 2008 19:14:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EA9741065673 for ; Sat, 15 Mar 2008 19:14:17 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D9B828FC12 for ; Sat, 15 Mar 2008 19:14:17 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FJEHem063803 for ; Sat, 15 Mar 2008 19:14:17 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FJEH7Q063801 for perforce@freebsd.org; Sat, 15 Mar 2008 19:14:17 GMT (envelope-from imp@freebsd.org) Date: Sat, 15 Mar 2008 19:14:17 GMT Message-Id: <200803151914.m2FJEH7Q063801@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 137793 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, 15 Mar 2008 19:14:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=137793 Change 137793 by imp@imp_lighthouse on 2008/03/15 19:13:48 Remove duplicate that's crept in. Affected files ... .. //depot/projects/arm/src/sys/conf/options.arm#26 edit Differences ... ==== //depot/projects/arm/src/sys/conf/options.arm#26 (text+ko) ==== @@ -11,7 +11,6 @@ CPU_ARM9 opt_global.h CPU_ARM9E opt_global.h CPU_XSCALE_80219 opt_global.h -CPU_ARM9E opt_global.h CPU_ARM10 opt_global.h CPU_ARM11 opt_global.h CPU_XSCALE_80321 opt_global.h From owner-p4-projects@FreeBSD.ORG Sat Mar 15 19:18:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA2141065675; Sat, 15 Mar 2008 19:18:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 890D71065673 for ; Sat, 15 Mar 2008 19:18:24 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 90BF08FC25 for ; Sat, 15 Mar 2008 19:18:24 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FJIOKZ063924 for ; Sat, 15 Mar 2008 19:18:24 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FJIOvw063922 for perforce@freebsd.org; Sat, 15 Mar 2008 19:18:24 GMT (envelope-from marcel@freebsd.org) Date: Sat, 15 Mar 2008 19:18:24 GMT Message-Id: <200803151918.m2FJIOvw063922@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 137794 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, 15 Mar 2008 19:18:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=137794 Change 137794 by marcel@marcel_xcllnt on 2008/03/15 19:17:43 Save WIP. The AP boots up to tracepoint 0x2001. Enabling IR and DR probably requires that we flush any TLBs first. I'm sure I should be invalidating the caches too... Affected files ... .. //depot/projects/powerpc/sys/powerpc/aim/locore.S#7 edit .. //depot/projects/powerpc/sys/powerpc/aim/mmu_oea.c#2 edit .. //depot/projects/powerpc/sys/powerpc/aim/mp_cpudep.c#3 edit .. //depot/projects/powerpc/sys/powerpc/aim/trap_subr.S#4 edit .. //depot/projects/powerpc/sys/powerpc/booke/trap_subr.S#2 edit .. //depot/projects/powerpc/sys/powerpc/include/cpufunc.h#4 edit .. //depot/projects/powerpc/sys/powerpc/include/smp.h#6 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#18 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/aim/locore.S#7 (text+ko) ==== @@ -81,8 +81,9 @@ * Globals */ .data + .align 4 GLOBAL(tmpstk) - .space 8208 + .space 8192 GLOBAL(esym) .long 0 /* end of symbol table */ @@ -153,7 +154,7 @@ lis 1,tmpstk@ha addi 1,1,tmpstk@l - addi 1,1,8192 + addi 1,1,8192-16 mfmsr 0 lis 9,ofmsr@ha ==== //depot/projects/powerpc/sys/powerpc/aim/mmu_oea.c#2 (text+ko) ==== @@ -147,6 +147,7 @@ #include #include #include +#include #include #include @@ -203,8 +204,6 @@ extern struct pmap ofw_pmap; - - /* * Lock for the pteg and pvo tables. */ @@ -615,6 +614,59 @@ } void +pmap_cpu_bootstrap(volatile uint32_t *trcp, int ap) +{ + u_int sdr; + int i; + + trcp[0] = 0x1000; + trcp[1] = (uint32_t)&pmap_cpu_bootstrap; + + if (ap) { + __asm __volatile("mtdbatu 0,%0" :: "r"(battable[0].batu)); + __asm __volatile("mtdbatl 0,%0" :: "r"(battable[0].batl)); + isync(); + __asm __volatile("mtibatu 0,%0" :: "r"(battable[0].batu)); + __asm __volatile("mtibatl 0,%0" :: "r"(battable[0].batl)); + isync(); + } + + trcp[0] = 0x1001; + + for (i = 1; i < 4; i++) { + __asm __volatile("mtdbatu %0,%1" :: "n"(i), "r"(0)); + __asm __volatile("mtibatu %0,%1" :: "n"(i), "r"(0)); + isync(); + } + + trcp[0] = 0x1002; + + __asm __volatile("mtdbatu 1,%0" :: "r"(battable[8].batu)); + __asm __volatile("mtdbatl 1,%0" :: "r"(battable[8].batl)); + isync(); + + trcp[0] = 0x1003; + + for (i = 0; i < 16; i++) + mtsrin(i << ADDR_SR_SHFT, EMPTY_SEGMENT); + + trcp[0] = 0x1004; + + __asm __volatile("mtsr %0,%1" :: "n"(KERNEL_SR), "r"(KERNEL_SEGMENT)); + __asm __volatile("mtsr %0,%1" :: "n"(KERNEL2_SR), "r"(KERNEL2_SEGMENT)); + __asm __volatile("sync"); + + trcp[0] = 0x1005; + + sdr = (u_int)moea_pteg_table | (moea_pteg_mask >> 10); + __asm __volatile("mtsdr1 %0" :: "r"(sdr)); + isync(); + + trcp[0] = 0x1006; + trcp[1] = sdr; +} + +void moea_bootstrap(mmu_t mmup, vm_offset_t kernelstart, vm_offset_t kernelend) { ihandle_t mmui; @@ -622,9 +674,9 @@ int sz; int i, j; int ofw_mappings; + uint32_t trace; vm_size_t size, physsz, hwphyssz; vm_offset_t pa, va, off; - u_int batl, batu; /* * Set up BAT0 to map the lowest 256 MB area @@ -657,28 +709,15 @@ * Use an IBAT and a DBAT to map the bottom segment of memory * where we are. */ - batu = BATU(0x00000000, BAT_BL_256M, BAT_Vs); - batl = BATL(0x00000000, BAT_M, BAT_PP_RW); __asm (".balign 32; \n" "mtibatu 0,%0; mtibatl 0,%1; isync; \n" "mtdbatu 0,%0; mtdbatl 0,%1; isync" - :: "r"(batu), "r"(batl)); - -#if 0 - /* map frame buffer */ - batu = BATU(0x90000000, BAT_BL_256M, BAT_Vs); - batl = BATL(0x90000000, BAT_I|BAT_G, BAT_PP_RW); - __asm ("mtdbatu 1,%0; mtdbatl 1,%1; isync" - :: "r"(batu), "r"(batl)); -#endif + :: "r"(battable[0].batu), "r"(battable[0].batl)); -#if 1 /* map pci space */ - batu = BATU(0x80000000, BAT_BL_256M, BAT_Vs); - batl = BATL(0x80000000, BAT_I|BAT_G, BAT_PP_RW); - __asm ("mtdbatu 1,%0; mtdbatl 1,%1; isync" - :: "r"(batu), "r"(batl)); -#endif + __asm __volatile("mtdbatu 1,%0" :: "r"(battable[8].batu)); + __asm __volatile("mtdbatl 1,%0" :: "r"(battable[8].batl)); + isync(); /* * Set the start and end of kva. @@ -901,20 +940,8 @@ msgbufp = (struct msgbuf *)virtual_avail; virtual_avail += round_page(MSGBUF_SIZE); - /* - * Initialize hardware. - */ - for (i = 0; i < 16; i++) { - mtsrin(i << ADDR_SR_SHFT, EMPTY_SEGMENT); - } - __asm __volatile ("mtsr %0,%1" - :: "n"(KERNEL_SR), "r"(KERNEL_SEGMENT)); - __asm __volatile ("mtsr %0,%1" - :: "n"(KERNEL2_SR), "r"(KERNEL2_SEGMENT)); - __asm __volatile ("sync; mtsdr1 %0; isync" - :: "r"((u_int)moea_pteg_table | (moea_pteg_mask >> 10))); + pmap_cpu_bootstrap(&trace, 0); tlbia(); - pmap_bootstrapped++; } ==== //depot/projects/powerpc/sys/powerpc/aim/mp_cpudep.c#3 (text+ko) ==== @@ -32,11 +32,14 @@ #include #include #include +#include #include +#include #include #include #include +#include #include #include @@ -45,6 +48,8 @@ extern void *rstcode; +void *ap_pcpu; + static int powerpc_smp_fill_cpuref(struct cpuref *cpuref, phandle_t cpu) { @@ -130,33 +135,68 @@ return (powerpc_smp_fill_cpuref(cpuref, bsp)); } +#if 0 static void dump_rstvec(void) { uint32_t buf[6]; - mtmsr(mfmsr() & ~(PSL_IR | PSL_DR)); - isync(); bcopy((void *)EXC_RST, buf, sizeof(buf)); - mtmsr(mfmsr() | PSL_IR | PSL_DR); - printf("XXX: %08x %08x %08x %08x %08x %08x\n", buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]); } +#endif + +uint32_t +cpudep_ap_bootstrap(volatile uint32_t *trcp) +{ + uint32_t sp; + + trcp[0] = 0x2000; + trcp[1] = (uint32_t)&cpudep_ap_bootstrap; + __asm __volatile("mtsprg 0, %0" :: "r"(ap_pcpu)); + __asm __volatile("sync"); + + trcp[0] = 0x2001; + trcp[1] = (uint32_t)pcpup; + + mtmsr(PSL_IR | PSL_DR | PSL_ME); + isync(); + + trcp[0] = 0x2002; + trcp[1] = 0; + + pcpup->pc_curthread = pcpup->pc_idlethread; + pcpup->pc_curtcb = pcpup->pc_curthread->td_pcb; + sp = pcpup->pc_curpcb->pcb_sp; + + trcp[0] = 0x2003; + trcp[1] = sp; + + breakpoint(); + + return (sp); +} + int powerpc_smp_start_cpu(struct pcpu *pc) { phandle_t cpu; + volatile uint32_t *trcp; volatile uint8_t *rstvec; - int res, reset; + uint32_t trace; + int res, reset, timeout; cpu = pc->pc_hwref; res = OF_getprop(cpu, "soft-reset", &reset, sizeof(reset)); if (res < 0) return (ENXIO); - dump_rstvec(); + trcp = (uint32_t *)(EXC_RST + 4); + trace = *trcp; + + ap_pcpu = pc; rstvec = (uint8_t *)(0x80000000 + reset); @@ -166,9 +206,12 @@ *rstvec = 0; __asm __volatile("sync"); - DELAY(1000); + timeout = 1000; + while (!pc->pc_awake && timeout--) + DELAY(100); - dump_rstvec(); + if (!pc->pc_awake) + printf("XXX: timeout (trace=%x; data=%x)\n", trcp[0], trcp[1]); return (0); } ==== //depot/projects/powerpc/sys/powerpc/aim/trap_subr.S#4 (text+ko) ==== @@ -233,35 +233,72 @@ * Define the kdb debugger stack */ .data + .align 4 GLOBAL(dbstk) - .space INTSTK+8 /* kdb stack */ + .space INTSTK+8 /* kdb stack */ #endif + .text + /* - * This code gets copied to all the trap vectors - * (except ISI/DSI, ALI, and the interrupts) + * Processor reset exception handler. These are typically + * the first instructions the processor executes after a + * software reset. */ - .text - .globl CNAME(rstcode), CNAME(rstsize) CNAME(rstcode): bl 1f - .long 0 + /* We use this space for tracing purposes. */ .long 0 .long 0 - .long 0 1: - mflr %r3 - stw %r3, 0(%r3) - stw %r1, 4(%r3) - stw %r2, 8(%r3) - mfmsr %r4 - stw %r4, 12(%r3) -9: b 9b + mflr %r2 + mfmsr %r3 + stw %r2,0(%r2) /* trace: 0x104 - we're here. */ + stw %r3,4(%r2) /* trace data: MSR */ + sync + + lis %r1,(dbstk+INTSTK)@ha + addi %r1,%r1,(dbstk+INTSTK)@l + + addi %r3,%r2,4 + stw %r3,0(%r1) + sync + stw %r3,0(%r2) /* trace: 0x108 - stack is writable */ + stw %r1,4(%r2) /* trace data: SP */ + sync + + mr %r3,%r2 + lis %r4,1@l + bla CNAME(pmap_cpu_bootstrap) + + addi %r3,%r2,8 + stw %r3,0(%r2) /* trace 0x10c - back from 1st call */ + sync + + mr %r3,%r2 + bla CNAME(cpudep_ap_bootstrap) + mr %r1,%r3 + + addi %r3,%r2,12 + stw %r3,0(%r2) /* trace 0x110 - back from 2nd call */ + stw %r1,4(%r2) /* trace data: SP */ + + mr %r3,%r2 + bla CNAME(machdep_ap_bootstrap) + + /* Should not be reached */ +9: + b 9b CNAME(rstsize) = . - CNAME(rstcode) +/* + * This code gets copied to all the trap vectors + * (except ISI/DSI, ALI, and the interrupts) + */ + .globl CNAME(trapcode),CNAME(trapsize) CNAME(trapcode): mtsprg1 %r1 /* save SP */ @@ -477,8 +514,8 @@ /* * Deliberate entry to dbtrap */ - .globl CNAME(ppc_db_trap) -CNAME(ppc_db_trap): + .globl CNAME(breakpoint) +CNAME(breakpoint): mtsprg1 %r1 mfmsr %r3 mtsrr1 %r3 ==== //depot/projects/powerpc/sys/powerpc/booke/trap_subr.S#2 (text+ko) ==== @@ -795,8 +795,8 @@ /* * Deliberate entry to dbtrap */ - .globl CNAME(ppc_db_trap) -CNAME(ppc_db_trap): + .globl CNAME(breakpoint) +CNAME(breakpoint): mtsprg1 %r1 mfmsr %r3 mtsrr1 %r3 ==== //depot/projects/powerpc/sys/powerpc/include/cpufunc.h#4 (text+ko) ==== @@ -48,16 +48,8 @@ struct thread; #ifdef KDB -void ppc_db_trap(void); -#endif - -static __inline void -breakpoint(void) -{ -#ifdef KDB - ppc_db_trap(); +void breakpoint(void); #endif -} /* CPU register mangling inlines */ ==== //depot/projects/powerpc/sys/powerpc/include/smp.h#6 (text+ko) ==== @@ -55,6 +55,10 @@ int powerpc_smp_next_cpu(struct cpuref *); int powerpc_smp_start_cpu(struct pcpu *); +void pmap_cpu_bootstrap(volatile uint32_t *, int); +uint32_t cpudep_ap_bootstrap(volatile uint32_t *); +void machdep_ap_bootstrap(volatile uint32_t *); + #endif /* !LOCORE */ #endif /* _KERNEL */ #endif /* !_MACHINE_SMP_H */ ==== //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#18 (text+ko) ==== @@ -49,6 +49,23 @@ int mp_ipi_test = 0; +void +machdep_ap_bootstrap(volatile uint32_t *trcp) +{ + + trcp[0] = 0x3000; + trcp[1] = (uint32_t)&machdep_ap_bootstrap; + + pcpup->pc_awake = 1; + + while (ap_spin) + DELAY(0); + + ap_awake++; + + while (1); +} + struct cpu_group * cpu_topo(void) { @@ -159,6 +176,8 @@ return; } + ap_spin = 1; + cpus = 0; smp_cpus = 0; SLIST_FOREACH(pc, &cpuhead, pc_allcpu) { @@ -217,9 +236,7 @@ break; case IPI_STOP: self = PCPU_GET(cpumask); -#if 0 savectx(PCPU_PTR(pcb)); -#endif atomic_set_int(&stopped_cpus, self); while ((started_cpus & self) == 0) cpu_spinwait(); From owner-p4-projects@FreeBSD.ORG Sat Mar 15 19:45:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A9F1106567C; Sat, 15 Mar 2008 19:45:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A400106567A for ; Sat, 15 Mar 2008 19:45:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 38DEF8FC21 for ; Sat, 15 Mar 2008 19:45:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FJjsi4065256 for ; Sat, 15 Mar 2008 19:45:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FJjrFD065254 for perforce@freebsd.org; Sat, 15 Mar 2008 19:45:53 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Mar 2008 19:45:53 GMT Message-Id: <200803151945.m2FJjrFD065254@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 137795 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, 15 Mar 2008 19:45:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=137795 Change 137795 by kmacy@pandemonium:kmacy:iwarp on 2008/03/15 19:45:17 remove old debug firmware Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/t3fw-4.7.1.bin.gz.uu#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Mar 15 19:52:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC34F1065672; Sat, 15 Mar 2008 19:52:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7BEA51065670 for ; Sat, 15 Mar 2008 19:52:00 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 840688FC22 for ; Sat, 15 Mar 2008 19:52:00 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FJq0kC065449 for ; Sat, 15 Mar 2008 19:52:00 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FJq0qD065445 for perforce@freebsd.org; Sat, 15 Mar 2008 19:52:00 GMT (envelope-from marcel@freebsd.org) Date: Sat, 15 Mar 2008 19:52:00 GMT Message-Id: <200803151952.m2FJq0qD065445@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 137796 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, 15 Mar 2008 19:52:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=137796 Change 137796 by marcel@marcel_xcllnt on 2008/03/15 19:51:42 Fix compile breakage (due to commit before compile). AP boots to the end, where we put it in an infinite loop. Affected files ... .. //depot/projects/powerpc/sys/powerpc/aim/mp_cpudep.c#4 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#19 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/aim/mp_cpudep.c#4 (text+ko) ==== @@ -168,14 +168,12 @@ trcp[1] = 0; pcpup->pc_curthread = pcpup->pc_idlethread; - pcpup->pc_curtcb = pcpup->pc_curthread->td_pcb; + pcpup->pc_curpcb = pcpup->pc_curthread->td_pcb; sp = pcpup->pc_curpcb->pcb_sp; trcp[0] = 0x2003; trcp[1] = sp; - breakpoint(); - return (sp); } ==== //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#19 (text+ko) ==== @@ -236,7 +236,7 @@ break; case IPI_STOP: self = PCPU_GET(cpumask); - savectx(PCPU_PTR(pcb)); + savectx(PCPU_GET(curpcb)); atomic_set_int(&stopped_cpus, self); while ((started_cpus & self) == 0) cpu_spinwait(); From owner-p4-projects@FreeBSD.ORG Sat Mar 15 20:00:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9783B1065672; Sat, 15 Mar 2008 20:00:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 57F46106564A for ; Sat, 15 Mar 2008 20:00:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F9F38FC1A for ; Sat, 15 Mar 2008 20:00:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FK0C7w065695 for ; Sat, 15 Mar 2008 20:00:12 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FK0BSH065689 for perforce@freebsd.org; Sat, 15 Mar 2008 20:00:11 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Mar 2008 20:00:11 GMT Message-Id: <200803152000.m2FK0BSH065689@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 137797 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, 15 Mar 2008 20:00:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=137797 Change 137797 by kmacy@pandemonium:kmacy:iwarp on 2008/03/15 19:59:08 add license Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_vm.c#4 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_vm.c#4 (text+ko) ==== @@ -1,5 +1,34 @@ +/************************************************************************** + +Copyright (c) 2007, Chelsio Inc. +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. Neither the name of the Chelsio Corporation nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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. + +***************************************************************************/ + #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c,v 1.3 2007/12/18 23:00:25 kmacy Exp $"); +__FBSDID("$FreeBSD$"); #include #include From owner-p4-projects@FreeBSD.ORG Sat Mar 15 20:00:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BACB1065701; Sat, 15 Mar 2008 20:00:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A75E106566B for ; Sat, 15 Mar 2008 20:00:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 826568FC1B for ; Sat, 15 Mar 2008 20:00:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FK0CV6065700 for ; Sat, 15 Mar 2008 20:00:12 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FK0COw065698 for perforce@freebsd.org; Sat, 15 Mar 2008 20:00:12 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Mar 2008 20:00:12 GMT Message-Id: <200803152000.m2FK0COw065698@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 137798 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, 15 Mar 2008 20:00:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=137798 Change 137798 by kmacy@pandemonium:kmacy:iwarp on 2008/03/15 19:59:16 add license Affected files ... .. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_vm.h#2 edit Differences ... ==== //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_vm.h#2 (text+ko) ==== @@ -1,3 +1,34 @@ +/************************************************************************** + +Copyright (c) 2007, Chelsio Inc. +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. Neither the name of the Chelsio Corporation nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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. + + +$FreeBSD$ + +***************************************************************************/ #ifndef CXGB_VM_H_ #define CXGB_VM_H_ From owner-p4-projects@FreeBSD.ORG Sat Mar 15 20:36:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED8781065688; Sat, 15 Mar 2008 20:36:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9DC41065711 for ; Sat, 15 Mar 2008 20:36:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ADD298FC16 for ; Sat, 15 Mar 2008 20:36:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FKaowQ068201 for ; Sat, 15 Mar 2008 20:36:50 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FKanjp068199 for perforce@freebsd.org; Sat, 15 Mar 2008 20:36:49 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Mar 2008 20:36:49 GMT Message-Id: <200803152036.m2FKanjp068199@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 137799 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, 15 Mar 2008 20:36:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=137799 Change 137799 by kmacy@pandemonium:kmacy:xen31 on 2008/03/15 20:36:30 IFC 137789 Affected files ... .. //depot/projects/xen31/ObsoleteFiles.inc#12 integrate .. //depot/projects/xen31/UPDATING#7 integrate .. //depot/projects/xen31/bin/Makefile#2 integrate .. //depot/projects/xen31/bin/cp/cp.1#2 integrate .. //depot/projects/xen31/bin/cp/cp.c#3 integrate .. //depot/projects/xen31/bin/cp/utils.c#2 integrate .. //depot/projects/xen31/bin/ps/ps.1#2 integrate .. //depot/projects/xen31/bin/uuidgen/Makefile#1 branch .. //depot/projects/xen31/bin/uuidgen/uuidgen.1#1 branch .. //depot/projects/xen31/bin/uuidgen/uuidgen.c#1 branch .. //depot/projects/xen31/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/xen31/etc/rc.d/mountlate#3 integrate .. //depot/projects/xen31/etc/rc.d/root#3 integrate .. //depot/projects/xen31/lib/Makefile#6 integrate .. //depot/projects/xen31/lib/libalias/libalias/Makefile#2 integrate .. //depot/projects/xen31/lib/libarchive/Makefile#4 integrate .. //depot/projects/xen31/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_entry.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_private.h#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_ar.c#4 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_mtree.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_read_support_format_tar.c#6 integrate .. //depot/projects/xen31/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_util.3#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_disk.3#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_disk.c#5 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_private.h#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_compression_compress.c#1 branch .. //depot/projects/xen31/lib/libarchive/archive_write_set_format_ar.c#4 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_format_cpio.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_format_cpio_newc.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_format_pax.c#3 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_format_shar.c#2 integrate .. //depot/projects/xen31/lib/libarchive/archive_write_set_format_ustar.c#3 integrate .. //depot/projects/xen31/lib/libarchive/config_freebsd.h#3 integrate .. //depot/projects/xen31/lib/libarchive/test/.cvsignore#1 branch .. //depot/projects/xen31/lib/libarchive/test/Makefile#4 integrate .. //depot/projects/xen31/lib/libarchive/test/main.c#4 integrate .. //depot/projects/xen31/lib/libarchive/test/test.h#4 integrate .. //depot/projects/xen31/lib/libarchive/test/test_archive_api_feature.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_compat_gtar.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_compat_tar_hardlink.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_compat_zip.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_empty_write.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_entry.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_pax_filename_encoding.c#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_read_format_ar.c#2 integrate .. //depot/projects/xen31/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/xen31/lib/libarchive/test/test_write_compress.c#1 branch .. //depot/projects/xen31/lib/libarchive/test/test_write_format_ar.c#2 integrate .. //depot/projects/xen31/lib/libc/gen/Makefile.inc#4 integrate .. //depot/projects/xen31/lib/libc/gen/sem_timedwait.3#1 branch .. //depot/projects/xen31/lib/libc/gen/sem_wait.3#2 integrate .. //depot/projects/xen31/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/xen31/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/xen31/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/xen31/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/xen31/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/xen31/lib/libpmc/pmc.3#5 integrate .. //depot/projects/xen31/lib/libpmc/pmc_capabilities.3#2 integrate .. //depot/projects/xen31/lib/libsdp/sdp.h#2 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_sem.c#4 integrate .. //depot/projects/xen31/lib/libthread_db/Makefile#2 integrate .. //depot/projects/xen31/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/xen31/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/xen31/sbin/geom/class/multipath/gmultipath.8#3 integrate .. //depot/projects/xen31/sbin/mount/mount.8#3 integrate .. //depot/projects/xen31/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/xen31/share/man/man4/uart.4#2 integrate .. //depot/projects/xen31/share/man/man4/vr.4#2 integrate .. //depot/projects/xen31/share/man/man9/Makefile#9 integrate .. //depot/projects/xen31/share/man/man9/stack.9#3 integrate .. //depot/projects/xen31/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/xen31/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/xen31/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/xen31/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/xen31/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/xen31/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/xen31/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/xen31/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/xen31/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/xen31/sys/amd64/include/nexusvar.h#1 branch .. //depot/projects/xen31/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/xen31/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/xen31/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/xen31/sys/arm/arm/intr.c#2 integrate .. //depot/projects/xen31/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/xen31/sys/arm/arm/trap.c#3 integrate .. //depot/projects/xen31/sys/arm/conf/AVILA#4 integrate .. //depot/projects/xen31/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/xen31/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/xen31/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/xen31/sys/boot/powerpc/uboot/metadata.c#3 integrate .. //depot/projects/xen31/sys/boot/uboot/Makefile#2 integrate .. //depot/projects/xen31/sys/boot/uboot/common/main.c#3 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/Makefile#3 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/api_public.h#3 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/console.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/copy.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/elf_freebsd.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/glue.h#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/module.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/reboot.c#2 integrate .. //depot/projects/xen31/sys/boot/uboot/lib/time.c#2 integrate .. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/xen31/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/xen31/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/xen31/sys/conf/files#19 integrate .. //depot/projects/xen31/sys/conf/options#11 integrate .. //depot/projects/xen31/sys/dev/aac/aac.c#6 integrate .. //depot/projects/xen31/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/xen31/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/xen31/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/xen31/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/xen31/sys/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/xen31/sys/dev/hwpmc/pmc_events.h#2 integrate .. //depot/projects/xen31/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/xen31/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/xen31/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/xen31/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/xen31/sys/dev/tsec/if_tsec.h#2 integrate .. //depot/projects/xen31/sys/dev/uart/uart.h#3 integrate .. //depot/projects/xen31/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/xen31/sys/dev/usb/ums.c#3 integrate .. //depot/projects/xen31/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/xen31/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/xen31/sys/dev/vr/if_vr.c#1 branch .. //depot/projects/xen31/sys/dev/vr/if_vrreg.h#1 branch .. //depot/projects/xen31/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/xen31/sys/dev/wpi/if_wpireg.h#3 integrate .. //depot/projects/xen31/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/xen31/sys/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/xen31/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/xen31/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/xen31/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/xen31/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/xen31/sys/i386/conf/DEFAULTS#5 integrate .. //depot/projects/xen31/sys/i386/cpufreq/est.c#4 integrate .. //depot/projects/xen31/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/xen31/sys/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/xen31/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/xen31/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/xen31/sys/i386/i386/machdep.c#17 integrate .. //depot/projects/xen31/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/xen31/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/xen31/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/xen31/sys/i386/i386/trap.c#12 integrate .. //depot/projects/xen31/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/xen31/sys/i386/ibcs2/imgact_coff.c#4 integrate .. //depot/projects/xen31/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/xen31/sys/i386/include/nexusvar.h#1 branch .. //depot/projects/xen31/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/xen31/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/xen31/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/xen31/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/xen31/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/xen31/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/xen31/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/xen31/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/xen31/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/xen31/sys/ia64/isa/isa_dma.c#2 integrate .. //depot/projects/xen31/sys/kern/imgact_elf.c#7 integrate .. //depot/projects/xen31/sys/kern/init_sysent.c#5 integrate .. //depot/projects/xen31/sys/kern/kern_clock.c#5 integrate .. //depot/projects/xen31/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_exec.c#8 integrate .. //depot/projects/xen31/sys/kern/kern_fork.c#6 integrate .. //depot/projects/xen31/sys/kern/kern_intr.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_kse.c#4 delete .. //depot/projects/xen31/sys/kern/kern_proc.c#8 integrate .. //depot/projects/xen31/sys/kern/kern_resource.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_sig.c#8 integrate .. //depot/projects/xen31/sys/kern/kern_switch.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_sx.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_synch.c#4 integrate .. //depot/projects/xen31/sys/kern/kern_thread.c#8 integrate .. //depot/projects/xen31/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/xen31/sys/kern/link_elf.c#4 integrate .. //depot/projects/xen31/sys/kern/link_elf_obj.c#4 integrate .. //depot/projects/xen31/sys/kern/p1003_1b.c#3 integrate .. //depot/projects/xen31/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/xen31/sys/kern/sched_ule.c#10 integrate .. //depot/projects/xen31/sys/kern/subr_bus.c#6 integrate .. //depot/projects/xen31/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/xen31/sys/kern/subr_smp.c#5 integrate .. //depot/projects/xen31/sys/kern/subr_trap.c#5 integrate .. //depot/projects/xen31/sys/kern/subr_witness.c#5 integrate .. //depot/projects/xen31/sys/kern/sys_process.c#3 integrate .. //depot/projects/xen31/sys/kern/syscalls.c#5 integrate .. //depot/projects/xen31/sys/kern/syscalls.master#5 integrate .. //depot/projects/xen31/sys/kern/systrace_args.c#5 integrate .. //depot/projects/xen31/sys/modules/vr/Makefile#2 integrate .. //depot/projects/xen31/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/xen31/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/xen31/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/xen31/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/xen31/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/xen31/sys/netinet/libalias/alias.h#2 integrate .. //depot/projects/xen31/sys/netinet/libalias/alias_old.c#2 delete .. //depot/projects/xen31/sys/netinet6/ip6_ipsec.c#3 integrate .. //depot/projects/xen31/sys/netinet6/ip6_ipsec.h#3 integrate .. //depot/projects/xen31/sys/netinet6/ip6_output.c#6 integrate .. //depot/projects/xen31/sys/netipsec/ipsec_output.c#3 integrate .. //depot/projects/xen31/sys/netipsec/key.c#3 integrate .. //depot/projects/xen31/sys/netsmb/smb_conn.h#3 integrate .. //depot/projects/xen31/sys/pc98/conf/DEFAULTS#2 integrate .. //depot/projects/xen31/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/xen31/sys/pc98/include/nexusvar.h#1 branch .. //depot/projects/xen31/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/xen31/sys/pci/if_vr.c#3 delete .. //depot/projects/xen31/sys/pci/if_vrreg.h#2 delete .. //depot/projects/xen31/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/xen31/sys/powerpc/aim/vm_machdep.c#3 integrate .. //depot/projects/xen31/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/xen31/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/xen31/sys/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/xen31/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/xen31/sys/powerpc/include/bootinfo.h#3 integrate .. //depot/projects/xen31/sys/powerpc/include/ocpbus.h#2 integrate .. //depot/projects/xen31/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/intr_machdep.c#5 integrate .. //depot/projects/xen31/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/xen31/sys/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/xen31/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/xen31/sys/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/xen31/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/xen31/sys/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/xen31/sys/sys/bus_dma.h#2 integrate .. //depot/projects/xen31/sys/sys/condvar.h#2 integrate .. //depot/projects/xen31/sys/sys/cpuset.h#2 integrate .. //depot/projects/xen31/sys/sys/disklabel.h#3 integrate .. //depot/projects/xen31/sys/sys/interrupt.h#2 integrate .. //depot/projects/xen31/sys/sys/kse.h#2 delete .. //depot/projects/xen31/sys/sys/param.h#15 integrate .. //depot/projects/xen31/sys/sys/proc.h#10 integrate .. //depot/projects/xen31/sys/sys/sched.h#3 integrate .. //depot/projects/xen31/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/xen31/sys/sys/syscall.h#5 integrate .. //depot/projects/xen31/sys/sys/syscall.mk#5 integrate .. //depot/projects/xen31/sys/sys/sysproto.h#5 integrate .. //depot/projects/xen31/sys/sys/systm.h#4 integrate .. //depot/projects/xen31/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/xen31/sys/vm/vm_glue.c#3 integrate .. //depot/projects/xen31/sys/vm/vm_map.c#5 integrate .. //depot/projects/xen31/sys/vm/vm_meter.c#2 integrate .. //depot/projects/xen31/tools/tools/editing/freebsd.vim#1 branch .. //depot/projects/xen31/usr.bin/Makefile#6 integrate .. //depot/projects/xen31/usr.bin/ar/ar.1#2 integrate .. //depot/projects/xen31/usr.bin/ar/ar.c#2 integrate .. //depot/projects/xen31/usr.bin/ar/ar.h#2 integrate .. //depot/projects/xen31/usr.bin/ar/write.c#3 integrate .. //depot/projects/xen31/usr.bin/cpuset/cpuset.1#2 integrate .. //depot/projects/xen31/usr.bin/cpuset/cpuset.c#2 integrate .. //depot/projects/xen31/usr.bin/kdump/kdump.c#5 integrate .. //depot/projects/xen31/usr.bin/kdump/kdump_subr.h#2 integrate .. //depot/projects/xen31/usr.bin/kdump/mksubr#4 integrate .. //depot/projects/xen31/usr.bin/make/globals.h#2 integrate .. //depot/projects/xen31/usr.bin/make/hash_tables.c#2 integrate .. //depot/projects/xen31/usr.bin/make/main.c#4 integrate .. //depot/projects/xen31/usr.bin/make/make.1#4 integrate .. //depot/projects/xen31/usr.bin/make/parse.c#2 integrate .. //depot/projects/xen31/usr.bin/ministat/ministat.1#2 integrate .. //depot/projects/xen31/usr.bin/tar/bsdtar.1#4 integrate .. //depot/projects/xen31/usr.bin/tar/bsdtar.c#4 integrate .. //depot/projects/xen31/usr.bin/tar/bsdtar.h#3 integrate .. //depot/projects/xen31/usr.bin/tar/config_freebsd.h#3 integrate .. //depot/projects/xen31/usr.bin/tar/read.c#3 integrate .. //depot/projects/xen31/usr.bin/tar/write.c#3 integrate .. //depot/projects/xen31/usr.bin/uuidgen/Makefile#2 delete .. //depot/projects/xen31/usr.bin/uuidgen/uuidgen.1#2 delete .. //depot/projects/xen31/usr.bin/uuidgen/uuidgen.c#2 delete .. //depot/projects/xen31/usr.sbin/Makefile#4 integrate .. //depot/projects/xen31/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c#3 integrate .. //depot/projects/xen31/usr.sbin/bluetooth/sdpd/Makefile#2 integrate .. //depot/projects/xen31/usr.sbin/bluetooth/sdpd/gn.c#1 branch .. //depot/projects/xen31/usr.sbin/bluetooth/sdpd/nap.c#1 branch .. //depot/projects/xen31/usr.sbin/bluetooth/sdpd/panu.c#1 branch .. //depot/projects/xen31/usr.sbin/bluetooth/sdpd/profile.c#2 integrate .. //depot/projects/xen31/usr.sbin/bluetooth/sdpd/profile.h#2 integrate .. //depot/projects/xen31/usr.sbin/mixer/mixer.8#2 integrate .. //depot/projects/xen31/usr.sbin/mixer/mixer.c#2 integrate .. //depot/projects/xen31/usr.sbin/ppp/command.c#2 integrate .. //depot/projects/xen31/usr.sbin/ppp/ipcp.c#2 integrate .. //depot/projects/xen31/usr.sbin/ppp/main.c#2 integrate .. //depot/projects/xen31/usr.sbin/ppp/nat_cmd.c#2 integrate Differences ... ==== //depot/projects/xen31/ObsoleteFiles.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.132 2008/03/08 21:59:43 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.133 2008/03/13 18:17:46 brueffer Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -27,6 +27,8 @@ # 20071207: Merged with fortunes-o.real OLD_FILES+=usr/share/games/fortune/fortunes2-o OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat +# 20071201: Removal of XRPU driver +OLD_FILES+=usr/include/sys/xrpuio.h # 20071129: Disabled static versions of libkse by default .if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" OLD_FILES+=usr/lib/libkse.a ==== //depot/projects/xen31/UPDATING#7 (text+ko) ==== @@ -22,6 +22,16 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080312: + Support for KSE threading has been removed from the kernel. To + run legacy applications linked against KSE libmap.conf may + be used. The following libmap.conf may be used to ensure + compatibility with any prior release: + + libpthread.so.1 libthr.so.1 + libpthread.so.2 libthr.so.2 + libkse.so.3 libthr.so.3 + 20080301: The layout of struct vmspace has changed. This affects libkvm and any executables that link against libkvm and use the @@ -997,4 +1007,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.522 2008/03/01 22:54:42 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.523 2008/03/12 09:48:42 jeff Exp $ ==== //depot/projects/xen31/bin/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.26 2006/03/17 18:54:20 ru Exp $ +# $FreeBSD: src/bin/Makefile,v 1.27 2008/03/13 17:38:06 obrien Exp $ .include @@ -37,7 +37,8 @@ sleep \ stty \ sync \ - test + test \ + uuidgen .if ${MK_RCMDS} != "no" _rcp= rcp ==== //depot/projects/xen31/bin/cp/cp.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.39 2006/11/02 19:10:05 ceri Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $ .\" .Dd October 27, 2006 .Dt CP 1 @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl lpv +.Op Fl alpv .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -116,6 +116,10 @@ or .Xr pax 1 instead. +.It Fl a +Archive mode. +Same as +.Fl RpP . .It Fl f For each existing destination pathname, remove it and create a new file, without prompting for confirmation ==== //depot/projects/xen31/bin/cp/cp.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); /* * Cp copies source files to target files. @@ -102,7 +102,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -119,6 +119,12 @@ case 'R': Rflag = 1; break; + case 'a': + Pflag = 1; + pflag = 1; + Rflag = 1; + Hflag = Lflag = 0; + break; case 'f': fflag = 1; iflag = nflag = 0; ==== //depot/projects/xen31/bin/cp/utils.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.53 2008/03/10 19:58:41 jhb Exp $"); #include #include @@ -429,8 +429,8 @@ { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-lpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " "target_directory"); exit(EX_USAGE); } ==== //depot/projects/xen31/bin/ps/ps.1#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.89 2006/09/17 17:40:06 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.90 2008/03/12 10:01:34 jeff Exp $ .\" .Dd August 21, 2006 .Dt PS 1 @@ -290,7 +290,6 @@ .It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us" .It Dv "P_WEXIT" Ta No "0x02000 Working on exiting" .It Dv "P_EXEC" Ta No "0x04000 Process called exec" -.It Dv "P_SA" Ta No "0x08000 Using scheduler activations" .It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state" .It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP" .It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing" ==== //depot/projects/xen31/contrib/tcsh/sh.lex.c#2 (text+ko) ==== @@ -851,7 +851,8 @@ return (en); } slhs.len = 0; - Strbuf_append(&slhs, lhsb.s); + if (lhsb.s != NULL && lhsb.len != 0) + Strbuf_append(&slhs, lhsb.s); Strbuf_terminate(&slhs); if (exclc) en = dosub(sc, en, global); ==== //depot/projects/xen31/etc/rc.d/mountlate#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountlate,v 1.3 2008/03/06 14:39:33 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountlate,v 1.5 2008/03/11 17:21:55 delphij Exp $ # # PROVIDE: mountlate @@ -33,6 +33,12 @@ stop_boot true ;; esac + + # If we booted a special kernel remove the record + # so we will boot the default kernel next time. + if [ -x /sbin/nextboot ]; then + /sbin/nextboot -D + fi } load_rc_config $name ==== //depot/projects/xen31/etc/rc.d/root#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/root,v 1.16 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.17 2008/03/11 17:21:14 delphij Exp $ # # PROVIDE: root @@ -34,7 +34,7 @@ # If we booted a special kernel remove the record # so we will boot the default kernel next time. if [ -x /sbin/nextboot ]; then - /sbin/nextboot -D + /sbin/nextboot -D > /dev/null 2>&1 fi } ==== //depot/projects/xen31/lib/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.229 2008/03/12 09:49:39 jeff Exp $ .include @@ -34,7 +34,7 @@ ${_libgssapi} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ + libpmc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} libthread_db libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -104,10 +104,6 @@ _libsmb= libsmb .endif -.if ${MK_LIBKSE} != "no" -_libkse= libkse -.endif - .if ${MK_LIBTHR} != "no" _libthr= libthr .endif ==== //depot/projects/xen31/lib/libalias/libalias/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.4 2007/06/18 18:47:53 rafan Exp $ +# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.5 2008/03/12 11:58:28 piso Exp $ .PATH: ${.CURDIR}/../../../sys/netinet/libalias @@ -6,7 +6,7 @@ SHLIBDIR?= /lib SHLIB_MAJOR= 6 MAN= libalias.3 -SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c +SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c INCS= alias.h WARNS?= 6 NO_WERROR= ==== //depot/projects/xen31/lib/libarchive/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.80 2008/01/23 05:48:07 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.82 2008/03/14 23:00:53 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -81,6 +81,7 @@ archive_write_open_filename.c \ archive_write_open_memory.c \ archive_write_set_compression_bzip2.c \ + archive_write_set_compression_compress.c \ archive_write_set_compression_gzip.c \ archive_write_set_compression_none.c \ archive_write_set_compression_program.c \ @@ -120,6 +121,8 @@ MLINKS+= archive_entry.3 archive_entry_copy_gname.3 MLINKS+= archive_entry.3 archive_entry_copy_gname_w.3 MLINKS+= archive_entry.3 archive_entry_copy_hardlink_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_link.3 +MLINKS+= archive_entry.3 archive_entry_copy_link_w.3 MLINKS+= archive_entry.3 archive_entry_copy_pathname_w.3 MLINKS+= archive_entry.3 archive_entry_copy_stat.3 MLINKS+= archive_entry.3 archive_entry_copy_symlink_w.3 ==== //depot/projects/xen31/lib/libarchive/archive.h.in#3 (text+ko) ==== @@ -22,18 +22,12 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.47 2007/12/30 04:58:21 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.49 2008/03/14 22:19:50 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED #define ARCHIVE_H_INCLUDED -/* - * This header file corresponds to: - * Library version @ARCHIVE_VERSION@ - * Shared library version @SHLIB_MAJOR@ - */ - #include /* Linux requires this for off_t */ @ARCHIVE_H_INCLUDE_INTTYPES_H@ #include /* For FILE * */ @@ -51,58 +45,59 @@ #endif /* - * Each of the version identifiers comes as a macro and a function. + * The version number is provided as both a macro and a function. * The macro identifies the installed header; the function identifies * the library version (which may not be the same if you're using a * dynamically-linked version of the library). */ /* - * Textual name/version of the library, useful for version displays. - */ -#define ARCHIVE_LIBRARY_VERSION "libarchive @LIBARCHIVE_VERSION_STRING@" -const char * archive_version(void); - -/* - * The "version stamp" is a single integer that makes it easy to check - * the exact version: for version a.b.c, the version stamp is - * printf("%d%03d%03d",a,b,c). For example, version 2.12.108 has - * version stamp 2012108. + * The version number is expressed as a single integer that makes it + * easy to compare versions at build time: for version a.b.c, the + * version number is printf("%d%03d%03d",a,b,c). For example, if you + * know your application requires version 2.12.108 or later, you can + * assert that ARCHIVE_VERSION >= 2012108. * - * This was introduced with libarchive 1.9.0 in the libarchive 1.x family - * and libarchive 2.2.4 in the libarchive 2.x family. The following - * may be useful if you really want to do feature detection for earlier - * libarchive versions (which defined API_VERSION and API_FEATURE): + * This single-number format was introduced with libarchive 1.9.0 in + * the libarchive 1.x family and libarchive 2.2.4 in the libarchive + * 2.x family. The following may be useful if you really want to do + * feature detection for earlier libarchive versions (which defined + * ARCHIVE_API_VERSION and ARCHIVE_API_FEATURE instead): * - * #ifndef ARCHIVE_VERSION_STAMP - * #define ARCHIVE_VERSION_STAMP \ + * #ifndef ARCHIVE_VERSION_NUMBER + * #define ARCHIVE_VERSION_NUMBER \ * (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000) * #endif */ -#define ARCHIVE_VERSION_STAMP @LIBARCHIVE_VERSION@ -int archive_version_stamp(void); +#define ARCHIVE_VERSION_NUMBER @LIBARCHIVE_VERSION@ +int archive_version_number(void); /* - * Major version number: If ARCHIVE_API_VERSION != - * archive_api_version(), then the library you were linked with is - * using an incompatible API to the one you were compiled with. This - * is almost certainly a fatal problem. - * This is deprecated and will be removed; use ARCHIVE_VERSION_STAMP - * instead. + * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_API_VERSION (ARCHIVE_VERSION_STAMP / 1000000) -int archive_api_version(void); +const char * archive_version_string(void); +#if ARCHIVE_VERSION_NUMBER < 3000000 /* - * Minor version number. This is deprecated and will be removed. - * Use ARCHIVE_VERSION_STAMP to adapt to libarchive API variations. + * Deprecated; these are older names that will be removed in favor of + * the simpler definitions above. */ -#define ARCHIVE_API_FEATURE ((ARCHIVE_VERSION_STAMP / 1000) % 1000) +#define ARCHIVE_VERSION_STAMP ARCHIVE_VERSION_NUMBER +int archive_version_stamp(void); +#define ARCHIVE_LIBRARY_VERSION "libarchive @LIBARCHIVE_VERSION_STRING@" +const char * archive_version(void); +#define ARCHIVE_API_VERSION (ARCHIVE_VERSION_NUMBER / 1000000) +int archive_api_version(void); +#define ARCHIVE_API_FEATURE ((ARCHIVE_VERSION_NUMBER / 1000) % 1000) int archive_api_feature(void); +#endif - +#if ARCHIVE_VERSION_NUMBER < 3000000 +/* This should never have been here in the first place. */ +/* Legacy of old tar assumptions, will be removed in libarchive 3.0. */ #define ARCHIVE_BYTES_PER_RECORD 512 #define ARCHIVE_DEFAULT_BYTES_PER_BLOCK 10240 +#endif /* Declare our basic types. */ struct archive; @@ -119,6 +114,7 @@ #define ARCHIVE_WARN (-20) /* Partial success. */ /* For example, if write_header "fails", then you can't push data. */ #define ARCHIVE_FAILED (-25) /* Current operation cannot complete. */ +/* But if write_header is "fatal," then this archive is dead and useless. */ #define ARCHIVE_FATAL (-30) /* No more operations are possible. */ /* @@ -146,7 +142,7 @@ typedef ssize_t archive_read_callback(struct archive *, void *_client_data, const void **_buffer); /* Skips at most request bytes from archive and returns the skipped amount */ -#if ARCHIVE_API_VERSION < 2 +#if ARCHIVE_VERSION_NUMBER < 2000000 typedef ssize_t archive_skip_callback(struct archive *, void *_client_data, size_t request); #else @@ -370,7 +366,7 @@ int archive_read_close(struct archive *); /* Release all resources and destroy the object. */ /* Note that archive_read_finish will call archive_read_close for you. */ -#if ARCHIVE_API_VERSION > 1 +#if ARCHIVE_VERSION_NUMBER >= 2000000 int archive_read_finish(struct archive *); #else /* Temporarily allow library to compile with either 1.x or 2.0 API. */ @@ -407,6 +403,7 @@ int archive_write_set_skip_file(struct archive *, dev_t, ino_t); int archive_write_set_compression_bzip2(struct archive *); +int archive_write_set_compression_compress(struct archive *); int archive_write_set_compression_gzip(struct archive *); int archive_write_set_compression_none(struct archive *); int archive_write_set_compression_program(struct archive *, @@ -445,7 +442,7 @@ */ int archive_write_header(struct archive *, struct archive_entry *); -#if ARCHIVE_API_VERSION > 1 +#if ARCHIVE_VERSION_NUMBER >= 2000000 ssize_t archive_write_data(struct archive *, const void *, size_t); #else /* Temporarily allow library to compile with either 1.x or 2.0 API. */ @@ -455,7 +452,7 @@ ssize_t archive_write_data_block(struct archive *, const void *, size_t, off_t); int archive_write_finish_entry(struct archive *); int archive_write_close(struct archive *); -#if ARCHIVE_API_VERSION > 1 +#if ARCHIVE_VERSION_NUMBER >= 2000000 int archive_write_finish(struct archive *); #else /* Temporarily allow library to compile with either 1.x or 2.0 API. */ ==== //depot/projects/xen31/lib/libarchive/archive_entry.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.15 2007/07/15 19:10:34 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.17 2008/03/14 23:00:53 kientzle Exp $ .\" .Dd December 15, 2003 .Dt archive_entry 3 @@ -45,6 +45,8 @@ .Nm archive_entry_copy_gname_w , .Nm archive_entry_copy_hardlink , .Nm archive_entry_copy_hardlink_w , +.Nm archive_entry_copy_link , +.Nm archive_entry_copy_link_w , .Nm archive_entry_copy_pathname_w , .Nm archive_entry_copy_stat , .Nm archive_entry_copy_symlink , @@ -101,17 +103,47 @@ .Sh SYNOPSIS .In archive_entry.h .Ft void -.Fn archive_entry_acl_add_entry "struct archive_entry *" "int type" "int permset" "int tag" "int qual" "const char *name" +.Fo archive_entry_acl_add_entry +.Fa "struct archive_entry *" +.Fa "int type" +.Fa "int permset" +.Fa "int tag" +.Fa "int qual" +.Fa "const char *name" +.Fc .Ft void -.Fn archive_entry_acl_add_entry_w "struct archive_entry *" "int type" "int permset" "int tag" "int qual" "const wchar_t *name" +.Fo archive_entry_acl_add_entry_w +.Fa "struct archive_entry *" +.Fa "int type" +.Fa "int permset" +.Fa "int tag" +.Fa "int qual" +.Fa "const wchar_t *name" +.Fc .Ft void .Fn archive_entry_acl_clear "struct archive_entry *" .Ft int .Fn archive_entry_acl_count "struct archive_entry *" "int type" .Ft int -.Fn archive_entry_acl_next "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const char **name" +.Fo archive_entry_acl_next +.Fa "struct archive_entry *" +.Fa "int want_type" +.Fa "int *type" +.Fa "int *permset" +.Fa "int *tag" +.Fa "int *qual" +.Fa "const char **name" +.Fc .Ft int -.Fn archive_entry_acl_next_w "struct archive_entry *" "int want_type" "int *type" "int *permset" "int *tag" "int *qual" "const wchar_t **name" +.Fo archive_entry_acl_next_w +.Fa "struct archive_entry *" +.Fa "int want_type" +.Fa "int *type" +.Fa "int *permset" +.Fa "int *tag" +.Fa "int *qual" +.Fa "const wchar_t **name" +.Fc .Ft int .Fn archive_entry_acl_reset "struct archive_entry *" "int want_type" .Ft const wchar_t * @@ -155,7 +187,11 @@ .Ft mode_t .Fn archive_entry_filetype "struct archive_entry *" .Ft void -.Fn archive_entry_fflags "struct archive_entry *" "unsigned long *set" "unsigned long *clear" +.Fo archive_entry_fflags +.Fa "struct archive_entry *" +.Fa "unsigned long *set" +.Fa "unsigned long *clear" +.Fc .Ft const char * .Fn archive_entry_fflags_text "struct archive_entry *" .Ft void @@ -195,7 +231,11 @@ .Ft void .Fn archive_entry_set_filetype "struct archive_entry *" "unsigned int" .Ft void -.Fn archive_entry_set_fflags "struct archive_entry *" "unsigned long set" "unsigned long clear" +.Fo archive_entry_set_fflags +.Fa "struct archive_entry *" +.Fa "unsigned long set" +.Fa "unsigned long clear" +.Fc .Ft void .Fn archive_entry_set_gid "struct archive_entry *" "gid_t" .Ft void ==== //depot/projects/xen31/lib/libarchive/archive_entry.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.45 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry.c,v 1.51 2008/03/14 23:19:46 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -207,6 +207,8 @@ static const wchar_t * aes_get_wcs(struct aes *aes) { + int r; + if (aes->aes_wcs == NULL && aes->aes_mbs == NULL) return NULL; if (aes->aes_wcs == NULL && aes->aes_mbs != NULL) { @@ -221,8 +223,13 @@ aes->aes_wcs = aes->aes_wcs_alloc; if (aes->aes_wcs == NULL) __archive_errx(1, "No memory for aes_get_wcs()"); - mbstowcs(aes->aes_wcs_alloc, aes->aes_mbs, wcs_length); + r = mbstowcs(aes->aes_wcs_alloc, aes->aes_mbs, wcs_length); aes->aes_wcs_alloc[wcs_length] = 0; + if (r == -1) { + /* Conversion failed, don't lie to our clients. */ + free(aes->aes_wcs_alloc); + aes->aes_wcs = aes->aes_wcs_alloc = NULL; + } } return (aes->aes_wcs); } @@ -307,6 +314,8 @@ struct archive_entry * archive_entry_clear(struct archive_entry *entry) { + if (entry == NULL) + return (NULL); aes_clean(&entry->ae_fflags_text); aes_clean(&entry->ae_gname); aes_clean(&entry->ae_hardlink); @@ -752,6 +761,28 @@ aes_set_mbs(&entry->ae_hardlink, target); } +/* Set symlink if symlink is already set, else set hardlink. */ +void +archive_entry_copy_link(struct archive_entry *entry, const char *target) +{ + if (entry->ae_symlink.aes_mbs != NULL || + entry->ae_symlink.aes_wcs != NULL) + aes_copy_mbs(&entry->ae_symlink, target); + else + aes_copy_mbs(&entry->ae_hardlink, target); +} + +/* Set symlink if symlink is already set, else set hardlink. */ +void +archive_entry_copy_link_w(struct archive_entry *entry, const wchar_t *target) +{ + if (entry->ae_symlink.aes_mbs != NULL || + entry->ae_symlink.aes_wcs != NULL) + aes_copy_wcs(&entry->ae_symlink, target); + else + aes_copy_wcs(&entry->ae_hardlink, target); +} + void archive_entry_set_mode(struct archive_entry *entry, mode_t m) { @@ -1124,6 +1155,11 @@ entry->acl_p = entry->acl_p->next; if (entry->acl_p == NULL) { entry->acl_state = 0; + *type = 0; + *permset = 0; + *tag = 0; + *id = -1; + *name = NULL; return (ARCHIVE_EOF); /* End of ACL entries. */ } *type = entry->acl_p->type; @@ -1143,7 +1179,7 @@ archive_entry_acl_text_w(struct archive_entry *entry, int flags) { int count; - int length; + size_t length; const wchar_t *wname; const wchar_t *prefix; wchar_t separator; @@ -1505,7 +1541,7 @@ return (ARCHIVE_OK); } else { *name = NULL; - *name = NULL; + *value = NULL; *size = (size_t)0; return (ARCHIVE_WARN); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 15 20:58:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E63FD1065671; Sat, 15 Mar 2008 20:58:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B310106564A for ; Sat, 15 Mar 2008 20:58:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 90E408FC14 for ; Sat, 15 Mar 2008 20:58:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FKwC7o079527 for ; Sat, 15 Mar 2008 20:58:12 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FKwCw3079525 for perforce@freebsd.org; Sat, 15 Mar 2008 20:58:12 GMT (envelope-from sam@freebsd.org) Date: Sat, 15 Mar 2008 20:58:12 GMT Message-Id: <200803152058.m2FKwCw3079525@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 137800 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, 15 Mar 2008 20:58:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=137800 Change 137800 by sam@sam_ebb on 2008/03/15 20:58:04 o don't attach 11n sysctl knobs for legacy devices o reorder some knobs to get most interesting bits near the top Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#23 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#23 (text+ko) ==== @@ -192,12 +192,18 @@ SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "%parent", CTLFLAG_RD, vap->iv_ic, 0, ieee80211_sysctl_parent, "A", "parent device"); + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "driver_caps", CTLFLAG_RW, &vap->iv_caps, 0, + "driver capabilities"); #ifdef IEEE80211_DEBUG vap->iv_debug = ieee80211_debug; SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "debug", CTLFLAG_RW, &vap->iv_debug, 0, "control debugging printfs"); #endif + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "bmiss_max", CTLFLAG_RW, &vap->iv_bmiss_max, 0, + "consecutive beacon misses before scanning"); /* XXX inherit from tunables */ SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "inact_run", CTLTYPE_INT | CTLFLAG_RW, &vap->iv_inact_run, 0, @@ -215,28 +221,24 @@ "inact_init", CTLTYPE_INT | CTLFLAG_RW, &vap->iv_inact_init, 0, ieee80211_sysctl_inact, "I", "station initial state timeout (sec)"); - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, - "driver_caps", CTLFLAG_RW, &vap->iv_caps, 0, - "driver capabilities"); - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, - "bmiss_max", CTLFLAG_RW, &vap->iv_bmiss_max, 0, - "consecutive beacon misses before scanning"); - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, - "ampdu_mintraffic_bk", CTLFLAG_RW, - &vap->iv_ampdu_mintraffic[WME_AC_BK], 0, - "BK traffic tx aggr threshold (pps)"); - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, - "ampdu_mintraffic_be", CTLFLAG_RW, - &vap->iv_ampdu_mintraffic[WME_AC_BE], 0, - "BE traffic tx aggr threshold (pps)"); - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, - "ampdu_mintraffic_vo", CTLFLAG_RW, - &vap->iv_ampdu_mintraffic[WME_AC_VO], 0, - "VO traffic tx aggr threshold (pps)"); - SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, - "ampdu_mintraffic_vi", CTLFLAG_RW, - &vap->iv_ampdu_mintraffic[WME_AC_VI], 0, - "VI traffic tx aggr threshold (pps)"); + if (vap->iv_htcaps & IEEE80211_HTC_HT) { + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "ampdu_mintraffic_bk", CTLFLAG_RW, + &vap->iv_ampdu_mintraffic[WME_AC_BK], 0, + "BK traffic tx aggr threshold (pps)"); + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "ampdu_mintraffic_be", CTLFLAG_RW, + &vap->iv_ampdu_mintraffic[WME_AC_BE], 0, + "BE traffic tx aggr threshold (pps)"); + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "ampdu_mintraffic_vo", CTLFLAG_RW, + &vap->iv_ampdu_mintraffic[WME_AC_VO], 0, + "VO traffic tx aggr threshold (pps)"); + SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "ampdu_mintraffic_vi", CTLFLAG_RW, + &vap->iv_ampdu_mintraffic[WME_AC_VI], 0, + "VI traffic tx aggr threshold (pps)"); + } vap->iv_sysctl = ctx; vap->iv_oid = oid; } From owner-p4-projects@FreeBSD.ORG Sat Mar 15 21:00:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C21291065671; Sat, 15 Mar 2008 21:00:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81707106566B for ; Sat, 15 Mar 2008 21:00:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 81C198FC1D for ; Sat, 15 Mar 2008 21:00:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FL0F12079613 for ; Sat, 15 Mar 2008 21:00:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FL0Fr5079611 for perforce@freebsd.org; Sat, 15 Mar 2008 21:00:15 GMT (envelope-from sam@freebsd.org) Date: Sat, 15 Mar 2008 21:00:15 GMT Message-Id: <200803152100.m2FL0Fr5079611@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 137801 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, 15 Mar 2008 21:00:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=137801 Change 137801 by sam@sam_ebb on 2008/03/15 20:59:48 checkpoint temporary hack to split post state change work into a callback; going to explore a better solution next Affected files ... .. //depot/projects/vap/sys/dev/usb/if_rum.c#10 edit .. //depot/projects/vap/sys/dev/usb/if_ural.c#12 edit .. //depot/projects/vap/sys/dev/usb/if_zyd.c#11 edit .. //depot/projects/vap/sys/dev/wpi/if_wpi.c#11 edit .. //depot/projects/vap/sys/net80211/ieee80211_proto.c#24 edit .. //depot/projects/vap/sys/net80211/ieee80211_var.h#32 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_rum.c#10 (text+ko) ==== @@ -801,13 +801,10 @@ RUM_UNLOCK(sc); - IEEE80211_LOCK(ic); /*XXX*/ + IEEE80211_LOCK(ic); rvp->newstate(vap, sc->sc_state, sc->sc_arg); - if (sc->sc_state == IEEE80211_S_RUN) { - /* XXX compensate for deferred handling of newstate */ - vap->iv_ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - if_start(vap->iv_ifp); - } + if (vap->iv_newstate_cb != NULL) + vap->iv_newstate_cb(vap, sc->sc_state, sc->sc_arg); IEEE80211_UNLOCK(ic); } @@ -825,11 +822,13 @@ sc->sc_arg = arg; usb_rem_task(sc->sc_udev, &sc->sc_task); - if (nstate == IEEE80211_S_INIT) + if (nstate == IEEE80211_S_INIT) { rvp->newstate(vap, nstate, arg); - else + return 0; + } else { usb_add_task(sc->sc_udev, &sc->sc_task, USB_TASKQ_DRIVER); - return 0; + return EINPROGRESS; + } } /* quickly determine if a given rate is CCK or OFDM */ ==== //depot/projects/vap/sys/dev/usb/if_ural.c#12 (text+ko) ==== @@ -808,13 +808,10 @@ RAL_UNLOCK(sc); - IEEE80211_LOCK(ic); /*XXX*/ + IEEE80211_LOCK(ic); uvp->newstate(vap, sc->sc_state, sc->sc_arg); - if (sc->sc_state == IEEE80211_S_RUN) { - /* XXX compensate for deferred handling of newstate */ - vap->iv_ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - if_start(vap->iv_ifp); - } + if (vap->iv_newstate_cb != NULL) + vap->iv_newstate_cb(vap, sc->sc_state, sc->sc_arg); IEEE80211_UNLOCK(ic); } @@ -857,11 +854,13 @@ sc->sc_arg = arg; usb_rem_task(sc->sc_udev, &sc->sc_task); - if (nstate == IEEE80211_S_INIT) + if (nstate == IEEE80211_S_INIT) { uvp->newstate(vap, nstate, arg); - else + return 0; + } else { usb_add_task(sc->sc_udev, &sc->sc_task, USB_TASKQ_DRIVER); - return 0; + return EINPROGRESS; + } } /* quickly determine if a given rate is CCK or OFDM */ ==== //depot/projects/vap/sys/dev/usb/if_zyd.c#11 (text+ko) ==== @@ -708,9 +708,6 @@ struct ieee80211com *ic = &sc->sc_ic; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); struct zyd_vap *zvp = ZYD_VAP(vap); - enum ieee80211_state ostate; - - ostate = vap->iv_state; switch (sc->sc_state) { case IEEE80211_S_RUN: @@ -740,13 +737,10 @@ break; } - IEEE80211_LOCK(ic); /*XXX*/ + IEEE80211_LOCK(ic); zvp->newstate(vap, sc->sc_state, sc->sc_arg); - if (sc->sc_state == IEEE80211_S_RUN) { - /* XXX compensate for deferred handling of newstate */ - vap->iv_ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - if_start(vap->iv_ifp); - } + if (vap->iv_newstate_cb != NULL) + vap->iv_newstate_cb(vap, sc->sc_state, sc->sc_arg); IEEE80211_UNLOCK(ic); } @@ -763,12 +757,13 @@ sc->sc_state = nstate; sc->sc_arg = arg; - if (nstate == IEEE80211_S_INIT) + if (nstate == IEEE80211_S_INIT) { zvp->newstate(vap, nstate, arg); - else + return 0; + } else { usb_add_task(sc->sc_udev, &sc->sc_task, USB_TASKQ_DRIVER); - - return 0; + return EINPROGRESS; + } } static int ==== //depot/projects/vap/sys/dev/wpi/if_wpi.c#11 (text+ko) ==== @@ -1256,6 +1256,7 @@ struct ieee80211com *ic = vap->iv_ic; struct ifnet *ifp = ic->ic_ifp; struct wpi_softc *sc = ifp->if_softc; + int error; DPRINTF(("%s: %s -> %s flags 0x%x\n", __func__, ieee80211_state_name[vap->iv_state], @@ -1265,11 +1266,13 @@ if (nstate == IEEE80211_S_AUTH) { /* Delay the auth transition until we can update the firmware */ - return wpi_queue_cmd(sc, WPI_AUTH, arg, WPI_QUEUE_NORMAL); + error = wpi_queue_cmd(sc, WPI_AUTH, arg, WPI_QUEUE_NORMAL); + return (error != 0 ? error : EINPROGRESS); } if (nstate == IEEE80211_S_RUN && vap->iv_state != IEEE80211_S_RUN) { /* set the association id first */ - return wpi_queue_cmd(sc, WPI_RUN, arg, WPI_QUEUE_NORMAL); + error = wpi_queue_cmd(sc, WPI_RUN, arg, WPI_QUEUE_NORMAL); + return (error != 0 ? error : EINPROGRESS); } if (nstate == IEEE80211_S_RUN) { /* RUN -> RUN transition; just restart the timers */ @@ -3580,28 +3583,35 @@ case WPI_AUTH: /* The node must be registered in the firmware before auth */ error = wpi_auth(sc, vap); + WPI_UNLOCK(sc); if (error != 0) { device_printf(sc->sc_dev, "%s: could not move to auth state, error %d\n", __func__, error); - WPI_UNLOCK(sc); return; } - /* Send the auth frame now */ + IEEE80211_LOCK(ic); WPI_VAP(vap)->newstate(vap, IEEE80211_S_AUTH, arg); - break; + if (vap->iv_newstate_cb != NULL) + vap->iv_newstate_cb(vap, IEEE80211_S_AUTH, arg); + IEEE80211_UNLOCK(ic); + goto again; case WPI_RUN: error = wpi_run(sc, vap); + WPI_UNLOCK(sc); if (error != 0) { device_printf(sc->sc_dev, "%s: could not move to run state, error %d\n", __func__, error); - WPI_UNLOCK(sc); return; } + IEEE80211_LOCK(ic); WPI_VAP(vap)->newstate(vap, IEEE80211_S_RUN, arg); - break; + if (vap->iv_newstate_cb != NULL) + vap->iv_newstate_cb(vap, IEEE80211_S_RUN, arg); + IEEE80211_UNLOCK(ic); + goto again; } WPI_UNLOCK(sc); ==== //depot/projects/vap/sys/net80211/ieee80211_proto.c#24 (text+ko) ==== @@ -1473,6 +1473,53 @@ } /* + * Handle post state change work common to all operating modes. + */ +static void +ieee80211_newstate_cb(struct ieee80211vap *vap, + enum ieee80211_state nstate, int arg) +{ + struct ieee80211com *ic = vap->iv_ic; + + IEEE80211_LOCK_ASSERT(ic); + + IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, + "%s: %s arg %d\n", __func__, ieee80211_state_name[nstate], arg); + + if (nstate == IEEE80211_S_RUN) { + /* + * OACTIVE may be set on the vap if the upper layer + * tried to transmit (e.g. IPv6 NDP) before we reach + * RUN state. Clear it and restart xmit. + * + * Note this can also happen as a result of SLEEP->RUN + * (i.e. coming out of power save mode). + */ + vap->iv_ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + if_start(vap->iv_ifp); + + /* bring up any vaps waiting on us */ + wakeupwaiting(vap); + } else if (nstate == IEEE80211_S_INIT) { + /* + * Flush the scan cache if we did the last scan (XXX?) + * and flush any frames on send queues from this vap. + * Note the mgt q is used only for legacy drivers and + * will go away shortly. + */ + ieee80211_scan_flush(vap); + + /* XXX can skip this if not using ic_mgtq */ + /* flush any frames for this vap in the shared q's */ + ieee80211_flush_ifq(&ic->ic_mgtq, vap); + /* XXX NB: cast for altq */ + ieee80211_flush_ifq((struct ifqueue *) + &ic->ic_ifp->if_snd, vap); + } + vap->iv_newstate_cb = NULL; +} + +/* * Public interface for initiating a state machine change. * This routine single-threads the request and coordinates * the scheduling of multiple vaps for the purpose of selecting @@ -1624,29 +1671,18 @@ default: break; } - rc = vap->iv_newstate(vap, nstate, arg); /* XXX on transition RUN->CAC do we need to set nstate = iv_state? */ if (ostate != nstate) { /* - * Handle work common to all operating modes. + * Arrange for work to happen after state change completes. + * If this happens asynchronously the caller must arrange + * for the com lock to be held. */ - if (nstate == IEEE80211_S_RUN) { - vap->iv_ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - if_start(vap->iv_ifp); - - /* bring up any vaps waiting on us */ - wakeupwaiting(vap); - } else if (nstate == IEEE80211_S_INIT) { - ieee80211_scan_flush(vap); - - /* XXX can skip this if not using ic_mgtq */ - /* flush any frames for this vap in the shared q's */ - ieee80211_flush_ifq(&ic->ic_mgtq, vap); - /* XXX NB: cast for altq */ - ieee80211_flush_ifq((struct ifqueue *) - &ic->ic_ifp->if_snd, vap); - } + vap->iv_newstate_cb = ieee80211_newstate_cb; } + rc = vap->iv_newstate(vap, nstate, arg); + if (rc == 0) + vap->iv_newstate_cb(vap, nstate, arg); done: return rc; } ==== //depot/projects/vap/sys/net80211/ieee80211_var.h#32 (text+ko) ==== @@ -293,6 +293,8 @@ uint32_t iv_htcaps; /* HT capabilities */ enum ieee80211_opmode iv_opmode; /* operation mode */ enum ieee80211_state iv_state; /* state machine state */ + void (*iv_newstate_cb)(struct ieee80211vap *, + enum ieee80211_state, int); struct callout iv_mgtsend; /* mgmt frame response timer */ /* inactivity timer settings */ int iv_inact_init; /* setting for new station */ From owner-p4-projects@FreeBSD.ORG Sat Mar 15 22:48:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F8671065671; Sat, 15 Mar 2008 22:48:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D050E106566C for ; Sat, 15 Mar 2008 22:48:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D336B8FC19 for ; Sat, 15 Mar 2008 22:48:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FMmC9M085984 for ; Sat, 15 Mar 2008 22:48:12 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FMmCMc085982 for perforce@freebsd.org; Sat, 15 Mar 2008 22:48:12 GMT (envelope-from sam@freebsd.org) Date: Sat, 15 Mar 2008 22:48:12 GMT Message-Id: <200803152248.m2FMmCMc085982@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 137807 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, 15 Mar 2008 22:48:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=137807 Change 137807 by sam@sam_ebb on 2008/03/15 22:47:59 fill in missing bits to merge vap's multicast lists into a single list for the parent device and call the update method to notify the driver it should push the result; note this is prone with terrible hackery to workaround bogosity in the ifnet code and we still pay a terrible price as we must rebuild the parent's mcast list from scratch each time as we have no context to know how to optimize work Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#43 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#43 (text+ko) ==== @@ -3143,12 +3143,44 @@ return error; } +/* + * Rebuild the parent's multicast address list after an add/del + * of a multicast address for a vap. We have no way to tell + * what happened above to optimize the work so we purge the entire + * list and rebuild from scratch. This is way expensive. + * Note also the half-baked workaround for if_addmulti calling + * back to the parent device; there's no way to insert mcast + * entries quietly and/or cheaply. + */ +static void +ieee80211_ioctl_updatemulti(struct ieee80211com *ic) +{ + struct ifnet *parent = ic->ic_ifp; + struct ieee80211vap *vap; + void *ioctl; + + IEEE80211_LOCK(ic); + if_purgemaddrs(parent); + ioctl = parent->if_ioctl; /* XXX WAR if_allmulti */ + parent->if_ioctl = NULL; + TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { + struct ifnet *ifp = vap->iv_ifp; + struct ifmultiaddr *ifma; + + TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) + (void) if_addmulti(parent, ifma->ifma_addr, NULL); + } + parent->if_ioctl = ioctl; + IEEE80211_UNLOCK(ic); + + ic->ic_update_mcast(ic->ic_ifp); +} + int ieee80211_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct ieee80211vap *vap; struct ieee80211com *ic; - struct ifnet *parent; int error = 0; struct ifreq *ifr; struct ifaddr *ifa; /* XXX */ @@ -3193,12 +3225,7 @@ break; case SIOCADDMULTI: case SIOCDELMULTI: - /* XXX merge vap lists into parent */ - parent = vap->iv_ic->ic_ifp; - if (parent->if_drv_flags & IFF_DRV_RUNNING) { - /* XXX propagate multicast address to device */ - error = parent->if_ioctl(parent, cmd, data); - } + ieee80211_ioctl_updatemulti(vap->iv_ic); break; case SIOCSIFMEDIA: case SIOCGIFMEDIA: From owner-p4-projects@FreeBSD.ORG Sat Mar 15 22:49:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 648961065673; Sat, 15 Mar 2008 22:49:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 24523106564A for ; Sat, 15 Mar 2008 22:49:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 272808FC17 for ; Sat, 15 Mar 2008 22:49:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FMnD7Z086007 for ; Sat, 15 Mar 2008 22:49:13 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FMnDAe086005 for perforce@freebsd.org; Sat, 15 Mar 2008 22:49:13 GMT (envelope-from sam@freebsd.org) Date: Sat, 15 Mar 2008 22:49:13 GMT Message-Id: <200803152249.m2FMnDAe086005@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 137808 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, 15 Mar 2008 22:49:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=137808 Change 137808 by sam@sam_ebb on 2008/03/15 22:48:36 remove hack to walk the vap list to calculate the mcast filter as net80211 now does the merge for us Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#44 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#44 (text+ko) ==== @@ -142,6 +142,7 @@ const u_int8_t mac[IEEE80211_ADDR_LEN]); static void ath_key_update_begin(struct ieee80211vap *); static void ath_key_update_end(struct ieee80211vap *); +static void ath_update_mcast(struct ifnet *); static void ath_mode_init(struct ath_softc *); static void ath_setslottime(struct ath_softc *); static void ath_updateslot(struct ifnet *); @@ -625,6 +626,7 @@ ic->ic_vap_create = ath_vap_create; ic->ic_vap_delete = ath_vap_delete; ic->ic_raw_xmit = ath_raw_xmit; + ic->ic_update_mcast = ath_update_mcast; ic->ic_node_alloc = ath_node_alloc; sc->sc_node_free = ic->ic_node_free; ic->ic_node_free = ath_node_free; @@ -2496,25 +2498,20 @@ return rfilt; } -/* - * Merge multicast address from all vap's to form the hardware - * filter. Ideally we should only inspect our own list and the - * 802.11 layer would merge for us but that's bit difficult so - * for now we put the onus on the driver. - */ static void -ath_merge_mcast(struct ath_softc *sc, u_int32_t mfilt[2]) +ath_update_mcast(struct ifnet *ifp) { - struct ieee80211com *ic = &sc->sc_ic; - struct ieee80211vap *vap; + struct ath_softc *sc = ifp->if_softc; + u_int32_t mfilt[2]; - mfilt[0] = mfilt[1] = 0; - /* XXX locking */ - TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { - struct ifnet *ifp = vap->iv_ifp; + /* calculate and install multicast filter */ + if ((ifp->if_flags & IFF_ALLMULTI) == 0) { struct ifmultiaddr *ifma; - - IF_ADDR_LOCK(ifp); + /* + * Merge multicast addresses to form the hardware filter. + */ + mfilt[0] = mfilt[1] = 0; + IF_ADDR_LOCK(ifp); /* XXX need some fiddling to remove? */ TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { caddr_t dl; u_int32_t val; @@ -2530,7 +2527,11 @@ mfilt[pos / 32] |= (1 << (pos % 32)); } IF_ADDR_UNLOCK(ifp); - } + } else + mfilt[0] = mfilt[1] = ~0; + ath_hal_setmcastfilter(sc->sc_ah, mfilt[0], mfilt[1]); + DPRINTF(sc, ATH_DEBUG_MODE, "%s: , MC filter %08x:%08x\n", + __func__, mfilt[0], mfilt[1]); } static void @@ -2539,11 +2540,12 @@ struct ieee80211com *ic = &sc->sc_ic; struct ath_hal *ah = sc->sc_ah; struct ifnet *ifp = sc->sc_ifp; - u_int32_t rfilt, mfilt[2]; + u_int32_t rfilt; /* configure rx filter */ rfilt = ath_calcrxfilter(sc); ath_hal_setrxfilter(ah, rfilt); + DPRINTF(sc, ATH_DEBUG_MODE, "%s: RX filter 0x%x\n", __func__, rfilt); /* configure operational mode */ ath_hal_setopmode(ah); @@ -2560,13 +2562,7 @@ ath_hal_setmac(ah, ic->ic_myaddr); /* calculate and install multicast filter */ - if ((ifp->if_flags & IFF_ALLMULTI) == 0) - ath_merge_mcast(sc, mfilt); - else - mfilt[0] = mfilt[1] = ~0; - ath_hal_setmcastfilter(ah, mfilt[0], mfilt[1]); - DPRINTF(sc, ATH_DEBUG_MODE, "%s: RX filter 0x%x, MC filter %08x:%08x\n", - __func__, rfilt, mfilt[0], mfilt[1]); + ath_update_mcast(ifp); } /* From owner-p4-projects@FreeBSD.ORG Sat Mar 15 22:50:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E64F106567A; Sat, 15 Mar 2008 22:50:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DF5C106564A for ; Sat, 15 Mar 2008 22:50:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 511E18FC1E for ; Sat, 15 Mar 2008 22:50:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FMoF0Z086072 for ; Sat, 15 Mar 2008 22:50:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FMoFA3086070 for perforce@freebsd.org; Sat, 15 Mar 2008 22:50:15 GMT (envelope-from sam@freebsd.org) Date: Sat, 15 Mar 2008 22:50:15 GMT Message-Id: <200803152250.m2FMoFA3086070@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 137809 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, 15 Mar 2008 22:50:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=137809 Change 137809 by sam@sam_ebb on 2008/03/15 22:49:47 hookup to an mcast update callback now that net80211 handles the merge; add a usb task so the update can be done in a context that avoids LOR's and such (this is gross) Affected files ... .. //depot/projects/vap/sys/dev/usb/if_zyd.c#12 edit .. //depot/projects/vap/sys/dev/usb/if_zydreg.h#7 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_zyd.c#12 (text+ko) ==== @@ -204,7 +204,8 @@ static int zyd_set_bssid(struct zyd_softc *, const uint8_t *); static int zyd_switch_radio(struct zyd_softc *, int); static void zyd_set_led(struct zyd_softc *, int, int); -static void zyd_set_multi(struct zyd_softc *); +static void zyd_set_multi(void *); +static void zyd_update_mcast(struct ifnet *); static int zyd_set_rxfilter(struct zyd_softc *); static void zyd_set_chan(struct zyd_softc *, struct ieee80211_channel *); static int zyd_set_beacon_interval(struct zyd_softc *, int); @@ -334,6 +335,7 @@ usb_init_task(&sc->sc_scantask, zyd_scantask, sc); usb_init_task(&sc->sc_task, zyd_task, sc); + usb_init_task(&sc->sc_mcasttask, zyd_set_multi, sc); callout_init(&sc->sc_watchdog_ch, 0); @@ -409,6 +411,7 @@ ic->ic_vap_create = zyd_vap_create; ic->ic_vap_delete = zyd_vap_delete; + ic->ic_update_mcast = zyd_update_mcast; bpfattach(ifp, DLT_IEEE802_11_RADIO, sizeof(struct ieee80211_frame) + sizeof(sc->sc_txtap)); @@ -1706,8 +1709,9 @@ } static void -zyd_set_multi(struct zyd_softc *sc) +zyd_set_multi(void *arg) { + struct zyd_softc *sc = arg; struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = ic->ic_ifp; struct ifmultiaddr *ifma; @@ -1744,6 +1748,14 @@ zyd_write32(sc, ZYD_MAC_GHTBH, high); } +static void +zyd_update_mcast(struct ifnet *ifp) +{ + struct zyd_softc *sc = ifp->if_softc; + + usb_add_task(sc->sc_udev, &sc->sc_mcasttask, USB_TASKQ_DRIVER); +} + static int zyd_set_rxfilter(struct zyd_softc *sc) { @@ -2487,11 +2499,6 @@ } sc->sc_if_flags = ifp->if_flags; break; - case SIOCADDMULTI: - case SIOCDELMULTI: - if (ifp->if_drv_flags & IFF_DRV_RUNNING) - zyd_set_multi(sc); - break; case SIOCGIFMEDIA: case SIOCSIFMEDIA: error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd); ==== //depot/projects/vap/sys/dev/usb/if_zydreg.h#7 (text+ko) ==== @@ -1195,6 +1195,7 @@ #define ZYD_SCAN_START 0 #define ZYD_SCAN_END 1 #define ZYD_SET_CHANNEL 2 + struct usb_task sc_mcasttask; usbd_device_handle sc_udev; usbd_interface_handle sc_iface; int sc_flags; From owner-p4-projects@FreeBSD.ORG Sat Mar 15 23:26:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7F7D1065673; Sat, 15 Mar 2008 23:26:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87699106564A for ; Sat, 15 Mar 2008 23:26:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 895738FC24 for ; Sat, 15 Mar 2008 23:26:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2FNQsQa088385 for ; Sat, 15 Mar 2008 23:26:54 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2FNQsWf088383 for perforce@freebsd.org; Sat, 15 Mar 2008 23:26:54 GMT (envelope-from sam@freebsd.org) Date: Sat, 15 Mar 2008 23:26:54 GMT Message-Id: <200803152326.m2FNQsWf088383@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 137810 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, 15 Mar 2008 23:26:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=137810 Change 137810 by sam@sam_ebb on 2008/03/15 23:26:31 increase tx buffer list Affected files ... .. //depot/projects/vap/sys/dev/usb/if_ural.c#13 edit .. //depot/projects/vap/sys/dev/usb/if_uralvar.h#9 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_ural.c#13 (text+ko) ==== @@ -621,7 +621,7 @@ struct ural_tx_data *data; int i, error; - sc->tx_queued = 0; + sc->tx_queued = sc->tx_cur = 0; for (i = 0; i < RAL_TX_LIST_COUNT; i++) { data = &sc->tx_data[i]; @@ -1236,7 +1236,7 @@ usbd_status error; int xferlen; - data = &sc->tx_data[0]; + data = &sc->tx_data[sc->tx_cur]; desc = (struct ural_tx_desc *)data->buf; tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)]; @@ -1310,6 +1310,7 @@ } sc->tx_queued++; + sc->tx_cur = (sc->tx_cur + 1) % RAL_TX_LIST_COUNT; return 0; } @@ -1328,7 +1329,7 @@ KASSERT(params != NULL, ("no raw xmit params")); - data = &sc->tx_data[0]; + data = &sc->tx_data[sc->tx_cur]; desc = (struct ural_tx_desc *)data->buf; rate = params->ibp_rate0 & IEEE80211_RATE_VAL; @@ -1387,6 +1388,7 @@ } sc->tx_queued++; + sc->tx_cur = (sc->tx_cur + 1) % RAL_TX_LIST_COUNT; return 0; } @@ -1427,7 +1429,7 @@ wh = mtod(m0, struct ieee80211_frame *); } - data = &sc->tx_data[0]; + data = &sc->tx_data[sc->tx_cur]; desc = (struct ural_tx_desc *)data->buf; data->m = m0; @@ -1483,6 +1485,7 @@ } sc->tx_queued++; + sc->tx_cur = (sc->tx_cur + 1) % RAL_TX_LIST_COUNT; return 0; } @@ -1498,7 +1501,7 @@ IFQ_DRV_DEQUEUE(&ifp->if_snd, m); if (m == NULL) break; - if (sc->tx_queued >= RAL_TX_LIST_COUNT) { + if (sc->tx_queued >= RAL_TX_LIST_COUNT-1) { IFQ_DRV_PREPEND(&ifp->if_snd, m); ifp->if_drv_flags |= IFF_DRV_OACTIVE; break; ==== //depot/projects/vap/sys/dev/usb/if_uralvar.h#9 (text+ko) ==== @@ -18,7 +18,7 @@ */ #define RAL_RX_LIST_COUNT 1 -#define RAL_TX_LIST_COUNT 1 +#define RAL_TX_LIST_COUNT 8 #define URAL_SCAN_START 1 #define URAL_SCAN_END 2 @@ -118,6 +118,7 @@ struct ural_rx_data rx_data[RAL_RX_LIST_COUNT]; struct ural_tx_data tx_data[RAL_TX_LIST_COUNT]; int tx_queued; + int tx_cur; struct mtx sc_mtx;