PERFORCE change 103528 for review
Marcel Moolenaar
marcel at FreeBSD.org
Wed Aug 9 19:54:34 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=103528
Change 103528 by marcel at marcel_nfs on 2006/08/09 19:53:45
IFC @103526
Affected files ...
.. //depot/projects/gdb/Makefile.inc1#16 integrate
.. //depot/projects/gdb/ObsoleteFiles.inc#2 integrate
.. //depot/projects/gdb/etc/defaults/rc.conf#16 integrate
.. //depot/projects/gdb/gnu/usr.bin/groff/tmac/mdoc.local#7 integrate
.. //depot/projects/gdb/lib/libc/gen/msgctl.3#2 integrate
.. //depot/projects/gdb/lib/libc/gen/syslog.c#4 integrate
.. //depot/projects/gdb/lib/libthr/thread/thr_init.c#9 integrate
.. //depot/projects/gdb/lib/libthr/thread/thr_mutex.c#11 integrate
.. //depot/projects/gdb/lib/libthr/thread/thr_private.h#14 integrate
.. //depot/projects/gdb/lib/libthr/thread/thr_pspinlock.c#2 integrate
.. //depot/projects/gdb/libexec/tftpd/tftpd.8#4 integrate
.. //depot/projects/gdb/sbin/dump/optr.c#6 integrate
.. //depot/projects/gdb/sbin/geom/class/eli/geli.8#2 integrate
.. //depot/projects/gdb/sbin/geom/class/eli/geom_eli.c#2 integrate
.. //depot/projects/gdb/sbin/ipfw/ipfw2.c#11 integrate
.. //depot/projects/gdb/share/examples/drivers/make_device_driver.sh#2 integrate
.. //depot/projects/gdb/share/man/man4/acpi.4#12 integrate
.. //depot/projects/gdb/share/man/man4/ng_pppoe.4#5 integrate
.. //depot/projects/gdb/share/man/man4/uscanner.4#6 integrate
.. //depot/projects/gdb/sys/amd64/amd64/pmap.c#25 integrate
.. //depot/projects/gdb/sys/amd64/amd64/trap.c#14 integrate
.. //depot/projects/gdb/sys/arm/arm/mem.c#2 integrate
.. //depot/projects/gdb/sys/arm/arm/pmap.c#11 integrate
.. //depot/projects/gdb/sys/arm/arm/vm_machdep.c#5 integrate
.. //depot/projects/gdb/sys/arm/at91/kb920x_machdep.c#2 integrate
.. //depot/projects/gdb/sys/arm/include/pmap.h#5 integrate
.. //depot/projects/gdb/sys/arm/include/sf_buf.h#2 integrate
.. //depot/projects/gdb/sys/arm/include/vmparam.h#4 integrate
.. //depot/projects/gdb/sys/arm/sa11x0/assabet_machdep.c#4 integrate
.. //depot/projects/gdb/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate
.. //depot/projects/gdb/sys/compat/linprocfs/linprocfs.c#6 integrate
.. //depot/projects/gdb/sys/compat/svr4/svr4_sockio.c#3 integrate
.. //depot/projects/gdb/sys/compat/svr4/svr4_stream.c#6 integrate
.. //depot/projects/gdb/sys/conf/files#45 integrate
.. //depot/projects/gdb/sys/conf/options.arm#3 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_dock.c#2 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_pci_link.c#8 integrate
.. //depot/projects/gdb/sys/dev/ata/ata-chipset.c#15 integrate
.. //depot/projects/gdb/sys/dev/ata/ata-disk.c#9 integrate
.. //depot/projects/gdb/sys/dev/ata/ata-pci.h#10 integrate
.. //depot/projects/gdb/sys/dev/ath/if_ath.c#9 integrate
.. //depot/projects/gdb/sys/dev/ath/if_athioctl.h#4 integrate
.. //depot/projects/gdb/sys/dev/bge/if_bge.c#9 integrate
.. //depot/projects/gdb/sys/dev/bge/if_bgereg.h#5 integrate
.. //depot/projects/gdb/sys/dev/isp/isp.c#5 integrate
.. //depot/projects/gdb/sys/dev/isp/isp_freebsd.c#7 integrate
.. //depot/projects/gdb/sys/dev/isp/isp_ioctl.h#4 integrate
.. //depot/projects/gdb/sys/dev/isp/isp_library.c#2 integrate
.. //depot/projects/gdb/sys/dev/isp/isp_target.c#5 integrate
.. //depot/projects/gdb/sys/dev/isp/isp_target.h#3 integrate
.. //depot/projects/gdb/sys/dev/isp/isp_tpublic.h#3 integrate
.. //depot/projects/gdb/sys/dev/pccard/pccard_cis.c#4 integrate
.. //depot/projects/gdb/sys/dev/sound/pci/emu10k1.c#10 integrate
.. //depot/projects/gdb/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate
.. //depot/projects/gdb/sys/dev/sound/pci/emu10kx.c#2 integrate
.. //depot/projects/gdb/sys/dev/sound/pci/emu10kx.h#2 integrate
.. //depot/projects/gdb/sys/dev/usb/usbdevs#22 integrate
.. //depot/projects/gdb/sys/dev/usb/uscanner.c#9 integrate
.. //depot/projects/gdb/sys/dev/wi/if_wavelan_ieee.h#3 integrate
.. //depot/projects/gdb/sys/dev/wi/if_wi.c#8 integrate
.. //depot/projects/gdb/sys/dev/wi/if_wireg.h#3 integrate
.. //depot/projects/gdb/sys/fs/nwfs/nwfs_io.c#5 integrate
.. //depot/projects/gdb/sys/fs/smbfs/smbfs_io.c#5 integrate
.. //depot/projects/gdb/sys/geom/eli/g_eli.c#2 integrate
.. //depot/projects/gdb/sys/geom/eli/g_eli.h#2 integrate
.. //depot/projects/gdb/sys/geom/eli/g_eli_ctl.c#2 integrate
.. //depot/projects/gdb/sys/geom/geom_gpt.c#6 integrate
.. //depot/projects/gdb/sys/geom/mirror/g_mirror.c#4 integrate
.. //depot/projects/gdb/sys/geom/raid3/g_raid3.c#4 integrate
.. //depot/projects/gdb/sys/i386/acpica/acpi_wakeup.c#8 integrate
.. //depot/projects/gdb/sys/i386/i386/pmap.c#23 integrate
.. //depot/projects/gdb/sys/kern/Makefile#3 integrate
.. //depot/projects/gdb/sys/kern/uipc_proto.c#4 delete
.. //depot/projects/gdb/sys/kern/uipc_syscalls.c#24 integrate
.. //depot/projects/gdb/sys/kern/uipc_usrreq.c#17 integrate
.. //depot/projects/gdb/sys/kern/vfs_bio.c#15 integrate
.. //depot/projects/gdb/sys/kern/vfs_lookup.c#6 integrate
.. //depot/projects/gdb/sys/kern/vfs_subr.c#22 integrate
.. //depot/projects/gdb/sys/net/bpf.c#12 integrate
.. //depot/projects/gdb/sys/net/if_faith.c#10 integrate
.. //depot/projects/gdb/sys/net/if_gif.c#10 integrate
.. //depot/projects/gdb/sys/net/if_gre.c#11 integrate
.. //depot/projects/gdb/sys/net/if_stf.c#10 integrate
.. //depot/projects/gdb/sys/net/if_tun.c#11 integrate
.. //depot/projects/gdb/sys/net/if_var.h#18 integrate
.. //depot/projects/gdb/sys/net/net_osdep.h#3 delete
.. //depot/projects/gdb/sys/netatalk/ddp_usrreq.c#8 integrate
.. //depot/projects/gdb/sys/netgraph/ng_pppoe.c#8 integrate
.. //depot/projects/gdb/sys/netgraph/ng_pppoe.h#6 integrate
.. //depot/projects/gdb/sys/netinet/in_gif.c#5 integrate
.. //depot/projects/gdb/sys/netinet/ip_encap.c#4 integrate
.. //depot/projects/gdb/sys/netinet6/ah_aesxcbcmac.c#3 integrate
.. //depot/projects/gdb/sys/netinet6/ah_core.c#4 integrate
.. //depot/projects/gdb/sys/netinet6/ah_input.c#3 integrate
.. //depot/projects/gdb/sys/netinet6/ah_output.c#3 integrate
.. //depot/projects/gdb/sys/netinet6/esp_aesctr.c#3 integrate
.. //depot/projects/gdb/sys/netinet6/esp_core.c#3 integrate
.. //depot/projects/gdb/sys/netinet6/esp_input.c#3 integrate
.. //depot/projects/gdb/sys/netinet6/esp_output.c#3 integrate
.. //depot/projects/gdb/sys/netinet6/esp_rijndael.c#3 integrate
.. //depot/projects/gdb/sys/netinet6/frag6.c#4 integrate
.. //depot/projects/gdb/sys/netinet6/icmp6.c#6 integrate
.. //depot/projects/gdb/sys/netinet6/in6.c#5 integrate
.. //depot/projects/gdb/sys/netinet6/in6_cksum.c#4 integrate
.. //depot/projects/gdb/sys/netinet6/in6_gif.c#3 integrate
.. //depot/projects/gdb/sys/netinet6/in6_ifattach.c#4 integrate
.. //depot/projects/gdb/sys/netinet6/in6_proto.c#5 integrate
.. //depot/projects/gdb/sys/netinet6/in6_src.c#6 integrate
.. //depot/projects/gdb/sys/netinet6/ip6_forward.c#4 integrate
.. //depot/projects/gdb/sys/netinet6/ip6_input.c#9 integrate
.. //depot/projects/gdb/sys/netinet6/ip6_mroute.c#4 integrate
.. //depot/projects/gdb/sys/netinet6/ip6_output.c#8 integrate
.. //depot/projects/gdb/sys/netinet6/ipcomp_core.c#3 integrate
.. //depot/projects/gdb/sys/netinet6/ipcomp_input.c#3 integrate
.. //depot/projects/gdb/sys/netinet6/ipcomp_output.c#3 integrate
.. //depot/projects/gdb/sys/netinet6/ipsec.c#5 integrate
.. //depot/projects/gdb/sys/netinet6/mld6.c#5 integrate
.. //depot/projects/gdb/sys/netinet6/nd6.c#6 integrate
.. //depot/projects/gdb/sys/netinet6/nd6_nbr.c#5 integrate
.. //depot/projects/gdb/sys/netinet6/nd6_rtr.c#4 integrate
.. //depot/projects/gdb/sys/netinet6/udp6_output.c#6 integrate
.. //depot/projects/gdb/sys/netkey/key.c#4 integrate
.. //depot/projects/gdb/sys/netkey/keydb.c#3 integrate
.. //depot/projects/gdb/sys/nfsclient/nfs_bio.c#10 integrate
.. //depot/projects/gdb/sys/nfsclient/nfs_vfsops.c#11 integrate
.. //depot/projects/gdb/sys/pc98/include/md_var.h#2 integrate
.. //depot/projects/gdb/sys/pc98/pc98/pc98_machdep.c#3 integrate
.. //depot/projects/gdb/sys/security/mac_biba/mac_biba.c#9 integrate
.. //depot/projects/gdb/sys/sparc64/sparc64/pmap.c#13 integrate
.. //depot/projects/gdb/sys/sys/domain.h#4 integrate
.. //depot/projects/gdb/sys/sys/mac_policy.h#8 integrate
.. //depot/projects/gdb/sys/sys/param.h#24 integrate
.. //depot/projects/gdb/sys/sys/stat.h#6 integrate
.. //depot/projects/gdb/sys/sys/systm.h#13 integrate
.. //depot/projects/gdb/sys/sys/time.h#5 integrate
.. //depot/projects/gdb/sys/sys/types.h#11 integrate
.. //depot/projects/gdb/sys/vm/swap_pager.c#13 integrate
.. //depot/projects/gdb/sys/vm/vm_fault.c#8 integrate
.. //depot/projects/gdb/sys/vm/vm_object.c#12 integrate
.. //depot/projects/gdb/sys/vm/vm_page.c#18 integrate
.. //depot/projects/gdb/sys/vm/vm_page.h#10 integrate
.. //depot/projects/gdb/sys/vm/vnode_pager.c#7 integrate
.. //depot/projects/gdb/tools/regression/fsx/fsx.c#3 integrate
.. //depot/projects/gdb/tools/tools/ath/athstats/athstats.c#2 integrate
.. //depot/projects/gdb/tools/tools/net80211/Makefile#2 integrate
.. //depot/projects/gdb/tools/tools/net80211/README#1 branch
.. //depot/projects/gdb/tools/tools/net80211/stumbler/Makefile#1 branch
.. //depot/projects/gdb/tools/tools/net80211/stumbler/stumbler.c#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/Makefile#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/Makefile.inc#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/README#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/ap/Makefile#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/ap/ap.c#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/assoc/Makefile#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/assoc/assoc.c#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/expand/Makefile#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/expand/expand.c#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/libw00t/Makefile#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/libw00t/w00t.c#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/libw00t/w00t.h#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/prga/Makefile#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/prga/prga.c#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/redir/Makefile#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/redir/buddy.c#1 branch
.. //depot/projects/gdb/tools/tools/net80211/w00t/redir/redir.c#1 branch
.. //depot/projects/gdb/tools/tools/net80211/wesside/Makefile#1 branch
.. //depot/projects/gdb/tools/tools/net80211/wesside/README#1 branch
.. //depot/projects/gdb/tools/tools/net80211/wesside/dics/Makefile#1 branch
.. //depot/projects/gdb/tools/tools/net80211/wesside/dics/dics.c#1 branch
.. //depot/projects/gdb/tools/tools/net80211/wesside/udps/Makefile#1 branch
.. //depot/projects/gdb/tools/tools/net80211/wesside/udps/udps.c#1 branch
.. //depot/projects/gdb/tools/tools/net80211/wesside/wesside/Makefile#1 branch
.. //depot/projects/gdb/tools/tools/net80211/wesside/wesside/wesside.c#1 branch
.. //depot/projects/gdb/tools/tools/net80211/wlaninject/Makefile#1 branch
.. //depot/projects/gdb/tools/tools/net80211/wlaninject/README#1 branch
.. //depot/projects/gdb/tools/tools/net80211/wlaninject/wlaninject.c#1 branch
.. //depot/projects/gdb/usr.bin/split/split.1#4 integrate
.. //depot/projects/gdb/usr.bin/split/split.c#4 integrate
.. //depot/projects/gdb/usr.sbin/Makefile#14 integrate
.. //depot/projects/gdb/usr.sbin/kldxref/Makefile#3 integrate
.. //depot/projects/gdb/usr.sbin/kldxref/kldxref.c#6 integrate
.. //depot/projects/gdb/usr.sbin/mailwrapper/mailwrapper.8#3 integrate
.. //depot/projects/gdb/usr.sbin/mailwrapper/mailwrapper.c#3 integrate
.. //depot/projects/gdb/usr.sbin/ngctl/Makefile#3 integrate
.. //depot/projects/gdb/usr.sbin/ngctl/main.c#4 integrate
.. //depot/projects/gdb/usr.sbin/sade/Makefile#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/command.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/config.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/devices.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/disks.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/dispatch.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/dmenu.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/globals.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/install.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/keymap.c#2 delete
.. //depot/projects/gdb/usr.sbin/sade/label.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/list.h#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/main.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/menus.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/misc.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/msg.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/rtermcap.c#2 delete
.. //depot/projects/gdb/usr.sbin/sade/sade.8#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/sade.h#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/system.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/termcap.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/usb.c#2 delete
.. //depot/projects/gdb/usr.sbin/sade/variable.c#2 integrate
.. //depot/projects/gdb/usr.sbin/sade/wizard.c#2 integrate
Differences ...
==== //depot/projects/gdb/Makefile.inc1#16 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.550 2006/08/02 15:26:15 netchild Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.552 2006/08/09 11:03:06 netchild Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
==== //depot/projects/gdb/ObsoleteFiles.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.41 2006/07/08 03:22:44 avatar Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.42 2006/08/04 21:29:22 brooks Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20060704: KAME compat file net_osdep.h removed
+OLD_FILES+=usr/include/net/net_osdep.h
# 20060517: pcvt removed
OLD_FILES+=usr/share/pcvt/README.FIRST
OLD_FILES+=usr/share/pcvt/Etc/xmodmap-german
==== //depot/projects/gdb/etc/defaults/rc.conf#16 (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.290 2006/07/21 15:55:18 yar Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.291 2006/08/05 20:28:50 njl Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -516,9 +516,9 @@
devfs_system_ruleset="" # The name of a ruleset to apply to /dev
devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to
# apply (must be mounted already, i.e. fstab(5))
-performance_cx_lowest="LOW" # Online CPU idle state
+performance_cx_lowest="HIGH" # Online CPU idle state
performance_cpu_freq="NONE" # Online CPU frequency
-economy_cx_lowest="LOW" # Offline CPU idle state
+economy_cx_lowest="HIGH" # Offline CPU idle state
economy_cpu_freq="NONE" # Offline CPU frequency
virecover_enable="YES" # Perform housekeeping for the vi(1) editor
ugidfw_enable="NO" # Load mac_bsdextended(4) rules on boot
==== //depot/projects/gdb/gnu/usr.bin/groff/tmac/mdoc.local#7 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.52 2006/01/12 15:33:18 ru Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.54 2006/08/08 19:47:10 ru Exp $
.\"
.\" %beginstrip%
.
@@ -34,6 +34,7 @@
.\" FreeBSD .Lb values
.ds doc-str-Lb-libarchive Streaming Archive Library (libarchive, \-larchive)
.ds doc-str-Lb-libbluetooth Bluetooth User Library (libbluetooth, \-lbluetooth)
+.ds doc-str-Lb-libbsm Basic Security Module User Library (libbsm, \-lbsm)
.ds doc-str-Lb-libc_r Reentrant C\~Library (libc_r, \-lc_r)
.ds doc-str-Lb-libcalendar Calendar Arithmetic Library (libcalendar, \-lcalendar)
.ds doc-str-Lb-libcam Common Access Method User Library (libcam, \-lcam)
@@ -62,6 +63,7 @@
.
.\" FreeBSD releases not found in doc-common
.ds doc-operating-system-FreeBSD-5.5 5.5
+.ds doc-operating-system-FreeBSD-6.2 6.2
.ds doc-operating-system-FreeBSD-7.0 7.0
.
.ec
==== //depot/projects/gdb/lib/libc/gen/msgctl.3#2 (text+ko) ====
@@ -29,7 +29,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/libc/gen/msgctl.3,v 1.19 2003/09/08 19:57:14 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/msgctl.3,v 1.20 2006/08/09 18:05:44 maxim Exp $
.\"/
.Dd November 24, 1997
.Dt MSGCTL 3
@@ -83,7 +83,7 @@
The
.Vt ipc_perm
structure used inside the
-.Vt shmid_ds
+.Vt msqid_ds
structure is defined in
.In sys/ipc.h
and looks like this:
==== //depot/projects/gdb/lib/libc/gen/syslog.c#4 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)syslog.c 8.5 (Berkeley) 4/29/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.37 2006/05/11 09:10:33 davidxu Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.38 2006/08/07 20:12:18 phk Exp $");
#include "namespace.h"
#include <sys/types.h>
@@ -116,7 +116,7 @@
h->base += len;
h->left -= len;
}
- return 0;
+ return len;
}
/*
==== //depot/projects/gdb/lib/libthr/thread/thr_init.c#9 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.37 2006/07/25 12:50:05 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.38 2006/08/08 04:42:41 davidxu Exp $
*/
#include "namespace.h"
@@ -99,6 +99,7 @@
};
pid_t _thr_pid;
+int _thr_smp_cpus = 1;
size_t _thr_guard_default;
size_t _thr_stack_default = THR_STACK_DEFAULT;
size_t _thr_stack_initial = THR_STACK_INITIAL;
@@ -443,6 +444,8 @@
len = sizeof (_usrstack);
if (sysctl(mib, 2, &_usrstack, &len, NULL, 0) == -1)
PANIC("Cannot get kern.usrstack from sysctl");
+ len = sizeof(_thr_smp_cpus);
+ sysctlbyname("kern.smp.cpus", &_thr_smp_cpus, &len, NULL, 0);
_thr_page_size = getpagesize();
_thr_guard_default = _thr_page_size;
_pthread_attr_default.guardsize_attr = _thr_guard_default;
==== //depot/projects/gdb/lib/libthr/thread/thr_mutex.c#11 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.44 2006/07/17 09:23:44 delphij Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.45 2006/08/08 05:04:43 davidxu Exp $
*/
#include "namespace.h"
@@ -128,7 +128,6 @@
pmutex->m_prio = attr->m_ceiling;
else
pmutex->m_prio = -1;
- pmutex->m_saved_prio = 0;
MUTEX_INIT_LINK(pmutex);
*mutex = pmutex;
return (0);
@@ -191,7 +190,6 @@
(*mutex)->m_count = 0;
(*mutex)->m_refcount = 0;
(*mutex)->m_prio = 0;
- (*mutex)->m_saved_prio = 0;
return (0);
}
==== //depot/projects/gdb/lib/libthr/thread/thr_private.h#14 (text+ko) ====
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.66 2006/07/12 06:13:18 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_private.h,v 1.68 2006/08/08 05:04:43 davidxu Exp $
*/
#ifndef _THR_PRIVATE_H
@@ -121,18 +121,10 @@
int m_refcount;
/*
- * Used for priority inheritence and protection.
- *
- * m_prio - For priority inheritence, the highest active
- * priority (threads locking the mutex inherit
- * this priority). For priority protection, the
- * ceiling priority of this mutex.
- * m_saved_prio - mutex owners inherited priority before
- * taking the mutex, restored when the owner
- * unlocks the mutex.
+ * Used for priority protection, the ceiling priority of
+ * this mutex.
*/
int m_prio;
- int m_saved_prio;
/*
* Link for list of all mutexes a thread currently owns.
@@ -588,6 +580,8 @@
extern struct pthread_prio _thr_priorities[] __hidden;
extern pid_t _thr_pid __hidden;
+extern int _thr_smp_cpus __hidden;
+
extern size_t _thr_guard_default __hidden;
extern size_t _thr_stack_default __hidden;
extern size_t _thr_stack_initial __hidden;
==== //depot/projects/gdb/lib/libthr/thread/thr_pspinlock.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_pspinlock.c,v 1.2 2006/04/04 02:57:49 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_pspinlock.c,v 1.3 2006/08/08 04:42:41 davidxu Exp $
*/
#include "namespace.h"
@@ -104,13 +104,17 @@
count = SPIN_COUNT;
while ((ret = THR_UMTX_TRYLOCK(curthread, &lck->s_lock)) != 0) {
while (lck->s_lock) {
-#ifdef __i386__
- /* tell cpu we are spinning */
- __asm __volatile("pause");
+ if (_thr_smp_cpus <= 1) {
+ _pthread_yield();
+ } else {
+#if defined(__i386__) || defined(__x86_64__)
+ /* tell cpu we are spinning */
+ __asm __volatile("pause");
#endif
- if (--count <= 0) {
- count = SPIN_COUNT;
- _pthread_yield();
+ if (--count <= 0) {
+ count = SPIN_COUNT;
+ _pthread_yield();
+ }
}
}
}
==== //depot/projects/gdb/libexec/tftpd/tftpd.8#4 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)tftpd.8 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/libexec/tftpd/tftpd.8,v 1.18 2004/07/07 19:57:14 ru Exp $
+.\" $FreeBSD: src/libexec/tftpd/tftpd.8,v 1.19 2006/08/07 16:05:55 yar Exp $
.\"
.Dd September 14, 2000
.Dt TFTPD 8
@@ -39,7 +39,7 @@
.Nm tftpd
.Nd Internet Trivial File Transfer Protocol server
.Sh SYNOPSIS
-.Nm /usr/libexec/tftpd
+.Nm tftpd
.Op Fl cClnw
.Op Fl s Ar directory
.Op Fl u Ar user
@@ -70,8 +70,11 @@
.Nm
will allow only publicly readable files to be
accessed.
-Files containing the string ``/\|\fB.\|.\fP\|/'' or starting with
-``\|\fB.\|.\fP\|/'' are not allowed.
+Files containing the string
+.Dq Li "/../"
+or starting with
+.Dq Li "../"
+are not allowed.
Files may be written only if they already exist and are publicly writable.
Note that this extends the concept of
.Dq public
@@ -85,7 +88,7 @@
.Nm
with a list of directories by including up to 20 pathnames
as server program arguments in
-.Pa /etc/inetd.conf .
+.Xr inetd.conf 5 .
In this case access is restricted to files whose
names are prefixed by the one of the given directories.
The given directories are also treated as a search path for
@@ -94,21 +97,24 @@
The
.Fl s
option provides additional security by changing
-.Nm Ns No 's
-root directory, thereby prohibiting accesses outside of the specified
+the root directory of
+.Nm ,
+thereby prohibiting accesses to outside of the specified
.Ar directory .
Because
.Xr chroot 2
requires super-user privileges,
.Nm
-must be run as root.
+must be run as
+.Li root .
However, after performing the
-.Fn chroot ,
+.Xr chroot 2
+call,
.Nm
-will set its user id to that of the specified
+will set its user ID to that of the specified
.Ar user ,
or
-.Dq nobody
+.Dq Li nobody
if no
.Fl u
option is specified.
@@ -116,8 +122,9 @@
The options are:
.Bl -tag -width Ds
.It Fl c
-Changes the default root directory of a connecting host via chroot based on the
-connecting IP address.
+Changes the default root directory of a connecting host via
+.Xr chroot 2
+based on the connecting IP address.
This prevents multiple clients from writing to the same file at the same time.
If the directory does not exist, the client connection is refused.
The
@@ -131,15 +138,17 @@
Operates the same as
.Fl c
except it falls back to
-.Fl s Ns No 's
.Ar directory
+specified via
+.Fl s
if a directory does not exist for the client's IP.
.It Fl l
Log all requests using
.Xr syslog 3
with the facility of
.Dv LOG_FTP .
-Note: Logging of
+.Sy Note :
+Logging of
.Dv LOG_FTP
messages
must also be enabled in the syslog configuration file,
@@ -151,15 +160,15 @@
Cause
.Nm
to change its root directory to
-.Pa directory .
-After changing roots but before accepting commands,
+.Ar directory .
+After doing that but before accepting commands,
.Nm
will switch credentials to an unprivileged user.
.It Fl u Ar user
Switch credentials to
.Ar user
(default
-.Dq nobody )
+.Dq Li nobody )
when the
.Fl s
option is used.
@@ -169,7 +178,7 @@
.Ar umask
for newly created files.
The default is 022
-.Pq Dv S_IWGRP | S_IWOTH .
+.Pq Dv S_IWGRP No | Dv S_IWOTH .
.It Fl w
Allow writes requests to create new files.
By default
@@ -179,8 +188,11 @@
.Sh SEE ALSO
.Xr tftp 1 ,
.Xr chroot 2 ,
-.Xr inetd 8 ,
-.Xr syslogd 8
+.Xr syslog 3 ,
+.Xr inetd.conf 5 ,
+.Xr services 5 ,
+.Xr syslog.conf 5 ,
+.Xr inetd 8
.Rs
.%A K. R. Sollins
.%T The TFTP Protocol (Revision 2)
==== //depot/projects/gdb/sbin/dump/optr.c#6 (text+ko) ====
@@ -32,7 +32,7 @@
static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/dump/optr.c,v 1.32 2005/02/16 06:48:35 obrien Exp $";
+ "$FreeBSD: src/sbin/dump/optr.c,v 1.35 2006/08/06 14:23:50 marck Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -190,6 +190,7 @@
{
double percent;
time_t tnow, tdone;
+ char *tdone_str;
int deltat, hours, mins;
(void)time(&tnow);
@@ -207,15 +208,17 @@
hours = deltat / 3600;
mins = (deltat % 3600) / 60;
+ tdone_str = ctime(&tdone);
+ tdone_str[strlen(tdone_str) - 1] = '\0';
setproctitle(
"%s: pass %d: %3.2f%% done, finished in %d:%02d at %s",
- disk, passno, percent, hours, mins, ctime(&tdone));
+ disk, passno, percent, hours, mins, tdone_str);
if (tnow >= tschedule) {
tschedule = tnow + 300;
if (blockswritten < 500)
return;
- msg("%3.2f%% done, finished in %d:%02d at %s", percent,
- hours, mins, ctime(&tdone));
+ msg("%3.2f%% done, finished in %d:%02d at %s\n", percent,
+ hours, mins, tdone_str);
}
}
}
==== //depot/projects/gdb/sbin/geom/class/eli/geli.8#2 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/geom/class/eli/geli.8,v 1.13 2006/06/06 19:03:51 brueffer Exp $
+.\" $FreeBSD: src/sbin/geom/class/eli/geli.8,v 1.15 2006/08/09 18:35:31 maxim Exp $
.\"
-.Dd June 5, 2006
+.Dd August 9, 2006
.Dt GELI 8
.Os
.Sh NAME
@@ -64,7 +64,7 @@
.Cm init
.Nm
.Cm attach
-.Op Fl dpv
+.Op Fl dprv
.Op Fl k Ar keyfile
.Ar prov
.Nm
@@ -288,6 +288,9 @@
option for the
.Cm detach
subcommand.
+.It Fl r
+Attach read-only provider.
+It will not be opened for writting.
.It Fl k Ar keyfile
Specifies a file which contains part of the key.
For more information see the description of the
==== //depot/projects/gdb/sbin/geom/class/eli/geom_eli.c#2 (text+ko) ====
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2004 Pawel Jakub Dawidek <pjd at FreeBSD.org>
+ * Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd at FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/geom/class/eli/geom_eli.c,v 1.12 2006/06/06 22:06:24 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/geom/class/eli/geom_eli.c,v 1.14 2006/08/09 18:11:13 pjd Exp $");
#include <stdio.h>
#include <stdint.h>
@@ -78,7 +78,7 @@
*
* init [-bhPv] [-a aalgo] [-e ealgo] [-i iterations] [-l keylen] [-K newkeyfile] prov
* label - alias for 'init'
- * attach [-dpv] [-k keyfile] prov
+ * attach [-dprv] [-k keyfile] prov
* detach [-fl] prov ...
* stop - alias for 'detach'
* onetime [-d] [-a aalgo] [-e ealgo] [-l keylen] prov ...
@@ -124,9 +124,10 @@
{ 'd', "detach", NULL, G_TYPE_NONE },
{ 'k', "keyfile", keyfile, G_TYPE_STRING },
{ 'p', "nopassphrase", NULL, G_TYPE_NONE },
+ { 'r', "readonly", NULL, G_TYPE_NONE },
G_OPT_SENTINEL
},
- "[-dpv] [-k keyfile] prov"
+ "[-dprv] [-k keyfile] prov"
},
{ "detach", 0, NULL,
{
@@ -393,7 +394,7 @@
}
}
/*
- * If md_iterations is equal to 0, user don't want PKCS5v2.
+ * If md_iterations is equal to 0, user don't want PKCS#5v2.
*/
if (md->md_iterations == 0) {
g_eli_crypto_hmac_update(&ctx, md->md_salt,
==== //depot/projects/gdb/sbin/ipfw/ipfw2.c#11 (text+ko) ====
@@ -17,7 +17,7 @@
*
* NEW command line interface for IP firewall facility
*
- * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.91 2006/06/15 09:39:22 oleg Exp $
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.92 2006/08/05 13:58:50 stefanf Exp $
*/
#include <sys/param.h>
@@ -2243,7 +2243,7 @@
char buf[30];
char prefix[80];
- if (p->next.sle_next != (struct dn_pipe *)DN_IS_PIPE)
+ if (SLIST_NEXT(p, next) != (struct dn_pipe *)DN_IS_PIPE)
break; /* done with pipes, now queues */
/*
@@ -2282,7 +2282,7 @@
for (fs = next; nbytes >= sizeof *fs; fs = next) {
char prefix[80];
- if (fs->next.sle_next != (struct dn_flow_set *)DN_IS_QUEUE)
+ if (SLIST_NEXT(fs, next) != (struct dn_flow_set *)DN_IS_QUEUE)
break;
l = sizeof(*fs) + fs->rq_elements * sizeof(*q);
next = (char *)fs + l;
==== //depot/projects/gdb/share/examples/drivers/make_device_driver.sh#2 (text+ko) ====
@@ -12,6 +12,7 @@
# cd /sys/modules/foo; make depend; make; make install; kldload foo
#
# arg1 to this script is expected to be lowercase "foo"
+# arg2 path to the kernel sources, "/sys" if omitted
#
# Trust me, RUN THIS SCRIPT :)
#
@@ -19,19 +20,21 @@
# o generate foo_isa.c, foo_pci.c, foo_pccard.c, foo_cardbus.c, and foovar.h
# o Put pccard stuff in here.
#
-# $FreeBSD: src/share/examples/drivers/make_device_driver.sh,v 1.21 2003/10/03 19:31:55 dds Exp $"
+# $FreeBSD: src/share/examples/drivers/make_device_driver.sh,v 1.24 2006/08/09 10:53:26 rik Exp $"
#
#
if [ "X${1}" = "X" ]; then
echo "Hey, how about some help here... give me a device name!"
exit 1
fi
+if [ "X${2}" = "X" ]; then
+ TOP=`cd /sys; pwd -P`
+ echo "Using ${TOP} as the path to the kernel sources!"
+else
+ TOP=${2}
+fi
UPPER=`echo ${1} |tr "[:lower:]" "[:upper:]"`
-HERE=`pwd`
-cd /sys
-TOP=`pwd`
-
RCS_KEYWORD=FreeBSD
if [ -d ${TOP}/modules/${1} ]; then
@@ -46,7 +49,7 @@
echo "Cleaning up from prior runs"
rm -rf ${TOP}/dev/${1}
rm -rf ${TOP}/modules/${1}
- rm ${TOP}/i386/conf/files.${UPPER}
+ rm ${TOP}/conf/files.${UPPER}
rm ${TOP}/i386/conf/${UPPER}
rm ${TOP}/sys/${1}io.h
;;
@@ -58,7 +61,7 @@
echo "The following files will be created:"
echo ${TOP}/modules/${1}
-echo ${TOP}/i386/conf/files.${UPPER}
+echo ${TOP}/conf/files.${UPPER}
echo ${TOP}/i386/conf/${UPPER}
echo ${TOP}/dev/${1}
echo ${TOP}/dev/${1}/${1}.c
@@ -79,7 +82,7 @@
# First add the file to a local file list.
#######################################################################
-cat >${TOP}/i386/conf/files.${UPPER} <<DONE
+cat >${TOP}/conf/files.${UPPER} <<DONE
dev/${1}/${1}.c optional ${1}
DONE
@@ -88,14 +91,20 @@
#######################################################################
cat >${TOP}/i386/conf/${UPPER} <<DONE
# Configuration file for kernel type: ${UPPER}
-ident ${UPPER}
# \$${RCS_KEYWORD}$
+
+files "${TOP}/conf/files.${UPPER}"
+
+include GENERIC
+
+ident ${UPPER}
+
DONE
-grep -v GENERIC < /sys/i386/conf/GENERIC >>${TOP}/i386/conf/${UPPER}
-
cat >>${TOP}/i386/conf/${UPPER} <<DONE
-options DDB # trust me, you'll need this
+# trust me, you'll need this
+options KDB
+options DDB
device ${1}
DONE
@@ -152,8 +161,6 @@
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/bus_pio.h>
-#include <machine/bus_memio.h>
#include <sys/rman.h>
#include <dev/pci/pcireg.h>
@@ -198,7 +205,7 @@
struct resource* res_irq; /* Resource for irq range. */
struct resource* res_drq; /* Resource for dma channel. */
device_t device;
- dev_t dev;
+ struct cdev *dev;
void *intr_cookie;
void *vaddr; /* Virtual address of mem resource. */
char buffer[BUFFERSIZE]; /* If we need to buffer something. */
@@ -219,8 +226,8 @@
static d_poll_t ${1}poll;
static void ${1}intr(void *arg);
-#define CDEV_MAJOR 20
static struct cdevsw ${1}_cdevsw = {
+ .d_version = D_VERSION,
.d_open = ${1}open,
.d_close = ${1}close,
.d_read = ${1}read,
@@ -229,7 +236,6 @@
.d_poll = ${1}poll,
.d_mmap = ${1}mmap,
.d_name = "${1}",
- .d_maj = CDEV_MAJOR,
};
static devclass_t ${1}_devclass;
@@ -818,7 +824,7 @@
}
static int
-${1}ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
+${1}ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td)
{
struct ${1}_softc *scp = DEV2SOFTC(dev);
@@ -840,7 +846,7 @@
* This should get you started.
*/
static int
-${1}open(dev_t dev, int oflags, int devtype, struct thread *td)
+${1}open(struct cdev *dev, int oflags, int devtype, struct thread *td)
{
struct ${1}_softc *scp = DEV2SOFTC(dev);
@@ -852,7 +858,7 @@
}
static int
-${1}close(dev_t dev, int fflag, int devtype, struct thread *td)
+${1}close(struct cdev *dev, int fflag, int devtype, struct thread *td)
{
struct ${1}_softc *scp = DEV2SOFTC(dev);
@@ -864,7 +870,7 @@
}
static int
-${1}read(dev_t dev, struct uio *uio, int ioflag)
+${1}read(struct cdev *dev, struct uio *uio, int ioflag)
{
struct ${1}_softc *scp = DEV2SOFTC(dev);
int toread;
@@ -879,7 +885,7 @@
}
static int
-${1}write(dev_t dev, struct uio *uio, int ioflag)
+${1}write(struct cdev *dev, struct uio *uio, int ioflag)
{
struct ${1}_softc *scp = DEV2SOFTC(dev);
int towrite;
@@ -894,7 +900,7 @@
}
static int
-${1}mmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot)
+${1}mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot)
{
struct ${1}_softc *scp = DEV2SOFTC(dev);
@@ -913,7 +919,7 @@
}
static int
-${1}poll(dev_t dev, int which, struct thread *td)
+${1}poll(struct cdev *dev, int which, struct thread *td)
{
struct ${1}_softc *scp = DEV2SOFTC(dev);
@@ -967,15 +973,40 @@
.include <bsd.kmod.mk>
DONE
-(cd ${TOP}/modules/${1}; make depend; make )
-exit
+echo -n "Do you want to build the '${1}' module? [Y]"
+read VAL
+if [ "-z" "$VAL" ]; then
+ VAL=YES
+fi
+case ${VAL} in
+[yY]*)
+ (cd ${TOP}/modules/${1}; make depend; make )
+ ;;
+*)
+# exit
+ ;;
+esac
-config ${UPPER}
-cd ../../compile/${UPPER}
-make depend
-make ${1}.o
-make
-exit
+echo ""
+echo -n "Do you want to build the '${UPPER}' kernel? [Y]"
+read VAL
+if [ "-z" "$VAL" ]; then
+ VAL=YES
+fi
+case ${VAL} in
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list