From owner-p4-projects@FreeBSD.ORG Sun Jun 20 01:17:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C00F116A4D0; Sun, 20 Jun 2004 01:17:10 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 92E8D16A4CE for ; Sun, 20 Jun 2004 01:17:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A43B43D4C for ; Sun, 20 Jun 2004 01:17:10 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5K1H61b070542 for ; Sun, 20 Jun 2004 01:17:06 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5K1H4Ra070539 for perforce@freebsd.org; Sun, 20 Jun 2004 01:17:04 GMT (envelope-from peter@freebsd.org) Date: Sun, 20 Jun 2004 01:17:04 GMT Message-Id: <200406200117.i5K1H4Ra070539@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 55344 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2004 01:17:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=55344 Change 55344 by peter@peter_daintree on 2004/06/20 01:16:11 IFC @55342 Affected files ... .. //depot/projects/hammer/contrib/gcc/config/i386/i386.c#11 integrate .. //depot/projects/hammer/contrib/gdb/ChangeLog#2 delete .. //depot/projects/hammer/contrib/gdb/MAINTAINERS#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-96#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-97#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-98#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/command.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-sun386.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/sun386.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/sun386.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-fbsd.h#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-sun386.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-i386lynx.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-sun386.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-windows.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/defs.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/doc/libgdb.texinfo#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdba.el#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/gdbreplay.c#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/low-linux.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gnu-regex.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gnu-regex.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/hp-psymtab-read.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/hp-symtab-read.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/hpread.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/i386bsd-nat.c#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/jv-exp.tab.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/partial-stab.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/signals.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/target.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/target.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/version.in#3 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/rap.c#4 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#29 integrate .. //depot/projects/hammer/etc/rc.d/syscons#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/ia64-freebsd/config.h#6 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile#9 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.alpha#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#6 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.i386#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.ia64#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.powerpc#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.sparc64#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/config.h.fbsd#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/ia64/bfd.h#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libiberty/Makefile#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#10 integrate .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#19 integrate .. //depot/projects/hammer/lib/msun/i387/s_ilogb.S#2 integrate .. //depot/projects/hammer/lib/msun/man/ieee.3#3 integrate .. //depot/projects/hammer/lib/msun/man/math.3#2 integrate .. //depot/projects/hammer/lib/msun/src/math.h#15 integrate .. //depot/projects/hammer/sbin/conscontrol/conscontrol.8#4 integrate .. //depot/projects/hammer/sbin/conscontrol/conscontrol.c#3 integrate .. //depot/projects/hammer/sbin/dump/optr.c#8 integrate .. //depot/projects/hammer/sbin/sunlabel/sunlabel.c#9 integrate .. //depot/projects/hammer/share/man/man4/netintro.4#4 integrate .. //depot/projects/hammer/share/man/man4/watchdog.4#4 integrate .. //depot/projects/hammer/share/man/man4/xl.4#5 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#29 integrate .. //depot/projects/hammer/share/mk/bsd.kmod.mk#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#84 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#39 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/hammer/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#16 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_osdep.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#11 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSynch.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#22 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#30 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#36 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#35 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#35 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#6 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#24 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#3 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#3 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_volume.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#36 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#38 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#15 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#20 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#27 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#26 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#53 integrate .. //depot/projects/hammer/sys/kern/subr_prf.c#16 integrate .. //depot/projects/hammer/sys/kern/sysv_shm.c#13 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#27 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#22 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#28 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#30 integrate .. //depot/projects/hammer/sys/net/pfil.h#3 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#32 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#16 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#15 integrate .. //depot/projects/hammer/sys/sys/_lock.h#3 integrate .. //depot/projects/hammer/sys/sys/_types.h#11 integrate .. //depot/projects/hammer/sys/sys/file.h#8 integrate .. //depot/projects/hammer/sys/sys/kernel.h#9 integrate .. //depot/projects/hammer/sys/sys/proc.h#53 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#18 integrate .. //depot/projects/hammer/sys/sys/types.h#18 integrate .. //depot/projects/hammer/sys/sys/user.h#12 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#21 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#29 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#15 integrate Differences ... ==== //depot/projects/hammer/contrib/gcc/config/i386/i386.c#11 (text+ko) ==== @@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.18 2003/11/07 03:17:46 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.20 2004/06/19 20:40:00 obrien Exp $ */ #include "config.h" ==== //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-fbsd.h#3 (text+ko) ==== @@ -18,8 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gdb/gdb/config/i386/tm-fbsd.h,v 1.4 2002/10/12 17:56:56 mp Exp $ */ - #ifndef TM_FBSD_H #define TM_FBSD_H ==== //depot/projects/hammer/contrib/gdb/gdb/defs.h#2 (text+ko) ==== @@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gdb/gdb/defs.h,v 1.5 2002/06/28 01:13:52 obrien Exp $ */ - #ifndef DEFS_H #define DEFS_H @@ -812,6 +810,10 @@ struct frame_info; +/* From readline (but not in any readline .h files). */ + +extern char *tilde_expand (char *); + /* Control types for commands */ enum misc_command_type ==== //depot/projects/hammer/contrib/gdb/gdb/gdbserver/gdbreplay.c#3 (text+ko) ==== @@ -19,8 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gdb/gdb/gdbserver/gdbreplay.c,v 1.6 2002/10/12 17:56:57 mp Exp $ */ - #include "config.h" #include #include @@ -32,15 +30,6 @@ #include #include #include -#ifdef HAVE_STDLIB_H -#include -#endif -#ifdef HAVE_UNISTD_H -#include -#endif -#ifdef HAVE_STRING_H -#include -#endif #ifdef HAVE_STDLIB_H #include ==== //depot/projects/hammer/contrib/gdb/gdb/i386bsd-nat.c#3 (text+ko) ==== @@ -18,8 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gdb/gdb/i386bsd-nat.c,v 1.2 2002/10/21 05:33:05 phk Exp $ */ - #include "defs.h" #include "inferior.h" #include "regcache.h" @@ -307,7 +305,7 @@ /* For some mysterious reason, some of the reserved bits in the debug control register get set. Mask these off, otherwise the ptrace call below will fail. */ - dbregs.dr[7] &= ~(0x0000fc00); + dbregs.dr7 &= ~(0x0000fc00); DBREG_DRX ((&dbregs), regnum) = value; @@ -356,7 +354,7 @@ return 0; #endif - return dbregs.dr[6]; + return dbregs.dr6; } #endif /* PT_GETDBREGS */ ==== //depot/projects/hammer/contrib/gdb/gdb/target.c#2 (text+ko) ==== @@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gdb/gdb/target.c,v 1.4 2002/06/29 00:42:52 obrien Exp $ */ - #include "defs.h" #include #include "gdb_string.h" @@ -1363,11 +1361,7 @@ for (t = target_structs; t < target_structs + target_struct_size; ++t) { -#if defined(__FreeBSD__) - if ((*t)->to_stratum == (kernel_debugging ? kcore_stratum : core_stratum)) -#else if ((*t)->to_stratum == core_stratum) -#endif { runable = *t; ++count; ==== //depot/projects/hammer/contrib/gdb/gdb/target.h#2 (text+ko) ==== @@ -20,8 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gdb/gdb/target.h,v 1.4 2002/06/29 00:42:52 obrien Exp $ */ - #if !defined (TARGET_H) #define TARGET_H @@ -54,7 +52,6 @@ dummy_stratum, /* The lowest of the low */ file_stratum, /* Executable files, etc */ core_stratum, /* Core dump files */ - kcore_stratum, /* Kernel core files */ download_stratum, /* Downloading of remote targets */ process_stratum, /* Executing processes */ thread_stratum /* Executing threads */ ==== //depot/projects/hammer/contrib/gdb/gdb/version.in#3 (text+ko) ==== @@ -1,1 +1,1 @@ -5.2.1 (FreeBSD) +5.2.1 ==== //depot/projects/hammer/contrib/smbfs/lib/smb/rap.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $Id: rap.c,v 1.8 2001/02/24 15:56:05 bp Exp $ - * $FreeBSD: src/contrib/smbfs/lib/smb/rap.c,v 1.2 2003/07/26 04:02:22 peter Exp $ + * $FreeBSD: src/contrib/smbfs/lib/smb/rap.c,v 1.4 2004/06/19 19:03:01 le Exp $ * * This is very simple implementation of RAP protocol. */ @@ -199,7 +199,7 @@ rap = malloc(sizeof(*rap)); if (rap == NULL) - return NULL; + return ENOMEM; bzero(rap, sizeof(*rap)); p = rap->r_sparam = rap->r_nparam = strdup(param); rap->r_sdata = rap->r_ndata = strdup(data); ==== //depot/projects/hammer/etc/defaults/rc.conf#29 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.208 2004/06/02 09:58:18 ume Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.209 2004/06/18 20:09:29 green Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -347,6 +347,7 @@ ### System console options ################################# ############################################################## +keyboard="" # keyboard device to use (default /dev/kbd0). keymap="NO" # keymap in /usr/share/syscons/keymaps/* (or NO). keyrate="NO" # keyboard rate to: slow, normal, fast (or NO). keybell="NO" # See kbdcontrol(1) for options. Use "off" to disable. ==== //depot/projects/hammer/etc/rc.d/syscons#5 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/syscons,v 1.11 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/syscons,v 1.12 2004/06/18 20:09:30 green Exp $ # # PROVIDE: syscons @@ -59,6 +59,13 @@ { echo -n 'Configuring syscons:' + # keyboard + # + if [ -n "${keyboard}" ]; then + echo -n ' keyboard'; kbdcontrol < ${kbddev} \ + -k "${keyboard}" >/dev/null + fi + # keymap # case ${keymap} in ==== //depot/projects/hammer/gnu/usr.bin/binutils/as/ia64-freebsd/config.h#6 (text+ko) ==== @@ -1,8 +1,6 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/as/ia64-freebsd/config.h,v 1.6 2004/06/16 07:09:35 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/as/ia64-freebsd/config.h,v 1.7 2004/06/19 23:18:14 marcel Exp $ */ -#define HAVE_DECL_GETOPT 1 - -/* config.h. Generated automatically by configure. */ +/* config.h. Generated by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ /* Define if using alloca.c. */ @@ -30,9 +28,6 @@ /* Define to `long' if doesn't define. */ /* #undef off_t */ -/* Define if you need to in order for stat and other things to work. */ -/* #undef _POSIX_SOURCE */ - /* Define to `unsigned' if doesn't define. */ /* #undef size_t */ @@ -145,13 +140,13 @@ /* #undef HAVE_VALUES_H */ /* Define if you have the header file. */ -#define HAVE_VARARGS_H 1 +/* #undef HAVE_VARARGS_H */ /* Name of package */ #define PACKAGE "gas" /* Version number of package */ -/* #define VERSION "2.12" */ +/* #define VERSION "2.15" */ /* Define if defaulting to ELF on SCO 5. */ /* #undef SCO_ELF */ @@ -165,8 +160,17 @@ /* Define as 1 if big endian. */ /* #undef TARGET_BYTES_BIG_ENDIAN */ -/* Use ELF stabs for MIPS, not ECOFF stabs */ -/* #undef MIPS_STABS_ELF */ +/* Default CPU for MIPS targets. */ +/* #undef MIPS_CPU_STRING_DEFAULT */ + +/* Allow use of E_MIPS_ABI_O32 on MIPS targets. */ +/* #undef USE_E_MIPS_ABI_O32 */ + +/* Generate 64-bit code by default on MIPS targets. */ +/* #undef MIPS_DEFAULT_64BIT */ + +/* Choose a default ABI for MIPS targets. */ +/* #undef MIPS_DEFAULT_ABI */ /* Default architecture. */ /* #undef DEFAULT_ARCH */ @@ -217,7 +221,7 @@ /* #undef USE_EMULATIONS */ /* Supported emulations. */ -#define EMULATIONS +#define EMULATIONS /* Default emulation. */ #define DEFAULT_EMULATION "" @@ -229,19 +233,19 @@ #define BFD_ASSEMBLER 1 /* Target alias. */ -#define TARGET_ALIAS "ia64-obrien-freebsd5" +/* #define TARGET_ALIAS "ia64-unknown-freebsd5.2" */ /* Canonical target. */ -#define TARGET_CANONICAL "ia64-obrien-freebsd5" +/* #define TARGET_CANONICAL "ia64-unknown-freebsd5.2" */ /* Target CPU. */ #define TARGET_CPU "ia64" /* Target vendor. */ -#define TARGET_VENDOR "obrien" +#define TARGET_VENDOR "unknown" /* Target OS. */ -#define TARGET_OS "freebsd5" +#define TARGET_OS "freebsd5.2" /* Define if you have the stpcpy function */ #define HAVE_STPCPY 1 @@ -278,3 +282,4 @@ /* Define if errno is not declared in system header files. */ /* #undef NEED_DECLARATION_ERRNO */ + ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile#9 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.28 2004/06/16 07:09:38 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.31 2004/06/19 20:50:57 marcel Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/bfd ${SRCDIR}/opcodes LIB= bfd -SRCS+= archive.c archive64.c archures.c bfd.c binary.c cache.c \ +SRCS+= archive.c archive64.c archures.c bfd.c bfdwin.c binary.c cache.c \ coffgen.c corefile.c elf.c elf-eh-frame.c elf-strtab.c format.c \ hash.c ihex.c init.c libbfd.c linker.c merge.c opncls.c reloc.c \ section.c srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \ @@ -49,13 +49,13 @@ # XXX:DEO should grab BFD_VERSION_DATE from ${VERSION}... bfdver.h: Makefile - echo '#define BFD_VERSION 214920000' > ${.TARGET} - echo '#define BFD_VERSION_DATE 20040510' >> ${.TARGET} + echo '#define BFD_VERSION 215000000' > ${.TARGET} + echo '#define BFD_VERSION_DATE 20040517' >> ${.TARGET} echo '#define BFD_VERSION_STRING ${VERSION}' >> ${.TARGET} targmatch.h: targmatch.sed config.bfd sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET} - + config.h: config.h.fbsd .if ${TARGET_ARCH} == "i386" sed -e 's,!!TRAD_HEADER!!,"hosts/i386bsd.h",g' ${.ALLSRC} > ${.TARGET} @@ -63,4 +63,10 @@ sed -e 's,!!TRAD_HEADER!!,,g' ${.ALLSRC} > ${.TARGET} .endif +elf32-target.h: elfxx-target.h + sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET} + +elf64-target.h: elfxx-target.h + sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} + .include ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.alpha#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.alpha,v 1.11 2004/06/16 07:09:38 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.alpha,v 1.12 2004/06/19 20:37:38 marcel Exp $ DEFAULT_VECTOR= bfd_elf64_alpha_freebsd_vec @@ -10,5 +10,3 @@ .endif CLEANFILES+= elf64-target.h -elf64-target.h: elfxx-target.h - sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.2 2003/07/01 17:29:48 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.3 2004/06/19 20:37:38 marcel Exp $ .include "${.CURDIR}/Makefile.i386" @@ -13,9 +13,6 @@ CLEANFILES+= elf64-target.h -elf64-target.h: elfxx-target.h - sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} - CLEANFILES+= elf64-amd64-fbsd.c elf64-amd64-fbsd.c: ${.CURDIR}/elf-fbsd-brand.c ${SRCDIR}/bfd/elf64-x86-64.c ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.i386#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.15 2004/06/16 07:09:38 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.16 2004/06/19 20:37:38 marcel Exp $ DEFAULT_VECTOR= bfd_elf32_i386_freebsd_vec @@ -14,5 +14,3 @@ .endif CLEANFILES+= elf32-target.h -elf32-target.h: elfxx-target.h - sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET} ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.ia64#3 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.ia64,v 1.6 2002/12/05 18:27:22 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.ia64,v 1.8 2004/06/19 21:14:10 marcel Exp $ DEFAULT_VECTOR= bfd_elf64_ia64_little_vec SRCS+= cofflink.c cpu-ia64.c efi-app-ia64.c elf32.c elf32-gen.c elf64.c \ elf64-gen.c elf64-ia64.c elflink.c -#SRCS+= coff-ia64.c elf32-ia64.c VECS+= ${DEFAULT_VECTOR} \ bfd_efi_app_ia64_vec \ @@ -20,14 +19,8 @@ SRCS+= ${GENSRCS} CLEANFILES+= ${GENSRCS} -elf32-target.h: elfxx-target.h - sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET} - -elf64-target.h: elfxx-target.h - sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} - -elf64-ia64.c: elfxx-ia64.c - sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} +elf64-ia64.c: elfxx-ia64.c elf-fbsd-brand.c + cat ${.ALLSRC} | sed -e s/NN/64/g > ${.TARGET} pepigen.c: peXXigen.c sed -e s/XX/pep/g ${.ALLSRC} > ${.TARGET} ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.powerpc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc,v 1.6 2002/12/02 09:59:05 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc,v 1.7 2004/06/19 20:37:38 marcel Exp $ DEFAULT_VECTOR= bfd_elf32_powerpc_vec @@ -21,5 +21,3 @@ .endif CLEANFILES+= elf32-target.h -elf32-target.h: elfxx-target.h - sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET} ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.sparc64#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.sparc64,v 1.8 2004/06/17 16:08:20 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.sparc64,v 1.9 2004/06/19 20:37:38 marcel Exp $ DEFAULT_VECTOR= bfd_elf64_sparc_vec @@ -20,11 +20,6 @@ .endif CLEANFILES+= elf32-target.h elf64-target.h -elf32-target.h: elfxx-target.h - sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET} - -elf64-target.h: elfxx-target.h - sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET} CLEANFILES+= elf64-sparc%FIXED.c elf64-sparc%FIXED.c: elf64-sparc.c elf64-sparc.c-bad-rtld.diff ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/config.h.fbsd#5 (text+ko) ==== @@ -1,7 +1,7 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/config.h.fbsd,v 1.5 2002/12/02 09:54:40 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/config.h.fbsd,v 1.6 2004/06/19 19:25:33 marcel Exp $ */ /* config.h. Generated automatically by configure. */ -/* config.in. Generated automatically from configure.in by autoheader 2.13. */ +/* config.in. Generated automatically from configure.in by autoheader. */ /* Define if using alloca.c. */ /* #undef C_ALLOCA */ @@ -28,9 +28,6 @@ /* Define to `long' if doesn't define. */ /* #undef off_t */ -/* Define if you need to in order for stat and other things to work. */ -/* #undef _POSIX_SOURCE */ - /* Define to `unsigned' if doesn't define. */ /* #undef size_t */ @@ -67,6 +64,18 @@ /* Define if you have the fdopen function. */ #define HAVE_FDOPEN 1 +/* Define if you have the fseeko function. */ +#define HAVE_FSEEKO 1 + +/* Define if you have the fseeko64 function. */ +/* #undef HAVE_FSEEKO64 */ + +/* Define if you have the ftello function. */ +#define HAVE_FTELLO 1 + +/* Define if you have the ftello64 function. */ +/* #undef HAVE_FTELLO64 */ + /* Define if you have the getcwd function. */ #define HAVE_GETCWD 1 @@ -109,6 +118,9 @@ /* Define if you have the strchr function. */ #define HAVE_STRCHR 1 +/* Define if you have the strtoull function. */ +#define HAVE_STRTOULL 1 + /* Define if you have the sysconf function. */ #define HAVE_SYSCONF 1 @@ -179,7 +191,7 @@ #define PACKAGE "bfd" /* Version number of package */ -/* #define VERSION "2.13.2" */ +/* #define VERSION "2.15" */ /* Define if you have the stpcpy function */ #define HAVE_STPCPY 1 @@ -193,6 +205,12 @@ /* Define as 1 if you have gettext and don't want to use GNU gettext. */ /* #undef HAVE_GETTEXT */ +/* The number of bytes in type long long */ +/* #define SIZEOF_LONG_LONG 8 */ + +/* The number of bytes in type long */ +/* #define SIZEOF_LONG 8 */ + /* Use b modifier when opening binary files? */ /* #undef USE_BINARY_FOPEN */ @@ -265,6 +283,9 @@ /* Name of host specific header file to include in trad-core.c. */ #define TRAD_HEADER !!TRAD_HEADER!! +/* The number of bytes in type off_t */ +/* #define SIZEOF_OFF_T 8 */ + /* Use mmap if it's available? */ /* #undef USE_MMAP */ ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/ia64/bfd.h#4 (text+ko) ==== @@ -1,15 +1,17 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/ia64/bfd.h,v 1.6 2002/12/02 09:49:57 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/ia64/bfd.h,v 1.7 2004/06/19 18:52:31 marcel Exp $ */ /* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c", - "section.c", "archures.c", "reloc.c", "syms.c", "bfd.c", "archive.c", - "corefile.c", "targets.c" and "format.c". + "bfdio.c", "bfdwin.c", "section.c", "archures.c", "reloc.c", + "syms.c", "bfd.c", "archive.c", "corefile.c", "targets.c", "format.c", + "linker.c" and "simple.c". Run "make headers" in your build bfd/ to regenerate. */ /* Main header file for the bfd library -- portable access to object files. - Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002 - Free Software Foundation, Inc. + + Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, + 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + Contributed by Cygnus Support. This file is part of BFD, the Binary File Descriptor library. @@ -49,10 +51,6 @@ #endif #endif -/* #define BFD_VERSION 213010000 */ -/* #define BFD_VERSION_DATE 20021127 */ -/* #define BFD_VERSION_STRING "2.13.2 20021127" */ - /* The word size used by BFD on the host. This may be 64 with a 32 bit target if the host is 64 bit, or if other 64 bit targets have been selected with --enable-targets, or if --enable-64-bit-bfd. */ @@ -61,14 +59,13 @@ /* The word size of the default bfd target. */ #define BFD_DEFAULT_TARGET_SIZE 64 -#if defined(__i386__) || defined(__powerpc__) -#define BFD_HOST_64BIT_LONG 0 -#else #define BFD_HOST_64BIT_LONG 1 -#endif /* 32-bit host */ -#if 0 -#define BFD_HOST_64_BIT -#define BFD_HOST_U_64_BIT +#define BFD_HOST_LONG_LONG 1 +#if 1 +#define BFD_HOST_64_BIT long +#define BFD_HOST_U_64_BIT unsigned long +typedef BFD_HOST_64_BIT bfd_int64_t; +typedef BFD_HOST_U_64_BIT bfd_uint64_t; #endif #if BFD_ARCH_SIZE >= 64 @@ -84,65 +81,30 @@ #endif /* Forward declaration. */ -typedef struct _bfd bfd; +typedef struct bfd bfd; + +/* Boolean type used in bfd. Too many systems define their own + versions of "boolean" for us to safely typedef a "boolean" of + our own. Using an enum for "bfd_boolean" has its own set of + problems, with strange looking casts required to avoid warnings + on some older compilers. Thus we just use an int. -/* To squelch erroneous compiler warnings ("illegal pointer - combination") from the SVR3 compiler, we would like to typedef - boolean to int (it doesn't like functions which return boolean. - Making sure they are never implicitly declared to return int - doesn't seem to help). But this file is not configured based on - the host. */ -/* General rules: functions which are boolean return true on success - and false on failure (unless they're a predicate). -- bfd.doc */ -/* I'm sure this is going to break something and someone is going to - force me to change it. */ -/* typedef enum boolean {false, true} boolean; */ -/* Yup, SVR4 has a "typedef enum boolean" in -fnf */ -/* It gets worse if the host also defines a true/false enum... -sts */ -/* And even worse if your compiler has built-in boolean types... -law */ -/* And even worse if your compiler provides a stdbool.h that conflicts - with these definitions... gcc 2.95 and later do. If so, it must - be included first. -drow */ -#if defined (__GNUG__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6)) -#define TRUE_FALSE_ALREADY_DEFINED -#else -#if defined (__bool_true_false_are_defined) -/* We have . */ -#define TRUE_FALSE_ALREADY_DEFINED -#endif -#endif -#ifdef MPW -/* Pre-emptive strike - get the file with the enum. */ -#include -#define TRUE_FALSE_ALREADY_DEFINED -#endif /* MPW */ -#ifndef TRUE_FALSE_ALREADY_DEFINED -typedef enum bfd_boolean {false, true} boolean; -#define BFD_TRUE_FALSE -#else -/* Use enum names that will appear nowhere else. */ -typedef enum bfd_boolean {bfd_fffalse, bfd_tttrue} boolean; -#endif + General rule: Functions which are bfd_boolean return TRUE on + success and FALSE on failure (unless they're a predicate). */ -/* Support for different sizes of target format ints and addresses. - If the type `long' is at least 64 bits, BFD_HOST_64BIT_LONG will be - set to 1 above. Otherwise, if gcc is being used, this code will - use gcc's "long long" type. Otherwise, BFD_HOST_64_BIT must be - defined above. */ +typedef int bfd_boolean; +#undef FALSE +#undef TRUE +#define FALSE 0 +#define TRUE 1 -#ifndef BFD_HOST_64_BIT -# if BFD_HOST_64BIT_LONG -# define BFD_HOST_64_BIT long -# define BFD_HOST_U_64_BIT unsigned long -# else -# ifdef __GNUC__ -# if __GNUC__ >= 2 -# define BFD_HOST_64_BIT long long -# define BFD_HOST_U_64_BIT unsigned long long -# endif /* __GNUC__ >= 2 */ -# endif /* ! defined (__GNUC__) */ -# endif /* ! BFD_HOST_64BIT_LONG */ -#endif /* ! defined (BFD_HOST_64_BIT) */ +#if 0 +/* Poison. */ +#undef false +#undef true +#define false dont_use_false_in_bfd +#define true dont_use_true_in_bfd +#endif #ifdef BFD64 @@ -191,19 +153,22 @@ #endif /* not BFD64 */ -/* A pointer to a position in a file. */ -/* FIXME: This should be using off_t from . - For now, try to avoid breaking stuff by not including here. - This will break on systems with 64-bit file offsets (e.g. 4.4BSD). - Probably the best long-term answer is to avoid using file_ptr AND off_t - in this header file, and to handle this in the BFD implementation - rather than in its interface. */ -/* typedef off_t file_ptr; */ -typedef bfd_signed_vma file_ptr; -typedef bfd_vma ufile_ptr; +#ifndef BFD_HOST_64_BIT +/* Fall back on a 32 bit type. The idea is to make these types always + available for function return types, but in the case that + BFD_HOST_64_BIT is undefined such a function should abort or + otherwise signal an error. */ +typedef bfd_signed_vma bfd_int64_t; +typedef bfd_vma bfd_uint64_t; +#endif + +/* An offset into a file. BFD always uses the largest possible offset + based on the build time availability of fseek, fseeko, or fseeko64. */ +typedef BFD_HOST_64_BIT file_ptr; +typedef unsigned BFD_HOST_64_BIT ufile_ptr; -extern void bfd_sprintf_vma PARAMS ((bfd *, char *, bfd_vma)); -extern void bfd_fprintf_vma PARAMS ((bfd *, PTR, bfd_vma)); +extern void bfd_sprintf_vma (bfd *, char *, bfd_vma); +extern void bfd_fprintf_vma (bfd *, void *, bfd_vma); #define printf_vma(x) fprintf_vma(stdout,x) #define bfd_printf_vma(abfd,x) bfd_fprintf_vma (abfd,stdout,x) @@ -216,7 +181,7 @@ typedef enum bfd_format { bfd_unknown = 0, /* File format is unknown. */ - bfd_object, /* Linker/assember/compiler output. */ + bfd_object, /* Linker/assembler/compiler output. */ bfd_archive, /* Object archive file. */ bfd_core, /* Core dump. */ bfd_type_end /* Marks the end; don't use it! */ @@ -279,6 +244,9 @@ /* This flag indicates that the BFD contents are actually cached in memory. If this is set, iostream points to a bfd_in_memory struct. */ #define BFD_IN_MEMORY 0x800 + +/* The sections in this BFD specify a memory page. */ +#define HAS_LOAD_PAGE 0x1000 /* Symbols and relocation. */ @@ -331,7 +299,7 @@ unsigned int line_number; /* Linenumber from start of function. */ union { - struct symbol_cache_entry *sym; /* Function name. */ + struct bfd_symbol *sym; /* Function name. */ bfd_vma offset; /* Offset into section. */ } u; } @@ -342,7 +310,7 @@ #define align_power(addr, align) \ (((addr) + ((bfd_vma) 1 << (align)) - 1) & ((bfd_vma) -1 << (align))) -typedef struct sec *sec_ptr; +typedef struct bfd_section *sec_ptr; #define bfd_get_section_name(bfd, ptr) ((ptr)->name + 0) #define bfd_get_section_vma(bfd, ptr) ((ptr)->vma + 0) @@ -358,9 +326,9 @@ #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0) -#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = (unsigned int)true), true) -#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),true) -#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),true) +#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE) +#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE) +#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE) typedef struct stat stat_type; @@ -386,7 +354,7 @@ /* Get the name of a stabs type code. */ -extern const char *bfd_get_stab_name PARAMS ((int)); +extern const char *bfd_get_stab_name (int); /* Hash table routines. There is no way to free up a hash table. */ @@ -419,75 +387,74 @@ built each of which calls the function in the superclass. Thus each function should be written to allocate a new block of memory only if the argument is NULL. */ - struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *, - struct bfd_hash_table *, - const char *)); + struct bfd_hash_entry *(*newfunc) + (struct bfd_hash_entry *, struct bfd_hash_table *, const char *); /* An objalloc for this hash table. This is a struct objalloc *, - but we use PTR to avoid requiring the inclusion of objalloc.h. */ - PTR memory; + but we use void * to avoid requiring the inclusion of objalloc.h. */ + void *memory; }; /* Initialize a hash table. */ -extern boolean bfd_hash_table_init - PARAMS ((struct bfd_hash_table *, - struct bfd_hash_entry *(*) (struct bfd_hash_entry *, - struct bfd_hash_table *, - const char *))); +extern bfd_boolean bfd_hash_table_init + (struct bfd_hash_table *, + struct bfd_hash_entry *(*) (struct bfd_hash_entry *, + struct bfd_hash_table *, + const char *)); /* Initialize a hash table specifying a size. */ -extern boolean bfd_hash_table_init_n - PARAMS ((struct bfd_hash_table *, - struct bfd_hash_entry *(*) (struct bfd_hash_entry *, - struct bfd_hash_table *, - const char *), - unsigned int size)); +extern bfd_boolean bfd_hash_table_init_n + (struct bfd_hash_table *, + struct bfd_hash_entry *(*) (struct bfd_hash_entry *, + struct bfd_hash_table *, + const char *), + unsigned int size); /* Free up a hash table. */ -extern void bfd_hash_table_free PARAMS ((struct bfd_hash_table *)); +extern void bfd_hash_table_free + (struct bfd_hash_table *); -/* Look up a string in a hash table. If CREATE is true, a new entry +/* Look up a string in a hash table. If CREATE is TRUE, a new entry will be created for this string if one does not already exist. The - COPY argument must be true if this routine should copy the string + COPY argument must be TRUE if this routine should copy the string into newly allocated memory when adding an entry. */ extern struct bfd_hash_entry *bfd_hash_lookup - PARAMS ((struct bfd_hash_table *, const char *, boolean create, - boolean copy)); + (struct bfd_hash_table *, const char *, bfd_boolean create, + bfd_boolean copy); /* Replace an entry in a hash table. */ extern void bfd_hash_replace - PARAMS ((struct bfd_hash_table *, struct bfd_hash_entry *old, - struct bfd_hash_entry *nw)); + (struct bfd_hash_table *, struct bfd_hash_entry *old, + struct bfd_hash_entry *nw); /* Base method for creating a hash table entry. */ extern struct bfd_hash_entry *bfd_hash_newfunc - PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, - const char *)); + (struct bfd_hash_entry *, struct bfd_hash_table *, const char *); /* Grab some space for a hash table entry. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 20 03:42:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45CDA16A4D0; Sun, 20 Jun 2004 03:42:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D5CB16A4CE for ; Sun, 20 Jun 2004 03:42:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1623943D2D for ; Sun, 20 Jun 2004 03:42:20 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5K3g6A2003863 for ; Sun, 20 Jun 2004 03:42:06 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5K3g6iL003854 for perforce@freebsd.org; Sun, 20 Jun 2004 03:42:06 GMT (envelope-from marcel@freebsd.org) Date: Sun, 20 Jun 2004 03:42:06 GMT Message-Id: <200406200342.i5K3g6iL003854@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 Subject: PERFORCE change 55355 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2004 03:42:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=55355 Change 55355 by marcel@marcel_nfs on 2004/06/20 03:42:03 IFC @55354 Affected files ... .. //depot/projects/gdb/gnu/usr.bin/binutils/ld/Makefile#4 integrate .. //depot/projects/gdb/sys/gnu/ext2fs/ext2_mount.h#4 integrate .. //depot/projects/gdb/sys/gnu/ext2fs/inode.h#4 integrate .. //depot/projects/gdb/sys/i386/include/pmap.h#8 integrate .. //depot/projects/gdb/sys/kern/kern_proc.c#11 integrate .. //depot/projects/gdb/sys/ufs/ufs/dinode.h#3 integrate Differences ... ==== //depot/projects/gdb/gnu/usr.bin/binutils/ld/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.28 2004/06/16 07:09:37 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.29 2004/06/20 01:44:58 obrien Exp $ .include "../Makefile.inc0" @@ -13,8 +13,8 @@ WARNS?= 0 # ldemul.h problem (`struct option' declared inside parameter list) CFLAGS+= -DSCRIPTDIR=\"${TOOLS_PREFIX}/usr/libdata\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" -CFLAGS+= -DBINDIR=\"${BINDIR}\" -DTARGET_SYSTEM_ROOT=\"${DESTDIR}\" -CFLAGS+= -DTOOLBINDIR=\"${DESTDIR}/${BINDIR}/libexec\" +CFLAGS+= -DBINDIR=\"${BINDIR}\" -DTARGET_SYSTEM_ROOT=\"${TOOLS_PREFIX}\" +CFLAGS+= -DTOOLBINDIR=\"${TOOLS_PREFIX}/${BINDIR}/libexec\" CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd NOSHARED?= yes ==== //depot/projects/gdb/sys/gnu/ext2fs/ext2_mount.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ufsmount.h 8.6 (Berkeley) 3/30/95 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_mount.h,v 1.27 2004/06/16 09:47:06 phk Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_mount.h,v 1.28 2004/06/20 03:34:21 bde Exp $ */ #ifndef _SYS_GNU_EXT2FS_EXT2_MOUNT_H_ @@ -44,7 +44,7 @@ /* This structure describes the ext2fs specific mount structure data. */ struct ext2mount { struct mount *um_mountp; /* filesystem vfs structure */ - struct cdev *um_dev; /* device mounted */ + struct cdev *um_dev; /* device mounted */ struct vnode *um_devvp; /* block device mounted vnode */ struct ext2_sb_info *um_e2fs; /* EXT2FS */ ==== //depot/projects/gdb/sys/gnu/ext2fs/inode.h#4 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)inode.h 8.9 (Berkeley) 5/14/95 - * $FreeBSD: src/sys/gnu/ext2fs/inode.h,v 1.40 2004/06/16 09:47:06 phk Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/inode.h,v 1.41 2004/06/20 03:36:31 bde Exp $ */ #ifndef _SYS_GNU_EXT2FS_INODE_H_ @@ -65,7 +65,7 @@ struct vnode *i_vnode;/* Vnode associated with this inode. */ struct vnode *i_devvp;/* Vnode for block I/O. */ u_int32_t i_flag; /* flags, see below */ - struct cdev *i_dev; /* Device associated with the inode. */ + struct cdev *i_dev; /* Device associated with the inode. */ ino_t i_number; /* The identity of the inode. */ struct ext2_sb_info *i_e2fs; /* EXT2FS */ @@ -110,7 +110,7 @@ * The di_db fields may be overlaid with other information for * file types that do not have associated disk storage. Block * and character devices overlay the first data block with their - * struct cdev *value. Short symbolic links place their path in the + * dev_t value. Short symbolic links place their path in the * di_db area. */ #define i_shortlink i_db ==== //depot/projects/gdb/sys/i386/include/pmap.h#8 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/pmap.h,v 1.110 2004/06/16 07:03:15 alc Exp $ + * $FreeBSD: src/sys/i386/include/pmap.h,v 1.111 2004/06/20 00:33:14 bde Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -135,9 +135,9 @@ #ifndef LOCORE +#include #include #include -#include #ifdef PAE ==== //depot/projects/gdb/sys/kern/kern_proc.c#11 (text+ko) ==== @@ -27,11 +27,11 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.7 (Berkeley) 2/14/95 - * $FreeBSD: src/sys/kern/kern_proc.c,v 1.209 2004/06/19 14:09:40 gad Exp $ + * $FreeBSD: src/sys/kern/kern_proc.c,v 1.210 2004/06/20 02:03:33 gad Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.209 2004/06/19 14:09:40 gad Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.210 2004/06/20 02:03:33 gad Exp $"); #include "opt_ktrace.h" #include "opt_kstack_pages.h" @@ -694,6 +694,8 @@ kp->ki_start = p->p_stats->p_start; timevaladd(&kp->ki_start, &boottime); kp->ki_rusage = p->p_stats->p_ru; + calcru(p, &kp->ki_rusage.ru_utime, &kp->ki_rusage.ru_stime, + NULL); kp->ki_childstime = p->p_stats->p_cru.ru_stime; kp->ki_childutime = p->p_stats->p_cru.ru_utime; /* Some callers want child-times in a single value */ ==== //depot/projects/gdb/sys/ufs/ufs/dinode.h#3 (text+ko) ==== @@ -41,7 +41,7 @@ * SUCH DAMAGE. * * @(#)dinode.h 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/ufs/ufs/dinode.h,v 1.12 2004/06/16 09:47:25 phk Exp $ + * $FreeBSD: src/sys/ufs/ufs/dinode.h,v 1.13 2004/06/20 03:11:19 bde Exp $ */ #ifndef _UFS_UFS_DINODE_H_ @@ -131,7 +131,7 @@ * The di_db fields may be overlaid with other information for * file types that do not have associated disk storage. Block * and character devices overlay the first data block with their - * struct cdev *value. Short symbolic links place their path in the + * dev_t value. Short symbolic links place their path in the * di_db area. */ #define di_rdev di_db[0] From owner-p4-projects@FreeBSD.ORG Sun Jun 20 15:01:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4690216A4D0; Sun, 20 Jun 2004 15:01:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 036B116A4CE for ; Sun, 20 Jun 2004 15:01:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFB3943D2D for ; Sun, 20 Jun 2004 15:01:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5KF1ovY071001 for ; Sun, 20 Jun 2004 15:01:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5KF1ona070992 for perforce@freebsd.org; Sun, 20 Jun 2004 15:01:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 20 Jun 2004 15:01:50 GMT Message-Id: <200406201501.i5KF1ona070992@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 Subject: PERFORCE change 55369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2004 15:01:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=55369 Change 55369 by rwatson@rwatson_paprika on 2004/06/20 15:01:33 Integrate netperf_socket for another batch of merging. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/include/cpu.h#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#15 integrate .. //depot/projects/netperf_socket/sys/amd64/include/cpu.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/null/null.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#13 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#13 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_mount.h#4 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/inode.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/netperf_socket/sys/i386/include/cpu.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/pmap.h#8 integrate .. //depot/projects/netperf_socket/sys/i386/isa/npx.c#8 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#9 integrate .. //depot/projects/netperf_socket/sys/ia64/include/cpu.h#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_proc.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#14 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/cpu.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/_types.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#13 integrate .. //depot/projects/netperf_socket/sys/sys/types.h#7 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/dinode.h#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/include/cpu.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.38 2004/06/16 09:46:26 phk Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.39 2004/06/20 03:52:48 bde Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /* @@ -66,7 +66,7 @@ /* * CTL_MACHDEP definitions. */ -#define CPU_CONSDEV 1 /* struct cdev *: console terminal device */ +#define CPU_CONSDEV 1 /* dev_t: console terminal device */ #define CPU_ROOT_DEVICE 2 /* string: root device name */ #define CPU_UNALIGNED_PRINT 3 /* int: print unaligned accesses */ #define CPU_UNALIGNED_FIX 4 /* int: fix unaligned accesses */ ==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#15 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.475 2004/06/17 06:16:57 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.477 2004/06/20 06:10:59 alc Exp $"); /* * Manages physical address maps. @@ -196,13 +196,11 @@ */ pt_entry_t *CMAP1 = 0; caddr_t CADDR1 = 0; -static pt_entry_t *msgbufmap; struct msgbuf *msgbufp = 0; /* * Crashdump maps. */ -static pt_entry_t *pt_crashdumpmap; static caddr_t crashdumpmap; static PMAP_INLINE void free_pv_entry(pv_entry_t pv); @@ -441,7 +439,7 @@ vm_paddr_t *firstaddr; { vm_offset_t va; - pt_entry_t *pte; + pt_entry_t *pte, *unused; avail_start = *firstaddr; @@ -493,14 +491,12 @@ /* * Crashdump maps. */ - SYSMAP(caddr_t, pt_crashdumpmap, crashdumpmap, MAXDUMPPGS); + SYSMAP(caddr_t, unused, crashdumpmap, MAXDUMPPGS) /* * msgbufp is used to map the system message buffer. - * XXX msgbufmap is not used. */ - SYSMAP(struct msgbuf *, msgbufmap, msgbufp, - atop(round_page(MSGBUF_SIZE))) + SYSMAP(struct msgbuf *, unused, msgbufp, atop(round_page(MSGBUF_SIZE))) virtual_avail = va; @@ -2570,14 +2566,17 @@ { pd_entry_t *pde; pt_entry_t *pte; + boolean_t rv; + rv = FALSE; + PMAP_LOCK(pmap); pde = pmap_pde(pmap, addr); - if (pde == NULL || (*pde & PG_V) == 0) - return (FALSE); - pte = vtopte(addr); - if (*pte & PG_V) - return (FALSE); - return (TRUE); + if (pde != NULL && (*pde & PG_V)) { + pte = vtopte(addr); + rv = (*pte & PG_V) == 0; + } + PMAP_UNLOCK(pmap); + return (rv); } /* ==== //depot/projects/netperf_socket/sys/amd64/include/cpu.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.72 2004/06/16 09:46:28 phk Exp $ + * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.73 2004/06/20 03:52:48 bde Exp $ */ #ifndef _MACHINE_CPU_H_ @@ -65,7 +65,7 @@ /* * CTL_MACHDEP definitions. */ -#define CPU_CONSDEV 1 /* struct cdev *: console terminal device */ +#define CPU_CONSDEV 1 /* dev_t: console terminal device */ #define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */ #define CPU_DISRTCSET 3 /* int: disable resettodr() call */ #define CPU_WALLCLOCK 5 /* int: indicates wall CMOS clock */ ==== //depot/projects/netperf_socket/sys/arm/arm/pmap.c#2 (text+ko) ==== @@ -144,7 +144,7 @@ */ /* Include header files */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.1 2004/05/14 11:46:42 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.3 2004/06/19 20:50:50 cognet Exp $"); #include #include #include @@ -155,7 +155,6 @@ #include #include #include -#include #include #include @@ -4190,7 +4189,7 @@ * the duration of the copy so that no other mappings can * be created while we have a potentially aliased mapping. */ - (void) pmap_clean_page(src_pg->md.pvh_list, TRUE); + (void) pmap_clean_page(TAILQ_FIRST(&src_pg->md.pv_list), TRUE); /* * Map the pages into the page hook points, copy them, and purge ==== //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0.c#2 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.1 2004/05/14 11:46:45 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.2 2004/06/19 17:38:32 cognet Exp $"); #include #include @@ -68,6 +68,7 @@ #include #include #include +#include #include #include ==== //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_ost.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.1 2004/05/14 11:46:45 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.2 2004/06/19 17:38:32 cognet Exp $"); #include #include @@ -47,6 +47,7 @@ #include #include #include +#include #include #include ==== //depot/projects/netperf_socket/sys/dev/null/null.c#4 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2000 Mark R. V. Murray & Jeroen C. van Gelderen + * Copyright (c) 2001-2004 Mark R. V. Murray * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/null/null.c,v 1.25 2004/06/16 09:46:52 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/null/null.c,v 1.26 2004/06/20 13:50:50 markm Exp $"); #include #include @@ -76,7 +77,8 @@ null_write(struct cdev *dev __unused, struct uio *uio, int flags __unused) { uio->uio_resid = 0; - return 0; + + return (0); } /* ARGSUSED */ @@ -105,7 +107,8 @@ c = uio->uio_resid < PAGE_SIZE ? uio->uio_resid : PAGE_SIZE; error = uiomove(zbuf, c, uio); } - return error; + + return (error); } /* ARGSUSED */ @@ -121,20 +124,20 @@ GID_WHEEL, 0666, "zero"); null_dev = make_dev(&null_cdevsw, NULL_MINOR, UID_ROOT, GID_WHEEL, 0666, "null"); - return 0; + break; case MOD_UNLOAD: destroy_dev(null_dev); destroy_dev(zero_dev); free(zbuf, M_TEMP); - return 0; + break; case MOD_SHUTDOWN: - return 0; + break; - default: - return EOPNOTSUPP; } + + return (0); } DEV_MODULE(null, null_modevent, NULL); ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs#13 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.181 2004/06/05 21:33:59 sanpei Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.182 2004/06/19 22:16:03 sanpei Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -357,6 +357,7 @@ vendor PNY 0x0d7d PNY vendor MSI 0x0db0 Micro Star International vendor HAWKING 0x0e66 Hawking Technologies +vendor MICROTUNE 0x0f4d Microtune, Inc. vendor QUALCOMM 0x1004 Qualcomm vendor MOTOROLA 0x1063 Motorola vendor PLX 0x10b5 PLX @@ -982,6 +983,9 @@ /* Micro Star International products */ product MSI BT_DONGLE 0x1967 Bluetooth USB dongle +/* Microtune, Inc. products */ +product MICROTUNE BT_DONGLE 0x1000 Bluetooth USB dongle + /* Mitsumi products */ product MITSUMI CDRRW 0x0000 CD-R/RW Drive product MITSUMI BT_DONGLE 0x641f Bluetooth USB dongle ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#13 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.188 2004/06/05 21:36:06 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.189 2004/06/19 22:17:34 sanpei Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.181 2004/06/05 21:33:59 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.182 2004/06/19 22:16:03 sanpei Exp */ /* @@ -364,6 +364,7 @@ #define USB_VENDOR_PNY 0x0d7d /* PNY */ #define USB_VENDOR_MSI 0x0db0 /* Micro Star International */ #define USB_VENDOR_HAWKING 0x0e66 /* Hawking Technologies */ +#define USB_VENDOR_MICROTUNE 0x0f4d /* Microtune, Inc. */ #define USB_VENDOR_QUALCOMM 0x1004 /* Qualcomm */ #define USB_VENDOR_MOTOROLA 0x1063 /* Motorola */ #define USB_VENDOR_PLX 0x10b5 /* PLX */ @@ -989,6 +990,9 @@ /* Micro Star International products */ #define USB_PRODUCT_MSI_BT_DONGLE 0x1967 /* Bluetooth USB dongle */ +/* Microtune, Inc. products */ +#define USB_PRODUCT_MICROTUNE_BT_DONGLE 0x1000 /* Bluetooth USB dongle */ + /* Mitsumi products */ #define USB_PRODUCT_MITSUMI_CDRRW 0x0000 /* CD-R/RW Drive */ #define USB_PRODUCT_MITSUMI_BT_DONGLE 0x641f /* Bluetooth USB dongle */ ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#13 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.188 2004/06/05 21:36:06 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.189 2004/06/19 22:17:34 sanpei Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.181 2004/06/05 21:33:59 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.182 2004/06/19 22:16:03 sanpei Exp */ /* @@ -2248,6 +2248,12 @@ "Bluetooth USB dongle", }, { + USB_VENDOR_MICROTUNE, USB_PRODUCT_MICROTUNE_BT_DONGLE, + 0, + "Microtune, Inc.", + "Bluetooth USB dongle", + }, + { USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_CDRRW, 0, "Mitsumi", @@ -5176,6 +5182,12 @@ NULL, }, { + USB_VENDOR_MICROTUNE, 0, + USB_KNOWNDEV_NOPROD, + "Microtune, Inc.", + NULL, + }, + { USB_VENDOR_QUALCOMM, 0, USB_KNOWNDEV_NOPROD, "Qualcomm", ==== //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_mount.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ufsmount.h 8.6 (Berkeley) 3/30/95 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_mount.h,v 1.27 2004/06/16 09:47:06 phk Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_mount.h,v 1.28 2004/06/20 03:34:21 bde Exp $ */ #ifndef _SYS_GNU_EXT2FS_EXT2_MOUNT_H_ @@ -44,7 +44,7 @@ /* This structure describes the ext2fs specific mount structure data. */ struct ext2mount { struct mount *um_mountp; /* filesystem vfs structure */ - struct cdev *um_dev; /* device mounted */ + struct cdev *um_dev; /* device mounted */ struct vnode *um_devvp; /* block device mounted vnode */ struct ext2_sb_info *um_e2fs; /* EXT2FS */ ==== //depot/projects/netperf_socket/sys/gnu/ext2fs/inode.h#4 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)inode.h 8.9 (Berkeley) 5/14/95 - * $FreeBSD: src/sys/gnu/ext2fs/inode.h,v 1.40 2004/06/16 09:47:06 phk Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/inode.h,v 1.41 2004/06/20 03:36:31 bde Exp $ */ #ifndef _SYS_GNU_EXT2FS_INODE_H_ @@ -65,7 +65,7 @@ struct vnode *i_vnode;/* Vnode associated with this inode. */ struct vnode *i_devvp;/* Vnode for block I/O. */ u_int32_t i_flag; /* flags, see below */ - struct cdev *i_dev; /* Device associated with the inode. */ + struct cdev *i_dev; /* Device associated with the inode. */ ino_t i_number; /* The identity of the inode. */ struct ext2_sb_info *i_e2fs; /* EXT2FS */ @@ -110,7 +110,7 @@ * The di_db fields may be overlaid with other information for * file types that do not have associated disk storage. Block * and character devices overlay the first data block with their - * struct cdev *value. Short symbolic links place their path in the + * dev_t value. Short symbolic links place their path in the * di_db area. */ #define i_shortlink i_db ==== //depot/projects/netperf_socket/sys/i386/i386/pmap.c#11 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.473 2004/06/17 06:16:57 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.475 2004/06/20 06:11:00 alc Exp $"); /* * Manages physical address maps. @@ -216,17 +216,15 @@ * All those kernel PT submaps that BSD is so fond of */ pt_entry_t *CMAP1 = 0; -static pt_entry_t *CMAP2, *CMAP3, *ptmmap; +static pt_entry_t *CMAP2, *CMAP3; caddr_t CADDR1 = 0, ptvmmap = 0; static caddr_t CADDR2, CADDR3; static struct mtx CMAPCADDR12_lock; -static pt_entry_t *msgbufmap; struct msgbuf *msgbufp = 0; /* * Crashdump maps. */ -static pt_entry_t *pt_crashdumpmap; static caddr_t crashdumpmap; #ifdef SMP @@ -308,7 +306,7 @@ vm_paddr_t loadaddr; { vm_offset_t va; - pt_entry_t *pte; + pt_entry_t *pte, *unused; int i; /* @@ -368,20 +366,17 @@ /* * Crashdump maps. */ - SYSMAP(caddr_t, pt_crashdumpmap, crashdumpmap, MAXDUMPPGS); + SYSMAP(caddr_t, unused, crashdumpmap, MAXDUMPPGS) /* * ptvmmap is used for reading arbitrary physical pages via /dev/mem. - * XXX ptmmap is not used. */ - SYSMAP(caddr_t, ptmmap, ptvmmap, 1) + SYSMAP(caddr_t, unused, ptvmmap, 1) /* * msgbufp is used to map the system message buffer. - * XXX msgbufmap is not used. */ - SYSMAP(struct msgbuf *, msgbufmap, msgbufp, - atop(round_page(MSGBUF_SIZE))) + SYSMAP(struct msgbuf *, unused, msgbufp, atop(round_page(MSGBUF_SIZE))) /* * ptemap is used for pmap_pte_quick @@ -2646,13 +2641,16 @@ pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr) { pt_entry_t *pte; + boolean_t rv; - if ((*pmap_pde(pmap, addr)) == 0) - return (FALSE); - pte = vtopte(addr); - if (*pte) - return (FALSE); - return (TRUE); + rv = FALSE; + PMAP_LOCK(pmap); + if (*pmap_pde(pmap, addr)) { + pte = vtopte(addr); + rv = *pte == 0; + } + PMAP_UNLOCK(pmap); + return (rv); } /* ==== //depot/projects/netperf_socket/sys/i386/include/cpu.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/include/cpu.h,v 1.71 2004/06/16 09:47:08 phk Exp $ + * $FreeBSD: src/sys/i386/include/cpu.h,v 1.72 2004/06/20 03:52:49 bde Exp $ */ #ifndef _MACHINE_CPU_H_ @@ -65,7 +65,7 @@ /* * CTL_MACHDEP definitions. */ -#define CPU_CONSDEV 1 /* struct cdev *: console terminal device */ +#define CPU_CONSDEV 1 /* dev_t: console terminal device */ #define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */ #define CPU_DISRTCSET 3 /* int: disable resettodr() call */ #define CPU_BOOTINFO 4 /* struct: bootinfo */ ==== //depot/projects/netperf_socket/sys/i386/include/pmap.h#8 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/pmap.h,v 1.110 2004/06/16 07:03:15 alc Exp $ + * $FreeBSD: src/sys/i386/include/pmap.h,v 1.111 2004/06/20 00:33:14 bde Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -135,9 +135,9 @@ #ifndef LOCORE +#include #include #include -#include #ifdef PAE ==== //depot/projects/netperf_socket/sys/i386/isa/npx.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/npx.c,v 1.151 2004/06/18 02:10:55 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/npx.c,v 1.152 2004/06/19 22:24:16 bde Exp $"); #include "opt_cpu.h" #include "opt_debug_npx.h" @@ -944,6 +944,10 @@ s = intr_disable(); if (td == PCPU_GET(fpcurthread)) { +#ifdef CPU_ENABLE_SSE + if (!cpu_fxsr) +#endif + fnclex(); /* As in npxdrop(). */ fpurstor(addr); intr_restore(s); } else { ==== //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#9 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.134 2004/06/11 20:11:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.135 2004/06/19 20:31:49 alc Exp $"); #include #include @@ -221,8 +221,6 @@ static uma_zone_t pvzone; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; int pmap_pagedaemon_waken; -static struct pv_entry *pvbootentries; -static int pvbootnext, pvbootmax; /* * Data for allocating PTEs for user processes. @@ -469,18 +467,6 @@ ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (IA64_ID_PAGE_SHIFT << 2)); /* - * Reserve some memory for allocating pvs while bootstrapping - * the pv allocator. We need to have enough to cover mapping - * the kmem_alloc region used to allocate the initial_pvs in - * pmap_init. In general, the size of this region is - * approximately (# physical pages) * (size of pv entry). - */ - pvbootmax = ((physmem * sizeof(struct pv_entry)) >> PAGE_SHIFT) + 128; - pvbootentries = (struct pv_entry *) - pmap_steal_memory(pvbootmax * sizeof(struct pv_entry)); - pvbootnext = 0; - - /* * Clear out any random TLB entries left over from booting. */ pmap_invalidate_all(kernel_pmap); ==== //depot/projects/netperf_socket/sys/ia64/include/cpu.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/include/cpu.h,v 1.42 2004/06/16 09:47:11 phk Exp $ */ +/* $FreeBSD: src/sys/ia64/include/cpu.h,v 1.43 2004/06/20 03:52:49 bde Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /* @@ -62,7 +62,7 @@ /* * CTL_MACHDEP definitions. */ -#define CPU_CONSDEV 1 /* struct cdev *: console terminal device */ +#define CPU_CONSDEV 1 /* dev_t: console terminal device */ #define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */ #define CPU_DISRTCSET 3 /* int: disable resettodr() call */ #define CPU_WALLCLOCK 4 /* int: indicates wall CMOS clock */ ==== //depot/projects/netperf_socket/sys/kern/kern_proc.c#10 (text+ko) ==== @@ -27,11 +27,11 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.7 (Berkeley) 2/14/95 - * $FreeBSD: src/sys/kern/kern_proc.c,v 1.209 2004/06/19 14:09:40 gad Exp $ + * $FreeBSD: src/sys/kern/kern_proc.c,v 1.210 2004/06/20 02:03:33 gad Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.209 2004/06/19 14:09:40 gad Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.210 2004/06/20 02:03:33 gad Exp $"); #include "opt_ktrace.h" #include "opt_kstack_pages.h" @@ -694,6 +694,8 @@ kp->ki_start = p->p_stats->p_start; timevaladd(&kp->ki_start, &boottime); kp->ki_rusage = p->p_stats->p_ru; + calcru(p, &kp->ki_rusage.ru_utime, &kp->ki_rusage.ru_stime, + NULL); kp->ki_childstime = p->p_stats->p_cru.ru_stime; kp->ki_childutime = p->p_stats->p_cru.ru_utime; /* Some callers want child-times in a single value */ ==== //depot/projects/netperf_socket/sys/kern/kern_thread.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.182 2004/06/18 06:15:21 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.183 2004/06/19 17:58:32 marcel Exp $"); #include #include @@ -129,7 +129,7 @@ struct tid_bitmap_part { STAILQ_ENTRY(tid_bitmap_part) bmp_next; tid_bitmap_word bmp_bitmap[TID_BITMAP_SIZE]; - int bmp_base; + lwpid_t bmp_base; int bmp_free; }; @@ -176,7 +176,8 @@ { struct thread *td; struct tid_bitmap_part *bmp; - int bit, idx, tid; + lwpid_t tid; + int bit, idx; td = (struct thread *)mem; @@ -537,11 +538,12 @@ /* * Assign a thread ID. */ -int +lwpid_t thread_new_tid(void) { struct tid_bitmap_part *bmp, *new; - int bit, idx, tid; + lwpid_t tid; + int bit, idx; mtx_lock(&tid_lock); STAILQ_FOREACH(bmp, &tid_bitmap, bmp_next) { ==== //depot/projects/netperf_socket/sys/sparc64/include/cpu.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 * from: FreeBSD: src/sys/i386/include/cpu.h,v 1.62 2001/06/29 - * $FreeBSD: src/sys/sparc64/include/cpu.h,v 1.13 2004/06/16 09:47:23 phk Exp $ + * $FreeBSD: src/sys/sparc64/include/cpu.h,v 1.14 2004/06/20 03:52:50 bde Exp $ */ #ifndef _MACHINE_CPU_H_ @@ -52,7 +52,7 @@ /* * CTL_MACHDEP definitions. */ -#define CPU_CONSDEV 1 /* struct cdev *: console terminal device */ +#define CPU_CONSDEV 1 /* dev_t: console terminal device */ #define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */ #define CPU_DISRTCSET 3 /* int: disable resettodr() call */ #define CPU_BOOTINFO 4 /* struct: bootinfo */ ==== //depot/projects/netperf_socket/sys/sys/_types.h#5 (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/sys/_types.h,v 1.18 2004/06/17 17:16:52 phk Exp $ + * $FreeBSD: src/sys/sys/_types.h,v 1.19 2004/06/19 17:58:32 marcel Exp $ */ #ifndef _SYS__TYPES_H_ @@ -43,6 +43,7 @@ typedef __int64_t __id_t; /* can hold a gid_t, pid_t, or uid_t */ typedef __uint32_t __ino_t; /* inode number */ typedef long __key_t; /* IPC key (for Sys V IPC) */ +typedef __int32_t __lwpid_t; /* Thread ID (a.k.a. LWP) */ typedef __uint16_t __mode_t; /* permissions */ typedef int __nl_item; typedef __uint16_t __nlink_t; /* link count */ ==== //depot/projects/netperf_socket/sys/sys/proc.h#13 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.380 2004/06/19 14:58:34 bde Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.381 2004/06/19 17:58:32 marcel Exp $ */ #ifndef _SYS_PROC_H_ @@ -264,7 +264,7 @@ TAILQ_HEAD(, selinfo) td_selq; /* (p) List of selinfos. */ struct sleepqueue *td_sleepqueue; /* (k) Associated sleep queue. */ struct turnstile *td_turnstile; /* (k) Associated turnstile. */ - int td_tid; /* (b) Thread ID. */ + lwpid_t td_tid; /* (b) Thread ID. */ /* Cleared during fork1() or thread_sched_upcall(). */ #define td_startzero td_flags @@ -903,7 +903,7 @@ int thread_export_context(struct thread *td, int willexit); void thread_free(struct thread *td); void thread_link(struct thread *td, struct ksegrp *kg); -int thread_new_tid(void); +lwpid_t thread_new_tid(void); void thread_reap(void); struct thread *thread_schedule_upcall(struct thread *td, struct kse_upcall *ku); int thread_single(int how); ==== //depot/projects/netperf_socket/sys/sys/types.h#7 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)types.h 8.6 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/types.h,v 1.89 2004/06/17 17:16:53 phk Exp $ + * $FreeBSD: src/sys/sys/types.h,v 1.90 2004/06/19 17:58:32 marcel Exp $ */ #ifndef _SYS_TYPES_H_ @@ -178,6 +178,11 @@ #define _KEY_T_DECLARED #endif +#ifndef _LWPID_T_DECLARED +typedef __lwpid_t lwpid_t; /* Thread ID (a.k.a. LWP) */ +#define _LWPID_T_DECLARED +#endif + #ifndef _MODE_T_DECLARED typedef __mode_t mode_t; /* permissions */ #define _MODE_T_DECLARED ==== //depot/projects/netperf_socket/sys/ufs/ufs/dinode.h#3 (text+ko) ==== @@ -41,7 +41,7 @@ * SUCH DAMAGE. * * @(#)dinode.h 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/ufs/ufs/dinode.h,v 1.12 2004/06/16 09:47:25 phk Exp $ + * $FreeBSD: src/sys/ufs/ufs/dinode.h,v 1.13 2004/06/20 03:11:19 bde Exp $ */ #ifndef _UFS_UFS_DINODE_H_ @@ -131,7 +131,7 @@ * The di_db fields may be overlaid with other information for * file types that do not have associated disk storage. Block * and character devices overlay the first data block with their - * struct cdev *value. Short symbolic links place their path in the + * dev_t value. Short symbolic links place their path in the * di_db area. */ #define di_rdev di_db[0] From owner-p4-projects@FreeBSD.ORG Sun Jun 20 17:25:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12BA516A4D0; Sun, 20 Jun 2004 17:25:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C954016A4CE for ; Sun, 20 Jun 2004 17:25:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE6F643D45 for ; Sun, 20 Jun 2004 17:25:56 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5KHPpeC009904 for ; Sun, 20 Jun 2004 17:25:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5KHPpnq009901 for perforce@freebsd.org; Sun, 20 Jun 2004 17:25:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 20 Jun 2004 17:25:51 GMT Message-Id: <200406201725.i5KHPpnq009901@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 Subject: PERFORCE change 55380 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2004 17:25:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=55380 Change 55380 by rwatson@rwatson_paprika on 2004/06/20 17:25:03 Integrate netperf_socket. Affected files ... .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehcireg.h#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/boot/forth/loader.conf#5 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.77 2004/04/15 12:12:15 cperciva Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.78 2004/06/20 15:58:24 josef Exp $ ############################################################## ### Basic configuration options ############################ @@ -280,6 +280,7 @@ snd_via8233_load="NO" # via8233 snd_via82c686_load="NO" # via82c686 snd_driver_load="NO" # All sound drivers +#pcm0.line="0" # Default value for a mixer channel ############################################################## ### USB modules ############################################ ==== //depot/projects/netperf_socket/sys/dev/sound/pcm/mixer.c#4 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include +#include #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.37 2004/06/17 17:16:45 phk Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.38 2004/06/20 15:38:11 josef Exp $"); MALLOC_DEFINE(M_MIXER, "mixer", "mixer"); @@ -189,9 +190,10 @@ { struct snddev_info *snddev; struct snd_mixer *m; + char devname[20]; u_int16_t v; struct cdev *pdev; - int i, unit; + int i, unit, val; m = (struct snd_mixer *)kobj_create(cls, M_MIXER, M_WAITOK | M_ZERO); snprintf(m->name, MIXER_NAMELEN, "%s:mixer", device_get_nameunit(dev)); @@ -204,7 +206,14 @@ goto bad; for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) { - v = snd_mixerdefaults[i]; + snprintf(devname, sizeof(devname), "%s.%s", device_get_nameunit(dev), snd_mixernames[i]); + TUNABLE_INT_FETCH(devname, &val); + + if (val >= 0 && val <= 100) + v = (u_int16_t) val; + else + v = snd_mixerdefaults[i]; + mixer_set(m, i, v | (v << 8)); } ==== //depot/projects/netperf_socket/sys/dev/usb/ehcireg.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: ehcireg.h,v 1.13 2001/11/23 01:16:27 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ehcireg.h,v 1.2 2004/03/19 07:14:23 julian Exp $ */ +/* $NetBSD: ehcireg.h,v 1.15 2004/06/12 16:02:42 mycroft Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ehcireg.h,v 1.3 2004/06/20 15:32:19 le Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -262,7 +262,7 @@ #define EHCI_QH_GET_MPL(x) (((x) >> 16) & 0x7ff) /* max packet len */ #define EHCI_QH_SET_MPL(x) ((x) << 16) #define EHCI_QG_MPLMASK 0x07ff0000 -#define EHCI_QH_GET_CTL(x) (((x) >> 26) & 0x01) /* control endpoint */ +#define EHCI_QH_GET_CTL(x) (((x) >> 27) & 0x01) /* control endpoint */ #define EHCI_QH_CTL 0x08000000 #define EHCI_QH_GET_NRL(x) (((x) >> 28) & 0x0f) /* NAK reload */ #define EHCI_QH_SET_NRL(x) ((x) << 28) From owner-p4-projects@FreeBSD.ORG Sun Jun 20 19:59:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD37416A4D0; Sun, 20 Jun 2004 19:59:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B09F816A4CE for ; Sun, 20 Jun 2004 19:59:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A95D143D1F for ; Sun, 20 Jun 2004 19:59:21 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5KJxFM0045108 for ; Sun, 20 Jun 2004 19:59:15 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5KJxFxT045105 for perforce@freebsd.org; Sun, 20 Jun 2004 19:59:15 GMT (envelope-from julian@freebsd.org) Date: Sun, 20 Jun 2004 19:59:15 GMT Message-Id: <200406201959.i5KJxFxT045105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 55393 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2004 19:59:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=55393 Change 55393 by julian@julian_desk on 2004/06/20 19:59:07 Set teh "had threads" flag down when doign exec or exit, and ensure everything actually looks that way. {this chamge still not tested}. Affected files ... .. //depot/projects/nsched/sys/kern/kern_exec.c#5 edit .. //depot/projects/nsched/sys/kern/kern_exit.c#10 edit .. //depot/projects/nsched/sys/kern/kern_fork.c#5 edit .. //depot/projects/nsched/sys/kern/kern_kse.c#14 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_exec.c#5 (text+ko) ==== @@ -263,8 +263,14 @@ /* * If we get here all other threads are dead, * so unset the associated flags and lose KSE mode. + * This meams that we must get rid of any extra + * upcalls and kses we may have picked up along the way. */ - p->p_flag &= ~P_SA; + mtx_lock_spin(&sched_lock): + sched_set_concurrancy(td, 1); + upcall_remove(td); + mtx_unlock_spin(&sched_lock): + p->p_flag &= ~(P_SA|P_HADTHREADS); td->td_mailbox = NULL; td->td_pflags &= ~TDP_SA; thread_single_end(); ==== //depot/projects/nsched/sys/kern/kern_exit.c#10 (text+ko) ==== @@ -167,9 +167,14 @@ * ... * Turn off threading support. */ - p->p_flag &= ~P_SA; + mtx_lock_spin(&sched_lock): + sched_set_concurrancy(td, 1); + upcall_remove(td); + mtx_unlock_spin(&sched_lock): + p->p_flag &= ~(P_SA|P_HADTHREADS); + td->td_mailbox = NULL; td->td_pflags &= ~TDP_SA; - thread_single_end(); /* end single-threading mode */ + thread_single_end(); } p->p_flag |= P_WEXIT; ==== //depot/projects/nsched/sys/kern/kern_fork.c#5 (text+ko) ==== ==== //depot/projects/nsched/sys/kern/kern_kse.c#14 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Jun 20 20:42:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C80D16A4D0; Sun, 20 Jun 2004 20:42:15 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3564216A4CE for ; Sun, 20 Jun 2004 20:42:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C20F43D41 for ; Sun, 20 Jun 2004 20:42:15 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5KKgFQN056425 for ; Sun, 20 Jun 2004 20:42:15 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5KKgDhR056392 for perforce@freebsd.org; Sun, 20 Jun 2004 20:42:13 GMT (envelope-from julian@freebsd.org) Date: Sun, 20 Jun 2004 20:42:13 GMT Message-Id: <200406202042.i5KKgDhR056392@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 55398 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2004 20:42:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=55398 Change 55398 by julian@julian_ref on 2004/06/20 20:41:20 Bring into sync with -current HEAD (IFC) Affected files ... .. //depot/projects/nsched/sys/alpha/include/cpu.h#4 integrate .. //depot/projects/nsched/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/nsched/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/nsched/sys/amd64/include/cpu.h#4 integrate .. //depot/projects/nsched/sys/amd64/include/pmap.h#8 integrate .. //depot/projects/nsched/sys/arm/arm/nexus_io.c#3 integrate .. //depot/projects/nsched/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/nsched/sys/arm/include/bus.h#3 integrate .. //depot/projects/nsched/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0_io.c#3 integrate .. //depot/projects/nsched/sys/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/nsched/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/nsched/sys/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/nsched/sys/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/nsched/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/nsched/sys/coda/coda.h#3 integrate .. //depot/projects/nsched/sys/coda/coda_fbsd.c#4 integrate .. //depot/projects/nsched/sys/coda/coda_venus.c#3 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/nsched/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/nsched/sys/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/nsched/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/nsched/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/nsched/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/nsched/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/nsched/sys/compat/svr4/svr4_types.h#2 integrate .. //depot/projects/nsched/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/nsched/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/nsched/sys/contrib/pf/net/pf_ioctl.c#5 integrate .. //depot/projects/nsched/sys/contrib/pf/net/pf_norm.c#4 integrate .. //depot/projects/nsched/sys/dev/acpica/Osd/OsdHardware.c#3 integrate .. //depot/projects/nsched/sys/dev/acpica/Osd/OsdSynch.c#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/nsched/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/nsched/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/nsched/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/nsched/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/nsched/sys/dev/cx/if_cx.c#6 integrate .. //depot/projects/nsched/sys/dev/cy/cy.c#6 integrate .. //depot/projects/nsched/sys/dev/dcons/dcons.c#5 integrate .. //depot/projects/nsched/sys/dev/digi/digi.c#6 integrate .. //depot/projects/nsched/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/nsched/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/nsched/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/nsched/sys/dev/led/led.c#4 integrate .. //depot/projects/nsched/sys/dev/nmdm/nmdm.c#6 integrate .. //depot/projects/nsched/sys/dev/null/null.c#3 integrate .. //depot/projects/nsched/sys/dev/snp/snp.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/nsched/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/ehcireg.h#2 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs.h#5 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs_data.h#5 integrate .. //depot/projects/nsched/sys/dev/vinum/vinum.c#3 integrate .. //depot/projects/nsched/sys/dev/vinum/vinumconfig.c#2 integrate .. //depot/projects/nsched/sys/dev/vinum/vinumio.c#3 integrate .. //depot/projects/nsched/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/nsched/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/nsched/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/nsched/sys/fs/portalfs/portal_vnops.c#3 integrate .. //depot/projects/nsched/sys/fs/specfs/spec_vnops.c#5 integrate .. //depot/projects/nsched/sys/geom/geom_dev.c#3 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/nsched/sys/gnu/ext2fs/ext2_mount.h#4 integrate .. //depot/projects/nsched/sys/gnu/ext2fs/inode.h#4 integrate .. //depot/projects/nsched/sys/i386/i386/bios.c#5 integrate .. //depot/projects/nsched/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/nsched/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/nsched/sys/i386/include/cpu.h#4 integrate .. //depot/projects/nsched/sys/i386/include/pmap.h#5 integrate .. //depot/projects/nsched/sys/i386/isa/npx.c#5 integrate .. //depot/projects/nsched/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/nsched/sys/ia64/include/cpu.h#4 integrate .. //depot/projects/nsched/sys/isofs/cd9660/cd9660_node.h#4 integrate .. //depot/projects/nsched/sys/isofs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_acct.c#2 integrate .. //depot/projects/nsched/sys/kern/kern_conf.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/nsched/sys/kern/kern_exit.c#11 integrate .. //depot/projects/nsched/sys/kern/kern_proc.c#8 integrate .. //depot/projects/nsched/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/nsched/sys/kern/kern_thread.c#24 integrate .. //depot/projects/nsched/sys/kern/kern_time.c#3 integrate .. //depot/projects/nsched/sys/kern/subr_prf.c#3 integrate .. //depot/projects/nsched/sys/kern/sys_socket.c#4 integrate .. //depot/projects/nsched/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/nsched/sys/kern/tty_cons.c#4 integrate .. //depot/projects/nsched/sys/kern/tty_pty.c#6 integrate .. //depot/projects/nsched/sys/kern/tty_tty.c#3 integrate .. //depot/projects/nsched/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/nsched/sys/kern/uipc_socket2.c#6 integrate .. //depot/projects/nsched/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/nsched/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/nsched/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/nsched/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/nsched/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/nsched/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/nsched/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/nsched/sys/modules/zlib/Makefile#1 branch .. //depot/projects/nsched/sys/net/bpf.c#5 integrate .. //depot/projects/nsched/sys/net/if_tap.c#4 integrate .. //depot/projects/nsched/sys/net/if_tun.c#3 integrate .. //depot/projects/nsched/sys/net/pfil.h#2 integrate .. //depot/projects/nsched/sys/net/zlib.c#2 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#4 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#5 integrate .. //depot/projects/nsched/sys/netgraph/ng_fec.c#4 integrate .. //depot/projects/nsched/sys/netgraph/ng_ksocket.c#5 integrate .. //depot/projects/nsched/sys/netinet/in_gif.c#3 integrate .. //depot/projects/nsched/sys/netinet/ip_input.c#5 integrate .. //depot/projects/nsched/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/nsched/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/nsched/sys/netsmb/smb_dev.c#4 integrate .. //depot/projects/nsched/sys/netsmb/smb_trantcp.c#3 integrate .. //depot/projects/nsched/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_subs.c#4 integrate .. //depot/projects/nsched/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/nsched/sys/nfsserver/nfs_syscalls.c#5 integrate .. //depot/projects/nsched/sys/sparc64/include/cpu.h#4 integrate .. //depot/projects/nsched/sys/sys/_lock.h#3 integrate .. //depot/projects/nsched/sys/sys/_types.h#3 integrate .. //depot/projects/nsched/sys/sys/acct.h#3 integrate .. //depot/projects/nsched/sys/sys/conf.h#5 integrate .. //depot/projects/nsched/sys/sys/file.h#3 integrate .. //depot/projects/nsched/sys/sys/kernel.h#2 integrate .. //depot/projects/nsched/sys/sys/param.h#6 integrate .. //depot/projects/nsched/sys/sys/proc.h#14 integrate .. //depot/projects/nsched/sys/sys/snoop.h#2 integrate .. //depot/projects/nsched/sys/sys/stat.h#4 integrate .. //depot/projects/nsched/sys/sys/sysctl.h#5 integrate .. //depot/projects/nsched/sys/sys/systm.h#5 integrate .. //depot/projects/nsched/sys/sys/tty.h#5 integrate .. //depot/projects/nsched/sys/sys/types.h#5 integrate .. //depot/projects/nsched/sys/sys/user.h#4 integrate .. //depot/projects/nsched/sys/sys/vnode.h#5 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/nsched/sys/ufs/ufs/dinode.h#3 integrate .. //depot/projects/nsched/sys/vm/swap_pager.c#4 integrate .. //depot/projects/nsched/sys/vm/vm_page.c#6 integrate .. //depot/projects/nsched/sys/vm/vm_param.h#3 integrate Differences ... ==== //depot/projects/nsched/sys/alpha/include/cpu.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.38 2004/06/16 09:46:26 phk Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.39 2004/06/20 03:52:48 bde Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /* @@ -66,7 +66,7 @@ /* * CTL_MACHDEP definitions. */ -#define CPU_CONSDEV 1 /* struct cdev *: console terminal device */ +#define CPU_CONSDEV 1 /* dev_t: console terminal device */ #define CPU_ROOT_DEVICE 2 /* string: root device name */ #define CPU_UNALIGNED_PRINT 3 /* int: print unaligned accesses */ #define CPU_UNALIGNED_FIX 4 /* int: fix unaligned accesses */ ==== //depot/projects/nsched/sys/amd64/amd64/fpu.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.153 2004/06/08 01:35:48 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.154 2004/06/18 04:01:54 peter Exp $"); #include #include @@ -125,6 +125,8 @@ ldmxcsr(mxcsr); fxsave(&fpu_cleanstate); start_emulating(); + bzero(fpu_cleanstate.sv_fp, sizeof(fpu_cleanstate.sv_fp)); + bzero(fpu_cleanstate.sv_xmm, sizeof(fpu_cleanstate.sv_xmm)); fpu_cleanstate_ready = 1; intr_restore(savecrit); } @@ -384,7 +386,6 @@ { struct pcb *pcb; register_t s; - u_short control; if (PCPU_GET(fpcurthread) == curthread) { printf("fpudna: fpcurthread == curthread %d times\n", @@ -409,13 +410,10 @@ if ((pcb->pcb_flags & PCB_FPUINITDONE) == 0) { /* - * This is the first time this thread has used the FPU or - * the PCB doesn't contain a clean FPU state. Explicitly - * initialize the FPU and load the default control word. + * This is the first time this thread has used the FPU, + * explicitly load sanitized registers. */ - fninit(); - control = __INITIAL_FPUCW__; - fldcw(&control); + fxrstor(&fpu_cleanstate); pcb->pcb_flags |= PCB_FPUINITDONE; } else fxrstor(&pcb->pcb_save); ==== //depot/projects/nsched/sys/amd64/amd64/pmap.c#9 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.474 2004/06/16 07:51:19 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.477 2004/06/20 06:10:59 alc Exp $"); /* * Manages physical address maps. @@ -196,13 +196,11 @@ */ pt_entry_t *CMAP1 = 0; caddr_t CADDR1 = 0; -static pt_entry_t *msgbufmap; struct msgbuf *msgbufp = 0; /* * Crashdump maps. */ -static pt_entry_t *pt_crashdumpmap; static caddr_t crashdumpmap; static PMAP_INLINE void free_pv_entry(pv_entry_t pv); @@ -441,7 +439,7 @@ vm_paddr_t *firstaddr; { vm_offset_t va; - pt_entry_t *pte; + pt_entry_t *pte, *unused; avail_start = *firstaddr; @@ -493,14 +491,12 @@ /* * Crashdump maps. */ - SYSMAP(caddr_t, pt_crashdumpmap, crashdumpmap, MAXDUMPPGS); + SYSMAP(caddr_t, unused, crashdumpmap, MAXDUMPPGS) /* * msgbufp is used to map the system message buffer. - * XXX msgbufmap is not used. */ - SYSMAP(struct msgbuf *, msgbufmap, msgbufp, - atop(round_page(MSGBUF_SIZE))) + SYSMAP(struct msgbuf *, unused, msgbufp, atop(round_page(MSGBUF_SIZE))) virtual_avail = va; @@ -1227,10 +1223,6 @@ *pd = VM_PAGE_TO_PHYS(m) | PG_U | PG_RW | PG_V | PG_A | PG_M; } - vm_page_lock_queues(); - vm_page_wakeup(m); - vm_page_unlock_queues(); - return m; } @@ -2574,14 +2566,17 @@ { pd_entry_t *pde; pt_entry_t *pte; + boolean_t rv; + rv = FALSE; + PMAP_LOCK(pmap); pde = pmap_pde(pmap, addr); - if (pde == NULL || (*pde & PG_V) == 0) - return (FALSE); - pte = vtopte(addr); - if (*pte & PG_V) - return (FALSE); - return (TRUE); + if (pde != NULL && (*pde & PG_V)) { + pte = vtopte(addr); + rv = (*pte & PG_V) == 0; + } + PMAP_UNLOCK(pmap); + return (rv); } /* ==== //depot/projects/nsched/sys/amd64/include/cpu.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.72 2004/06/16 09:46:28 phk Exp $ + * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.73 2004/06/20 03:52:48 bde Exp $ */ #ifndef _MACHINE_CPU_H_ @@ -65,7 +65,7 @@ /* * CTL_MACHDEP definitions. */ -#define CPU_CONSDEV 1 /* struct cdev *: console terminal device */ +#define CPU_CONSDEV 1 /* dev_t: console terminal device */ #define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */ #define CPU_DISRTCSET 3 /* int: disable resettodr() call */ #define CPU_WALLCLOCK 5 /* int: indicates wall CMOS clock */ ==== //depot/projects/nsched/sys/amd64/include/pmap.h#8 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.119 2004/06/14 01:17:50 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.120 2004/06/19 14:58:34 bde Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -129,9 +129,9 @@ #ifndef LOCORE +#include #include #include -#include typedef u_int64_t pd_entry_t; typedef u_int64_t pt_entry_t; ==== //depot/projects/nsched/sys/arm/arm/nexus_io.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io.c,v 1.2 2004/06/16 09:46:28 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/nexus_io.c,v 1.3 2004/06/17 17:51:47 cognet Exp $"); #include #include @@ -75,8 +75,6 @@ /* get kernel virtual address */ 0, /* there is no linear mapping */ - NULL, - /* barrier */ nexus_bs_barrier, ==== //depot/projects/nsched/sys/arm/arm/pmap.c#2 (text+ko) ==== @@ -144,7 +144,7 @@ */ /* Include header files */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.1 2004/05/14 11:46:42 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.3 2004/06/19 20:50:50 cognet Exp $"); #include #include #include @@ -155,7 +155,6 @@ #include #include #include -#include #include #include @@ -4190,7 +4189,7 @@ * the duration of the copy so that no other mappings can * be created while we have a potentially aliased mapping. */ - (void) pmap_clean_page(src_pg->md.pvh_list, TRUE); + (void) pmap_clean_page(TAILQ_FIRST(&src_pg->md.pv_list), TRUE); /* * Map the pages into the page hook points, copy them, and purge ==== //depot/projects/nsched/sys/arm/include/bus.h#3 (text+ko) ==== @@ -67,7 +67,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/arm/include/bus.h,v 1.2 2004/06/16 09:46:28 phk Exp $ + * $FreeBSD: src/sys/arm/include/bus.h,v 1.3 2004/06/17 17:51:47 cognet Exp $ */ #ifndef _MACHINE_BUS_H_ @@ -117,9 +117,6 @@ /* get kernel virtual address */ void * (*bs_vaddr) (void *, bus_space_handle_t); - /* mmap bus space for user */ - int (*bs_mmap) (struct cdev *, vm_offset_t, vm_paddr_t *, int); - /* barrier */ void (*bs_barrier) (void *, bus_space_handle_t, bus_size_t, bus_size_t, int); @@ -258,12 +255,6 @@ (*(t)->bs_vaddr)((t)->bs_cookie, (h)) /* - * MMap bus space for a user application. - */ -#define bus_space_mmap(t, a, o, p, f) \ - (*(t)->bs_mmap)((t)->bs_cookie, (a), (o), (p), (f)) - -/* * Bus barrier operations. */ #define bus_space_barrier(t, h, o, l, f) \ ==== //depot/projects/nsched/sys/arm/sa11x0/assabet_machdep.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.1 2004/05/14 11:46:45 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.2 2004/06/17 17:52:12 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -257,16 +257,6 @@ valloc_pages(kernelstack, KSTACK_PAGES); -#ifdef VERBOSE_INIT_ARM - printf("IRQ stack: p0x%08lx v0x%08lx\n", irqstack.pv_pa, - irqstack.pv_va); - printf("ABT stack: p0x%08lx v0x%08lx\n", abtstack.pv_pa, - abtstack.pv_va); - printf("UND stack: p0x%08lx v0x%08lx\n", undstack.pv_pa, - undstack.pv_va); - printf("SVC stack: p0x%08lx v0x%08lx\n", kernelstack.pv_pa, - kernelstack.pv_va); -#endif /* * Allocate memory for the l1 and l2 page tables. The scheme to avoid * wasting memory by allocating the l1pt on the first 16k memory was @@ -285,10 +275,6 @@ l1pagetable = kernel_l1pt.pv_pa; - /* XXX bla **/ -#if 0 - bcopy((void*)0xd0300000, &mfs_root, MD_ROOT_SIZE*1024); -#endif /* Map the L2 pages tables in the L1 page table */ pmap_link_l2pt(l1pagetable, 0x00000000, &kernel_pt_table[KERNEL_PT_SYS]); @@ -349,7 +335,7 @@ cpu_tlb_flushID(); cpu_domains(DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)); - /* + /* * Pages were allocated during the secondary bootstrap for the * stacks for different CPU modes. * We must now set the r13 registers in the different CPU modes to @@ -358,7 +344,6 @@ * of the stack memory. */ printf("init subsystems: stacks\n"); - set_stackptr(PSR_IRQ32_MODE, irqstack.pv_va + IRQ_STACK_SIZE * PAGE_SIZE); set_stackptr(PSR_ABT32_MODE, @@ -383,56 +368,8 @@ bootverbose = 1; -#if 0 - set_cpufuncs(); -#endif /* Set stack for exception handlers */ -#if 0 - printf("arm_init: physical_pages = %08x\n", physical_pages); - printf("arm_init: kernel_l1pt: pa = %08x, va = %08x\n", - kernel_l1pt.pv_pa, kernel_l1pt.pv_va); - printf("arm_init: proc0_uarea: pa = %08x, va = %08x\n", - proc0_uarea.pv_pa, proc0_uarea.pv_va); - printf("arm_init: proc0_kstack: pa = %08x, va = %08x\n", - proc0_kstack.pv_pa, proc0_kstack.pv_va); -#endif - -/* printf("arm_init: physfree = %08x\n", physical_freestart); - printf("arm_init: first = %08x\n", first); - printf("arm_init: end = %08x\n", (uint32_t) &end); - - printf("arm_init: params = %08x\n", params); - printf("arm_init: params: page_size = %08x\n", params->u1.s.page_size); - printf("arm_init: params: nrpages = %08x\n", params->u1.s.nr_pages); - printf("arm_init: params: ramdisk_size = %08x\n", params->u1.s.ramdisk_size); - printf("arm_init: params: flags = %08x\n", params->u1.s.flags); - printf("arm_init: params: rootdev = %08x\n", params->u1.s.rootdev); - printf("arm_init: params: video_num_cols = %08x\n", params->u1.s.video_num_cols); - printf("arm_init: params: video_num_rows = %08x\n", params->u1.s.video_num_rows); - printf("arm_init: params: video_x = %08x\n", params->u1.s.video_x); - printf("arm_init: params: video_y = %08x\n", params->u1.s.video_y); - printf("arm_init: params: memc_control_reg = %08x\n", params->u1.s.memc_control_reg); - printf("arm_init: params: sounddefault = %02x\n", params->u1.s.sounddefault); - printf("arm_init: params: adfsdrives = %02x\n", params->u1.s.adfsdrives); - printf("arm_init: params: bytes_per_char_h = %02x\n", params->u1.s.bytes_per_char_h); - printf("arm_init: params: bytes_per_char_v = %02x\n", params->u1.s.bytes_per_char_v); - for(i = 0; i < 4; i++) { - printf("arm_init: params: pages_in_bank[%d] = %08x\n", i, params->u1.s.pages_in_bank[i]); - } - printf("arm_init: params: pages_in_vram = %08x\n", params->u1.s.pages_in_vram); - printf("arm_init: params: initrd_start = %08x\n", params->u1.s.initrd_start); - printf("arm_init: params: initrd_size = %08x\n", params->u1.s.initrd_size); - printf("arm_init: params: rd_start = %08x\n", params->u1.s.rd_start); - printf("arm_init: params: system_options = %08x\n", params->u1.s.system_options); - printf("arm_init: params: system_serial_num = %08x\n", params->u1.s.system_serial_num); - for(i = 0; i < 8; i++) { - printf("arm_init: params: paths[%d] = %s\n", i, (params->u2.paths[i][0]) ? params->u2.paths[i] : "(null)"); - } - printf("arm_init: params: magic = %08x\n", params->u2.s.magic); - printf("arm_init: params: commandline = %s\n", (params->commandline[0]) ? params->commandline : "(null)"); - printf("arm_init: params: bootsetting = %s\n", (params->bootsetting[0]) ? params->bootsetting : "(null)");*/ - proc_linkup(&proc0, &ksegrp0, &kse0, &thread0); proc0.p_uarea = (struct user *) proc0_uarea.pv_va; thread0.td_kstack = kernelstack.pv_va; @@ -443,13 +380,6 @@ /* Enable MMU, I-cache, D-cache, write buffer. */ -#if 0 - printf("it was %p\n", (void *)cpufunc_control(0,0)); - printf("ca c fait\n"); - printf("before\n"); - printf("mmu enabled\n"); - printf("now we have %p\n", (void*)cpufunc_control(0,0)); -#endif cpufunc_control(0x337f, 0x107d); got_mmu = 1; @@ -463,35 +393,14 @@ mutex_init(); -#if 0 - phys_avail[0] = 0x00000000; - phys_avail[1] = physmem; - phys_avail[2] = 0; -#endif -#if 0 - phys_avail[1] = physical_start; - phys_avail[2] = physical_freestart; - phys_avail[3] = physmem; -#endif -#if 0 - phys_avail[3] = 0; -#endif -#if 0 - phys_avail[1] = 0x01000000 - 1; -#endif phys_avail[0] = round_page(freemempos); phys_avail[1] = 0xc0000000 + 0x02000000 - 1; phys_avail[2] = 0; phys_avail[3] = 0; -#if 0 - phys_avail[4] = 0x00000000; - phys_avail[5] = 0x00000000; -#endif /* Do basic tuning, hz etc */ init_param1(); init_param2(physmem); - printf("arm_init: done!\n"); avail_end = 0xc0000000 + 0x02000000 - 1; return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP)); } ==== //depot/projects/nsched/sys/arm/sa11x0/sa11x0.c#2 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.1 2004/05/14 11:46:45 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.2 2004/06/19 17:38:32 cognet Exp $"); #include #include @@ -68,6 +68,7 @@ #include #include #include +#include #include #include ==== //depot/projects/nsched/sys/arm/sa11x0/sa11x0_io.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_io.c,v 1.2 2004/06/16 09:46:29 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_io.c,v 1.3 2004/06/17 17:51:48 cognet Exp $"); #include #include #include @@ -79,9 +79,6 @@ /* get kernel virtual address */ sa11x0_bs_vaddr, - /* mmap bus space for userland */ - sa11x0_bs_mmap, - /* barrier */ sa11x0_bs_barrier, @@ -224,13 +221,6 @@ return (0); } -int -sa11x0_bs_mmap(struct cdev *t, vm_offset_t offset, vm_paddr_t *paddr, int nprot) -{ - *paddr = offset; - return (0); -} - void * sa11x0_bs_vaddr(t, bsh) void *t; ==== //depot/projects/nsched/sys/arm/sa11x0/sa11x0_ost.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.1 2004/05/14 11:46:45 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.2 2004/06/19 17:38:32 cognet Exp $"); #include #include @@ -47,6 +47,7 @@ #include #include #include +#include #include #include ==== //depot/projects/nsched/sys/boot/forth/loader.conf#3 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.77 2004/04/15 12:12:15 cperciva Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.78 2004/06/20 15:58:24 josef Exp $ ############################################################## ### Basic configuration options ############################ @@ -280,6 +280,7 @@ snd_via8233_load="NO" # via8233 snd_via82c686_load="NO" # via82c686 snd_driver_load="NO" # All sound drivers +#pcm0.line="0" # Default value for a mixer channel ############################################################## ### USB modules ############################################ ==== //depot/projects/nsched/sys/boot/i386/boot0/boot0.S#4 (text+ko) ==== @@ -13,7 +13,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.9 2004/06/11 09:45:18 phk Exp $ + * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.10 2004/06/17 12:02:25 phk Exp $ */ /* A 512-byte boot manager. */ @@ -96,9 +96,8 @@ /* * Initialize the serial port. bioscom preserves the driver number in DX. */ - movb COMSPEED,%al # defined by Makefile - movb $0x00,%ah # BIOS: Set COM Port - call bioscom + movw COMSPEED,%ax # defined by Makefile + callw bioscom #endif /* SIO */ /* * Check what flags were loaded with us, specifically, Use a predefined Drive. @@ -372,7 +371,6 @@ #else /* SIO */ putchr: movb $0x01,%ah # BIOS: Send - xorw %cx,%cx # No timeout bioscom: pushw %dx # Save xorw %dx,%dx # Use COM1 ==== //depot/projects/nsched/sys/boot/pc98/libpc98/biosdisk.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.29 2004/06/16 18:21:22 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.30 2004/06/17 11:44:05 phk Exp $"); /* * BIOS disk device handling. @@ -989,7 +989,7 @@ return (0); default: /* DO NOTHING */ - beak; + break; } return EROFS; ==== //depot/projects/nsched/sys/cam/scsi/scsi_target.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.61 2004/06/16 09:46:31 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.62 2004/06/17 17:16:40 phk Exp $"); #include #include @@ -1035,7 +1035,7 @@ { int u; - if (*dev != NODEV) + if (*dev != NULL) return; if (dev_stdclone(name, NULL, "targ", &u) != 1) return; ==== //depot/projects/nsched/sys/coda/coda.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda.h,v 1.11 2004/06/16 09:46:32 phk Exp $ + * $FreeBSD: src/sys/coda/coda.h,v 1.12 2004/06/17 17:16:40 phk Exp $ * */ @@ -87,7 +87,7 @@ typedef unsigned long long u_quad_t; #endif #else -#define cdev_t udev_t +#define cdev_t dev_t #endif #ifdef __CYGWIN32__ ==== //depot/projects/nsched/sys/coda/coda_fbsd.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.34 2004/06/16 09:46:32 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.35 2004/06/17 17:16:40 phk Exp $"); #include "vcoda.h" @@ -186,7 +186,7 @@ { int u; - if (*dev != NODEV) + if (*dev != NULL) return; if (dev_stdclone(name,NULL,"cfs",&u) != 1) return; ==== //depot/projects/nsched/sys/coda/coda_venus.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_venus.c,v 1.20 2004/06/16 09:46:32 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_venus.c,v 1.21 2004/06/17 17:16:40 phk Exp $"); #include #include @@ -212,7 +212,7 @@ error = coda_call(mdp, Isize, &Osize, (char *)inp); if (!error) { - *dev = udev2dev(outp->dev); + *dev = findcdev(outp->dev); *inode = outp->inode; } ==== //depot/projects/nsched/sys/compat/freebsd32/freebsd32_misc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.22 2004/04/24 04:31:59 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.23 2004/06/17 17:16:41 phk Exp $"); #include "opt_compat.h" @@ -1083,13 +1083,13 @@ } struct stat32 { - udev_t st_dev; + dev_t st_dev; ino_t st_ino; mode_t st_mode; nlink_t st_nlink; uid_t st_uid; gid_t st_gid; - udev_t st_rdev; + dev_t st_rdev; struct timespec32 st_atimespec; struct timespec32 st_mtimespec; struct timespec32 st_ctimespec; ==== //depot/projects/nsched/sys/compat/linux/linux_ioctl.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.114 2004/06/14 07:26:23 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.119 2004/06/18 14:36:24 bms Exp $"); #include #include @@ -1443,20 +1443,22 @@ } case LINUX_CDROMREADTOCENTRY: { - struct linux_cdrom_tocentry lte, *ltep = - (struct linux_cdrom_tocentry *)args->arg; + struct linux_cdrom_tocentry lte; struct ioc_read_toc_single_entry irtse; - irtse.address_format = ltep->cdte_format; - irtse.track = ltep->cdte_track; + + error = copyin((void *)args->arg, <e, sizeof(lte)); + if (error) + break; + irtse.address_format = lte.cdte_format; + irtse.track = lte.cdte_track; error = fo_ioctl(fp, CDIOREADTOCENTRY, (caddr_t)&irtse, td->td_ucred, td); if (!error) { - lte = *ltep; lte.cdte_ctrl = irtse.entry.control; lte.cdte_adr = irtse.entry.addr_type; bsd_to_linux_msf_lba(irtse.address_format, &irtse.entry.addr, <e.cdte_addr); - copyout(<e, (void *)args->arg, sizeof(lte)); + error = copyout(<e, (void *)args->arg, sizeof(lte)); } break; } @@ -1696,6 +1698,10 @@ args->cmd = SETDIR(SOUND_MIXER_WRITE_LINE3); return (ioctl(td, (struct ioctl_args *)args)); + case LINUX_SOUND_MIXER_INFO: + args->cmd = SETDIR(SOUND_MIXER_INFO); + return (ioctl(td, (struct ioctl_args *)args)); + case LINUX_OSS_GETVERSION: { int version = linux_get_oss_version(td); return (copyout(&version, (void *)args->arg, sizeof(int))); @@ -1705,6 +1711,10 @@ args->cmd = SOUND_MIXER_READ_STEREODEVS; return (ioctl(td, (struct ioctl_args *)args)); + case LINUX_SOUND_MIXER_READ_RECMASK: + args->cmd = SOUND_MIXER_READ_RECMASK; + return (ioctl(td, (struct ioctl_args *)args)); + case LINUX_SOUND_MIXER_READ_DEVMASK: args->cmd = SOUND_MIXER_READ_DEVMASK; return (ioctl(td, (struct ioctl_args *)args)); @@ -1941,11 +1951,14 @@ break; case LINUX_VT_SETMODE: { - struct vt_mode *mode; + struct vt_mode mode; + if ((error = copyin((void *)args->arg, &mode, sizeof(mode)))) + break; + if (!ISSIGVALID(mode.frsig) && ISSIGVALID(mode.acqsig)) + mode.frsig = mode.acqsig; + if ((error = copyout(&mode, (void *)args->arg, sizeof(mode)))) + break; args->cmd = VT_SETMODE; - mode = (struct vt_mode *)args->arg; - if (!ISSIGVALID(mode->frsig) && ISSIGVALID(mode->acqsig)) - mode->frsig = mode->acqsig; error = (ioctl(td, (struct ioctl_args *)args)); break; } @@ -2076,6 +2089,20 @@ if (error != 0) return (error); + /* handle the 'request buffer size' case */ + if (ifc.ifc_buf == NULL) { + ifc.ifc_len = 0; + TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { + struct sockaddr *sa = ifa->ifa_addr; + if (sa->sa_family == AF_INET) + ifc.ifc_len += sizeof(ifr); + } + } + error = copyout(&ifc, uifc, sizeof(ifc)); + return (error); + } + /* much easier to use uiomove than keep track ourselves */ iov.iov_base = ifc.ifc_buf; iov.iov_len = ifc.ifc_len; ==== //depot/projects/nsched/sys/compat/linux/linux_ioctl.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.18 2004/06/14 07:26:23 phk Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.20 2004/06/18 14:36:24 bms Exp $ */ #ifndef _LINUX_IOCTL_H_ @@ -227,8 +227,10 @@ #define LINUX_SOUND_MIXER_WRITE_LINE1 0x4d0E #define LINUX_SOUND_MIXER_WRITE_LINE2 0x4d0F #define LINUX_SOUND_MIXER_WRITE_LINE3 0x4d10 +#define LINUX_SOUND_MIXER_INFO 0x4d65 #define LINUX_OSS_GETVERSION 0x4d76 #define LINUX_SOUND_MIXER_READ_STEREODEVS 0x4dfb +#define LINUX_SOUND_MIXER_READ_RECMASK 0x4dfd #define LINUX_SOUND_MIXER_READ_DEVMASK 0x4dfe #define LINUX_SOUND_MIXER_WRITE_RECSRC 0x4dff #define LINUX_SNDCTL_DSP_RESET 0x5000 ==== //depot/projects/nsched/sys/compat/linux/linux_stats.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.59 2004/06/16 09:46:33 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.60 2004/06/17 17:16:41 phk Exp $"); #include "opt_mac.h" @@ -76,7 +76,7 @@ * in FreeBSD but block devices under Linux. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 20 21:10:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38A6316A4D1; Sun, 20 Jun 2004 21:10:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0CFF216A4CE for ; Sun, 20 Jun 2004 21:10:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 05F9243D39 for ; Sun, 20 Jun 2004 21:10:54 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5KLAoxK068507 for ; Sun, 20 Jun 2004 21:10:50 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5KLAog1068504 for perforce@freebsd.org; Sun, 20 Jun 2004 21:10:50 GMT (envelope-from julian@freebsd.org) Date: Sun, 20 Jun 2004 21:10:50 GMT Message-Id: <200406202110.i5KLAog1068504@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 55400 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2004 21:10:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=55400 Change 55400 by julian@julian_ref on 2004/06/20 21:10:48 compile this time.. Affected files ... .. //depot/projects/nsched/sys/kern/kern_exec.c#6 edit .. //depot/projects/nsched/sys/kern/kern_exit.c#12 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_exec.c#6 (text+ko) ==== @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -266,10 +267,10 @@ * This meams that we must get rid of any extra * upcalls and kses we may have picked up along the way. */ - mtx_lock_spin(&sched_lock): - sched_set_concurrancy(td, 1); + mtx_lock_spin(&sched_lock); + sched_set_concurrancy(td->td_ksegrp, 1); upcall_remove(td); - mtx_unlock_spin(&sched_lock): + mtx_unlock_spin(&sched_lock); p->p_flag &= ~(P_SA|P_HADTHREADS); td->td_mailbox = NULL; td->td_pflags &= ~TDP_SA; ==== //depot/projects/nsched/sys/kern/kern_exit.c#12 (text+ko) ==== @@ -166,10 +166,10 @@ * ... * Turn off threading support. */ - mtx_lock_spin(&sched_lock): - sched_set_concurrancy(td, 1); + mtx_lock_spin(&sched_lock); + sched_set_concurrancy(td->td_ksegrp, 1); upcall_remove(td); - mtx_unlock_spin(&sched_lock): + mtx_unlock_spin(&sched_lock); p->p_flag &= ~(P_SA|P_HADTHREADS); td->td_mailbox = NULL; td->td_pflags &= ~TDP_SA; From owner-p4-projects@FreeBSD.ORG Sun Jun 20 21:33:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 572AB16A4D0; Sun, 20 Jun 2004 21:33:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 15EE216A4CE for ; Sun, 20 Jun 2004 21:33:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CC2243D39 for ; Sun, 20 Jun 2004 21:33:26 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5KLXPim074476 for ; Sun, 20 Jun 2004 21:33:25 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5KLXJp9074473 for perforce@freebsd.org; Sun, 20 Jun 2004 21:33:19 GMT (envelope-from marcel@freebsd.org) Date: Sun, 20 Jun 2004 21:33:19 GMT Message-Id: <200406202133.i5KLXJp9074473@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 Subject: PERFORCE change 55403 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2004 21:33:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=55403 Change 55403 by marcel@marcel_nfs on 2004/06/20 21:33:02 IFC @55399 Affected files ... .. //depot/projects/gdb/contrib/gdb/FREEBSD-Xlist#5 integrate .. //depot/projects/gdb/contrib/gdb/config-ml.in#5 integrate .. //depot/projects/gdb/contrib/gdb/djunpack.bat#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/MAINTAINERS#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/NEWS#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/PROBLEMS#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/README#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/TODO#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/acinclude.m4#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/aclocal.m4#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ada-exp.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/ada-exp.y#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/ada-lang.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/ada-lang.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/ada-lex.l#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/ada-typeprint.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/ada-valprint.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/alpha-mdebug-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/alpha-tdep.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/alpha-tdep.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/alphabsd-nat.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/alphabsd-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/alphabsd-tdep.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/alphafbsd-tdep.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/alphanbsd-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/amd64-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/amd64-nat.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/amd64-tdep.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/amd64-tdep.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/amd64bsd-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/amd64fbsd-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/amd64fbsd-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/amd64nbsd-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/amd64nbsd-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/amd64obsd-nat.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/amd64obsd-tdep.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/annotate.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/arch-utils.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/arch-utils.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/arm-tdep.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/armnbsd-tdep.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/auxv.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/auxv.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/ax-gdb.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ax-gdb.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ax-general.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/bcache.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/bcache.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/bfd-target.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/bfd-target.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/block.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/block.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/blockframe.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/breakpoint.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/breakpoint.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/buildsym.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/buildsym.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/c-exp.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/c-exp.y#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/c-lang.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/c-lang.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/c-typeprint.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/c-valprint.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/charset.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/charset.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/cli-out.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/cli-out.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-cmds.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-decode.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-decode.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-dump.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-dump.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-interp.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-logging.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-script.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-script.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-setshow.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/cli/cli-setshow.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/coff-pe-read.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/coff-pe-read.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/coffread.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/command.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/complaints.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/complaints.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/completer.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/completer.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/alpha.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/fbsd.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nbsd.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nbsd.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nm-fbsd.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nm-nbsd.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nm-osf.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nm-osf2.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/tm-alpha.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/tm-fbsd.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/alpha/tm-nbsd.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/arm/nbsd.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/arm/nbsdaout.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/arm/nbsdelf.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/arm/nm-nbsd.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/arm/nm-nbsdaout.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/arm/tm-arm.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/arm/tm-nbsd.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/arm/wince.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/arm/xm-nbsd.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/fbsd.mh#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/fbsd.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/fbsd64.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/fbsd64.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/go32.mh#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386aout.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386gnu.mh#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386gnu.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386lynx.mh#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386nw.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386sol2.mh#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386sol2.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386v.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386v42mp.mh#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nbsd.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nbsd64.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nbsd64.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nbsdaout.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nbsdelf.mh#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/ncr3000.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-fbsd.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-fbsd64.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-go32.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386gnu.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386lynx.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386sco.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386sco5.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386sol2.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386v.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386v4.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386v42mp.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-nbsd.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-nbsdaout.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-nto.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-obsd.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nto.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/nto.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/obsd.mh#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/obsd.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/obsd64.mh#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/obsd64.mt#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/obsdaout.mh#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-fbsd.h#7 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-go32.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-i386.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-i386lynx.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-i386sol2.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-nbsd.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-nto.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-vxworks.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/xm-i386.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/xm-i386sco.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/xm-i386v4.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/i386/xm-nbsd.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/ia64.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/tm-ia64.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/decstation.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/embed.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/littlemips.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/mipsv4.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/mipsv4.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/nbsd.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/nbsd.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/news-mips.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/nm-mips.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/nm-nbsd.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/nm-news-mips.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/nm-riscos.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/riscos.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/tm-mips.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/tm-mipsv4.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/tm-nbsd.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/tm-vxmips.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/tm-wince.h#5 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/vxmips.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/wince.mt#5 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/xm-mips.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/xm-mipsv4.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/mips/xm-riscos.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/nm-nbsdaout.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/nbsd.mh#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/nbsd.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/nm-nbsd.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/ppc-eabi.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/ppc-sim.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/tm-nbsd.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/tm-ppc-eabi.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/tm-vxworks.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/powerpc/vxworks.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/s390/s390.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/s390/s390.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/fbsd.mh#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/fbsd.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nbsd.mt#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nbsd64.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nbsd64.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nbsdaout.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nbsdelf.mh#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nm-fbsd.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nm-nbsd.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nm-nbsdaout.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/nm-sol2.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/obsd.mt#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/obsd64.mt#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/sol2-64.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/sol2.mh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/sol2.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/sparc.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/sparc64.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/tm-fbsd.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/tm-nbsd.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/tm-nbsd64.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/tm-sol2.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/tm-vxworks.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/sparc/vxworks.mt#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/tm-nto.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/core-regset.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/corefile.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/corelow.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/cp-abi.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/cp-abi.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/cp-namespace.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/cp-support.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/cp-support.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/cp-valprint.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/dbug-rom.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/dbxread.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/dcache.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/defs.h#7 integrate .. //depot/projects/gdb/contrib/gdb/gdb/delta68-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/demangle.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/dictionary.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/dictionary.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/dink32-rom.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/disasm.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/disasm.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/doc/GDBvn.texi#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/doc/agentexpr.texi#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/doc/all-cfg.texi#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/doc/annotate.texinfo#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/doc/fdl.texi#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/doc/gdb.info-1#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/doc/gdb.info-2#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/doc/gdb.info-3#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/doc/gdb.texinfo#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/doc/gdbint.texinfo#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/doc/observer.texi#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/doc/stabs.texinfo#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/doublest.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/doublest.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/dpx2-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/dsrec.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/dummy-frame.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/dummy-frame.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/dve3900-rom.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/dwarf2-frame.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/dwarf2-frame.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/dwarf2expr.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/dwarf2expr.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/dwarf2loc.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/dwarf2loc.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/dwarf2read.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/dwarfread.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/elfread.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/environ.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/eval.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/event-loop.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/event-loop.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/event-top.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/event-top.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/exec.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/exec.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/expprint.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/expression.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/f-exp.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/f-exp.y#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/f-lang.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/f-typeprint.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/f-valprint.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/fbsd-proc.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/findvar.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/fork-child.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/frame-base.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/frame-base.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/frame-unwind.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/frame-unwind.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/frame.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/frame.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gcore.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdb-events.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdb-events.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdb-events.sh#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdb-stabs.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdb.1#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdb.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gdb.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdb_assert.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdb_curses.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/gdb_dirent.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdb_gcore.sh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gdb_indent.sh#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdb_locale.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gdb_mbuild.sh#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gdb_obstack.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gdb_regex.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdb_thread_db.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbarch.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbarch.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbarch.sh#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbcore.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbinit.in#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/acinclude.m4#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/aclocal.m4#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/gdbreplay.c#7 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/i387-fp.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/i387-fp.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/inferiors.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/mem-break.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/mem-break.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/proc-service.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/regcache.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/regcache.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/remote-utils.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/server.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/server.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/target.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/target.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/thread-db.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gdbserver/utils.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbthread.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbtypes.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gdbtypes.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/glibc-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/glibc-tdep.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gnu-v2-abi.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/gnu-v3-abi.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/go32-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gregset.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/hpacc-abi.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/hpread.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/i386-nat.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/i386-nto-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/i386-sol2-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/i386-tdep.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/i386-tdep.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/i386bsd-nat.c#7 integrate .. //depot/projects/gdb/contrib/gdb/gdb/i386bsd-tdep.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/i386fbsd-nat.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/i386fbsd-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/i386gnu-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/i386nbsd-tdep.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/i386obsd-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/i386obsd-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/i387-tdep.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/i387-tdep.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/ia64-tdep.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ia64-tdep.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/infcall.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/infcall.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/infcmd.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/inferior.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/inflow.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/inflow.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/infptrace.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/infrun.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/inftarg.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/infttrace.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/infttrace.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/interps.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/interps.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/jv-exp.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/jv-exp.y#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/jv-lang.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/jv-typeprint.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/jv-valprint.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/kod.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/language.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/language.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/libunwind-frame.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/libunwind-frame.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/lin-lwp.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/linespec.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/linespec.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/m2-exp.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/m2-exp.y#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/m2-lang.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/macrocmd.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/macroexp.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/macroexp.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/macroscope.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/macroscope.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/macrotab.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/macrotab.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/main.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/main.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/maint.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mdebugread.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mem-break.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/memattr.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-cmd-break.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-cmd-disas.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-cmd-env.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-cmd-file.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-cmd-stack.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-cmd-var.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-cmds.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-cmds.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-console.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-console.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-getopt.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-getopt.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-interp.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-main.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-main.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-out.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-out.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-parse.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mi/mi-symbol-cmds.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/minsyms.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mips-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/mips-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/mips-tdep.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/mipsnbsd-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/mipsnbsd-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/mipsnbsd-tdep.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/mipsread.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/mipsv4-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/nbsd-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/nbsd-tdep.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/nlmread.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/nto-procfs.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/nto-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/nto-tdep.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/objc-exp.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/objc-exp.y#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/objc-lang.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/objc-lang.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/objfiles.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/objfiles.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/observer.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/observer.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/ocd.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ocd.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/osabi.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/osabi.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/p-exp.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/p-exp.y#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/p-lang.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/p-lang.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/p-typeprint.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/p-valprint.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/pa64solib.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/pa64solib.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/parse.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/parser-defs.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ppc-bdm.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ppc-sysv-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/ppc-tdep.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ppcnbsd-nat.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ppcnbsd-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/ppcnbsd-tdep.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/printcmd.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/proc-api.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/proc-utils.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/regcache.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/regcache.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/regformats/reg-m68k.dat#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/regformats/reg-ppc.dat#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/regformats/reg-s390.dat#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/regformats/reg-s390x.dat#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/regformats/reg-x86-64.dat#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/reggroups.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/reggroups.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/regset.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/remote-fileio.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/remote-fileio.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/remote-rdi.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/remote-utils.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/remote-utils.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/remote.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/remote.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/rom68k-rom.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/s390-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/s390-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/s390-tdep.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/scm-exp.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/scm-lang.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/scm-lang.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/sentinel-frame.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sentinel-frame.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/ser-pipe.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ser-tcp.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ser-unix.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ser-unix.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/serial.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/serial.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/signals/signals.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/sim-regno.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sol-thread.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/solib-legacy.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/solib-osf.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/solib-sunos.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/solib-svr4.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/solib-svr4.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/solib.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/solib.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/solist.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/source.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/source.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/sparc-nat.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/sparc-nat.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sparc-sol2-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sparc-sol2-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sparc-tdep.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/sparc-tdep.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sparc64-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sparc64-sol2-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sparc64-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sparc64-tdep.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sparc64fbsd-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sparc64fbsd-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sparc64nbsd-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sparc64nbsd-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sparc64obsd-tdep.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/sparcnbsd-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sparcnbsd-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sparcobsd-tdep.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/stabsread.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/stabsread.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/stack.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/stack.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/std-regs.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/sun3-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/symfile.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/symfile.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/symmisc.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/symtab.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/symtab.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/target.c#7 integrate .. //depot/projects/gdb/contrib/gdb/gdb/target.h#7 integrate .. //depot/projects/gdb/contrib/gdb/gdb/thread-db.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/thread.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/top.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/top.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/tracepoint.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/trad-frame.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/trad-frame.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-command.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-command.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-data.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-data.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-disasm.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-disasm.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-file.c#5 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-file.h#5 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-hooks.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-hooks.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-interp.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-io.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-io.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-layout.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-layout.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-main.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-out.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-regs.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-regs.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-source.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-source.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-stack.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-stack.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-win.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-win.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-windata.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-windata.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-wingeneral.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-wingeneral.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-winsource.c#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui-winsource.h#3 branch .. //depot/projects/gdb/contrib/gdb/gdb/typeprint.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/typeprint.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ui-file.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ui-file.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ui-out.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ui-out.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/user-regs.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/user-regs.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/utils.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/uw-thread.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/valarith.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/valops.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/valprint.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/valprint.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/value.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/values.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/varobj.c#6 integrate .. //depot/projects/gdb/contrib/gdb/gdb/version.in#7 integrate .. //depot/projects/gdb/contrib/gdb/gdb/win32-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/wince-stub.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/wince-stub.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/wince.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/wrapper.h#6 integrate .. //depot/projects/gdb/contrib/gdb/gettext.m4#3 branch .. //depot/projects/gdb/contrib/gdb/include/MAINTAINERS#3 branch .. //depot/projects/gdb/contrib/gdb/include/alloca-conf.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/bin-bugs.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/dyn-string.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/fibheap.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/filenames.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/fnmatch.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/fopen-vms.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/gdb/callback.h#4 branch .. //depot/projects/gdb/contrib/gdb/include/gdb/fileio.h#4 branch .. //depot/projects/gdb/contrib/gdb/include/gdb/remote-sim.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/gdb/signals.h#6 integrate .. //depot/projects/gdb/contrib/gdb/include/gdb/sim-arm.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/gdb/sim-d10v.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/gdb/sim-frv.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/gdb/sim-h8300.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/gdb/sim-sh.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/hashtab.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/md5.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/objalloc.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/partition.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/safe-ctype.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/sort.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/splay-tree.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/symcat.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/ternary.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/xregex.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/xregex2.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/xtensa-isa-internal.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/xtensa-isa.h#3 branch .. //depot/projects/gdb/contrib/gdb/install-sh#3 branch .. //depot/projects/gdb/contrib/gdb/libtool.m4#3 branch .. //depot/projects/gdb/contrib/gdb/ltcf-c.sh#3 branch .. //depot/projects/gdb/contrib/gdb/ltcf-cxx.sh#3 branch .. //depot/projects/gdb/contrib/gdb/ltcf-gcj.sh#3 branch .. //depot/projects/gdb/contrib/gdb/ltconfig#3 branch .. //depot/projects/gdb/contrib/gdb/ltmain.sh#3 branch .. //depot/projects/gdb/contrib/gdb/md5.sum#3 branch .. //depot/projects/gdb/contrib/gdb/missing#3 branch .. //depot/projects/gdb/contrib/gdb/mkinstalldirs#3 branch .. //depot/projects/gdb/contrib/gdb/src-release#3 branch .. //depot/projects/gdb/contrib/gdb/symlink-tree#3 branch .. //depot/projects/gdb/contrib/gdb/ylwrap#3 branch .. //depot/projects/gdb/contrib/smbfs/mount_smbfs/mount_smbfs.c#3 integrate .. //depot/projects/gdb/include/stdio.h#5 integrate .. //depot/projects/gdb/lib/msun/Makefile#5 integrate .. //depot/projects/gdb/lib/msun/i387/s_ilogb.S#3 delete .. //depot/projects/gdb/lib/msun/man/ceil.3#2 integrate .. //depot/projects/gdb/lib/msun/man/floor.3#2 integrate .. //depot/projects/gdb/lib/msun/man/ieee.3#4 integrate .. //depot/projects/gdb/lib/msun/man/math.3#3 integrate .. //depot/projects/gdb/lib/msun/man/round.3#2 integrate .. //depot/projects/gdb/lib/msun/man/trunc.3#1 branch .. //depot/projects/gdb/lib/msun/src/math.h#7 integrate .. //depot/projects/gdb/lib/msun/src/s_scalbln.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_trunc.c#1 branch .. //depot/projects/gdb/lib/msun/src/s_truncf.c#1 branch .. //depot/projects/gdb/share/examples/atm/fore-microcode.txt#2 integrate .. //depot/projects/gdb/share/examples/diskless/README.BOOTP#2 integrate .. //depot/projects/gdb/share/examples/diskless/README.TEMPLATING#3 integrate .. //depot/projects/gdb/share/examples/etc/README.examples#3 integrate .. //depot/projects/gdb/share/examples/mdoc/example.3#2 integrate .. //depot/projects/gdb/share/man/man4/netintro.4#3 integrate .. //depot/projects/gdb/share/man/man5/style.Makefile.5#4 integrate .. //depot/projects/gdb/sys/alpha/include/cpu.h#4 integrate .. //depot/projects/gdb/sys/amd64/amd64/pmap.c#16 integrate .. //depot/projects/gdb/sys/amd64/include/cpu.h#4 integrate .. //depot/projects/gdb/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/gdb/sys/dev/null/null.c#4 integrate .. //depot/projects/gdb/sys/dev/sound/pcm/mixer.c#6 integrate .. //depot/projects/gdb/sys/dev/usb/ehcireg.h#3 integrate .. //depot/projects/gdb/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/gdb/sys/i386/include/cpu.h#4 integrate .. //depot/projects/gdb/sys/ia64/include/cpu.h#4 integrate .. //depot/projects/gdb/sys/kern/sys_socket.c#6 integrate .. //depot/projects/gdb/sys/kern/uipc_socket.c#13 integrate .. //depot/projects/gdb/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/gdb/sys/modules/zlib/Makefile#1 branch .. //depot/projects/gdb/sys/net/zlib.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_fec.c#4 integrate .. //depot/projects/gdb/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/gdb/sys/netinet/tcp_input.c#10 integrate .. //depot/projects/gdb/sys/sparc64/include/cpu.h#4 integrate .. //depot/projects/gdb/usr.bin/gprof/Makefile#2 integrate .. //depot/projects/gdb/usr.bin/gprof/alpha.c#2 delete .. //depot/projects/gdb/usr.bin/gprof/amd64.c#2 delete .. //depot/projects/gdb/usr.bin/gprof/aout.c#3 integrate .. //depot/projects/gdb/usr.bin/gprof/arcs.c#2 integrate .. //depot/projects/gdb/usr.bin/gprof/arm.c#2 delete .. //depot/projects/gdb/usr.bin/gprof/gprof.1#2 integrate .. //depot/projects/gdb/usr.bin/gprof/gprof.c#3 integrate .. //depot/projects/gdb/usr.bin/gprof/gprof.h#4 integrate .. //depot/projects/gdb/usr.bin/gprof/i386.c#2 delete .. //depot/projects/gdb/usr.bin/gprof/ia64.c#2 delete .. //depot/projects/gdb/usr.bin/gprof/sparc64.c#2 delete .. //depot/projects/gdb/usr.sbin/newsyslog/newsyslog.c#8 integrate .. //depot/projects/gdb/usr.sbin/zic/README#2 integrate .. //depot/projects/gdb/usr.sbin/zic/Theory#2 integrate .. //depot/projects/gdb/usr.sbin/zic/WWW.htm#2 delete .. //depot/projects/gdb/usr.sbin/zic/tz-art.htm#1 branch .. //depot/projects/gdb/usr.sbin/zic/tz-link.htm#1 branch Differences ... ==== //depot/projects/gdb/contrib/gdb/FREEBSD-Xlist#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/gdb/FREEBSD-Xlist,v 1.5 2002/10/12 21:33:49 mp Exp $ +$FreeBSD: src/contrib/gdb/FREEBSD-Xlist,v 1.6 2004/06/20 19:15:58 marcel Exp $ gdb-6.1.1/bfd/* gdb-6.1.1/config/* gdb-6.1.1/etc/* ==== //depot/projects/gdb/contrib/gdb/config-ml.in#5 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/MAINTAINERS#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/NEWS#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/PROBLEMS#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/README#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/TODO#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/acinclude.m4#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/aclocal.m4#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/alpha-tdep.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/alphabsd-nat.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/alphafbsd-tdep.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/annotate.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/arch-utils.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/arch-utils.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/arm-tdep.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/armnbsd-tdep.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/ax-gdb.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/ax-gdb.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/ax-general.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/bcache.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/bcache.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/blockframe.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/breakpoint.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/breakpoint.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/buildsym.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/buildsym.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/c-exp.y#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/c-lang.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/c-lang.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/c-typeprint.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/c-valprint.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/cli-out.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/cli-out.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/cli/cli-cmds.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/cli/cli-decode.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/cli/cli-decode.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/cli/cli-script.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/cli/cli-script.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/cli/cli-setshow.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/cli/cli-setshow.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/coffread.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/command.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/complaints.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/complaints.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/completer.c#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/completer.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/alpha/fbsd.mt#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nm-fbsd.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nm-osf.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/alpha/nm-osf2.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/alpha/tm-alpha.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/alpha/tm-fbsd.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/arm/nbsd.mt#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/arm/nm-nbsd.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/arm/tm-arm.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/arm/wince.mt#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/arm/xm-nbsd.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/fbsd.mh#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/fbsd.mt#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/go32.mh#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386aout.mt#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386gnu.mh#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386gnu.mt#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386lynx.mh#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386nw.mt#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386sol2.mh#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386sol2.mt#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386v.mt#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/i386v42mp.mh#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/nbsd.mt#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/nbsdelf.mh#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/ncr3000.mt#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-fbsd.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-go32.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386lynx.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386sco.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386sco5.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386sol2.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386v.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386v4.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-i386v42mp.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-nbsd.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/nm-obsd.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/obsd.mh#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/obsd.mt#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-fbsd.h#7 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-go32.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-i386.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-i386lynx.h#6 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/i386/tm-i386sol2.h#6 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 20 23:39:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6425816A4D0; Sun, 20 Jun 2004 23:39:37 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3739616A4CE for ; Sun, 20 Jun 2004 23:39:37 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2EB9343D5C for ; Sun, 20 Jun 2004 23:39:37 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5KNdbHf006390 for ; Sun, 20 Jun 2004 23:39:37 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5KNda7t006386 for perforce@freebsd.org; Sun, 20 Jun 2004 23:39:36 GMT (envelope-from marcel@freebsd.org) Date: Sun, 20 Jun 2004 23:39:36 GMT Message-Id: <200406202339.i5KNda7t006386@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 Subject: PERFORCE change 55421 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2004 23:39:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=55421 Change 55421 by marcel@marcel_nfs on 2004/06/20 23:39:34 Remove the gdb6 import under contrib/gdb6. The import has happened under contrib/gdb. No need to have a 50+ MB diff for bits that aren't going to be used. Affected files ... .. //depot/projects/gdb/contrib/gdb6/COPYING#2 delete .. //depot/projects/gdb/contrib/gdb6/COPYING.LIB#2 delete .. //depot/projects/gdb/contrib/gdb6/Makefile.def#2 delete .. //depot/projects/gdb/contrib/gdb6/Makefile.in#2 delete .. //depot/projects/gdb/contrib/gdb6/Makefile.tpl#2 delete .. //depot/projects/gdb/contrib/gdb6/README#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/COPYING#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ChangeLog#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ChangeLog-0001#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ChangeLog-0203#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ChangeLog-9193#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ChangeLog-9495#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ChangeLog-9697#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ChangeLog-9899#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/MAINTAINERS#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/Makefile.am#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/Makefile.in#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/PORTING#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/README#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/TODO#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/acinclude.m4#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/aclocal.m4#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/aix386-core.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/aix5ppc-core.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/aout-adobe.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/aout-arm.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/aout-cris.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/aout-encap.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/aout-ns32k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/aout-sparcle.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/aout-target.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/aout-tic30.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/aout0.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/aout32.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/aout64.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/aoutf1.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/aoutx.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/archive.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/archive64.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/archures.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/armnetbsd.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/bfd-in.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/bfd-in2.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/bfd.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/bfdio.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/bfdwin.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/binary.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/bout.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cache.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cf-i386lynx.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cf-m68klynx.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cf-sparclynx.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cisco-core.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-a29k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-alpha.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-apollo.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-arm.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-aux.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-go32.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-h8300.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-h8500.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-i386.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-i860.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-i960.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-ia64.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-m68k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-m88k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-mcore.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-mips.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-or32.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-pmac.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-ppc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-rs6000.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-sh.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-sparc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-stgo32.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-svm68k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-tic30.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-tic4x.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-tic54x.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-tic80.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-u68k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-w65.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-we32k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff-z8k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coff64-rs6000.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coffcode.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coffgen.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cofflink.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/coffswap.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/config.bfd#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/config.in#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/configure#3 delete .. //depot/projects/gdb/contrib/gdb6/bfd/configure.com#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/configure.host#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/configure.in#3 delete .. //depot/projects/gdb/contrib/gdb6/bfd/corefile.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-a29k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-alpha.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-arc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-arm.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-avr.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-cris.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-d10v.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-d30v.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-dlx.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-fr30.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-frv.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-h8300.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-h8500.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-hppa.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-i370.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-i386.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-i860.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-i960.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-ia64-opc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-ia64.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-ip2k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-iq2000.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-m10200.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-m10300.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-m32r.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-m68hc11.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-m68hc12.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-m68k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-m88k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-mcore.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-mips.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-mmix.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-msp430.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-ns32k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-openrisc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-or32.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-pdp11.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-pj.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-powerpc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-rs6000.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-s390.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-sh.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-sparc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-tic30.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-tic4x.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-tic54x.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-tic80.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-v850.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-vax.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-w65.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-we32k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-xstormy16.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-xtensa.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/cpu-z8k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/demo64.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/dep-in.sed#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/dwarf1.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/dwarf2.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ecoff.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ecofflink.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ecoffswap.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/efi-app-ia32.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/efi-app-ia64.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf-bfd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf-eh-frame.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf-hppa.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf-m10200.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf-m10300.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf-strtab.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-am33lin.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-arc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-arm.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-avr.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-cris.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-d10v.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-d30v.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-dlx.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-fr30.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-frv.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-gen.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-h8300.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-hppa.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-hppa.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-i370.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-i386.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-i860.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-i960.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-ip2k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-iq2000.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-m32r.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-m68hc11.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-m68hc12.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-m68hc1x.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-m68hc1x.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-m68k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-m88k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-mcore.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-mips.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-msp430.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-openrisc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-or32.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-pj.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-ppc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-ppc.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-s390.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-sh.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-sh64-com.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-sh64.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-sh64.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-sparc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-v850.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-vax.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-xstormy16.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32-xtensa.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf32.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf64-alpha.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf64-gen.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf64-hppa.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf64-hppa.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf64-mips.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf64-mmix.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf64-ppc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf64-ppc.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf64-s390.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf64-sh64.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf64-sparc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf64-x86-64.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elf64.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elfarm-nabi.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elfarm-oabi.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elfcode.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elfcore.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elflink.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elflink.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elfn32-mips.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elfxx-ia64.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elfxx-mips.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elfxx-mips.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/elfxx-target.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/epoc-pe-arm.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/epoc-pei-arm.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/format.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/freebsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/gen-aout.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/genlink.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/go32stub.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hash.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/host-aout.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/alphalinux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/alphavms.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/decstation.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/delta68.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/dpx2.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/hp300bsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/i386bsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/i386linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/i386mach3.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/i386sco.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/i860mach3.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/m68kaux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/m68klinux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/m88kmach3.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/mipsbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/mipsmach3.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/news-mips.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/news.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/pc532mach.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/riscos.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/symmetry.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/tahoe.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/vaxbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/vaxult.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hosts/vaxult2.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hp300bsd.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hp300hpux.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hppabsd-core.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/hpux-core.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/i386aout.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/i386bsd.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/i386dynix.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/i386freebsd.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/i386linux.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/i386lynx.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/i386mach3.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/i386msdos.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/i386netbsd.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/i386os9k.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ieee.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ihex.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/init.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/irix-core.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/libaout.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/libbfd-in.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/libbfd.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/libbfd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/libcoff-in.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/libcoff.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/libecoff.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/libhppa.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/libieee.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/libnlm.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/liboasys.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/libpei.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/libxcoff.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/linker.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/lynx-core.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/m68k4knetbsd.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/m68klinux.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/m68klynx.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/m68knetbsd.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/m88kmach3.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/mach-o-target.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/mach-o.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/mach-o.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/makefile.vms#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/merge.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/mipsbsd.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/mmo.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/mpw-config.in#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/mpw-make.sed#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/netbsd-core.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/netbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/newsos3.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/nlm-target.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/nlm.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/nlm32-alpha.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/nlm32-i386.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/nlm32-ppc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/nlm32-sparc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/nlm32.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/nlm64.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/nlmcode.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/nlmswap.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ns32k.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ns32knetbsd.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/oasys.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/opncls.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/osf-core.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pc532-mach.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pdp11.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pe-arm.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pe-i386.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pe-mcore.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pe-mips.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pe-ppc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pe-sh.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/peXXigen.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pef-traceback.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pef.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pef.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pei-arm.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pei-i386.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pei-mcore.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pei-mips.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pei-ppc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/pei-sh.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/peicode.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ppcboot.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ptrace-core.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/reloc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/reloc16.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/riscix.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/rs6000-core.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/sco5-core.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/section.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/simple.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/som.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/som.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/sparclinux.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/sparclynx.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/sparcnetbsd.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/srec.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/stab-syms.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/stabs.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/stamp-h.in#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/sunos.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/syms.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/sysdep.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/targets.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/targmatch.sed#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/tekhex.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/ticoff.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/trad-core.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/vax1knetbsd.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/vaxbsd.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/vaxnetbsd.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/versados.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/version.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/vms-gsd.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/vms-hdr.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/vms-misc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/vms-tir.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/vms.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/vms.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/xcoff-target.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/xcofflink.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/xsym.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/xsym.h#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/xtensa-isa.c#2 delete .. //depot/projects/gdb/contrib/gdb6/bfd/xtensa-modules.c#2 delete .. //depot/projects/gdb/contrib/gdb6/config-ml.in#2 delete .. //depot/projects/gdb/contrib/gdb6/config.guess#2 delete .. //depot/projects/gdb/contrib/gdb6/config.if#2 delete .. //depot/projects/gdb/contrib/gdb6/config.sub#2 delete .. //depot/projects/gdb/contrib/gdb6/configure#2 delete .. //depot/projects/gdb/contrib/gdb6/configure.in#2 delete .. //depot/projects/gdb/contrib/gdb6/djunpack.bat#3 delete .. //depot/projects/gdb/contrib/gdb6/gdb/CONTRIBUTE#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/COPYING#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ChangeLog#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ChangeLog-1990#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ChangeLog-1991#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ChangeLog-1992#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ChangeLog-1993#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ChangeLog-1994#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ChangeLog-1995#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ChangeLog-1996#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ChangeLog-1997#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ChangeLog-1998#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ChangeLog-1999#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ChangeLog-2000#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ChangeLog-2001#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ChangeLog-2002#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ChangeLog-2003#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ChangeLog-3.x#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/MAINTAINERS#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/Makefile.in#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/NEWS#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/PROBLEMS#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/README#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/TODO#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/abug-rom.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/acconfig.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/acinclude.m4#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/aclocal.m4#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ada-exp.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ada-exp.y#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ada-lang.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ada-lang.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ada-lex.l#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ada-tasks.c#3 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ada-typeprint.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ada-valprint.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/aix-thread.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/alpha-linux-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/alpha-mdebug-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/alpha-nat.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/alpha-osf1-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/alpha-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/alpha-tdep.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/alphabsd-nat.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/alphabsd-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/alphabsd-tdep.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/alphafbsd-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/alphanbsd-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/amd64-linux-nat.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/amd64-linux-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/amd64-linux-tdep.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/amd64-nat.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/amd64-nat.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/amd64-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/amd64-tdep.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/amd64bsd-nat.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/amd64fbsd-nat.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/amd64fbsd-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/amd64nbsd-nat.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/amd64nbsd-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/amd64obsd-nat.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/amd64obsd-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/annotate.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/annotate.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/arch-utils.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/arch-utils.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/arm-linux-nat.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/arm-linux-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/arm-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/arm-tdep.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/armnbsd-nat.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/armnbsd-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/auxv.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/auxv.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/avr-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ax-gdb.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ax-gdb.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ax-general.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/ax.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/bcache.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/bcache.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/bfd-target.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/bfd-target.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/block.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/block.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/blockframe.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/breakpoint.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/breakpoint.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/buildsym.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/buildsym.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/c-exp.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/c-exp.y#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/c-lang.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/c-lang.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/c-typeprint.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/c-valprint.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/call-cmds.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/charset.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/charset.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cli-out.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cli-out.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cli/cli-cmds.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cli/cli-cmds.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cli/cli-decode.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cli/cli-decode.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cli/cli-dump.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cli/cli-dump.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cli/cli-interp.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cli/cli-logging.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cli/cli-script.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cli/cli-script.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cli/cli-setshow.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cli/cli-setshow.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cli/cli-utils.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cli/cli-utils.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/coff-pe-read.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/coff-pe-read.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/coff-solib.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/coff-solib.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/coffread.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/command.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/complaints.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/complaints.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/completer.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/completer.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config.in#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/alpha-linux.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/alpha-linux.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/alpha-osf1.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/alpha-osf1.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/alpha-osf2.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/alpha-osf3.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/alpha.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/fbsd.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/fbsd.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/nbsd.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/nbsd.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/nm-fbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/nm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/nm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/nm-osf.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/nm-osf2.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/nm-osf3.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/tm-alpha.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/tm-alphalinux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/tm-fbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/tm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/xm-alphalinux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/alpha/xm-alphaosf.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/embed.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/linux.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/linux.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/nbsd.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/nbsdaout.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/nbsdelf.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/nm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/nm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/nm-nbsdaout.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/tm-arm.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/tm-embed.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/tm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/tm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/tm-wince.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/wince.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/xm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/arm/xm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/avr/avr.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/cris/cris.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/cris/tm-cris.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/d10v/d10v.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/djgpp/README#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/djgpp/config.sed#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/djgpp/djcheck.sh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/djgpp/djconfig.sh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/djgpp/fnchange.lst#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/frv/frv.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/frv/tm-frv.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/h8300/h8300.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/h8300/tm-h8300.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/cygwin.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/cygwin.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/embed.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/fbsd.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/fbsd.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/fbsd64.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/fbsd64.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/go32.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/go32.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/i386aout.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/i386gnu.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/i386gnu.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/i386lynx.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/i386lynx.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/i386nw.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/i386sco.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/i386sco4.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/i386sco5.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/i386sol2.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/i386sol2.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/i386v.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/i386v.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/i386v4.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/i386v42mp.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/interix.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/interix.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/linux.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/linux.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/linux64.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/linux64.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nbsd.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nbsd64.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nbsd64.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nbsdaout.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nbsdelf.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/ncr3000.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/ncr3000.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-cygwin.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-fbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-fbsd64.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-go32.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-i386.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-i386gnu.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-i386lynx.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-i386sco.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-i386sco4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-i386sco5.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-i386sol2.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-i386v.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-i386v4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-i386v42mp.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-interix.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-linux64.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-nbsdaout.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-nto.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nm-obsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nto.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/nto.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/obsd.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/obsd.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/obsd64.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/obsd64.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/obsdaout.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/tm-cygwin.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/tm-fbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/tm-go32.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/tm-i386.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/tm-i386lynx.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/tm-i386sol2.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/tm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/tm-linux64.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/tm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/tm-nto.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/tm-vxworks.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/vxworks.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/xm-cygwin.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/xm-go32.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/xm-i386.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/xm-i386sco.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/xm-i386v.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/xm-i386v4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/i386/xm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ia64/aix.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ia64/aix.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ia64/fbsd.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ia64/fbsd.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ia64/ia64.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ia64/linux.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ia64/linux.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ia64/nm-aix.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ia64/nm-fbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ia64/nm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ia64/tm-aix.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ia64/tm-fbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ia64/tm-ia64.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ia64/tm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ia64/xm-aix.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ia64/xm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m32r/m32r.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68hc11/m68hc11.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/3b1.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/3b1.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/cisco.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/delta68.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/delta68.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/dpx2.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/dpx2.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/linux.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/linux.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/m68klynx.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/m68klynx.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/m68kv4.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/m68kv4.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/monitor.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/nbsdaout.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/nbsdaout.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/nm-delta68.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/nm-dpx2.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/nm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/nm-m68klynx.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/nm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/nm-nbsdaout.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/nm-sun2.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/nm-sun3.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/nm-sysv4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/os68k.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/st2000.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/sun2os3.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/sun2os3.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/sun2os4.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/sun2os4.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/sun3os3.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/sun3os3.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/sun3os4.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/sun3os4.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-3b1.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-cisco.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-delta68.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-dpx2.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-m68k.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-m68klynx.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-m68kv4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-monitor.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-os68k.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-st2000.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-sun2.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-sun2os4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-sun3.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-sun3os4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/tm-vx68.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/vxworks68.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/xm-3b1.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/xm-delta68.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/xm-dpx2.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/xm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/xm-m68k.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/xm-m68kv4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/xm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/xm-sun2.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/xm-sun3.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/m68k/xm-sun3os4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mcore/mcore.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/decstation.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/embed.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/irix5.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/irix5.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/irix6.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/irix6.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/linux.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/linux.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/littlemips.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/mipsv4.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/mipsv4.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/nbsd.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/nbsd.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/news-mips.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/nm-irix5.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/nm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/nm-mips.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/nm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/nm-news-mips.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/nm-riscos.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/riscos.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/tm-irix5.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/tm-irix6.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/tm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/tm-mips.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/tm-mipsv4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/tm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/tm-vxmips.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/tm-wince.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/vxmips.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/wince.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/xm-irix5.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/xm-mips.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/xm-mipsv4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mips/xm-riscos.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/mn10300/mn10300.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/nm-gnu.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/nm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/nm-lynx.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/nm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/nm-nbsdaout.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/nm-sysv4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ns32k/nbsdaout.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ns32k/nbsdaout.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ns32k/nm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ns32k/nm-nbsdaout.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ns32k/tm-ns32k.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/ns32k/xm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/pa/hppa.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/pa/hppa64.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/pa/hppahpux.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/pa/hppahpux.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/pa/hpux1020.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/pa/hpux11.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/pa/hpux11w.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/pa/nm-hppah.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/pa/nm-hppah11.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/pa/tm-hppa.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/pa/tm-hppa64.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/pa/tm-hppah.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/pa/xm-hppah.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/aix.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/aix.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/aix432.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/linux.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/linux.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/nbsd.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/nbsd.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/nm-aix.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/nm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/nm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/nm-ppc64-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/ppc-eabi.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/ppc-sim.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/ppc64-linux.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/tm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/tm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/tm-ppc-aix.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/tm-ppc-eabi.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/tm-ppcle-eabi.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/tm-ppcle-sim.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/tm-vxworks.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/vxworks.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/xm-aix.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/powerpc/xm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/rs6000/aix4.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/rs6000/aix4.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/rs6000/nm-rs6000.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/rs6000/nm-rs6000ly.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/rs6000/rs6000.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/rs6000/rs6000.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/rs6000/rs6000lynx.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/rs6000/rs6000lynx.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/rs6000/tm-rs6000-aix4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/rs6000/tm-rs6000.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/rs6000/tm-rs6000ly.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/rs6000/xm-aix4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/rs6000/xm-rs6000.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/s390/nm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/s390/s390.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/s390/s390.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/s390/tm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sh/embed.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sh/linux.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sh/nbsd.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sh/nbsd.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sh/nm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sh/tm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sh/tm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sh/tm-sh.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sh/tm-wince.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sh/wince.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/fbsd.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/fbsd.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/linux.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/linux.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/linux64.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/linux64.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/nbsd.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/nbsd64.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/nbsd64.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/nbsdaout.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/nbsdelf.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/nm-fbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/nm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/nm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/nm-nbsdaout.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/nm-sol2.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/obsd.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/obsd64.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/sol2-64.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/sol2.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/sol2.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/sparc.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/sparc64.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/tm-fbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/tm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/tm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/tm-nbsd64.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/tm-sol2.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/tm-vxworks.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/sparc/vxworks.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/tm-linux.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/tm-lynx.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/tm-nto.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/tm-sunos.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/tm-sysv4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/tm-vxworks.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/v850/v850.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/vax/nm-vax.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/vax/tm-vaxbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/vax/vax.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/vax/vaxbsd.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/vax/vaxult.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/vax/vaxult2.mh#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/vax/xm-vax.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/vax/xm-vaxbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/vax/xm-vaxult.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/vax/xm-vaxult2.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/xm-aix4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/xm-nbsd.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/xm-sysv4.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/config/xstormy16/xstormy16.mt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/configure#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/configure.host#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/configure.in#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/configure.tgt#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/copying.awk#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/copying.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/core-aout.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/core-regset.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/corefile.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/corelow.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cp-abi.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cp-abi.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cp-namespace.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cp-support.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cp-support.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cp-valprint.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cpu32bug-rom.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/cris-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/d10v-tdep.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dbug-rom.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dbxread.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dcache.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dcache.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/defs.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/delta68-nat.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/demangle.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dictionary.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dictionary.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dink32-rom.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/disasm.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/disasm.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/ChangeLog#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/GDBvn.texi#3 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/LRS#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/Makefile.in#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/a4rc.sed#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/agentexpr.texi#3 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/all-cfg.texi#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/annotate.info#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/annotate.texinfo#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/configure#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/configure.in#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/fdl.texi#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/gdb.info#3 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/gdb.info-1#3 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/gdb.info-2#3 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/gdb.info-3#3 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/gdb.texinfo#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/gdbint.info#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/gdbint.texinfo#3 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/gpl.texi#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/lpsrc.sed#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/observer.texi#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/psrc.sed#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/refcard.tex#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/stabs.info#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doc/stabs.texinfo#3 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doublest.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/doublest.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dpx2-nat.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dsrec.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dummy-frame.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dummy-frame.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dve3900-rom.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dwarf2-frame.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dwarf2-frame.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dwarf2expr.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dwarf2expr.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dwarf2loc.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dwarf2loc.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dwarf2read.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/dwarfread.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/elfread.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/environ.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/environ.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/eval.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/event-loop.c#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/event-loop.h#2 delete .. //depot/projects/gdb/contrib/gdb6/gdb/event-top.c#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 21 00:59:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D32116A4D0; Mon, 21 Jun 2004 00:59:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 12FF516A4CE for ; Mon, 21 Jun 2004 00:59:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B3E443D1D for ; Mon, 21 Jun 2004 00:59:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5L0xH57030951 for ; Mon, 21 Jun 2004 00:59:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5L0xF7f030948 for perforce@freebsd.org; Mon, 21 Jun 2004 00:59:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 21 Jun 2004 00:59:15 GMT Message-Id: <200406210059.i5L0xF7f030948@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 Subject: PERFORCE change 55426 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2004 00:59:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=55426 Change 55426 by rwatson@rwatson_paprika on 2004/06/21 00:59:02 Integrate netperf_socket: - Loop back a number of locking annotations from rwatson_netperf. - Loop back a conversion of if->panic to KASSERT. - Loop back locking of SO_LINGER socket option. - Loop back removal of Giant from ip_mroute.c code around sockets. - Loop back assertion of inpcb lock for MAC in tcp_input(). - Loop back SOCK_LOCK(so) around so_state frobbing in UNIX domain sockets. - Loop back locking of socket locks in uipc_rcvd(). - Loop back conditional CALLOUT_MPSAFE for TCP timers. - Loop back soabort() locking and queueing changes in SPX. - Loop back annotation of NET_{LOCK,UNLOCK}_GIANT() in mutex.h - Loop back socket buffer locking reformulations of socket buffer wakeup, release, flush, cant{send,rcv}, append, and more. Affected files ... .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#16 integrate .. //depot/projects/netperf_socket/sys/conf/ldscript.ia64#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/kern_proc.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/sys_socket.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#21 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#18 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#15 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/netperf_socket/sys/modules/zlib/Makefile#1 branch .. //depot/projects/netperf_socket/sys/net/zlib.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_fec.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#9 integrate .. //depot/projects/netperf_socket/sys/netipx/spx_usrreq.c#6 integrate .. //depot/projects/netperf_socket/sys/netkey/keysock.c#2 integrate .. //depot/projects/netperf_socket/sys/sys/mutex.h#6 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#17 integrate .. //depot/projects/netperf_socket/sys/sys/user.h#7 integrate Differences ... ==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#16 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.477 2004/06/20 06:10:59 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.478 2004/06/20 20:57:05 alc Exp $"); /* * Manages physical address maps. @@ -2461,7 +2461,7 @@ #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else - pte = pmap_pte(pv->pv_pmap, pv->pv_va); + pte = pmap_pte(pmap, pv->pv_va); #endif tpte = *pte; @@ -2487,7 +2487,7 @@ KASSERT(m < &vm_page_array[vm_page_array_size], ("pmap_remove_pages: bad tpte %#jx", (uintmax_t)tpte)); - pv->pv_pmap->pm_stats.resident_count--; + pmap->pm_stats.resident_count--; pte_clear(pte); @@ -2499,15 +2499,14 @@ } npv = TAILQ_NEXT(pv, pv_plist); - TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); + TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_FIRST(&m->md.pv_list) == NULL) { + if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - } - pmap_unuse_pt(pv->pv_pmap, pv->pv_va, pv->pv_ptem); + pmap_unuse_pt(pmap, pv->pv_va, pv->pv_ptem); free_pv_entry(pv); } pmap_invalidate_all(pmap); @@ -2525,9 +2524,11 @@ { pv_entry_t pv; pt_entry_t *pte; + boolean_t rv; + rv = FALSE; if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) - return FALSE; + return (rv); mtx_assert(&vm_page_queue_mtx, MA_OWNED); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { @@ -2546,13 +2547,12 @@ #endif PMAP_LOCK(pv->pv_pmap); pte = pmap_pte(pv->pv_pmap, pv->pv_va); - if (*pte & PG_M) { - PMAP_UNLOCK(pv->pv_pmap); - return TRUE; - } + rv = (*pte & PG_M) != 0; PMAP_UNLOCK(pv->pv_pmap); + if (rv) + break; } - return (FALSE); + return (rv); } /* ==== //depot/projects/netperf_socket/sys/conf/ldscript.ia64#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.10 2003/09/06 05:15:36 marcel Exp $ */ +/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.11 2004/06/20 22:32:19 marcel Exp $ */ OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") OUTPUT_ARCH(ia64) ENTRY(__start) @@ -74,6 +74,8 @@ *(.dtors) *(SORT(.dtors.*)) } + . = ALIGN(16); + __gp = . + 0x200000; .got : { *(.got.plt) *(.got) } .IA_64.pltoff : { *(.IA_64.pltoff) } /* We want the small data sections together, so single-instruction offsets ==== //depot/projects/netperf_socket/sys/i386/i386/pmap.c#12 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.475 2004/06/20 06:11:00 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.476 2004/06/20 20:57:06 alc Exp $"); /* * Manages physical address maps. @@ -2533,7 +2533,7 @@ #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else - pte = pmap_pte_quick(pv->pv_pmap, pv->pv_va); + pte = pmap_pte_quick(pmap, pv->pv_va); #endif tpte = *pte; @@ -2559,7 +2559,7 @@ KASSERT(m < &vm_page_array[vm_page_array_size], ("pmap_remove_pages: bad tpte %#jx", (uintmax_t)tpte)); - pv->pv_pmap->pm_stats.resident_count--; + pmap->pm_stats.resident_count--; pte_clear(pte); @@ -2571,15 +2571,14 @@ } npv = TAILQ_NEXT(pv, pv_plist); - TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); + TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_FIRST(&m->md.pv_list) == NULL) { + if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - } - pmap_unuse_pt(pv->pv_pmap, pv->pv_va, pv->pv_ptem); + pmap_unuse_pt(pmap, pv->pv_va, pv->pv_ptem); free_pv_entry(pv); } sched_unpin(); @@ -2598,9 +2597,11 @@ { pv_entry_t pv; pt_entry_t *pte; + boolean_t rv; + rv = FALSE; if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) - return FALSE; + return (rv); sched_pin(); mtx_assert(&vm_page_queue_mtx, MA_OWNED); @@ -2620,15 +2621,13 @@ #endif PMAP_LOCK(pv->pv_pmap); pte = pmap_pte_quick(pv->pv_pmap, pv->pv_va); - if (*pte & PG_M) { - sched_unpin(); - PMAP_UNLOCK(pv->pv_pmap); - return TRUE; - } + rv = (*pte & PG_M) != 0; PMAP_UNLOCK(pv->pv_pmap); + if (rv) + break; } sched_unpin(); - return (FALSE); + return (rv); } /* ==== //depot/projects/netperf_socket/sys/kern/kern_proc.c#11 (text+ko) ==== @@ -27,11 +27,11 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.7 (Berkeley) 2/14/95 - * $FreeBSD: src/sys/kern/kern_proc.c,v 1.210 2004/06/20 02:03:33 gad Exp $ + * $FreeBSD: src/sys/kern/kern_proc.c,v 1.211 2004/06/20 22:17:22 gad Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.210 2004/06/20 02:03:33 gad Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.211 2004/06/20 22:17:22 gad Exp $"); #include "opt_ktrace.h" #include "opt_kstack_pages.h" @@ -763,6 +763,8 @@ kp->ki_lastcpu = td->td_lastcpu; kp->ki_oncpu = td->td_oncpu; kp->ki_tdflags = td->td_flags; + kp->ki_tid = td->td_tid; + kp->ki_numthreads = p->p_numthreads; kp->ki_pcb = td->td_pcb; kp->ki_kstack = (void *)td->td_kstack; kp->ki_pctcpu = sched_pctcpu(td); ==== //depot/projects/netperf_socket/sys/kern/sys_socket.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sys_socket.c,v 1.60 2004/06/17 22:48:09 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sys_socket.c,v 1.61 2004/06/20 17:35:50 rwatson Exp $"); #include "opt_mac.h" @@ -170,6 +170,7 @@ return (0); case FIONREAD: + /* Unlocked read. */ *(int *)data = so->so_rcv.sb_cc; return (0); @@ -188,6 +189,7 @@ return (0); case SIOCATMARK: + /* Unlocked read. */ *(int *)data = (so->so_rcv.sb_state & SBS_RCVATMARK) != 0; return (0); } @@ -229,7 +231,11 @@ /* * If SBS_CANTRCVMORE is set, but there's still data left in the * receive buffer, the socket is still readable. + * + * XXXRW: perhaps should lock socket buffer so st_size result + * is consistent. */ + /* Unlocked read. */ if ((so->so_rcv.sb_state & SBS_CANTRCVMORE) == 0 || so->so_rcv.sb_cc != 0) ub->st_mode |= S_IRUSR | S_IRGRP | S_IROTH; ==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#21 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.182 2004/06/19 03:23:14 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.186 2004/06/21 00:20:42 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -265,6 +265,11 @@ { int s, error; + /* + * XXXRW: Ordering issue here -- perhaps we need to set + * SO_ACCEPTCONN before the call to pru_listen()? + * XXXRW: General atomic test-and-set concerns here also. + */ s = splnet(); if (so->so_state & (SS_ISCONNECTED | SS_ISCONNECTING | SS_ISDISCONNECTING)) { @@ -343,9 +348,15 @@ SOCKBUF_LOCK(&so->so_snd); so->so_snd.sb_flags |= SB_NOINTR; (void)sblock(&so->so_snd, M_WAITOK); + /* + * socantsendmore_locked() drops the socket buffer mutex so that it + * can safely perform wakeups. Re-acquire the mutex before + * continuing. + */ socantsendmore_locked(so); + SOCKBUF_LOCK(&so->so_snd); sbunlock(&so->so_snd); - sbrelease(&so->so_snd, so); + sbrelease_locked(&so->so_snd, so); SOCKBUF_UNLOCK(&so->so_snd); sorflush(so); sodealloc(so); @@ -425,8 +436,7 @@ } discard: SOCK_LOCK(so); - if (so->so_state & SS_NOFDREF) - panic("soclose: NOFDREF"); + KASSERT((so->so_state & SS_NOFDREF) == 0, ("soclose: NOFDREF")); so->so_state |= SS_NOFDREF; sorele(so); splx(s); @@ -1216,7 +1226,7 @@ flags |= MSG_TRUNC; if ((flags & MSG_PEEK) == 0) { SOCKBUF_LOCK_ASSERT(&so->so_rcv); - (void) sbdroprecord(&so->so_rcv); + (void) sbdroprecord_locked(&so->so_rcv); } } if ((flags & MSG_PEEK) == 0) { @@ -1281,23 +1291,41 @@ struct protosw *pr = so->so_proto; struct sockbuf asb; + /* + * XXXRW: This is quite ugly. The existing code made a copy of the + * socket buffer, then zero'd the original to clear the buffer + * fields. However, with mutexes in the socket buffer, this causes + * problems. We only clear the zeroable bits of the original; + * however, we have to initialize and destroy the mutex in the copy + * so that dom_dispose() and sbrelease() can lock t as needed. + */ SOCKBUF_LOCK(sb); sb->sb_flags |= SB_NOINTR; (void) sblock(sb, M_WAITOK); + /* + * socantrcvmore_locked() drops the socket buffer mutex so that it + * can safely perform wakeups. Re-acquire the mutex before + * continuing. + */ socantrcvmore_locked(so); + SOCKBUF_LOCK(sb); sbunlock(sb); - asb = *sb; /* * Invalidate/clear most of the sockbuf structure, but leave * selinfo and mutex data unchanged. */ + bzero(&asb, offsetof(struct sockbuf, sb_startzero)); + bcopy(&sb->sb_startzero, &asb.sb_startzero, + sizeof(*sb) - offsetof(struct sockbuf, sb_startzero)); bzero(&sb->sb_startzero, sizeof(*sb) - offsetof(struct sockbuf, sb_startzero)); SOCKBUF_UNLOCK(sb); + SOCKBUF_LOCK_INIT(&asb, "so_rcv"); if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose != NULL) (*pr->pr_domain->dom_dispose)(asb.sb_mb); sbrelease(&asb, so); + SOCKBUF_LOCK_DESTROY(&asb); } #ifdef INET @@ -1652,8 +1680,15 @@ #endif case SO_LINGER: + /* + * XXXRW: We grab the lock here to get a consistent + * snapshot of both fields. This may not really + * be necessary. + */ + SOCK_LOCK(so); l.l_onoff = so->so_options & SO_LINGER; l.l_linger = so->so_linger; + SOCK_UNLOCK(so); error = sooptcopyout(sopt, &l, sizeof l); break; ==== //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#18 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.133 2004/06/19 03:23:14 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.134 2004/06/21 00:20:42 rwatson Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -199,9 +199,9 @@ SOCKBUF_UNLOCK(&so->so_rcv); SOCKBUF_LOCK(&so->so_snd); so->so_snd.sb_state |= SBS_CANTSENDMORE; + sbdrop_locked(&so->so_snd, so->so_snd.sb_cc); SOCKBUF_UNLOCK(&so->so_snd); wakeup(&so->so_timeo); - sbdrop(&so->so_snd, so->so_snd.sb_cc); sowwakeup(so); sorwakeup(so); } @@ -299,14 +299,38 @@ * protocol when it detects that the peer will send no more data. * Data queued for reading in the socket may yet be read. */ +void +socantsendmore_locked(so) + struct socket *so; +{ + + SOCKBUF_LOCK_ASSERT(&so->so_snd); + + so->so_snd.sb_state |= SBS_CANTSENDMORE; + sowwakeup_locked(so); + mtx_assert(SOCKBUF_MTX(&so->so_snd), MA_NOTOWNED); +} void socantsendmore(so) struct socket *so; { - so->so_snd.sb_state |= SBS_CANTSENDMORE; - sowwakeup(so); + SOCKBUF_LOCK(&so->so_snd); + socantsendmore_locked(so); + mtx_assert(SOCKBUF_MTX(&so->so_snd), MA_NOTOWNED); +} + +void +socantrcvmore_locked(so) + struct socket *so; +{ + + SOCKBUF_LOCK_ASSERT(&so->so_rcv); + + so->so_rcv.sb_state |= SBS_CANTRCVMORE; + sorwakeup_locked(so); + mtx_assert(SOCKBUF_MTX(&so->so_rcv), MA_NOTOWNED); } void @@ -324,8 +348,9 @@ struct socket *so; { - so->so_rcv.sb_state |= SBS_CANTRCVMORE; - sorwakeup(so); + SOCKBUF_LOCK(&so->so_rcv); + socantrcvmore_locked(so); + mtx_assert(SOCKBUF_MTX(&so->so_rcv), MA_NOTOWNED); } void @@ -380,29 +405,16 @@ } /* - * The part of sowakeup that must be done while - * holding the sockbuf lock. - */ -static __inline void -sowakeup_under_lock(struct socket *so, struct sockbuf *sb) -{ - SOCKBUF_LOCK_ASSERT(sb); - - selwakeuppri(&sb->sb_sel, PSOCK); - sb->sb_flags &= ~SB_SEL; - if (sb->sb_flags & SB_WAIT) { - sb->sb_flags &= ~SB_WAIT; - wakeup(&sb->sb_cc); - } -} - -/* - * Wakeup processes waiting on a socket buffer. - * Do asynchronous notification via SIGIO - * if the socket has the SS_ASYNC flag set. + * Wakeup processes waiting on a socket buffer. Do asynchronous + * notification via SIGIO if the socket has the SS_ASYNC flag set. * - * The caller is assumed to hold the necessary - * sockbuf lock. + * Called with the socket buffer lock held; will release the lock by the end + * of the function. This allows the caller to acquire the socket buffer lock + * while testing for the need for various sorts of wakeup and hold it through + * to the point where it's no longer required. We currently hold the lock + * through calls out to other subsystems (with the exception of kqueue), and + * then release it to avoid lock order issues. It's not clear that's + * correct. */ void sowakeup_locked(so, sb) @@ -434,17 +446,23 @@ register struct sockbuf *sb; { - SOCKBUF_LOCK(sb); - sowakeup_under_lock(so, sb); + SOCKBUF_LOCK_ASSERT(sb); + + selwakeuppri(&sb->sb_sel, PSOCK); + sb->sb_flags &= ~SB_SEL; + if (sb->sb_flags & SB_WAIT) { + sb->sb_flags &= ~SB_WAIT; + wakeup(&sb->sb_cc); + } + KNOTE(&sb->sb_sel.si_note, 0); SOCKBUF_UNLOCK(sb); - if ((so->so_state & SS_ASYNC) && so->so_sigio != NULL) pgsigio(&so->so_sigio, SIGIO, 0); if (sb->sb_flags & SB_UPCALL) (*so->so_upcall)(so, so->so_upcallarg, M_DONTWAIT); if (sb->sb_flags & SB_AIO) /* XXX locking */ aio_swake(so, sb); - KNOTE(&sb->sb_sel.si_note, 0); /* XXX locking? */ + mtx_assert(SOCKBUF_MTX(sb), MA_NOTOWNED); } /* @@ -566,17 +584,29 @@ * Free mbufs held by a socket, and reserved mbuf space. */ void -sbrelease(sb, so) +sbrelease_locked(sb, so) struct sockbuf *sb; struct socket *so; { - sbflush(sb); + SOCKBUF_LOCK_ASSERT(sb); + + sbflush_locked(sb); (void)chgsbsize(so->so_cred->cr_uidinfo, &sb->sb_hiwat, 0, RLIM_INFINITY); sb->sb_mbmax = 0; } +void +sbrelease(sb, so) + struct sockbuf *sb; + struct socket *so; +{ + + SOCKBUF_LOCK(sb); + sbrelease_locked(sb, so); + SOCKBUF_UNLOCK(sb); +} /* * Routines to add and remove * data from an mbuf queue. @@ -653,6 +683,7 @@ #endif /* SOCKBUF_DEBUG */ #define SBLINKRECORD(sb, m0) do { \ + SOCKBUF_LOCK_ASSERT(sb); \ if ((sb)->sb_lastrecord != NULL) \ (sb)->sb_lastrecord->m_nextpkt = (m0); \ else \ @@ -673,11 +704,11 @@ { register struct mbuf *n; + SOCKBUF_LOCK_ASSERT(sb); + if (m == 0) return; - SOCKBUF_LOCK_ASSERT(sb); - SBLASTRECORDCHK(sb); n = sb->sb_mb; if (n) { @@ -725,12 +756,10 @@ struct sockbuf *sb; struct mbuf *m; { - if (!SOCKBUF_OWNED(sb)) { - SOCKBUF_LOCK(sb); - sbappend_locked(sb, m); - SOCKBUF_UNLOCK(sb); - } else - sbappend_locked(sb, m); + + SOCKBUF_LOCK(sb); + sbappend_locked(sb, m); + SOCKBUF_UNLOCK(sb); } /* @@ -762,12 +791,10 @@ void sbappendstream(struct sockbuf *sb, struct mbuf *m) { - if (!SOCKBUF_OWNED(sb)) { - SOCKBUF_LOCK(sb); - sbappendstream_locked(sb, m); - SOCKBUF_UNLOCK(sb); - } else - sbappendstream_locked(sb, m); + + SOCKBUF_LOCK(sb); + sbappendstream_locked(sb, m); + SOCKBUF_UNLOCK(sb); } #ifdef SOCKBUF_DEBUG @@ -846,12 +873,10 @@ register struct sockbuf *sb; register struct mbuf *m0; { - if (!SOCKBUF_OWNED(sb)) { - SOCKBUF_LOCK(sb); - sbappendrecord_locked(sb, m0); - SOCKBUF_UNLOCK(sb); - } else - sbappendrecord_locked(sb, m0); + + SOCKBUF_LOCK(sb); + sbappendrecord_locked(sb, m0); + SOCKBUF_UNLOCK(sb); } /* @@ -912,12 +937,10 @@ register struct sockbuf *sb; register struct mbuf *m0; { - if (!SOCKBUF_OWNED(sb)) { - SOCKBUF_LOCK(sb); - sbinsertoob_locked(sb, m0); - SOCKBUF_UNLOCK(sb); - } else - sbinsertoob_locked(sb, m0); + + SOCKBUF_LOCK(sb); + sbinsertoob_locked(sb, m0); + SOCKBUF_UNLOCK(sb); } /* @@ -938,7 +961,7 @@ SOCKBUF_LOCK_ASSERT(sb); if (m0 && (m0->m_flags & M_PKTHDR) == 0) - panic("sbappendaddr"); + panic("sbappendaddr_locked"); if (m0) space += m0->m_pkthdr.len; space += m_length(control, &n); @@ -980,17 +1003,14 @@ int sbappendaddr(sb, asa, m0, control) struct sockbuf *sb; - struct sockaddr *asa; + const struct sockaddr *asa; struct mbuf *m0, *control; { int retval; - if (!SOCKBUF_OWNED(sb)) { - SOCKBUF_LOCK(sb); - retval = sbappendaddr_locked(sb, asa, m0, control); - SOCKBUF_UNLOCK(sb); - } else - retval = sbappendaddr_locked(sb, asa, m0, control); + SOCKBUF_LOCK(sb); + retval = sbappendaddr_locked(sb, asa, m0, control); + SOCKBUF_UNLOCK(sb); return (retval); } @@ -1005,7 +1025,7 @@ SOCKBUF_LOCK_ASSERT(sb); if (control == 0) - panic("sbappendcontrol"); + panic("sbappendcontrol_locked"); space = m_length(control, &n) + m_length(m0, NULL); if (space > sbspace(sb)) @@ -1034,12 +1054,9 @@ { int retval; - if (!SOCKBUF_OWNED(sb)) { - SOCKBUF_LOCK(sb); - retval = sbappendcontrol(sb, m0, control); - SOCKBUF_UNLOCK(sb); - } else - retval = sbappendcontrol(sb, m0, control); + SOCKBUF_LOCK(sb); + retval = sbappendcontrol_locked(sb, m0, control); + SOCKBUF_UNLOCK(sb); return (retval); } @@ -1110,12 +1127,14 @@ * Check that all resources are reclaimed. */ void -sbflush(sb) +sbflush_locked(sb) register struct sockbuf *sb; { + SOCKBUF_LOCK_ASSERT(sb); + if (sb->sb_flags & SB_LOCK) - panic("sbflush: locked"); + panic("sbflush_locked: locked"); while (sb->sb_mbcnt) { /* * Don't call sbdrop(sb, 0) if the leading mbuf is non-empty: @@ -1123,18 +1142,27 @@ */ if (!sb->sb_cc && (sb->sb_mb == NULL || sb->sb_mb->m_len)) break; - sbdrop(sb, (int)sb->sb_cc); + sbdrop_locked(sb, (int)sb->sb_cc); } if (sb->sb_cc || sb->sb_mb || sb->sb_mbcnt) - panic("sbflush: cc %u || mb %p || mbcnt %u", - sb->sb_cc, (void *)sb->sb_mb, sb->sb_mbcnt); + panic("sbflush_locked: cc %u || mb %p || mbcnt %u", sb->sb_cc, (void *)sb->sb_mb, sb->sb_mbcnt); +} + +void +sbflush(sb) + register struct sockbuf *sb; +{ + + SOCKBUF_LOCK(sb); + sbflush_locked(sb); + SOCKBUF_UNLOCK(sb); } /* * Drop data from (the front of) a sockbuf. */ void -sbdrop(sb, len) +sbdrop_locked(sb, len) register struct sockbuf *sb; register int len; { @@ -1145,6 +1173,8 @@ if (need_lock) SOCKBUF_LOCK(sb); + SOCKBUF_LOCK_ASSERT(sb); + next = (m = sb->sb_mb) ? m->m_nextpkt : 0; while (len > 0) { if (m == 0) { @@ -1194,11 +1224,25 @@ } /* + * Drop data from (the front of) a sockbuf. + */ +void +sbdrop(sb, len) + register struct sockbuf *sb; + register int len; +{ + + SOCKBUF_LOCK(sb); + sbdrop_locked(sb, len); + SOCKBUF_UNLOCK(sb); +} + +/* * Drop a record off the front of a sockbuf * and move the next record to the front. */ void -sbdroprecord(sb) +sbdroprecord_locked(sb) register struct sockbuf *sb; { register struct mbuf *m; @@ -1207,6 +1251,8 @@ if (need_lock) SOCKBUF_LOCK(sb); + SOCKBUF_LOCK_ASSERT(sb); + m = sb->sb_mb; if (m) { sb->sb_mb = m->m_nextpkt; @@ -1222,6 +1268,20 @@ } /* + * Drop a record off the front of a sockbuf + * and move the next record to the front. + */ +void +sbdroprecord(sb) + register struct sockbuf *sb; +{ + + SOCKBUF_LOCK(sb); + sbdroprecord_locked(sb); + SOCKBUF_UNLOCK(sb); +} + +/* * Create a "control" mbuf containing the specified data * with the specified type for presentation on a socket buffer. */ ==== //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#15 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.126 2004/06/17 17:16:49 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.129 2004/06/21 00:20:42 rwatson Exp $"); #include "opt_mac.h" @@ -288,7 +288,6 @@ break; } so2 = unp->unp_conn->unp_socket; - /* NB: careful of order here */ SOCKBUF_LOCK(&so2->so_snd); SOCKBUF_LOCK(&so->so_rcv); /* @@ -302,8 +301,9 @@ (void)chgsbsize(so2->so_cred->cr_uidinfo, &so2->so_snd.sb_hiwat, newhiwat, RLIM_INFINITY); unp->unp_cc = so->so_rcv.sb_cc; - sowwakeup_locked(so2); + SOCKBUF_UNLOCK(&so->so_rcv); SOCKBUF_UNLOCK(&so2->so_snd); + sowwakeup(so2); break; default: @@ -371,10 +371,12 @@ from = &sun_noname; SOCKBUF_LOCK(&so2->so_rcv); if (sbappendaddr_locked(&so2->so_rcv, from, m, control)) { - sorwakeup_locked(so2); + SOCKBUF_UNLOCK(&so2->so_rcv); + sorwakeup(so2); m = NULL; control = NULL; } else { + SOCKBUF_UNLOCK(&so2->so_rcv); error = ENOBUFS; } SOCKBUF_UNLOCK(&so2->so_rcv); @@ -429,8 +431,8 @@ (void)chgsbsize(so->so_cred->cr_uidinfo, &so->so_snd.sb_hiwat, newhiwat, RLIM_INFINITY); unp->unp_conn->unp_cc = so2->so_rcv.sb_cc; - sorwakeup_locked(so2); SOCKBUF_UNLOCK(&so2->so_rcv); + sorwakeup(so2); m = NULL; break; @@ -933,6 +935,7 @@ struct unpcb *unp; { register struct unpcb *unp2 = unp->unp_conn; + struct socket *so; UNP_LOCK_ASSERT(); @@ -943,7 +946,10 @@ case SOCK_DGRAM: LIST_REMOVE(unp, unp_reflink); - unp->unp_socket->so_state &= ~SS_ISCONNECTED; + so = unp->unp_socket; + SOCK_LOCK(so); + so->so_state &= ~SS_ISCONNECTED; + SOCK_UNLOCK(so); break; case SOCK_STREAM: ==== //depot/projects/netperf_socket/sys/kern/vfs_mount.c#8 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.128 2004/06/17 21:24:13 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.129 2004/06/20 17:31:01 tmm Exp $"); #include #include @@ -1488,6 +1488,7 @@ UIO_SYSSPACE, cp, curthread); nid.ni_startdir = vroot; nid.ni_pathlen = strlen(cp); + nid.ni_cnd.cn_cred = curthread->td_ucred; nid.ni_cnd.cn_nameptr = cp; error = lookup(&nid); ==== //depot/projects/netperf_socket/sys/net/zlib.c#2 (text+ko) ==== @@ -10,7 +10,7 @@ * - added inflateIncomp and deflateOutputPending * - allow strm->next_out to be NULL, meaning discard the output * - * $FreeBSD: src/sys/net/zlib.c,v 1.17 2003/02/02 13:52:24 alfred Exp $ + * $FreeBSD: src/sys/net/zlib.c,v 1.18 2004/06/20 17:42:34 markm Exp $ */ /* @@ -57,6 +57,8 @@ #include #include #include +#include +#include # define HAVE_MEMCPY #else @@ -5380,3 +5382,25 @@ return (s2 << 16) | s1; } /* --- adler32.c */ + +#ifdef _KERNEL +static int +zlib_modevent(module_t mod, int type, void *unused) +{ + switch (type) { + case MOD_LOAD: + return 0; + case MOD_UNLOAD: + return 0; + } + return EINVAL; +} + +static moduledata_t zlib_mod = { + "zlib", + zlib_modevent, + 0 +}; +DECLARE_MODULE(zlib, zlib_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); +MODULE_VERSION(zlib, 1); +#endif /* _KERNEL */ ==== //depot/projects/netperf_socket/sys/netgraph/ng_fec.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/netgraph/ng_fec.c,v 1.9 2004/05/29 00:51:11 julian Exp $ + * $FreeBSD: src/sys/netgraph/ng_fec.c,v 1.11 2004/06/20 21:08:58 wpaul Exp $ */ /* * Copyright (c) 1996-1999 Whistle Communications, Inc. @@ -125,7 +125,15 @@ #include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 21 01:20:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF48A16A4D0; Mon, 21 Jun 2004 01:20:44 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F3A816A4CE for ; Mon, 21 Jun 2004 01:20:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 792E243D58 for ; Mon, 21 Jun 2004 01:20:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5L1KioK036026 for ; Mon, 21 Jun 2004 01:20:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5L1KhkM036022 for perforce@freebsd.org; Mon, 21 Jun 2004 01:20:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 21 Jun 2004 01:20:43 GMT Message-Id: <200406210120.i5L1KhkM036022@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 Subject: PERFORCE change 55427 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2004 01:20:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=55427 Change 55427 by rwatson@rwatson_paprika on 2004/06/21 01:20:11 A bit of whitespace diff reduction in netperf_socket to make it easier to diff versions of the netperf patches. Affected files ... .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#19 edit Differences ... ==== //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#19 (text+ko) ==== @@ -337,6 +337,7 @@ socantsendmore_locked(so) struct socket *so; { + SOCKBUF_LOCK_ASSERT(&so->so_snd); so->so_state |= SS_CANTSENDMORE; @@ -349,6 +350,7 @@ { SOCKBUF_LOCK(&so->so_rcv); + socantrcvmore_locked(so); mtx_assert(SOCKBUF_MTX(&so->so_rcv), MA_NOTOWNED); } @@ -357,6 +359,7 @@ socantrcvmore_locked(so) struct socket *so; { + SOCKBUF_LOCK_ASSERT(&so->so_rcv); so->so_state |= SS_CANTRCVMORE; @@ -370,7 +373,6 @@ sbwait(sb) struct sockbuf *sb; { - SOCKBUF_LOCK_ASSERT(sb); SOCKBUF_LOCK_ASSERT(sb); From owner-p4-projects@FreeBSD.ORG Mon Jun 21 01:50:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B16616A4D1; Mon, 21 Jun 2004 01:50:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C862F16A4CE for ; Mon, 21 Jun 2004 01:50:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC51843D5A for ; Mon, 21 Jun 2004 01:50:22 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5L1oM4M042483 for ; Mon, 21 Jun 2004 01:50:22 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5L1oMsD042480 for perforce@freebsd.org; Mon, 21 Jun 2004 01:50:22 GMT (envelope-from julian@freebsd.org) Date: Mon, 21 Jun 2004 01:50:22 GMT Message-Id: <200406210150.i5L1oMsD042480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 55431 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2004 01:50:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=55431 Change 55431 by julian@julian_ref on 2004/06/21 01:49:43 cleaning up and commenting Affected files ... .. //depot/projects/nsched/sys/kern/sched_4bsd.c#15 edit .. //depot/projects/nsched/sys/sys/proc.h#15 edit .. //depot/projects/nsched/sys/sys/sched.h#7 edit Differences ... ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#15 (text+ko) ==== @@ -215,7 +215,16 @@ static void maybe_resched(struct thread *td); static void updatepri(struct ksegrp *kg); static void resetpriority(struct ksegrp *kg); +static void sched_add(struct thread *td); +static void sched_rem(struct thread *td); +static struct kse * sched_choose(void); +static void adjustrunqueue( struct thread *td, int newpri) ; + +/*************************************************************** + * Define startup entrypoints + */ + static struct kproc_desc sched_kp = { "schedcpu", schedcpu_thread, @@ -224,7 +233,82 @@ SYSINIT(schedcpu, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, kproc_start, &sched_kp) SYSINIT(sched_setup, SI_SUB_RUN_QUEUE, SI_ORDER_FIRST, sched_setup, NULL) +/************************************************************************ + * Definitions of the run queues we use here. + */ + +/* + * Copyright (c) 2001 Jake Burkholder + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: src/sys/sys/runq.h,v 1.4 2002/05/25 01:12:23 jake Exp $ + */ + +#ifndef _RUNQ_H_ +#define _RUNQ_H_ + +#include + +struct kse; + +/* + * Run queue parameters. + */ + +#define RQ_NQS (64) /* Number of run queues. */ +#define RQ_PPQ (4) /* Priorities per queue. */ + +/* + * Head of run queues. + */ +TAILQ_HEAD(rqhead, kse); + /* + * Bit array which maintains the status of a run queue. When a queue is + * non-empty the bit corresponding to the queue number will be set. + */ +struct rqbits { + rqb_word_t rqb_bits[RQB_LEN]; +}; + +/* + * Run queue structure. Contains an array of run queues on which processes + * are placed, and a structure to maintain the status of each queue. + */ +struct runq { + struct rqbits rq_status; + struct rqhead rq_queues[RQ_NQS]; +}; + +static void runq_add(struct runq *, struct kse *); +static int runq_check(struct runq *); +static struct kse *runq_choose(struct runq *); +static void runq_init(struct runq *); +static void runq_remove(struct runq *, struct kse *); + +#endif /* end of Jake copyright file */ +/* * Global run queue. */ static struct runq runq; @@ -292,6 +376,8 @@ * The act of firing the event triggers a context switch to softclock() and * then switching back out again which is equivalent to a preemption, thus * no further work is needed on the local CPU. + * Called from: + * callout started by sched_setup(); */ /* ARGSUSED */ static void @@ -396,6 +482,8 @@ /* * Recompute process priorities, every hz ticks. * MP-safe, called without the Giant mutex. + * Called from: + * schedcpu_thread() which is a kthread that awakens once per second. */ /* ARGSUSED */ static void @@ -507,6 +595,8 @@ /* * Main loop for a kthread that executes schedcpu once a second. + * Called from: + * This is a kthread that runs forever.. */ static void schedcpu_thread(void) @@ -523,6 +613,9 @@ * Recalculate the priority of a process after it has slept for a while. * For all load averages >= 1 and max kg_estcpu of 255, sleeping for at * least six times the loadfactor will decay kg_estcpu to zero. + * Called from: + * sched_wakeup() (local) + * schedcpu() (local) */ static void updatepri(struct ksegrp *kg) @@ -547,6 +640,11 @@ * Compute the priority of a process when running in user mode. * Arrange to reschedule if the resulting priority is better * than that of the current process. + * Called from: + * updatepri() (local) + * schedcpu() (local) + * sched_clock() (local) + * sched_nice() (local) */ static void resetpriority(struct ksegrp *kg) @@ -566,6 +664,11 @@ } } +/* + * Scheduler intialisation. + * Called from: + * SYSINIT() above. + */ /* ARGSUSED */ static void sched_setup(void *dummy) @@ -593,6 +696,13 @@ * allocation and death of various entities, timer events, and * * direct calls for scheduler services. * ******************************************************************/ +/* + * Test to see if there is anything scheduled to run. + * Called from: + * idle_proc() + * vm_pagezero() + * cpu_idle() + */ int sched_runnable(void) { @@ -603,6 +713,11 @@ #endif } +/* + * report teh round-robin scheduling interval. + * Called from: + * (posix scheduling interface) + */ int sched_rr_interval(void) { @@ -624,6 +739,8 @@ * 90% forget that the process used a lot of CPU time in 5 * loadav * seconds. This causes the system to favor processes which haven't * run much recently, and to round-robin among other processes. + * Called from: + * statclock() (called by hardclock) */ void sched_clock(struct thread *td) @@ -651,6 +768,8 @@ * Charge it to the ksegrp that did the wait since process estcpu is sum of * all ksegrps, this is strictly as expected. Assume that the child process * aggregated all the estcpu into the 'built-in' ksegrp. + * Called from: + * exit() */ void sched_exit(struct proc *parent, struct thread *td) @@ -667,6 +786,8 @@ /* * We should give the estcpu to someone, but WHO? + * Called from: + * thread_exit() (for threaded programs only) */ void sched_exit_ksegrp(struct proc *parent, struct thread *td) @@ -675,6 +796,11 @@ sched_set_concurrancy(td->td_ksegrp, 0); } +/* + * Called when individual threads exit. + * Called from: + * thread_exit() (for all exiting threads) + */ void sched_thread_exit(struct thread *td) { @@ -695,6 +821,9 @@ /* * special version of the above for thr.. * work towards merging them. + * Special code for thr library thread + * Called from: + * thr_exit1() */ void sched_thr_exit(struct thread *td) @@ -713,6 +842,12 @@ } +/* + * Allocate any resources the scheduler needs to allocate or set up + * on a new process at fork() time. + * Called from: + * fork1() + */ void sched_fork(struct thread *td, struct proc *child) { @@ -730,12 +865,24 @@ newtd->td_kse = newke; } +/* + * When we make a new ksegrp, teh scheduler may need to know about it. + * Called from: + * kse_create() + */ void sched_fork_ksegrp(struct thread *td, struct ksegrp *newkg) { newkg->kg_estcpu = td->td_ksegrp->kg_estcpu; } +/* + * Do the dirty work of changing the nice value of the process + * and deciding how that affects the threads. + * Called from: + * donice() + * vm_pageout_scan() (to make a killed program exit quickly) + */ void sched_nice(struct proc *p, int nice) { @@ -749,6 +896,11 @@ } } +/* + * Scheduler specific code when a process group changes scheduler class. + * Called from: + * rtp_to_pri() + */ void sched_class(struct ksegrp *kg, int class) { @@ -761,6 +913,13 @@ * This may include moving the thread within the KSEGRP, * changing the assignment of a kse to the thread, * and moving a KSE in the system run queue. + * Called from: + * rtp_to_pri() + * uio_yield() + * msleep() + * yield() + * ast() + * propogate_priority() */ void sched_prio(struct thread *td, u_char prio) @@ -774,6 +933,13 @@ } } +/* + * when going to sleep. The scheduler may need to be informed. + * (probaly this is silly. it can tell from sched_switch probably) + * Called from: + * sleepq_switch() + */ + */ void sched_sleep(struct thread *td) { @@ -783,6 +949,12 @@ td->td_base_pri = td->td_priority; } +/* + * As the thread is actually switched out, the scheduler + * may need to be told of this.. + * Called from: + * mi_switch() + */ void sched_switch(struct thread *td, int flags) { @@ -825,6 +997,12 @@ td->td_oncpu = PCPU_GET(cpuid); } +/* + * Making the thread runnable after being stopped or sleeping, + * The scheduler needs to be informed. + * Called from: + * setrunnable() + */ void sched_wakeup(struct thread *td) { @@ -839,7 +1017,18 @@ maybe_resched(td); } -void + +/* + * We have a thread to put on the run queue. + * Let the scheduler keep track of + * the fact that the thread is becoming runnable, + * and decide which run queue to use. + * Called from: + * kse_reassign() (local) + * adjustrunqueue() (local) + * setrunqueue() (local) + */ +static void sched_add(struct thread *td) { struct kse *ke; @@ -874,7 +1063,14 @@ runq_add(ke->ke_runq, ke); } -void +/* + * Change scheduler stats to reflect removal of a thread from teh run queues. + * Called from: + * remrunqueue() (local) + * adjustrunqueue() (local) + * setrunqueue() (local) + */ +static void sched_rem(struct thread *td) { struct kse *ke; @@ -894,7 +1090,13 @@ ke->ke_ksegrp->kg_runq_kses--; } -struct kse * +/* + * Try find a runnable thread from teh per-cpu or + * general run queues and adjust scheduler stats accordingly. + * Called from: + * choosethread() (local) + */ +static struct kse * sched_choose(void) { struct kse *ke; @@ -937,6 +1139,11 @@ return (ke); } +/* + * The scheduler needs to know when the thread transitions to user-mode. + * Called from: + * userret() + */ void sched_userret(struct thread *td) { @@ -958,6 +1165,11 @@ } } +/* + * Set the thread up so that it is bound onto a particular CPU. + * Called from: + * ***NEVER CALLED *** + */ void sched_bind(struct thread *td, int cpu) { @@ -981,6 +1193,11 @@ #endif } +/* + * Set the thread up so that it is NOT bound onto a particular CPU. + * Called from: + * ***NEVER CALLED *** + */ void sched_unbind(struct thread* td) { @@ -988,12 +1205,24 @@ td->td_kse->ke_flags &= ~KEF_BOUND; } +/* + * Scheduler specific way to find the loadaverage. + * Called from: + * loadav() (from a callout) + */ int sched_load(void) { return (sched_tdcnt); } +/* + * The following calls return teh size of the scheduler specific + * storage that needs to be allocated along with the proc, ksegrp and thread + * structures. + * Called from: + * ksegrp_init(), proc_init(), thread_init() (UMA init entrypoints) + */ int sched_sizeof_ksegrp(void) { @@ -1012,6 +1241,12 @@ return (sizeof(struct thread) + sizeof(struct td_sched)); } +/* + * Scheduler specific method to detirmine teh percentage cpu used by a thread. + * Called from: + * fill_kinfo_thread() (for ps etc.) + * ttyinfo() ( for ^T etc) + */ fixpt_t sched_pctcpu(struct thread *td) { @@ -1038,6 +1273,11 @@ extern struct mtx kse_zombie_lock; TAILQ_HEAD(, kse) zombie_kses = TAILQ_HEAD_INITIALIZER(zombie_kses); +/* + * Occasionally the scheduler may need to do some GC.. + * Called from: + * thread_reap() + */ void sched_GC(void) { @@ -1057,6 +1297,12 @@ } } +/* + * Very early in the boot some setup of scheduler-specific + * parts of proc0 and of soem scheduler resources needs to be done. + * Called from: + * proc0_init() + */ void schedinit(void) { @@ -1085,6 +1331,8 @@ /* * for now have special thr code * later on, clean these up into common code. + * Called from: + * thr_create() */ int sched_thr_newthread(struct thread *td, struct thread *newtd, int flags) @@ -1117,6 +1365,9 @@ return (0); /* the API could fail but not in this case */ } +/***************************** + * KSE zone/allocation methods. + */ /* * Allocate a kse. */ @@ -1129,7 +1380,7 @@ /* * Deallocate a kse. */ -void +static void kse_free(struct kse *td) { uma_zfree(kse_zone, td); @@ -1137,8 +1388,10 @@ /* * Stash an embarasingly extra kse into the zombie kse queue. + * Called from: + * kse_unlink() (local) */ -void +static void kse_stash(struct kse *ke) { mtx_lock_spin(&kse_zombie_lock); @@ -1148,8 +1401,14 @@ /* * KSE is linked into kse group. + * Called from: + * sched_newproc() (local) + * sched_thr_newthread() (local) + * schedinit() (local) + * sched_set_concurrancy() (local) + * */ -void +static void kse_link( struct kse *ke, struct ksegrp *kg) { TAILQ_INSERT_HEAD(&kg->kg_kseq, ke, ke_kglist); @@ -1163,8 +1422,10 @@ } /* - * Allocate scheduler per-process resources. + * Allocate scheduler specific per-process resources. * The thread and ksegrp have already been linked in. + * Called from: + * proc_init() (UMA init method) */ int sched_newproc(struct proc *p, struct ksegrp *kg, struct thread *td) @@ -1184,6 +1445,13 @@ return (ENOMEM ); } +/* + * Ksegrp is being either created or recycled. + * Fix up the per-scheduler resources associated with it. + * Called from: + * ksegrp_dtor() + * ksegrp_initi() + */ void sched_init_ksegrp(struct ksegrp *kg) { @@ -1195,6 +1463,13 @@ kg->kg_idle_kses = 0; } +/* + * thread is being either created or recycled. + * Fix up the per-scheduler resources associated with it. + * Called from: + * thread_dtor() + * thread_initi() + */ /* Assumes td->td_sched is already set up */ void sched_init_thread(struct thread *td) @@ -1203,7 +1478,17 @@ td->td_kse = NULL; } -void + +/* + * code to take the per-scheduler KSE structure + * off the ksegrp it is hanging off and free it + * Called from: + * sched_destroyproc() + * sched_thr_exit() + * sched_set_concurrancy() via REDUCE_KSES() + * kse_reassign() via REDUCE_KSES() + */ +static void kse_unlink(struct kse *ke) { struct ksegrp *kg; @@ -1241,6 +1526,8 @@ * Called by the uma process fini routine.. * undo anything we may have done in the uma_init method. * Panic if it's not all 1:1:1:1 + * Called from: + * proc_fini() (UMA method) */ void sched_destroyproc(struct proc *p) @@ -1259,6 +1546,17 @@ kse_unlink(TAILQ_FIRST(&skg->skg_iq)); \ } +/* + * (Re) assign resources to allow the ksegrp to implement + * teh requested concurrancy. At this time it means allocating + * or freeing KSE structures. + * Called from: + * kern_execve() (reverting to non threaded) + * kern_exit() (reverting to non threaded) + * thread_exit() (during removal of ksegrp) + * sched_exit_ksegrp() (local) + * kse_exit() (decreasing) + * kse_create() (increasing) void sched_set_concurrancy(struct ksegrp *kg, int concurrancy) { @@ -1393,6 +1691,11 @@ * this will be what does it. * XXX Change to take an argument indicating * if the switch is voluntary or involuntary. + * Called from: + * thr_exit1() + * thread_exit() + * sched_switch() (local) + * init_secondary() (start up 2ndary processors) */ struct thread * choosethread(int flags) @@ -1465,8 +1768,14 @@ * Given a surplus KSE, either assign a new runable thread to it * (and put it in the run queue) or put it in the ksegrp's idle KSE list. * Assumes that the original thread is not runnable. + * Called from: + * sched_thread_exit() (local) + * sched_set_concurrancy() (local) + * sched_switch() (local) + * sched_thread_exit() (local) + * remrunqueue() (local) (commented out) */ -void +static void kse_reassign(struct kse *ke) { struct ksegrp *kg; @@ -1516,6 +1825,8 @@ * This in turn may remove it from a KSE if it was already assigned * to one, possibly causing a new thread to be assigned to the KSE * and the KSE getting a new priority. + * Called from: + * Not used */ static void remrunqueue(struct thread *td) @@ -1562,8 +1873,10 @@ /* * Change the priority of a thread that is on the run queue. + * Called from: + * sched_prio() (local) */ -void +static void adjustrunqueue( struct thread *td, int newpri) { struct ksegrp *kg; @@ -1750,7 +2063,7 @@ /* * Initialize a run structure. */ -void +static void runq_init(struct runq *rq) { int i; @@ -1821,7 +2134,7 @@ * Add the KSE to the queue specified by its priority, and set the * corresponding status bit. */ -void +static void runq_add(struct runq *rq, struct kse *ke) { struct rqhead *rqh; @@ -1841,7 +2154,7 @@ * queue, false otherwise. Has no side effects, does not modify the run * queue structure. */ -int +static int runq_check(struct runq *rq) { struct rqbits *rqb; @@ -1862,7 +2175,7 @@ /* * Find the highest priority process on the run queue. */ -struct kse * +static struct kse * runq_choose(struct runq *rq) { struct rqhead *rqh; @@ -1888,7 +2201,7 @@ * corresponding status bit if the queue becomes empty. * Caller must set ke->ke_state afterwards. */ -void +static void runq_remove(struct runq *rq, struct kse *ke) { struct rqhead *rqh; ==== //depot/projects/nsched/sys/sys/proc.h#15 (text+ko) ==== @@ -48,7 +48,6 @@ #include #include #include /* XXX. */ -#include #include #include #ifndef _KERNEL @@ -741,7 +740,6 @@ struct pgrp *pgfind(pid_t); /* Find process group by id. */ struct proc *zpfind(pid_t); /* Find zombie process by id. */ -void adjustrunqueue(struct thread *, int newpri); void ast(struct trapframe *framep); struct thread *choosethread(int flags); int cr_cansignal(struct ucred *cred, struct proc *proc, int signum); ==== //depot/projects/nsched/sys/sys/sched.h#7 (text+ko) ==== @@ -72,13 +72,7 @@ void sched_userret(struct thread *td); void sched_wakeup(struct thread *td); -/* - * Threads are moved on and off of run queues - */ -void sched_add(struct thread *td); -struct kse *sched_choose(void); /* XXX Should be thread * */ void sched_clock(struct thread *td); -void sched_rem(struct thread *td); /* * Binding makes cpu affinity permanent while pinning is used to temporarily From owner-p4-projects@FreeBSD.ORG Mon Jun 21 03:40:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20EF116A4D0; Mon, 21 Jun 2004 03:40:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E459B16A4CE for ; Mon, 21 Jun 2004 03:40:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCB4543D53 for ; Mon, 21 Jun 2004 03:40:56 +0000 (GMT) (envelope-from ps@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5L3euxS066704 for ; Mon, 21 Jun 2004 03:40:56 GMT (envelope-from ps@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5L3eqaG066697 for perforce@freebsd.org; Mon, 21 Jun 2004 03:40:52 GMT (envelope-from ps@freebsd.org) Date: Mon, 21 Jun 2004 03:40:52 GMT Message-Id: <200406210340.i5L3eqaG066697@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ps@freebsd.org using -f From: Paul Saab To: Perforce Change Reviews Subject: PERFORCE change 55434 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2004 03:40:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=55434 Change 55434 by ps@butter.corp on 2004/06/21 03:40:43 IFC Affected files ... .. //depot/projects/sack/alpha/alpha/mem.c#2 integrate .. //depot/projects/sack/alpha/alpha/pmap.c#3 integrate .. //depot/projects/sack/alpha/alpha/promcons.c#2 integrate .. //depot/projects/sack/alpha/include/cpu.h#2 integrate .. //depot/projects/sack/alpha/tlsb/zs_tlsb.c#2 integrate .. //depot/projects/sack/amd64/amd64/fpu.c#3 integrate .. //depot/projects/sack/amd64/amd64/mem.c#2 integrate .. //depot/projects/sack/amd64/amd64/pmap.c#3 integrate .. //depot/projects/sack/amd64/include/cpu.h#2 integrate .. //depot/projects/sack/amd64/include/pmap.h#3 integrate .. //depot/projects/sack/arm/arm/nexus_io.c#2 integrate .. //depot/projects/sack/arm/arm/pmap.c#2 integrate .. //depot/projects/sack/arm/include/bus.h#2 integrate .. //depot/projects/sack/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/sack/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/sack/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/sack/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/sack/boot/forth/loader.conf#2 integrate .. //depot/projects/sack/boot/i386/boot0/boot0.S#3 integrate .. //depot/projects/sack/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/sack/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/sack/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/sack/boot/pc98/boot2/dinode.h#2 integrate .. //depot/projects/sack/boot/pc98/boot2/inode.h#2 integrate .. //depot/projects/sack/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/sack/cam/cam_xpt.c#2 integrate .. //depot/projects/sack/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/sack/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/sack/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/sack/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/sack/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/sack/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/sack/coda/cnode.h#2 integrate .. //depot/projects/sack/coda/coda.h#2 integrate .. //depot/projects/sack/coda/coda_fbsd.c#2 integrate .. //depot/projects/sack/coda/coda_psdev.c#2 integrate .. //depot/projects/sack/coda/coda_psdev.h#2 integrate .. //depot/projects/sack/coda/coda_venus.c#2 integrate .. //depot/projects/sack/coda/coda_venus.h#2 integrate .. //depot/projects/sack/coda/coda_vfsops.c#2 integrate .. //depot/projects/sack/coda/coda_vnops.c#2 integrate .. //depot/projects/sack/coda/coda_vnops.h#2 integrate .. //depot/projects/sack/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/sack/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/sack/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/sack/compat/linux/linux_stats.c#2 integrate .. //depot/projects/sack/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/sack/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/sack/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/sack/compat/svr4/svr4_types.h#2 integrate .. //depot/projects/sack/conf/files#4 integrate .. //depot/projects/sack/conf/ldscript.ia64#2 integrate .. //depot/projects/sack/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/sack/contrib/altq/altq/if_altq.h#2 integrate .. //depot/projects/sack/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/sack/contrib/dev/fla/fla.c#2 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ip_fil.c#2 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/sack/contrib/pf/net/if_pflog.c#3 integrate .. //depot/projects/sack/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/sack/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/sack/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/sack/contrib/pf/net/pf.c#3 integrate .. //depot/projects/sack/contrib/pf/net/pf_if.c#1 branch .. //depot/projects/sack/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/sack/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/sack/contrib/pf/net/pf_osfp.c#2 integrate .. //depot/projects/sack/contrib/pf/net/pf_subr.c#1 branch .. //depot/projects/sack/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/sack/contrib/pf/net/pfvar.h#3 integrate .. //depot/projects/sack/contrib/pf/netinet/in4_cksum.c#2 integrate .. //depot/projects/sack/dev/aac/aac.c#2 integrate .. //depot/projects/sack/dev/aac/aacvar.h#2 integrate .. //depot/projects/sack/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/sack/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/sack/dev/acpica/acpi.c#3 integrate .. //depot/projects/sack/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/sack/dev/acpica/acpivar.h#3 integrate .. //depot/projects/sack/dev/adlink/adlink.c#2 integrate .. //depot/projects/sack/dev/amr/amr.c#2 integrate .. //depot/projects/sack/dev/amr/amrvar.h#2 integrate .. //depot/projects/sack/dev/an/if_an.c#2 integrate .. //depot/projects/sack/dev/asr/asr.c#2 integrate .. //depot/projects/sack/dev/ata/ata-all.c#2 integrate .. //depot/projects/sack/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/sack/dev/ata/ata-pci.c#2 integrate .. //depot/projects/sack/dev/ata/ata-pci.h#2 integrate .. //depot/projects/sack/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/sack/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/sack/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/sack/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/sack/dev/bktr/bktr_core.h#2 integrate .. //depot/projects/sack/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/sack/dev/bktr/bktr_reg.h#2 integrate .. //depot/projects/sack/dev/ciss/ciss.c#2 integrate .. //depot/projects/sack/dev/ciss/cissvar.h#2 integrate .. //depot/projects/sack/dev/cp/if_cp.c#2 integrate .. //depot/projects/sack/dev/ctau/if_ct.c#2 integrate .. //depot/projects/sack/dev/cx/if_cx.c#3 integrate .. //depot/projects/sack/dev/cy/cy.c#3 integrate .. //depot/projects/sack/dev/dcons/dcons.c#2 integrate .. //depot/projects/sack/dev/digi/digi.c#3 integrate .. //depot/projects/sack/dev/digi/digi.h#2 integrate .. //depot/projects/sack/dev/drm/drmP.h#3 integrate .. //depot/projects/sack/dev/drm/drm_drv.h#3 integrate .. //depot/projects/sack/dev/drm/drm_fops.h#2 integrate .. //depot/projects/sack/dev/drm/drm_os_freebsd.h#3 integrate .. //depot/projects/sack/dev/drm/drm_vm.h#2 integrate .. //depot/projects/sack/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/sack/dev/fb/gfb.h#2 integrate .. //depot/projects/sack/dev/fb/vga.c#3 integrate .. //depot/projects/sack/dev/fb/vgareg.h#2 integrate .. //depot/projects/sack/dev/fdc/fdc.c#2 integrate .. //depot/projects/sack/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/sack/dev/firewire/fwdev.c#2 integrate .. //depot/projects/sack/dev/firewire/fwmem.c#2 integrate .. //depot/projects/sack/dev/firewire/fwohci.c#2 integrate .. //depot/projects/sack/dev/firewire/sbp.c#2 integrate .. //depot/projects/sack/dev/gfb/gfb_pci.c#2 integrate .. //depot/projects/sack/dev/ida/ida.c#2 integrate .. //depot/projects/sack/dev/ida/idavar.h#2 integrate .. //depot/projects/sack/dev/iicbus/iic.c#2 integrate .. //depot/projects/sack/dev/iir/iir.h#2 integrate .. //depot/projects/sack/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/sack/dev/ips/ips.c#2 integrate .. //depot/projects/sack/dev/ips/ips.h#2 integrate .. //depot/projects/sack/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/sack/dev/joy/joy.c#2 integrate .. //depot/projects/sack/dev/joy/joyvar.h#2 integrate .. //depot/projects/sack/dev/kbd/kbd.c#2 integrate .. //depot/projects/sack/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/sack/dev/led/led.c#2 integrate .. //depot/projects/sack/dev/led/led.h#2 integrate .. //depot/projects/sack/dev/matcd/matcd.c#2 integrate .. //depot/projects/sack/dev/matcd/matcd_data.h#2 integrate .. //depot/projects/sack/dev/mcd/mcd.c#2 integrate .. //depot/projects/sack/dev/mcd/mcdvar.h#2 integrate .. //depot/projects/sack/dev/md/md.c#2 integrate .. //depot/projects/sack/dev/mlx/mlx.c#2 integrate .. //depot/projects/sack/dev/mlx/mlxvar.h#2 integrate .. //depot/projects/sack/dev/mly/mly.c#2 integrate .. //depot/projects/sack/dev/mly/mlyvar.h#2 integrate .. //depot/projects/sack/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/sack/dev/null/null.c#2 integrate .. //depot/projects/sack/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/sack/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/sack/dev/ofw/openpromio.c#2 integrate .. //depot/projects/sack/dev/pci/pci.c#2 integrate .. //depot/projects/sack/dev/pci/pci_user.c#2 integrate .. //depot/projects/sack/dev/ppbus/lpt.c#2 integrate .. //depot/projects/sack/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/sack/dev/ppbus/ppi.c#2 integrate .. //depot/projects/sack/dev/ppbus/pps.c#2 integrate .. //depot/projects/sack/dev/random/randomdev.c#2 integrate .. //depot/projects/sack/dev/rc/rc.c#2 integrate .. //depot/projects/sack/dev/rp/rp.c#3 integrate .. //depot/projects/sack/dev/rp/rpreg.h#2 integrate .. //depot/projects/sack/dev/sab/sab.c#3 integrate .. //depot/projects/sack/dev/scd/scd.c#2 integrate .. //depot/projects/sack/dev/scd/scdvar.h#2 integrate .. //depot/projects/sack/dev/si/si.c#3 integrate .. //depot/projects/sack/dev/sio/sio.c#3 integrate .. //depot/projects/sack/dev/smbus/smb.c#2 integrate .. //depot/projects/sack/dev/snp/snp.c#2 integrate .. //depot/projects/sack/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/sack/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/sack/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/sack/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/sack/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/sack/dev/streams/streams.c#2 integrate .. //depot/projects/sack/dev/sx/sx.c#3 integrate .. //depot/projects/sack/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/sack/dev/syscons/syscons.c#2 integrate .. //depot/projects/sack/dev/syscons/syscons.h#2 integrate .. //depot/projects/sack/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/sack/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/sack/dev/tdfx/tdfx_vars.h#2 integrate .. //depot/projects/sack/dev/twa/twa.h#2 integrate .. //depot/projects/sack/dev/twa/twa_freebsd.c#2 integrate .. //depot/projects/sack/dev/twe/twe_compat.h#2 integrate .. //depot/projects/sack/dev/twe/twe_freebsd.c#3 integrate .. //depot/projects/sack/dev/uart/uart_bus.h#2 integrate .. //depot/projects/sack/dev/uart/uart_tty.c#2 integrate .. //depot/projects/sack/dev/usb/ehcireg.h#2 integrate .. //depot/projects/sack/dev/usb/ubser.c#2 integrate .. //depot/projects/sack/dev/usb/ucom.c#3 integrate .. //depot/projects/sack/dev/usb/ucomvar.h#2 integrate .. //depot/projects/sack/dev/usb/ufm.c#2 integrate .. //depot/projects/sack/dev/usb/ugen.c#2 integrate .. //depot/projects/sack/dev/usb/uhid.c#2 integrate .. //depot/projects/sack/dev/usb/ulpt.c#2 integrate .. //depot/projects/sack/dev/usb/ums.c#2 integrate .. //depot/projects/sack/dev/usb/urio.c#2 integrate .. //depot/projects/sack/dev/usb/usb.c#2 integrate .. //depot/projects/sack/dev/usb/usbdevs#2 integrate .. //depot/projects/sack/dev/usb/usbdevs.h#2 integrate .. //depot/projects/sack/dev/usb/usbdevs_data.h#2 integrate .. //depot/projects/sack/dev/usb/uscanner.c#2 integrate .. //depot/projects/sack/dev/vinum/vinum.c#2 integrate .. //depot/projects/sack/dev/vinum/vinumconfig.c#2 integrate .. //depot/projects/sack/dev/vinum/vinumext.h#2 integrate .. //depot/projects/sack/dev/vinum/vinumio.c#2 integrate .. //depot/projects/sack/dev/vinum/vinumioctl.c#2 integrate .. //depot/projects/sack/dev/vinum/vinumobj.h#2 integrate .. //depot/projects/sack/dev/vinum/vinumutil.c#2 integrate .. //depot/projects/sack/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/sack/dev/zs/z8530var.h#2 integrate .. //depot/projects/sack/dev/zs/zs.c#2 integrate .. //depot/projects/sack/fs/devfs/devfs.h#2 integrate .. //depot/projects/sack/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/sack/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/sack/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/sack/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/sack/fs/hpfs/hpfs.h#2 integrate .. //depot/projects/sack/fs/hpfs/hpfs_hash.c#2 integrate .. //depot/projects/sack/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/sack/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/sack/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/sack/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/sack/fs/ntfs/ntfs.h#2 integrate .. //depot/projects/sack/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/sack/fs/ntfs/ntfs_ihash.h#2 integrate .. //depot/projects/sack/fs/ntfs/ntfs_inode.h#2 integrate .. //depot/projects/sack/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/sack/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/sack/fs/specfs/spec_vnops.c#2 integrate .. //depot/projects/sack/fs/udf/udf.h#2 integrate .. //depot/projects/sack/geom/gate/g_gate.c#2 integrate .. //depot/projects/sack/geom/geom.h#2 integrate .. //depot/projects/sack/geom/geom_ctl.c#2 integrate .. //depot/projects/sack/geom/geom_dev.c#2 integrate .. //depot/projects/sack/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/sack/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/sack/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/sack/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/sack/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/sack/gnu/ext2fs/ext2_extern.h#2 integrate .. //depot/projects/sack/gnu/ext2fs/ext2_ihash.c#2 integrate .. //depot/projects/sack/gnu/ext2fs/ext2_mount.h#2 integrate .. //depot/projects/sack/gnu/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/sack/gnu/ext2fs/inode.h#2 integrate .. //depot/projects/sack/i386/acpica/acpi_asus.c#3 integrate .. //depot/projects/sack/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/sack/i386/acpica/acpi_toshiba.c#3 integrate .. //depot/projects/sack/i386/bios/apm.c#2 integrate .. //depot/projects/sack/i386/bios/apm.h#2 integrate .. //depot/projects/sack/i386/bios/smapi.c#3 integrate .. //depot/projects/sack/i386/i386/bios.c#3 integrate .. //depot/projects/sack/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/sack/i386/i386/geode.c#2 integrate .. //depot/projects/sack/i386/i386/machdep.c#3 integrate .. //depot/projects/sack/i386/i386/mem.c#2 integrate .. //depot/projects/sack/i386/i386/perfmon.c#2 integrate .. //depot/projects/sack/i386/i386/pmap.c#3 integrate .. //depot/projects/sack/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/sack/i386/include/cpu.h#2 integrate .. //depot/projects/sack/i386/include/pmap.h#3 integrate .. //depot/projects/sack/i386/isa/mse.c#2 integrate .. //depot/projects/sack/i386/isa/npx.c#2 integrate .. //depot/projects/sack/i386/isa/pcvt/pcvt_drv.c#2 integrate .. //depot/projects/sack/i386/isa/pcvt/pcvt_ext.c#2 integrate .. //depot/projects/sack/i386/isa/pcvt/pcvt_hdr.h#2 integrate .. //depot/projects/sack/i386/isa/pcvt/pcvt_kbd.c#2 integrate .. //depot/projects/sack/i386/isa/pcvt/pcvt_sup.c#2 integrate .. //depot/projects/sack/i386/isa/spic.c#2 integrate .. //depot/projects/sack/i386/isa/spkr.c#2 integrate .. //depot/projects/sack/i4b/driver/i4b_ctl.c#2 integrate .. //depot/projects/sack/i4b/driver/i4b_rbch.c#2 integrate .. //depot/projects/sack/i4b/driver/i4b_tel.c#2 integrate .. //depot/projects/sack/i4b/driver/i4b_trace.c#2 integrate .. //depot/projects/sack/i4b/layer4/i4b_i4bdrv.c#2 integrate .. //depot/projects/sack/ia64/ia64/mem.c#2 integrate .. //depot/projects/sack/ia64/ia64/pmap.c#3 integrate .. //depot/projects/sack/ia64/ia64/ssc.c#2 integrate .. //depot/projects/sack/ia64/ia64/sscdisk.c#2 integrate .. //depot/projects/sack/ia64/include/cpu.h#2 integrate .. //depot/projects/sack/isa/psm.c#2 integrate .. //depot/projects/sack/isa/vga_isa.c#2 integrate .. //depot/projects/sack/isofs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/sack/isofs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/sack/isofs/cd9660/cd9660_rrip.c#2 integrate .. //depot/projects/sack/isofs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/sack/isofs/cd9660/iso.h#2 integrate .. //depot/projects/sack/kern/init_main.c#2 integrate .. //depot/projects/sack/kern/kern_acct.c#2 integrate .. //depot/projects/sack/kern/kern_clock.c#2 integrate .. //depot/projects/sack/kern/kern_conf.c#2 integrate .. //depot/projects/sack/kern/kern_descrip.c#3 integrate .. //depot/projects/sack/kern/kern_exit.c#3 integrate .. //depot/projects/sack/kern/kern_physio.c#2 integrate .. //depot/projects/sack/kern/kern_proc.c#3 integrate .. //depot/projects/sack/kern/kern_resource.c#3 integrate .. //depot/projects/sack/kern/kern_shutdown.c#2 integrate .. //depot/projects/sack/kern/kern_thread.c#3 integrate .. //depot/projects/sack/kern/kern_time.c#2 integrate .. //depot/projects/sack/kern/link_elf_obj.c#2 integrate .. //depot/projects/sack/kern/sched_4bsd.c#2 integrate .. //depot/projects/sack/kern/sched_ule.c#2 integrate .. //depot/projects/sack/kern/subr_bus.c#2 integrate .. //depot/projects/sack/kern/subr_devstat.c#2 integrate .. //depot/projects/sack/kern/subr_log.c#2 integrate .. //depot/projects/sack/kern/subr_prf.c#2 integrate .. //depot/projects/sack/kern/sys_socket.c#3 integrate .. //depot/projects/sack/kern/sysv_shm.c#2 integrate .. //depot/projects/sack/kern/tty.c#3 integrate .. //depot/projects/sack/kern/tty_conf.c#3 integrate .. //depot/projects/sack/kern/tty_cons.c#2 integrate .. //depot/projects/sack/kern/tty_pty.c#3 integrate .. //depot/projects/sack/kern/tty_tty.c#2 integrate .. //depot/projects/sack/kern/uipc_socket.c#3 integrate .. //depot/projects/sack/kern/uipc_socket2.c#3 integrate .. //depot/projects/sack/kern/uipc_syscalls.c#3 integrate .. //depot/projects/sack/kern/uipc_usrreq.c#3 integrate .. //depot/projects/sack/kern/vfs_aio.c#2 integrate .. //depot/projects/sack/kern/vfs_bio.c#2 integrate .. //depot/projects/sack/kern/vfs_mount.c#2 integrate .. //depot/projects/sack/kern/vfs_subr.c#3 integrate .. //depot/projects/sack/kern/vfs_syscalls.c#3 integrate .. //depot/projects/sack/modules/Makefile#2 integrate .. //depot/projects/sack/modules/pf/Makefile#2 integrate .. //depot/projects/sack/modules/pflog/Makefile#2 delete .. //depot/projects/sack/modules/pfsync/Makefile#2 delete .. //depot/projects/sack/modules/zlib/Makefile#1 branch .. //depot/projects/sack/net/bpf.c#3 integrate .. //depot/projects/sack/net/bridge.c#2 integrate .. //depot/projects/sack/net/if.c#3 integrate .. //depot/projects/sack/net/if_arcsubr.c#2 integrate .. //depot/projects/sack/net/if_ef.c#2 integrate .. //depot/projects/sack/net/if_ethersubr.c#2 integrate .. //depot/projects/sack/net/if_fddisubr.c#2 integrate .. //depot/projects/sack/net/if_fwsubr.c#2 integrate .. //depot/projects/sack/net/if_iso88025subr.c#2 integrate .. //depot/projects/sack/net/if_sl.c#3 integrate .. //depot/projects/sack/net/if_spppsubr.c#3 integrate .. //depot/projects/sack/net/if_tap.c#2 integrate .. //depot/projects/sack/net/if_tapvar.h#2 integrate .. //depot/projects/sack/net/if_tun.c#2 integrate .. //depot/projects/sack/net/if_var.h#3 integrate .. //depot/projects/sack/net/if_vlan.c#2 integrate .. //depot/projects/sack/net/pfil.h#2 integrate .. //depot/projects/sack/net/ppp_tty.c#2 integrate .. //depot/projects/sack/net/raw_cb.c#3 integrate .. //depot/projects/sack/net/raw_cb.h#2 integrate .. //depot/projects/sack/net/raw_usrreq.c#3 integrate .. //depot/projects/sack/net/zlib.c#2 integrate .. //depot/projects/sack/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/sack/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/sack/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#2 integrate .. //depot/projects/sack/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/sack/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/sack/netgraph/ng_device.c#2 integrate .. //depot/projects/sack/netgraph/ng_fec.c#2 integrate .. //depot/projects/sack/netgraph/ng_ksocket.c#3 integrate .. //depot/projects/sack/netgraph/ng_tty.c#2 integrate .. //depot/projects/sack/netinet/in.h#3 integrate .. //depot/projects/sack/netinet/in_gif.c#2 integrate .. //depot/projects/sack/netinet/in_pcb.c#3 integrate .. //depot/projects/sack/netinet/in_proto.c#2 integrate .. //depot/projects/sack/netinet/ip_input.c#3 integrate .. //depot/projects/sack/netinet/ip_mroute.c#2 integrate .. //depot/projects/sack/netinet/tcp_input.c#4 integrate .. //depot/projects/sack/netinet/tcp_output.c#4 integrate .. //depot/projects/sack/netinet/tcp_subr.c#4 integrate .. //depot/projects/sack/netinet/tcp_syncache.c#4 integrate .. //depot/projects/sack/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/sack/netinet/udp_usrreq.c#2 integrate .. //depot/projects/sack/netipx/spx_usrreq.c#3 integrate .. //depot/projects/sack/netkey/keysock.c#2 integrate .. //depot/projects/sack/netncp/ncp_mod.c#2 integrate .. //depot/projects/sack/netsmb/smb_dev.c#2 integrate .. //depot/projects/sack/netsmb/smb_trantcp.c#3 integrate .. //depot/projects/sack/nfs4client/nfs4_dev.c#2 integrate .. //depot/projects/sack/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/sack/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/sack/nfsclient/krpc_subr.c#2 integrate .. //depot/projects/sack/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/sack/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/sack/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/sack/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/sack/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/sack/opencrypto/cryptodev.c#2 integrate .. //depot/projects/sack/pc98/conf/NOTES#2 integrate .. //depot/projects/sack/pc98/i386/machdep.c#3 integrate .. //depot/projects/sack/pc98/pc98/fd.c#2 integrate .. //depot/projects/sack/pc98/pc98/mse.c#2 integrate .. //depot/projects/sack/pc98/pc98/olpt.c#2 integrate .. //depot/projects/sack/pc98/pc98/pc98gdc.c#3 integrate .. //depot/projects/sack/pc98/pc98/sio.c#3 integrate .. //depot/projects/sack/pc98/pc98/wd_cd.c#2 integrate .. //depot/projects/sack/pccard/pccard.c#2 integrate .. //depot/projects/sack/pccard/slot.h#2 integrate .. //depot/projects/sack/pci/agp.c#2 integrate .. //depot/projects/sack/pci/agppriv.h#2 integrate .. //depot/projects/sack/pci/if_ti.c#2 integrate .. //depot/projects/sack/pci/if_tireg.h#2 integrate .. //depot/projects/sack/pci/xrpu.c#2 integrate .. //depot/projects/sack/powerpc/ofw/ofw_syscons.h#2 integrate .. //depot/projects/sack/security/mac/mac_vfs.c#2 integrate .. //depot/projects/sack/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/sack/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/sack/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/sack/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/sack/security/mac_test/mac_test.c#2 integrate .. //depot/projects/sack/sparc64/creator/creator.h#2 integrate .. //depot/projects/sack/sparc64/creator/creator_upa.c#2 integrate .. //depot/projects/sack/sparc64/include/cpu.h#2 integrate .. //depot/projects/sack/sparc64/sbus/lsi64854.c#1 branch .. //depot/projects/sack/sparc64/sbus/lsi64854reg.h#1 branch .. //depot/projects/sack/sparc64/sbus/lsi64854var.h#1 branch .. //depot/projects/sack/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/sack/sys/_lock.h#2 integrate .. //depot/projects/sack/sys/_types.h#3 integrate .. //depot/projects/sack/sys/acct.h#2 integrate .. //depot/projects/sack/sys/bio.h#2 integrate .. //depot/projects/sack/sys/conf.h#2 integrate .. //depot/projects/sack/sys/file.h#2 integrate .. //depot/projects/sack/sys/kernel.h#2 integrate .. //depot/projects/sack/sys/linedisc.h#2 integrate .. //depot/projects/sack/sys/mac.h#2 integrate .. //depot/projects/sack/sys/mac_policy.h#2 integrate .. //depot/projects/sack/sys/mbuf.h#3 integrate .. //depot/projects/sack/sys/mount.h#2 integrate .. //depot/projects/sack/sys/mutex.h#2 integrate .. //depot/projects/sack/sys/param.h#3 integrate .. //depot/projects/sack/sys/proc.h#2 integrate .. //depot/projects/sack/sys/sched.h#2 integrate .. //depot/projects/sack/sys/snoop.h#2 integrate .. //depot/projects/sack/sys/socketvar.h#3 integrate .. //depot/projects/sack/sys/stat.h#2 integrate .. //depot/projects/sack/sys/sysctl.h#2 integrate .. //depot/projects/sack/sys/systm.h#2 integrate .. //depot/projects/sack/sys/tty.h#3 integrate .. //depot/projects/sack/sys/types.h#3 integrate .. //depot/projects/sack/sys/user.h#2 integrate .. //depot/projects/sack/sys/vnode.h#2 integrate .. //depot/projects/sack/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/sack/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/sack/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/sack/ufs/ufs/dinode.h#2 integrate .. //depot/projects/sack/ufs/ufs/ufs_extern.h#2 integrate .. //depot/projects/sack/ufs/ufs/ufs_ihash.c#2 integrate .. //depot/projects/sack/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/sack/vm/device_pager.c#2 integrate .. //depot/projects/sack/vm/swap_pager.c#2 integrate .. //depot/projects/sack/vm/vm_contig.c#2 integrate .. //depot/projects/sack/vm/vm_glue.c#2 integrate .. //depot/projects/sack/vm/vm_page.c#2 integrate .. //depot/projects/sack/vm/vm_pageout.c#2 integrate .. //depot/projects/sack/vm/vm_param.h#2 integrate Differences ... ==== //depot/projects/sack/alpha/alpha/mem.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.49 2004/06/03 05:58:27 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.50 2004/06/16 09:46:26 phk Exp $"); /* * Memory special file @@ -67,9 +67,9 @@ #include #include -static dev_t memdev, kmemdev; +static struct cdev *memdev, *kmemdev; #ifdef PERFMON -static dev_t perfdev; +static struct cdev *perfdev; #endif /* PERFMON */ static d_open_t mmopen; @@ -95,7 +95,7 @@ struct mem_range_softc mem_range_softc; static int -mmclose(dev_t dev, int flags, int fmt, struct thread *td) +mmclose(struct cdev *dev, int flags, int fmt, struct thread *td) { switch (minor(dev)) { #ifdef PERFMON @@ -109,7 +109,7 @@ } static int -mmopen(dev_t dev, int flags, int fmt, struct thread *td) +mmopen(struct cdev *dev, int flags, int fmt, struct thread *td) { int error; @@ -136,7 +136,7 @@ /*ARGSUSED*/ static int -mmrw(dev_t dev, struct uio *uio, int flags) +mmrw(struct cdev *dev, struct uio *uio, int flags) { vm_offset_t o, v; int c = 0; @@ -219,7 +219,7 @@ * instead of going through read/write * \*******************************************************/ static int -memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) +memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) { /* * /dev/mem is the only one that makes sense through this @@ -240,7 +240,7 @@ } static int -mmioctl(dev_t dev, u_long cmd, caddr_t cmdarg, int flags, struct thread *td) +mmioctl(struct cdev *dev, u_long cmd, caddr_t cmdarg, int flags, struct thread *td) { switch(minor(dev)) { #ifdef PERFMON ==== //depot/projects/sack/alpha/alpha/pmap.c#3 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.149 2004/06/12 06:03:27 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.150 2004/06/15 19:28:39 alc Exp $"); #include #include @@ -1425,12 +1425,6 @@ return uma_zalloc(pvzone, M_NOWAIT); } -/* - * If it is the first entry on the list, it is actually - * in the header and we must copy the following entry up - * to the header. Otherwise we must search the list for - * the entry. In either case we free the now unused entry. - */ static int pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va) ==== //depot/projects/sack/alpha/alpha/promcons.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.38 2004/06/04 16:02:48 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.39 2004/06/16 09:46:26 phk Exp $"); #include #include @@ -86,7 +86,7 @@ int promopen(dev, flag, mode, td) - dev_t dev; + struct cdev *dev; int flag, mode; struct thread *td; { @@ -137,7 +137,7 @@ int promclose(dev, flag, mode, td) - dev_t dev; + struct cdev *dev; int flag, mode; struct thread *td; { ==== //depot/projects/sack/alpha/include/cpu.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.37 2004/04/05 21:00:50 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.39 2004/06/20 03:52:48 bde Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /* ==== //depot/projects/sack/alpha/tlsb/zs_tlsb.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.44 2004/06/04 16:02:48 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.45 2004/06/16 09:46:27 phk Exp $"); #include "opt_ddb.h" @@ -258,7 +258,7 @@ static int -zsopen(dev_t dev, int flag, int mode, struct thread *td) +zsopen(struct cdev *dev, int flag, int mode, struct thread *td) { struct zs_softc *sc = ZS_SOFTC(minor(dev)); struct tty *tp; @@ -305,7 +305,7 @@ } static int -zsclose(dev_t dev, int flag, int mode, struct thread *td) +zsclose(struct cdev *dev, int flag, int mode, struct thread *td) { struct zs_softc *sc = ZS_SOFTC(minor(dev)); struct tty *tp; ==== //depot/projects/sack/amd64/amd64/fpu.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.153 2004/06/08 01:35:48 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.154 2004/06/18 04:01:54 peter Exp $"); #include #include @@ -125,6 +125,8 @@ ldmxcsr(mxcsr); fxsave(&fpu_cleanstate); start_emulating(); + bzero(fpu_cleanstate.sv_fp, sizeof(fpu_cleanstate.sv_fp)); + bzero(fpu_cleanstate.sv_xmm, sizeof(fpu_cleanstate.sv_xmm)); fpu_cleanstate_ready = 1; intr_restore(savecrit); } @@ -384,7 +386,6 @@ { struct pcb *pcb; register_t s; - u_short control; if (PCPU_GET(fpcurthread) == curthread) { printf("fpudna: fpcurthread == curthread %d times\n", @@ -409,13 +410,10 @@ if ((pcb->pcb_flags & PCB_FPUINITDONE) == 0) { /* - * This is the first time this thread has used the FPU or - * the PCB doesn't contain a clean FPU state. Explicitly - * initialize the FPU and load the default control word. + * This is the first time this thread has used the FPU, + * explicitly load sanitized registers. */ - fninit(); - control = __INITIAL_FPUCW__; - fldcw(&control); + fxrstor(&fpu_cleanstate); pcb->pcb_flags |= PCB_FPUINITDONE; } else fxrstor(&pcb->pcb_save); ==== //depot/projects/sack/amd64/amd64/mem.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.115 2004/06/03 05:58:30 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.116 2004/06/16 09:46:27 phk Exp $"); /* * Memory special file @@ -68,7 +68,7 @@ #include #include -static dev_t memdev, kmemdev, iodev; +static struct cdev *memdev, *kmemdev, *iodev; static d_open_t mmopen; static d_close_t mmclose; @@ -95,7 +95,7 @@ struct mem_range_softc mem_range_softc; static int -mmclose(dev_t dev, int flags, int fmt, struct thread *td) +mmclose(struct cdev *dev, int flags, int fmt, struct thread *td) { switch (minor(dev)) { case 14: @@ -105,7 +105,7 @@ } static int -mmopen(dev_t dev, int flags, int fmt, struct thread *td) +mmopen(struct cdev *dev, int flags, int fmt, struct thread *td) { int error; @@ -133,7 +133,7 @@ /*ARGSUSED*/ static int -mmrw(dev_t dev, struct uio *uio, int flags) +mmrw(struct cdev *dev, struct uio *uio, int flags) { int o; u_long c = 0, v; @@ -214,7 +214,7 @@ * instead of going through read/write * \*******************************************************/ static int -memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) +memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) { switch (minor(dev)) { @@ -242,7 +242,7 @@ * and mem_range_attr_set. */ static int -mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td) +mmioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *td) { int nd, error = 0; struct mem_range_op *mo = (struct mem_range_op *)data; ==== //depot/projects/sack/amd64/amd64/pmap.c#3 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.470 2004/06/14 01:17:50 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.478 2004/06/20 20:57:05 alc Exp $"); /* * Manages physical address maps. @@ -196,13 +196,11 @@ */ pt_entry_t *CMAP1 = 0; caddr_t CADDR1 = 0; -static pt_entry_t *msgbufmap; struct msgbuf *msgbufp = 0; /* * Crashdump maps. */ -static pt_entry_t *pt_crashdumpmap; static caddr_t crashdumpmap; static PMAP_INLINE void free_pv_entry(pv_entry_t pv); @@ -441,7 +439,7 @@ vm_paddr_t *firstaddr; { vm_offset_t va; - pt_entry_t *pte; + pt_entry_t *pte, *unused; avail_start = *firstaddr; @@ -493,14 +491,12 @@ /* * Crashdump maps. */ - SYSMAP(caddr_t, pt_crashdumpmap, crashdumpmap, MAXDUMPPGS); + SYSMAP(caddr_t, unused, crashdumpmap, MAXDUMPPGS) /* * msgbufp is used to map the system message buffer. - * XXX msgbufmap is not used. */ - SYSMAP(struct msgbuf *, msgbufmap, msgbufp, - atop(round_page(MSGBUF_SIZE))) + SYSMAP(struct msgbuf *, unused, msgbufp, atop(round_page(MSGBUF_SIZE))) virtual_avail = va; @@ -774,19 +770,23 @@ if (pmap == 0) return 0; + PMAP_LOCK(pmap); pdep = pmap_pde(pmap, va); if (pdep) { pde = *pdep; if (pde) { if ((pde & PG_PS) != 0) { rtval = (pde & ~PDRMASK) | (va & PDRMASK); + PMAP_UNLOCK(pmap); return rtval; } pte = pmap_pte(pmap, va); rtval = ((*pte & PG_FRAME) | (va & PAGE_MASK)); + PMAP_UNLOCK(pmap); return rtval; } } + PMAP_UNLOCK(pmap); return 0; } @@ -1223,10 +1223,6 @@ *pd = VM_PAGE_TO_PHYS(m) | PG_U | PG_RW | PG_V | PG_A | PG_M; } - vm_page_lock_queues(); - vm_page_wakeup(m); - vm_page_unlock_queues(); - return m; } @@ -1427,12 +1423,6 @@ return uma_zalloc(pvzone, M_NOWAIT); } -/* - * If it is the first entry on the list, it is actually - * in the header and we must copy the following entry up - * to the header. Otherwise we must search the list for - * the entry. In either case we free the now unused entry. - */ static int pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va) @@ -1440,6 +1430,7 @@ pv_entry_t pv; int rtval; + PMAP_LOCK_ASSERT(pmap, MA_OWNED); mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (m->md.pv_list_count < pmap->pm_stats.resident_count) { TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { @@ -1500,6 +1491,7 @@ pt_entry_t oldpte; vm_page_t m, mpte; + PMAP_LOCK_ASSERT(pmap, MA_OWNED); oldpte = pte_load_clear(ptq); if (oldpte & PG_W) pmap->pm_stats.wired_count -= 1; @@ -1540,6 +1532,7 @@ { pt_entry_t *pte; + PMAP_LOCK_ASSERT(pmap, MA_OWNED); pte = pmap_pte(pmap, va); if (pte == NULL || (*pte & PG_V) == 0) return; @@ -1566,8 +1559,12 @@ if (pmap == NULL) return; + /* + * Perform an unsynchronized read. This is, however, safe. + */ if (pmap->pm_stats.resident_count == 0) return; + PMAP_LOCK(pmap); /* * special handling of removing one page. a very @@ -1578,6 +1575,7 @@ pde = pmap_pde(pmap, sva); if (pde && (*pde & PG_PS) == 0) { pmap_remove_page(pmap, sva); + PMAP_UNLOCK(pmap); return; } } @@ -1648,6 +1646,7 @@ if (anyvalid) pmap_invalidate_all(pmap); + PMAP_UNLOCK(pmap); } /* @@ -1938,7 +1937,9 @@ if (opa) { int err; vm_page_lock_queues(); + PMAP_LOCK(pmap); err = pmap_remove_pte(pmap, pte, va); + PMAP_UNLOCK(pmap); vm_page_unlock_queues(); if (err) panic("pmap_enter: pte vanished, va: 0x%lx", va); @@ -2460,7 +2461,7 @@ #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else - pte = pmap_pte(pv->pv_pmap, pv->pv_va); + pte = pmap_pte(pmap, pv->pv_va); #endif tpte = *pte; @@ -2486,7 +2487,7 @@ KASSERT(m < &vm_page_array[vm_page_array_size], ("pmap_remove_pages: bad tpte %#jx", (uintmax_t)tpte)); - pv->pv_pmap->pm_stats.resident_count--; + pmap->pm_stats.resident_count--; pte_clear(pte); @@ -2498,15 +2499,14 @@ } npv = TAILQ_NEXT(pv, pv_plist); - TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); + TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_FIRST(&m->md.pv_list) == NULL) { + if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - } - pmap_unuse_pt(pv->pv_pmap, pv->pv_va, pv->pv_ptem); + pmap_unuse_pt(pmap, pv->pv_va, pv->pv_ptem); free_pv_entry(pv); } pmap_invalidate_all(pmap); @@ -2524,9 +2524,11 @@ { pv_entry_t pv; pt_entry_t *pte; + boolean_t rv; + rv = FALSE; if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) - return FALSE; + return (rv); mtx_assert(&vm_page_queue_mtx, MA_OWNED); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { @@ -2545,13 +2547,12 @@ #endif PMAP_LOCK(pv->pv_pmap); pte = pmap_pte(pv->pv_pmap, pv->pv_va); - if (*pte & PG_M) { - PMAP_UNLOCK(pv->pv_pmap); - return TRUE; - } + rv = (*pte & PG_M) != 0; PMAP_UNLOCK(pv->pv_pmap); + if (rv) + break; } - return (FALSE); + return (rv); } /* @@ -2565,14 +2566,17 @@ { pd_entry_t *pde; pt_entry_t *pte; + boolean_t rv; + rv = FALSE; + PMAP_LOCK(pmap); pde = pmap_pde(pmap, addr); - if (pde == NULL || (*pde & PG_V) == 0) - return (FALSE); - pte = vtopte(addr); - if ((*pte & PG_V) == 0) - return (FALSE); - return (TRUE); + if (pde != NULL && (*pde & PG_V)) { + pte = vtopte(addr); + rv = (*pte & PG_V) == 0; + } + PMAP_UNLOCK(pmap); + return (rv); } /* @@ -2791,12 +2795,12 @@ vm_page_t m; int val = 0; + PMAP_LOCK(pmap); ptep = pmap_pte(pmap, addr); - if (ptep == 0) { - return 0; - } + pte = (ptep != NULL) ? *ptep : 0; + PMAP_UNLOCK(pmap); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 21 04:07:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A9FA16A4D0; Mon, 21 Jun 2004 04:07:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 03A9016A4CE for ; Mon, 21 Jun 2004 04:07:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F009B43D39 for ; Mon, 21 Jun 2004 04:07:31 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5L47UQ9073667 for ; Mon, 21 Jun 2004 04:07:31 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5L47UaS073664 for perforce@freebsd.org; Mon, 21 Jun 2004 04:07:30 GMT (envelope-from marcel@freebsd.org) Date: Mon, 21 Jun 2004 04:07:30 GMT Message-Id: <200406210407.i5L47UaS073664@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 Subject: PERFORCE change 55437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2004 04:07:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=55437 Change 55437 by marcel@marcel_nfs on 2004/06/21 04:06:55 IFC @55425 Affected files ... .. //depot/projects/gdb/bin/ps/extern.h#3 integrate .. //depot/projects/gdb/bin/ps/keyword.c#4 integrate .. //depot/projects/gdb/bin/ps/print.c#4 integrate .. //depot/projects/gdb/bin/ps/ps.c#12 integrate .. //depot/projects/gdb/bin/ps/ps.h#3 integrate .. //depot/projects/gdb/contrib/gdb/gdb/abug-rom.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/ada-tasks.c#5 integrate .. //depot/projects/gdb/contrib/gdb/gdb/alpha-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/arm-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/coff-solib.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/coff-solib.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/nm-gnu.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/nm-lynx.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/nm-nbsd.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/nm-sysv4.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/tm-lynx.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/tm-sunos.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/tm-sysv4.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/xm-nbsd.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/xm-sysv4.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/cpu32bug-rom.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gnu-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/gnu-nat.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/i386-stub.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/i386gnu-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/i386ly-tdep.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/i386v-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/i386v4-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/lynx-nat.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/minimon.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/monitor.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/monitor.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/ppcbug-rom.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/procfs.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/remote-e7000.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/remote-est.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/remote-hms.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/remote-mips.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/remote-rdp.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/remote-sds.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/remote-sim.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/remote-st.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/remote-vx.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/remote-vx68.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/remote-vxmips.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/remote-vxsparc.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/ser-e7kpc.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/ser-go32.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/somread.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/somsolib.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/somsolib.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/srec.h#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/standalone.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/stop-gdb.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui.c#5 branch .. //depot/projects/gdb/contrib/gdb/gdb/tui/tui.h#5 branch .. //depot/projects/gdb/contrib/gdb/gdb/xcoffread.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/xcoffsolib.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/xmodem.c#4 branch .. //depot/projects/gdb/contrib/gdb/gdb/xmodem.h#4 branch .. //depot/projects/gdb/contrib/gdb/include/COPYING#3 branch .. //depot/projects/gdb/contrib/gdb/include/ansidecl.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/bfdlink.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/bout.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/demangle.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/dis-asm.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/floatformat.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/fopen-bin.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/fopen-same.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/gdbm.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/getopt.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/hp-symtab.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/ieee.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/libiberty.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/oasys.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/obstack.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/os9k.h#3 branch .. //depot/projects/gdb/contrib/gdb/include/progress.h#3 branch .. //depot/projects/gdb/contrib/gdb/move-if-change#3 branch .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.sparc64#4 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/sparc64/elf64-sparc.c-bad-rtld.diff#2 delete .. //depot/projects/gdb/sys/conf/ldscript.ia64#2 integrate .. //depot/projects/gdb/sys/kern/kern_proc.c#12 integrate .. //depot/projects/gdb/sys/kern/uipc_socket.c#14 integrate .. //depot/projects/gdb/sys/kern/uipc_socket2.c#12 integrate .. //depot/projects/gdb/sys/kern/uipc_usrreq.c#10 integrate .. //depot/projects/gdb/sys/netgraph/ng_fec.c#5 integrate .. //depot/projects/gdb/sys/netinet/tcp_subr.c#9 integrate .. //depot/projects/gdb/sys/netipx/spx_usrreq.c#4 integrate .. //depot/projects/gdb/sys/netkey/keysock.c#2 integrate .. //depot/projects/gdb/sys/sys/mutex.h#4 integrate .. //depot/projects/gdb/sys/sys/socketvar.h#7 integrate .. //depot/projects/gdb/sys/sys/user.h#7 integrate .. //depot/projects/gdb/usr.sbin/zic/private.h#2 integrate .. //depot/projects/gdb/usr.sbin/zic/zdump.8#2 integrate .. //depot/projects/gdb/usr.sbin/zic/zdump.c#2 integrate .. //depot/projects/gdb/usr.sbin/zic/zic.8#2 integrate .. //depot/projects/gdb/usr.sbin/zic/zic.c#2 integrate Differences ... ==== //depot/projects/gdb/bin/ps/extern.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.32 2004/04/06 20:06:49 markm Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.33 2004/06/20 23:40:54 gad Exp $ */ struct kinfo; @@ -48,6 +48,7 @@ void cputime(KINFO *, VARENT *); int donlist(void); void elapsed(KINFO *, VARENT *); +void emulname(KINFO *, VARENT *); VARENT *find_varentry(VAR *); const char *fmt_argv(char **, char *, size_t); double getpcpu(const KINFO *); ==== //depot/projects/gdb/bin/ps/keyword.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.66 2004/04/06 20:06:49 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.68 2004/06/20 23:40:54 gad Exp $"); #include #include @@ -57,6 +57,11 @@ #define KOFF(x) offsetof(struct kinfo_proc, x) #define ROFF(x) offsetof(struct rusage, x) +#define EMULLEN 13 /* enough for "FreeBSD ELF32" */ +#define LWPFMT "d" +#define LWPLEN 6 +#define NLWPFMT "d" +#define NLWPLEN 4 #define UIDFMT "u" #define UIDLEN 5 #define PIDFMT "d" @@ -81,6 +86,8 @@ {"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d", 0}, {"cputime", "", "time", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, + {"emul", "EMUL", NULL, LJUST, emulname, NULL, EMULLEN, 0, CHAR, + NULL, 0}, {"etime", "ELAPSED", NULL, USER, elapsed, NULL, 12, 0, CHAR, NULL, 0}, {"f", "F", NULL, 0, kvar, NULL, 7, KOFF(ki_flag), INT, "x", 0}, {"flags", "", "f", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, @@ -102,6 +109,8 @@ {"logname", "", "login", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"lstart", "STARTED", NULL, LJUST|USER, lstarted, NULL, 28, 0, CHAR, NULL, 0}, + {"lwp", "LWP", NULL, 0, kvar, NULL, LWPLEN, KOFF(ki_tid), UINT, + LWPFMT, 0}, {"majflt", "MAJFLT", NULL, USER, rvar, NULL, 4, ROFF(ru_majflt), LONG, "ld", 0}, {"minflt", "MINFLT", NULL, USER, rvar, NULL, 4, ROFF(ru_minflt), @@ -116,6 +125,8 @@ 0}, {"nivcsw", "NIVCSW", NULL, USER, rvar, NULL, 5, ROFF(ru_nivcsw), LONG, "ld", 0}, + {"nlwp", "NLWP", NULL, 0, kvar, NULL, NLWPLEN, KOFF(ki_numthreads), + UINT, NLWPFMT, 0}, {"nsignals", "", "nsigs", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"nsigs", "NSIGS", NULL, USER, rvar, NULL, 4, ROFF(ru_nsignals), LONG, "ld", 0}, ==== //depot/projects/gdb/bin/ps/print.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.85 2004/04/06 20:06:49 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.87 2004/06/20 23:40:54 gad Exp $"); #include #include @@ -750,6 +750,15 @@ } void +emulname(KINFO *k, VARENT *ve) +{ + VAR *v; + + v = ve->var; + printf("%-*s", v->width, *k->ki_p->ki_emul ? k->ki_p->ki_emul : "-"); +} + +void label(KINFO *k, VARENT *ve) { char *string; @@ -774,7 +783,7 @@ (void)printf("%-*s", v->width, string); free(string); } else - (void)printf("%-*s", v->width, ""); + (void)printf("%-*s", v->width, " -"); return; } ==== //depot/projects/gdb/bin/ps/ps.c#12 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.98 2004/06/01 23:27:11 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.99 2004/06/20 21:25:10 gad Exp $"); #include #include @@ -166,6 +166,7 @@ struct listinfo gidlist, pgrplist, pidlist; struct listinfo ruidlist, sesslist, ttylist, uidlist; struct kinfo_proc *kp; + KINFO *next_KINFO; struct varent *vent; struct winsize ws; const char *nlistf, *memf; @@ -569,10 +570,15 @@ continue; keepit: - kinfo[nkept].ki_p = kp; + next_KINFO = &kinfo[nkept]; + next_KINFO->ki_p = kp; + next_KINFO->ki_pcpu = getpcpu(next_KINFO); + if (sortby == SORTMEM) + next_KINFO->ki_memsize = kp->ki_tsize + + kp->ki_dsize + kp->ki_ssize; if (needuser) - saveuser(&kinfo[nkept]); - dynsizevars(&kinfo[nkept]); + saveuser(next_KINFO); + dynsizevars(next_KINFO); nkept++; } } @@ -989,53 +995,40 @@ } } +/* A macro used to improve the readability of pscomp(). */ +#define DIFF_RETURN(a, b, field) do { \ + if ((a)->field != (b)->field) \ + return (((a)->field < (b)->field) ? -1 : 1); \ +} while (0) + static int pscomp(const void *a, const void *b) { const KINFO *ka, *kb; - double cpua, cpub; - segsz_t sizea, sizeb; ka = a; kb = b; /* SORTCPU and SORTMEM are sorted in descending order. */ - if (sortby == SORTCPU) { - cpua = getpcpu(ka); - cpub = getpcpu(kb); - if (cpua < cpub) - return (1); - if (cpua > cpub) - return (-1); - } - if (sortby == SORTMEM) { - sizea = ka->ki_p->ki_tsize + ka->ki_p->ki_dsize + - ka->ki_p->ki_ssize; - sizeb = kb->ki_p->ki_tsize + kb->ki_p->ki_dsize + - kb->ki_p->ki_ssize; - if (sizea < sizeb) - return (1); - if (sizea > sizeb) - return (-1); - } + if (sortby == SORTCPU) + DIFF_RETURN(kb, ka, ki_pcpu); + if (sortby == SORTMEM) + DIFF_RETURN(kb, ka, ki_memsize); /* * TTY's are sorted in ascending order, except that all NODEV * processes come before all processes with a device. */ - if (ka->ki_p->ki_tdev == NODEV && kb->ki_p->ki_tdev != NODEV) - return (-1); - if (ka->ki_p->ki_tdev != NODEV && kb->ki_p->ki_tdev == NODEV) - return (1); - if (ka->ki_p->ki_tdev < kb->ki_p->ki_tdev) - return (-1); - if (ka->ki_p->ki_tdev > kb->ki_p->ki_tdev) - return (1); - /* PID's are sorted in ascending order. */ - if (ka->ki_p->ki_pid < kb->ki_p->ki_pid) - return (-1); - if (ka->ki_p->ki_pid > kb->ki_p->ki_pid) - return (1); + if (ka->ki_p->ki_tdev != kb->ki_p->ki_tdev) { + if (ka->ki_p->ki_tdev == NODEV) + return (-1); + if (kb->ki_p->ki_tdev == NODEV) + return (1); + DIFF_RETURN(ka, kb, ki_p->ki_tdev); + } + + DIFF_RETURN(ka, kb, ki_p->ki_pid); return (0); } +#undef DIFF_RETURN /* * ICK (all for getopt), would rather hide the ugliness ==== //depot/projects/gdb/bin/ps/ps.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ps.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ps/ps.h,v 1.17 2004/04/06 20:06:49 markm Exp $ + * $FreeBSD: src/bin/ps/ps.h,v 1.18 2004/06/20 21:25:10 gad Exp $ */ #define UNLIMITED 0 /* unlimited terminal width */ @@ -38,6 +38,8 @@ char *ki_args; /* exec args */ char *ki_env; /* environment */ int ki_valid; /* 1 => uarea stuff valid */ + double ki_pcpu; /* calculated in main() */ + segsz_t ki_memsize; /* calculated in main() */ } KINFO; /* Variables. */ ==== //depot/projects/gdb/contrib/gdb/gdb/ada-tasks.c#5 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.sparc64#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.sparc64,v 1.9 2004/06/19 20:37:38 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.sparc64,v 1.10 2004/06/20 09:46:13 obrien Exp $ DEFAULT_VECTOR= bfd_elf64_sparc_vec @@ -7,7 +7,7 @@ elf32-sparc.c \ elf32-target.h \ elf32.c \ - elf64-sparc%FIXED.c \ + elf64-sparc.c \ elf64-target.h \ elf64.c \ elflink.c \ @@ -20,8 +20,3 @@ .endif CLEANFILES+= elf32-target.h elf64-target.h - -CLEANFILES+= elf64-sparc%FIXED.c -elf64-sparc%FIXED.c: elf64-sparc.c elf64-sparc.c-bad-rtld.diff - cp ${.ALLSRC:M*.c} ${.TARGET} - patch -b .orig < ${.ALLSRC:M*.diff} ==== //depot/projects/gdb/sys/conf/ldscript.ia64#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.10 2003/09/06 05:15:36 marcel Exp $ */ +/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.11 2004/06/20 22:32:19 marcel Exp $ */ OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") OUTPUT_ARCH(ia64) ENTRY(__start) @@ -74,6 +74,8 @@ *(.dtors) *(SORT(.dtors.*)) } + . = ALIGN(16); + __gp = . + 0x200000; .got : { *(.got.plt) *(.got) } .IA_64.pltoff : { *(.IA_64.pltoff) } /* We want the small data sections together, so single-instruction offsets ==== //depot/projects/gdb/sys/kern/kern_proc.c#12 (text+ko) ==== @@ -27,11 +27,11 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.7 (Berkeley) 2/14/95 - * $FreeBSD: src/sys/kern/kern_proc.c,v 1.210 2004/06/20 02:03:33 gad Exp $ + * $FreeBSD: src/sys/kern/kern_proc.c,v 1.211 2004/06/20 22:17:22 gad Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.210 2004/06/20 02:03:33 gad Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.211 2004/06/20 22:17:22 gad Exp $"); #include "opt_ktrace.h" #include "opt_kstack_pages.h" @@ -763,6 +763,8 @@ kp->ki_lastcpu = td->td_lastcpu; kp->ki_oncpu = td->td_oncpu; kp->ki_tdflags = td->td_flags; + kp->ki_tid = td->td_tid; + kp->ki_numthreads = p->p_numthreads; kp->ki_pcb = td->td_pcb; kp->ki_kstack = (void *)td->td_kstack; kp->ki_pctcpu = sched_pctcpu(td); ==== //depot/projects/gdb/sys/kern/uipc_socket.c#14 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.185 2004/06/20 17:50:42 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.186 2004/06/21 00:20:42 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -348,9 +348,15 @@ SOCKBUF_LOCK(&so->so_snd); so->so_snd.sb_flags |= SB_NOINTR; (void)sblock(&so->so_snd, M_WAITOK); - socantsendmore(so); + /* + * socantsendmore_locked() drops the socket buffer mutex so that it + * can safely perform wakeups. Re-acquire the mutex before + * continuing. + */ + socantsendmore_locked(so); + SOCKBUF_LOCK(&so->so_snd); sbunlock(&so->so_snd); - sbrelease(&so->so_snd, so); + sbrelease_locked(&so->so_snd, so); SOCKBUF_UNLOCK(&so->so_snd); sorflush(so); sodealloc(so); @@ -1202,7 +1208,7 @@ flags |= MSG_TRUNC; if ((flags & MSG_PEEK) == 0) { SOCKBUF_LOCK_ASSERT(&so->so_rcv); - (void) sbdroprecord(&so->so_rcv); + (void) sbdroprecord_locked(&so->so_rcv); } } if ((flags & MSG_PEEK) == 0) { @@ -1271,23 +1277,41 @@ struct protosw *pr = so->so_proto; struct sockbuf asb; + /* + * XXXRW: This is quite ugly. The existing code made a copy of the + * socket buffer, then zero'd the original to clear the buffer + * fields. However, with mutexes in the socket buffer, this causes + * problems. We only clear the zeroable bits of the original; + * however, we have to initialize and destroy the mutex in the copy + * so that dom_dispose() and sbrelease() can lock t as needed. + */ SOCKBUF_LOCK(sb); sb->sb_flags |= SB_NOINTR; (void) sblock(sb, M_WAITOK); - socantrcvmore(so); + /* + * socantrcvmore_locked() drops the socket buffer mutex so that it + * can safely perform wakeups. Re-acquire the mutex before + * continuing. + */ + socantrcvmore_locked(so); + SOCKBUF_LOCK(sb); sbunlock(sb); - asb = *sb; /* - * Invalidate/clear most of the sockbuf structure, but keep - * its selinfo structure valid. + * Invalidate/clear most of the sockbuf structure, but leave + * selinfo and mutex data unchanged. */ + bzero(&asb, offsetof(struct sockbuf, sb_startzero)); + bcopy(&sb->sb_startzero, &asb.sb_startzero, + sizeof(*sb) - offsetof(struct sockbuf, sb_startzero)); bzero(&sb->sb_startzero, sizeof(*sb) - offsetof(struct sockbuf, sb_startzero)); SOCKBUF_UNLOCK(sb); + SOCKBUF_LOCK_INIT(&asb, "so_rcv"); if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose != NULL) (*pr->pr_domain->dom_dispose)(asb.sb_mb); sbrelease(&asb, so); + SOCKBUF_LOCK_DESTROY(&asb); } #ifdef INET ==== //depot/projects/gdb/sys/kern/uipc_socket2.c#12 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.133 2004/06/19 03:23:14 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.134 2004/06/21 00:20:42 rwatson Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -197,9 +197,9 @@ SOCKBUF_UNLOCK(&so->so_rcv); SOCKBUF_LOCK(&so->so_snd); so->so_snd.sb_state |= SBS_CANTSENDMORE; + sbdrop_locked(&so->so_snd, so->so_snd.sb_cc); SOCKBUF_UNLOCK(&so->so_snd); wakeup(&so->so_timeo); - sbdrop(&so->so_snd, so->so_snd.sb_cc); sowwakeup(so); sorwakeup(so); } @@ -296,14 +296,38 @@ * protocol when it detects that the peer will send no more data. * Data queued for reading in the socket may yet be read. */ +void +socantsendmore_locked(so) + struct socket *so; +{ + SOCKBUF_LOCK_ASSERT(&so->so_snd); + + so->so_snd.sb_state |= SBS_CANTSENDMORE; + sowwakeup_locked(so); + mtx_assert(SOCKBUF_MTX(&so->so_snd), MA_NOTOWNED); +} + void socantsendmore(so) struct socket *so; { - so->so_snd.sb_state |= SBS_CANTSENDMORE; - sowwakeup(so); + SOCKBUF_LOCK(&so->so_snd); + socantsendmore_locked(so); + mtx_assert(SOCKBUF_MTX(&so->so_snd), MA_NOTOWNED); +} + +void +socantrcvmore_locked(so) + struct socket *so; +{ + + SOCKBUF_LOCK_ASSERT(&so->so_rcv); + + so->so_rcv.sb_state |= SBS_CANTRCVMORE; + sorwakeup_locked(so); + mtx_assert(SOCKBUF_MTX(&so->so_rcv), MA_NOTOWNED); } void @@ -311,8 +335,9 @@ struct socket *so; { - so->so_rcv.sb_state |= SBS_CANTRCVMORE; - sorwakeup(so); + SOCKBUF_LOCK(&so->so_rcv); + socantrcvmore_locked(so); + mtx_assert(SOCKBUF_MTX(&so->so_rcv), MA_NOTOWNED); } /* @@ -356,9 +381,16 @@ } /* - * Wakeup processes waiting on a socket buffer. - * Do asynchronous notification via SIGIO - * if the socket has the SS_ASYNC flag set. + * Wakeup processes waiting on a socket buffer. Do asynchronous + * notification via SIGIO if the socket has the SS_ASYNC flag set. + * + * Called with the socket buffer lock held; will release the lock by the end + * of the function. This allows the caller to acquire the socket buffer lock + * while testing for the need for various sorts of wakeup and hold it through + * to the point where it's no longer required. We currently hold the lock + * through calls out to other subsystems (with the exception of kqueue), and + * then release it to avoid lock order issues. It's not clear that's + * correct. */ void sowakeup(so, sb) @@ -366,19 +398,23 @@ register struct sockbuf *sb; { + SOCKBUF_LOCK_ASSERT(sb); + selwakeuppri(&sb->sb_sel, PSOCK); sb->sb_flags &= ~SB_SEL; if (sb->sb_flags & SB_WAIT) { sb->sb_flags &= ~SB_WAIT; wakeup(&sb->sb_cc); } + KNOTE(&sb->sb_sel.si_note, 0); + SOCKBUF_UNLOCK(sb); if ((so->so_state & SS_ASYNC) && so->so_sigio != NULL) pgsigio(&so->so_sigio, SIGIO, 0); if (sb->sb_flags & SB_UPCALL) (*so->so_upcall)(so, so->so_upcallarg, M_DONTWAIT); if (sb->sb_flags & SB_AIO) aio_swake(so, sb); - KNOTE(&sb->sb_sel.si_note, 0); + mtx_assert(SOCKBUF_MTX(sb), MA_NOTOWNED); } /* @@ -500,17 +536,29 @@ * Free mbufs held by a socket, and reserved mbuf space. */ void -sbrelease(sb, so) +sbrelease_locked(sb, so) struct sockbuf *sb; struct socket *so; { - sbflush(sb); + SOCKBUF_LOCK_ASSERT(sb); + + sbflush_locked(sb); (void)chgsbsize(so->so_cred->cr_uidinfo, &sb->sb_hiwat, 0, RLIM_INFINITY); sb->sb_mbmax = 0; } +void +sbrelease(sb, so) + struct sockbuf *sb; + struct socket *so; +{ + + SOCKBUF_LOCK(sb); + sbrelease_locked(sb, so); + SOCKBUF_UNLOCK(sb); +} /* * Routines to add and remove * data from an mbuf queue. @@ -542,6 +590,8 @@ { struct mbuf *m = sb->sb_mb; + SOCKBUF_LOCK_ASSERT(sb); + while (m && m->m_nextpkt) m = m->m_nextpkt; @@ -561,6 +611,8 @@ struct mbuf *m = sb->sb_mb; struct mbuf *n; + SOCKBUF_LOCK_ASSERT(sb); + while (m && m->m_nextpkt) m = m->m_nextpkt; @@ -583,6 +635,7 @@ #endif /* SOCKBUF_DEBUG */ #define SBLINKRECORD(sb, m0) do { \ + SOCKBUF_LOCK_ASSERT(sb); \ if ((sb)->sb_lastrecord != NULL) \ (sb)->sb_lastrecord->m_nextpkt = (m0); \ else \ @@ -597,14 +650,17 @@ * discarded and mbufs are compacted where possible. */ void -sbappend(sb, m) +sbappend_locked(sb, m) struct sockbuf *sb; struct mbuf *m; { register struct mbuf *n; + SOCKBUF_LOCK_ASSERT(sb); + if (m == 0) return; + SBLASTRECORDCHK(sb); n = sb->sb_mb; if (n) { @@ -612,7 +668,7 @@ n = n->m_nextpkt; do { if (n->m_flags & M_EOR) { - sbappendrecord(sb, m); /* XXXXXX!!!! */ + sbappendrecord_locked(sb, m); /* XXXXXX!!!! */ return; } } while (n->m_next && (n = n->m_next)); @@ -625,7 +681,7 @@ if ((n = sb->sb_lastrecord) != NULL) { do { if (n->m_flags & M_EOR) { - sbappendrecord(sb, m); /* XXXXXX!!!! */ + sbappendrecord_locked(sb, m); /* XXXXXX!!!! */ return; } } while (n->m_next && (n = n->m_next)); @@ -642,13 +698,31 @@ } /* + * Append mbuf chain m to the last record in the + * socket buffer sb. The additional space associated + * the mbuf chain is recorded in sb. Empty mbufs are + * discarded and mbufs are compacted where possible. + */ +void +sbappend(sb, m) + struct sockbuf *sb; + struct mbuf *m; +{ + + SOCKBUF_LOCK(sb); + sbappend_locked(sb, m); + SOCKBUF_UNLOCK(sb); +} + +/* * This version of sbappend() should only be used when the caller * absolutely knows that there will never be more than one record * in the socket buffer, that is, a stream protocol (such as TCP). */ void -sbappendstream(struct sockbuf *sb, struct mbuf *m) +sbappendstream_locked(struct sockbuf *sb, struct mbuf *m) { + SOCKBUF_LOCK_ASSERT(sb); KASSERT(m->m_nextpkt == NULL,("sbappendstream 0")); KASSERT(sb->sb_mb == sb->sb_lastrecord,("sbappendstream 1")); @@ -661,6 +735,20 @@ SBLASTRECORDCHK(sb); } +/* + * This version of sbappend() should only be used when the caller + * absolutely knows that there will never be more than one record + * in the socket buffer, that is, a stream protocol (such as TCP). + */ +void +sbappendstream(struct sockbuf *sb, struct mbuf *m) +{ + + SOCKBUF_LOCK(sb); + sbappendstream_locked(sb, m); + SOCKBUF_UNLOCK(sb); +} + #ifdef SOCKBUF_DEBUG void sbcheck(sb) @@ -670,6 +758,8 @@ struct mbuf *n = 0; u_long len = 0, mbcnt = 0; + SOCKBUF_LOCK_ASSERT(sb); + for (m = sb->sb_mb; m; m = n) { n = m->m_nextpkt; for (; m; m = m->m_next) { @@ -692,12 +782,14 @@ * begins a new record. */ void -sbappendrecord(sb, m0) +sbappendrecord_locked(sb, m0) register struct sockbuf *sb; register struct mbuf *m0; { register struct mbuf *m; + SOCKBUF_LOCK_ASSERT(sb); + if (m0 == 0) return; m = sb->sb_mb; @@ -725,18 +817,35 @@ } /* + * As above, except the mbuf chain + * begins a new record. + */ +void +sbappendrecord(sb, m0) + register struct sockbuf *sb; + register struct mbuf *m0; +{ + + SOCKBUF_LOCK(sb); + sbappendrecord_locked(sb, m0); + SOCKBUF_UNLOCK(sb); +} + +/* * As above except that OOB data * is inserted at the beginning of the sockbuf, * but after any other OOB data. */ void -sbinsertoob(sb, m0) +sbinsertoob_locked(sb, m0) register struct sockbuf *sb; register struct mbuf *m0; { register struct mbuf *m; register struct mbuf **mp; + SOCKBUF_LOCK_ASSERT(sb); + if (m0 == 0) return; for (mp = &sb->sb_mb; *mp ; mp = &((*mp)->m_nextpkt)) { @@ -771,13 +880,29 @@ } /* + * As above except that OOB data + * is inserted at the beginning of the sockbuf, + * but after any other OOB data. + */ +void +sbinsertoob(sb, m0) + register struct sockbuf *sb; + register struct mbuf *m0; +{ + + SOCKBUF_LOCK(sb); + sbinsertoob_locked(sb, m0); + SOCKBUF_UNLOCK(sb); +} + +/* * Append address and data, and optionally, control (ancillary) data * to the receive queue of a socket. If present, * m0 must include a packet header with total length. * Returns 0 if no space in sockbuf or insufficient mbufs. */ int -sbappendaddr(sb, asa, m0, control) +sbappendaddr_locked(sb, asa, m0, control) struct sockbuf *sb; const struct sockaddr *asa; struct mbuf *m0, *control; @@ -785,11 +910,14 @@ struct mbuf *m, *n, *nlast; int space = asa->sa_len; + SOCKBUF_LOCK_ASSERT(sb); + if (m0 && (m0->m_flags & M_PKTHDR) == 0) - panic("sbappendaddr"); + panic("sbappendaddr_locked"); if (m0) space += m0->m_pkthdr.len; space += m_length(control, &n); + if (space > sbspace(sb)) return (0); #if MSIZE <= 256 @@ -819,17 +947,40 @@ return (1); } +/* + * Append address and data, and optionally, control (ancillary) data + * to the receive queue of a socket. If present, + * m0 must include a packet header with total length. + * Returns 0 if no space in sockbuf or insufficient mbufs. + */ int -sbappendcontrol(sb, m0, control) +sbappendaddr(sb, asa, m0, control) + struct sockbuf *sb; + const struct sockaddr *asa; + struct mbuf *m0, *control; +{ + int retval; + + SOCKBUF_LOCK(sb); + retval = sbappendaddr_locked(sb, asa, m0, control); + SOCKBUF_UNLOCK(sb); + return (retval); +} + +int +sbappendcontrol_locked(sb, m0, control) struct sockbuf *sb; struct mbuf *control, *m0; { struct mbuf *m, *n, *mlast; int space; + SOCKBUF_LOCK_ASSERT(sb); + if (control == 0) - panic("sbappendcontrol"); + panic("sbappendcontrol_locked"); space = m_length(control, &n) + m_length(m0, NULL); + if (space > sbspace(sb)) return (0); n->m_next = m0; /* concatenate data to control */ @@ -849,6 +1000,19 @@ return (1); } +int +sbappendcontrol(sb, m0, control) + struct sockbuf *sb; + struct mbuf *control, *m0; +{ + int retval; + + SOCKBUF_LOCK(sb); + retval = sbappendcontrol_locked(sb, m0, control); + SOCKBUF_UNLOCK(sb); + return (retval); +} + /* * Compress mbuf chain m into the socket * buffer sb following mbuf n. If n @@ -862,6 +1026,8 @@ register int eor = 0; register struct mbuf *o; + SOCKBUF_LOCK_ASSERT(sb); + while (m) { eor |= m->m_flags & M_EOR; if (m->m_len == 0 && @@ -914,12 +1080,14 @@ * Check that all resources are reclaimed. */ void -sbflush(sb) +sbflush_locked(sb) register struct sockbuf *sb; { + SOCKBUF_LOCK_ASSERT(sb); + if (sb->sb_flags & SB_LOCK) - panic("sbflush: locked"); + panic("sbflush_locked: locked"); while (sb->sb_mbcnt) { /* * Don't call sbdrop(sb, 0) if the leading mbuf is non-empty: @@ -927,23 +1095,35 @@ */ if (!sb->sb_cc && (sb->sb_mb == NULL || sb->sb_mb->m_len)) break; - sbdrop(sb, (int)sb->sb_cc); + sbdrop_locked(sb, (int)sb->sb_cc); } if (sb->sb_cc || sb->sb_mb || sb->sb_mbcnt) - panic("sbflush: cc %u || mb %p || mbcnt %u", sb->sb_cc, (void *)sb->sb_mb, sb->sb_mbcnt); + panic("sbflush_locked: cc %u || mb %p || mbcnt %u", sb->sb_cc, (void *)sb->sb_mb, sb->sb_mbcnt); +} + +void +sbflush(sb) + register struct sockbuf *sb; +{ + + SOCKBUF_LOCK(sb); + sbflush_locked(sb); + SOCKBUF_UNLOCK(sb); } /* * Drop data from (the front of) a sockbuf. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 21 08:05:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F4C516A4D1; Mon, 21 Jun 2004 08:05:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1EE0E16A4CE for ; Mon, 21 Jun 2004 08:05:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19C0043D58 for ; Mon, 21 Jun 2004 08:05:35 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5L85G55032357 for ; Mon, 21 Jun 2004 08:05:16 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5L85FqN032354 for perforce@freebsd.org; Mon, 21 Jun 2004 08:05:15 GMT (envelope-from julian@freebsd.org) Date: Mon, 21 Jun 2004 08:05:15 GMT Message-Id: <200406210805.i5L85FqN032354@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 55441 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2004 08:05:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=55441 Change 55441 by julian@julian_jules1 on 2004/06/21 08:04:47 add comments Affected files ... .. //depot/projects/nsched/sys/kern/sched_4bsd.c#16 edit Differences ... ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#16 (text+ko) ==== @@ -1916,6 +1916,26 @@ setrunqueue(td); } +/* + * Decide whether to pass this newly runnable thread on to the + * system scheduler. This basically implements the concurrancy + * limit for a KSE. (e.g. "threading fairness") + * Called from: + * kick_init() + * fork1() + * ithread_destroy() + * ithread_schedule() + * kthread_create() + * turnstyle_unpend() + * kse_create() + * thread_switchout() + * pagezero_start() + * * linux_clone() + * sched_switch() (local) + * sched_wakeup() (local) + * sched_thr_newthread() (local) + * adjustrunqueue() (local) + */ void setrunqueue(struct thread *td) { @@ -2028,6 +2048,17 @@ * XXX I'm not sure WHY they are here.. * ************************************************************************/ /* Critical sections that prevent preemption. */ +/* Called from: + * _mtx_lock_spin_flags() + * _mtx_lock_spin() + * ?kmupetest() + * kmstartup() + * intr_execute_handlers + * pmap_invalidate_{page,range,all}() + * pmap_activate() + * vm86_intcall() + * vm86_datacall() + */ void critical_enter(void) { From owner-p4-projects@FreeBSD.ORG Mon Jun 21 16:42:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4779616A4D0; Mon, 21 Jun 2004 16:42:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1578816A4CE for ; Mon, 21 Jun 2004 16:42:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B6C843D39 for ; Mon, 21 Jun 2004 16:42:18 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5LGgE60057348 for ; Mon, 21 Jun 2004 16:42:14 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5LGgD1r057330 for perforce@freebsd.org; Mon, 21 Jun 2004 16:42:13 GMT (envelope-from julian@freebsd.org) Date: Mon, 21 Jun 2004 16:42:13 GMT Message-Id: <200406211642.i5LGgD1r057330@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 55458 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2004 16:42:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=55458 Change 55458 by julian@julian_jules1 on 2004/06/21 16:41:20 IFC Affected files ... .. //depot/projects/nsched/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/nsched/sys/conf/ldscript.ia64#2 integrate .. //depot/projects/nsched/sys/dev/esp/esp_sbus.c#4 integrate .. //depot/projects/nsched/sys/dev/rp/rp.c#5 integrate .. //depot/projects/nsched/sys/dev/rp/rp_pci.c#3 integrate .. //depot/projects/nsched/sys/dev/rp/rpreg.h#3 integrate .. //depot/projects/nsched/sys/geom/gate/g_gate.c#3 integrate .. //depot/projects/nsched/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/nsched/sys/kern/kern_exit.c#13 integrate .. //depot/projects/nsched/sys/kern/kern_proc.c#9 integrate .. //depot/projects/nsched/sys/kern/tty_compat.c#5 integrate .. //depot/projects/nsched/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/nsched/sys/kern/uipc_socket2.c#7 integrate .. //depot/projects/nsched/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/nsched/sys/netgraph/ng_fec.c#5 integrate .. //depot/projects/nsched/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/nsched/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/nsched/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/nsched/sys/netipx/spx_usrreq.c#3 integrate .. //depot/projects/nsched/sys/netkey/keysock.c#2 integrate .. //depot/projects/nsched/sys/sys/mutex.h#2 integrate .. //depot/projects/nsched/sys/sys/socketvar.h#5 integrate .. //depot/projects/nsched/sys/sys/user.h#5 integrate Differences ... ==== //depot/projects/nsched/sys/amd64/amd64/pmap.c#10 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.477 2004/06/20 06:10:59 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.478 2004/06/20 20:57:05 alc Exp $"); /* * Manages physical address maps. @@ -2461,7 +2461,7 @@ #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else - pte = pmap_pte(pv->pv_pmap, pv->pv_va); + pte = pmap_pte(pmap, pv->pv_va); #endif tpte = *pte; @@ -2487,7 +2487,7 @@ KASSERT(m < &vm_page_array[vm_page_array_size], ("pmap_remove_pages: bad tpte %#jx", (uintmax_t)tpte)); - pv->pv_pmap->pm_stats.resident_count--; + pmap->pm_stats.resident_count--; pte_clear(pte); @@ -2499,15 +2499,14 @@ } npv = TAILQ_NEXT(pv, pv_plist); - TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); + TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_FIRST(&m->md.pv_list) == NULL) { + if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - } - pmap_unuse_pt(pv->pv_pmap, pv->pv_va, pv->pv_ptem); + pmap_unuse_pt(pmap, pv->pv_va, pv->pv_ptem); free_pv_entry(pv); } pmap_invalidate_all(pmap); @@ -2525,9 +2524,11 @@ { pv_entry_t pv; pt_entry_t *pte; + boolean_t rv; + rv = FALSE; if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) - return FALSE; + return (rv); mtx_assert(&vm_page_queue_mtx, MA_OWNED); TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { @@ -2546,13 +2547,12 @@ #endif PMAP_LOCK(pv->pv_pmap); pte = pmap_pte(pv->pv_pmap, pv->pv_va); - if (*pte & PG_M) { - PMAP_UNLOCK(pv->pv_pmap); - return TRUE; - } + rv = (*pte & PG_M) != 0; PMAP_UNLOCK(pv->pv_pmap); + if (rv) + break; } - return (FALSE); + return (rv); } /* ==== //depot/projects/nsched/sys/conf/ldscript.ia64#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.10 2003/09/06 05:15:36 marcel Exp $ */ +/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.11 2004/06/20 22:32:19 marcel Exp $ */ OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") OUTPUT_ARCH(ia64) ENTRY(__start) @@ -74,6 +74,8 @@ *(.dtors) *(SORT(.dtors.*)) } + . = ALIGN(16); + __gp = . + 0x200000; .got : { *(.got.plt) *(.got) } .IA_64.pltoff : { *(.IA_64.pltoff) } /* We want the small data sections together, so single-instruction offsets ==== //depot/projects/nsched/sys/dev/esp/esp_sbus.c#4 (text+ko) ==== @@ -65,12 +65,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/esp/esp_sbus.c,v 1.3 2004/06/12 03:23:37 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/esp/esp_sbus.c,v 1.4 2004/06/21 07:27:34 scottl Exp $"); #include #include #include #include +#include #include #include #include ==== //depot/projects/nsched/sys/dev/rp/rp.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/rp/rp.c,v 1.60 2004/06/16 09:46:54 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/rp/rp.c,v 1.61 2004/06/21 13:02:25 gallatin Exp $"); /* * rp.c - for RocketPort FreeBSD @@ -565,6 +565,7 @@ **********************************************************************/ static timeout_t rpdtrwakeup; +struct callout_handle rp_callout_handle; static d_open_t rpopen; static d_close_t rpclose; @@ -789,7 +790,8 @@ } } if(rp_num_ports_open) - timeout(rp_do_poll, (void *)NULL, POLL_INTERVAL); + rp_callout_handle = timeout(rp_do_poll, + (void *)NULL, POLL_INTERVAL); } int @@ -801,7 +803,6 @@ int ChanStatus, line, i, count; int retval; struct rp_port *rp; - struct tty *tty; struct cdev **dev_nodes; unit = device_get_unit(ctlp->dev); @@ -809,9 +810,10 @@ printf("RocketPort%d (Version %s) %d ports.\n", unit, RocketPortVersion, num_ports); rp_num_ports[unit] = num_ports; + callout_handle_init(&rp_callout_handle); ctlp->rp = rp = (struct rp_port *) - malloc(sizeof(struct rp_port) * num_ports, M_TTYS, M_NOWAIT); + malloc(sizeof(struct rp_port) * num_ports, M_TTYS, M_NOWAIT | M_ZERO); if (rp == NULL) { device_printf(ctlp->dev, "rp_attachcommon: Could not malloc rp_ports structures.\n"); retval = ENOMEM; @@ -823,15 +825,6 @@ minor_to_unit[i] = unit; bzero(rp, sizeof(struct rp_port) * num_ports); - ctlp->tty = tty = (struct tty *) - malloc(sizeof(struct tty) * num_ports, M_TTYS, - M_NOWAIT | M_ZERO); - if(tty == NULL) { - device_printf(ctlp->dev, "rp_attachcommon: Could not malloc tty structures.\n"); - retval = ENOMEM; - goto nogo; - } - oldspl = spltty(); rp_addr(unit) = rp; splx(oldspl); @@ -867,15 +860,15 @@ port = 0; for(aiop=0; aiop < num_aiops; aiop++) { num_chan = sGetAiopNumChan(ctlp, aiop); - for(chan=0; chan < num_chan; chan++, port++, rp++, tty++) { - rp->rp_tty = tty; + for(chan=0; chan < num_chan; chan++, port++, rp++) { + rp->rp_tty = ttymalloc(NULL); rp->rp_port = port; rp->rp_ctlp = ctlp; rp->rp_unit = unit; rp->rp_chan = chan; rp->rp_aiop = aiop; - tty->t_line = 0; + rp->rp_tty->t_line = 0; /* tty->t_termios = deftermios; */ rp->dtr_wait = 3 * hz; @@ -920,8 +913,19 @@ rp_releaseresource(CONTROLLER_t *ctlp) { int i, s, unit; + struct rp_port *rp; + unit = device_get_unit(ctlp->dev); + if (rp_addr(unit) != NULL) { + for (i = 0; i < rp_num_ports[unit]; i++) { + rp = rp_addr(unit) + i; + s = ttyrel(rp->rp_tty); + if (s) { + printf("Detaching with active tty (%d refs)!\n", s); + } + } + } if (ctlp->rp != NULL) { s = spltty(); @@ -935,10 +939,6 @@ free(ctlp->rp, M_DEVBUF); ctlp->rp = NULL; } - if (ctlp->tty != NULL) { - free(ctlp->tty, M_DEVBUF); - ctlp->tty = NULL; - } if (ctlp->dev != NULL) { for (i = 0 ; i < rp_num_ports[unit] * 6 ; i++) destroy_dev(ctlp->dev_nodes[i]); @@ -947,6 +947,11 @@ } } +void +rp_untimeout(void) +{ + untimeout(rp_do_poll, (void *)NULL, rp_callout_handle); +} static int rpopen(dev, flag, mode, td) struct cdev *dev; @@ -1072,8 +1077,8 @@ } if(rp_num_ports_open == 1) - timeout(rp_do_poll, (void *)NULL, POLL_INTERVAL); - + rp_callout_handle = timeout(rp_do_poll, + (void *)NULL, POLL_INTERVAL); } if(!(flag&O_NONBLOCK) && !(tp->t_cflag&CLOCAL) && ==== //depot/projects/nsched/sys/dev/rp/rp_pci.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/rp/rp_pci.c,v 1.8 2004/05/30 20:08:39 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/rp/rp_pci.c,v 1.9 2004/06/21 13:02:25 gallatin Exp $"); #include #include @@ -208,7 +208,6 @@ return (retval); } -#if notdef static int rp_pcidetach(device_t dev) { @@ -238,20 +237,22 @@ return (0); } -#endif /* notdef */ static void rp_pcireleaseresource(CONTROLLER_t *ctlp) { - rp_releaseresource(ctlp); - + rp_untimeout(); if (ctlp->io != NULL) { if (ctlp->io[0] != NULL) bus_release_resource(ctlp->dev, SYS_RES_IOPORT, ctlp->io_rid[0], ctlp->io[0]); free(ctlp->io, M_DEVBUF); + ctlp->io = NULL; } - if (ctlp->io_rid != NULL) + if (ctlp->io_rid != NULL) { free(ctlp->io_rid, M_DEVBUF); + ctlp->io = NULL; + } + rp_releaseresource(ctlp); } static int @@ -351,10 +352,8 @@ /* Device interface */ DEVMETHOD(device_probe, rp_pciprobe), DEVMETHOD(device_attach, rp_pciattach), -#if notdef DEVMETHOD(device_detach, rp_pcidetach), DEVMETHOD(device_shutdown, rp_pcishutdown), -#endif /* notdef */ { 0, 0 } }; ==== //depot/projects/nsched/sys/dev/rp/rpreg.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/rp/rpreg.h,v 1.5 2004/06/16 09:46:54 phk Exp $ + * $FreeBSD: src/sys/dev/rp/rpreg.h,v 1.6 2004/06/21 13:02:25 gallatin Exp $ */ /* @@ -368,7 +368,6 @@ struct resource **io; /* IO resources */ struct rp_port *rp; /* port */ - struct tty *tty; /* tty */ /* Device nodes */ struct cdev **dev_nodes; @@ -1005,6 +1004,7 @@ void sDisInterrupts(CHANNEL_T *ChP,Word_t Flags); int rp_attachcommon(CONTROLLER_T *ctlp, int num_aiops, int num_ports); void rp_releaseresource(CONTROLLER_t *ctlp); +void rp_untimeout(void); #ifndef ROCKET_C extern Byte_t R[RDATASIZE]; ==== //depot/projects/nsched/sys/geom/gate/g_gate.c#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/sys/geom/gate/g_gate.c,v 1.6 2004/06/16 09:47:05 phk Exp $ + * $FreeBSD: src/sys/geom/gate/g_gate.c,v 1.7 2004/06/21 09:12:08 pjd Exp $ */ #include @@ -355,7 +355,9 @@ sbuf_printf(sb, "%s%u\n", indent, sc->sc_queue_size); sbuf_printf(sb, "%s%u\n", indent, sc->sc_ref); + g_topology_unlock(); g_gate_release(sc); + g_topology_lock(); } static int ==== //depot/projects/nsched/sys/i386/i386/pmap.c#7 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.475 2004/06/20 06:11:00 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.476 2004/06/20 20:57:06 alc Exp $"); /* * Manages physical address maps. @@ -2533,7 +2533,7 @@ #ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY pte = vtopte(pv->pv_va); #else - pte = pmap_pte_quick(pv->pv_pmap, pv->pv_va); + pte = pmap_pte_quick(pmap, pv->pv_va); #endif tpte = *pte; @@ -2559,7 +2559,7 @@ KASSERT(m < &vm_page_array[vm_page_array_size], ("pmap_remove_pages: bad tpte %#jx", (uintmax_t)tpte)); - pv->pv_pmap->pm_stats.resident_count--; + pmap->pm_stats.resident_count--; pte_clear(pte); @@ -2571,15 +2571,14 @@ } npv = TAILQ_NEXT(pv, pv_plist); - TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); + TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - if (TAILQ_FIRST(&m->md.pv_list) == NULL) { + if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - } - pmap_unuse_pt(pv->pv_pmap, pv->pv_va, pv->pv_ptem); + pmap_unuse_pt(pmap, pv->pv_va, pv->pv_ptem); free_pv_entry(pv); } sched_unpin(); @@ -2598,9 +2597,11 @@ { pv_entry_t pv; pt_entry_t *pte; + boolean_t rv; + rv = FALSE; if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) - return FALSE; + return (rv); sched_pin(); mtx_assert(&vm_page_queue_mtx, MA_OWNED); @@ -2620,15 +2621,13 @@ #endif PMAP_LOCK(pv->pv_pmap); pte = pmap_pte_quick(pv->pv_pmap, pv->pv_va); - if (*pte & PG_M) { - sched_unpin(); - PMAP_UNLOCK(pv->pv_pmap); - return TRUE; - } + rv = (*pte & PG_M) != 0; PMAP_UNLOCK(pv->pv_pmap); + if (rv) + break; } sched_unpin(); - return (FALSE); + return (rv); } /* ==== //depot/projects/nsched/sys/kern/kern_exit.c#13 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.236 2004/06/18 11:13:49 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.238 2004/06/21 14:49:50 bde Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -103,6 +103,7 @@ void exit1(struct thread *td, int rv) { + struct bintime new_switchtime; struct proc *p, *nq, *q; struct tty *tp; struct vnode *ttyvp; @@ -512,14 +513,15 @@ mtx_lock_spin(&sched_lock); critical_exit(); - cnt.v_swtch++; - binuptime(PCPU_PTR(switchtime)); + + /* Do the same timestamp bookkeeping that mi_switch() would do. */ + binuptime(&new_switchtime); + bintime_add(&p->p_runtime, &new_switchtime); + bintime_sub(&p->p_runtime, PCPU_PTR(switchtime)); + PCPU_SET(switchtime, new_switchtime); PCPU_SET(switchticks, ticks); - /* - * Allow the scheduler to adjust the priority of the - * parent when a process is exiting. - */ + cnt.v_swtch++; sched_exit(p->p_pptr, td); /* ==== //depot/projects/nsched/sys/kern/kern_proc.c#9 (text+ko) ==== @@ -27,11 +27,11 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.7 (Berkeley) 2/14/95 - * $FreeBSD: src/sys/kern/kern_proc.c,v 1.210 2004/06/20 02:03:33 gad Exp $ + * $FreeBSD: src/sys/kern/kern_proc.c,v 1.211 2004/06/20 22:17:22 gad Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.210 2004/06/20 02:03:33 gad Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.211 2004/06/20 22:17:22 gad Exp $"); #include "opt_ktrace.h" #include "opt_kstack_pages.h" @@ -751,6 +751,8 @@ kp->ki_lastcpu = td->td_lastcpu; kp->ki_oncpu = td->td_oncpu; kp->ki_tdflags = td->td_flags; + kp->ki_tid = td->td_tid; + kp->ki_numthreads = p->p_numthreads; kp->ki_pcb = td->td_pcb; kp->ki_kstack = (void *)td->td_kstack; kp->ki_pctcpu = sched_pctcpu(td); ==== //depot/projects/nsched/sys/kern/tty_compat.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty_compat.c,v 1.35 2004/06/11 11:16:24 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty_compat.c,v 1.36 2004/06/21 12:28:56 phk Exp $"); #include "opt_compat.h" @@ -82,9 +82,7 @@ }; static int -ttcompatspeedtab(speed, table) - int speed; - register struct speedtab *table; +ttcompatspeedtab(int speed, struct speedtab *table) { if (speed == 0) return (0); /* hangup */ @@ -95,16 +93,12 @@ } int -ttsetcompat(tp, com, data, term) - register struct tty *tp; - u_long *com; - caddr_t data; - struct termios *term; +ttsetcompat(struct tty *tp, u_long *com, caddr_t data, struct termios *term) { switch (*com) { case TIOCSETP: case TIOCSETN: { - register struct sgttyb *sg = (struct sgttyb *)data; + struct sgttyb *sg = (struct sgttyb *)data; int speed; if ((speed = sg->sg_ispeed) > MAX_SPEED || speed < 0) @@ -128,7 +122,7 @@ } case TIOCSETC: { struct tchars *tc = (struct tchars *)data; - register cc_t *cc; + cc_t *cc; cc = term->c_cc; cc[VINTR] = tc->t_intrc; @@ -144,7 +138,7 @@ } case TIOCSLTC: { struct ltchars *ltc = (struct ltchars *)data; - register cc_t *cc; + cc_t *cc; cc = term->c_cc; cc[VSUSP] = ltc->t_suspc; @@ -178,11 +172,7 @@ /*ARGSUSED*/ int -ttcompat(tp, com, data, flag) - register struct tty *tp; - u_long com; - caddr_t data; - int flag; +ttcompat(struct tty *tp, u_long com, caddr_t data, int flag) { switch (com) { case TIOCSETP: @@ -201,8 +191,8 @@ return ttioctl(tp, com, &term, flag); } case TIOCGETP: { - register struct sgttyb *sg = (struct sgttyb *)data; - register cc_t *cc = tp->t_cc; + struct sgttyb *sg = (struct sgttyb *)data; + cc_t *cc = tp->t_cc; sg->sg_ospeed = ttcompatspeedtab(tp->t_ospeed, compatspeeds); if (tp->t_ispeed == 0) @@ -216,7 +206,7 @@ } case TIOCGETC: { struct tchars *tc = (struct tchars *)data; - register cc_t *cc = tp->t_cc; + cc_t *cc = tp->t_cc; tc->t_intrc = cc[VINTR]; tc->t_quitc = cc[VQUIT]; @@ -228,7 +218,7 @@ } case TIOCGLTC: { struct ltchars *ltc = (struct ltchars *)data; - register cc_t *cc = tp->t_cc; + cc_t *cc = tp->t_cc; ltc->t_suspc = cc[VSUSP]; ltc->t_dsuspc = cc[VDSUSP]; @@ -269,14 +259,13 @@ } static int -ttcompatgetflags(tp) - register struct tty *tp; +ttcompatgetflags(struct tty *tp) { - register tcflag_t iflag = tp->t_iflag; - register tcflag_t lflag = tp->t_lflag; - register tcflag_t oflag = tp->t_oflag; - register tcflag_t cflag = tp->t_cflag; - register int flags = 0; + tcflag_t iflag = tp->t_iflag; + tcflag_t lflag = tp->t_lflag; + tcflag_t oflag = tp->t_oflag; + tcflag_t cflag = tp->t_cflag; + int flags = 0; if (iflag&IXOFF) flags |= TANDEM; @@ -330,15 +319,13 @@ } static void -ttcompatsetflags(tp, t) - register struct tty *tp; - register struct termios *t; +ttcompatsetflags(struct tty *tp, struct termios *t) { - register int flags = tp->t_flags; - register tcflag_t iflag = t->c_iflag; - register tcflag_t oflag = t->c_oflag; - register tcflag_t lflag = t->c_lflag; - register tcflag_t cflag = t->c_cflag; + int flags = tp->t_flags; + tcflag_t iflag = t->c_iflag; + tcflag_t oflag = t->c_oflag; + tcflag_t lflag = t->c_lflag; + tcflag_t cflag = t->c_cflag; if (flags & RAW) { iflag = IGNBRK; @@ -409,15 +396,13 @@ } static void -ttcompatsetlflags(tp, t) - register struct tty *tp; - register struct termios *t; +ttcompatsetlflags(struct tty *tp, struct termios *t) { - register int flags = tp->t_flags; - register tcflag_t iflag = t->c_iflag; - register tcflag_t oflag = t->c_oflag; - register tcflag_t lflag = t->c_lflag; - register tcflag_t cflag = t->c_cflag; + int flags = tp->t_flags; + tcflag_t iflag = t->c_iflag; + tcflag_t oflag = t->c_oflag; + tcflag_t lflag = t->c_lflag; + tcflag_t cflag = t->c_cflag; iflag &= ~(PARMRK|IGNPAR|IGNCR|INLCR); if (flags&CRTERA) ==== //depot/projects/nsched/sys/kern/uipc_socket.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.185 2004/06/20 17:50:42 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.186 2004/06/21 00:20:42 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -348,9 +348,15 @@ SOCKBUF_LOCK(&so->so_snd); so->so_snd.sb_flags |= SB_NOINTR; (void)sblock(&so->so_snd, M_WAITOK); - socantsendmore(so); + /* + * socantsendmore_locked() drops the socket buffer mutex so that it + * can safely perform wakeups. Re-acquire the mutex before + * continuing. + */ + socantsendmore_locked(so); + SOCKBUF_LOCK(&so->so_snd); sbunlock(&so->so_snd); - sbrelease(&so->so_snd, so); + sbrelease_locked(&so->so_snd, so); SOCKBUF_UNLOCK(&so->so_snd); sorflush(so); sodealloc(so); @@ -1202,7 +1208,7 @@ flags |= MSG_TRUNC; if ((flags & MSG_PEEK) == 0) { SOCKBUF_LOCK_ASSERT(&so->so_rcv); - (void) sbdroprecord(&so->so_rcv); + (void) sbdroprecord_locked(&so->so_rcv); } } if ((flags & MSG_PEEK) == 0) { @@ -1271,23 +1277,41 @@ struct protosw *pr = so->so_proto; struct sockbuf asb; + /* + * XXXRW: This is quite ugly. The existing code made a copy of the + * socket buffer, then zero'd the original to clear the buffer + * fields. However, with mutexes in the socket buffer, this causes + * problems. We only clear the zeroable bits of the original; + * however, we have to initialize and destroy the mutex in the copy + * so that dom_dispose() and sbrelease() can lock t as needed. + */ SOCKBUF_LOCK(sb); sb->sb_flags |= SB_NOINTR; (void) sblock(sb, M_WAITOK); - socantrcvmore(so); + /* + * socantrcvmore_locked() drops the socket buffer mutex so that it + * can safely perform wakeups. Re-acquire the mutex before + * continuing. + */ + socantrcvmore_locked(so); + SOCKBUF_LOCK(sb); sbunlock(sb); - asb = *sb; /* - * Invalidate/clear most of the sockbuf structure, but keep - * its selinfo structure valid. + * Invalidate/clear most of the sockbuf structure, but leave + * selinfo and mutex data unchanged. */ + bzero(&asb, offsetof(struct sockbuf, sb_startzero)); + bcopy(&sb->sb_startzero, &asb.sb_startzero, + sizeof(*sb) - offsetof(struct sockbuf, sb_startzero)); bzero(&sb->sb_startzero, sizeof(*sb) - offsetof(struct sockbuf, sb_startzero)); SOCKBUF_UNLOCK(sb); + SOCKBUF_LOCK_INIT(&asb, "so_rcv"); if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose != NULL) (*pr->pr_domain->dom_dispose)(asb.sb_mb); sbrelease(&asb, so); + SOCKBUF_LOCK_DESTROY(&asb); } #ifdef INET ==== //depot/projects/nsched/sys/kern/uipc_socket2.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.133 2004/06/19 03:23:14 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.134 2004/06/21 00:20:42 rwatson Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -197,9 +197,9 @@ SOCKBUF_UNLOCK(&so->so_rcv); SOCKBUF_LOCK(&so->so_snd); so->so_snd.sb_state |= SBS_CANTSENDMORE; + sbdrop_locked(&so->so_snd, so->so_snd.sb_cc); SOCKBUF_UNLOCK(&so->so_snd); wakeup(&so->so_timeo); - sbdrop(&so->so_snd, so->so_snd.sb_cc); sowwakeup(so); sorwakeup(so); } @@ -296,14 +296,38 @@ * protocol when it detects that the peer will send no more data. * Data queued for reading in the socket may yet be read. */ +void +socantsendmore_locked(so) + struct socket *so; +{ + SOCKBUF_LOCK_ASSERT(&so->so_snd); + + so->so_snd.sb_state |= SBS_CANTSENDMORE; + sowwakeup_locked(so); + mtx_assert(SOCKBUF_MTX(&so->so_snd), MA_NOTOWNED); +} + void socantsendmore(so) struct socket *so; { - so->so_snd.sb_state |= SBS_CANTSENDMORE; - sowwakeup(so); + SOCKBUF_LOCK(&so->so_snd); + socantsendmore_locked(so); + mtx_assert(SOCKBUF_MTX(&so->so_snd), MA_NOTOWNED); +} + +void +socantrcvmore_locked(so) + struct socket *so; +{ + + SOCKBUF_LOCK_ASSERT(&so->so_rcv); + + so->so_rcv.sb_state |= SBS_CANTRCVMORE; + sorwakeup_locked(so); + mtx_assert(SOCKBUF_MTX(&so->so_rcv), MA_NOTOWNED); } void @@ -311,8 +335,9 @@ struct socket *so; { - so->so_rcv.sb_state |= SBS_CANTRCVMORE; - sorwakeup(so); + SOCKBUF_LOCK(&so->so_rcv); + socantrcvmore_locked(so); + mtx_assert(SOCKBUF_MTX(&so->so_rcv), MA_NOTOWNED); } /* @@ -356,9 +381,16 @@ } /* - * Wakeup processes waiting on a socket buffer. - * Do asynchronous notification via SIGIO - * if the socket has the SS_ASYNC flag set. + * Wakeup processes waiting on a socket buffer. Do asynchronous + * notification via SIGIO if the socket has the SS_ASYNC flag set. + * + * Called with the socket buffer lock held; will release the lock by the end + * of the function. This allows the caller to acquire the socket buffer lock + * while testing for the need for various sorts of wakeup and hold it through + * to the point where it's no longer required. We currently hold the lock + * through calls out to other subsystems (with the exception of kqueue), and + * then release it to avoid lock order issues. It's not clear that's + * correct. */ void sowakeup(so, sb) @@ -366,19 +398,23 @@ register struct sockbuf *sb; { + SOCKBUF_LOCK_ASSERT(sb); + selwakeuppri(&sb->sb_sel, PSOCK); sb->sb_flags &= ~SB_SEL; if (sb->sb_flags & SB_WAIT) { sb->sb_flags &= ~SB_WAIT; wakeup(&sb->sb_cc); } + KNOTE(&sb->sb_sel.si_note, 0); + SOCKBUF_UNLOCK(sb); if ((so->so_state & SS_ASYNC) && so->so_sigio != NULL) pgsigio(&so->so_sigio, SIGIO, 0); if (sb->sb_flags & SB_UPCALL) (*so->so_upcall)(so, so->so_upcallarg, M_DONTWAIT); if (sb->sb_flags & SB_AIO) aio_swake(so, sb); - KNOTE(&sb->sb_sel.si_note, 0); + mtx_assert(SOCKBUF_MTX(sb), MA_NOTOWNED); } /* @@ -500,17 +536,29 @@ * Free mbufs held by a socket, and reserved mbuf space. */ void -sbrelease(sb, so) +sbrelease_locked(sb, so) struct sockbuf *sb; struct socket *so; { - sbflush(sb); + SOCKBUF_LOCK_ASSERT(sb); + + sbflush_locked(sb); (void)chgsbsize(so->so_cred->cr_uidinfo, &sb->sb_hiwat, 0, RLIM_INFINITY); sb->sb_mbmax = 0; } +void +sbrelease(sb, so) + struct sockbuf *sb; + struct socket *so; +{ + + SOCKBUF_LOCK(sb); + sbrelease_locked(sb, so); + SOCKBUF_UNLOCK(sb); +} /* * Routines to add and remove * data from an mbuf queue. @@ -542,6 +590,8 @@ { struct mbuf *m = sb->sb_mb; + SOCKBUF_LOCK_ASSERT(sb); + while (m && m->m_nextpkt) m = m->m_nextpkt; @@ -561,6 +611,8 @@ struct mbuf *m = sb->sb_mb; struct mbuf *n; + SOCKBUF_LOCK_ASSERT(sb); + while (m && m->m_nextpkt) m = m->m_nextpkt; @@ -583,6 +635,7 @@ #endif /* SOCKBUF_DEBUG */ #define SBLINKRECORD(sb, m0) do { \ + SOCKBUF_LOCK_ASSERT(sb); \ if ((sb)->sb_lastrecord != NULL) \ (sb)->sb_lastrecord->m_nextpkt = (m0); \ else \ @@ -597,14 +650,17 @@ * discarded and mbufs are compacted where possible. */ void -sbappend(sb, m) +sbappend_locked(sb, m) struct sockbuf *sb; struct mbuf *m; { register struct mbuf *n; + SOCKBUF_LOCK_ASSERT(sb); + if (m == 0) return; + SBLASTRECORDCHK(sb); n = sb->sb_mb; if (n) { @@ -612,7 +668,7 @@ n = n->m_nextpkt; do { if (n->m_flags & M_EOR) { - sbappendrecord(sb, m); /* XXXXXX!!!! */ + sbappendrecord_locked(sb, m); /* XXXXXX!!!! */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 21 20:53:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21AD016A4D0; Mon, 21 Jun 2004 20:53:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5A9816A4CE for ; Mon, 21 Jun 2004 20:53:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C815343D48 for ; Mon, 21 Jun 2004 20:53:31 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5LKrV3f026876 for ; Mon, 21 Jun 2004 20:53:31 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5LKrVaU026873 for perforce@freebsd.org; Mon, 21 Jun 2004 20:53:31 GMT (envelope-from julian@freebsd.org) Date: Mon, 21 Jun 2004 20:53:31 GMT Message-Id: <200406212053.i5LKrVaU026873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 55474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2004 20:53:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=55474 Change 55474 by julian@julian_ref on 2004/06/21 20:52:32 make the last thread in exit also be inactive. Affected files ... .. //depot/projects/nsched/sys/kern/kern_thread.c#25 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_thread.c#25 (text+ko) ==== @@ -610,7 +610,6 @@ ksegrp_unlink(kg); } - td->td_state = TDS_INACTIVE; #if 0 td->td_proc = NULL; #endif @@ -620,6 +619,7 @@ sched_set_concurrancy(kg, 1); } } + td->td_state = TDS_INACTIVE; PROC_UNLOCK(p); cpu_throw(td, choosethread(SW_VOL)); panic("I'm a teapot!"); From owner-p4-projects@FreeBSD.ORG Mon Jun 21 22:49:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3AC116A4D0; Mon, 21 Jun 2004 22:49:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2EB8E16A4CE for ; Mon, 21 Jun 2004 22:49:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24B3C43D1D for ; Mon, 21 Jun 2004 22:49:54 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5LMnrmM053475 for ; Mon, 21 Jun 2004 22:49:53 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5LMnp6M053468 for perforce@freebsd.org; Mon, 21 Jun 2004 22:49:51 GMT (envelope-from wsalamon@computer.org) Date: Mon, 21 Jun 2004 22:49:51 GMT Message-Id: <200406212249.i5LMnp6M053468@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 55483 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2004 22:49:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=55483 Change 55483 by wsalamon@wsalamon_epi on 2004/06/21 22:48:37 Integrate a new branch of the TrustedBSD base for new audit development based on Apple's audit code from Darwin 7.4. Affected files ... .. //depot/projects/trustedbsd/audit3/COPYRIGHT#1 branch .. //depot/projects/trustedbsd/audit3/MAINTAINERS#1 branch .. //depot/projects/trustedbsd/audit3/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/Makefile.inc1#1 branch .. //depot/projects/trustedbsd/audit3/README#1 branch .. //depot/projects/trustedbsd/audit3/UPDATING#1 branch .. //depot/projects/trustedbsd/audit3/UPDATING.64BTT#1 branch .. //depot/projects/trustedbsd/audit3/bin/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit3/bin/cat/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/cat/cat.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/cat/cat.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/chflags/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/chflags/chflags.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/chflags/chflags.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/chio/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/chio/chio.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/chio/chio.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/chio/defs.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/chio/pathnames.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/chmod/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/chmod/chmod.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/chmod/chmod.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/cp/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/cp/cp.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/cp/cp.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/cp/extern.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/cp/utils.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/csh/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/trustedbsd/audit3/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/trustedbsd/audit3/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/trustedbsd/audit3/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/trustedbsd/audit3/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/trustedbsd/audit3/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/trustedbsd/audit3/bin/csh/config.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/csh/host.defs#1 branch .. //depot/projects/trustedbsd/audit3/bin/date/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/date/date.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/date/date.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/date/extern.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/date/netdate.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/date/vary.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/date/vary.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/args.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/conv.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/conv_tab.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/dd.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/dd.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/dd.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/extern.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/gen.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/misc.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/position.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/ref.ascii#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/ref.ebcdic#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/ref.ibm#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/ref.lcase#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/ref.oldascii#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/ref.oldibm#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/ref.pareven#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/ref.parnone#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/ref.parodd#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/ref.parset#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/ref.swab#1 branch .. //depot/projects/trustedbsd/audit3/bin/dd/ref.ucase#1 branch .. //depot/projects/trustedbsd/audit3/bin/df/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/df/df.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/df/df.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/domainname/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/domainname/domainname.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/domainname/domainname.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/echo/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/echo/echo.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/echo/echo.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/POSIX#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/README#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/buf.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/cbc.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/ed.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/ed.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/glbl.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/io.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/main.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/re.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/sub.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/=.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/README#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/TODO#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/a.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/a.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/a.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/a1.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/a2.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/addr.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/addr.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/addr.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/addr1.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/addr2.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/ascii.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/bang1.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/bang1.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/bang1.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/bang1.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/bang2.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/c.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/c.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/c.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/c1.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/c2.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/d.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/d.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/d.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/d.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/e1.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/e1.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/e1.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/e1.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/e2.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/e2.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/e2.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/e2.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/e3.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/e3.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/e3.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/e3.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/e4.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/e4.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/e4.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/f1.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/f2.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g1.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g1.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g1.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g1.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g2.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g2.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g2.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g2.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g3.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g3.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g3.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g3.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g4.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g4.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g4.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g5.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g5.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/g5.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/h.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/i.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/i.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/i.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/i1.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/i2.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/i3.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/j.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/j.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/j.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/k.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/k.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/k.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/k1.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/k2.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/k3.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/k4.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/l.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/l.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/l.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/m.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/m.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/m.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/m.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/n.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/n.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/n.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/nl.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/nl1.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/nl1.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/nl1.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/nl2.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/nl2.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/nl2.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/p.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/p.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/p.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/q.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/q.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/q.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/q1.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/r1.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/r1.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/r1.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/r1.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/r2.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/r2.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/r2.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/r2.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/r3.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/r3.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/r3.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s1.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s1.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s1.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s1.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s10.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s2.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s2.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s2.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s2.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s3.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s3.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s3.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s3.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s4.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s5.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s6.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s7.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s8.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/s9.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/t.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/t.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/t1.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/t1.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/t1.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/t1.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/t2.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/t2.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/t2.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/t2.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/u.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/u.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/u.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/u.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/v.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/v.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/v.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/w.d#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/w.r#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/w.t#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/w1.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/w2.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/w3.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/x.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/test/z.err#1 branch .. //depot/projects/trustedbsd/audit3/bin/ed/undo.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/expr/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/expr/expr.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/expr/expr.y#1 branch .. //depot/projects/trustedbsd/audit3/bin/getfacl/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/getfacl/getfacl.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/getfacl/getfacl.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/hostname/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/hostname/hostname.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/hostname/hostname.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/kenv/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/kenv/kenv.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/kenv/kenv.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/kill/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/kill/kill.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/kill/kill.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ln/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/ln/ln.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/ln/ln.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ln/symlink.7#1 branch .. //depot/projects/trustedbsd/audit3/bin/ls/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/ls/cmp.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ls/extern.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/ls/ls.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/ls/ls.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ls/ls.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/ls/print.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ls/util.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/mkdir/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/mkdir/mkdir.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/mkdir/mkdir.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/mv/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/mv/mv.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/mv/mv.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/ar_io.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/ar_subs.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/buf_subs.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/cache.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/cache.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/cpio.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/cpio.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/cpio.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/extern.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/file_subs.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/ftree.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/ftree.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/gen_subs.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/getoldopt.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/options.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/options.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/pat_rep.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/pat_rep.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/pax.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/pax.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/pax.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/sel_subs.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/sel_subs.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/tables.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/tables.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/tar.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/tar.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/tar.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/pax/tty_subs.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ps/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/ps/extern.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/ps/fmt.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ps/keyword.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ps/nlist.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ps/print.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ps/ps.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/ps/ps.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/ps/ps.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/pwd/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/pwd/pwd.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/pwd/pwd.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/rcp/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/rcp/extern.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/rcp/rcp.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/rcp/rcp.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/rcp/util.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/realpath/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/realpath/realpath.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/realpath/realpath.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/rm/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/rm/rm.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/rm/rm.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/rmail/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/rmdir/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/rmdir/rmdir.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/rmdir/rmdir.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/setfacl/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/setfacl/file.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/setfacl/mask.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/setfacl/merge.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/setfacl/remove.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/setfacl/setfacl.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/setfacl/setfacl.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/setfacl/setfacl.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/setfacl/util.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/TOUR#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/alias.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/alias.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/arith.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/arith.y#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/arith_lex.l#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/bltin/echo.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/bltin/echo.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/builtins.def#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/cd.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/cd.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/error.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/error.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/eval.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/eval.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/exec.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/exec.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/expand.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/expand.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/funcs/cmv#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/funcs/dirs#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/funcs/kill#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/funcs/login#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/funcs/newgrp#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/funcs/popd#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/funcs/pushd#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/funcs/suspend#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/histedit.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/init.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/input.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/input.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/jobs.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/jobs.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/mail.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/mail.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/main.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/main.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/memalloc.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/memalloc.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/miscbltin.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/mkbuiltins#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/mkinit.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/mknodes.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/mksyntax.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/mktokens#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/myhistedit.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/mystring.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/mystring.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/nodes.c.pat#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/nodetypes#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/options.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/options.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/output.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/output.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/parser.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/parser.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/redir.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/redir.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/sh.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/shell.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/show.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/show.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/trap.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/trap.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/var.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sh/var.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/sleep/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/sleep/sleep.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/sleep/sleep.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/stty/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/stty/cchar.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/stty/extern.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/stty/gfmt.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/stty/key.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/stty/modes.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/stty/print.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/stty/stty.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/stty/stty.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/stty/stty.h#1 branch .. //depot/projects/trustedbsd/audit3/bin/stty/util.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/sync/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/sync/sync.8#1 branch .. //depot/projects/trustedbsd/audit3/bin/sync/sync.c#1 branch .. //depot/projects/trustedbsd/audit3/bin/test/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/bin/test/TEST.README#1 branch .. //depot/projects/trustedbsd/audit3/bin/test/TEST.csh#1 branch .. //depot/projects/trustedbsd/audit3/bin/test/TEST.sh#1 branch .. //depot/projects/trustedbsd/audit3/bin/test/test.1#1 branch .. //depot/projects/trustedbsd/audit3/bin/test/test.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/AUTHORS#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/BUGS#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/COPYING#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/ChangeLog#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/INSTALL#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/MIRRORS#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/NEWS#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/README#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/README.ldap#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/README.y2k#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amd.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amd.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amd.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/autil.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/clock.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/conf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/map.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/opts.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/restart.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/sched.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amq/amq.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amq/amq.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amq/amq.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/bootstrap#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/commit#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/conf/hn_dref/hn_dref_default.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/conf/mount/mount_default.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/config.guess#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/config.guess.long#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/config.sub#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/configure.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/cvs-server.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/depcomp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/doc/mdate-sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/doc/version.texi#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/install-sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/libamu/util.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/ltmain.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/amindent#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/autopat#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/c_void_p.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/cache_check_dynamic.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_amu_fs.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_checkmount_style.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_extern.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_fhandle.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_field.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_fs_headers.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_fs_mntent.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_gnu_getopt.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_hide_mount_type.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_lib2.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_map_funcs.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_mnt2_gen_opt.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_mnttab_file_name.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_mnttab_location.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_mnttab_opt.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_mnttab_style.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_mnttab_type.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_mount_style.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_mount_trap.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_mount_type.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_mtype_printf_type.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_mtype_type.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_network_transport_type.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_nfs_fh_dref.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_nfs_hn_dref.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_nfs_prot_headers.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_nfs_sa_dref.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_nfs_socket_connection.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_os_libs.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_restartable_signal_handler.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_umount_style.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_unmount_args.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/check_unmount_call.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/expand_cpp_hex.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/expand_cpp_int.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/expand_cpp_string.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/expand_run_string.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/extern_optarg.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/extern_sys_errlist.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/func_bad_memcmp.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/func_bad_yp_all.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/header_templates.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/host_macros.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/linux_headers.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/localconfig.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/mount_headers.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/name_package.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/name_version.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/opt_amu_cflags.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/opt_cppflags.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/opt_debug.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/opt_ldflags.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/opt_libs.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/os_cflags.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/os_cppflags.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/os_ldflags.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/package_bugreport.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/package_name.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/package_version.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/save_state.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/struct_field_nfs_fh.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/struct_mntent.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/struct_mnttab.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/struct_nfs_args.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/struct_nfs_fh.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/struct_nfs_fh3.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/try_compile_anyfs.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/try_compile_nfs.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/try_compile_rpc.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/type_auth_create_gidlist.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/type_cachefs_args.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/type_cdfs_args.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/type_efs_args.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/type_lofs_args.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/type_mfs_args.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/type_pcfs_args.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/type_recvfrom_fromlen.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/type_rfs_args.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/type_svc_in_arg.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/type_time_t.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/type_tmpfs_args.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/type_ufs_args.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/type_xdrproc_t.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/type_xfs_args.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/type_yp_order_outorder.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/macros/with_addon.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/mkconf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/missing#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/mkinstalldirs#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/lostaltmail.conf-sample#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/lostaltmail.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/tasks#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/AUTHORS#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/ChangeLog#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/FAQ#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/INSTALL#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/NEWS#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/README#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/array.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/atan.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/div.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/exp.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/fact.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/jn.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/ln.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/mul.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/raise.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/signum#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/sine.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/Test/timetest#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/acconfig.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/aclocal.m4#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/bc.y#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/const.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/execute.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/global.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/global.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/load.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/main.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/proto.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/scan.l#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/storage.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/util.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/config.h.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/configure#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/configure.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/dc/array.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/dc/dc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/dc/dc.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/dc/eval.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/dc/misc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/dc/stack.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/dc/string.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/doc/bc.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/doc/dc.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/h/number.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/install-sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/lib/number.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/missing#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bc/stamp-h.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/CHANGES#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/DNSSEC#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/FREEBSD-Upgrade#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/INSTALL#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/LICENSE#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/README#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/SUPPORT#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/TODO#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/Version#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/addr/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/addr/addr.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/dig/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/dig/dig.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/dnskeygen/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/dnskeygen/dnskeygen.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/dnsquery/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/dnsquery/dnsquery.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/host/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/host/host.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/irpd/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/irpd/irpd.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/irpd/irs-irpd.conf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/irpd/version.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/mkservdb/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/mkservdb/mkservdb.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named-bootconf/Grot/named-bootconf.pl#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named-bootconf/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named-bootconf/named-bootconf.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named-bootconf/test.boot#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named-xfer/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named-xfer/named-xfer.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/db_defs.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/db_dump.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/db_func.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/db_glob.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/db_glue.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/db_ixfr.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/db_load.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/db_lookup.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/db_save.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/db_sec.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/db_tsig.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/db_update.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/named.conf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/named.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_config.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_ctl.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_defs.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_forw.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_func.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_glob.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_glue.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_init.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_ixfr.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_lexer.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_lexer.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_main.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_maint.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_ncache.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_notify.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_parser.y#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_parseutil.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_parseutil.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_req.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_resp.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_signal.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_sort.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_stats.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_udp.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_update.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/ns_xfr.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/pathtemplate.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/test/127.0.0.zone#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/test/localhost.zone#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/test/named.conf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/test/root.hint#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/named/version.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/ndc/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/ndc/ndc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/nslookup/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/nslookup/commands.l#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/nslookup/debug.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/nslookup/getinfo.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/nslookup/list.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/nslookup/main.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/nslookup/nslookup.help#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/nslookup/pathnames.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/nslookup/res.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/nslookup/send.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/nslookup/skip.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/nslookup/subr.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/nsupdate/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/html/acl.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/html/address_list.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/html/comments.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/html/config.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/html/controls.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/html/docdef.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/html/example.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/html/include.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/html/index.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/html/key.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/html/logging.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/html/master.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/html/options.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/html/server.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/html/trusted-keys.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/html/zone.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/dig.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/dnskeygen.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/dnsquery.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/getaddrinfo.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/gethostbyname.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/getipnodebyname.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/getnameinfo.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/getnetent.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/hesiod.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/host.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/hostname.7#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/inet_cidr.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/irs.conf.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/mailaddr.7#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/mkdep.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/named-bootconf.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/named-xfer.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/named.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/named.conf.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/ndc.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/nslookup.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/nsupdate.8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/resolver.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/resolver.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/man/tsig.3#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/misc/DynamicUpdate#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/misc/FAQ.1of2#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/misc/FAQ.2of2#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/misc/rfc2317-notes.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/doc/misc/style.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/arpa/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/arpa/inet.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/arpa/nameser.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/arpa/nameser_compat.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/fd_setsize.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/hesiod.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/irp.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/irs.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/isc/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/isc/assertions.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/isc/ctl.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/isc/dst.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/isc/eventlib.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/isc/heap.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/isc/irpmarshall.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/isc/list.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/isc/logging.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/isc/memcluster.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/isc/misc.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/isc/tree.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/netdb.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/netgroup.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/res_update.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/include/resolv.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/lib/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/lib/dst/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/lib/dst/README#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/lib/dst/bsafe_link.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/lib/dst/cylink_link.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/lib/dst/dst_api.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/lib/dst/dst_internal.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/lib/dst/eay_dss_link.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/lib/dst/hmac_link.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/lib/dst/md5.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind/lib/dst/md5_dgst.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 22 00:44:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B4A416A4D0; Tue, 22 Jun 2004 00:44:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 65EC616A4CE for ; Tue, 22 Jun 2004 00:44:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4754043D31 for ; Tue, 22 Jun 2004 00:44:47 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5M0ilvg079993 for ; Tue, 22 Jun 2004 00:44:47 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5M0ikYB079990 for perforce@freebsd.org; Tue, 22 Jun 2004 00:44:46 GMT (envelope-from wsalamon@computer.org) Date: Tue, 22 Jun 2004 00:44:46 GMT Message-Id: <200406220044.i5M0ikYB079990@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 55491 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2004 00:44:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=55491 Change 55491 by wsalamon@wsalamon_epi on 2004/06/22 00:43:46 Integrate the Darwin 7.4 BSM utils and library into the TrustedBSD audit branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/bsm/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/bin/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/bin/auditreduce.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/bin/auditreduce.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/bin/praudit.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/etc/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/etc/audit_class#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/etc/audit_control#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/etc/audit_event#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/etc/audit_user#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/etc/audit_warn#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/audit_uevents.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_audit.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_class.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_control.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_event.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_flags.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_io.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_mask.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_notify.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_token.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_user.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/lib_wrappers.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/libbsm.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/man/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/man/audit_class.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/man/audit_control.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/man/audit_event.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/man/audit_user.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/man/audit_warn.5#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/man/auditreduce.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/man/praudit.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/test/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/test/bsm_lib_test.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bsm/test/bsm_tok_test.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jun 22 02:57:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 358BD16A4D0; Tue, 22 Jun 2004 02:57:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB1DB16A4CE for ; Tue, 22 Jun 2004 02:57:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E227E43D45 for ; Tue, 22 Jun 2004 02:57:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5M2vFAu014413 for ; Tue, 22 Jun 2004 02:57:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5M2vEbk014410 for perforce@freebsd.org; Tue, 22 Jun 2004 02:57:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 22 Jun 2004 02:57:14 GMT Message-Id: <200406220257.i5M2vEbk014410@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 Subject: PERFORCE change 55495 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2004 02:57:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=55495 Change 55495 by rwatson@rwatson_tislabs on 2004/06/22 02:56:21 Integrate netperf_socket. Affected files ... .. //depot/projects/netperf_socket/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_ttold.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_fil.c#4 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/cissreg.h#7 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/cissvar.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rpreg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/si/si.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/sx/sx.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/gate/g_gate.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/geom.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_sysent.c#4 integrate .. //depot/projects/netperf_socket/sys/i4b/driver/i4b_ing.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/kern_resource.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#15 integrate .. //depot/projects/netperf_socket/sys/kern/kern_time.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/sched_ule.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/tty_compat.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/tty_pty.c#9 integrate .. //depot/projects/netperf_socket/sys/pci/if_mn.c#5 integrate .. //depot/projects/netperf_socket/sys/sys/ioctl_compat.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/ttychars.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/ttydev.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/user.h#8 integrate Differences ... ==== //depot/projects/netperf_socket/sys/cam/cam_xpt.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.139 2004/06/16 09:46:31 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.141 2004/06/21 19:01:55 ps Exp $"); #include #include ==== //depot/projects/netperf_socket/sys/compat/svr4/svr4_ioctl.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.20 2003/06/10 21:35:15 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.21 2004/06/21 22:57:10 phk Exp $"); #include #include @@ -119,10 +119,12 @@ #endif switch (cmd & 0xff00) { +#ifndef BURN_BRIDGES case SVR4_tIOC: DPRINTF(("ttold\n")); fun = svr4_ttold_ioctl; break; +#endif case SVR4_TIOC: DPRINTF(("term\n")); ==== //depot/projects/netperf_socket/sys/compat/svr4/svr4_ttold.c#2 (text+ko) ==== @@ -27,7 +27,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ttold.c,v 1.12 2003/06/10 21:35:15 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ttold.c,v 1.13 2004/06/21 22:57:10 phk Exp $"); + +#ifndef BURN_BRIDGES #include #include @@ -376,3 +378,5 @@ return 0; /* ENOSYS really */ } } + +#endif /* BURN_BRIDGES */ ==== //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/fil.c#3 (text+ko) ==== @@ -42,6 +42,7 @@ # include # endif #else +# include # include # if SOLARIS2 < 5 # include @@ -99,7 +100,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.37 2004/04/07 20:45:56 imp Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.38 2004/06/21 22:46:35 darrenr Exp $"; #endif #ifndef _KERNEL @@ -146,6 +147,9 @@ static int frflushlist __P((int, minor_t, int *, frentry_t **)); #ifdef _KERNEL static void frsynclist __P((frentry_t *)); +# ifndef __sgi +static void *ipf_pullup __P((mb_t *, fr_info_t *, int, void *)); +# endif #endif @@ -194,19 +198,27 @@ * compact the IP header into a structure which contains just the info. * which is useful for comparing IP headers with. */ -void fr_makefrip(hlen, ip, fin) +int fr_makefrip(hlen, ip, fin) int hlen; ip_t *ip; fr_info_t *fin; { u_short optmsk = 0, secmsk = 0, auth = 0; int i, mv, ol, off, p, plen, v; +#if defined(_KERNEL) +# if SOLARIS + mb_t *m = fin->fin_qfm; +# else + mb_t *m = fin->fin_mp ? *fin->fin_mp : NULL; +# endif +#endif fr_ip_t *fi = &fin->fin_fi; struct optlist *op; u_char *s, opt; tcphdr_t *tcp; fin->fin_rev = 0; + fin->fin_dp = NULL; fin->fin_fr = NULL; fin->fin_tcpf = 0; fin->fin_data[0] = 0; @@ -220,8 +232,10 @@ if (v == 4) { fin->fin_id = ip->ip_id; fi->fi_tos = ip->ip_tos; +#if (OpenBSD >= 200311) && defined(_KERNEL) + ip->ip_off = ntohs(ip->ip_off); +#endif off = (ip->ip_off & IP_OFFMASK); - tcp = (tcphdr_t *)((char *)ip + hlen); (*(((u_short *)fi) + 1)) = (*(((u_short *)ip) + 4)); fi->fi_src.i6[1] = 0; fi->fi_src.i6[2] = 0; @@ -235,6 +249,9 @@ fi->fi_fl = (hlen > sizeof(ip_t)) ? FI_OPTIONS : 0; if (ip->ip_off & (IP_MF|IP_OFFMASK)) fi->fi_fl |= FI_FRAG; +#if (OpenBSD >= 200311) && defined(_KERNEL) + ip->ip_len = ntohs(ip->ip_len); +#endif plen = ip->ip_len; fin->fin_dlen = plen - hlen; } @@ -246,7 +263,6 @@ p = ip6->ip6_nxt; fi->fi_p = p; fi->fi_ttl = ip6->ip6_hlim; - tcp = (tcphdr_t *)(ip6 + 1); fi->fi_src.in6 = ip6->ip6_src; fi->fi_dst.in6 = ip6->ip6_dst; fin->fin_id = (u_short)(ip6->ip6_flow & 0xffff); @@ -258,14 +274,23 @@ } #endif else - return; + return -1; fin->fin_off = off; fin->fin_plen = plen; - fin->fin_dp = (char *)tcp; + tcp = (tcphdr_t *)((char *)ip + hlen); fin->fin_misc = 0; off <<= 3; + /* + * For both ICMPV6 & ICMP, we attempt to pullup the entire packet into + * a single buffer for recognised error return packets. Why? Because + * the entire data section of the ICMP payload is considered to be of + * significance and maybe required in NAT/state processing, so rather + * than be careful later, attempt to get it all in one buffeer first. + * For TCP we just make sure the _entire_ TCP header is in the first + * buffer for convienience. + */ switch (p) { #ifdef USE_INET6 @@ -274,7 +299,7 @@ int minicmpsz = sizeof(struct icmp6_hdr); struct icmp6_hdr *icmp6; - if (fin->fin_dlen > 1) { + if (!(fin->fin_fl & FI_SHORT) && (fin->fin_dlen > 1)) { fin->fin_data[0] = *(u_short *)tcp; icmp6 = (struct icmp6_hdr *)tcp; @@ -289,6 +314,14 @@ case ICMP6_PACKET_TOO_BIG : case ICMP6_TIME_EXCEEDED : case ICMP6_PARAM_PROB : +# if defined(KERNEL) && !defined(__sgi) + if ((m != NULL) && (M_BLEN(m) < plen)) { + ip = ipf_pullup(m, fin, plen, ip); + if (ip == NULL) + return -1; + tcp = (tcphdr_t *)((char *)ip + hlen); + } +# endif /* KERNEL && !__sgi */ minicmpsz = ICMP6ERR_IPICMPHLEN; break; default : @@ -296,22 +329,27 @@ } } - if (!(plen >= minicmpsz)) + if (!(fin->fin_dlen >= minicmpsz)) fi->fi_fl |= FI_SHORT; break; } -#endif +#endif /* USE_INET6 */ + case IPPROTO_ICMP : { int minicmpsz = sizeof(struct icmp); icmphdr_t *icmp; - if (!off && (fin->fin_dlen > 1)) { + if (!off && (fin->fin_dlen > 1) && !(fin->fin_fl & FI_SHORT)) { fin->fin_data[0] = *(u_short *)tcp; icmp = (icmphdr_t *)tcp; + /* + * Minimum ICMP packet is type(1) code(1) cksum(2) + * plus 4 bytes following, totalling 8 bytes. + */ switch (icmp->icmp_type) { case ICMP_ECHOREPLY : @@ -327,7 +365,7 @@ */ case ICMP_TSTAMP : case ICMP_TSTAMPREPLY : - minicmpsz = 20; + minicmpsz = ICMP_MINLEN + 12; break; /* * type(1) + code(1) + cksum(2) + id(2) seq(2) + @@ -335,9 +373,28 @@ */ case ICMP_MASKREQ : case ICMP_MASKREPLY : - minicmpsz = 12; + minicmpsz = ICMP_MINLEN + 4; + break; + /* + * type(1) + code(1) + cksum(2) + arg(4) ip(20+) + */ + case ICMP_UNREACH : + case ICMP_SOURCEQUENCH : + case ICMP_REDIRECT : + case ICMP_TIMXCEED : + case ICMP_PARAMPROB : +#if defined(KERNEL) && !defined(__sgi) + if ((m != NULL) && (M_BLEN(m) < plen)) { + ip = ipf_pullup(m, fin, plen, ip); + if (ip == NULL) + return -1; + tcp = (tcphdr_t *)((char *)ip + hlen); + } +#endif /* KERNEL && !__sgi */ + minicmpsz = ICMPERR_MINPKTLEN - sizeof(ip_t); break; default : + minicmpsz = ICMP_MINLEN; break; } } @@ -345,9 +402,9 @@ if ((!(plen >= hlen + minicmpsz) && !off) || (off && off < sizeof(struct icmp))) fi->fi_fl |= FI_SHORT; - break; } + case IPPROTO_TCP : fi->fi_fl |= FI_TCPUDP; #ifdef USE_INET6 @@ -361,6 +418,20 @@ (off && off < sizeof(struct tcphdr))) fi->fi_fl |= FI_SHORT; } + +#if defined(KERNEL) && !defined(__sgi) + if (!off && !(fi->fi_fl & FI_SHORT)) { + int tlen = hlen + (tcp->th_off << 2); + + if ((m != NULL) && (M_BLEN(m) < tlen)) { + ip = ipf_pullup(m, fin, tlen, ip); + if (ip == NULL) + return -1; + tcp = (tcphdr_t *)((char *)ip + hlen); + } + } +#endif /* _KERNEL && !_sgi */ + if (!(fi->fi_fl & FI_SHORT) && !off) fin->fin_tcpf = tcp->th_flags; goto getports; @@ -400,12 +471,14 @@ break; } + fin->fin_dp = (char *)tcp; + #ifdef USE_INET6 if (v == 6) { fi->fi_optmsk = 0; fi->fi_secmsk = 0; fi->fi_auth = 0; - return; + return 0; } #endif @@ -462,6 +535,7 @@ fi->fi_optmsk = optmsk; fi->fi_secmsk = secmsk; fi->fi_auth = auth; + return 0; } @@ -749,7 +823,7 @@ #endif /* IPFILTER_LOG */ ATOMIC_INCL(fr->fr_hits); if (passt & FR_ACCOUNT) - fr->fr_bytes += (U_QUAD_T)ip->ip_len; + fr->fr_bytes += (U_QUAD_T)fin->fin_plen; else fin->fin_icode = fr->fr_icode; fin->fin_rule = rulen; @@ -812,12 +886,17 @@ int p, len, drop = 0, logit = 0; mb_t *mc = NULL; # if !defined(__SVR4) && !defined(__svr4__) + /* + * We don't do this section for Solaris because fr_precheck() does a + * pullupmsg() instead, effectively achieving the same result as here + * so no need to duplicate it. + */ # ifdef __sgi char hbuf[128]; # endif int up; -# if !SOLARIS && !defined(NETBSD_PF) && \ +# if !defined(NETBSD_PF) && \ ((defined(__FreeBSD__) && (__FreeBSD_version < 500011)) || \ defined(__OpenBSD__) || defined(_BSDI_VERSION)) if (fr_checkp != fr_check && fr_running > 0) { @@ -855,7 +934,7 @@ } # endif /* CSUM_DELAY_DATA */ -# ifdef USE_INET6 +# ifdef USE_INET6 if (v == 6) { len = ntohs(((ip6_t*)ip)->ip6_plen); if (!len) @@ -863,17 +942,20 @@ len += sizeof(ip6_t); p = ((ip6_t *)ip)->ip6_nxt; } else -# endif +# endif { p = ip->ip_p; len = ip->ip_len; } + fin->fin_mp = mp; + fin->fin_out = out; + if ((p == IPPROTO_TCP || p == IPPROTO_UDP || (v == 4 && p == IPPROTO_ICMP) -# ifdef USE_INET6 +# ifdef USE_INET6 || (v == 6 && p == IPPROTO_ICMPV6) -# endif +# endif )) { int plen = 0; @@ -893,7 +975,7 @@ case IPPROTO_ESP: plen = 8; break; -# ifdef USE_INET6 +# ifdef USE_INET6 case IPPROTO_ICMPV6 : /* * XXX does not take intermediate header @@ -901,8 +983,10 @@ */ plen = ICMP6ERR_MINPKTLEN + 8 - sizeof(ip6_t); break; -# endif +# endif } + if ((plen > 0) && (len < hlen + plen)) + fin->fin_fl |= FI_SHORT; up = MIN(hlen + plen, len); if (up > m->m_len) { @@ -917,14 +1001,34 @@ ip = (ip_t *)hbuf; # else /* __ sgi */ # ifndef linux - if ((*mp = m_pullup(m, up)) == 0) { - ATOMIC_INCL(frstats[out].fr_pull[1]); + /* + * Having determined that we need to pullup some data, + * try to bring as much of the packet up into a single + * buffer with the first pullup. This hopefully means + * less need for doing futher pullups. Not needed for + * Solaris because fr_precheck() does it anyway. + * + * The main potential for trouble here is if MLEN/MHLEN + * become quite small, lets say < 64 bytes...but if + * that did happen, BSD networking as a whole would be + * slow/inefficient. + */ +# ifdef MHLEN + /* + * Assume that M_PKTHDR is set and just work with what + * is left rather than check.. Should not make any + * real difference, anyway. + */ + if ((MHLEN > up) && (len > up)) + up = MIN(len, MHLEN); +# else + if ((MLEN > up) && (len > up)) + up = MIN(len, MLEN); +# endif + ip = ipf_pullup(m, fin, up, ip); + if (ip == NULL) return -1; - } else { - ATOMIC_INCL(frstats[out].fr_pull[0]); - m = *mp; - ip = mtod(m, ip_t *); - } + m = *mp; # endif /* !linux */ # endif /* __sgi */ } else @@ -937,9 +1041,14 @@ if ((u_int)ip & 0x3) return 2; + fin->fin_mp = mp; + fin->fin_out = out; fin->fin_qfm = m; fin->fin_qif = qif; # endif +#else + fin->fin_mp = mp; + fin->fin_out = out; #endif /* _KERNEL */ #ifndef __FreeBSD__ @@ -952,11 +1061,10 @@ #endif changed = 0; + fin->fin_v = v; fin->fin_ifp = ifp; - fin->fin_v = v; - fin->fin_out = out; - fin->fin_mp = mp; - fr_makefrip(hlen, ip, fin); + if (fr_makefrip(hlen, ip, fin) == -1) + return -1; #ifdef _KERNEL # ifdef USE_INET6 @@ -1120,6 +1228,10 @@ if (pass & FR_KEEPSTATE) { if (fr_addstate(ip, fin, NULL, 0) == NULL) { ATOMIC_INCL(frstats[out].fr_bads); + if (pass & FR_PASS) { + pass &= ~FR_PASS; + pass |= FR_BLOCK; + } } else { ATOMIC_INCL(frstats[out].fr_ads); } @@ -1306,6 +1418,12 @@ (void) ipfr_fastroute(ip, mc, &mc, fin, &fr->fr_dif); } # endif /* !SOLARIS */ +#if (OpenBSD >= 200311) && defined(_KERNEL) + if (pass & FR_PASS) { + ip->ip_len = htons(ip->ip_len); + ip->ip_off = htons(ip->ip_off); + } +#endif return (pass & FR_PASS) ? 0 : error; #else /* _KERNEL */ if (pass & FR_NOMATCH) @@ -1403,10 +1521,10 @@ /* * Both sum and sum2 are partial sums, so combine them together. */ - sum = (sum & 0xffff) + (sum >> 16); - sum = ~sum & 0xffff; - sum2 += sum; - sum2 = (sum2 & 0xffff) + (sum2 >> 16); + sum += ~sum2 & 0xffff; + while (sum > 0xffff) + sum = (sum & 0xffff) + (sum >> 16); + sum2 = ~sum & 0xffff; # else /* defined(BSD) || defined(sun) */ { union { @@ -1543,7 +1661,7 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $Id: fil.c,v 2.35.2.67 2002/12/06 13:28:05 darrenr Exp $ + * $Id: fil.c,v 2.35.2.82 2004/06/20 10:27:47 darrenr Exp $ */ /* * Copy data from an mbuf chain starting "off" bytes from the beginning, @@ -1975,12 +2093,40 @@ static void frsynclist(fr) register frentry_t *fr; { + frdest_t *fdp; + int i; + for (; fr; fr = fr->fr_next) { - if (fr->fr_ifa != NULL) { - fr->fr_ifa = GETUNIT(fr->fr_ifname, fr->fr_ip.fi_v); - if (fr->fr_ifa == NULL) - fr->fr_ifa = (void *)-1; + for (i = 0; i < 4; i++) { + if ((fr->fr_ifnames[i][1] == '\0') && + ((fr->fr_ifnames[i][0] == '-') || + (fr->fr_ifnames[i][0] == '*'))) { + fr->fr_ifas[i] = NULL; + } else if (*fr->fr_ifnames[i]) { + fr->fr_ifas[i] = GETUNIT(fr->fr_ifnames[i], + fr->fr_v); + if (!fr->fr_ifas[i]) + fr->fr_ifas[i] = (void *)-1; + } + } + + fdp = &fr->fr_dif; + fr->fr_flags &= ~FR_DUP; + if (*fdp->fd_ifname) { + fdp->fd_ifp = GETUNIT(fdp->fd_ifname, fr->fr_v); + if (!fdp->fd_ifp) + fdp->fd_ifp = (struct ifnet *)-1; + else + fr->fr_flags |= FR_DUP; + } + + fdp = &fr->fr_tif; + if (*fdp->fd_ifname) { + fdp->fd_ifp = GETUNIT(fdp->fd_ifname, fr->fr_v); + if (!fdp->fd_ifp) + fdp->fd_ifp = (struct ifnet *)-1; } + if (fr->fr_grp) frsynclist(fr->fr_grp); } @@ -2013,6 +2159,9 @@ IFNET_RUNLOCK(); # endif ip_natsync((struct ifnet *)-1); +# if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) + IFNET_RUNLOCK(); +# endif # endif /* !SOLARIS */ WRITE_ENTER(&ipf_mutex); @@ -2241,3 +2390,64 @@ return ip->ip_len; } #endif + + +#if defined(_KERNEL) && !defined(__sgi) +void *ipf_pullup(m, fin, len, ipin) +mb_t *m; +fr_info_t *fin; +int len; +void *ipin; +{ +# if SOLARIS + qif_t *qf = fin->fin_qif; +# endif + int out = fin->fin_out, dpoff, ipoff; + char *ip; + + if (m == NULL) + return NULL; + + ipoff = (char *)ipin - MTOD(m, char *); + if (fin->fin_dp != NULL) + dpoff = (char *)fin->fin_dp - (char *)ipin; + else + dpoff = 0; + + if (M_BLEN(m) < len) { +# if SOLARIS + qif_t *qf = fin->fin_qif; + int inc = 0; + + if (ipoff > 0) { + if ((ipoff & 3) != 0) { + inc = 4 - (ipoff & 3); + if (m->b_rptr - inc >= m->b_datap->db_base) + m->b_rptr -= inc; + else + inc = 0; + } + } + if (!pullupmsg(m, len + ipoff + inc)) { + ATOMIC_INCL(frstats[out].fr_pull[1]); + return NULL; + } + m->b_rptr += inc; + ATOMIC_INCL(frstats[out].fr_pull[0]); + qf->qf_data = MTOD(m, char *) + ipoff; +# else + m = m_pullup(m, len); + *fin->fin_mp = m; + if (m == NULL) { + ATOMIC_INCL(frstats[out].fr_pull[1]); + return NULL; + } + ATOMIC_INCL(frstats[out].fr_pull[0]); +# endif /* SOLARIS */ + } + ip = MTOD(m, char *) + ipoff; + if (fin->fin_dp != NULL) + fin->fin_dp = (char *)ip + dpoff; + return ip; +} +#endif /* _KERNEL */ ==== //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_auth.c#2 (text+ko) ==== @@ -105,7 +105,7 @@ #if !defined(lint) /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.11.2.12 2001/07/18 14:57:08 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.33 2003/03/04 23:19:55 jlemon Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.34 2004/06/21 22:46:35 darrenr Exp $"; #endif @@ -320,7 +320,9 @@ #endif { mb_t *m; -#if defined(_KERNEL) && !SOLARIS +#if defined(_KERNEL) && !SOLARIS && \ + (!defined(__FreeBSD_version) || (__FreeBSD_version < 501000)) + struct ifqueue *ifq; int s; #endif frauth_t auth, *au = &auth, *fra; @@ -423,8 +425,8 @@ bzero((char *)&ro, sizeof(ro)); # if ((_BSDI_VERSION >= 199802) && (_BSDI_VERSION < 200005)) || \ - defined(__OpenBSD__) || (defined(IRIX) && (IRIX >= 605)) || \ - (__FreeBSD_version >= 500042) + defined(__OpenBSD__) || (defined(IRIX) && (IRIX >= 605)) || \ + (__FreeBSD_version >= 470102) error = ip_output(m, NULL, &ro, IP_FORWARDING, NULL, NULL); # else @@ -442,8 +444,22 @@ # if SOLARIS error = (fr_qin(fra->fra_q, m) == 0) ? EINVAL : 0; # else /* SOLARIS */ - if (! netisr_queue(NETISR_IP, m)) +# if __FreeBSD_version >= 501104 + if (! netisr_dispatch(NETISR_IP, m)) + error = ENOBUFS; +# else + ifq = &ipintrq; + if (IF_QFULL(ifq)) { + IF_DROP(ifq); + m_freem(m); error = ENOBUFS; + } else { + IF_ENQUEUE(ifq, m); +# if IRIX < 605 + schednetisr(NETISR_IP); +# endif + } +# endif # endif /* SOLARIS */ if (error) fr_authstats.fas_quefail++; ==== //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_compat.h#3 (text+ko) ==== @@ -5,7 +5,7 @@ * * @(#)ip_compat.h 1.8 1/14/96 * $Id: ip_compat.h,v 2.26.2.9 2001/01/14 14:58:01 darrenr Exp $ - * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.22 2004/06/08 23:52:22 darrenr Exp $ + * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.23 2004/06/21 22:46:35 darrenr Exp $ */ #ifndef __IP_COMPAT_H__ @@ -66,7 +66,7 @@ #if defined(__sgi) || defined(bsdi) struct ether_addr { - u_char ether_addr_octet[6]; + u_char ether_addr_octet[6]; }; #endif @@ -164,6 +164,7 @@ # define V4_PART_OF_V6(v6) v6.s6_addr32[3] # endif # endif +# define M_BLEN(m) ((m)->b_wptr - (m)->b_rptr) typedef struct qif { struct qif *qf_next; @@ -173,6 +174,7 @@ void *qf_optr; queue_t *qf_in; queue_t *qf_out; + void *qf_data; /* layer 3 header pointer */ struct qinit *qf_wqinfo; struct qinit *qf_rqinfo; struct qinit qf_wqinit; @@ -525,6 +527,7 @@ # ifndef linux # define FREE_MB_T(m) m_freem(m) # define MTOD(m,t) mtod(m,t) +# define M_BLEN(m) (m)->m_len # define IRCOPY(a,b,c) (bcopy((a), (b), (c)), 0) # define IWCOPY(a,b,c) (bcopy((a), (b), (c)), 0) # define IRCOPYPTR ircopyptr @@ -963,7 +966,7 @@ __u32 th_seq; __u32 th_ack; # if defined(__i386__) || defined(__MIPSEL__) || defined(__alpha__) ||\ - defined(vax) + defined(__vax__) __u8 th_res:4; __u8 th_off:4; #else @@ -985,7 +988,7 @@ typedef struct { # if defined(__i386__) || defined(__MIPSEL__) || defined(__alpha__) ||\ - defined(vax) + defined(__vax__) __u8 ip_hl:4; __u8 ip_v:4; # else @@ -1209,8 +1212,8 @@ #define ICMPERR_MINPKTLEN (20 + 8 + 20) #define ICMPERR_MAXPKTLEN (20 + 8 + 20 + 8) #define ICMP6_MINLEN 8 -#define ICMP6ERR_MINPKTLEN (40 + 8) -#define ICMP6ERR_IPICMPHLEN (40 + 8 + 40) +#define ICMP6ERR_IPICMPHLEN (40 + 8) +#define ICMP6ERR_MINPKTLEN (40 + 8 + 40) #ifndef ICMP6_DST_UNREACH # define ICMP6_DST_UNREACH 1 ==== //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_fil.c#4 (text+ko) ==== @@ -131,7 +131,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; /* static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.42.2.34 2001/07/23 13:49:57 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.44 2004/06/16 09:46:34 phk Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.46 2004/06/22 02:44:06 darrenr Exp $"; #endif extern struct protosw inetsw[]; @@ -537,7 +537,7 @@ # if (__NetBSD_Version__ >= 105150000) || (__FreeBSD_version >= 501108) struct pfil_head *ph_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET); # ifdef USE_INET6 - struct pfil_head *ph_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6); + struct pfil_head *ph_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6); # endif # endif #endif @@ -1055,8 +1055,8 @@ while ((f = *ftail)) ftail = &f->fr_next; else { + ftail = fprev; if (fp->fr_hits) { - ftail = fprev; while (--fp->fr_hits && (f = *ftail)) ftail = &f->fr_next; } @@ -1310,7 +1310,7 @@ frn.fin_ifp = fin->fin_ifp; frn.fin_v = fin->fin_v; frn.fin_out = fin->fin_out; - frn.fin_mp = fin->fin_mp; + frn.fin_mp = mp; ip = mtod(m, ip_t *); hlen = sizeof(*ip); @@ -1354,9 +1354,10 @@ m->m_pkthdr.rcvif = NULL; # endif - fr_makefrip(hlen, ip, &frn); - - error = ipfr_fastroute(m, mp, &frn, NULL); + if (fr_makefrip(hlen, ip, &frn) == 0) + error = ipfr_fastroute(m, mp, &frn, NULL); + else + error = EINVAL; return error; } @@ -1489,7 +1490,13 @@ #endif if (avail) { + slen = oip->ip_len; + oip->ip_len = htons(oip->ip_len); + soff = oip->ip_off; + oip->ip_off = htons(oip->ip_off); bcopy((char *)oip, (char *)&icmp->icmp_ip, MIN(ohlen, avail)); + oip->ip_len = slen; + oip->ip_off = soff; avail -= MIN(ohlen, avail); } @@ -1510,10 +1517,6 @@ } else #endif { - slen = oip->ip_len; - oip->ip_len = htons(oip->ip_len); - soff = oip->ip_off; - oip->ip_off = htons(ip->ip_off); ip->ip_src.s_addr = dst4.s_addr; ip->ip_dst.s_addr = oip->ip_src.s_addr; @@ -1533,13 +1536,7 @@ fin->fin_hlen = hlen; err = send_ip(oip, fin, &m); fin->fin_hlen = shlen; -#ifdef USE_INET6 - if (fin->fin_v == 4) -#endif - { - oip->ip_len = slen; - oip->ip_off = soff; - } + return err; } @@ -1597,7 +1594,7 @@ register struct ip *ip, *mhip; register struct mbuf *m = m0; register struct route *ro; - int len, off, error = 0, hlen, code; + int len, off, error = 0, hlen, code, sout; struct ifnet *ifp, *sifp; struct sockaddr_in *dst; struct route iproute; @@ -1663,7 +1660,7 @@ /* * Route packet. */ -#if defined(__sgi) && (IRIX >= 605) +#if (defined(IRIX) && (IRIX >= 605)) ROUTE_RDLOCK(); #endif bzero((caddr_t)ro, sizeof (*ro)); @@ -1682,8 +1679,12 @@ * check that we're going in the correct direction. */ if ((fr != NULL) && (fin->fin_rev != 0)) { - if ((ifp != NULL) && (fdp == &fr->fr_tif)) + if ((ifp != NULL) && (fdp == &fr->fr_tif)) { +# if (defined(IRIX) && (IRIX >= 605)) + ROUTE_UNLOCK(); +# endif return 0; + } } else if (fdp != NULL) { if (fdp->fd_ip.s_addr != 0) dst->sin_addr = fdp->fd_ip; @@ -1703,13 +1704,12 @@ rtalloc(ro); # endif -#if defined(__sgi) && (IRIX > 602) - ROUTE_UNLOCK(); -#endif - if (!ifp) { if (!fr || !(fr->fr_flags & FR_FASTROUTE)) { error = -2; +# if (defined(IRIX) && (IRIX >= 605)) + ROUTE_UNLOCK(); +# endif goto bad; } } @@ -1722,11 +1722,14 @@ error = EHOSTUNREACH; else error = ENETUNREACH; +# if (defined(IRIX) && (IRIX >= 605)) + ROUTE_UNLOCK(); +# endif goto bad; } if (ro->ro_rt->rt_flags & RTF_GATEWAY) { -#if BSD >= 199306 +#if (BSD >= 199306) || (defined(IRIX) && (IRIX >= 605)) dst = (struct sockaddr_in *)ro->ro_rt->rt_gateway; #else dst = (struct sockaddr_in *)&ro->ro_rt->rt_gateway; @@ -1734,6 +1737,10 @@ } ro->ro_rt->rt_use++; +#if (defined(IRIX) && (IRIX > 602)) + ROUTE_UNLOCK(); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 22 05:54:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A32916A4D0; Tue, 22 Jun 2004 05:54:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E30A16A4CE for ; Tue, 22 Jun 2004 05:54:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1565A43D41 for ; Tue, 22 Jun 2004 05:54:18 +0000 (GMT) (envelope-from ps@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5M5sH6j060798 for ; Tue, 22 Jun 2004 05:54:17 GMT (envelope-from ps@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5M5sGIF060795 for perforce@freebsd.org; Tue, 22 Jun 2004 05:54:16 GMT (envelope-from ps@freebsd.org) Date: Tue, 22 Jun 2004 05:54:16 GMT Message-Id: <200406220554.i5M5sGIF060795@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ps@freebsd.org using -f From: Paul Saab To: Perforce Change Reviews Subject: PERFORCE change 55511 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2004 05:54:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=55511 Change 55511 by ps@butter.corp on 2004/06/22 05:54:09 IFC Affected files ... .. //depot/projects/sack/cam/cam_xpt.c#3 integrate .. //depot/projects/sack/compat/linux/linux_util.c#2 integrate .. //depot/projects/sack/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/sack/compat/svr4/svr4_ttold.c#2 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ip_fil.c#3 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ip_fil.h#3 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/sack/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/sack/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/sack/dev/ciss/ciss.c#3 integrate .. //depot/projects/sack/dev/ciss/cissreg.h#2 integrate .. //depot/projects/sack/dev/ciss/cissvar.h#3 integrate .. //depot/projects/sack/dev/cy/cy.c#4 integrate .. //depot/projects/sack/dev/digi/digi.c#4 integrate .. //depot/projects/sack/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/sack/dev/rp/rp.c#4 integrate .. //depot/projects/sack/dev/rp/rp_pci.c#2 integrate .. //depot/projects/sack/dev/rp/rpreg.h#3 integrate .. //depot/projects/sack/dev/si/si.c#4 integrate .. //depot/projects/sack/dev/sio/sio.c#4 integrate .. //depot/projects/sack/dev/sx/sx.c#4 integrate .. //depot/projects/sack/geom/gate/g_gate.c#3 integrate .. //depot/projects/sack/geom/geom.h#3 integrate .. //depot/projects/sack/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/sack/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/sack/i4b/driver/i4b_ing.c#2 integrate .. //depot/projects/sack/kern/init_sysent.c#2 integrate .. //depot/projects/sack/kern/kern_exit.c#4 integrate .. //depot/projects/sack/kern/kern_resource.c#4 integrate .. //depot/projects/sack/kern/kern_thread.c#4 integrate .. //depot/projects/sack/kern/kern_time.c#3 integrate .. //depot/projects/sack/kern/sched_4bsd.c#3 integrate .. //depot/projects/sack/kern/sched_ule.c#3 integrate .. //depot/projects/sack/kern/syscalls.c#2 integrate .. //depot/projects/sack/kern/syscalls.master#2 integrate .. //depot/projects/sack/kern/tty.c#4 integrate .. //depot/projects/sack/kern/tty_compat.c#3 integrate .. //depot/projects/sack/kern/tty_pty.c#4 integrate .. //depot/projects/sack/kern/uipc_socket.c#4 integrate .. //depot/projects/sack/kern/vfs_syscalls.c#4 integrate .. //depot/projects/sack/netinet/ip_divert.c#3 integrate .. //depot/projects/sack/pci/if_mn.c#3 integrate .. //depot/projects/sack/sys/ioctl_compat.h#2 integrate .. //depot/projects/sack/sys/syscall.h#2 integrate .. //depot/projects/sack/sys/syscall.mk#2 integrate .. //depot/projects/sack/sys/sysproto.h#2 integrate .. //depot/projects/sack/sys/ttychars.h#2 integrate .. //depot/projects/sack/sys/ttydev.h#2 integrate .. //depot/projects/sack/sys/user.h#3 integrate Differences ... ==== //depot/projects/sack/cam/cam_xpt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.139 2004/06/16 09:46:31 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.141 2004/06/21 19:01:55 ps Exp $"); #include #include ==== //depot/projects/sack/compat/linux/linux_util.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.24 2004/01/14 22:38:03 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.25 2004/06/22 04:22:34 rwatson Exp $"); #include #include @@ -101,6 +101,8 @@ char *ptr, *buf, *cp; size_t len, sz; + GIANT_REQUIRED; + buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK); *pbuf = buf; ==== //depot/projects/sack/compat/svr4/svr4_ioctl.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.20 2003/06/10 21:35:15 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.21 2004/06/21 22:57:10 phk Exp $"); #include #include @@ -119,10 +119,12 @@ #endif switch (cmd & 0xff00) { +#ifndef BURN_BRIDGES case SVR4_tIOC: DPRINTF(("ttold\n")); fun = svr4_ttold_ioctl; break; +#endif case SVR4_TIOC: DPRINTF(("term\n")); ==== //depot/projects/sack/compat/svr4/svr4_ttold.c#2 (text+ko) ==== @@ -27,7 +27,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ttold.c,v 1.12 2003/06/10 21:35:15 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ttold.c,v 1.13 2004/06/21 22:57:10 phk Exp $"); + +#ifndef BURN_BRIDGES #include #include @@ -376,3 +378,5 @@ return 0; /* ENOSYS really */ } } + +#endif /* BURN_BRIDGES */ ==== //depot/projects/sack/contrib/ipfilter/netinet/fil.c#2 (text+ko) ==== @@ -42,6 +42,7 @@ # include # endif #else +# include # include # if SOLARIS2 < 5 # include @@ -99,7 +100,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.37 2004/04/07 20:45:56 imp Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.38 2004/06/21 22:46:35 darrenr Exp $"; #endif #ifndef _KERNEL @@ -146,6 +147,9 @@ static int frflushlist __P((int, minor_t, int *, frentry_t **)); #ifdef _KERNEL static void frsynclist __P((frentry_t *)); +# ifndef __sgi +static void *ipf_pullup __P((mb_t *, fr_info_t *, int, void *)); +# endif #endif @@ -194,19 +198,27 @@ * compact the IP header into a structure which contains just the info. * which is useful for comparing IP headers with. */ -void fr_makefrip(hlen, ip, fin) +int fr_makefrip(hlen, ip, fin) int hlen; ip_t *ip; fr_info_t *fin; { u_short optmsk = 0, secmsk = 0, auth = 0; int i, mv, ol, off, p, plen, v; +#if defined(_KERNEL) +# if SOLARIS + mb_t *m = fin->fin_qfm; +# else + mb_t *m = fin->fin_mp ? *fin->fin_mp : NULL; +# endif +#endif fr_ip_t *fi = &fin->fin_fi; struct optlist *op; u_char *s, opt; tcphdr_t *tcp; fin->fin_rev = 0; + fin->fin_dp = NULL; fin->fin_fr = NULL; fin->fin_tcpf = 0; fin->fin_data[0] = 0; @@ -220,8 +232,10 @@ if (v == 4) { fin->fin_id = ip->ip_id; fi->fi_tos = ip->ip_tos; +#if (OpenBSD >= 200311) && defined(_KERNEL) + ip->ip_off = ntohs(ip->ip_off); +#endif off = (ip->ip_off & IP_OFFMASK); - tcp = (tcphdr_t *)((char *)ip + hlen); (*(((u_short *)fi) + 1)) = (*(((u_short *)ip) + 4)); fi->fi_src.i6[1] = 0; fi->fi_src.i6[2] = 0; @@ -235,6 +249,9 @@ fi->fi_fl = (hlen > sizeof(ip_t)) ? FI_OPTIONS : 0; if (ip->ip_off & (IP_MF|IP_OFFMASK)) fi->fi_fl |= FI_FRAG; +#if (OpenBSD >= 200311) && defined(_KERNEL) + ip->ip_len = ntohs(ip->ip_len); +#endif plen = ip->ip_len; fin->fin_dlen = plen - hlen; } @@ -246,7 +263,6 @@ p = ip6->ip6_nxt; fi->fi_p = p; fi->fi_ttl = ip6->ip6_hlim; - tcp = (tcphdr_t *)(ip6 + 1); fi->fi_src.in6 = ip6->ip6_src; fi->fi_dst.in6 = ip6->ip6_dst; fin->fin_id = (u_short)(ip6->ip6_flow & 0xffff); @@ -258,14 +274,23 @@ } #endif else - return; + return -1; fin->fin_off = off; fin->fin_plen = plen; - fin->fin_dp = (char *)tcp; + tcp = (tcphdr_t *)((char *)ip + hlen); fin->fin_misc = 0; off <<= 3; + /* + * For both ICMPV6 & ICMP, we attempt to pullup the entire packet into + * a single buffer for recognised error return packets. Why? Because + * the entire data section of the ICMP payload is considered to be of + * significance and maybe required in NAT/state processing, so rather + * than be careful later, attempt to get it all in one buffeer first. + * For TCP we just make sure the _entire_ TCP header is in the first + * buffer for convienience. + */ switch (p) { #ifdef USE_INET6 @@ -274,7 +299,7 @@ int minicmpsz = sizeof(struct icmp6_hdr); struct icmp6_hdr *icmp6; - if (fin->fin_dlen > 1) { + if (!(fin->fin_fl & FI_SHORT) && (fin->fin_dlen > 1)) { fin->fin_data[0] = *(u_short *)tcp; icmp6 = (struct icmp6_hdr *)tcp; @@ -289,6 +314,14 @@ case ICMP6_PACKET_TOO_BIG : case ICMP6_TIME_EXCEEDED : case ICMP6_PARAM_PROB : +# if defined(KERNEL) && !defined(__sgi) + if ((m != NULL) && (M_BLEN(m) < plen)) { + ip = ipf_pullup(m, fin, plen, ip); + if (ip == NULL) + return -1; + tcp = (tcphdr_t *)((char *)ip + hlen); + } +# endif /* KERNEL && !__sgi */ minicmpsz = ICMP6ERR_IPICMPHLEN; break; default : @@ -296,22 +329,27 @@ } } - if (!(plen >= minicmpsz)) + if (!(fin->fin_dlen >= minicmpsz)) fi->fi_fl |= FI_SHORT; break; } -#endif +#endif /* USE_INET6 */ + case IPPROTO_ICMP : { int minicmpsz = sizeof(struct icmp); icmphdr_t *icmp; - if (!off && (fin->fin_dlen > 1)) { + if (!off && (fin->fin_dlen > 1) && !(fin->fin_fl & FI_SHORT)) { fin->fin_data[0] = *(u_short *)tcp; icmp = (icmphdr_t *)tcp; + /* + * Minimum ICMP packet is type(1) code(1) cksum(2) + * plus 4 bytes following, totalling 8 bytes. + */ switch (icmp->icmp_type) { case ICMP_ECHOREPLY : @@ -327,7 +365,7 @@ */ case ICMP_TSTAMP : case ICMP_TSTAMPREPLY : - minicmpsz = 20; + minicmpsz = ICMP_MINLEN + 12; break; /* * type(1) + code(1) + cksum(2) + id(2) seq(2) + @@ -335,9 +373,28 @@ */ case ICMP_MASKREQ : case ICMP_MASKREPLY : - minicmpsz = 12; + minicmpsz = ICMP_MINLEN + 4; + break; + /* + * type(1) + code(1) + cksum(2) + arg(4) ip(20+) + */ + case ICMP_UNREACH : + case ICMP_SOURCEQUENCH : + case ICMP_REDIRECT : + case ICMP_TIMXCEED : + case ICMP_PARAMPROB : +#if defined(KERNEL) && !defined(__sgi) + if ((m != NULL) && (M_BLEN(m) < plen)) { + ip = ipf_pullup(m, fin, plen, ip); + if (ip == NULL) + return -1; + tcp = (tcphdr_t *)((char *)ip + hlen); + } +#endif /* KERNEL && !__sgi */ + minicmpsz = ICMPERR_MINPKTLEN - sizeof(ip_t); break; default : + minicmpsz = ICMP_MINLEN; break; } } @@ -345,9 +402,9 @@ if ((!(plen >= hlen + minicmpsz) && !off) || (off && off < sizeof(struct icmp))) fi->fi_fl |= FI_SHORT; - break; } + case IPPROTO_TCP : fi->fi_fl |= FI_TCPUDP; #ifdef USE_INET6 @@ -361,6 +418,20 @@ (off && off < sizeof(struct tcphdr))) fi->fi_fl |= FI_SHORT; } + +#if defined(KERNEL) && !defined(__sgi) + if (!off && !(fi->fi_fl & FI_SHORT)) { + int tlen = hlen + (tcp->th_off << 2); + + if ((m != NULL) && (M_BLEN(m) < tlen)) { + ip = ipf_pullup(m, fin, tlen, ip); + if (ip == NULL) + return -1; + tcp = (tcphdr_t *)((char *)ip + hlen); + } + } +#endif /* _KERNEL && !_sgi */ + if (!(fi->fi_fl & FI_SHORT) && !off) fin->fin_tcpf = tcp->th_flags; goto getports; @@ -400,12 +471,14 @@ break; } + fin->fin_dp = (char *)tcp; + #ifdef USE_INET6 if (v == 6) { fi->fi_optmsk = 0; fi->fi_secmsk = 0; fi->fi_auth = 0; - return; + return 0; } #endif @@ -462,6 +535,7 @@ fi->fi_optmsk = optmsk; fi->fi_secmsk = secmsk; fi->fi_auth = auth; + return 0; } @@ -749,7 +823,7 @@ #endif /* IPFILTER_LOG */ ATOMIC_INCL(fr->fr_hits); if (passt & FR_ACCOUNT) - fr->fr_bytes += (U_QUAD_T)ip->ip_len; + fr->fr_bytes += (U_QUAD_T)fin->fin_plen; else fin->fin_icode = fr->fr_icode; fin->fin_rule = rulen; @@ -812,12 +886,17 @@ int p, len, drop = 0, logit = 0; mb_t *mc = NULL; # if !defined(__SVR4) && !defined(__svr4__) + /* + * We don't do this section for Solaris because fr_precheck() does a + * pullupmsg() instead, effectively achieving the same result as here + * so no need to duplicate it. + */ # ifdef __sgi char hbuf[128]; # endif int up; -# if !SOLARIS && !defined(NETBSD_PF) && \ +# if !defined(NETBSD_PF) && \ ((defined(__FreeBSD__) && (__FreeBSD_version < 500011)) || \ defined(__OpenBSD__) || defined(_BSDI_VERSION)) if (fr_checkp != fr_check && fr_running > 0) { @@ -855,7 +934,7 @@ } # endif /* CSUM_DELAY_DATA */ -# ifdef USE_INET6 +# ifdef USE_INET6 if (v == 6) { len = ntohs(((ip6_t*)ip)->ip6_plen); if (!len) @@ -863,17 +942,20 @@ len += sizeof(ip6_t); p = ((ip6_t *)ip)->ip6_nxt; } else -# endif +# endif { p = ip->ip_p; len = ip->ip_len; } + fin->fin_mp = mp; + fin->fin_out = out; + if ((p == IPPROTO_TCP || p == IPPROTO_UDP || (v == 4 && p == IPPROTO_ICMP) -# ifdef USE_INET6 +# ifdef USE_INET6 || (v == 6 && p == IPPROTO_ICMPV6) -# endif +# endif )) { int plen = 0; @@ -893,7 +975,7 @@ case IPPROTO_ESP: plen = 8; break; -# ifdef USE_INET6 +# ifdef USE_INET6 case IPPROTO_ICMPV6 : /* * XXX does not take intermediate header @@ -901,8 +983,10 @@ */ plen = ICMP6ERR_MINPKTLEN + 8 - sizeof(ip6_t); break; -# endif +# endif } + if ((plen > 0) && (len < hlen + plen)) + fin->fin_fl |= FI_SHORT; up = MIN(hlen + plen, len); if (up > m->m_len) { @@ -917,14 +1001,34 @@ ip = (ip_t *)hbuf; # else /* __ sgi */ # ifndef linux - if ((*mp = m_pullup(m, up)) == 0) { - ATOMIC_INCL(frstats[out].fr_pull[1]); + /* + * Having determined that we need to pullup some data, + * try to bring as much of the packet up into a single + * buffer with the first pullup. This hopefully means + * less need for doing futher pullups. Not needed for + * Solaris because fr_precheck() does it anyway. + * + * The main potential for trouble here is if MLEN/MHLEN + * become quite small, lets say < 64 bytes...but if + * that did happen, BSD networking as a whole would be + * slow/inefficient. + */ +# ifdef MHLEN + /* + * Assume that M_PKTHDR is set and just work with what + * is left rather than check.. Should not make any + * real difference, anyway. + */ + if ((MHLEN > up) && (len > up)) + up = MIN(len, MHLEN); +# else + if ((MLEN > up) && (len > up)) + up = MIN(len, MLEN); +# endif + ip = ipf_pullup(m, fin, up, ip); + if (ip == NULL) return -1; - } else { - ATOMIC_INCL(frstats[out].fr_pull[0]); - m = *mp; - ip = mtod(m, ip_t *); - } + m = *mp; # endif /* !linux */ # endif /* __sgi */ } else @@ -937,9 +1041,14 @@ if ((u_int)ip & 0x3) return 2; + fin->fin_mp = mp; + fin->fin_out = out; fin->fin_qfm = m; fin->fin_qif = qif; # endif +#else + fin->fin_mp = mp; + fin->fin_out = out; #endif /* _KERNEL */ #ifndef __FreeBSD__ @@ -952,11 +1061,10 @@ #endif changed = 0; + fin->fin_v = v; fin->fin_ifp = ifp; - fin->fin_v = v; - fin->fin_out = out; - fin->fin_mp = mp; - fr_makefrip(hlen, ip, fin); + if (fr_makefrip(hlen, ip, fin) == -1) + return -1; #ifdef _KERNEL # ifdef USE_INET6 @@ -1120,6 +1228,10 @@ if (pass & FR_KEEPSTATE) { if (fr_addstate(ip, fin, NULL, 0) == NULL) { ATOMIC_INCL(frstats[out].fr_bads); + if (pass & FR_PASS) { + pass &= ~FR_PASS; + pass |= FR_BLOCK; + } } else { ATOMIC_INCL(frstats[out].fr_ads); } @@ -1306,6 +1418,12 @@ (void) ipfr_fastroute(ip, mc, &mc, fin, &fr->fr_dif); } # endif /* !SOLARIS */ +#if (OpenBSD >= 200311) && defined(_KERNEL) + if (pass & FR_PASS) { + ip->ip_len = htons(ip->ip_len); + ip->ip_off = htons(ip->ip_off); + } +#endif return (pass & FR_PASS) ? 0 : error; #else /* _KERNEL */ if (pass & FR_NOMATCH) @@ -1403,10 +1521,10 @@ /* * Both sum and sum2 are partial sums, so combine them together. */ - sum = (sum & 0xffff) + (sum >> 16); - sum = ~sum & 0xffff; - sum2 += sum; - sum2 = (sum2 & 0xffff) + (sum2 >> 16); + sum += ~sum2 & 0xffff; + while (sum > 0xffff) + sum = (sum & 0xffff) + (sum >> 16); + sum2 = ~sum & 0xffff; # else /* defined(BSD) || defined(sun) */ { union { @@ -1543,7 +1661,7 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $Id: fil.c,v 2.35.2.67 2002/12/06 13:28:05 darrenr Exp $ + * $Id: fil.c,v 2.35.2.82 2004/06/20 10:27:47 darrenr Exp $ */ /* * Copy data from an mbuf chain starting "off" bytes from the beginning, @@ -1975,12 +2093,40 @@ static void frsynclist(fr) register frentry_t *fr; { + frdest_t *fdp; + int i; + for (; fr; fr = fr->fr_next) { - if (fr->fr_ifa != NULL) { - fr->fr_ifa = GETUNIT(fr->fr_ifname, fr->fr_ip.fi_v); - if (fr->fr_ifa == NULL) - fr->fr_ifa = (void *)-1; + for (i = 0; i < 4; i++) { + if ((fr->fr_ifnames[i][1] == '\0') && + ((fr->fr_ifnames[i][0] == '-') || + (fr->fr_ifnames[i][0] == '*'))) { + fr->fr_ifas[i] = NULL; + } else if (*fr->fr_ifnames[i]) { + fr->fr_ifas[i] = GETUNIT(fr->fr_ifnames[i], + fr->fr_v); + if (!fr->fr_ifas[i]) + fr->fr_ifas[i] = (void *)-1; + } + } + + fdp = &fr->fr_dif; + fr->fr_flags &= ~FR_DUP; + if (*fdp->fd_ifname) { + fdp->fd_ifp = GETUNIT(fdp->fd_ifname, fr->fr_v); + if (!fdp->fd_ifp) + fdp->fd_ifp = (struct ifnet *)-1; + else + fr->fr_flags |= FR_DUP; + } + + fdp = &fr->fr_tif; + if (*fdp->fd_ifname) { + fdp->fd_ifp = GETUNIT(fdp->fd_ifname, fr->fr_v); + if (!fdp->fd_ifp) + fdp->fd_ifp = (struct ifnet *)-1; } + if (fr->fr_grp) frsynclist(fr->fr_grp); } @@ -2013,6 +2159,9 @@ IFNET_RUNLOCK(); # endif ip_natsync((struct ifnet *)-1); +# if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) + IFNET_RUNLOCK(); +# endif # endif /* !SOLARIS */ WRITE_ENTER(&ipf_mutex); @@ -2241,3 +2390,64 @@ return ip->ip_len; } #endif + + +#if defined(_KERNEL) && !defined(__sgi) +void *ipf_pullup(m, fin, len, ipin) +mb_t *m; +fr_info_t *fin; +int len; +void *ipin; +{ +# if SOLARIS + qif_t *qf = fin->fin_qif; +# endif + int out = fin->fin_out, dpoff, ipoff; + char *ip; + + if (m == NULL) + return NULL; + + ipoff = (char *)ipin - MTOD(m, char *); + if (fin->fin_dp != NULL) + dpoff = (char *)fin->fin_dp - (char *)ipin; + else + dpoff = 0; + + if (M_BLEN(m) < len) { +# if SOLARIS + qif_t *qf = fin->fin_qif; + int inc = 0; + + if (ipoff > 0) { + if ((ipoff & 3) != 0) { + inc = 4 - (ipoff & 3); + if (m->b_rptr - inc >= m->b_datap->db_base) + m->b_rptr -= inc; + else + inc = 0; + } + } + if (!pullupmsg(m, len + ipoff + inc)) { + ATOMIC_INCL(frstats[out].fr_pull[1]); + return NULL; + } + m->b_rptr += inc; + ATOMIC_INCL(frstats[out].fr_pull[0]); + qf->qf_data = MTOD(m, char *) + ipoff; +# else + m = m_pullup(m, len); + *fin->fin_mp = m; + if (m == NULL) { + ATOMIC_INCL(frstats[out].fr_pull[1]); + return NULL; + } + ATOMIC_INCL(frstats[out].fr_pull[0]); +# endif /* SOLARIS */ + } + ip = MTOD(m, char *) + ipoff; + if (fin->fin_dp != NULL) + fin->fin_dp = (char *)ip + dpoff; + return ip; +} +#endif /* _KERNEL */ ==== //depot/projects/sack/contrib/ipfilter/netinet/ip_auth.c#2 (text+ko) ==== @@ -105,7 +105,7 @@ #if !defined(lint) /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.11.2.12 2001/07/18 14:57:08 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.33 2003/03/04 23:19:55 jlemon Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.36 2004/06/22 05:20:30 darrenr Exp $"; #endif @@ -321,6 +321,9 @@ { mb_t *m; #if defined(_KERNEL) && !SOLARIS +# if !defined(__FreeBSD_version) || (__FreeBSD_version < 501104) + struct ifqueue *ifq; +# endif int s; #endif frauth_t auth, *au = &auth, *fra; @@ -423,8 +426,8 @@ bzero((char *)&ro, sizeof(ro)); # if ((_BSDI_VERSION >= 199802) && (_BSDI_VERSION < 200005)) || \ - defined(__OpenBSD__) || (defined(IRIX) && (IRIX >= 605)) || \ - (__FreeBSD_version >= 500042) + defined(__OpenBSD__) || (defined(IRIX) && (IRIX >= 605)) || \ + (__FreeBSD_version >= 470102) error = ip_output(m, NULL, &ro, IP_FORWARDING, NULL, NULL); # else ==== //depot/projects/sack/contrib/ipfilter/netinet/ip_compat.h#3 (text+ko) ==== @@ -5,7 +5,7 @@ * * @(#)ip_compat.h 1.8 1/14/96 * $Id: ip_compat.h,v 2.26.2.9 2001/01/14 14:58:01 darrenr Exp $ - * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.22 2004/06/08 23:52:22 darrenr Exp $ + * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.23 2004/06/21 22:46:35 darrenr Exp $ */ #ifndef __IP_COMPAT_H__ @@ -66,7 +66,7 @@ #if defined(__sgi) || defined(bsdi) struct ether_addr { - u_char ether_addr_octet[6]; + u_char ether_addr_octet[6]; }; #endif @@ -164,6 +164,7 @@ # define V4_PART_OF_V6(v6) v6.s6_addr32[3] # endif # endif +# define M_BLEN(m) ((m)->b_wptr - (m)->b_rptr) typedef struct qif { struct qif *qf_next; @@ -173,6 +174,7 @@ void *qf_optr; queue_t *qf_in; queue_t *qf_out; + void *qf_data; /* layer 3 header pointer */ struct qinit *qf_wqinfo; struct qinit *qf_rqinfo; struct qinit qf_wqinit; @@ -525,6 +527,7 @@ # ifndef linux # define FREE_MB_T(m) m_freem(m) # define MTOD(m,t) mtod(m,t) +# define M_BLEN(m) (m)->m_len # define IRCOPY(a,b,c) (bcopy((a), (b), (c)), 0) # define IWCOPY(a,b,c) (bcopy((a), (b), (c)), 0) # define IRCOPYPTR ircopyptr @@ -963,7 +966,7 @@ __u32 th_seq; __u32 th_ack; # if defined(__i386__) || defined(__MIPSEL__) || defined(__alpha__) ||\ - defined(vax) + defined(__vax__) __u8 th_res:4; __u8 th_off:4; #else @@ -985,7 +988,7 @@ typedef struct { # if defined(__i386__) || defined(__MIPSEL__) || defined(__alpha__) ||\ - defined(vax) + defined(__vax__) __u8 ip_hl:4; __u8 ip_v:4; # else @@ -1209,8 +1212,8 @@ #define ICMPERR_MINPKTLEN (20 + 8 + 20) #define ICMPERR_MAXPKTLEN (20 + 8 + 20 + 8) #define ICMP6_MINLEN 8 -#define ICMP6ERR_MINPKTLEN (40 + 8) -#define ICMP6ERR_IPICMPHLEN (40 + 8 + 40) +#define ICMP6ERR_IPICMPHLEN (40 + 8) +#define ICMP6ERR_MINPKTLEN (40 + 8 + 40) #ifndef ICMP6_DST_UNREACH # define ICMP6_DST_UNREACH 1 ==== //depot/projects/sack/contrib/ipfilter/netinet/ip_fil.c#3 (text+ko) ==== @@ -131,7 +131,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; /* static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.42.2.34 2001/07/23 13:49:57 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.44 2004/06/16 09:46:34 phk Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.46 2004/06/22 02:44:06 darrenr Exp $"; #endif extern struct protosw inetsw[]; @@ -537,7 +537,7 @@ # if (__NetBSD_Version__ >= 105150000) || (__FreeBSD_version >= 501108) struct pfil_head *ph_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET); # ifdef USE_INET6 - struct pfil_head *ph_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6); + struct pfil_head *ph_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6); # endif # endif #endif @@ -1055,8 +1055,8 @@ while ((f = *ftail)) ftail = &f->fr_next; else { + ftail = fprev; if (fp->fr_hits) { - ftail = fprev; while (--fp->fr_hits && (f = *ftail)) ftail = &f->fr_next; } @@ -1310,7 +1310,7 @@ frn.fin_ifp = fin->fin_ifp; frn.fin_v = fin->fin_v; frn.fin_out = fin->fin_out; - frn.fin_mp = fin->fin_mp; + frn.fin_mp = mp; ip = mtod(m, ip_t *); hlen = sizeof(*ip); @@ -1354,9 +1354,10 @@ m->m_pkthdr.rcvif = NULL; # endif - fr_makefrip(hlen, ip, &frn); - - error = ipfr_fastroute(m, mp, &frn, NULL); + if (fr_makefrip(hlen, ip, &frn) == 0) + error = ipfr_fastroute(m, mp, &frn, NULL); + else + error = EINVAL; return error; } @@ -1489,7 +1490,13 @@ #endif if (avail) { + slen = oip->ip_len; + oip->ip_len = htons(oip->ip_len); + soff = oip->ip_off; + oip->ip_off = htons(oip->ip_off); bcopy((char *)oip, (char *)&icmp->icmp_ip, MIN(ohlen, avail)); + oip->ip_len = slen; + oip->ip_off = soff; avail -= MIN(ohlen, avail); } @@ -1510,10 +1517,6 @@ } else #endif { - slen = oip->ip_len; - oip->ip_len = htons(oip->ip_len); - soff = oip->ip_off; - oip->ip_off = htons(ip->ip_off); ip->ip_src.s_addr = dst4.s_addr; ip->ip_dst.s_addr = oip->ip_src.s_addr; @@ -1533,13 +1536,7 @@ fin->fin_hlen = hlen; err = send_ip(oip, fin, &m); fin->fin_hlen = shlen; -#ifdef USE_INET6 - if (fin->fin_v == 4) -#endif - { - oip->ip_len = slen; - oip->ip_off = soff; - } + return err; } @@ -1597,7 +1594,7 @@ register struct ip *ip, *mhip; register struct mbuf *m = m0; register struct route *ro; - int len, off, error = 0, hlen, code; + int len, off, error = 0, hlen, code, sout; struct ifnet *ifp, *sifp; struct sockaddr_in *dst; struct route iproute; @@ -1663,7 +1660,7 @@ /* * Route packet. */ -#if defined(__sgi) && (IRIX >= 605) +#if (defined(IRIX) && (IRIX >= 605)) ROUTE_RDLOCK(); #endif bzero((caddr_t)ro, sizeof (*ro)); @@ -1682,8 +1679,12 @@ * check that we're going in the correct direction. */ if ((fr != NULL) && (fin->fin_rev != 0)) { - if ((ifp != NULL) && (fdp == &fr->fr_tif)) + if ((ifp != NULL) && (fdp == &fr->fr_tif)) { +# if (defined(IRIX) && (IRIX >= 605)) + ROUTE_UNLOCK(); +# endif return 0; + } } else if (fdp != NULL) { if (fdp->fd_ip.s_addr != 0) dst->sin_addr = fdp->fd_ip; @@ -1703,13 +1704,12 @@ rtalloc(ro); # endif -#if defined(__sgi) && (IRIX > 602) - ROUTE_UNLOCK(); -#endif - if (!ifp) { if (!fr || !(fr->fr_flags & FR_FASTROUTE)) { error = -2; +# if (defined(IRIX) && (IRIX >= 605)) + ROUTE_UNLOCK(); +# endif goto bad; } } @@ -1722,11 +1722,14 @@ error = EHOSTUNREACH; else error = ENETUNREACH; +# if (defined(IRIX) && (IRIX >= 605)) + ROUTE_UNLOCK(); +# endif goto bad; } if (ro->ro_rt->rt_flags & RTF_GATEWAY) { -#if BSD >= 199306 +#if (BSD >= 199306) || (defined(IRIX) && (IRIX >= 605)) dst = (struct sockaddr_in *)ro->ro_rt->rt_gateway; #else dst = (struct sockaddr_in *)&ro->ro_rt->rt_gateway; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 22 23:50:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72D1A16A4D1; Tue, 22 Jun 2004 23:50:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1AFFA16A4CF for ; Tue, 22 Jun 2004 23:50:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1305E43D31 for ; Tue, 22 Jun 2004 23:50:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5MNoA4d023003 for ; Tue, 22 Jun 2004 23:50:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5MNo9Dp023000 for perforce@freebsd.org; Tue, 22 Jun 2004 23:50:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 22 Jun 2004 23:50:09 GMT Message-Id: <200406222350.i5MNo9Dp023000@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 Subject: PERFORCE change 55562 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2004 23:50:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=55562 Change 55562 by rwatson@rwatson_tislabs on 2004/06/22 23:50:05 Integrate netperf_socket. Affected files ... .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/netperf_socket/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#22 integrate .. //depot/projects/netperf_socket/sys/conf/files#28 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#8 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#8 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pfvar.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-fd.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-tape.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumio.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_drive.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_raid5.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/init_sysent.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_conf.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.master#7 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#22 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#11 integrate .. //depot/projects/netperf_socket/sys/modules/Makefile#11 integrate .. //depot/projects/netperf_socket/sys/net/if.c#12 integrate .. //depot/projects/netperf_socket/sys/net/if.h#5 integrate .. //depot/projects/netperf_socket/sys/net/if_clone.c#1 branch .. //depot/projects/netperf_socket/sys/net/if_clone.h#1 branch .. //depot/projects/netperf_socket/sys/net/if_disc.c#4 integrate .. //depot/projects/netperf_socket/sys/net/if_faith.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_gif.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_gre.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_loop.c#5 integrate .. //depot/projects/netperf_socket/sys/net/if_ppp.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_stf.c#7 integrate .. //depot/projects/netperf_socket/sys/net/if_var.h#15 integrate .. //depot/projects/netperf_socket/sys/net/if_vlan.c#7 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_bridge.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_divert.c#8 integrate .. //depot/projects/netperf_socket/sys/netipsec/key.c#5 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx.h#2 integrate .. //depot/projects/netperf_socket/sys/pc98/i386/machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#11 integrate .. //depot/projects/netperf_socket/sys/sys/imgact_aout.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#14 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.h#7 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.mk#7 integrate .. //depot/projects/netperf_socket/sys/sys/sysproto.h#7 integrate .. //depot/projects/netperf_socket/sys/sys/ttycom.h#5 integrate Differences ... ==== //depot/projects/netperf_socket/sys/boot/forth/loader.conf#6 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.78 2004/06/20 15:58:24 josef Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.79 2004/06/22 22:57:13 brueffer Exp $ ############################################################## ### Basic configuration options ############################ @@ -172,8 +172,6 @@ if_tun_load="NO" # Tunnel driver (user process ppp) if_vlan_load="NO" # IEEE 802.1Q VLAN network interface ipfw_load="NO" # Firewall -pfsync_load="NO" # pfsync pseudo interface -pflog_load="NO" # pflog pseudo interface pf_load="NO" # packet filter ==== //depot/projects/netperf_socket/sys/boot/i386/cdboot/cdboot.s#2 (text+ko) ==== @@ -1,19 +1,33 @@ # -# Copyright (c) 2001 John Baldwin +# Copyright (c) 2001 John Baldwin # All rights reserved. # -# Redistribution and use in source and binary forms are freely -# permitted provided that the above copyright notice and this -# paragraph and the following disclaimer are duplicated in all -# such forms. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the author nor the names of any co-contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. # -# This software is provided "AS IS" and without any express or -# implied warranties, including, without limitation, the implied -# warranties of merchantability and fitness for a particular -# purpose. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.11 2004/01/12 20:34:42 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.13 2004/06/22 21:55:22 jhb Exp $ # # This program is a freestanding boot program to load an a.out binary @@ -151,7 +165,6 @@ mov $0xffff,%cx # path name by repnz # scanning for scasb # nul char - inc %di # Skip nul mov %di,%si # Point %si at next path mov (%si),%al # Get first char of next path or %al,%al # Is it double nul? ==== //depot/projects/netperf_socket/sys/compat/linux/linux_util.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.24 2004/01/14 22:38:03 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.25 2004/06/22 04:22:34 rwatson Exp $"); #include #include @@ -101,6 +101,8 @@ char *ptr, *buf, *cp; size_t len, sz; + GIANT_REQUIRED; + buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK); *pbuf = buf; ==== //depot/projects/netperf_socket/sys/conf/NOTES#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1232 2004/06/13 17:29:06 mlaier Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1233 2004/06/22 22:02:57 bms Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -372,9 +372,8 @@ # The default is that packets coming from a tunnel are _not_ processed; # they are assumed trusted. # -# Note that enabling this can be problematic as there are no mechanisms -# in place for distinguishing packets coming out of a tunnel (e.g. no -# encX devices as found on openbsd). +# IPSEC history is preserved for such packets, and can be filtered +# using ipfw(8)'s 'ipsec' keyword, when this option is enabled. # #options IPSEC_FILTERGIF #filter ipsec packets from a tunnel ==== //depot/projects/netperf_socket/sys/conf/files#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.906 2004/06/16 23:23:59 mlaier Exp $ +# $FreeBSD: src/sys/conf/files,v 1.907 2004/06/22 20:13:24 brooks Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1222,6 +1222,7 @@ net/if.c standard net/if_arcsubr.c optional arcnet net/if_atmsubr.c optional atm +net/if_clone.c standard net/if_disc.c optional disc net/if_ef.c optional ef net/if_ethersubr.c optional ether ==== //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_auth.c#3 (text+ko) ==== @@ -105,7 +105,7 @@ #if !defined(lint) /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.11.2.12 2001/07/18 14:57:08 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.34 2004/06/21 22:46:35 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.36 2004/06/22 05:20:30 darrenr Exp $"; #endif @@ -320,9 +320,10 @@ #endif { mb_t *m; -#if defined(_KERNEL) && !SOLARIS && \ - (!defined(__FreeBSD_version) || (__FreeBSD_version < 501000)) +#if defined(_KERNEL) && !SOLARIS +# if !defined(__FreeBSD_version) || (__FreeBSD_version < 501104) struct ifqueue *ifq; +# endif int s; #endif frauth_t auth, *au = &auth, *fra; @@ -444,22 +445,8 @@ # if SOLARIS error = (fr_qin(fra->fra_q, m) == 0) ? EINVAL : 0; # else /* SOLARIS */ -# if __FreeBSD_version >= 501104 - if (! netisr_dispatch(NETISR_IP, m)) + if (! netisr_queue(NETISR_IP, m)) error = ENOBUFS; -# else - ifq = &ipintrq; - if (IF_QFULL(ifq)) { - IF_DROP(ifq); - m_freem(m); - error = ENOBUFS; - } else { - IF_ENQUEUE(ifq, m); -# if IRIX < 605 - schednetisr(NETISR_IP); -# endif - } -# endif # endif /* SOLARIS */ if (error) fr_authstats.fas_quefail++; ==== //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.8 2004/06/16 23:24:00 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.9 2004/06/22 20:13:24 brooks Exp $ */ /* $OpenBSD: if_pflog.c,v 1.11 2003/12/31 11:18:25 cedric Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -63,6 +63,9 @@ #endif #include +#if defined(__FreeBSD__) +#include +#endif #include #include #include @@ -123,8 +126,7 @@ #ifdef __FreeBSD__ static MALLOC_DEFINE(M_PFLOG, PFLOGNAME, "Packet Filter Logging Interface"); static LIST_HEAD(pflog_list, pflog_softc) pflog_list; -struct if_clone pflog_cloner = IF_CLONE_INITIALIZER(PFLOGNAME, - pflog_clone_create, pflog_clone_destroy, 1, IF_MAXUNIT); +IFC_SIMPLE_DECLARE(pflog, 1); static void pflog_clone_destroy(struct ifnet *ifp) ==== //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.8 2004/06/16 23:24:00 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.9 2004/06/22 20:13:24 brooks Exp $ */ /* $OpenBSD: if_pfsync.c,v 1.26 2004/03/28 18:14:20 mcbride Exp $ */ /* @@ -62,6 +62,9 @@ #endif #include +#if defined(__FreeBSD__) +#include +#endif #include #include #include @@ -148,8 +151,7 @@ #ifdef __FreeBSD__ static MALLOC_DEFINE(M_PFSYNC, PFSYNCNAME, "Packet Filter State Sync. Interface"); static LIST_HEAD(pfsync_list, pfsync_softc) pfsync_list; -struct if_clone pfsync_cloner = IF_CLONE_INITIALIZER(PFSYNCNAME, - pfsync_clone_create, pfsync_clone_destroy, 1, IF_MAXUNIT); +IFC_SIMPLE_DECLARE(pfsync, 1); static void pfsync_clone_destroy(struct ifnet *ifp) ==== //depot/projects/netperf_socket/sys/contrib/pf/net/pfvar.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.6 2004/06/16 23:24:00 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.7 2004/06/22 20:13:25 brooks Exp $ */ /* $OpenBSD: pfvar.h,v 1.187 2004/03/22 04:54:18 mcbride Exp $ */ /* @@ -40,6 +40,7 @@ #include #ifdef __FreeBSD__ +#include #include #else #include ==== //depot/projects/netperf_socket/sys/dev/acpica/acpiio.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.9 2003/09/13 20:13:01 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.10 2004/06/22 08:23:26 brueffer Exp $ */ /* @@ -44,7 +44,7 @@ struct acpi_battinfo { int cap; /* percent */ - int min; /* remianing time */ + int min; /* remaining time */ int state; /* battery state */ }; @@ -57,8 +57,8 @@ u_int32_t dvol; /* Design voltage (mV) */ u_int32_t wcap; /* WARN capacity */ u_int32_t lcap; /* Low capacity */ - u_int32_t gra1; /* Granulity 1(Warn to Low) */ - u_int32_t gra2; /* Granulity 2(Full to Warn) */ + u_int32_t gra1; /* Granularity 1 (Warn to Low) */ + u_int32_t gra2; /* Granularity 2 (Full to Warn) */ char model[ACPI_CMBAT_MAXSTRLEN]; /* model identifier */ char serial[ACPI_CMBAT_MAXSTRLEN]; /* Serial number */ char type[ACPI_CMBAT_MAXSTRLEN]; /* Type */ ==== //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.213 2004/06/16 09:46:37 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.214 2004/06/22 11:18:24 sos Exp $"); #include "opt_ata.h" #include @@ -156,7 +156,7 @@ /* initialize queue and associated lock */ bzero(&ch->queue_mtx, sizeof(struct mtx)); - mtx_init(&ch->queue_mtx, "ATA queue lock", MTX_DEF, 0); + mtx_init(&ch->queue_mtx, "ATA queue lock", NULL, MTX_DEF); TAILQ_INIT(&ch->ata_queue); /* do not attach devices if we are in early boot */ ==== //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.74 2004/06/17 21:36:10 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.75 2004/06/22 11:18:24 sos Exp $"); #include "opt_ata.h" #include @@ -1324,7 +1324,7 @@ ctlr->driver = malloc(sizeof(struct ata_promise_sx4), M_TEMP, M_NOWAIT | M_ZERO); hpkt = ctlr->driver; - mtx_init(&hpkt->mtx, "ATA promise HPKT lock", MTX_DEF, 0); + mtx_init(&hpkt->mtx, "ATA promise HPKT lock", NULL, MTX_DEF); hpkt->busy = hpkt->head = hpkt->tail = 0; if ((bus_setup_intr(dev, ctlr->r_irq, ATA_INTR_FLAGS, ==== //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.172 2004/04/13 09:44:20 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.173 2004/06/22 11:18:24 sos Exp $"); #include "opt_ata.h" #include @@ -97,7 +97,7 @@ adp->sectors = 17; adp->heads = 8; } - mtx_init(&adp->queue_mtx, "ATA disk bioqueue lock", MTX_DEF, 0); + mtx_init(&adp->queue_mtx, "ATA disk bioqueue lock", NULL, MTX_DEF); bioq_init(&adp->queue); lbasize = (u_int32_t)atadev->param->lba_size_1 | ==== //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.167 2004/06/21 20:42:03 green Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.168 2004/06/22 11:18:24 sos Exp $"); #include "opt_ata.h" #include @@ -230,7 +230,7 @@ if (!(cdp = malloc(sizeof(struct acd_softc), M_ACD, M_NOWAIT | M_ZERO))) return NULL; bioq_init(&cdp->queue); - mtx_init(&cdp->queue_mtx, "ATAPI CD bioqueue lock", MTX_DEF, 0); + mtx_init(&cdp->queue_mtx, "ATAPI CD bioqueue lock", NULL, MTX_DEF); cdp->device = atadev; cdp->lun = ata_get_lun(&acd_lun_map); cdp->block_size = 2048; ==== //depot/projects/netperf_socket/sys/dev/ata/atapi-fd.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.95 2004/03/01 13:17:07 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.96 2004/06/22 11:18:25 sos Exp $"); #include #include @@ -82,7 +82,7 @@ fdp->lun = ata_get_lun(&afd_lun_map); ata_set_name(atadev, "afd", fdp->lun); bioq_init(&fdp->queue); - mtx_init(&fdp->queue_mtx, "ATAPI FD bioqueue lock", MTX_DEF, 0); + mtx_init(&fdp->queue_mtx, "ATAPI FD bioqueue lock", NULL, MTX_DEF); if (afd_sense(fdp)) { free(fdp, M_AFD); ==== //depot/projects/netperf_socket/sys/dev/ata/atapi-tape.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.91 2004/06/16 09:46:37 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.92 2004/06/22 11:18:25 sos Exp $"); #include "opt_ata.h" #include @@ -106,7 +106,7 @@ stp->lun = ata_get_lun(&ast_lun_map); ata_set_name(atadev, "ast", stp->lun); bioq_init(&stp->queue); - mtx_init(&stp->queue_mtx, "ATAPI TAPE bioqueue lock", MTX_DEF, 0); + mtx_init(&stp->queue_mtx, "ATAPI TAPE bioqueue lock", NULL, MTX_DEF); if (ast_sense(stp)) { free(stp, M_AST); ==== //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#12 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.52 2004/06/21 22:57:10 ps Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.54 2004/06/22 23:05:06 ps Exp $ */ /* @@ -2493,7 +2493,7 @@ for (i = 0; i < sc->ciss_max_logical_bus; i++) ciss_cam_rescan_target(sc, i, CAM_TARGET_WILDCARD); /* Rescan the physical buses */ - for (i = CISS_PHYSICAL_BASE; i < sc->ciss_max_logical_bus + + for (i = CISS_PHYSICAL_BASE; i < sc->ciss_max_physical_bus + CISS_PHYSICAL_BASE; i++) ciss_cam_rescan_target(sc, i, CAM_TARGET_WILDCARD); } @@ -3414,6 +3414,7 @@ if (ld->cl_update == 0) continue; + ld->cl_update = 0; ld->cl_address = cll->lun[i]; ld->cl_controller = &sc->ciss_controllers[bus]; if (ciss_identify_logical(sc, ld) == 0) { ==== //depot/projects/netperf_socket/sys/dev/cy/cy.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.154 2004/06/21 22:57:10 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.155 2004/06/22 20:32:16 phk Exp $"); #include "opt_compat.h" @@ -299,9 +299,7 @@ struct termios lt_out; bool_t do_timestamp; - bool_t do_dcd_timestamp; struct timeval timestamp; - struct timeval dcd_timestamp; u_long bytes_in; /* statistics */ u_long bytes_out; @@ -1283,11 +1281,6 @@ ++com->mdm; modem_status = cd_inb(iobase, CD1400_MSVR2, cy_align); if (modem_status != com->last_modem_status) { - if (com->do_dcd_timestamp - && !(com->last_modem_status & MSR_DCD) - && modem_status & MSR_DCD) - microtime(&com->dcd_timestamp); - /* * Schedule high level to handle DCD changes. Note * that we don't use the delta bits anywhere. Some @@ -1673,10 +1666,6 @@ com->do_timestamp = TRUE; *(struct timeval *)data = com->timestamp; break; - case TIOCDCDTIMESTAMP: - com->do_dcd_timestamp = TRUE; - *(struct timeval *)data = com->dcd_timestamp; - break; default: splx(s); return (ENOTTY); ==== //depot/projects/netperf_socket/sys/dev/digi/digi.h#3 (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/dev/digi/digi.h,v 1.15 2004/06/16 09:46:42 phk Exp $ + * $FreeBSD: src/sys/dev/digi/digi.h,v 1.16 2004/06/22 20:32:16 phk Exp $ */ #define W(p) (*(u_int16_t *)(p)) @@ -107,10 +107,6 @@ struct termios lt_in; /* should be in struct tty */ struct termios lt_out; - u_int do_timestamp; - u_int do_dcd_timestamp; - struct timeval dcd_timestamp; - u_long bytes_in, bytes_out; u_int delta_error_counts[CE_NTYPES]; u_long error_counts; ==== //depot/projects/netperf_socket/sys/dev/sio/sio.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.440 2004/06/21 22:57:13 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.441 2004/06/22 20:32:16 phk Exp $"); #include "opt_comconsole.h" #include "opt_compat.h" @@ -251,9 +251,7 @@ struct termios lt_out; bool_t do_timestamp; - bool_t do_dcd_timestamp; struct timeval timestamp; - struct timeval dcd_timestamp; struct pps_state pps; int pps_bit; #ifdef ALT_BREAK_TO_DEBUGGER @@ -1449,7 +1447,6 @@ com->poll = FALSE; com->poll_output = FALSE; com->do_timestamp = FALSE; - com->do_dcd_timestamp = FALSE; com->pps.ppsparam.mode = 0; sio_setreg(com, com_cfcr, com->cfcr_image &= ~CFCR_SBREAK); tp = com->tp; @@ -1914,11 +1911,6 @@ /* modem status change? (always check before doing output) */ modem_status = inb(com->modem_status_port); if (modem_status != com->last_modem_status) { - if (com->do_dcd_timestamp - && !(com->last_modem_status & MSR_DCD) - && modem_status & MSR_DCD) - microtime(&com->dcd_timestamp); - /* * Schedule high level to handle DCD changes. Note * that we don't use the delta bits anywhere. Some @@ -2160,10 +2152,6 @@ com->do_timestamp = TRUE; *(struct timeval *)data = com->timestamp; break; - case TIOCDCDTIMESTAMP: - com->do_dcd_timestamp = TRUE; - *(struct timeval *)data = com->dcd_timestamp; - break; default: splx(s); error = pps_ioctl(cmd, data, &com->pps); ==== //depot/projects/netperf_socket/sys/dev/vinum/vinumio.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ * advised of the possibility of such damage. * * $Id: vinumio.c,v 1.39 2003/05/23 00:59:53 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.99 2004/06/17 17:16:47 phk Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.100 2004/06/22 06:38:01 le Exp $ */ #include @@ -68,7 +68,7 @@ drive->lasterror = ENOTBLK; else { DROP_GIANT(); - drive->lasterror = (dsw->d_open) (drive->dev, FWRITE | FREAD, 0, NULL); + drive->lasterror = (dsw->d_open) (drive->dev, FWRITE | FREAD, 0, td); PICKUP_GIANT(); } ==== //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_drive.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.4 2004/06/18 19:53:33 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.5 2004/06/22 18:13:43 le Exp $"); #include #include @@ -421,7 +421,6 @@ g_detach(cp); g_destroy_consumer(cp); - g_free(gp->softc); g_destroy_geom(gp); return (NULL); } ==== //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_raid5.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.c,v 1.2 2004/06/14 17:06:55 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.c,v 1.3 2004/06/22 14:54:31 le Exp $"); #include #include @@ -357,7 +357,9 @@ * the desired data. */ if (wp->type == DEGRADED) { - wp->buf = g_malloc(wp->length, M_WAITOK | M_ZERO); + wp->buf = g_malloc(wp->length, M_NOWAIT | M_ZERO); + if (wp->buf == NULL) + return (ENOMEM); wp->bufmalloc = 1; LIST_FOREACH(s, &p->subdisks, in_plex) { /* Skip the broken subdisk. */ @@ -369,7 +371,9 @@ if (rbp->bio == NULL) return (ENOMEM); rbp->buf = g_malloc(wp->length, - M_WAITOK | M_ZERO); + M_NOWAIT | M_ZERO); + if (rbp->buf == NULL) + return (ENOMEM); rbp->malloc = 1; rbp->bio->bio_cmd = BIO_READ; rbp->bio->bio_offset = wp->offset; @@ -414,7 +418,9 @@ * write the parity stripe back out. */ if (wp->type == DEGRADED) { - wp->buf = g_malloc(wp->length, M_WAITOK | M_ZERO); + wp->buf = g_malloc(wp->length, M_NOWAIT | M_ZERO); + if (wp->buf == NULL) + return (ENOMEM); wp->bufmalloc = 1; /* Copy the original data. */ @@ -432,7 +438,9 @@ if (rbp->bio == NULL) return (ENOMEM); rbp->buf = g_malloc(wp->length, - M_WAITOK | M_ZERO); + M_NOWAIT | M_ZERO); + if (rbp->buf == NULL) + return (ENOMEM); rbp->malloc = 1; rbp->bio->bio_cmd = BIO_READ; rbp->bio->bio_data = rbp->buf; @@ -476,7 +484,9 @@ * recalculate the parity again. */ } else if (wp->type == COMBINED) { - wp->buf = g_malloc(wp->length, M_WAITOK | M_ZERO); + wp->buf = g_malloc(wp->length, M_NOWAIT | M_ZERO); + if (wp->buf == NULL) + return (ENOMEM); wp->bufmalloc = 1; /* Get the data from all subdisks. */ @@ -492,7 +502,9 @@ return (ENOMEM); rbp->bio->bio_cmd = BIO_READ; rbp->buf = g_malloc(wp->length, - M_WAITOK | M_ZERO); + M_NOWAIT | M_ZERO); + if (rbp->buf == NULL) + return (ENOMEM); rbp->malloc = 1; rbp->bio->bio_data = rbp->buf; rbp->bio->bio_offset = wp->offset; @@ -544,7 +556,9 @@ return (ENOMEM); rbp->bio->bio_cmd = BIO_READ; rbp->buf = g_malloc(wp->length, - M_WAITOK | M_ZERO); + M_NOWAIT | M_ZERO); + if (rbp->buf == NULL) + return (ENOMEM); rbp->malloc = 1; rbp->bio->bio_data = rbp->buf; rbp->bio->bio_offset = wp->offset; @@ -568,7 +582,9 @@ * out the parity again. */ } else { - wp->buf = g_malloc(wp->length, M_WAITOK | M_ZERO); + wp->buf = g_malloc(wp->length, M_NOWAIT | M_ZERO); + if (wp->buf == NULL) + return (ENOMEM); wp->bufmalloc = 1; LIST_FOREACH(s, &p->subdisks, in_plex) { /* Skip the parity stripe. */ @@ -591,7 +607,9 @@ } else { rbp->bio->bio_cmd = BIO_READ; rbp->buf = g_malloc(wp->length, - M_WAITOK | M_ZERO); + M_NOWAIT | M_ZERO); + if (rbp->buf == NULL) + return (ENOMEM); rbp->malloc = 1; } rbp->bio->bio_data = rbp->buf; ==== //depot/projects/netperf_socket/sys/i386/i386/pmap.c#13 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.476 2004/06/20 20:57:06 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.477 2004/06/22 19:35:43 alc Exp $"); /* * Manages physical address maps. @@ -860,18 +860,34 @@ vm_page_t pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { - vm_paddr_t pa; + pd_entry_t pde; + pt_entry_t pte; vm_page_t m; m = NULL; - mtx_lock(&Giant); - if ((pa = pmap_extract(pmap, va)) != 0) { - m = PHYS_TO_VM_PAGE(pa); - vm_page_lock_queues(); - vm_page_hold(m); - vm_page_unlock_queues(); + if (pmap == NULL) + return (m); + vm_page_lock_queues(); + PMAP_LOCK(pmap); + pde = *pmap_pde(pmap, va); + if (pde != 0) { + if (pde & PG_PS) { + if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) { + m = PHYS_TO_VM_PAGE((pde & ~PDRMASK) | + (va & PDRMASK)); + vm_page_hold(m); + } + } else { + pte = *pmap_pte_quick(pmap, va); + if (pte != 0 && + ((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) { + m = PHYS_TO_VM_PAGE(pte & PG_FRAME); + vm_page_hold(m); + } + } } - mtx_unlock(&Giant); + vm_page_unlock_queues(); + PMAP_UNLOCK(pmap); return (m); } ==== //depot/projects/netperf_socket/sys/kern/init_sysent.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.170 2004/04/05 10:16:38 dfr Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.171 2004/04/05 10:15:53 dfr Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.172 2004/06/22 04:36:24 rwatson Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.173 2004/06/22 04:34:55 rwatson Exp */ #include "opt_compat.h" @@ -37,8 +37,8 @@ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close }, /* 6 = close */ { SYF_MPSAFE | AS(wait_args), (sy_call_t *)wait4 }, /* 7 = wait4 */ { compat(SYF_MPSAFE | AS(ocreat_args),creat) }, /* 8 = old creat */ - { AS(link_args), (sy_call_t *)link }, /* 9 = link */ - { AS(unlink_args), (sy_call_t *)unlink }, /* 10 = unlink */ + { SYF_MPSAFE | AS(link_args), (sy_call_t *)link }, /* 9 = link */ + { SYF_MPSAFE | AS(unlink_args), (sy_call_t *)unlink }, /* 10 = unlink */ { 0, (sy_call_t *)nosys }, /* 11 = obsolete execv */ { AS(chdir_args), (sy_call_t *)chdir }, /* 12 = chdir */ { AS(fchdir_args), (sy_call_t *)fchdir }, /* 13 = fchdir */ ==== //depot/projects/netperf_socket/sys/kern/kern_conf.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.152 2004/06/17 17:16:48 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.153 2004/06/22 20:22:24 le Exp $"); #include #include @@ -50,7 +50,7 @@ extern unsigned char reserved_majors[256]; /* - * This is the number of hash-buckets. Experiements with 'real-life' + * This is the number of hash-buckets. Experiments with 'real-life' * dev_t's show that a prime halfway between two powers of two works * best. */ @@ -241,7 +241,7 @@ } /* - * struct cdev *and u_dev_t primitives + * struct cdev * and u_dev_t primitives */ int @@ -675,8 +675,8 @@ * we do "on-demand" devices, using rman or other "private" methods * will be very tricky to lock down properly once we lock down this file. * - * Instead we give the drivers these routines which puts the struct cdev *'s that - * are to be managed on their own list, and gives the driver the ability + * Instead we give the drivers these routines which puts the struct cdev *'s + * that are to be managed on their own list, and gives the driver the ability * to ask for the first free unit number or a given specified unit number. * * In addition these routines support paired devices (pty, nmdm and similar) @@ -781,7 +781,7 @@ } /* - * Helper sysctl for devname(3). We're given a {u}struct cdev *and return + * Helper sysctl for devname(3). We're given a struct cdev * and return * the name, if any, registered by the device driver. */ static int ==== //depot/projects/netperf_socket/sys/kern/syscalls.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.156 2004/04/05 10:16:38 dfr Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.171 2004/04/05 10:15:53 dfr Exp + * $FreeBSD: src/sys/kern/syscalls.c,v 1.158 2004/06/22 04:36:25 rwatson Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.173 2004/06/22 04:34:55 rwatson Exp */ const char *syscallnames[] = { ==== //depot/projects/netperf_socket/sys/kern/syscalls.master#7 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.171 2004/04/05 10:15:53 dfr Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.173 2004/06/22 04:34:55 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -58,8 +58,8 @@ 7 MSTD { int wait4(int pid, int *status, int options, \ struct rusage *rusage); } wait4 wait_args int 8 MCOMPAT { int creat(char *path, int mode); } -9 STD { int link(char *path, char *link); } -10 STD { int unlink(char *path); } +9 MSTD { int link(char *path, char *link); } +10 MSTD { int unlink(char *path); } 11 OBSOL execv 12 STD { int chdir(char *path); } 13 STD { int fchdir(int fd); } ==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#22 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.186 2004/06/21 00:20:42 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.187 2004/06/22 03:49:22 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -221,12 +221,8 @@ struct sockaddr *nam; struct thread *td; { - int s = splnet(); - int error; - error = (*so->so_proto->pr_usrreqs->pru_bind)(so, nam, td); - splx(s); - return (error); + return ((*so->so_proto->pr_usrreqs->pru_bind)(so, nam, td)); } void @@ -263,24 +259,19 @@ int backlog; struct thread *td; { - int s, error; + int error; /* * XXXRW: Ordering issue here -- perhaps we need to set * SO_ACCEPTCONN before the call to pru_listen()? * XXXRW: General atomic test-and-set concerns here also. */ - s = splnet(); if (so->so_state & (SS_ISCONNECTED | SS_ISCONNECTING | - SS_ISDISCONNECTING)) { - splx(s); + SS_ISDISCONNECTING)) return (EINVAL); - } error = (*so->so_proto->pr_usrreqs->pru_listen)(so, td); - if (error) { - splx(s); + if (error) return (error); - } ACCEPT_LOCK(); if (TAILQ_EMPTY(&so->so_comp)) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 23 18:15:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F53516A4D1; Wed, 23 Jun 2004 18:15:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 511F916A4CE for ; Wed, 23 Jun 2004 18:15:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 474A943D53 for ; Wed, 23 Jun 2004 18:15:16 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5NIFGrZ000924 for ; Wed, 23 Jun 2004 18:15:16 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5NIExas000886 for perforce@freebsd.org; Wed, 23 Jun 2004 18:14:59 GMT (envelope-from peter@freebsd.org) Date: Wed, 23 Jun 2004 18:14:59 GMT Message-Id: <200406231814.i5NIExas000886@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 55619 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2004 18:15:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=55619 Change 55619 by peter@peter_overcee on 2004/06/23 18:14:04 IFC @55618 Affected files ... .. //depot/projects/hammer/UPDATING#41 integrate .. //depot/projects/hammer/bin/ls/cmp.c#4 integrate .. //depot/projects/hammer/bin/ps/extern.h#9 integrate .. //depot/projects/hammer/bin/ps/fmt.c#5 integrate .. //depot/projects/hammer/bin/ps/keyword.c#11 integrate .. //depot/projects/hammer/bin/ps/print.c#11 integrate .. //depot/projects/hammer/bin/ps/ps.1#17 integrate .. //depot/projects/hammer/bin/ps/ps.c#14 integrate .. //depot/projects/hammer/bin/ps/ps.h#7 integrate .. //depot/projects/hammer/contrib/gdb/FREEBSD-Xlist#3 integrate .. //depot/projects/hammer/contrib/gdb/Makefile.in#2 delete .. //depot/projects/hammer/contrib/gdb/config-ml.in#2 integrate .. //depot/projects/hammer/contrib/gdb/config.guess#2 delete .. //depot/projects/hammer/contrib/gdb/config.if#2 delete .. //depot/projects/hammer/contrib/gdb/config.sub#2 delete .. //depot/projects/hammer/contrib/gdb/configure#2 delete .. //depot/projects/hammer/contrib/gdb/configure.in#3 delete .. //depot/projects/hammer/contrib/gdb/djunpack.bat#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog#3 delete .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-1990#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-1991#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-1992#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-1993#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-1994#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-1995#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-1996#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-1997#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-1998#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-1999#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-2000#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-2001#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-3.x#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/MAINTAINERS#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/Makefile.in#3 delete .. //depot/projects/hammer/contrib/gdb/gdb/NEWS#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/PROBLEMS#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/README#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/TODO#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/abug-rom.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/acinclude.m4#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/aclocal.m4#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ada-exp.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ada-exp.y#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ada-lang.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ada-lang.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ada-lex.l#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ada-tasks.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ada-typeprint.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ada-valprint.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/alpha-mdebug-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/alpha-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/alpha-tdep.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/alpha-tdep.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/alphabsd-nat.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/alphabsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/alphabsd-tdep.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/alphafbsd-tdep.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/alphanbsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/amd64-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/amd64-nat.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/amd64-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/amd64-tdep.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/amd64bsd-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/amd64fbsd-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/amd64fbsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/amd64nbsd-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/amd64nbsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/amd64obsd-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/amd64obsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/annotate.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/arc-tdep.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/arch-utils.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/arch-utils.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/arm-linux-nat.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/arm-linux-tdep.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/arm-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/arm-tdep.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/armnbsd-tdep.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/auxv.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/auxv.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ax-gdb.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ax-gdb.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ax-general.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/bcache.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/bcache.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/bfd-target.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/bfd-target.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/block.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/block.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/blockframe.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/breakpoint.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/breakpoint.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/buildsym.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/buildsym.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/c-exp.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/c-exp.y#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/c-lang.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/c-lang.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/c-typeprint.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/c-valprint.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ch-exp.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ch-lang.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ch-lang.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ch-typeprint.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ch-valprint.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/charset.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/charset.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/cli-out.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/cli-out.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/cli/cli-cmds.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/cli/cli-decode.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/cli/cli-decode.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/cli/cli-dump.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/cli/cli-dump.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/cli/cli-interp.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/cli/cli-logging.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/cli/cli-script.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/cli/cli-script.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/cli/cli-setshow.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/cli/cli-setshow.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/coff-pe-read.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/coff-pe-read.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/coff-solib.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/coff-solib.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/coffread.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/command.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/complaints.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/complaints.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/completer.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/completer.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config.in#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/alpha-linux.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/alpha-linux.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/alpha-osf1.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/alpha-osf1.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/alpha.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/fbsd.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/nbsd.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/nbsd.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/nm-fbsd.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/nm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/nm-nbsd.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/nm-osf.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/nm-osf2.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/tm-alpha.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/tm-alphalinux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/tm-fbsd.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/tm-nbsd.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/alpha/xm-alphalinux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/arm/linux.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/arm/linux.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/arm/nbsd.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/arm/nbsd.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/arm/nbsdaout.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/arm/nbsdelf.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/arm/nm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/arm/nm-nbsd.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/arm/nm-nbsdaout.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/arm/tm-arm.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/arm/tm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/arm/tm-nbsd.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/arm/wince.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/arm/xm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/arm/xm-nbsd.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/cygwin.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/cygwin.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/fbsd.mh#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/fbsd.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/fbsd64.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/fbsd64.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/gdbserve.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/go32.mh#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386aix.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386aix.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386aout.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386bsd.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386bsd.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386dgux.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386gnu.mh#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386gnu.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386lynx.mh#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386m3.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386m3.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386mach.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386mk.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386mk.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386nw.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386os9k.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386sco5.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386sol2.mh#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386sol2.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386v.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386v32.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386v4.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386v42mp.mh#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/i386v42mp.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/linux.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/linux.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nbsd.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nbsd.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nbsd64.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nbsd64.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nbsdaout.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nbsdelf.mh#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nbsdelf.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/ncr3000.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-cygwin.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-fbsd.h#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-fbsd64.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-gnu.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-go32.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-i386.h#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-i386aix.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-i386bsd.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-i386gnu.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-i386lynx.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-i386mach.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-i386sco.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-i386sco5.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-i386sol2.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-i386v.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-i386v4.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-i386v42mp.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-m3.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-nbsd.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-nbsdaout.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-nbsdelf.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-nto.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-obsd.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-ptx4.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-symmetry.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-x86-64.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nto.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nto.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/obsd.mh#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/obsd.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/obsd64.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/obsd64.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/obsdaout.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/ptx.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/ptx.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/ptx4.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/ptx4.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/symmetry.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/symmetry.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-cygwin.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-fbsd.h#4 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-go32.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-i386.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-i386aix.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-i386bsd.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-i386gnu.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-i386lynx.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-i386m3.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-i386mk.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-i386nw.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-i386os9k.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-i386sco5.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-i386sol2.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-i386v.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-i386v4.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-i386v42mp.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-nbsd.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-nbsdelf.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-nto.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-obsd.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-ptx.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-ptx4.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-symmetry.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-vxworks.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/x86-64linux.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/x86-64linux.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-cygwin.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-i386.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-i386aix.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-i386bsd.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-i386gnu.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-i386m3.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-i386mach.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-i386mk.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-i386sco.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-i386v32.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-i386v4.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-nbsd.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-ptx.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-ptx4.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-symmetry.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/aix.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/aix.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/ia64.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/linux.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/linux.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/nm-aix.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/nm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/tm-aix.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/tm-ia64.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/tm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/xm-aix.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/xm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/decstation.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/embed.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/littlemips.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/mipsv4.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/mipsv4.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/nbsd.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/nbsd.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/news-mips.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/nm-mips.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/nm-nbsd.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/nm-news-mips.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/nm-riscos.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/riscos.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/tm-mips.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/tm-mipsv4.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/tm-nbsd.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/tm-vxmips.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/tm-wince.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/vxmips.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/wince.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/xm-mips.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/xm-mipsv4.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/mips/xm-riscos.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/nm-gnu.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/nm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/nm-lynx.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/nm-nbsd.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/nm-nbsdaout.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/nm-sysv4.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/none/nm-none.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/none/none.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/none/none.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/none/tm-none.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/none/xm-none.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/aix.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/aix.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/gdbserve.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/linux.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/linux.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/nbsd.mh#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/nbsd.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/nm-aix.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/nm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/nm-nbsd.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/ppc-eabi.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/ppc-sim.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/ppcle-eabi.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/ppcle-sim.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/tm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/tm-nbsd.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/tm-ppc-aix.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/tm-ppc-eabi.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/tm-ppc-sim.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/tm-vxworks.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/vxworks.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/xm-aix.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/powerpc/xm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/s390/s390.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/s390/s390.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/fbsd.mh#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/fbsd.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/linux.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/linux.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/nbsd.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/nbsd.mt#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/nbsd64.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/nbsd64.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/nbsdaout.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/nbsdelf.mh#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/nm-fbsd.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/nm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/nm-nbsd.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/nm-nbsdaout.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/nm-nbsdelf.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/nm-sol2.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/nm-sparclynx.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/nm-sun4os4.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/nm-sun4sol2.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/obsd.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/obsd64.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sol2-64.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sol2.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sol2.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sp64.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sp64linux.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sp64sim.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sp64sol2.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sparc-em.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sparc.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sparc64.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sparclet.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sparclite.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sparclynx.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sparclynx.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sun4os4.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sun4os4.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sun4sol2.mh#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/sun4sol2.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-fbsd.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-nbsd.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-nbsd64.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-sol2.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-sp64.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-sp64linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-sp64sim.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-sparc.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-sparclet.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-sparclite.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-sparclynx.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-spc-em.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-sun4os4.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-sun4sol2.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-vxsparc.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/tm-vxworks.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/vxsparc.mt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/vxworks.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/xm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/xm-nbsd.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/sparc/xm-sun4sol2.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/tm-linux.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/config/tm-lynx.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/tm-nto.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/tm-sunos.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/tm-sysv4.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/xm-nbsd.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/xm-sysv4.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/configure#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/configure.host#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/configure.in#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/configure.tgt#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/core-regset.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/corefile.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/corelow.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/cp-abi.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/cp-abi.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/cp-namespace.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/cp-support.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/cp-support.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/cp-valprint.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/cpu32bug-rom.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/dbug-rom.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/dbxread.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/dcache.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/defs.h#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/delta68-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/demangle.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/dictionary.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/dictionary.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/dink32-rom.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/disasm.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/disasm.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/doc/ChangeLog#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/doc/GDBvn.texi#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/doc/Makefile.in#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/doc/agentexpr.texi#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/doc/all-cfg.texi#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/doc/annotate.texi#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/doc/annotate.texinfo#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/doc/configure#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/doc/configure.in#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/doc/fdl.texi#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/doc/gdb.info-1#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/doc/gdb.info-2#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/doc/gdb.info-3#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/doc/gdb.texinfo#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/doc/gdbint.texinfo#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/doc/observer.texi#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/doc/stabs.texinfo#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/doublest.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/doublest.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/dpx2-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/dsrec.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/dst.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/dstread.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/dummy-frame.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/dummy-frame.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/dve3900-rom.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/dwarf2-frame.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/dwarf2-frame.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/dwarf2cfi.c#3 delete .. //depot/projects/hammer/contrib/gdb/gdb/dwarf2cfi.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/dwarf2expr.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/dwarf2expr.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/dwarf2loc.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/dwarf2loc.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/dwarf2read.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/dwarfread.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/elfread.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/environ.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/eval.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/event-loop.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/event-loop.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/event-top.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/event-top.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/exec.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/exec.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/expprint.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/expression.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/f-exp.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/f-exp.y#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/f-lang.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/f-typeprint.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/f-valprint.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/fbsd-proc.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/findvar.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/fork-child.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/frame-base.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/frame-base.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/frame-unwind.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/frame-unwind.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/frame.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/frame.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gcore.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdb-events.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdb-events.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdb-events.sh#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdb-stabs.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdb.1#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdb.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gdb.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdb_assert.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdb_curses.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gdb_dirent.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdb_gcore.sh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gdb_indent.sh#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdb_locale.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gdb_mbuild.sh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gdb_obstack.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gdb_regex.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdb_thread_db.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbarch.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbarch.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbarch.sh#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbcore.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbinit.in#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/Makefile.in#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/acconfig.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/acinclude.m4#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/aclocal.m4#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/config.in#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/configure#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/configure.in#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/configure.srv#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/gdbreplay.c#4 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/i387-fp.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/i387-fp.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/inferiors.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/linux-arm-low.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/linux-i386-low.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/linux-ia64-low.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/linux-low.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/linux-low.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/linux-mips-low.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/linux-ppc-low.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/linux-x86-64-low.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/low-hppabsd.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/low-lynx.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/low-nbsd.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/low-sim.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/low-sparc.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/low-sun3.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/mem-break.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/mem-break.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/proc-service.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/regcache.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/regcache.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/remote-utils.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/server.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/server.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/target.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/target.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/thread-db.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/utils.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbthread.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbtypes.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gdbtypes.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/glibc-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/glibc-tdep.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gnu-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gnu-nat.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gnu-v2-abi.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/gnu-v3-abi.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/go32-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/gregset.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/hpacc-abi.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/hpread.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/hpux-thread.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/i386-linux-nat.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/i386-linux-tdep.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/i386-nat.c#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/i386-nto-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/i386-sol2-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/i386-stub.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/i386-tdep.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/i386-tdep.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/i386b-nat.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/i386bsd-nat.c#4 integrate .. //depot/projects/hammer/contrib/gdb/gdb/i386bsd-tdep.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/i386fbsd-nat.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/i386fbsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/i386gnu-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/i386gnu-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/i386ly-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/i386nbsd-nat.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/i386nbsd-tdep.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/i386obsd-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/i386obsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/i386v-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/i386v4-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/i387-nat.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/i387-nat.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/i387-tdep.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/i387-tdep.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ia64-aix-nat.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ia64-aix-tdep.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ia64-linux-nat.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ia64-linux-tdep.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ia64-tdep.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ia64-tdep.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/infcall.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/infcall.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/infcmd.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/inferior.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/inflow.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/inflow.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/infptrace.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/infrun.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/inftarg.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/infttrace.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/infttrace.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/interps.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/interps.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/jv-exp.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/jv-exp.y#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/jv-lang.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/jv-typeprint.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/jv-valprint.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/kod.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/language.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/language.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/libunwind-frame.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/libunwind-frame.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/lin-lwp.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/linespec.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/linespec.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/linux-proc.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/lynx-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/m2-exp.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/m2-exp.y#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/m2-lang.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/macrocmd.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/macroexp.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/macroexp.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/macroscope.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/macroscope.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/macrotab.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/macrotab.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/main.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/main.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/maint.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mdebugread.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mem-break.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/memattr.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mi/ChangeLog#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/mi/gdbmi.texinfo#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-cmd-break.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-cmd-disas.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-cmd-env.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-cmd-file.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-cmd-stack.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-cmd-var.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-cmds.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-cmds.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-console.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-console.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-getopt.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-getopt.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-interp.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-main.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-main.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-out.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-out.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-parse.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mi/mi-symbol-cmds.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/minimon.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/minsyms.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mips-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/mips-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/mips-tdep.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/mipsnbsd-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/mipsnbsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/mipsnbsd-tdep.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/mipsread.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/mipsv4-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/monitor.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/monitor.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/nbsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/nbsd-tdep.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/nlm/Makefile.in#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/nlm/configure#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/nlm/configure.in#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/nlm/gdbserve.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/nlm/gdbserve.def#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/nlm/i386.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/nlm/i386.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/nlm/ppc.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/nlm/ppc.h#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/nlm/prelude.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/nlmread.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/nto-procfs.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/nto-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/nto-tdep.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/objc-exp.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/objc-exp.y#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/objc-lang.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/objc-lang.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/objfiles.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/objfiles.h#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/observer.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/observer.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ocd.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ocd.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/osabi.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/osabi.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/p-exp.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/p-exp.y#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/p-lang.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/p-lang.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/p-typeprint.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/p-valprint.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/pa64solib.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/pa64solib.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/parse.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/parser-defs.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ppc-bdm.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ppc-linux-nat.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ppc-linux-tdep.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/ppc-sysv-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ppc-tdep.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ppcbug-rom.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ppcnbsd-nat.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ppcnbsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ppcnbsd-tdep.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/printcmd.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/proc-api.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/proc-utils.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/procfs.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/regcache.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/regcache.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/regformats/reg-i386-linux.dat#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/regformats/reg-m68k.dat#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/regformats/reg-ppc.dat#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/regformats/reg-s390.dat#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/regformats/reg-s390x.dat#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/regformats/reg-x86-64.dat#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/reggroups.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/reggroups.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/regset.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/remote-e7000.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/remote-est.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/remote-fileio.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/remote-fileio.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/remote-hms.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/remote-mips.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/remote-rdi.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/remote-rdp.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/remote-sds.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/remote-sim.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/remote-st.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/remote-utils.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/remote-utils.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/remote-vx.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/remote-vx68.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/remote-vxmips.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/remote-vxsparc.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/remote.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/remote.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/rom68k-rom.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/s390-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/s390-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/s390-tdep.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/saber.suppress#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/scm-exp.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/scm-lang.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/scm-lang.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/sentinel-frame.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sentinel-frame.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ser-e7kpc.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ser-go32.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ser-pipe.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ser-tcp.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ser-unix.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ser-unix.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/serial.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/serial.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/signals.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/signals/signals.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/sim-regno.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sol-thread.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/solib-legacy.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/solib-osf.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/solib-sunos.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/solib-svr4.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/solib-svr4.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/solib.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/solib.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/solist.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/somread.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/somsolib.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/somsolib.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/source.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/source.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/sparc-linux-nat.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/sparc-nat.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/sparc-nat.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sparc-sol2-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sparc-sol2-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sparc-tdep.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/sparc-tdep.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sparc64-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sparc64-sol2-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sparc64-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sparc64-tdep.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sparc64fbsd-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sparc64fbsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sparc64nbsd-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sparc64nbsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sparc64obsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sparcl-stub.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/sparcl-tdep.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/sparclet-rom.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/sparclet-stub.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/sparcnbsd-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sparcnbsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sparcobsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/srec.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/stabsread.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/stabsread.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/stack.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/stack.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/standalone.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/std-regs.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/stop-gdb.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/sun3-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/symfile.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/symfile.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/symmisc.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/symtab.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/symtab.h#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/target.c#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/target.h#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/thread-db.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/thread.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/top.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/top.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/tracepoint.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/trad-frame.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/trad-frame.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-command.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-command.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-data.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-data.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-disasm.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-disasm.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-file.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-file.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-hooks.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-hooks.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-interp.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-io.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-io.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-layout.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-layout.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-main.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-out.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-regs.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-regs.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-source.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-source.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-stack.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-stack.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-win.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-win.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-windata.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-windata.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-wingeneral.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-wingeneral.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-winsource.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui-winsource.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/tui/tui.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/typeprint.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/typeprint.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ui-file.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ui-file.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ui-out.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ui-out.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/user-regs.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/user-regs.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/utils.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/uw-thread.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/valarith.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/valops.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/valprint.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/valprint.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/value.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/values.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/varobj.c#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/version.in#4 integrate .. //depot/projects/hammer/contrib/gdb/gdb/win32-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/wince-stub.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/wince-stub.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/wince.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/wrapper.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/x86-64-linux-nat.c#3 delete .. //depot/projects/hammer/contrib/gdb/gdb/x86-64-linux-tdep.c#2 delete .. //depot/projects/hammer/contrib/gdb/gdb/x86-64-tdep.c#3 delete .. //depot/projects/hammer/contrib/gdb/gdb/x86-64-tdep.h#3 delete .. //depot/projects/hammer/contrib/gdb/gdb/xcoffread.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/xcoffsolib.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/xmodem.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/xmodem.h#1 branch .. //depot/projects/hammer/contrib/gdb/gettext.m4#1 branch .. //depot/projects/hammer/contrib/gdb/include/COPYING#1 branch .. //depot/projects/hammer/contrib/gdb/include/MAINTAINERS#1 branch .. //depot/projects/hammer/contrib/gdb/include/alloca-conf.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/ansidecl.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/bfdlink.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/bin-bugs.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/bout.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/demangle.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/dis-asm.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/dyn-string.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/fibheap.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/filenames.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/floatformat.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/fnmatch.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/fopen-bin.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/fopen-same.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/fopen-vms.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/gdb/ChangeLog#2 delete .. //depot/projects/hammer/contrib/gdb/include/gdb/callback.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/gdb/fileio.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/gdb/remote-sim.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/gdb/signals.h#2 integrate .. //depot/projects/hammer/contrib/gdb/include/gdb/sim-arm.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/gdb/sim-d10v.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/gdb/sim-frv.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/gdb/sim-h8300.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/gdb/sim-sh.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/gdbm.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/getopt.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/hashtab.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/hp-symtab.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/ieee.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/libiberty.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/md5.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/oasys.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/objalloc.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/obstack.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/os9k.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/partition.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/progress.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/safe-ctype.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/sort.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/splay-tree.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/symcat.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/ternary.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/xregex.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/xregex2.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/xtensa-isa-internal.h#1 branch .. //depot/projects/hammer/contrib/gdb/include/xtensa-isa.h#1 branch .. //depot/projects/hammer/contrib/gdb/install-sh#1 branch .. //depot/projects/hammer/contrib/gdb/libtool.m4#1 branch .. //depot/projects/hammer/contrib/gdb/ltcf-c.sh#1 branch .. //depot/projects/hammer/contrib/gdb/ltcf-cxx.sh#1 branch .. //depot/projects/hammer/contrib/gdb/ltcf-gcj.sh#1 branch .. //depot/projects/hammer/contrib/gdb/ltconfig#1 branch .. //depot/projects/hammer/contrib/gdb/ltmain.sh#1 branch .. //depot/projects/hammer/contrib/gdb/md5.sum#1 branch .. //depot/projects/hammer/contrib/gdb/missing#1 branch .. //depot/projects/hammer/contrib/gdb/mkinstalldirs#1 branch .. //depot/projects/hammer/contrib/gdb/move-if-change#1 branch .. //depot/projects/hammer/contrib/gdb/src-release#1 branch .. //depot/projects/hammer/contrib/gdb/symlink-tree#1 branch .. //depot/projects/hammer/contrib/gdb/ylwrap#1 branch .. //depot/projects/hammer/contrib/ipfilter/BSD/kupgrade#3 integrate .. //depot/projects/hammer/contrib/ipfilter/HISTORY#4 integrate .. //depot/projects/hammer/contrib/ipfilter/Makefile#4 integrate .. //depot/projects/hammer/contrib/ipfilter/common.c#3 integrate .. //depot/projects/hammer/contrib/ipfilter/fils.c#4 integrate .. //depot/projects/hammer/contrib/ipfilter/ip_sfil.c#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 23 20:41:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E85F116A4D0; Wed, 23 Jun 2004 20:41:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B5CFB16A4CF for ; Wed, 23 Jun 2004 20:41:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD3E143D2D for ; Wed, 23 Jun 2004 20:41:27 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5NKer56031399 for ; Wed, 23 Jun 2004 20:40:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5NKeZBR031369 for perforce@freebsd.org; Wed, 23 Jun 2004 20:40:35 GMT (envelope-from jhb@freebsd.org) Date: Wed, 23 Jun 2004 20:40:35 GMT Message-Id: <200406232040.i5NKeZBR031369@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 Subject: PERFORCE change 55629 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2004 20:41:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=55629 Change 55629 by jhb@jhb_slimer on 2004/06/23 20:40:08 IFC @55627. Mucho changes. Affected files ... .. //depot/projects/smpng/sys/Makefile#6 integrate .. //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#13 integrate .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#68 integrate .. //depot/projects/smpng/sys/alpha/alpha/mem.c#15 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#57 integrate .. //depot/projects/smpng/sys/alpha/alpha/promcons.c#18 integrate .. //depot/projects/smpng/sys/alpha/alpha/support.s#10 integrate .. //depot/projects/smpng/sys/alpha/alpha/uio_machdep.c#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/uma_machdep.c#1 branch .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#34 integrate .. //depot/projects/smpng/sys/alpha/include/_stdint.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/cpu.h#10 integrate .. //depot/projects/smpng/sys/alpha/include/pc/bios.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/pmap.h#19 integrate .. //depot/projects/smpng/sys/alpha/include/profile.h#3 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_proto.h#13 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_syscall.h#11 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysent.c#11 integrate .. //depot/projects/smpng/sys/alpha/linux/syscalls.master#12 integrate .. //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#15 integrate .. //depot/projects/smpng/sys/amd64/acpica/madt.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#11 integrate .. //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#7 integrate .. //depot/projects/smpng/sys/amd64/amd64/exception.S#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#12 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/legacy.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#23 integrate .. //depot/projects/smpng/sys/amd64/amd64/mem.c#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/mpboot.S#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/mptable.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#25 integrate .. //depot/projects/smpng/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/support.S#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#18 integrate .. //depot/projects/smpng/sys/amd64/amd64/uio_machdep.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#18 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#17 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_exception.S#3 integrate .. //depot/projects/smpng/sys/amd64/include/_stdint.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/asm.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/cpu.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/legacyvar.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/md_var.h#10 integrate .. //depot/projects/smpng/sys/amd64/include/param.h#8 integrate .. //depot/projects/smpng/sys/amd64/include/pcb.h#8 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#11 integrate .. //depot/projects/smpng/sys/amd64/include/profile.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/specialreg.h#7 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic.c#6 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic_vector.S#3 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#7 integrate .. //depot/projects/smpng/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/smpng/sys/amd64/isa/icu.h#5 integrate .. //depot/projects/smpng/sys/amd64/isa/nmi.c#3 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#9 integrate .. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/exception.S#2 integrate .. //depot/projects/smpng/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/smpng/sys/arm/arm/locore.S#2 integrate .. //depot/projects/smpng/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/nexus_io.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/support.S#2 integrate .. //depot/projects/smpng/sys/arm/arm/uio_machdep.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/smpng/sys/arm/include/_stdint.h#2 integrate .. //depot/projects/smpng/sys/arm/include/bus.h#2 integrate .. //depot/projects/smpng/sys/arm/include/profile.h#2 integrate .. //depot/projects/smpng/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0.c#2 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_io.c#2 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/smpng/sys/boot/Makefile#15 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#27 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#24 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf.5#7 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot1.S#3 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/sio.S#3 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btxldr/btxldr.S#3 integrate .. //depot/projects/smpng/sys/boot/i386/cdboot/cdboot.s#4 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/amd64_tramp.S#4 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#8 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/bioscd.c#6 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#10 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/libi386.h#5 integrate .. //depot/projects/smpng/sys/boot/i386/pxeldr/pxeldr.S#3 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/dinode.h#3 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/inode.h#3 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/serial_16550.S#6 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/serial_8251.S#3 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/btx/btx.S#3 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/btxldr/btxldr.S#3 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/biosdisk.c#9 integrate .. //depot/projects/smpng/sys/cam/cam_ccb.h#5 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#20 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#11 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#12 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#11 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#20 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#10 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#14 integrate .. //depot/projects/smpng/sys/coda/cnode.h#6 integrate .. //depot/projects/smpng/sys/coda/coda.h#3 integrate .. //depot/projects/smpng/sys/coda/coda_fbsd.c#8 integrate .. //depot/projects/smpng/sys/coda/coda_psdev.c#13 integrate .. //depot/projects/smpng/sys/coda/coda_psdev.h#3 integrate .. //depot/projects/smpng/sys/coda/coda_venus.c#9 integrate .. //depot/projects/smpng/sys/coda/coda_venus.h#3 integrate .. //depot/projects/smpng/sys/coda/coda_vfsops.c#14 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.c#14 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.h#7 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#10 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#32 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.h#9 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#47 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#18 integrate .. //depot/projects/smpng/sys/compat/linux/linux_uid16.c#17 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.c#11 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#15 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#15 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#15 integrate .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#20 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.c#11 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_socket.c#7 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_socket.h#5 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#16 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ttold.c#6 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_types.h#3 integrate .. //depot/projects/smpng/sys/conf/NOTES#69 integrate .. //depot/projects/smpng/sys/conf/files#110 integrate .. //depot/projects/smpng/sys/conf/files.alpha#28 integrate .. //depot/projects/smpng/sys/conf/files.amd64#16 integrate .. //depot/projects/smpng/sys/conf/files.arm#2 integrate .. //depot/projects/smpng/sys/conf/files.i386#61 integrate .. //depot/projects/smpng/sys/conf/files.ia64#40 integrate .. //depot/projects/smpng/sys/conf/files.pc98#59 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#39 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#36 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#35 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#30 integrate .. //depot/projects/smpng/sys/conf/ldscript.amd64#2 integrate .. //depot/projects/smpng/sys/conf/ldscript.ia64#7 integrate .. //depot/projects/smpng/sys/conf/options#77 integrate .. //depot/projects/smpng/sys/conf/options.pc98#39 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/altq.h#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_cbq.c#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_cbq.h#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_cdnr.c#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_cdnr.h#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_classq.h#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_hfsc.c#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_hfsc.h#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_priq.c#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_priq.h#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_red.c#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_red.h#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_rio.c#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_rio.h#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_rmclass.c#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_rmclass.h#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_rmclass_debug.h#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_subr.c#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altq_var.h#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/altqconf.h#1 branch .. //depot/projects/smpng/sys/contrib/altq/altq/if_altq.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdebug.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdispat.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acefi.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acexcep.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/achware.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acnamesp.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acparser.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpixf.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acstruct.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmwalk.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxface.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfevnt.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfregn.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmutex.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg2.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwgpe.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsparse.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfeval.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfname.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsutils.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsxface.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utxface.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_osdep.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/fla/fla.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#10 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#12 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.c#11 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_compat.h#9 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.c#14 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.h#8 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_frag.c#9 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_frag.h#5 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#8 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_log.c#9 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.c#11 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.h#7 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#4 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#4 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.c#10 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.h#6 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ipl.h#8 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/mlfk_ipl.c#5 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.c#5 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.h#3 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#5 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.h#3 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#6 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_if.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#6 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#5 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_osfp.c#3 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_subr.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pf_table.c#3 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pfvar.h#3 integrate .. //depot/projects/smpng/sys/contrib/pf/netinet/in4_cksum.c#2 integrate .. //depot/projects/smpng/sys/crypto/des/des_ecb.c#3 integrate .. //depot/projects/smpng/sys/crypto/des/des_enc.c#2 integrate .. //depot/projects/smpng/sys/crypto/des/des_setkey.c#3 integrate .. //depot/projects/smpng/sys/ddb/db_elf.c#6 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#40 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#11 integrate .. //depot/projects/smpng/sys/dev/aac/aac_debug.c#14 integrate .. //depot/projects/smpng/sys/dev/aac/aac_disk.c#19 integrate .. //depot/projects/smpng/sys/dev/aac/aac_linux.c#3 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#31 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#23 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#15 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#65 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_button.c#15 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#19 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#25 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#28 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_isab.c#6 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_lid.c#12 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#15 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#23 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_powerres.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#26 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/smpng/sys/dev/acpica/acpiio.h#5 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#42 integrate .. //depot/projects/smpng/sys/dev/adlink/adlink.c#9 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_isa.c#7 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/aic/aic_pccard.c#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.h#12 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#13 integrate .. //depot/projects/smpng/sys/dev/amd/amd.c#12 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#20 integrate .. //depot/projects/smpng/sys/dev/amr/amr_disk.c#14 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#13 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#39 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pccard.c#14 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar.c#13 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl.c#5 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#25 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#53 integrate .. //depot/projects/smpng/sys/dev/ata/ata-card.c#19 integrate .. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#11 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#37 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#40 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#15 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#46 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#23 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#14 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#21 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#49 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#24 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#27 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.h#8 integrate .. //depot/projects/smpng/sys/dev/awi/awi.c#19 integrate .. //depot/projects/smpng/sys/dev/awi/if_awi_pccard.c#13 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#7 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#43 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#23 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_core.c#15 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_core.h#3 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_mem.c#5 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#22 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_reg.h#6 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#19 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#33 integrate .. //depot/projects/smpng/sys/dev/ciss/cissreg.h#8 integrate .. //depot/projects/smpng/sys/dev/ciss/cissvar.h#8 integrate .. //depot/projects/smpng/sys/dev/cnw/if_cnw.c#17 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs.c#10 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs_pccard.c#9 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#4 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#7 integrate .. //depot/projects/smpng/sys/dev/cy/cy.c#3 integrate .. //depot/projects/smpng/sys/dev/cy/cy_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/cy/cy_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons.c#4 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_crom.c#4 integrate .. //depot/projects/smpng/sys/dev/digi/digi.c#21 integrate .. //depot/projects/smpng/sys/dev/digi/digi.h#7 integrate .. //depot/projects/smpng/sys/dev/digi/digi_isa.c#8 integrate .. //depot/projects/smpng/sys/dev/digi/digi_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/drm.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#9 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.h#18 integrate .. //depot/projects/smpng/sys/dev/drm/drm_fops.h#9 integrate .. //depot/projects/smpng/sys/dev/drm/drm_linux_list.h#1 branch .. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#16 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#1 branch .. //depot/projects/smpng/sys/dev/drm/drm_sarea.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_vm.h#9 integrate .. //depot/projects/smpng/sys/dev/drm/mga.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drm.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/r128.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drm.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/r128_state.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/radeon.h#9 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drm.h#7 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#9 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_mem.c#5 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_state.c#9 integrate .. //depot/projects/smpng/sys/dev/drm/sis.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/sis_drv.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/sis_mm.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/tdfx.h#4 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#22 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#22 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/eisa/eisa_if.m#1 branch .. //depot/projects/smpng/sys/dev/eisa/eisaconf.c#7 integrate .. //depot/projects/smpng/sys/dev/eisa/eisaconf.h#4 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#33 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#21 integrate .. //depot/projects/smpng/sys/dev/en/if_en_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#16 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_pccard.c#14 integrate .. //depot/projects/smpng/sys/dev/esp/esp_sbus.c#1 branch .. //depot/projects/smpng/sys/dev/esp/lsi64854.c#1 branch .. //depot/projects/smpng/sys/dev/esp/lsi64854reg.h#1 branch .. //depot/projects/smpng/sys/dev/esp/lsi64854var.h#1 branch .. //depot/projects/smpng/sys/dev/esp/ncr53c9x.c#1 branch .. //depot/projects/smpng/sys/dev/esp/ncr53c9xreg.h#1 branch .. //depot/projects/smpng/sys/dev/esp/ncr53c9xvar.h#1 branch .. //depot/projects/smpng/sys/dev/ex/if_ex.c#11 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex_pccard.c#6 integrate .. //depot/projects/smpng/sys/dev/fb/gfb.h#2 integrate .. //depot/projects/smpng/sys/dev/fb/splash.c#4 integrate .. //depot/projects/smpng/sys/dev/fb/tga.c#4 integrate .. //depot/projects/smpng/sys/dev/fb/vga.c#17 integrate .. //depot/projects/smpng/sys/dev/fb/vgareg.h#4 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#1 branch .. //depot/projects/smpng/sys/dev/fdc/fdcreg.h#1 branch .. //depot/projects/smpng/sys/dev/fe/if_fe.c#13 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe_pccard.c#8 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#33 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.h#13 integrate .. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#17 integrate .. //depot/projects/smpng/sys/dev/firewire/fwcrom.c#9 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#18 integrate .. //depot/projects/smpng/sys/dev/firewire/fwmem.c#17 integrate .. //depot/projects/smpng/sys/dev/firewire/fwmem.h#6 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#32 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#27 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcireg.h#14 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcivar.h#10 integrate .. //depot/projects/smpng/sys/dev/firewire/fwphyreg.h#2 integrate .. //depot/projects/smpng/sys/dev/firewire/iec13213.h#7 integrate .. //depot/projects/smpng/sys/dev/firewire/iec68113.h#5 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#22 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwip.c#1 branch .. //depot/projects/smpng/sys/dev/firewire/if_fwipvar.h#1 branch .. //depot/projects/smpng/sys/dev/firewire/sbp.c#33 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.h#4 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp_targ.c#6 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#51 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#13 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#19 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/gx/if_gx.c#16 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#16 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#16 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#8 integrate .. //depot/projects/smpng/sys/dev/hme/if_hmereg.h#5 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/smpng/sys/dev/ida/ida.c#16 integrate .. //depot/projects/smpng/sys/dev/ida/ida_disk.c#14 integrate .. //depot/projects/smpng/sys/dev/ida/ida_eisa.c#9 integrate .. //depot/projects/smpng/sys/dev/ida/ida_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/ida/idavar.h#6 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#16 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#7 integrate .. //depot/projects/smpng/sys/dev/iicbus/iic.c#9 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbus.c#6 integrate .. //depot/projects/smpng/sys/dev/iir/iir.c#10 integrate .. //depot/projects/smpng/sys/dev/iir/iir.h#9 integrate .. //depot/projects/smpng/sys/dev/iir/iir_ctrl.c#11 integrate .. //depot/projects/smpng/sys/dev/ips/ips.c#10 integrate .. //depot/projects/smpng/sys/dev/ips/ips.h#9 integrate .. //depot/projects/smpng/sys/dev/ips/ips_commands.c#9 integrate .. //depot/projects/smpng/sys/dev/ips/ips_ioctl.c#5 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#33 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#30 integrate .. //depot/projects/smpng/sys/dev/isp/isp_inline.h#11 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#24 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#9 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.c#12 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#22 integrate .. //depot/projects/smpng/sys/dev/ispfw/ispfw.c#8 integrate .. //depot/projects/smpng/sys/dev/ixgb/LICENSE#1 branch .. //depot/projects/smpng/sys/dev/ixgb/README#1 branch .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#1 branch .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.h#1 branch .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb_osdep.h#1 branch .. //depot/projects/smpng/sys/dev/ixgb/ixgb_ee.c#1 branch .. //depot/projects/smpng/sys/dev/ixgb/ixgb_ee.h#1 branch .. //depot/projects/smpng/sys/dev/ixgb/ixgb_hw.c#1 branch .. //depot/projects/smpng/sys/dev/ixgb/ixgb_hw.h#1 branch .. //depot/projects/smpng/sys/dev/ixgb/ixgb_ids.h#1 branch .. //depot/projects/smpng/sys/dev/joy/joy.c#9 integrate .. //depot/projects/smpng/sys/dev/joy/joy_pccard.c#4 integrate .. //depot/projects/smpng/sys/dev/joy/joyvar.h#3 integrate .. //depot/projects/smpng/sys/dev/kbd/atkbd.c#12 integrate .. //depot/projects/smpng/sys/dev/kbd/kbd.c#14 integrate .. //depot/projects/smpng/sys/dev/kbd/kbdreg.h#4 integrate .. //depot/projects/smpng/sys/dev/led/led.c#8 integrate .. //depot/projects/smpng/sys/dev/led/led.h#3 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#21 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#15 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_cbus.c#7 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_isa.c#7 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/matcd/matcd.c#5 integrate .. //depot/projects/smpng/sys/dev/matcd/matcd_data.h#2 integrate .. //depot/projects/smpng/sys/dev/mcd/mcd.c#9 integrate .. //depot/projects/smpng/sys/dev/mcd/mcdvar.h#3 integrate .. //depot/projects/smpng/sys/dev/md/md.c#50 integrate .. //depot/projects/smpng/sys/dev/mii/acphy.c#11 integrate .. //depot/projects/smpng/sys/dev/mii/amphy.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/bmtphy.c#7 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#21 integrate .. //depot/projects/smpng/sys/dev/mii/dcphy.c#12 integrate .. //depot/projects/smpng/sys/dev/mii/e1000phy.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/exphy.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/inphy.c#7 integrate .. //depot/projects/smpng/sys/dev/mii/lxtphy.c#11 integrate .. //depot/projects/smpng/sys/dev/mii/mii.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/mii_physubr.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/nsgphy.c#12 integrate .. //depot/projects/smpng/sys/dev/mii/nsphy.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/pnaphy.c#11 integrate .. //depot/projects/smpng/sys/dev/mii/pnphy.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/qsphy.c#11 integrate .. //depot/projects/smpng/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/smpng/sys/dev/mii/rlphy.c#14 integrate .. //depot/projects/smpng/sys/dev/mii/ruephy.c#4 integrate .. //depot/projects/smpng/sys/dev/mii/tdkphy.c#12 integrate .. //depot/projects/smpng/sys/dev/mii/tlphy.c#12 integrate .. //depot/projects/smpng/sys/dev/mii/ukphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/ukphy_subr.c#5 integrate .. //depot/projects/smpng/sys/dev/mii/xmphy.c#12 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx.c#16 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx_disk.c#10 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/mlx/mlxvar.h#9 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#23 integrate .. //depot/projects/smpng/sys/dev/mly/mlyvar.h#4 integrate .. //depot/projects/smpng/sys/dev/musycc/musycc.c#9 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#17 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500_pccard.c#14 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#32 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#20 integrate .. //depot/projects/smpng/sys/dev/nsp/nsp_pccard.c#11 integrate .. //depot/projects/smpng/sys/dev/null/null.c#16 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#16 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.c#7 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirmio.c#9 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirmio.h#4 integrate .. //depot/projects/smpng/sys/dev/ofw/openpromio.c#4 integrate .. //depot/projects/smpng/sys/dev/owi/if_owi.c#7 integrate .. //depot/projects/smpng/sys/dev/owi/if_owi_pccard.c#2 integrate .. //depot/projects/smpng/sys/dev/pccard/Makefile.pccarddevs#3 delete .. //depot/projects/smpng/sys/dev/pccard/card_if.m#10 integrate .. //depot/projects/smpng/sys/dev/pccard/devlist2h.awk#4 delete .. //depot/projects/smpng/sys/dev/pccard/pccard_cis_quirks.c#6 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#39 delete .. //depot/projects/smpng/sys/dev/pccard/pccardvar.h#18 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#44 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#12 integrate .. //depot/projects/smpng/sys/dev/pcf/envctrl.c#1 branch .. //depot/projects/smpng/sys/dev/pcf/pcf.c#1 branch .. //depot/projects/smpng/sys/dev/pcf/pcf_ebus.c#1 branch .. //depot/projects/smpng/sys/dev/pcf/pcf_isa.c#1 branch .. //depot/projects/smpng/sys/dev/pcf/pcfvar.h#1 branch .. //depot/projects/smpng/sys/dev/pci/eisa_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/pci/fixup_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/pci/ignore_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/pci/isa_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#39 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#21 integrate .. //depot/projects/smpng/sys/dev/pci/pci_user.c#13 integrate .. //depot/projects/smpng/sys/dev/pdq/pdq_freebsd.h#7 integrate .. //depot/projects/smpng/sys/dev/ppbus/lpt.c#10 integrate .. //depot/projects/smpng/sys/dev/ppbus/pcfclock.c#10 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppi.c#10 integrate .. //depot/projects/smpng/sys/dev/ppbus/pps.c#14 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc.c#4 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/smpng/sys/dev/puc/puc_ebus.c#2 integrate .. //depot/projects/smpng/sys/dev/puc/puc_pccard.c#6 integrate .. //depot/projects/smpng/sys/dev/puc/puc_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/puc/puc_sbus.c#3 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#26 integrate .. //depot/projects/smpng/sys/dev/random/randomdev.c#23 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#13 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#10 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#10 integrate .. //depot/projects/smpng/sys/dev/rp/rp.c#15 integrate .. //depot/projects/smpng/sys/dev/rp/rp_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/rp/rp_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/rp/rpreg.h#2 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#17 integrate .. //depot/projects/smpng/sys/dev/safe/safe.c#6 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#15 integrate .. //depot/projects/smpng/sys/dev/sbsh/if_sbsh.c#7 integrate .. //depot/projects/smpng/sys/dev/scd/scd.c#8 integrate .. //depot/projects/smpng/sys/dev/scd/scdvar.h#2 integrate .. //depot/projects/smpng/sys/dev/si/si.c#13 integrate .. //depot/projects/smpng/sys/dev/si/si_eisa.c#4 integrate .. //depot/projects/smpng/sys/dev/si/si_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/si/si_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#44 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pccard.c#9 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/smbus/smb.c#8 integrate .. //depot/projects/smpng/sys/dev/smbus/smb.h#2 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#17 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn_pccard.c#11 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932.c#9 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/isa/emu8000.c#7 delete .. //depot/projects/smpng/sys/dev/sound/isa/gusmidi.c#7 delete .. //depot/projects/smpng/sys/dev/sound/isa/mpu.c#13 delete .. //depot/projects/smpng/sys/dev/sound/isa/opl.c#6 delete .. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/isa/uartsio.c#10 delete .. //depot/projects/smpng/sys/dev/sound/midi/midi.c#9 delete .. //depot/projects/smpng/sys/dev/sound/midi/midi.h#7 delete .. //depot/projects/smpng/sys/dev/sound/midi/midibuf.c#6 delete .. //depot/projects/smpng/sys/dev/sound/midi/midibuf.h#3 delete .. //depot/projects/smpng/sys/dev/sound/midi/midisynth.c#3 delete .. //depot/projects/smpng/sys/dev/sound/midi/midisynth.h#3 delete .. //depot/projects/smpng/sys/dev/sound/midi/miditypes.h#3 delete .. //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#10 delete .. //depot/projects/smpng/sys/dev/sound/midi/sequencer.h#3 delete .. //depot/projects/smpng/sys/dev/sound/midi/timer.c#5 delete .. //depot/projects/smpng/sys/dev/sound/midi/timer.h#2 delete .. //depot/projects/smpng/sys/dev/sound/pci/csamidi.c#9 delete .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#21 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.h#4 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#23 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#17 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio_pcm.c#4 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr.c#14 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_pccard.c#12 integrate .. //depot/projects/smpng/sys/dev/streams/streams.c#18 integrate .. //depot/projects/smpng/sys/dev/sx/sx.c#2 integrate .. //depot/projects/smpng/sys/dev/sx/sx_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/syscons/scterm-sc.c#6 integrate .. //depot/projects/smpng/sys/dev/syscons/scvesactl.c#4 integrate .. //depot/projects/smpng/sys/dev/syscons/scvgarndr.c#5 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#39 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.h#8 integrate .. //depot/projects/smpng/sys/dev/syscons/sysmouse.c#9 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#17 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_vars.h#4 integrate .. //depot/projects/smpng/sys/dev/tga/tga_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#18 integrate .. //depot/projects/smpng/sys/dev/twa/twa.h#2 integrate .. //depot/projects/smpng/sys/dev/twa/twa_cam.c#2 integrate .. //depot/projects/smpng/sys/dev/twa/twa_freebsd.c#2 integrate .. //depot/projects/smpng/sys/dev/twa/twa_includes.h#2 integrate .. //depot/projects/smpng/sys/dev/twe/twe.c#12 integrate .. //depot/projects/smpng/sys/dev/twe/twe_compat.h#9 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#21 integrate .. //depot/projects/smpng/sys/dev/twe/twevar.h#9 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#18 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#20 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus.h#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_ebus.c#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_pccard.c#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu_pc98.c#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/ehcireg.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#32 integrate .. //depot/projects/smpng/sys/dev/usb/if_auereg.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/if_axereg.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/if_cuereg.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/if_kue.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/if_kuereg.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/if_rue.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/if_ruereg.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/if_udavreg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/ubsa.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/ubser.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/ucom.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/ucomvar.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/udbp.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/ufm.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#30 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/uhub.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/ulpt.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#37 integrate .. //depot/projects/smpng/sys/dev/usb/umct.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/umodem.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/urio.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/usb.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#52 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#52 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#52 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi_util.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/uvisor.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/uvscom.c#13 integrate .. //depot/projects/smpng/sys/dev/utopia/utopia.c#5 integrate .. //depot/projects/smpng/sys/dev/vinum/vinum.c#17 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#21 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumext.h#11 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumio.c#20 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumioctl.c#17 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumobj.h#7 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumutil.c#5 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#15 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#63 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#29 integrate .. //depot/projects/smpng/sys/dev/wl/if_wl.c#21 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#18 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe_pccard.c#13 integrate .. //depot/projects/smpng/sys/dev/zs/z8530var.h#2 integrate .. //depot/projects/smpng/sys/dev/zs/zs.c#14 integrate .. //depot/projects/smpng/sys/dev/zs/zs_sbus.c#5 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs.h#11 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#12 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_rule.c#8 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#32 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#27 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs.h#7 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_hash.c#8 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#20 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#15 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#29 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfsmount.h#9 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs.h#6 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_ihash.c#6 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_ihash.h#3 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_inode.h#4 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#20 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#17 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#34 integrate .. //depot/projects/smpng/sys/fs/udf/udf.h#5 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#14 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#18 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#5 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.h#4 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.c#2 integrate .. //depot/projects/smpng/sys/geom/geom.h#37 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#19 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#35 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#36 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#29 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel_enc.c#3 integrate .. //depot/projects/smpng/sys/geom/nop/g_nop.c#1 branch .. //depot/projects/smpng/sys/geom/nop/g_nop.h#1 branch .. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#1 branch .. //depot/projects/smpng/sys/geom/stripe/g_stripe.h#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum.h#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_init.c#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_list.c#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_raid5.c#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_raid5.h#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_rm.c#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_share.c#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_share.h#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_state.c#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_var.h#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_volume.c#1 branch .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_extern.h#8 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_ihash.c#6 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_mount.h#4 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#32 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/inode.h#4 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_asus.c#2 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#15 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_toshiba.c#4 integrate .. //depot/projects/smpng/sys/i386/acpica/madt.c#10 integrate .. //depot/projects/smpng/sys/i386/bios/apm.c#8 integrate .. //depot/projects/smpng/sys/i386/bios/apm.h#3 integrate .. //depot/projects/smpng/sys/i386/bios/mca_machdep.c#3 integrate .. //depot/projects/smpng/sys/i386/bios/smapi.c#7 integrate .. //depot/projects/smpng/sys/i386/bios/smbios.c#4 integrate .. //depot/projects/smpng/sys/i386/bios/vpd.c#4 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#50 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#82 integrate .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#9 integrate .. //depot/projects/smpng/sys/i386/i386/bios.c#20 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#19 integrate .. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#11 integrate .. //depot/projects/smpng/sys/i386/i386/exception.s#19 integrate .. //depot/projects/smpng/sys/i386/i386/genassym.c#29 integrate .. //depot/projects/smpng/sys/i386/i386/geode.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#30 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/io_apic.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/legacy.c#6 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#75 integrate .. //depot/projects/smpng/sys/i386/i386/mem.c#20 integrate .. //depot/projects/smpng/sys/i386/i386/mp_clock.c#11 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#64 integrate .. //depot/projects/smpng/sys/i386/i386/mptable.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/nexus.c#12 integrate .. //depot/projects/smpng/sys/i386/i386/perfmon.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#60 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#16 integrate .. //depot/projects/smpng/sys/i386/i386/swtch.s#23 integrate .. //depot/projects/smpng/sys/i386/i386/symbols.raw#2 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#69 integrate .. //depot/projects/smpng/sys/i386/i386/uio_machdep.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#52 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ioctl.c#12 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#15 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysent.c#8 integrate .. //depot/projects/smpng/sys/i386/include/_stdint.h#2 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#6 integrate .. //depot/projects/smpng/sys/i386/include/cpu.h#11 integrate .. //depot/projects/smpng/sys/i386/include/cputypes.h#4 integrate .. //depot/projects/smpng/sys/i386/include/md_var.h#26 integrate .. //depot/projects/smpng/sys/i386/include/pc/bios.h#5 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#21 integrate .. //depot/projects/smpng/sys/i386/include/profile.h#11 integrate .. //depot/projects/smpng/sys/i386/isa/atpic.c#9 integrate .. //depot/projects/smpng/sys/i386/isa/atpic_vector.s#11 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#35 integrate .. //depot/projects/smpng/sys/i386/isa/if_el.c#11 integrate .. //depot/projects/smpng/sys/i386/isa/mse.c#12 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#42 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#14 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_ext.c#13 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_hdr.h#6 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_kbd.c#4 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_sup.c#4 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_vtf.c#2 integrate .. //depot/projects/smpng/sys/i386/isa/pmtimer.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/prof_machdep.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/spic.c#11 integrate .. //depot/projects/smpng/sys/i386/isa/spkr.c#14 integrate .. //depot/projects/smpng/sys/i386/isa/vesa.c#10 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#38 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#22 integrate .. //depot/projects/smpng/sys/i386/pci/pci_pir.c#4 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ctl.c#9 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ing.c#9 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#17 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_rbch.c#14 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_tel.c#12 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_trace.c#13 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#8 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic_isa.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic_pnp.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_i4bdrv.c#18 integrate .. //depot/projects/smpng/sys/ia64/conf/NOTES#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#80 integrate .. //depot/projects/smpng/sys/ia64/ia64/mem.c#16 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#56 integrate .. //depot/projects/smpng/sys/ia64/ia64/ssc.c#13 integrate .. //depot/projects/smpng/sys/ia64/ia64/sscdisk.c#15 integrate .. //depot/projects/smpng/sys/ia64/ia64/uio_machdep.c#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#41 integrate .. //depot/projects/smpng/sys/ia64/include/_stdint.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/cpu.h#21 integrate .. //depot/projects/smpng/sys/ia64/include/pmap.h#17 integrate .. //depot/projects/smpng/sys/ia64/include/profile.h#7 integrate .. //depot/projects/smpng/sys/isa/atkbd_isa.c#9 integrate .. //depot/projects/smpng/sys/isa/atkbdc_isa.c#9 integrate .. //depot/projects/smpng/sys/isa/fd.c#34 delete .. //depot/projects/smpng/sys/isa/fdreg.h#5 delete .. //depot/projects/smpng/sys/isa/psm.c#25 integrate .. //depot/projects/smpng/sys/isa/syscons_isa.c#8 integrate .. //depot/projects/smpng/sys/isa/vga_isa.c#11 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.c#12 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.h#6 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_rrip.c#8 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#26 integrate .. //depot/projects/smpng/sys/isofs/cd9660/iso.h#7 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#22 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#35 integrate .. //depot/projects/smpng/sys/kern/init_main.c#43 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#34 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#61 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#71 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#78 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#1 branch .. //depot/projects/smpng/sys/kern/kern_linker.c#35 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#1 branch .. //depot/projects/smpng/sys/kern/kern_physio.c#13 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#62 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#81 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_sema.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#90 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#69 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#57 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_xxx.c#13 integrate .. //depot/projects/smpng/sys/kern/link_elf.c#24 integrate .. //depot/projects/smpng/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#26 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#30 integrate .. //depot/projects/smpng/sys/kern/subr_blist.c#7 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#34 integrate .. //depot/projects/smpng/sys/kern/subr_devstat.c#14 integrate .. //depot/projects/smpng/sys/kern/subr_log.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#42 delete .. //depot/projects/smpng/sys/kern/subr_prf.c#35 integrate .. //depot/projects/smpng/sys/kern/subr_prof.c#24 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#115 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#18 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#43 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#44 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#22 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#27 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#22 integrate .. //depot/projects/smpng/sys/kern/tty.c#43 integrate .. //depot/projects/smpng/sys/kern/tty_compat.c#7 integrate .. //depot/projects/smpng/sys/kern/tty_conf.c#5 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#27 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#30 integrate .. //depot/projects/smpng/sys/kern/tty_tty.c#13 integrate .. //depot/projects/smpng/sys/kern/uipc_accf.c#4 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#29 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf2.c#15 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#10 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#50 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#34 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#53 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#35 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#46 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#63 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#27 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#73 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#74 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#45 integrate .. //depot/projects/smpng/sys/libkern/arm/bzero.S#2 delete .. //depot/projects/smpng/sys/libkern/arm/memcmp.S#2 delete .. //depot/projects/smpng/sys/libkern/arm/memcpy.S#2 delete .. //depot/projects/smpng/sys/libkern/arm/memcpy_arm.S#2 delete .. //depot/projects/smpng/sys/libkern/arm/memcpy_xscale.S#2 delete .. //depot/projects/smpng/sys/libkern/arm/memset.S#2 delete .. //depot/projects/smpng/sys/libkern/arm/strcmp.S#2 delete .. //depot/projects/smpng/sys/libkern/arm/strncmp.S#2 delete .. //depot/projects/smpng/sys/modules/Makefile#77 integrate .. //depot/projects/smpng/sys/modules/aic/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/an/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/awi/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/cs/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/cx/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ed/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/em/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/ep/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/esp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ex/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/exca/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/fdc/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/fe/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/geom/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/geom/geom_nop/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_stripe/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_vinum/Makefile#1 branch .. //depot/projects/smpng/sys/modules/if_ndis/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ipfilter/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/ixgb/Makefile#1 branch .. //depot/projects/smpng/sys/modules/joy/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ncv/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/bt3c/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/nsp/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/oldcard/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/owi/Makefile#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 23 20:45:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC84A16A4D0; Wed, 23 Jun 2004 20:45:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7CF8516A4CE for ; Wed, 23 Jun 2004 20:45:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7502F43D60 for ; Wed, 23 Jun 2004 20:45:09 +0000 (GMT) (envelope-from ps@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5NKix7q033232 for ; Wed, 23 Jun 2004 20:44:59 GMT (envelope-from ps@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5NKiwTP033229 for perforce@freebsd.org; Wed, 23 Jun 2004 20:44:58 GMT (envelope-from ps@freebsd.org) Date: Wed, 23 Jun 2004 20:44:58 GMT Message-Id: <200406232044.i5NKiwTP033229@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ps@freebsd.org using -f From: Paul Saab To: Perforce Change Reviews Subject: PERFORCE change 55630 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2004 20:45:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=55630 Change 55630 by ps@butter.corp on 2004/06/23 20:44:23 IFC Affected files ... .. //depot/projects/sack/alpha/include/pmap.h#2 integrate .. //depot/projects/sack/amd64/amd64/pmap.c#4 integrate .. //depot/projects/sack/boot/forth/loader.conf#3 integrate .. //depot/projects/sack/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/sack/compat/linux/linux_util.c#3 integrate .. //depot/projects/sack/conf/NOTES#3 integrate .. //depot/projects/sack/conf/files#5 integrate .. //depot/projects/sack/conf/files.i386#2 integrate .. //depot/projects/sack/contrib/pf/net/if_pflog.c#4 integrate .. //depot/projects/sack/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/sack/contrib/pf/net/pfvar.h#4 integrate .. //depot/projects/sack/dev/acpica/acpi.c#4 integrate .. //depot/projects/sack/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/sack/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/sack/dev/acpica/acpi_resource.c#3 integrate .. //depot/projects/sack/dev/acpica/acpiio.h#2 integrate .. //depot/projects/sack/dev/acpica/acpivar.h#4 integrate .. //depot/projects/sack/dev/ata/ata-all.c#3 integrate .. //depot/projects/sack/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/sack/dev/ata/ata-disk.c#2 integrate .. //depot/projects/sack/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/sack/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/sack/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/sack/dev/ciss/ciss.c#4 integrate .. //depot/projects/sack/dev/cp/if_cp.c#3 integrate .. //depot/projects/sack/dev/ctau/if_ct.c#3 integrate .. //depot/projects/sack/dev/cx/if_cx.c#4 integrate .. //depot/projects/sack/dev/cy/cy.c#5 integrate .. //depot/projects/sack/dev/digi/digi.h#3 integrate .. //depot/projects/sack/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/sack/dev/sio/sio.c#5 integrate .. //depot/projects/sack/dev/uart/uart_tty.c#3 integrate .. //depot/projects/sack/dev/usb/ulpt.c#3 integrate .. //depot/projects/sack/dev/vinum/vinumio.c#3 integrate .. //depot/projects/sack/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/sack/fs/portalfs/portal_vnops.c#3 integrate .. //depot/projects/sack/fs/udf/udf.h#3 integrate .. //depot/projects/sack/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/sack/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/sack/geom/vinum/geom_vinum_drive.c#3 integrate .. //depot/projects/sack/geom/vinum/geom_vinum_raid5.c#2 integrate .. //depot/projects/sack/i386/conf/NOTES#3 integrate .. //depot/projects/sack/i386/i386/bios.c#4 integrate .. //depot/projects/sack/i386/i386/io_apic.c#2 integrate .. //depot/projects/sack/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/sack/i386/i386/mptable.c#2 integrate .. //depot/projects/sack/i386/i386/pmap.c#4 integrate .. //depot/projects/sack/i386/include/apicvar.h#2 integrate .. //depot/projects/sack/ia64/include/pmap.h#2 integrate .. //depot/projects/sack/kern/kern_conf.c#3 integrate .. //depot/projects/sack/kern/uipc_syscalls.c#4 integrate .. //depot/projects/sack/modules/Makefile#3 integrate .. //depot/projects/sack/modules/ctau/Makefile#2 integrate .. //depot/projects/sack/modules/cx/Makefile#2 integrate .. //depot/projects/sack/net/if.c#4 integrate .. //depot/projects/sack/net/if.h#2 integrate .. //depot/projects/sack/net/if_clone.c#1 branch .. //depot/projects/sack/net/if_clone.h#1 branch .. //depot/projects/sack/net/if_disc.c#2 integrate .. //depot/projects/sack/net/if_faith.c#2 integrate .. //depot/projects/sack/net/if_gif.c#2 integrate .. //depot/projects/sack/net/if_gre.c#2 integrate .. //depot/projects/sack/net/if_loop.c#2 integrate .. //depot/projects/sack/net/if_ppp.c#3 integrate .. //depot/projects/sack/net/if_stf.c#2 integrate .. //depot/projects/sack/net/if_var.h#4 integrate .. //depot/projects/sack/net/if_vlan.c#3 integrate .. //depot/projects/sack/netgraph/ng_bpf.c#2 integrate .. //depot/projects/sack/netgraph/ng_bridge.c#2 integrate .. //depot/projects/sack/netipsec/key.c#2 integrate .. //depot/projects/sack/netipsec/keysock.c#2 integrate .. //depot/projects/sack/netipx/ipx.h#2 integrate .. //depot/projects/sack/pc98/i386/machdep.c#4 integrate .. //depot/projects/sack/pc98/pc98/sio.c#4 integrate .. //depot/projects/sack/sys/imgact_aout.h#2 integrate .. //depot/projects/sack/sys/param.h#4 integrate .. //depot/projects/sack/sys/tty.h#4 integrate .. //depot/projects/sack/sys/ttycom.h#2 integrate .. //depot/projects/sack/vm/swap_pager.c#3 integrate Differences ... ==== //depot/projects/sack/alpha/include/pmap.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.30 2004/04/11 05:08:26 alc Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.31 2004/06/23 08:06:52 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -178,11 +178,6 @@ LIST_ENTRY(pmap) pm_list; /* list of all pmaps. */ }; -#define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) - -#define PM_FLAG_LOCKED 0x1 -#define PM_FLAG_WANTED 0x2 - typedef struct pmap *pmap_t; #ifdef _KERNEL @@ -210,6 +205,8 @@ struct vmspace; +#define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) + vm_offset_t pmap_steal_memory(vm_size_t); void pmap_bootstrap(vm_offset_t, u_int); void pmap_kenter(vm_offset_t va, vm_offset_t pa); ==== //depot/projects/sack/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.478 2004/06/20 20:57:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.479 2004/06/23 04:37:14 alc Exp $"); /* * Manages physical address maps. @@ -801,18 +801,34 @@ vm_page_t pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { - vm_paddr_t pa; + pd_entry_t pde, *pdep; + pt_entry_t pte; vm_page_t m; m = NULL; - mtx_lock(&Giant); - if ((pa = pmap_extract(pmap, va)) != 0) { - m = PHYS_TO_VM_PAGE(pa); - vm_page_lock_queues(); - vm_page_hold(m); - vm_page_unlock_queues(); + if (pmap == NULL) + return (m); + vm_page_lock_queues(); + PMAP_LOCK(pmap); + pdep = pmap_pde(pmap, va); + if (pdep != NULL && (pde = *pdep)) { + if (pde & PG_PS) { + if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) { + m = PHYS_TO_VM_PAGE((pde & ~PDRMASK) | + (va & PDRMASK)); + vm_page_hold(m); + } + } else { + pte = *pmap_pte(pmap, va); + if ((pte & PG_V) && + ((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) { + m = PHYS_TO_VM_PAGE(pte & PG_FRAME); + vm_page_hold(m); + } + } } - mtx_unlock(&Giant); + vm_page_unlock_queues(); + PMAP_UNLOCK(pmap); return (m); } ==== //depot/projects/sack/boot/forth/loader.conf#3 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.78 2004/06/20 15:58:24 josef Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.79 2004/06/22 22:57:13 brueffer Exp $ ############################################################## ### Basic configuration options ############################ @@ -172,8 +172,6 @@ if_tun_load="NO" # Tunnel driver (user process ppp) if_vlan_load="NO" # IEEE 802.1Q VLAN network interface ipfw_load="NO" # Firewall -pfsync_load="NO" # pfsync pseudo interface -pflog_load="NO" # pflog pseudo interface pf_load="NO" # packet filter ==== //depot/projects/sack/boot/i386/cdboot/cdboot.s#2 (text+ko) ==== @@ -1,19 +1,33 @@ # -# Copyright (c) 2001 John Baldwin +# Copyright (c) 2001 John Baldwin # All rights reserved. # -# Redistribution and use in source and binary forms are freely -# permitted provided that the above copyright notice and this -# paragraph and the following disclaimer are duplicated in all -# such forms. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the author nor the names of any co-contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. # -# This software is provided "AS IS" and without any express or -# implied warranties, including, without limitation, the implied -# warranties of merchantability and fitness for a particular -# purpose. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.11 2004/01/12 20:34:42 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.13 2004/06/22 21:55:22 jhb Exp $ # # This program is a freestanding boot program to load an a.out binary @@ -151,7 +165,6 @@ mov $0xffff,%cx # path name by repnz # scanning for scasb # nul char - inc %di # Skip nul mov %di,%si # Point %si at next path mov (%si),%al # Get first char of next path or %al,%al # Is it double nul? ==== //depot/projects/sack/compat/linux/linux_util.c#3 (text+ko) ==== @@ -30,13 +30,15 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.25 2004/06/22 04:22:34 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.26 2004/06/23 06:35:43 bde Exp $"); #include -#include +#include +#include +#include #include #include -#include +#include #include #include ==== //depot/projects/sack/conf/NOTES#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1232 2004/06/13 17:29:06 mlaier Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1233 2004/06/22 22:02:57 bms Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -372,9 +372,8 @@ # The default is that packets coming from a tunnel are _not_ processed; # they are assumed trusted. # -# Note that enabling this can be problematic as there are no mechanisms -# in place for distinguishing packets coming out of a tunnel (e.g. no -# encX devices as found on openbsd). +# IPSEC history is preserved for such packets, and can be filtered +# using ipfw(8)'s 'ipsec' keyword, when this option is enabled. # #options IPSEC_FILTERGIF #filter ipsec packets from a tunnel ==== //depot/projects/sack/conf/files#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.906 2004/06/16 23:23:59 mlaier Exp $ +# $FreeBSD: src/sys/conf/files,v 1.907 2004/06/22 20:13:24 brooks Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1222,6 +1222,7 @@ net/if.c standard net/if_arcsubr.c optional arcnet net/if_atmsubr.c optional atm +net/if_clone.c standard net/if_disc.c optional disc net/if_ef.c optional ef net/if_ethersubr.c optional ether ==== //depot/projects/sack/conf/files.i386#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.493 2004/05/26 07:43:40 bde Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.494 2004/06/23 17:33:24 brooks Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -272,7 +272,7 @@ i386/isa/elcr.c standard i386/isa/elink.c optional ep i386/isa/elink.c optional ie -i386/isa/if_el.c count el +i386/isa/if_el.c optional el i386/isa/isa.c optional isa i386/isa/isa_dma.c optional isa i386/isa/mse.c optional mse ==== //depot/projects/sack/contrib/pf/net/if_pflog.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.8 2004/06/16 23:24:00 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pflog.c,v 1.9 2004/06/22 20:13:24 brooks Exp $ */ /* $OpenBSD: if_pflog.c,v 1.11 2003/12/31 11:18:25 cedric Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -63,6 +63,9 @@ #endif #include +#if defined(__FreeBSD__) +#include +#endif #include #include #include @@ -123,8 +126,7 @@ #ifdef __FreeBSD__ static MALLOC_DEFINE(M_PFLOG, PFLOGNAME, "Packet Filter Logging Interface"); static LIST_HEAD(pflog_list, pflog_softc) pflog_list; -struct if_clone pflog_cloner = IF_CLONE_INITIALIZER(PFLOGNAME, - pflog_clone_create, pflog_clone_destroy, 1, IF_MAXUNIT); +IFC_SIMPLE_DECLARE(pflog, 1); static void pflog_clone_destroy(struct ifnet *ifp) ==== //depot/projects/sack/contrib/pf/net/if_pfsync.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.8 2004/06/16 23:24:00 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/if_pfsync.c,v 1.9 2004/06/22 20:13:24 brooks Exp $ */ /* $OpenBSD: if_pfsync.c,v 1.26 2004/03/28 18:14:20 mcbride Exp $ */ /* @@ -62,6 +62,9 @@ #endif #include +#if defined(__FreeBSD__) +#include +#endif #include #include #include @@ -148,8 +151,7 @@ #ifdef __FreeBSD__ static MALLOC_DEFINE(M_PFSYNC, PFSYNCNAME, "Packet Filter State Sync. Interface"); static LIST_HEAD(pfsync_list, pfsync_softc) pfsync_list; -struct if_clone pfsync_cloner = IF_CLONE_INITIALIZER(PFSYNCNAME, - pfsync_clone_create, pfsync_clone_destroy, 1, IF_MAXUNIT); +IFC_SIMPLE_DECLARE(pfsync, 1); static void pfsync_clone_destroy(struct ifnet *ifp) ==== //depot/projects/sack/contrib/pf/net/pfvar.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.6 2004/06/16 23:24:00 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.7 2004/06/22 20:13:25 brooks Exp $ */ /* $OpenBSD: pfvar.h,v 1.187 2004/03/22 04:54:18 mcbride Exp $ */ /* @@ -40,6 +40,7 @@ #include #ifdef __FreeBSD__ +#include #include #else #include ==== //depot/projects/sack/dev/acpica/acpi.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.163 2004/06/16 09:46:35 phk Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.164 2004/06/23 17:21:02 jhb Exp $ */ #include "opt_acpi.h" @@ -846,12 +846,12 @@ acpi_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + ACPI_RESOURCE ares; struct acpi_device *ad = device_get_ivars(child); struct resource_list *rl = &ad->ad_rl; struct resource_list_entry *rle; struct resource *res; struct rman *rm; - int needactivate; /* * If this is an allocation of the "default" range for a given RID, and @@ -870,41 +870,56 @@ /* If we don't manage this address, pass the request up to the parent. */ rle = acpi_sysres_find(type, start); if (rle == NULL) { - return (BUS_ALLOC_RESOURCE(device_get_parent(bus), child, type, rid, - start, end, count, flags)); - } + res = BUS_ALLOC_RESOURCE(device_get_parent(bus), child, type, rid, + start, end, count, flags); + } else { + + /* We only handle memory and IO resources through rman. */ + switch (type) { + case SYS_RES_IOPORT: + rm = &acpi_rman_io; + break; + case SYS_RES_MEMORY: + rm = &acpi_rman_mem; + break; + default: + panic("acpi_alloc_resource: invalid res type %d", type); + } - /* We only handle memory and IO resources through rman. */ - switch (type) { - case SYS_RES_IOPORT: - rm = &acpi_rman_io; - break; - case SYS_RES_MEMORY: - rm = &acpi_rman_mem; - break; - default: - panic("acpi_alloc_resource: invalid res type %d", type); - } + /* If we do know it, allocate it from the local pool. */ + res = rman_reserve_resource(rm, start, end, count, flags & ~RF_ACTIVE, + child); + if (res == NULL) + return (NULL); - /* If we do know it, allocate it from the local pool. */ - needactivate = flags & RF_ACTIVE; - flags &= ~RF_ACTIVE; - res = rman_reserve_resource(rm, start, end, count, flags, child); - if (res == NULL) - return (NULL); + /* Copy the bus tag from the pre-allocated resource. */ + rman_set_bustag(res, rman_get_bustag(rle->res)); + if (type == SYS_RES_IOPORT) + rman_set_bushandle(res, res->r_start); - /* Copy the bus tag from the pre-allocated resource. */ - rman_set_bustag(res, rman_get_bustag(rle->res)); - if (type == SYS_RES_IOPORT) - rman_set_bushandle(res, res->r_start); + /* If requested, activate the resource using the parent's method. */ + if (flags & RF_ACTIVE) + if (bus_activate_resource(child, type, *rid, res) != 0) { + rman_release_resource(res); + return (NULL); + } + } - /* If requested, activate the resource using the parent's method. */ - if (needactivate) - if (bus_activate_resource(child, type, *rid, res) != 0) { - rman_release_resource(res); - return (NULL); + if (res != NULL && device_get_parent(child) == bus) + switch (type) { + case SYS_RES_IRQ: + /* + * Since bus_config_intr() takes immediate effect, we cannot + * configure the interrupt associated with a device when we + * parse the resources but have to defer it until a driver + * actually allocates the interrupt via bus_alloc_resource(). + * + * XXX: Should we handle the lookup failing? + */ + if (ACPI_SUCCESS(acpi_lookup_irq_resource(child, *rid, res, &ares))) + acpi_config_intr(child, &ares); + break; } - return (res); } ==== //depot/projects/sack/dev/acpica/acpi_pci.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.18 2004/06/07 21:44:01 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.19 2004/06/23 15:08:40 jhb Exp $"); #include #include @@ -56,18 +56,17 @@ ACPI_HANDLE ap_handle; }; +static int acpi_pci_attach(device_t dev); +static int acpi_pci_child_location_str_method(device_t cbdev, + device_t child, char *buf, size_t buflen); static int acpi_pci_probe(device_t dev); -static int acpi_pci_attach(device_t dev); static int acpi_pci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result); -static int acpi_pci_child_location_str_method(device_t cbdev, - device_t child, char *buf, size_t buflen); - - +static ACPI_STATUS acpi_pci_save_handle(ACPI_HANDLE handle, UINT32 level, + void *context, void **status); static int acpi_pci_set_powerstate_method(device_t dev, device_t child, int state); -static ACPI_STATUS acpi_pci_save_handle(ACPI_HANDLE handle, UINT32 level, - void *context, void **status); +static void acpi_pci_update_device(ACPI_HANDLE handle, device_t pci_child); static device_method_t acpi_pci_methods[] = { /* Device interface */ @@ -205,6 +204,40 @@ return (0); } +static void +acpi_pci_update_device(ACPI_HANDLE handle, device_t pci_child) +{ + ACPI_STATUS status; + device_t child; + + /* + * Lookup and remove the unused device that acpi0 creates when it walks + * the namespace creating devices. + */ + child = acpi_get_device(handle); + if (child != NULL) { + KASSERT(!device_is_alive(child), ("%s: deleting alive child %s", + __func__, device_get_nameunit(child))); + KASSERT(device_get_parent(child) == + devclass_get_device(devclass_find("acpi"), 0), + ("%s: child (%s)'s parent is not acpi0", __func__, + acpi_name(handle))); + device_delete_child(device_get_parent(child), child); + } + + /* + * Update ACPI-CA to use the PCI enumerated device_t for this handle. + */ + status = AcpiDetachData(handle, acpi_fake_objhandler); + if (ACPI_FAILURE(status)) + printf("WARNING: Unable to detach object data from %s - %s\n", + acpi_name(handle), AcpiFormatException(status)); + status = AcpiAttachData(handle, acpi_fake_objhandler, child); + if (ACPI_FAILURE(status)) + printf("WARNING: Unable to attach object data to %s - %s\n", + acpi_name(handle), AcpiFormatException(status)); +} + static ACPI_STATUS acpi_pci_save_handle(ACPI_HANDLE handle, UINT32 level, void *context, void **status) @@ -227,6 +260,7 @@ if (dinfo->ap_dinfo.cfg.func == func && dinfo->ap_dinfo.cfg.slot == slot) { dinfo->ap_handle = handle; + acpi_pci_update_device(handle, devlist[i]); free(devlist, M_TEMP); return_ACPI_STATUS (AE_OK); } ==== //depot/projects/sack/dev/acpica/acpi_pcib.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.44 2004/06/07 17:36:22 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.45 2004/06/23 17:21:02 jhb Exp $"); #include "opt_acpi.h" #include @@ -121,6 +121,7 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); + crsres = NULL; buf.Pointer = NULL; crsbuf.Pointer = NULL; prsbuf.Pointer = NULL; @@ -348,6 +349,7 @@ /* XXX Data.Irq and Data.ExtendedIrq are implicitly structure-copied. */ crsbuf.Pointer = NULL; + crsres = NULL; if (prsres->Id == ACPI_RSTYPE_IRQ) { resbuf.Id = ACPI_RSTYPE_IRQ; resbuf.Length = ACPI_SIZEOF_RESOURCE(ACPI_RESOURCE_IRQ); @@ -378,6 +380,7 @@ AcpiFormatException(status)); goto out; } + crsres = &resbuf; /* Return the interrupt we just routed. */ device_printf(pcib, "slot %d INT%c routed to irq %d via %s\n", @@ -386,6 +389,8 @@ interrupt = Interrupts[0]; out: + if (PCI_INTERRUPT_VALID(interrupt) && crsres != NULL) + acpi_config_intr(dev, crsres); if (crsbuf.Pointer != NULL) AcpiOsFree(crsbuf.Pointer); if (prsbuf.Pointer != NULL) ==== //depot/projects/sack/dev/acpica/acpi_resource.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.25 2004/06/13 22:52:30 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.26 2004/06/23 17:21:02 jhb Exp $"); #include "opt_acpi.h" #include @@ -46,6 +46,94 @@ #define _COMPONENT ACPI_BUS ACPI_MODULE_NAME("RESOURCE") +struct lookup_irq_request { + ACPI_RESOURCE *acpi_res; + struct resource *res; + int counter; + int rid; + int found; +}; + +static ACPI_STATUS +acpi_lookup_irq_handler(ACPI_RESOURCE *res, void *context) +{ + struct lookup_irq_request *req; + u_int irqnum, irq; + + switch (res->Id) { + case ACPI_RSTYPE_IRQ: + case ACPI_RSTYPE_EXT_IRQ: + if (res->Id == ACPI_RSTYPE_IRQ) { + irqnum = res->Data.Irq.NumberOfInterrupts; + irq = res->Data.Irq.Interrupts[0]; + } else { + irqnum = res->Data.ExtendedIrq.NumberOfInterrupts; + irq = res->Data.ExtendedIrq.Interrupts[0]; + } + if (irqnum != 1) + break; + req = (struct lookup_irq_request *)context; + if (req->counter != req->rid) { + req->counter++; + break; + } + req->found = 1; + KASSERT(irq == rman_get_start(req->res), + ("IRQ resources do not match")); + bcopy(res, req->acpi_res, sizeof(ACPI_RESOURCE)); + return (AE_CTRL_TERMINATE); + } + return (AE_OK); +} + +ACPI_STATUS +acpi_lookup_irq_resource(device_t dev, int rid, struct resource *res, + ACPI_RESOURCE *acpi_res) +{ + struct lookup_irq_request req; + ACPI_STATUS status; + + req.acpi_res = acpi_res; + req.res = res; + req.counter = 0; + req.rid = rid; + req.found = 0; + status = AcpiWalkResources(acpi_get_handle(dev), "_CRS", + acpi_lookup_irq_handler, &req); + if (ACPI_SUCCESS(status) && req.found == 0) + status = AE_NOT_FOUND; + return (status); +} + +void +acpi_config_intr(device_t dev, ACPI_RESOURCE *res) +{ + u_int irq; + int pol, trig; + + switch (res->Id) { + case ACPI_RSTYPE_IRQ: + KASSERT(res->Data.Irq.NumberOfInterrupts == 1, + ("%s: multiple interrupts", __func__)); + irq = res->Data.Irq.Interrupts[0]; + trig = res->Data.Irq.EdgeLevel; + pol = res->Data.Irq.ActiveHighLow; + break; + case ACPI_RSTYPE_EXT_IRQ: + KASSERT(res->Data.ExtendedIrq.NumberOfInterrupts == 1, + ("%s: multiple interrupts", __func__)); + irq = res->Data.ExtendedIrq.Interrupts[0]; + trig = res->Data.ExtendedIrq.EdgeLevel; + pol = res->Data.ExtendedIrq.ActiveHighLow; + break; + default: + panic("%s: bad resource type %u", __func__, res->Id); + } + BUS_CONFIG_INTR(dev, irq, (trig == ACPI_EDGE_SENSITIVE) ? + INTR_TRIGGER_EDGE : INTR_TRIGGER_LEVEL, (pol == ACPI_ACTIVE_HIGH) ? + INTR_POLARITY_HIGH : INTR_POLARITY_LOW); +} + /* * Fetch a device's resources and associate them with the device. * @@ -497,9 +585,6 @@ return; bus_set_resource(dev, SYS_RES_IRQ, cp->ar_nirq++, *irq, 1); - BUS_CONFIG_INTR(dev, *irq, (trig == ACPI_EDGE_SENSITIVE) ? - INTR_TRIGGER_EDGE : INTR_TRIGGER_LEVEL, (pol == ACPI_ACTIVE_HIGH) ? - INTR_POLARITY_HIGH : INTR_POLARITY_LOW); } static void ==== //depot/projects/sack/dev/acpica/acpiio.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.9 2003/09/13 20:13:01 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.10 2004/06/22 08:23:26 brueffer Exp $ */ /* @@ -44,7 +44,7 @@ struct acpi_battinfo { int cap; /* percent */ - int min; /* remianing time */ + int min; /* remaining time */ int state; /* battery state */ }; @@ -57,8 +57,8 @@ u_int32_t dvol; /* Design voltage (mV) */ u_int32_t wcap; /* WARN capacity */ u_int32_t lcap; /* Low capacity */ - u_int32_t gra1; /* Granulity 1(Warn to Low) */ - u_int32_t gra2; /* Granulity 2(Full to Warn) */ + u_int32_t gra1; /* Granularity 1 (Warn to Low) */ + u_int32_t gra2; /* Granularity 2 (Full to Warn) */ char model[ACPI_CMBAT_MAXSTRLEN]; /* model identifier */ char serial[ACPI_CMBAT_MAXSTRLEN]; /* Serial number */ char type[ACPI_CMBAT_MAXSTRLEN]; /* Type */ ==== //depot/projects/sack/dev/acpica/acpivar.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.72 2004/06/16 09:46:35 phk Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.73 2004/06/23 17:21:02 jhb Exp $ */ #include "bus_if.h" @@ -268,6 +268,10 @@ }; extern struct acpi_parse_resource_set acpi_res_parse_set; + +void acpi_config_intr(device_t dev, ACPI_RESOURCE *res); +ACPI_STATUS acpi_lookup_irq_resource(device_t dev, int rid, + struct resource *res, ACPI_RESOURCE *acpi_res); ACPI_STATUS acpi_parse_resources(device_t dev, ACPI_HANDLE handle, struct acpi_parse_resource_set *set, void *arg); extern struct rman acpi_rman_io, acpi_rman_mem; ==== //depot/projects/sack/dev/ata/ata-all.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.213 2004/06/16 09:46:37 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.214 2004/06/22 11:18:24 sos Exp $"); #include "opt_ata.h" #include @@ -156,7 +156,7 @@ /* initialize queue and associated lock */ bzero(&ch->queue_mtx, sizeof(struct mtx)); - mtx_init(&ch->queue_mtx, "ATA queue lock", MTX_DEF, 0); + mtx_init(&ch->queue_mtx, "ATA queue lock", NULL, MTX_DEF); TAILQ_INIT(&ch->ata_queue); /* do not attach devices if we are in early boot */ ==== //depot/projects/sack/dev/ata/ata-chipset.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.74 2004/06/17 21:36:10 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.75 2004/06/22 11:18:24 sos Exp $"); #include "opt_ata.h" #include @@ -1324,7 +1324,7 @@ ctlr->driver = malloc(sizeof(struct ata_promise_sx4), M_TEMP, M_NOWAIT | M_ZERO); hpkt = ctlr->driver; - mtx_init(&hpkt->mtx, "ATA promise HPKT lock", MTX_DEF, 0); + mtx_init(&hpkt->mtx, "ATA promise HPKT lock", NULL, MTX_DEF); hpkt->busy = hpkt->head = hpkt->tail = 0; if ((bus_setup_intr(dev, ctlr->r_irq, ATA_INTR_FLAGS, ==== //depot/projects/sack/dev/ata/ata-disk.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.172 2004/04/13 09:44:20 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.173 2004/06/22 11:18:24 sos Exp $"); #include "opt_ata.h" #include @@ -97,7 +97,7 @@ adp->sectors = 17; adp->heads = 8; } - mtx_init(&adp->queue_mtx, "ATA disk bioqueue lock", MTX_DEF, 0); + mtx_init(&adp->queue_mtx, "ATA disk bioqueue lock", NULL, MTX_DEF); bioq_init(&adp->queue); lbasize = (u_int32_t)atadev->param->lba_size_1 | ==== //depot/projects/sack/dev/ata/atapi-cd.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.167 2004/06/21 20:42:03 green Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.168 2004/06/22 11:18:24 sos Exp $"); #include "opt_ata.h" #include @@ -230,7 +230,7 @@ if (!(cdp = malloc(sizeof(struct acd_softc), M_ACD, M_NOWAIT | M_ZERO))) return NULL; bioq_init(&cdp->queue); - mtx_init(&cdp->queue_mtx, "ATAPI CD bioqueue lock", MTX_DEF, 0); + mtx_init(&cdp->queue_mtx, "ATAPI CD bioqueue lock", NULL, MTX_DEF); cdp->device = atadev; cdp->lun = ata_get_lun(&acd_lun_map); cdp->block_size = 2048; ==== //depot/projects/sack/dev/ata/atapi-fd.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.95 2004/03/01 13:17:07 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.96 2004/06/22 11:18:25 sos Exp $"); #include #include @@ -82,7 +82,7 @@ fdp->lun = ata_get_lun(&afd_lun_map); ata_set_name(atadev, "afd", fdp->lun); bioq_init(&fdp->queue); - mtx_init(&fdp->queue_mtx, "ATAPI FD bioqueue lock", MTX_DEF, 0); + mtx_init(&fdp->queue_mtx, "ATAPI FD bioqueue lock", NULL, MTX_DEF); if (afd_sense(fdp)) { free(fdp, M_AFD); ==== //depot/projects/sack/dev/ata/atapi-tape.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.91 2004/06/16 09:46:37 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.92 2004/06/22 11:18:25 sos Exp $"); #include "opt_ata.h" #include @@ -106,7 +106,7 @@ stp->lun = ata_get_lun(&ast_lun_map); ata_set_name(atadev, "ast", stp->lun); bioq_init(&stp->queue); - mtx_init(&stp->queue_mtx, "ATAPI TAPE bioqueue lock", MTX_DEF, 0); + mtx_init(&stp->queue_mtx, "ATAPI TAPE bioqueue lock", NULL, MTX_DEF); if (ast_sense(stp)) { free(stp, M_AST); ==== //depot/projects/sack/dev/ciss/ciss.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.52 2004/06/21 22:57:10 ps Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.54 2004/06/22 23:05:06 ps Exp $ */ /* @@ -2493,7 +2493,7 @@ for (i = 0; i < sc->ciss_max_logical_bus; i++) ciss_cam_rescan_target(sc, i, CAM_TARGET_WILDCARD); /* Rescan the physical buses */ - for (i = CISS_PHYSICAL_BASE; i < sc->ciss_max_logical_bus + + for (i = CISS_PHYSICAL_BASE; i < sc->ciss_max_physical_bus + CISS_PHYSICAL_BASE; i++) ciss_cam_rescan_target(sc, i, CAM_TARGET_WILDCARD); } @@ -3414,6 +3414,7 @@ if (ld->cl_update == 0) continue; + ld->cl_update = 0; ld->cl_address = cll->lun[i]; ld->cl_controller = &sc->ciss_controllers[bus]; if (ciss_identify_logical(sc, ld) == 0) { ==== //depot/projects/sack/dev/cp/if_cp.c#3 (text+ko) ==== @@ -18,11 +18,11 @@ * as long as this message is kept with the software, all derivative * works or modified versions. * - * $Cronyx: if_cp.c,v 1.1.2.32 2004/02/26 17:56:39 rik Exp $ + * Cronyx Id: if_cp.c,v 1.1.2.41 2004/06/23 17:09:13 rik Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.6 2004/06/17 17:16:42 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.8 2004/06/23 18:13:09 rik Exp $"); #include @@ -45,9 +45,7 @@ #include #include #include -#if __FreeBSD_version >= 400000 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 23 21:16:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E61616A4D1; Wed, 23 Jun 2004 21:16:52 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 452FA16A4CE for ; Wed, 23 Jun 2004 21:16:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D53B43D5D for ; Wed, 23 Jun 2004 21:16:52 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5NLGUP4046849 for ; Wed, 23 Jun 2004 21:16:30 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5NLGSLM046846 for perforce@freebsd.org; Wed, 23 Jun 2004 21:16:28 GMT (envelope-from marcel@freebsd.org) Date: Wed, 23 Jun 2004 21:16:28 GMT Message-Id: <200406232116.i5NLGSLM046846@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 Subject: PERFORCE change 55637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2004 21:16:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=55637 Change 55637 by marcel@marcel_nfs on 2004/06/23 21:16:08 IFC @55632 Affected files ... .. //depot/projects/gdb/UPDATING#16 integrate .. //depot/projects/gdb/bin/ls/cmp.c#3 integrate .. //depot/projects/gdb/bin/ps/extern.h#4 integrate .. //depot/projects/gdb/bin/ps/fmt.c#3 integrate .. //depot/projects/gdb/bin/ps/keyword.c#5 integrate .. //depot/projects/gdb/bin/ps/print.c#5 integrate .. //depot/projects/gdb/bin/ps/ps.1#11 integrate .. //depot/projects/gdb/bin/ps/ps.c#13 integrate .. //depot/projects/gdb/contrib/ipfilter/BSD/kupgrade#2 integrate .. //depot/projects/gdb/contrib/ipfilter/HISTORY#2 integrate .. //depot/projects/gdb/contrib/ipfilter/Makefile#2 integrate .. //depot/projects/gdb/contrib/ipfilter/common.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/fils.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/ip_sfil.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/ipf.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/ipf.h#2 integrate .. //depot/projects/gdb/contrib/ipfilter/ipfs.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/ipft_ef.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/ipft_td.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/iplang/iplang_l.l#2 integrate .. //depot/projects/gdb/contrib/ipfilter/ipmon.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/ipnat.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/ipsend/in_var.h#2 integrate .. //depot/projects/gdb/contrib/ipfilter/ipsend/ipsend.1#2 integrate .. //depot/projects/gdb/contrib/ipfilter/ipsend/ipsend.5#2 integrate .. //depot/projects/gdb/contrib/ipfilter/ipsend/ipsend.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/ipsend/ipsopt.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/ipt.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/kmem.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/man/ipf.5#2 integrate .. //depot/projects/gdb/contrib/ipfilter/man/ipf.8#2 integrate .. //depot/projects/gdb/contrib/ipfilter/man/ipfstat.8#2 integrate .. //depot/projects/gdb/contrib/ipfilter/man/ipl.4#2 integrate .. //depot/projects/gdb/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/gdb/contrib/ipfilter/man/ipnat.5#2 integrate .. //depot/projects/gdb/contrib/ipfilter/mln_ipl.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/natparse.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/parse.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/perl/Services#2 integrate .. //depot/projects/gdb/contrib/ipfilter/printnat.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/printstate.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/Makefile#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/README.TXT#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/expected/i11#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/expected/in1#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/expected/ni1#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/expected/ni10#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/expected/ni11#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/expected/ni2#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/expected/ni3#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/expected/ni4#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/expected/ni5#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/expected/ni7#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/expected/ni8#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/input/f12#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/input/f13#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/input/f17#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/input/ni1#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/input/ni10#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/input/ni11#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/input/ni2#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/input/ni3#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/input/ni4#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/input/ni5#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/input/ni7#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/input/ni8#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/regress/i11#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/regress/in1#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/regress/ni10.ipf#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/regress/ni10.nat#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/regress/ni11.ipf#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/regress/ni11.nat#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/regress/ni7.ipf#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/regress/ni7.nat#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/regress/ni8.ipf#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/regress/ni8.nat#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/vfycksum.pl#1 branch .. //depot/projects/gdb/etc/group#4 integrate .. //depot/projects/gdb/etc/master.passwd#4 integrate .. //depot/projects/gdb/etc/rc.d/nsswitch#2 integrate .. //depot/projects/gdb/etc/rc.d/pf#3 integrate .. //depot/projects/gdb/games/fortune/fortune/Makefile#2 integrate .. //depot/projects/gdb/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/Makefile#4 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/doc/Makefile#2 integrate .. //depot/projects/gdb/include/a.out.h#2 integrate .. //depot/projects/gdb/include/ctype.h#3 integrate .. //depot/projects/gdb/include/rune.h#2 integrate .. //depot/projects/gdb/include/runetype.h#2 integrate .. //depot/projects/gdb/lib/libc/gen/dlinfo.3#2 integrate .. //depot/projects/gdb/lib/libc/gen/getfsent.3#2 integrate .. //depot/projects/gdb/lib/libc/locale/euc.c#8 integrate .. //depot/projects/gdb/lib/libc/locale/isxdigit.3#3 integrate .. //depot/projects/gdb/lib/libc/locale/rune.c#2 integrate .. //depot/projects/gdb/lib/libc/locale/runetype.c#3 integrate .. //depot/projects/gdb/lib/libc/locale/setrunelocale.c#5 integrate .. //depot/projects/gdb/lib/libc/locale/tolower.c#3 integrate .. //depot/projects/gdb/lib/libc/locale/toupper.c#3 integrate .. //depot/projects/gdb/lib/libc/net/inet6_opt_init.3#2 integrate .. //depot/projects/gdb/lib/libc/net/inet6_rth_space.3#3 integrate .. //depot/projects/gdb/lib/libc/stdio/tmpnam.3#2 integrate .. //depot/projects/gdb/lib/libc/sys/accept.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/clock_gettime.2#3 integrate .. //depot/projects/gdb/lib/libc/sys/ioctl.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/jail.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/kqueue.2#3 integrate .. //depot/projects/gdb/lib/libc/sys/poll.2#3 integrate .. //depot/projects/gdb/lib/libc/sys/send.2#3 integrate .. //depot/projects/gdb/lib/libc/sys/sendfile.2#3 integrate .. //depot/projects/gdb/libexec/tftpd/tftpd.c#3 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#2 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/readme/article.sgml#3 integrate .. //depot/projects/gdb/sbin/ggate/ggatec/Makefile#4 integrate .. //depot/projects/gdb/sbin/ggate/ggatel/Makefile#4 integrate .. //depot/projects/gdb/sbin/ggate/shared/ggate.c#3 integrate .. //depot/projects/gdb/sbin/md5/md5.c#3 integrate .. //depot/projects/gdb/share/man/man3/pthread_attr_setcreatesuspend_np.3#3 integrate .. //depot/projects/gdb/share/man/man3/pthread_barrier_destroy.3#3 integrate .. //depot/projects/gdb/share/man/man3/queue.3#2 integrate .. //depot/projects/gdb/share/man/man3/tree.3#2 integrate .. //depot/projects/gdb/share/man/man4/Makefile#12 integrate .. //depot/projects/gdb/share/man/man4/ata.4#5 integrate .. //depot/projects/gdb/share/man/man4/ath.4#4 integrate .. //depot/projects/gdb/share/man/man4/axe.4#3 integrate .. //depot/projects/gdb/share/man/man4/ciss.4#4 integrate .. //depot/projects/gdb/share/man/man4/cm.4#1 branch .. //depot/projects/gdb/share/man/man4/esp.4#1 branch .. //depot/projects/gdb/share/man/man4/hatm.4#2 integrate .. //depot/projects/gdb/share/man/man4/hifn.4#2 integrate .. //depot/projects/gdb/share/man/man4/icmp.4#3 integrate .. //depot/projects/gdb/share/man/man4/ip.4#5 integrate .. //depot/projects/gdb/share/man/man4/led.4#4 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/cp.4#2 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/ctau.4#3 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/cx.4#6 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/el.4#2 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/pae.4#2 integrate .. //depot/projects/gdb/share/man/man4/netintro.4#4 integrate .. //depot/projects/gdb/share/man/man4/ng_atm.4#2 integrate .. //depot/projects/gdb/share/man/man4/ng_bluetooth.4#2 integrate .. //depot/projects/gdb/share/man/man4/ng_eiface.4#2 integrate .. //depot/projects/gdb/share/man/man4/ng_fec.4#1 branch .. //depot/projects/gdb/share/man/man4/ng_hci.4#2 integrate .. //depot/projects/gdb/share/man/man4/ng_l2cap.4#2 integrate .. //depot/projects/gdb/share/man/man4/ng_sscfu.4#2 integrate .. //depot/projects/gdb/share/man/man4/ng_uni.4#2 integrate .. //depot/projects/gdb/share/man/man4/nsp.4#2 integrate .. //depot/projects/gdb/share/man/man4/rc.4#1 branch .. //depot/projects/gdb/share/man/man4/sis.4#2 integrate .. //depot/projects/gdb/share/man/man4/snc.4#1 branch .. //depot/projects/gdb/share/man/man4/tcp.4#5 integrate .. //depot/projects/gdb/share/man/man4/uart.4#2 integrate .. //depot/projects/gdb/share/man/man4/utopia.4#2 integrate .. //depot/projects/gdb/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/gdb/share/man/man7/hier.7#7 integrate .. //depot/projects/gdb/share/man/man7/release.7#5 integrate .. //depot/projects/gdb/share/man/man8/diskless.8#4 integrate .. //depot/projects/gdb/share/man/man9/VOP_LISTEXTATTR.9#2 integrate .. //depot/projects/gdb/share/man/man9/bus_child_present.9#2 integrate .. //depot/projects/gdb/share/man/man9/bus_dma.9#3 integrate .. //depot/projects/gdb/share/man/man9/condvar.9#3 integrate .. //depot/projects/gdb/share/man/man9/cr_seeothergids.9#2 integrate .. //depot/projects/gdb/share/man/man9/cr_seeotheruids.9#2 integrate .. //depot/projects/gdb/share/man/man9/device_ids.9#2 integrate .. //depot/projects/gdb/share/man/man9/disk.9#3 integrate .. //depot/projects/gdb/share/man/man9/g_bio.9#4 integrate .. //depot/projects/gdb/share/man/man9/g_data.9#4 integrate .. //depot/projects/gdb/share/man/man9/malloc.9#4 integrate .. //depot/projects/gdb/share/man/man9/mbpool.9#2 integrate .. //depot/projects/gdb/share/man/man9/sleepqueue.9#4 integrate .. //depot/projects/gdb/share/man/man9/utopia.9#2 integrate .. //depot/projects/gdb/share/man/man9/vm_map_insert.9#2 integrate .. //depot/projects/gdb/share/mk/bsd.kmod.mk#3 integrate .. //depot/projects/gdb/sys/alpha/include/pmap.h#6 integrate .. //depot/projects/gdb/sys/amd64/amd64/pmap.c#17 integrate .. //depot/projects/gdb/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/gdb/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/gdb/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/gdb/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/gdb/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/gdb/sys/compat/svr4/svr4_ttold.c#2 integrate .. //depot/projects/gdb/sys/conf/NOTES#25 integrate .. //depot/projects/gdb/sys/conf/files#30 integrate .. //depot/projects/gdb/sys/conf/files.i386#18 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_fil.c#4 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/gdb/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/gdb/sys/contrib/pf/net/if_pflog.c#8 integrate .. //depot/projects/gdb/sys/contrib/pf/net/if_pfsync.c#8 integrate .. //depot/projects/gdb/sys/contrib/pf/net/pfvar.h#5 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#22 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pci.c#11 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pcib.c#8 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_resource.c#7 integrate .. //depot/projects/gdb/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/gdb/sys/dev/acpica/acpivar.h#17 integrate .. //depot/projects/gdb/sys/dev/ata/ata-all.c#10 integrate .. //depot/projects/gdb/sys/dev/ata/ata-chipset.c#11 integrate .. //depot/projects/gdb/sys/dev/ata/ata-disk.c#5 integrate .. //depot/projects/gdb/sys/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/gdb/sys/dev/ata/atapi-fd.c#4 integrate .. //depot/projects/gdb/sys/dev/ata/atapi-tape.c#5 integrate .. //depot/projects/gdb/sys/dev/ciss/ciss.c#13 integrate .. //depot/projects/gdb/sys/dev/ciss/cissreg.h#8 integrate .. //depot/projects/gdb/sys/dev/ciss/cissvar.h#4 integrate .. //depot/projects/gdb/sys/dev/cp/if_cp.c#6 integrate .. //depot/projects/gdb/sys/dev/ctau/if_ct.c#6 integrate .. //depot/projects/gdb/sys/dev/cx/if_cx.c#10 integrate .. //depot/projects/gdb/sys/dev/cy/cy.c#9 integrate .. //depot/projects/gdb/sys/dev/digi/digi.c#9 integrate .. //depot/projects/gdb/sys/dev/digi/digi.h#3 integrate .. //depot/projects/gdb/sys/dev/esp/esp_sbus.c#4 integrate .. //depot/projects/gdb/sys/dev/pccbb/pccbb.c#11 integrate .. //depot/projects/gdb/sys/dev/rp/rp.c#7 integrate .. //depot/projects/gdb/sys/dev/rp/rp_pci.c#4 integrate .. //depot/projects/gdb/sys/dev/rp/rpreg.h#3 integrate .. //depot/projects/gdb/sys/dev/si/si.c#7 integrate .. //depot/projects/gdb/sys/dev/sio/sio.c#15 integrate .. //depot/projects/gdb/sys/dev/sx/sx.c#6 integrate .. //depot/projects/gdb/sys/dev/uart/uart_tty.c#6 integrate .. //depot/projects/gdb/sys/dev/usb/ulpt.c#4 integrate .. //depot/projects/gdb/sys/dev/vinum/vinumio.c#6 integrate .. //depot/projects/gdb/sys/fs/fifofs/fifo_vnops.c#9 integrate .. //depot/projects/gdb/sys/fs/portalfs/portal_vnops.c#6 integrate .. //depot/projects/gdb/sys/fs/udf/udf.h#3 integrate .. //depot/projects/gdb/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/gdb/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/gdb/sys/geom/gate/g_gate.c#6 integrate .. //depot/projects/gdb/sys/geom/geom.h#5 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum_drive.c#4 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum_raid5.c#2 integrate .. //depot/projects/gdb/sys/i386/conf/NOTES#14 integrate .. //depot/projects/gdb/sys/i386/i386/bios.c#7 integrate .. //depot/projects/gdb/sys/i386/i386/io_apic.c#5 integrate .. //depot/projects/gdb/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/gdb/sys/i386/i386/mptable.c#6 integrate .. //depot/projects/gdb/sys/i386/i386/pmap.c#12 integrate .. //depot/projects/gdb/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/gdb/sys/i386/ibcs2/ibcs2_sysent.c#4 integrate .. //depot/projects/gdb/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/gdb/sys/i4b/driver/i4b_ing.c#3 integrate .. //depot/projects/gdb/sys/ia64/include/pmap.h#5 integrate .. //depot/projects/gdb/sys/kern/init_sysent.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_conf.c#8 integrate .. //depot/projects/gdb/sys/kern/kern_exit.c#12 integrate .. //depot/projects/gdb/sys/kern/kern_resource.c#8 integrate .. //depot/projects/gdb/sys/kern/kern_thread.c#17 integrate .. //depot/projects/gdb/sys/kern/kern_time.c#4 integrate .. //depot/projects/gdb/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/gdb/sys/kern/sched_ule.c#13 integrate .. //depot/projects/gdb/sys/kern/syscalls.c#6 integrate .. //depot/projects/gdb/sys/kern/syscalls.master#6 integrate .. //depot/projects/gdb/sys/kern/tty.c#10 integrate .. //depot/projects/gdb/sys/kern/tty_compat.c#5 integrate .. //depot/projects/gdb/sys/kern/tty_pty.c#11 integrate .. //depot/projects/gdb/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/gdb/sys/kern/uipc_syscalls.c#16 integrate .. //depot/projects/gdb/sys/kern/vfs_syscalls.c#14 integrate .. //depot/projects/gdb/sys/modules/Makefile#14 integrate .. //depot/projects/gdb/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/cx/Makefile#2 integrate .. //depot/projects/gdb/sys/net/if.c#11 integrate .. //depot/projects/gdb/sys/net/if.h#5 integrate .. //depot/projects/gdb/sys/net/if_clone.c#1 branch .. //depot/projects/gdb/sys/net/if_clone.h#1 branch .. //depot/projects/gdb/sys/net/if_disc.c#4 integrate .. //depot/projects/gdb/sys/net/if_faith.c#6 integrate .. //depot/projects/gdb/sys/net/if_gif.c#6 integrate .. //depot/projects/gdb/sys/net/if_gre.c#6 integrate .. //depot/projects/gdb/sys/net/if_loop.c#5 integrate .. //depot/projects/gdb/sys/net/if_ppp.c#6 integrate .. //depot/projects/gdb/sys/net/if_stf.c#7 integrate .. //depot/projects/gdb/sys/net/if_var.h#14 integrate .. //depot/projects/gdb/sys/net/if_vlan.c#7 integrate .. //depot/projects/gdb/sys/netgraph/ng_bpf.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_bridge.c#4 integrate .. //depot/projects/gdb/sys/netinet/ip_divert.c#8 integrate .. //depot/projects/gdb/sys/netipsec/key.c#5 integrate .. //depot/projects/gdb/sys/netipsec/keysock.c#2 integrate .. //depot/projects/gdb/sys/netipx/ipx.h#2 integrate .. //depot/projects/gdb/sys/pc98/i386/machdep.c#9 integrate .. //depot/projects/gdb/sys/pc98/pc98/sio.c#13 integrate .. //depot/projects/gdb/sys/pci/if_mn.c#5 integrate .. //depot/projects/gdb/sys/sys/imgact_aout.h#4 integrate .. //depot/projects/gdb/sys/sys/ioctl_compat.h#3 integrate .. //depot/projects/gdb/sys/sys/param.h#16 integrate .. //depot/projects/gdb/sys/sys/syscall.h#6 integrate .. //depot/projects/gdb/sys/sys/syscall.mk#6 integrate .. //depot/projects/gdb/sys/sys/sysproto.h#6 integrate .. //depot/projects/gdb/sys/sys/tty.h#8 integrate .. //depot/projects/gdb/sys/sys/ttychars.h#3 integrate .. //depot/projects/gdb/sys/sys/ttycom.h#5 integrate .. //depot/projects/gdb/sys/sys/ttydev.h#3 integrate .. //depot/projects/gdb/sys/sys/user.h#8 integrate .. //depot/projects/gdb/sys/vm/swap_pager.c#7 integrate .. //depot/projects/gdb/tools/tools/tinderbox/tbmaster.1#5 integrate .. //depot/projects/gdb/tools/tools/tinderbox/tbmaster.pl#6 integrate .. //depot/projects/gdb/tools/tools/tinderbox/tinderbox.1#4 integrate .. //depot/projects/gdb/tools/tools/tinderbox/tinderbox.pl#7 integrate .. //depot/projects/gdb/usr.bin/mklocale/yacc.y#2 integrate .. //depot/projects/gdb/usr.sbin/btxld/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/btxld/btxld.c#2 integrate .. //depot/projects/gdb/usr.sbin/btxld/elfh.c#2 integrate .. //depot/projects/gdb/usr.sbin/crunch/crunchide/exec_aout.c#3 integrate .. //depot/projects/gdb/usr.sbin/kgzip/elfhdr.c#2 integrate .. //depot/projects/gdb/usr.sbin/kgzip/endian.h#2 delete .. //depot/projects/gdb/usr.sbin/kgzip/i386_a.out.h#2 delete .. //depot/projects/gdb/usr.sbin/kgzip/kgzcmp.c#2 integrate .. //depot/projects/gdb/usr.sbin/kgzip/kgzld.c#2 integrate .. //depot/projects/gdb/usr.sbin/rrenumd/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/rtadvd/Makefile#2 integrate Differences ... ==== //depot/projects/gdb/UPDATING#16 (text+ko) ==== @@ -17,6 +17,30 @@ developers choose to disable these features on build machines to maximize performance. +20040623: + pf was updated to OpenBSD-stable 3.5 and pflogd(8) is priviledge + separated now. It uses the newly created "_pflogd" user/group + combination. If you plan to use pflogd(8) make sure to run + mergemaster -p or install the "_pflogd" user and group manually. + +20040622: + Network interface cloning has been overhauled. This change will + require a recompile of modules using cloning and modification of + external ones to the new API. __FreeBSD_version has been bumped + to 502119 to mark this change. Additionally, users creating + stf(4) interfaces via "ifconfig stf" will need to update their + scripts as this will create an interface named "stf" instead of + "stf0" and ifconfig will not print "stf0" to stdout. + +20040621: + On 20040524, the /etc/rc.d/nsswitch script was modified to + automatically create /etc/nsswitch.conf on startup if it did + not already exist. Unfortunately, an error in the man page + was carried over to the script, resulting in incorrect + nsswitch settings. The simplest remedy is to remove both + /etc/nsswitch.conf and /etc/host.conf; they will be recreated + during the next reboot. + 20040614: The return value of sema_timedwait(9) has been changed to make it consistent with cv_timedwait(9). Be sure to recompile @@ -45,7 +69,7 @@ ipfw(8) is recompiled. 20040420: - Due to changes in the callout ABI, kernels compiled after this + Due to changes in the callout ABI, kernels compiled after this date may be incompatible with kernel modules compiled prior to 20040406. @@ -227,7 +251,7 @@ If ACPI is not being used and hyperthreading is enabled in the BIOS, logical CPUs can be enabled by building a custom kernel with the option MPTABLE_FORCE_HTT enabled. - + 20031103: The i386 APIC_IO kernel option has been replaced by 'device apic'. The ACPI module has also been temporarily @@ -260,7 +284,7 @@ 20030923: Fix a bug in arplookup(), whereby a hostile party on a locally - attached network could exhaust kernel memory, and cause a system + attached network could exhaust kernel memory, and cause a system panic, by sending a flood of spoofed ARP requests. See FreeBSD-SA-03:14.arp. @@ -282,7 +306,7 @@ may or may not exist on your system. 20030824: - ATAng has been committed. You need to build world as sys/ata.h + ATAng has been committed. You need to build world as sys/ata.h has changed, and userland atacontrol depends on it. If you use ATA SW raids you need "device ataraid" in your kernel config file, as it is no longer pulled in automatically. @@ -436,7 +460,7 @@ which FreeBSD's GCC maintainers were not aware of relative to previous versions of FreeBSD. We have gone back to the ABI for now, and any code compiled which is required to interoperate with other code (not - built at the same time) returning structs or unions should be + built at the same time) returning structs or unions should be rebuilt. 20021216: @@ -508,7 +532,7 @@ 20020702: Problems with libc_r clients like KDE and GNOME have been resolved. - There are still some minor problems with some signals but the + There are still some minor problems with some signals but the system is stable enough for general use again. SMP is less so than UP but each can successfully complete multiple buildworlds. Libkvm needs to be recompiled due to KSE. @@ -622,7 +646,7 @@ 20011207: Daily security checks have been split out to use the periodic(8) scripts. Some change in configuration may be necessary. Please - see + see http://www.freebsd.org/cgi/mid.cgi?db=mid&id=<20011207155805.R8975@blossom.cjclark.org> for details. @@ -733,18 +757,18 @@ have been rectified around this date. 20010823: - named now runs as user bind and group bind rather than as - root. If named_enable is set to YES in /etc/rc.conf, ensure - that user bind is available in /etc/passwd (using vipw(8)) - and that group bind is available in /etc/group. Also make - sure that user or group bind has read (and not write) - permission for your name server configuration and that it - has read and write permission for your slave zone files and + named now runs as user bind and group bind rather than as + root. If named_enable is set to YES in /etc/rc.conf, ensure + that user bind is available in /etc/passwd (using vipw(8)) + and that group bind is available in /etc/group. Also make + sure that user or group bind has read (and not write) + permission for your name server configuration and that it + has read and write permission for your slave zone files and directory. - - If you wish to continue to run named as root (a less secure + + If you wish to continue to run named as root (a less secure alternative), add a line to /etc/rc.conf saying - + named_flags= 20010709: @@ -998,7 +1022,7 @@ Important new FreeBSD-version stuff: PAM support has been worked in, partially from the "Unix" OpenSSH version. This requires adding the following in pam.conf: - + sshd auth sufficient pam_skey.so sshd auth required pam_unix.so try_first_pass sshd session required pam_permit.so @@ -1127,7 +1151,7 @@ 20000904: A new issue with the sendmail upgrade has come to light. - /etc/aliases has moved to /etc/mail/aliases. Mergemaster will + /etc/aliases has moved to /etc/mail/aliases. Mergemaster will incorrectly install the default aliases in /etc/mail rather than move the old one from /etc. So you'll need to manually move the file, create a symbolic link, remove the old /etc/aliases.db and @@ -1203,7 +1227,7 @@ to /MYKERNEL. 20000711: - If you use CVSUP or CTM to get CVS trees, AND you used to get + If you use CVSUP or CTM to get CVS trees, AND you used to get the old crypto files from internat.freebsd.org AND you check out files from the CVS tree with the cvs command, please read http://people.freebsd.org/~imp/internat.txt @@ -1353,7 +1377,7 @@ is now available. 20000502: - Modules have been disconnected from the buildworld tree and + Modules have been disconnected from the buildworld tree and connected to the kernel building instead. 20000427: @@ -1442,7 +1466,7 @@ cd ../compile/KERNEL_NAME_HERE make depend make - make install + make install If this fails, go to the "To build a kernel" section. @@ -1488,10 +1512,10 @@ - + - To upgrade in-place from 4.x-stable to current + To upgrade in-place from 4.x-stable to current ---------------------------------------------- # 5.x uses more space than 4.x. Also, the location of kernel # modules has changed. If you are installing 5.0 onto a 4.x @@ -1501,7 +1525,7 @@ # the / partition, you may want to completely remove all its content # before upgrading, as this can be a common source of shortage of # space on /. - + [7] make buildworld [9] @@ -1623,4 +1647,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.312 2004/06/14 18:19:04 jdp Exp $ +$FreeBSD: src/UPDATING,v 1.317 2004/06/23 01:32:28 mlaier Exp $ ==== //depot/projects/gdb/bin/ls/cmp.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.13 2004/04/06 20:06:47 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.15 2004/06/23 08:26:31 dwmalone Exp $"); #include @@ -51,47 +51,91 @@ int namecmp(const FTSENT *a, const FTSENT *b) { + return (strcoll(a->fts_name, b->fts_name)); } int revnamecmp(const FTSENT *a, const FTSENT *b) { + return (strcoll(b->fts_name, a->fts_name)); } int modcmp(const FTSENT *a, const FTSENT *b) { - return (b->fts_statp->st_mtime - a->fts_statp->st_mtime); + + if (b->fts_statp->st_mtimespec.tv_sec > + a->fts_statp->st_mtimespec.tv_sec) + return (1); + if (b->fts_statp->st_mtimespec.tv_sec < + a->fts_statp->st_mtimespec.tv_sec) + return (-1); + if (b->fts_statp->st_mtimespec.tv_nsec > + a->fts_statp->st_mtimespec.tv_nsec) + return (1); + if (b->fts_statp->st_mtimespec.tv_nsec < + a->fts_statp->st_mtimespec.tv_nsec) + return (-1); + return (strcoll(a->fts_name, b->fts_name)); } int revmodcmp(const FTSENT *a, const FTSENT *b) { - return (a->fts_statp->st_mtime - b->fts_statp->st_mtime); + + return (modcmp(b, a)); } int acccmp(const FTSENT *a, const FTSENT *b) { - return (b->fts_statp->st_atime - a->fts_statp->st_atime); + + if (b->fts_statp->st_atimespec.tv_sec > + a->fts_statp->st_atimespec.tv_sec) + return (1); + if (b->fts_statp->st_atimespec.tv_sec < + a->fts_statp->st_atimespec.tv_sec) + return (-1); + if (b->fts_statp->st_atimespec.tv_nsec > + a->fts_statp->st_atimespec.tv_nsec) + return (1); + if (b->fts_statp->st_atimespec.tv_nsec < + a->fts_statp->st_atimespec.tv_nsec) + return (-1); + return (strcoll(a->fts_name, b->fts_name)); } int revacccmp(const FTSENT *a, const FTSENT *b) { - return (a->fts_statp->st_atime - b->fts_statp->st_atime); + + return (acccmp(b, a)); } int statcmp(const FTSENT *a, const FTSENT *b) { - return (b->fts_statp->st_ctime - a->fts_statp->st_ctime); + + if (b->fts_statp->st_ctimespec.tv_sec > + a->fts_statp->st_ctimespec.tv_sec) + return (1); + if (b->fts_statp->st_ctimespec.tv_sec < + a->fts_statp->st_ctimespec.tv_sec) + return (-1); + if (b->fts_statp->st_ctimespec.tv_nsec > + a->fts_statp->st_ctimespec.tv_nsec) + return (1); + if (b->fts_statp->st_ctimespec.tv_nsec < + a->fts_statp->st_ctimespec.tv_nsec) + return (-1); + return (strcoll(a->fts_name, b->fts_name)); } int revstatcmp(const FTSENT *a, const FTSENT *b) { - return (a->fts_statp->st_ctime - b->fts_statp->st_ctime); + + return (statcmp(b, a)); } ==== //depot/projects/gdb/bin/ps/extern.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.33 2004/06/20 23:40:54 gad Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.36 2004/06/23 11:56:57 gad Exp $ */ struct kinfo; @@ -82,6 +82,7 @@ void tname(KINFO *, VARENT *); void ucomm(KINFO *, VARENT *); void uname(KINFO *, VARENT *); +void upr(KINFO *, VARENT *); void vsize(KINFO *, VARENT *); void wchan(KINFO *, VARENT *); __END_DECLS ==== //depot/projects/gdb/bin/ps/fmt.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.30 2004/04/06 20:06:49 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.34 2004/06/22 02:18:29 gad Exp $"); #include #include @@ -123,10 +123,10 @@ if (cp == NULL) errx(1, "malloc failed"); if (ap == NULL) - sprintf(cp, " (%.*s)", (int)maxlen, cmd); + sprintf(cp, "[%.*s]", (int)maxlen, cmd); else if (strncmp(cmdpart(argv[0]), cmd, maxlen) != 0) sprintf(cp, "%s (%.*s)", ap, (int)maxlen, cmd); else - (void) strcpy(cp, ap); + strcpy(cp, ap); return (cp); } ==== //depot/projects/gdb/bin/ps/keyword.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.68 2004/06/20 23:40:54 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.69 2004/06/23 11:56:57 gad Exp $"); #include #include @@ -197,8 +197,7 @@ 0}, {"uid", "UID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_uid), UINT, UIDFMT, 0}, - {"upr", "UPR", NULL, 0, kvar, NULL, 3, KOFF(ki_pri.pri_user), UCHAR, - "d", 0}, + {"upr", "UPR", NULL, 0, upr, NULL, 3, 0, CHAR, NULL, 0}, {"uprocp", "UPROCP", NULL, 0, kvar, NULL, 8, KOFF(ki_paddr), KPTR, "lx", 0}, {"user", "USER", NULL, LJUST|DSIZ, uname, s_uname, USERLEN, 0, CHAR, ==== //depot/projects/gdb/bin/ps/print.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.87 2004/06/20 23:40:54 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.90 2004/06/23 12:18:36 gad Exp $"); #include #include @@ -180,7 +180,10 @@ VAR *v; v = ve->var; - (void)printf("%-*s", v->width, k->ki_p->ki_comm); + if (ve->next == NULL) /* last field, don't pad */ + (void)printf("%s", k->ki_p->ki_comm); + else + (void)printf("%-*s", v->width, k->ki_p->ki_comm); } void @@ -265,14 +268,26 @@ (void)printf("%-*s", v->width, buf); } +#define scalepri(x) ((x) - PZERO) + void pri(KINFO *k, VARENT *ve) { VAR *v; v = ve->var; - (void)printf("%*d", v->width, k->ki_p->ki_pri.pri_level - PZERO); + (void)printf("%*d", v->width, scalepri(k->ki_p->ki_pri.pri_level)); +} + +void +upr(KINFO *k, VARENT *ve) +{ + VAR *v; + + v = ve->var; + (void)printf("%*d", v->width, scalepri(k->ki_p->ki_pri.pri_user)); } +#undef scalepri void uname(KINFO *k, VARENT *ve) @@ -509,7 +524,7 @@ if (decimal_point == '\0') decimal_point = localeconv()->decimal_point[0]; v = ve->var; - if (k->ki_p->ki_stat == SZOMB || !k->ki_valid) { + if (!k->ki_valid) { secs = 0; psecs = 0; } else { ==== //depot/projects/gdb/bin/ps/ps.1#11 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.78 2004/05/25 14:05:25 gad Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.79 2004/06/22 01:59:54 gad Exp $ .\" .Dd March 27, 2004 .Dt PS 1 @@ -414,6 +414,9 @@ and a process which is blocked while trying to exit is listed as .Dq Li . +If the command vector cannot be located (usually because it has not +been set, as is the case of system processes and/or kernel threads) +the command name is printed within square brackets. The .Nm utility ==== //depot/projects/gdb/bin/ps/ps.c#13 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.99 2004/06/20 21:25:10 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.101 2004/06/23 11:40:56 gad Exp $"); #include #include @@ -1025,7 +1025,9 @@ DIFF_RETURN(ka, kb, ki_p->ki_tdev); } + /* PID's and TID's (threads) are sorted in ascending order. */ DIFF_RETURN(ka, kb, ki_p->ki_pid); + DIFF_RETURN(ka, kb, ki_p->ki_tid); return (0); } #undef DIFF_RETURN @@ -1133,7 +1135,7 @@ static void usage(void) { -#define SINGLE_OPTS "[-aC" OPT_LAZY_f "HhjlmrSTuvwXxZ]" +#define SINGLE_OPTS "[-aCc" OPT_LAZY_f "HhjlmrSTuvwXxZ]" (void)fprintf(stderr, "%s\n%s\n%s\n%s\n", "usage: ps " SINGLE_OPTS " [-G gid[,gid]] [-O|o fmt]", ==== //depot/projects/gdb/contrib/ipfilter/BSD/kupgrade#2 (text+ko) ==== @@ -16,6 +16,9 @@ echo "Copying /usr/include/osreldate.h to /sys/sys" cp /usr/include/osreldate.h /sys/sys fi + if [ -f /sys/contrib/ipfilter/netinet/mlfk_ipl.c ] ; then + /bin/cp mlfk_ipl.c /sys/contrib/ipfilter/netinet/ + fi fi archdir="/sys/arch/$karch" ipfdir=/sys/netinet ==== //depot/projects/gdb/contrib/ipfilter/HISTORY#2 (text+ko) ==== @@ -22,6 +22,87 @@ # and especially those who have found the time to port IP Filter to new # platforms. # +3.4.35 21/6/2004 - Released + +some cases of ICMP checksum alteration were wrong + +block packets that fail to create state table entries + +correctly handle all return values from ip_natout() when fastrouting + +ipmon was not correctly calculating the length of the IPv6 packet (excluded +ipv6 header length) + +3.4.34 20/4/2004 - Released + +correct the ICMP packet checksum fixing up when processing ICMP errors for NAT + +various changes to ipsend for sending packets with ipv4 options + +look for ipmon's pidfile in /var/run and /etc/opt/ipf in Solaris' init script + +only allow non-fragmented packets to influence whether or not a logged +packet is the same as the one logged before. + +make "ipfstat -f" output more informative + +compatibility for openbsd byte order changes to ip_off/ip_len + +disallow "freebsd" as a make target (encourages people to do the wrong thing) + +3.4.33 15/12/2003 - Released + +pass on messages moving through ipfilter when it is unloading itself on Solaris + +add disabling of auto-detach when the module attaches on Solaris + +compatibility patches for 'struct ifnet' changes on FreeBSD + +implement a maximum for the number of entries in the NAT table (NAT_TABLE_MAX +and ipf_nattable_max) + +fix ipfstat -A + +frsynclist() wasn't paying attention to all the places where interface +names are, like it should. + +fix where packet header pointers are pointing to after doing an ipf_pullup + +fix comparing ICMP packets with established TCP state where only 8 bytes +of header are returned in the ICMP error. + +3.4.32 18/6/2003 - Released + +fix up the behaviour of ipfs + +make parsing errors in ipf/ipnat return an error rather than return +indicating success. + +window scaling patch + +make ipfstat work as a set{g,u}id thing - gave up privs before opening +/dev/ipl + +checksum adjustment corrections for ICMP & NAT + +attempt to always get an mbuf full of data through pullup if possible + +Fix bug with NAT and fragments causing system to crash + +Add patches for OpenBSD 3.3 + +stop LKM locking up the machine on modern NetBSD(?) + +allow timeouts in NAT rules to over-ride fr_defnatage if LARGE_NAT is defined + +Locking patches for IRIX 6.5 from SGI. + +fix bug in synchronising state sessions where all interfaces were invalidated + +fix bug in openbsd 3.2 bridge diffs + +fix bug parsing port comparisons in proxy rules + 3.4.31 7/12/2002 - Released Solaris 10 compatibility ==== //depot/projects/gdb/contrib/ipfilter/Makefile#2 (text+ko) ==== @@ -3,7 +3,7 @@ # # See the IPFILTER.LICENCE file for details on licencing. # -# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.2 2003/04/05 09:25:19 darrenr Exp $ +# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.3 2004/06/21 22:53:02 darrenr Exp $ # $Id: Makefile,v 2.11.2.15 2002/12/02 04:22:56 darrenr Exp $ # BINDEST=/usr/local/bin @@ -85,7 +85,7 @@ @echo "solaris - auto-selects SunOS4.1.x/Solaris 2.3-6/Solaris2.4-6x86" @echo "netbsd - compile for NetBSD" @echo "openbsd - compile for OpenBSD" - @echo "freebsd - compile for FreeBSD 2.0, 2.1 or earlier" + @echo "freebsd20 - compile for FreeBSD 2.0, 2.1 or earlier" @echo "freebsd22 - compile for FreeBSD-2.2 or greater" @echo "freebsd3 - compile for FreeBSD-3.x" @echo "freebsd4 - compile for FreeBSD-4.x" @@ -124,7 +124,7 @@ else \ ln -s `uname -v|sed -e 's@^.*:\(/[^: ]*\).*@\1@'`/ioconf.h BSD/$(CPU) ; \ fi - make freebsd + make freebsd20 freebsd4: include if [ x$INET6 = x ] ; then \ @@ -151,7 +151,7 @@ (cd BSD/$(CPUDIR); make build TOP=../.. $(MFLAGS) 'DLKM=-D_LKM' "ML=mln_ipl.c"; cd ..) (cd BSD/$(CPUDIR); make -f Makefile.ipsend TOP=../.. $(MFLAGS); cd ..) -freebsd freebsd20 freebsd21: include +freebsd20 freebsd21: include make setup "TARGOS=BSD" "CPUDIR=$(CPUDIR)" (cd BSD/$(CPUDIR); make build TOP=../.. $(MFLAGS) "ML=mlf_ipl.c"; cd ..) (cd BSD/$(CPUDIR); make -f Makefile.ipsend TOP=../.. $(MFLAGS); cd ..) @@ -289,3 +289,27 @@ exit 1; \ fi -@echo make ok + +test-solaris test-sunos4 test-sunos5: solaris + (cd test && make clean && make) + +test-freebsd: freebsd + (cd test && make clean && make) + +test-freebsd22: freebsd22 + (cd test && make clean && make) + +test-freebsd3: freebsd3 + (cd test && make clean && make) + +test-freebsd4: freebsd4 + (cd test && make clean && make) + +test-netbsd: netbsd + (cd test && make clean && make) + +test-openbsd: openbsd + (cd test && make clean && make) + +test-irix: irix + (cd test && make clean && make) ==== //depot/projects/gdb/contrib/ipfilter/common.c#2 (text+ko) ==== @@ -263,7 +263,19 @@ return 0; if (!strcasecmp(**seg, "port") && *(*seg + 1) && *(*seg + 2)) { (*seg)++; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 23 21:38:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8B9616A4D0; Wed, 23 Jun 2004 21:38:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 92D0E16A4CE for ; Wed, 23 Jun 2004 21:38:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AE1443D3F for ; Wed, 23 Jun 2004 21:38:40 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5NLc7Uv051112 for ; Wed, 23 Jun 2004 21:38:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5NLc6nD051109 for perforce@freebsd.org; Wed, 23 Jun 2004 21:38:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 23 Jun 2004 21:38:06 GMT Message-Id: <200406232138.i5NLc6nD051109@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 Subject: PERFORCE change 55641 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2004 21:38:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=55641 Change 55641 by rwatson@rwatson_tislabs on 2004/06/23 21:37:33 Integ netperf_socket, including TCP SACK support. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/include/pmap.h#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#17 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_util.c#3 integrate .. //depot/projects/netperf_socket/sys/conf/files#29 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#17 integrate .. //depot/projects/netperf_socket/sys/conf/options#15 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#26 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_resource.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#16 integrate .. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ulpt.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/fifofs/fifo_vnops.c#10 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#20 integrate .. //depot/projects/netperf_socket/sys/i386/i386/bios.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/i386/io_apic.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mptable.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/netperf_socket/sys/ia64/include/pmap.h#5 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#20 integrate .. //depot/projects/netperf_socket/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/cx/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_bpf.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp.h#4 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#12 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_sack.c#1 branch .. //depot/projects/netperf_socket/sys/netinet/tcp_seq.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#10 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#9 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/netperf_socket/sys/netipsec/keysock.c#2 integrate .. //depot/projects/netperf_socket/sys/sys/tty.h#7 integrate .. //depot/projects/netperf_socket/sys/vm/swap_pager.c#5 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/include/pmap.h#6 (text+ko) ==== @@ -39,7 +39,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.30 2004/04/11 05:08:26 alc Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.31 2004/06/23 08:06:52 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -178,11 +178,6 @@ LIST_ENTRY(pmap) pm_list; /* list of all pmaps. */ }; -#define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) - -#define PM_FLAG_LOCKED 0x1 -#define PM_FLAG_WANTED 0x2 - typedef struct pmap *pmap_t; #ifdef _KERNEL @@ -210,6 +205,8 @@ struct vmspace; +#define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) + vm_offset_t pmap_steal_memory(vm_size_t); void pmap_bootstrap(vm_offset_t, u_int); void pmap_kenter(vm_offset_t va, vm_offset_t pa); ==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#17 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.478 2004/06/20 20:57:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.479 2004/06/23 04:37:14 alc Exp $"); /* * Manages physical address maps. @@ -801,18 +801,34 @@ vm_page_t pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { - vm_paddr_t pa; + pd_entry_t pde, *pdep; + pt_entry_t pte; vm_page_t m; m = NULL; - mtx_lock(&Giant); - if ((pa = pmap_extract(pmap, va)) != 0) { - m = PHYS_TO_VM_PAGE(pa); - vm_page_lock_queues(); - vm_page_hold(m); - vm_page_unlock_queues(); + if (pmap == NULL) + return (m); + vm_page_lock_queues(); + PMAP_LOCK(pmap); + pdep = pmap_pde(pmap, va); + if (pdep != NULL && (pde = *pdep)) { + if (pde & PG_PS) { + if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) { + m = PHYS_TO_VM_PAGE((pde & ~PDRMASK) | + (va & PDRMASK)); + vm_page_hold(m); + } + } else { + pte = *pmap_pte(pmap, va); + if ((pte & PG_V) && + ((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) { + m = PHYS_TO_VM_PAGE(pte & PG_FRAME); + vm_page_hold(m); + } + } } - mtx_unlock(&Giant); + vm_page_unlock_queues(); + PMAP_UNLOCK(pmap); return (m); } ==== //depot/projects/netperf_socket/sys/compat/linux/linux_util.c#3 (text+ko) ==== @@ -30,13 +30,15 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.25 2004/06/22 04:22:34 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.26 2004/06/23 06:35:43 bde Exp $"); #include -#include +#include +#include +#include #include #include -#include +#include #include #include ==== //depot/projects/netperf_socket/sys/conf/files#29 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.907 2004/06/22 20:13:24 brooks Exp $ +# $FreeBSD: src/sys/conf/files,v 1.908 2004/06/23 21:04:36 ps Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1465,6 +1465,7 @@ netinet/tcp_hostcache.c optional inet netinet/tcp_input.c optional inet netinet/tcp_output.c optional inet +netinet/tcp_sack.c optional inet netinet/tcp_subr.c optional inet netinet/tcp_syncache.c optional inet netinet/tcp_timer.c optional inet ==== //depot/projects/netperf_socket/sys/conf/files.i386#17 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.493 2004/05/26 07:43:40 bde Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.494 2004/06/23 17:33:24 brooks Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -272,7 +272,7 @@ i386/isa/elcr.c standard i386/isa/elink.c optional ep i386/isa/elink.c optional ie -i386/isa/if_el.c count el +i386/isa/if_el.c optional el i386/isa/isa.c optional isa i386/isa/isa_dma.c optional isa i386/isa/mse.c optional mse ==== //depot/projects/netperf_socket/sys/conf/options#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.453 2004/06/13 17:29:06 mlaier Exp $ +# $FreeBSD: src/sys/conf/options,v 1.454 2004/06/23 21:04:37 ps Exp $ # # On the handling of kernel options # @@ -354,6 +354,7 @@ SLIP_IFF_OPTS opt_slip.h TCPDEBUG TCP_SIGNATURE opt_inet.h +TCP_SACK_DEBUG opt_tcp_sack.h TCP_DROP_SYNFIN opt_tcp_input.h XBONEHACK ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#26 (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/dev/acpica/acpi.c,v 1.163 2004/06/16 09:46:35 phk Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.164 2004/06/23 17:21:02 jhb Exp $ */ #include "opt_acpi.h" @@ -846,12 +846,12 @@ acpi_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + ACPI_RESOURCE ares; struct acpi_device *ad = device_get_ivars(child); struct resource_list *rl = &ad->ad_rl; struct resource_list_entry *rle; struct resource *res; struct rman *rm; - int needactivate; /* * If this is an allocation of the "default" range for a given RID, and @@ -870,41 +870,56 @@ /* If we don't manage this address, pass the request up to the parent. */ rle = acpi_sysres_find(type, start); if (rle == NULL) { - return (BUS_ALLOC_RESOURCE(device_get_parent(bus), child, type, rid, - start, end, count, flags)); - } + res = BUS_ALLOC_RESOURCE(device_get_parent(bus), child, type, rid, + start, end, count, flags); + } else { + + /* We only handle memory and IO resources through rman. */ + switch (type) { + case SYS_RES_IOPORT: + rm = &acpi_rman_io; + break; + case SYS_RES_MEMORY: + rm = &acpi_rman_mem; + break; + default: + panic("acpi_alloc_resource: invalid res type %d", type); + } - /* We only handle memory and IO resources through rman. */ - switch (type) { - case SYS_RES_IOPORT: - rm = &acpi_rman_io; - break; - case SYS_RES_MEMORY: - rm = &acpi_rman_mem; - break; - default: - panic("acpi_alloc_resource: invalid res type %d", type); - } + /* If we do know it, allocate it from the local pool. */ + res = rman_reserve_resource(rm, start, end, count, flags & ~RF_ACTIVE, + child); + if (res == NULL) + return (NULL); - /* If we do know it, allocate it from the local pool. */ - needactivate = flags & RF_ACTIVE; - flags &= ~RF_ACTIVE; - res = rman_reserve_resource(rm, start, end, count, flags, child); - if (res == NULL) - return (NULL); + /* Copy the bus tag from the pre-allocated resource. */ + rman_set_bustag(res, rman_get_bustag(rle->res)); + if (type == SYS_RES_IOPORT) + rman_set_bushandle(res, res->r_start); - /* Copy the bus tag from the pre-allocated resource. */ - rman_set_bustag(res, rman_get_bustag(rle->res)); - if (type == SYS_RES_IOPORT) - rman_set_bushandle(res, res->r_start); + /* If requested, activate the resource using the parent's method. */ + if (flags & RF_ACTIVE) + if (bus_activate_resource(child, type, *rid, res) != 0) { + rman_release_resource(res); + return (NULL); + } + } - /* If requested, activate the resource using the parent's method. */ - if (needactivate) - if (bus_activate_resource(child, type, *rid, res) != 0) { - rman_release_resource(res); - return (NULL); + if (res != NULL && device_get_parent(child) == bus) + switch (type) { + case SYS_RES_IRQ: + /* + * Since bus_config_intr() takes immediate effect, we cannot + * configure the interrupt associated with a device when we + * parse the resources but have to defer it until a driver + * actually allocates the interrupt via bus_alloc_resource(). + * + * XXX: Should we handle the lookup failing? + */ + if (ACPI_SUCCESS(acpi_lookup_irq_resource(child, *rid, res, &ares))) + acpi_config_intr(child, &ares); + break; } - return (res); } ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.18 2004/06/07 21:44:01 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.19 2004/06/23 15:08:40 jhb Exp $"); #include #include @@ -56,18 +56,17 @@ ACPI_HANDLE ap_handle; }; +static int acpi_pci_attach(device_t dev); +static int acpi_pci_child_location_str_method(device_t cbdev, + device_t child, char *buf, size_t buflen); static int acpi_pci_probe(device_t dev); -static int acpi_pci_attach(device_t dev); static int acpi_pci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result); -static int acpi_pci_child_location_str_method(device_t cbdev, - device_t child, char *buf, size_t buflen); - - +static ACPI_STATUS acpi_pci_save_handle(ACPI_HANDLE handle, UINT32 level, + void *context, void **status); static int acpi_pci_set_powerstate_method(device_t dev, device_t child, int state); -static ACPI_STATUS acpi_pci_save_handle(ACPI_HANDLE handle, UINT32 level, - void *context, void **status); +static void acpi_pci_update_device(ACPI_HANDLE handle, device_t pci_child); static device_method_t acpi_pci_methods[] = { /* Device interface */ @@ -205,6 +204,40 @@ return (0); } +static void +acpi_pci_update_device(ACPI_HANDLE handle, device_t pci_child) +{ + ACPI_STATUS status; + device_t child; + + /* + * Lookup and remove the unused device that acpi0 creates when it walks + * the namespace creating devices. + */ + child = acpi_get_device(handle); + if (child != NULL) { + KASSERT(!device_is_alive(child), ("%s: deleting alive child %s", + __func__, device_get_nameunit(child))); + KASSERT(device_get_parent(child) == + devclass_get_device(devclass_find("acpi"), 0), + ("%s: child (%s)'s parent is not acpi0", __func__, + acpi_name(handle))); + device_delete_child(device_get_parent(child), child); + } + + /* + * Update ACPI-CA to use the PCI enumerated device_t for this handle. + */ + status = AcpiDetachData(handle, acpi_fake_objhandler); + if (ACPI_FAILURE(status)) + printf("WARNING: Unable to detach object data from %s - %s\n", + acpi_name(handle), AcpiFormatException(status)); + status = AcpiAttachData(handle, acpi_fake_objhandler, child); + if (ACPI_FAILURE(status)) + printf("WARNING: Unable to attach object data to %s - %s\n", + acpi_name(handle), AcpiFormatException(status)); +} + static ACPI_STATUS acpi_pci_save_handle(ACPI_HANDLE handle, UINT32 level, void *context, void **status) @@ -227,6 +260,7 @@ if (dinfo->ap_dinfo.cfg.func == func && dinfo->ap_dinfo.cfg.slot == slot) { dinfo->ap_handle = handle; + acpi_pci_update_device(handle, devlist[i]); free(devlist, M_TEMP); return_ACPI_STATUS (AE_OK); } ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.44 2004/06/07 17:36:22 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.45 2004/06/23 17:21:02 jhb Exp $"); #include "opt_acpi.h" #include @@ -121,6 +121,7 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); + crsres = NULL; buf.Pointer = NULL; crsbuf.Pointer = NULL; prsbuf.Pointer = NULL; @@ -348,6 +349,7 @@ /* XXX Data.Irq and Data.ExtendedIrq are implicitly structure-copied. */ crsbuf.Pointer = NULL; + crsres = NULL; if (prsres->Id == ACPI_RSTYPE_IRQ) { resbuf.Id = ACPI_RSTYPE_IRQ; resbuf.Length = ACPI_SIZEOF_RESOURCE(ACPI_RESOURCE_IRQ); @@ -378,6 +380,7 @@ AcpiFormatException(status)); goto out; } + crsres = &resbuf; /* Return the interrupt we just routed. */ device_printf(pcib, "slot %d INT%c routed to irq %d via %s\n", @@ -386,6 +389,8 @@ interrupt = Interrupts[0]; out: + if (PCI_INTERRUPT_VALID(interrupt) && crsres != NULL) + acpi_config_intr(dev, crsres); if (crsbuf.Pointer != NULL) AcpiOsFree(crsbuf.Pointer); if (prsbuf.Pointer != NULL) ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_resource.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.25 2004/06/13 22:52:30 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.26 2004/06/23 17:21:02 jhb Exp $"); #include "opt_acpi.h" #include @@ -46,6 +46,94 @@ #define _COMPONENT ACPI_BUS ACPI_MODULE_NAME("RESOURCE") +struct lookup_irq_request { + ACPI_RESOURCE *acpi_res; + struct resource *res; + int counter; + int rid; + int found; +}; + +static ACPI_STATUS +acpi_lookup_irq_handler(ACPI_RESOURCE *res, void *context) +{ + struct lookup_irq_request *req; + u_int irqnum, irq; + + switch (res->Id) { + case ACPI_RSTYPE_IRQ: + case ACPI_RSTYPE_EXT_IRQ: + if (res->Id == ACPI_RSTYPE_IRQ) { + irqnum = res->Data.Irq.NumberOfInterrupts; + irq = res->Data.Irq.Interrupts[0]; + } else { + irqnum = res->Data.ExtendedIrq.NumberOfInterrupts; + irq = res->Data.ExtendedIrq.Interrupts[0]; + } + if (irqnum != 1) + break; + req = (struct lookup_irq_request *)context; + if (req->counter != req->rid) { + req->counter++; + break; + } + req->found = 1; + KASSERT(irq == rman_get_start(req->res), + ("IRQ resources do not match")); + bcopy(res, req->acpi_res, sizeof(ACPI_RESOURCE)); + return (AE_CTRL_TERMINATE); + } + return (AE_OK); +} + +ACPI_STATUS +acpi_lookup_irq_resource(device_t dev, int rid, struct resource *res, + ACPI_RESOURCE *acpi_res) +{ + struct lookup_irq_request req; + ACPI_STATUS status; + + req.acpi_res = acpi_res; + req.res = res; + req.counter = 0; + req.rid = rid; + req.found = 0; + status = AcpiWalkResources(acpi_get_handle(dev), "_CRS", + acpi_lookup_irq_handler, &req); + if (ACPI_SUCCESS(status) && req.found == 0) + status = AE_NOT_FOUND; + return (status); +} + +void +acpi_config_intr(device_t dev, ACPI_RESOURCE *res) +{ + u_int irq; + int pol, trig; + + switch (res->Id) { + case ACPI_RSTYPE_IRQ: + KASSERT(res->Data.Irq.NumberOfInterrupts == 1, + ("%s: multiple interrupts", __func__)); + irq = res->Data.Irq.Interrupts[0]; + trig = res->Data.Irq.EdgeLevel; + pol = res->Data.Irq.ActiveHighLow; + break; + case ACPI_RSTYPE_EXT_IRQ: + KASSERT(res->Data.ExtendedIrq.NumberOfInterrupts == 1, + ("%s: multiple interrupts", __func__)); + irq = res->Data.ExtendedIrq.Interrupts[0]; + trig = res->Data.ExtendedIrq.EdgeLevel; + pol = res->Data.ExtendedIrq.ActiveHighLow; + break; + default: + panic("%s: bad resource type %u", __func__, res->Id); + } + BUS_CONFIG_INTR(dev, irq, (trig == ACPI_EDGE_SENSITIVE) ? + INTR_TRIGGER_EDGE : INTR_TRIGGER_LEVEL, (pol == ACPI_ACTIVE_HIGH) ? + INTR_POLARITY_HIGH : INTR_POLARITY_LOW); +} + /* * Fetch a device's resources and associate them with the device. * @@ -497,9 +585,6 @@ return; bus_set_resource(dev, SYS_RES_IRQ, cp->ar_nirq++, *irq, 1); - BUS_CONFIG_INTR(dev, *irq, (trig == ACPI_EDGE_SENSITIVE) ? - INTR_TRIGGER_EDGE : INTR_TRIGGER_LEVEL, (pol == ACPI_ACTIVE_HIGH) ? - INTR_POLARITY_HIGH : INTR_POLARITY_LOW); } static void ==== //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#16 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.72 2004/06/16 09:46:35 phk Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.73 2004/06/23 17:21:02 jhb Exp $ */ #include "bus_if.h" @@ -268,6 +268,10 @@ }; extern struct acpi_parse_resource_set acpi_res_parse_set; + +void acpi_config_intr(device_t dev, ACPI_RESOURCE *res); +ACPI_STATUS acpi_lookup_irq_resource(device_t dev, int rid, + struct resource *res, ACPI_RESOURCE *acpi_res); ACPI_STATUS acpi_parse_resources(device_t dev, ACPI_HANDLE handle, struct acpi_parse_resource_set *set, void *arg); extern struct rman acpi_rman_io, acpi_rman_mem; ==== //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#5 (text+ko) ==== @@ -18,11 +18,11 @@ * as long as this message is kept with the software, all derivative * works or modified versions. * - * $Cronyx: if_cp.c,v 1.1.2.32 2004/02/26 17:56:39 rik Exp $ + * Cronyx Id: if_cp.c,v 1.1.2.41 2004/06/23 17:09:13 rik Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.6 2004/06/17 17:16:42 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.8 2004/06/23 18:13:09 rik Exp $"); #include @@ -45,9 +45,7 @@ #include #include #include -#if __FreeBSD_version >= 400000 -# include -#endif +#include #include #include #include @@ -68,34 +66,18 @@ # endif # include # include -# if __FreeBSD_version >= 500000 -# include -# else -# include -# endif +# include #else # include # define PP_CISCO IFF_LINK2 -# if __FreeBSD_version < 400000 -# include -# if NBPFILTER > 0 -# include -# endif -# else -# if __FreeBSD_version < 500000 -# include -# endif -# include -# define NBPFILTER NBPF -#endif +# if __FreeBSD_version < 500000 +# include +# endif +# include +# define NBPFILTER NBPF #endif -#if __FreeBSD_version >= 500000 #include #include -#else -#include -#include -#endif #include #include #include @@ -112,7 +94,6 @@ #define CDEV_MAJOR 134 -#if __FreeBSD_version >= 400000 static int cp_probe __P((device_t)); static int cp_attach __P((device_t)); static int cp_detach __P((device_t)); @@ -126,27 +107,21 @@ {0, 0} }; -typedef struct _bdrv_t { - cp_board_t *board; - struct resource *cp_res; - struct resource *cp_irq; - void *cp_intrhand; -} bdrv_t; - -static driver_t cp_driver = { - "cp", - cp_methods, - sizeof(bdrv_t), -}; - -static devclass_t cp_devclass; +typedef struct _cp_dma_mem_t { + unsigned long phys; + void *virt; + size_t size; +#if __FreeBSD_version >= 500000 + bus_dma_tag_t dmat; + bus_dmamap_t mapp; #endif +} cp_dma_mem_t; typedef struct _drv_t { char name [8]; cp_chan_t *chan; cp_board_t *board; - cp_buf_t buf; + cp_dma_mem_t dmamem; int running; #ifdef NETGRAPH char nodename [NG_NODELEN+1]; @@ -160,11 +135,26 @@ #else struct sppp pp; #endif -#if __FreeBSD_version >= 400000 struct cdev *devt; -#endif } drv_t; +typedef struct _bdrv_t { + cp_board_t *board; + struct resource *cp_res; + struct resource *cp_irq; + void *cp_intrhand; + cp_dma_mem_t dmamem; + drv_t channel [NCHAN]; +} bdrv_t; + +static driver_t cp_driver = { + "cp", + cp_methods, + sizeof(bdrv_t), +}; + +static devclass_t cp_devclass; + static void cp_receive (cp_chan_t *c, unsigned char *data, int len); static void cp_transmit (cp_chan_t *c, void *attachment, int len); static void cp_error (cp_chan_t *c, int data); @@ -185,7 +175,6 @@ static cp_board_t *adapter [NBRD]; static drv_t *channel [NBRD*NCHAN]; -static cp_qbuf_t *queue [NBRD]; static struct callout_handle led_timo [NBRD]; static struct callout_handle timeout_handle; @@ -227,14 +216,6 @@ return m; } -#if __FreeBSD_version < 400000 -static const char *cp_probe (pcici_t tag, pcidi_t type) -{ - if (tag->vendor == cp_vendor_id && tag->device == cp_device_id) - return "Cronyx-Tau-PCI serial adapter"; - return 0; -} -#else static int cp_probe (device_t dev) { if ((pci_get_vendor (dev) == cp_vendor_id) && @@ -244,7 +225,6 @@ } return ENXIO; } -#endif static void cp_timeout (void *arg) { @@ -300,12 +280,8 @@ static void cp_intr (void *arg) { -#if __FreeBSD_version < 400000 - cp_board_t *b = arg; -#else bdrv_t *bd = arg; cp_board_t *b = bd->board; -#endif int s = splimp (); if (cp_destroy) { splx (s); @@ -324,49 +300,110 @@ extern struct cdevsw cp_cdevsw; +#if __FreeBSD_version >= 500000 +static void +cp_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error) +{ + unsigned long *addr; + + if (error) + return; + + KASSERT(nseg == 1, ("too many DMA segments, %d should be 1", nseg)); + addr = arg; + *addr = segs->ds_addr; +} + +static int +cp_bus_dma_mem_alloc (int bnum, int cnum, cp_dma_mem_t *dmem) +{ + int error; + + error = bus_dma_tag_create (NULL, 16, 0, BUS_SPACE_MAXADDR_32BIT, + BUS_SPACE_MAXADDR, NULL, NULL, dmem->size, 1, + dmem->size, 0, NULL, NULL, &dmem->dmat); + if (error) { + if (cnum >= 0) printf ("cp%d-%d: ", bnum, cnum); + else printf ("cp%d: ", bnum); + printf ("couldn't allocate tag for dma memory\n"); + return 0; + } + error = bus_dmamem_alloc (dmem->dmat, (void **)&dmem->virt, + BUS_DMA_NOWAIT | BUS_DMA_ZERO, &dmem->mapp); + if (error) { + if (cnum >= 0) printf ("cp%d-%d: ", bnum, cnum); + else printf ("cp%d: ", bnum); + printf ("couldn't allocate mem for dma memory\n"); + bus_dma_tag_destroy (dmem->dmat); + return 0; + } + error = bus_dmamap_load (dmem->dmat, dmem->mapp, dmem->virt, + dmem->size, cp_bus_dmamap_addr, &dmem->phys, 0); + if (error) { + if (cnum >= 0) printf ("cp%d-%d: ", bnum, cnum); + else printf ("cp%d: ", bnum); + printf ("couldn't load mem map for dma memory\n"); + bus_dmamem_free (dmem->dmat, dmem->virt, dmem->mapp); + bus_dma_tag_destroy (dmem->dmat); + return 0; + } + return 1; +} + +static void +cp_bus_dma_mem_free (cp_dma_mem_t *dmem) +{ + bus_dmamap_unload (dmem->dmat, dmem->mapp); + bus_dmamem_free (dmem->dmat, dmem->virt, dmem->mapp); + bus_dma_tag_destroy (dmem->dmat); +} +#else +static int +cp_bus_dma_mem_alloc (int bnum, int cnum, cp_dma_mem_t *dmem) +{ + dmem->virt = contigmalloc (dmem->size, M_DEVBUF, M_WAITOK, + 0x100000, 0xffffffff, 16, 0); + if (dmem->virt == NULL) { + if (cnum >= 0) printf ("cp%d-%d: ", bnum, cnum); + else printf ("cp%d: ", bnum); + printf ("couldn't allocate memory for dma memory\n", unit); + return 0; + } + dmem->phys = vtophys (dmem->virt); + return 1; +} + +static void +cp_bus_dma_mem_free (cp_dma_mem_t *dmem) +{ + contigfree (dmem->virt, dmem->size, M_DEVBUF); +} +#endif + /* * Called if the probe succeeded. */ -#if __FreeBSD_version < 400000 -static void cp_attach (pcici_t tag, int unit) -{ - vm_offset_t pbase; -#else static int cp_attach (device_t dev) { bdrv_t *bd = device_get_softc (dev); int unit = device_get_unit (dev); + unsigned short res; + vm_offset_t vbase; int rid, error; -#endif - vm_offset_t vbase; - cp_board_t *b; + cp_board_t *b; cp_chan_t *c; - drv_t *d; - unsigned short res; + drv_t *d; int s = splimp (); b = malloc (sizeof(cp_board_t), M_DEVBUF, M_WAITOK); if (!b) { printf ("cp%d: couldn't allocate memory\n", unit); -#if __FreeBSD_version < 400000 - splx (s); - return; -#else splx (s); return (ENXIO); -#endif } adapter[unit] = b; bzero (b, sizeof(cp_board_t)); -#if __FreeBSD_version < 400000 - if (! pci_map_mem (tag, PCIR_MAPS, &vbase, &pbase)) { - printf ("cp%d: cannot map memory\n", unit); - free (b, M_DEVBUF); - splx (s); - return; - } -#else bd->board = b; b->sys = bd; rid = PCIR_BAR(0); @@ -379,40 +416,24 @@ return (ENXIO); } vbase = (vm_offset_t) rman_get_virtual (bd->cp_res); -#endif res = cp_init (b, unit, (u_char*) vbase); if (res) { printf ("cp%d: can't init, error code:%x\n", unit, res); -#if __FreeBSD_version >= 400000 bus_release_resource (dev, SYS_RES_MEMORY, PCIR_BAR(0), bd->cp_res); -#endif free (b, M_DEVBUF); splx (s); -#if __FreeBSD_version >= 400000 return (ENXIO); -#else - return; -#endif } - queue[unit] = contigmalloc (sizeof(cp_qbuf_t), M_DEVBUF, M_WAITOK, - 0x100000, 0xffffffff, 16, 0); - if (queue[unit] == NULL) { - printf ("cp%d: allocate memory for qbuf_t\n", unit); + + bd->dmamem.size = sizeof(cp_qbuf_t); + if (! cp_bus_dma_mem_alloc (unit, -1, &bd->dmamem)) { free (b, M_DEVBUF); splx (s); -#if __FreeBSD_version >= 400000 return (ENXIO); -#else - return; -#endif } - cp_reset (b, queue[unit], vtophys (queue[unit])); + cp_reset (b, bd->dmamem.virt, bd->dmamem.phys); -#if __FreeBSD_version < 400000 - if (! pci_map_int (tag, cp_intr, b, &net_imask)) - printf ("cp%d: cannot map interrupt\n", unit); -#else rid = 0; bd->cp_irq = bus_alloc_resource (dev, SYS_RES_IRQ, &rid, 0, ~0, 1, RF_SHAREABLE | RF_ACTIVE); @@ -435,20 +456,16 @@ splx (s); return (ENXIO); } -#endif printf ("cp%d: %s, clock %ld MHz\n", unit, b->name, b->osc / 1000000); for (c=b->chan; cchan+NCHAN; ++c) { if (! c->type) continue; - d = contigmalloc (sizeof(drv_t), M_DEVBUF, M_WAITOK, - 0x100000, 0xffffffff, 16, 0); - if (d == NULL) { - printf ("cp%d-%d: cannot allocate memory for drv_t\n", - unit, c->num); - } + d = &bd->channel[c->num]; + d->dmamem.size = sizeof(cp_buf_t); + if (! cp_bus_dma_mem_alloc (unit, c->num, &d->dmamem)) + continue; channel [b->num*NCHAN + c->num] = d; - bzero (d, sizeof(drv_t)); sprintf (d->name, "cp%d.%d", b->num, c->num); d->board = b; d->chan = c; @@ -500,31 +517,24 @@ if_attach (&d->pp.pp_if); d->pp.pp_tlf = cp_tlf; d->pp.pp_tls = cp_tls; -#if __FreeBSD_version >= 400000 || NBPFILTER > 0 /* If BPF is in the kernel, call the attach for it. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 23 22:10:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27FB816A4D0; Wed, 23 Jun 2004 22:10:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 008FA16A4CF for ; Wed, 23 Jun 2004 22:10:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED13143D39 for ; Wed, 23 Jun 2004 22:10:40 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5NM9nO7059531 for ; Wed, 23 Jun 2004 22:09:49 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5NM9nFB059528 for perforce@freebsd.org; Wed, 23 Jun 2004 22:09:49 GMT (envelope-from peter@freebsd.org) Date: Wed, 23 Jun 2004 22:09:49 GMT Message-Id: <200406232209.i5NM9nFB059528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 55647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2004 22:10:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=55647 Change 55647 by peter@peter_daintree on 2004/06/23 22:09:25 IFC @55646 Affected files ... .. //depot/projects/hammer/sys/conf/files#65 integrate .. //depot/projects/hammer/sys/conf/options#41 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#6 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#7 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#11 integrate .. //depot/projects/hammer/sys/fs/udf/udf.h#6 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#10 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#16 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/io_apic.c#9 integrate .. //depot/projects/hammer/sys/netinet/tcp.h#7 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#29 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#17 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#1 branch .. //depot/projects/hammer/sys/netinet/tcp_seq.h#5 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#23 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#18 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#9 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#13 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#26 integrate Differences ... ==== //depot/projects/hammer/sys/conf/files#65 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.907 2004/06/22 20:13:24 brooks Exp $ +# $FreeBSD: src/sys/conf/files,v 1.908 2004/06/23 21:04:36 ps Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1465,6 +1465,7 @@ netinet/tcp_hostcache.c optional inet netinet/tcp_input.c optional inet netinet/tcp_output.c optional inet +netinet/tcp_sack.c optional inet netinet/tcp_subr.c optional inet netinet/tcp_syncache.c optional inet netinet/tcp_timer.c optional inet ==== //depot/projects/hammer/sys/conf/options#41 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.453 2004/06/13 17:29:06 mlaier Exp $ +# $FreeBSD: src/sys/conf/options,v 1.454 2004/06/23 21:04:37 ps Exp $ # # On the handling of kernel options # @@ -354,6 +354,7 @@ SLIP_IFF_OPTS opt_slip.h TCPDEBUG TCP_SIGNATURE opt_inet.h +TCP_SACK_DEBUG opt_tcp_sack.h TCP_DROP_SYNFIN opt_tcp_input.h XBONEHACK ==== //depot/projects/hammer/sys/dev/cp/if_cp.c#6 (text+ko) ==== @@ -18,11 +18,11 @@ * as long as this message is kept with the software, all derivative * works or modified versions. * - * $Cronyx: if_cp.c,v 1.1.2.32 2004/02/26 17:56:39 rik Exp $ + * Cronyx Id: if_cp.c,v 1.1.2.41 2004/06/23 17:09:13 rik Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.7 2004/06/23 11:23:53 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.8 2004/06/23 18:13:09 rik Exp $"); #include @@ -66,11 +66,7 @@ # endif # include # include -# if __FreeBSD_version >= 500000 -# include -# else -# include -# endif +# include #else # include # define PP_CISCO IFF_LINK2 @@ -80,13 +76,8 @@ # include # define NBPFILTER NBPF #endif -#if __FreeBSD_version >= 500000 #include #include -#else -#include -#include -#endif #include #include #include @@ -116,26 +107,21 @@ {0, 0} }; -typedef struct _bdrv_t { - cp_board_t *board; - struct resource *cp_res; - struct resource *cp_irq; - void *cp_intrhand; -} bdrv_t; - -static driver_t cp_driver = { - "cp", - cp_methods, - sizeof(bdrv_t), -}; +typedef struct _cp_dma_mem_t { + unsigned long phys; + void *virt; + size_t size; +#if __FreeBSD_version >= 500000 + bus_dma_tag_t dmat; + bus_dmamap_t mapp; +#endif +} cp_dma_mem_t; -static devclass_t cp_devclass; - typedef struct _drv_t { char name [8]; cp_chan_t *chan; cp_board_t *board; - cp_buf_t buf; + cp_dma_mem_t dmamem; int running; #ifdef NETGRAPH char nodename [NG_NODELEN+1]; @@ -152,6 +138,23 @@ struct cdev *devt; } drv_t; +typedef struct _bdrv_t { + cp_board_t *board; + struct resource *cp_res; + struct resource *cp_irq; + void *cp_intrhand; + cp_dma_mem_t dmamem; + drv_t channel [NCHAN]; +} bdrv_t; + +static driver_t cp_driver = { + "cp", + cp_methods, + sizeof(bdrv_t), +}; + +static devclass_t cp_devclass; + static void cp_receive (cp_chan_t *c, unsigned char *data, int len); static void cp_transmit (cp_chan_t *c, void *attachment, int len); static void cp_error (cp_chan_t *c, int data); @@ -172,7 +175,6 @@ static cp_board_t *adapter [NBRD]; static drv_t *channel [NBRD*NCHAN]; -static cp_qbuf_t *queue [NBRD]; static struct callout_handle led_timo [NBRD]; static struct callout_handle timeout_handle; @@ -298,6 +300,86 @@ extern struct cdevsw cp_cdevsw; +#if __FreeBSD_version >= 500000 +static void +cp_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error) +{ + unsigned long *addr; + + if (error) + return; + + KASSERT(nseg == 1, ("too many DMA segments, %d should be 1", nseg)); + addr = arg; + *addr = segs->ds_addr; +} + +static int +cp_bus_dma_mem_alloc (int bnum, int cnum, cp_dma_mem_t *dmem) +{ + int error; + + error = bus_dma_tag_create (NULL, 16, 0, BUS_SPACE_MAXADDR_32BIT, + BUS_SPACE_MAXADDR, NULL, NULL, dmem->size, 1, + dmem->size, 0, NULL, NULL, &dmem->dmat); + if (error) { + if (cnum >= 0) printf ("cp%d-%d: ", bnum, cnum); + else printf ("cp%d: ", bnum); + printf ("couldn't allocate tag for dma memory\n"); + return 0; + } + error = bus_dmamem_alloc (dmem->dmat, (void **)&dmem->virt, + BUS_DMA_NOWAIT | BUS_DMA_ZERO, &dmem->mapp); + if (error) { + if (cnum >= 0) printf ("cp%d-%d: ", bnum, cnum); + else printf ("cp%d: ", bnum); + printf ("couldn't allocate mem for dma memory\n"); + bus_dma_tag_destroy (dmem->dmat); + return 0; + } + error = bus_dmamap_load (dmem->dmat, dmem->mapp, dmem->virt, + dmem->size, cp_bus_dmamap_addr, &dmem->phys, 0); + if (error) { + if (cnum >= 0) printf ("cp%d-%d: ", bnum, cnum); + else printf ("cp%d: ", bnum); + printf ("couldn't load mem map for dma memory\n"); + bus_dmamem_free (dmem->dmat, dmem->virt, dmem->mapp); + bus_dma_tag_destroy (dmem->dmat); + return 0; + } + return 1; +} + +static void +cp_bus_dma_mem_free (cp_dma_mem_t *dmem) +{ + bus_dmamap_unload (dmem->dmat, dmem->mapp); + bus_dmamem_free (dmem->dmat, dmem->virt, dmem->mapp); + bus_dma_tag_destroy (dmem->dmat); +} +#else +static int +cp_bus_dma_mem_alloc (int bnum, int cnum, cp_dma_mem_t *dmem) +{ + dmem->virt = contigmalloc (dmem->size, M_DEVBUF, M_WAITOK, + 0x100000, 0xffffffff, 16, 0); + if (dmem->virt == NULL) { + if (cnum >= 0) printf ("cp%d-%d: ", bnum, cnum); + else printf ("cp%d: ", bnum); + printf ("couldn't allocate memory for dma memory\n", unit); + return 0; + } + dmem->phys = vtophys (dmem->virt); + return 1; +} + +static void +cp_bus_dma_mem_free (cp_dma_mem_t *dmem) +{ + contigfree (dmem->virt, dmem->size, M_DEVBUF); +} +#endif + /* * Called if the probe succeeded. */ @@ -305,12 +387,12 @@ { bdrv_t *bd = device_get_softc (dev); int unit = device_get_unit (dev); + unsigned short res; + vm_offset_t vbase; int rid, error; - vm_offset_t vbase; - cp_board_t *b; + cp_board_t *b; cp_chan_t *c; - drv_t *d; - unsigned short res; + drv_t *d; int s = splimp (); b = malloc (sizeof(cp_board_t), M_DEVBUF, M_WAITOK); @@ -343,15 +425,14 @@ splx (s); return (ENXIO); } - queue[unit] = contigmalloc (sizeof(cp_qbuf_t), M_DEVBUF, M_WAITOK, - 0x100000, 0xffffffff, 16, 0); - if (queue[unit] == NULL) { - printf ("cp%d: allocate memory for qbuf_t\n", unit); + + bd->dmamem.size = sizeof(cp_qbuf_t); + if (! cp_bus_dma_mem_alloc (unit, -1, &bd->dmamem)) { free (b, M_DEVBUF); splx (s); return (ENXIO); } - cp_reset (b, queue[unit], vtophys (queue[unit])); + cp_reset (b, bd->dmamem.virt, bd->dmamem.phys); rid = 0; bd->cp_irq = bus_alloc_resource (dev, SYS_RES_IRQ, &rid, 0, ~0, 1, @@ -380,14 +461,11 @@ for (c=b->chan; cchan+NCHAN; ++c) { if (! c->type) continue; - d = contigmalloc (sizeof(drv_t), M_DEVBUF, M_WAITOK, - 0x100000, 0xffffffff, 16, 0); - if (d == NULL) { - printf ("cp%d-%d: cannot allocate memory for drv_t\n", - unit, c->num); - } + d = &bd->channel[c->num]; + d->dmamem.size = sizeof(cp_buf_t); + if (! cp_bus_dma_mem_alloc (unit, c->num, &d->dmamem)) + continue; channel [b->num*NCHAN + c->num] = d; - bzero (d, sizeof(drv_t)); sprintf (d->name, "cp%d.%d", b->num, c->num); d->board = b; d->chan = c; @@ -444,7 +522,7 @@ bpfattach (&d->pp.pp_if, DLT_PPP, 4); #endif /*NETGRAPH*/ cp_start_e1 (c); - cp_start_chan (c, 1, 1, &d->buf, vtophys (&d->buf)); + cp_start_chan (c, 1, 1, d->dmamem.virt, d->dmamem.phys); /* Register callback functions. */ cp_register_transmit (c, &cp_transmit); @@ -548,10 +626,10 @@ continue; channel [b->num*NCHAN + c->num] = 0; /* Deallocate buffers. */ - contigfree (d, sizeof (*d), M_DEVBUF); + cp_bus_dma_mem_free (&d->dmamem); } adapter [b->num] = 0; - contigfree (queue[b->num], sizeof (cp_qbuf_t), M_DEVBUF); + cp_bus_dma_mem_free (&bd->dmamem); free (b, M_DEVBUF); splx (s); return 0; @@ -2326,7 +2404,6 @@ } #endif - static int cp_modevent (module_t mod, int type, void *unused) { struct cdev *dev; @@ -2400,7 +2477,7 @@ #else DRIVER_MODULE (cp, pci, cp_driver, cp_devclass, cp_modevent, NULL); #endif -#elif __FreeBSD_version >= 400000 +#elif __FreeBSD_version >= 400000 #ifdef NETGRAPH DRIVER_MODULE (cp, pci, cp_driver, cp_devclass, ng_mod_event, &typestruct); #else ==== //depot/projects/hammer/sys/dev/ctau/if_ct.c#7 (text+ko) ==== @@ -18,10 +18,11 @@ * as long as this message is kept with the software, all derivative * works or modified versions. * - * Cronyx Id: if_ct.c,v 1.1.2.22 2004/02/26 19:06:51 rik Exp $ + * Cronyx Id: if_ct.c,v 1.1.2.31 2004/06/23 17:09:13 rik Exp $ */ + #include -__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.9 2004/06/23 11:23:54 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.10 2004/06/23 18:13:10 rik Exp $"); #include @@ -111,30 +112,21 @@ {0, 0} }; -typedef struct _bdrv_t { - ct_board_t *board; - struct resource *base_res; - struct resource *drq_res; - struct resource *irq_res; - int base_rid; - int drq_rid; - int irq_rid; - void *intrhand; -} bdrv_t; - -static driver_t ct_isa_driver = { - "ct", - ct_isa_methods, - sizeof (bdrv_t), -}; +typedef struct _ct_dma_mem_t { + unsigned long phys; + void *virt; + size_t size; +#if __FreeBSD_version >= 500000 + bus_dma_tag_t dmat; + bus_dmamap_t mapp; +#endif +} ct_dma_mem_t; -static devclass_t ct_devclass; - typedef struct _drv_t { char name [8]; ct_chan_t *chan; ct_board_t *board; - ct_buf_t buf; + ct_dma_mem_t dmamem; int running; #ifdef NETGRAPH char nodename [NG_NODELEN+1]; @@ -151,6 +143,26 @@ struct cdev *devt; } drv_t; +typedef struct _bdrv_t { + ct_board_t *board; + struct resource *base_res; + struct resource *drq_res; + struct resource *irq_res; + int base_rid; + int drq_rid; + int irq_rid; + void *intrhand; + drv_t channel [NCHAN]; +} bdrv_t; + +static driver_t ct_isa_driver = { + "ct", + ct_isa_methods, + sizeof (bdrv_t), +}; + +static devclass_t ct_devclass; + static void ct_receive (ct_chan_t *c, char *data, int len); static void ct_transmit (ct_chan_t *c, void *attachment, int len); static void ct_error (ct_chan_t *c, int data); @@ -446,6 +458,87 @@ } extern struct cdevsw ct_cdevsw; + +#if __FreeBSD_version >= 500000 +static void +ct_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error) +{ + unsigned long *addr; + + if (error) + return; + + KASSERT(nseg == 1, ("too many DMA segments, %d should be 1", nseg)); + addr = arg; + *addr = segs->ds_addr; +} + +static int +ct_bus_dma_mem_alloc (int bnum, int cnum, ct_dma_mem_t *dmem) +{ + int error; + + error = bus_dma_tag_create (NULL, 16, 0, BUS_SPACE_MAXADDR_24BIT, + BUS_SPACE_MAXADDR, NULL, NULL, dmem->size, 1, + dmem->size, 0, NULL, NULL, &dmem->dmat); + if (error) { + if (cnum >= 0) printf ("ct%d-%d: ", bnum, cnum); + else printf ("ct%d: ", bnum); + printf ("couldn't allocate tag for dma memory\n"); + return 0; + } + error = bus_dmamem_alloc (dmem->dmat, (void **)&dmem->virt, + BUS_DMA_NOWAIT | BUS_DMA_ZERO, &dmem->mapp); + if (error) { + if (cnum >= 0) printf ("ct%d-%d: ", bnum, cnum); + else printf ("ct%d: ", bnum); + printf ("couldn't allocate mem for dma memory\n"); + bus_dma_tag_destroy (dmem->dmat); + return 0; + } + error = bus_dmamap_load (dmem->dmat, dmem->mapp, dmem->virt, + dmem->size, ct_bus_dmamap_addr, &dmem->phys, 0); + if (error) { + if (cnum >= 0) printf ("ct%d-%d: ", bnum, cnum); + else printf ("ct%d: ", bnum); + printf ("couldn't load mem map for dma memory\n"); + bus_dmamem_free (dmem->dmat, dmem->virt, dmem->mapp); + bus_dma_tag_destroy (dmem->dmat); + return 0; + } + return 1; +} + +static void +ct_bus_dma_mem_free (ct_dma_mem_t *dmem) +{ + bus_dmamap_unload (dmem->dmat, dmem->mapp); + bus_dmamem_free (dmem->dmat, dmem->virt, dmem->mapp); + bus_dma_tag_destroy (dmem->dmat); +} +#else +static int +ct_bus_dma_mem_alloc (int bnum, int cnum, ct_dma_mem_t *dmem) +{ + dmem->virt = contigmalloc (dmem->size, M_DEVBUF, M_WAITOK, + 0x100000, 0x1000000, 16, 0); + if (dmem->virt == NULL) { + if (cnum >= 0) printf ("ct%d-%d: ", bnum, cnum); + else printf ("ct%d: ", bnum); + printf ("couldn't allocate memory for dma memory\n", unit); + return 0; + } + dmem->phys = vtophys (dmem->virt); + return 1; +} + +static void +ct_bus_dma_mem_free (ct_dma_mem_t *dmem) +{ + contigfree (dmem->virt, dmem->size, M_DEVBUF); +} +#endif + /* * The adapter is present, initialize the driver structures. */ @@ -589,10 +682,11 @@ b->osc == 20000000 ? "20" : "16.384"); for (c=b->chan; cchan+NCHAN; ++c) { - d = contigmalloc (sizeof(drv_t), M_DEVBUF, M_WAITOK, - 0x100000, 0x1000000, 16, 0); + d = &bd->channel[c->num]; + d->dmamem.size = sizeof(ct_buf_t); + if (! ct_bus_dma_mem_alloc (unit, c->num, &d->dmamem)) + continue; channel [b->num*NCHAN + c->num] = d; - bzero (d, sizeof(drv_t)); sprintf (d->name, "ct%d.%d", b->num, c->num); d->board = b; d->chan = c; @@ -603,7 +697,7 @@ printf ("%s: cannot make common node\n", d->name); channel [b->num*NCHAN + c->num] = 0; c->sys = 0; - contigfree (d, sizeof (*d), M_DEVBUF); + ct_bus_dma_mem_free (&d->dmamem); continue; } #if __FreeBSD_version >= 500000 @@ -623,7 +717,7 @@ #endif channel [b->num*NCHAN + c->num] = 0; c->sys = 0; - contigfree (d, sizeof (*d), M_DEVBUF); + ct_bus_dma_mem_free (&d->dmamem); continue; } d->queue.ifq_maxlen = IFQ_MAXLEN; @@ -654,7 +748,7 @@ * Header size is 4 bytes. */ bpfattach (&d->pp.pp_if, DLT_PPP, 4); #endif /*NETGRAPH*/ - ct_start_chan (c, &d->buf, vtophys (&d->buf)); + ct_start_chan (c, d->dmamem.virt, d->dmamem.phys); ct_register_receive (c, &ct_receive); ct_register_transmit (c, &ct_transmit); ct_register_error (c, &ct_error); @@ -748,7 +842,7 @@ continue; /* Deallocate buffers. */ - contigfree (d, sizeof (*d), M_DEVBUF); + ct_bus_dma_mem_free (&d->dmamem); } bd->board = 0; adapter [b->num] = 0; @@ -1504,7 +1598,7 @@ case SERIAL_SETCLK: /* Only for superuser! */ #if __FreeBSD_version < 500000 - error = suser (p); + error = suser (p); #else /* __FreeBSD_version >= 500000 */ error = suser (td); #endif /* __FreeBSD_version >= 500000 */ @@ -2296,9 +2390,8 @@ .newhook = ng_ct_newhook, .connect = ng_ct_connect, .rcvdata = ng_ct_rcvdata, - .disconnect = ng_ct_disconnect + .disconnect = ng_ct_disconnect, }; - #endif /*NETGRAPH*/ #if __FreeBSD_version >= 500000 ==== //depot/projects/hammer/sys/dev/cx/if_cx.c#11 (text+ko) ==== @@ -19,10 +19,11 @@ * as long as this message is kept with the software, all derivative * works or modified versions. * - * Cronyx Id: if_cx.c,v 1.1.2.23 2004/02/26 17:56:40 rik Exp $ + * Cronyx Id: if_cx.c,v 1.1.2.34 2004/06/23 17:09:13 rik Exp $ */ + #include -__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.22 2004/06/23 11:23:54 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.23 2004/06/23 18:13:10 rik Exp $"); #include @@ -57,8 +58,8 @@ #include #include #if __FreeBSD_version < 500000 -#include -#include +# include +# include #endif #include #if __FreeBSD_version <= 501000 @@ -142,30 +143,21 @@ {0, 0} }; -typedef struct _bdrv_t { - cx_board_t *board; - struct resource *base_res; - struct resource *drq_res; - struct resource *irq_res; - int base_rid; - int drq_rid; - int irq_rid; - void *intrhand; -} bdrv_t; +typedef struct _cx_dma_mem_t { + unsigned long phys; + void *virt; + size_t size; +#if __FreeBSD_version >= 500000 + bus_dma_tag_t dmat; + bus_dmamap_t mapp; +#endif +} cx_dma_mem_t; -static driver_t cx_isa_driver = { - "cx", - cx_isa_methods, - sizeof (bdrv_t), -}; - -static devclass_t cx_devclass; - typedef struct _drv_t { char name [8]; cx_chan_t *chan; cx_board_t *board; - cx_buf_t buf; + cx_dma_mem_t dmamem; struct tty *tty; struct callout_handle dcd_timeout_handle; unsigned dtrwait; @@ -196,6 +188,26 @@ short atimeout; } drv_t; +typedef struct _bdrv_t { + cx_board_t *board; + struct resource *base_res; + struct resource *drq_res; + struct resource *irq_res; + int base_rid; + int drq_rid; + int irq_rid; + void *intrhand; + drv_t channel [NCHAN]; +} bdrv_t; + +static driver_t cx_isa_driver = { + "cx", + cx_isa_methods, + sizeof (bdrv_t), +}; + +static devclass_t cx_devclass; + extern long csigma_fw_len; extern const char *csigma_fw_version; extern const char *csigma_fw_date; @@ -571,6 +583,86 @@ return 0; } +#if __FreeBSD_version >= 500000 +static void +cx_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error) +{ + unsigned long *addr; + + if (error) + return; + + KASSERT(nseg == 1, ("too many DMA segments, %d should be 1", nseg)); + addr = arg; + *addr = segs->ds_addr; +} + +static int +cx_bus_dma_mem_alloc (int bnum, int cnum, cx_dma_mem_t *dmem) +{ + int error; + + error = bus_dma_tag_create (NULL, 16, 0, BUS_SPACE_MAXADDR_24BIT, + BUS_SPACE_MAXADDR, NULL, NULL, dmem->size, 1, + dmem->size, 0, NULL, NULL, &dmem->dmat); + if (error) { + if (cnum >= 0) printf ("cx%d-%d: ", bnum, cnum); + else printf ("cx%d: ", bnum); + printf ("couldn't allocate tag for dma memory\n"); + return 0; + } + error = bus_dmamem_alloc (dmem->dmat, (void **)&dmem->virt, + BUS_DMA_NOWAIT | BUS_DMA_ZERO, &dmem->mapp); + if (error) { + if (cnum >= 0) printf ("cx%d-%d: ", bnum, cnum); + else printf ("cx%d: ", bnum); + printf ("couldn't allocate mem for dma memory\n"); + bus_dma_tag_destroy (dmem->dmat); + return 0; + } + error = bus_dmamap_load (dmem->dmat, dmem->mapp, dmem->virt, + dmem->size, cx_bus_dmamap_addr, &dmem->phys, 0); + if (error) { + if (cnum >= 0) printf ("cx%d-%d: ", bnum, cnum); + else printf ("cx%d: ", bnum); + printf ("couldn't load mem map for dma memory\n"); + bus_dmamem_free (dmem->dmat, dmem->virt, dmem->mapp); + bus_dma_tag_destroy (dmem->dmat); + return 0; + } + return 1; +} + +static void +cx_bus_dma_mem_free (cx_dma_mem_t *dmem) +{ + bus_dmamap_unload (dmem->dmat, dmem->mapp); + bus_dmamem_free (dmem->dmat, dmem->virt, dmem->mapp); + bus_dma_tag_destroy (dmem->dmat); +} +#else +static int +cx_bus_dma_mem_alloc (int bnum, int cnum, cx_dma_mem_t *dmem) +{ + dmem->virt = contigmalloc (dmem->size, M_DEVBUF, M_WAITOK, + 0x100000, 0x1000000, 16, 0); + if (dmem->virt == NULL) { + if (cnum >= 0) printf ("cx%d-%d: ", bnum, cnum); + else printf ("cx%d: ", bnum); + printf ("couldn't allocate memory for dma memory\n", unit); + return 0; + } + dmem->phys = vtophys (dmem->virt); + return 1; +} + +static void +cx_bus_dma_mem_free (cx_dma_mem_t *dmem) +{ + contigfree (dmem->virt, dmem->size, M_DEVBUF); +} +#endif + /* * The adapter is present, initialize the driver structures. */ @@ -717,10 +809,11 @@ char *dnmc="cua %x"; if (c->type == T_NONE) continue; - d = contigmalloc (sizeof(drv_t), M_DEVBUF, M_WAITOK, - 0x100000, 0x1000000, 16, 0); + d = &bd->channel[c->num]; + d->dmamem.size = sizeof(cx_buf_t); + if (! cx_bus_dma_mem_alloc (unit, c->num, &d->dmamem)) + continue; channel [b->num*NCHAN + c->num] = d; - bzero (d, sizeof(drv_t)); sprintf (d->name, "cx%d.%d", b->num, c->num); d->board = b; d->chan = c; @@ -741,7 +834,7 @@ printf ("%s: cannot make common node\n", d->name); channel [b->num*NCHAN + c->num] = 0; c->sys = 0; - contigfree (d, sizeof (*d), M_DEVBUF); + cx_bus_dma_mem_free (&d->dmamem); continue; } #if __FreeBSD_version >= 500000 @@ -761,7 +854,7 @@ #endif channel [b->num*NCHAN + c->num] = 0; c->sys = 0; - contigfree (d, sizeof (*d), M_DEVBUF); + cx_bus_dma_mem_free (&d->dmamem); continue; } d->lo_queue.ifq_maxlen = IFQ_MAXLEN; @@ -793,7 +886,7 @@ bpfattach (&d->pp.pp_if, DLT_PPP, 4); #endif /*NETGRAPH*/ } - cx_start_chan (c, &d->buf, vtophys (&d->buf)); + cx_start_chan (c, d->dmamem.virt, d->dmamem.phys); cx_register_receive (c, &cx_receive); cx_register_transmit (c, &cx_transmit); cx_register_error (c, &cx_error); @@ -919,7 +1012,7 @@ continue; /* Deallocate buffers. */ - contigfree (d, sizeof (*d), M_DEVBUF); + cx_bus_dma_mem_free (&d->dmamem); } bd->board = 0; adapter [b->num] = 0; @@ -2815,9 +2908,8 @@ .newhook = ng_cx_newhook, .connect = ng_cx_connect, .rcvdata = ng_cx_rcvdata, - .disconnect = ng_cx_disconnect + .disconnect = ng_cx_disconnect, }; - #endif /*NETGRAPH*/ #if __FreeBSD_version >= 500000 ==== //depot/projects/hammer/sys/fs/udf/udf.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/udf/udf.h,v 1.7 2004/06/16 09:47:05 phk Exp $ + * $FreeBSD: src/sys/fs/udf/udf.h,v 1.8 2004/06/23 19:36:09 scottl Exp $ */ #define UDF_HASHTBLSIZE 100 @@ -115,7 +115,9 @@ } /* - * Produce a suitable file number from an ICB. + * Produce a suitable file number from an ICB. The passed in ICB is expected + * to be in little endian (meaning that it hasn't been swapped for big + * endian machines yet). * XXX If the fileno resolves to 0, we might be in big trouble. * XXX Assumes the ICB is a long_ad. This struct is compatible with short_ad, * but not ext_ad. @@ -123,7 +125,7 @@ static __inline ino_t udf_getid(struct long_ad *icb) { - return (icb->loc.lb_num); + return (le32toh(icb->loc.lb_num)); } int udf_allocv(struct mount *, struct vnode **, struct thread *); ==== //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#10 (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/fs/udf/udf_vfsops.c,v 1.17 2004/03/30 05:01:48 scottl Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.18 2004/06/23 19:36:09 scottl Exp $ */ /* udf_vfsops.c */ @@ -87,6 +87,7 @@ #include #include #include +#include #include @@ -382,8 +383,8 @@ * XXX Should we care about the partition type right now? * XXX What about multiple partitions? */ - mvds_start = avdp.main_vds_ex.loc; - mvds_end = mvds_start + (avdp.main_vds_ex.len - 1) / bsize; + mvds_start = le32toh(avdp.main_vds_ex.loc); + mvds_end = mvds_start + (le32toh(avdp.main_vds_ex.len) - 1) / bsize; for (sector = mvds_start; sector < mvds_end; sector++) { if ((error = bread(devvp, sector * btodb(bsize), bsize, NOCRED, &bp)) != 0) { @@ -392,11 +393,11 @@ } lvd = (struct logvol_desc *)bp->b_data; if (!udf_checktag(&lvd->tag, TAGID_LOGVOL)) { - udfmp->bsize = lvd->lb_size; + udfmp->bsize = le32toh(lvd->lb_size); udfmp->bmask = udfmp->bsize - 1; udfmp->bshift = ffs(udfmp->bsize) - 1; - fsd_part = lvd->_lvd_use.fsd_loc.loc.part_num; - fsd_offset = lvd->_lvd_use.fsd_loc.loc.lb_num; + fsd_part = le16toh(lvd->_lvd_use.fsd_loc.loc.part_num); + fsd_offset = le32toh(lvd->_lvd_use.fsd_loc.loc.lb_num); if (udf_find_partmaps(udfmp, lvd)) break; logvol_found = 1; @@ -404,9 +405,9 @@ pd = (struct part_desc *)bp->b_data; if (!udf_checktag(&pd->tag, TAGID_PARTITION)) { part_found = 1; - part_num = pd->part_num; - udfmp->part_len = pd->part_len; - udfmp->part_start = pd->start_loc; + part_num = le16toh(pd->part_num); + udfmp->part_len = le32toh(pd->part_len); + udfmp->part_start = le32toh(pd->start_loc); } brelse(bp); @@ -456,8 +457,8 @@ /* * Find the file entry for the root directory. */ - sector = udfmp->root_icb.loc.lb_num + udfmp->part_start; - size = udfmp->root_icb.len; + sector = le32toh(udfmp->root_icb.loc.lb_num) + udfmp->part_start; + size = le32toh(udfmp->root_icb.len); if ((error = udf_readlblks(udfmp, sector, size, &bp)) != 0) { printf("Cannot read sector %d\n", sector); goto bail; @@ -626,7 +627,7 @@ brelse(bp); return (ENOMEM); } - size = UDF_FENTRY_SIZE + fe->l_ea + fe->l_ad; + size = UDF_FENTRY_SIZE + le32toh(fe->l_ea) + le32toh(fe->l_ad); MALLOC(unode->fentry, struct file_entry *, size, M_UDFFENTRY, M_NOWAIT | M_ZERO); if (unode->fentry == NULL) { @@ -736,7 +737,7 @@ unsigned char regid_id[UDF_REGID_ID_SIZE + 1]; int i, ptype, psize, error; - for (i = 0; i < lvd->n_pm; i++) { + for (i = 0; i < le32toh(lvd->n_pm); i++) { pmap = (union udf_pmap *)&lvd->maps[i * UDF_PMAP_SIZE]; ptype = pmap->data[0]; psize = pmap->data[1]; @@ -763,28 +764,28 @@ } pms = &pmap->pms; - MALLOC(udfmp->s_table, struct udf_sparing_table *, pms->st_size, - M_UDFMOUNT, M_NOWAIT | M_ZERO); + MALLOC(udfmp->s_table, struct udf_sparing_table *, + le32toh(pms->st_size), M_UDFMOUNT, M_NOWAIT | M_ZERO); if (udfmp->s_table == NULL) return (ENOMEM); /* Calculate the number of sectors per packet. */ /* XXX Logical or physical? */ - udfmp->p_sectors = pms->packet_len / udfmp->bsize; + udfmp->p_sectors = le16toh(pms->packet_len) / udfmp->bsize; /* * XXX If reading the first Sparing Table fails, should look * for another table. */ - if ((error = udf_readlblks(udfmp, pms->st_loc[0], pms->st_size, - &bp)) != 0) { + if ((error = udf_readlblks(udfmp, le32toh(pms->st_loc[0]), + le32toh(pms->st_size), &bp)) != 0) { if (bp != NULL) brelse(bp); printf("Failed to read Sparing Table at sector %d\n", - pms->st_loc[0]); + le32toh(pms->st_loc[0])); return (error); } - bcopy(bp->b_data, udfmp->s_table, pms->st_size); + bcopy(bp->b_data, udfmp->s_table, le32toh(pms->st_size)); brelse(bp); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 24 00:11:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1DFE16A4D4; Thu, 24 Jun 2004 00:11:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CA65916A4D1 for ; Thu, 24 Jun 2004 00:11:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9154843D49 for ; Thu, 24 Jun 2004 00:11:21 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O0BLgA086849 for ; Thu, 24 Jun 2004 00:11:21 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O0BLWq086843 for perforce@freebsd.org; Thu, 24 Jun 2004 00:11:21 GMT (envelope-from peter@freebsd.org) Date: Thu, 24 Jun 2004 00:11:21 GMT Message-Id: <200406240011.i5O0BLWq086843@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 55653 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 00:11:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=55653 Change 55653 by peter@peter_daintree on 2004/06/24 00:11:01 IFC @55651 Affected files ... .. //depot/projects/hammer/bin/ps/ps.c#15 integrate .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#20 integrate .. //depot/projects/hammer/share/man/man4/usb.4#7 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#4 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_raid5.c#3 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_raid5.h#2 integrate Differences ... ==== //depot/projects/hammer/bin/ps/ps.c#15 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.101 2004/06/23 11:40:56 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.102 2004/06/23 21:17:25 gad Exp $"); #include #include @@ -977,19 +977,27 @@ /* * save arguments if needed */ - if (needcomm && (UREADOK(ki) || (ki->ki_p->ki_args != NULL))) { - ki->ki_args = strdup(fmt(kvm_getargv, ki, ki->ki_p->ki_comm, - MAXCOMLEN)); - } else if (needcomm) { - asprintf(&ki->ki_args, "(%s)", ki->ki_p->ki_comm); + if (needcomm) { + if (ki->ki_p->ki_stat == SZOMB) + ki->ki_args = strdup(""); + else if (UREADOK(ki) || (ki->ki_p->ki_args != NULL)) + ki->ki_args = strdup(fmt(kvm_getargv, ki, + ki->ki_p->ki_comm, MAXCOMLEN)); + else + asprintf(&ki->ki_args, "(%s)", ki->ki_p->ki_comm); + if (ki->ki_env == NULL) + errx(1, "malloc failed"); } else { ki->ki_args = NULL; } - if (needenv && UREADOK(ki)) { - ki->ki_env = strdup(fmt(kvm_getenvv, ki, (char *)NULL, 0)); - } else if (needenv) { - ki->ki_env = malloc(3); - strcpy(ki->ki_env, "()"); + if (needenv) { + if (UREADOK(ki)) + ki->ki_env = strdup(fmt(kvm_getenvv, ki, + (char *)NULL, 0)); + else + ki->ki_env = strdup("()"); + if (ki->ki_env == NULL) + errx(1, "malloc failed"); } else { ki->ki_env = NULL; } ==== //depot/projects/hammer/lib/libkvm/kvm_proc.c#20 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.76 2004/06/19 14:08:10 gad Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.78 2004/06/23 21:59:56 gad Exp $"); /* * Proc traversal interface for kvm. ps and w are (probably) the exclusive @@ -128,7 +128,7 @@ TAILQ_FIRST(&proc.p_threads)); return (-1); } - if (proc.p_flag & P_SA == 0) { + if ((proc.p_flag & P_SA) == 0) { if (KREAD(kd, (u_long)TAILQ_FIRST(&proc.p_ksegrps), &mkg)) { @@ -328,10 +328,8 @@ continue; break; } - if (proc.p_comm[0] != 0) { - strncpy(kp->ki_comm, proc.p_comm, MAXCOMLEN); - kp->ki_comm[MAXCOMLEN] = 0; - } + if (proc.p_comm[0] != 0) + strlcpy(kp->ki_comm, proc.p_comm, MAXCOMLEN); (void)kvm_read(kd, (u_long)proc.p_sysent, (char *)&sysent, sizeof(sysent)); (void)kvm_read(kd, (u_long)sysent.sv_name, (char *)&svname, ==== //depot/projects/hammer/share/man/man4/usb.4#7 (text+ko) ==== @@ -25,7 +25,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/usb.4,v 1.30 2003/09/14 13:41:59 ru Exp $ +.\" $FreeBSD: src/share/man/man4/usb.4,v 1.31 2004/06/23 23:25:58 markus Exp $ .\" .Dd February 21, 1999 .Dt USB 4 @@ -236,7 +236,7 @@ .Va udi_config field shows the current configuration of the device. .Pp -.Va udi_peed +.Va udi_speed indicates whether the device is at low speed .Pq Dv USB_SPEED_LOW , full speed ==== //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_plex.c,v 1.3 2004/06/18 19:53:33 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_plex.c,v 1.4 2004/06/23 23:52:55 le Exp $"); #include #include @@ -275,6 +275,8 @@ boff); if (err) { + if (p->org == GV_PLEX_RAID5) + gv_free_raid5_packet(wp); bp->bio_completed += bcount; if (bp->bio_error == 0) bp->bio_error = err; ==== //depot/projects/hammer/sys/geom/vinum/geom_vinum_raid5.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.c,v 1.3 2004/06/22 14:54:31 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.c,v 1.5 2004/06/23 23:52:55 le Exp $"); #include #include @@ -70,6 +70,26 @@ return (wp); } +void +gv_free_raid5_packet(struct gv_raid5_packet *wp) +{ + struct gv_raid5_bit *r, *r2; + + /* Remove all the bits from this work packet. */ + TAILQ_FOREACH_SAFE(r, &wp->bits, list, r2) { + TAILQ_REMOVE(&wp->bits, r, list); + if (r->malloc) + g_free(r->buf); + if (r->bio != NULL) + g_destroy_bio(r->bio); + g_free(r); + } + + if (wp->bufmalloc == 1) + g_free(wp->buf); + g_free(wp); +} + /* * Check if the stripe that the work packet wants is already being used by * some other work packet. @@ -109,7 +129,6 @@ mtx_lock(&p->worklist_mtx); for (;;) { restart = 0; - g_trace(G_T_TOPOLOGY, "gv_raid5_worker scan"); TAILQ_FOREACH_SAFE(wp, &p->worklist, list, wpt) { /* This request packet is already being processed. */ if (wp->state == IO) @@ -141,9 +160,7 @@ mtx_lock(&p->worklist_mtx); } TAILQ_REMOVE(&p->worklist, wp, list); - if (wp->bufmalloc == 1) - g_free(wp->buf); - g_free(wp); + gv_free_raid5_packet(wp); restart++; /*break;*/ } @@ -152,7 +169,6 @@ /* Self-destruct. */ if (p->flags & GV_PLEX_THREAD_DIE) break; - g_trace(G_T_TOPOLOGY, "gv_raid5_worker sleep"); error = msleep(p, &p->worklist_mtx, PRIBIO, "-", hz/100); } @@ -240,15 +256,6 @@ break; } - g_destroy_bio(bp); - - if (rbp != NULL) { - if (rbp->malloc == 1) - g_free(rbp->buf); - TAILQ_REMOVE(&wp->bits, rbp, list); - g_free(rbp); - } - /* This request group is done. */ if (wp->active == 0) wp->state = FINISH; ==== //depot/projects/hammer/sys/geom/vinum/geom_vinum_raid5.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/geom/vinum/geom_vinum_raid5.h,v 1.1 2004/06/12 21:16:10 le Exp $ + * $FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.h,v 1.2 2004/06/23 23:52:55 le Exp $ */ #ifndef _GEOM_VINUM_RAID5_H_ @@ -85,6 +85,7 @@ int gv_build_raid5_req(struct gv_raid5_packet *, struct bio *, caddr_t, long, off_t); +void gv_free_raid5_packet(struct gv_raid5_packet *); void gv_raid5_done(struct bio *); void gv_raid5_worker(void *); struct gv_raid5_packet *gv_new_raid5_packet(void); From owner-p4-projects@FreeBSD.ORG Thu Jun 24 01:32:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 747C316A4D0; Thu, 24 Jun 2004 01:32:01 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3DC4C16A4CE for ; Thu, 24 Jun 2004 01:32:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 369CD43D53 for ; Thu, 24 Jun 2004 01:32:01 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O1W1P8011125 for ; Thu, 24 Jun 2004 01:32:01 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O1W002011117 for perforce@freebsd.org; Thu, 24 Jun 2004 01:32:00 GMT (envelope-from peter@freebsd.org) Date: Thu, 24 Jun 2004 01:32:00 GMT Message-Id: <200406240132.i5O1W002011117@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 55659 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 01:32:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=55659 Change 55659 by peter@peter_daintree on 2004/06/24 01:31:59 I have no idea what the hell is going on here, but CXXFLAGS was missing the -D and -I flags to both mkdep and the c++ compile commands. Affected files ... .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#17 edit .. //depot/projects/hammer/gnu/lib/libsupc++/Makefile#3 edit Differences ... ==== //depot/projects/hammer/gnu/lib/libstdc++/Makefile#17 (text+ko) ==== @@ -15,6 +15,8 @@ CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} +CXXFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H +CXXFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections -Wno-deprecated #LDFLAGS+= -Wl,-version-info,4:0:0 -Wl,--version-script=${SRCDIR}/src/linker.map ==== //depot/projects/hammer/gnu/lib/libsupc++/Makefile#3 (text+ko) ==== @@ -18,6 +18,8 @@ CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H CFLAGS+= -I${SRCDIR} -I${GCCDIR} -I${.CURDIR}/../libstdc++ +CXXFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H +CXXFLAGS+= -I${SRCDIR} -I${GCCDIR} -I${.CURDIR}/../libstdc++ CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections HDRS= exception new typeinfo cxxabi.h exception_defines.h From owner-p4-projects@FreeBSD.ORG Thu Jun 24 03:47:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8597A16A4D0; Thu, 24 Jun 2004 03:47:01 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5F77A16A4CE for ; Thu, 24 Jun 2004 03:47:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 412C743D49 for ; Thu, 24 Jun 2004 03:47:01 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O3l11e041380 for ; Thu, 24 Jun 2004 03:47:01 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O3l0KH041377 for perforce@freebsd.org; Thu, 24 Jun 2004 03:47:00 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 Jun 2004 03:47:00 GMT Message-Id: <200406240347.i5O3l0KH041377@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 Subject: PERFORCE change 55678 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 03:47:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=55678 Change 55678 by marcel@marcel_nfs on 2004/06/24 03:46:27 Re-add i386. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/Makefile#1 add .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/config.h#1 add .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/init.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 24 03:47:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86E2516A4CF; Thu, 24 Jun 2004 03:47:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 599EE16A4D4 for ; Thu, 24 Jun 2004 03:47:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F2A143D49 for ; Thu, 24 Jun 2004 03:47:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O3l26G041387 for ; Thu, 24 Jun 2004 03:47:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O3l1ZS041383 for perforce@freebsd.org; Thu, 24 Jun 2004 03:47:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 24 Jun 2004 03:47:01 GMT Message-Id: <200406240347.i5O3l1ZS041383@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 Subject: PERFORCE change 55679 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 03:47:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=55679 Change 55679 by rwatson@rwatson_tislabs on 2004/06/24 03:46:34 Integrate netperf_socket to loop back a variety of changes associated with rwatson_netperf, including: - portalfs locking - expand sockbuf locking in sopoll() to include selrecord() - add sbreserve_locked(), expand and coallesce locking in soreserve() - ng_base locking fixes - when asserting various network locks, also conditionally assert giant - lock some accesses to inpcb fields in ip_ctloutput() - clean up socket buffer locking in tcp_input, covering oobmark, sbdrop() for ACK processing, tcp_mss(), etc - netnatm const merge - sb_flags locking in nfs_socket - mac_ifnet_mtx, mpo_copy_label, don't externalize holding mutex Affected files ... .. //depot/projects/netperf_socket/sys/compat/svr4/imgact_svr4.c#3 integrate .. //depot/projects/netperf_socket/sys/conf/options.sparc64#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#27 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/ofw_console.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vnops.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_plex.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_raid5.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/linux/imgact_linux.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#23 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#20 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#21 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_dummynet.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#7 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_output.c#12 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#13 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#11 integrate .. //depot/projects/netperf_socket/sys/netnatm/natm.c#5 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/netperf_socket/sys/security/mac/mac_net.c#5 integrate .. //depot/projects/netperf_socket/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/netperf_socket/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/netperf_socket/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/netperf_socket/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/netperf_socket/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/NOTES#4 integrate .. //depot/projects/netperf_socket/sys/sys/mac_policy.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#18 integrate .. //depot/projects/netperf_socket/sys/vm/uma_core.c#7 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pageout.c#6 integrate Differences ... ==== //depot/projects/netperf_socket/sys/compat/svr4/imgact_svr4.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.22 2004/02/04 21:52:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.23 2004/06/24 02:21:17 obrien Exp $"); #include #include @@ -90,7 +90,7 @@ } bss_size = round_page(a_out->a_bss); #ifdef DEBUG - printf("imgact: text: %08lx, data: %08lx, bss: %08lx\n", a_out->a_text, a_out->a_data, bss_size); + printf("imgact: text: %08lx, data: %08lx, bss: %08lx\n", (u_long)a_out->a_text, (u_long)a_out->a_data, bss_size); #endif /* @@ -193,7 +193,7 @@ #ifdef DEBUG printf("imgact: startaddr=%08lx, length=%08lx\n", (u_long)vmaddr, - a_out->a_text + a_out->a_data); + (u_long)a_out->a_text + a_out->a_data); #endif /* * allow read/write of data ==== //depot/projects/netperf_socket/sys/conf/options.sparc64#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.sparc64,v 1.10 2004/05/08 13:53:46 marius Exp $ +# $FreeBSD: src/sys/conf/options.sparc64,v 1.11 2004/06/24 02:57:10 obrien Exp $ SUN4U opt_global.h @@ -9,6 +9,7 @@ PSYCHO_DEBUG opt_psycho.h DEBUGGER_ON_POWERFAIL opt_psycho.h OFW_PCI_DEBUG opt_ofw_pci.h +OFWCONS_POLL_HZ opt_ofw.h # Debug IOMMU inserts/removes using diagnostic accesses. Very loud. IOMMU_DIAG opt_iommu.h PMAP_STATS opt_pmap.h ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#27 (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/dev/acpica/acpi.c,v 1.164 2004/06/23 17:21:02 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.165 2004/06/24 00:48:45 njl Exp $ */ #include "opt_acpi.h" @@ -129,7 +129,6 @@ static ACPI_STATUS acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status); static void acpi_shutdown_final(void *arg, int howto); -static void acpi_shutdown_poweroff(void *arg); static void acpi_enable_fixed_events(struct acpi_softc *sc); static int acpi_parse_prw(ACPI_HANDLE h, struct acpi_prw_data *prw); static ACPI_STATUS acpi_wake_limit(ACPI_HANDLE h, UINT32 level, void *context, @@ -1282,9 +1281,9 @@ ACPI_STATUS status; /* - * If powering off, run the actual shutdown code on each processor. - * It will only perform the shutdown on the BSP. Some chipsets do - * not power off the system correctly if called from an AP. + * XXX Shutdown code should only run on the BSP (cpuid 0). + * Some chipsets do not power off the system correctly if called from + * an AP. */ if ((howto & RB_POWEROFF) != 0) { status = AcpiEnterSleepStatePrep(ACPI_STATE_S5); @@ -1294,36 +1293,20 @@ return; } printf("Powering system off using ACPI\n"); - smp_rendezvous(NULL, acpi_shutdown_poweroff, NULL, NULL); + ACPI_DISABLE_IRQS(); + status = AcpiEnterSleepState(ACPI_STATE_S5); + if (ACPI_FAILURE(status)) { + printf("ACPI power-off failed - %s\n", AcpiFormatException(status)); + } else { + DELAY(1000000); + printf("ACPI power-off failed - timeout\n"); + } } else { printf("Shutting down ACPI\n"); AcpiTerminate(); } } -/* - * Since this function may be called with locks held or in an unknown - * context, it cannot allocate memory, acquire locks, sleep, etc. - */ -static void -acpi_shutdown_poweroff(void *arg) -{ - ACPI_STATUS status; - - /* Only attempt to power off if this is the BSP (cpuid 0). */ - if (PCPU_GET(cpuid) != 0) - return; - - ACPI_DISABLE_IRQS(); - status = AcpiEnterSleepState(ACPI_STATE_S5); - if (ACPI_FAILURE(status)) { - printf("ACPI power-off failed - %s\n", AcpiFormatException(status)); - } else { - DELAY(1000000); - printf("ACPI power-off failed - timeout\n"); - } -} - static void acpi_enable_fixed_events(struct acpi_softc *sc) { ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.40 2004/06/19 02:27:23 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.41 2004/06/24 00:38:51 njl Exp $"); #include "opt_acpi.h" #include @@ -1046,7 +1046,7 @@ struct sbuf sb; char buf[128]; int i; - uint64_t fract, sum, whole; + uintmax_t fract, sum, whole; sum = 0; for (i = 0; i < cpu_cx_count; i++) @@ -1054,7 +1054,7 @@ sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN); for (i = 0; i < cpu_cx_count; i++) { if (sum > 0) { - whole = cpu_cx_stats[i] * 100; + whole = (uintmax_t)cpu_cx_stats[i] * 100; fract = (whole % sum) * 100; sbuf_printf(&sb, "%u.%02u%% ", (u_int)(whole / sum), (u_int)(fract / sum)); ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.19 2004/06/23 15:08:40 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.20 2004/06/24 01:57:31 njl Exp $"); #include #include @@ -232,7 +232,7 @@ if (ACPI_FAILURE(status)) printf("WARNING: Unable to detach object data from %s - %s\n", acpi_name(handle), AcpiFormatException(status)); - status = AcpiAttachData(handle, acpi_fake_objhandler, child); + status = AcpiAttachData(handle, acpi_fake_objhandler, pci_child); if (ACPI_FAILURE(status)) printf("WARNING: Unable to attach object data to %s - %s\n", acpi_name(handle), AcpiFormatException(status)); @@ -261,8 +261,7 @@ dinfo->ap_dinfo.cfg.slot == slot) { dinfo->ap_handle = handle; acpi_pci_update_device(handle, devlist[i]); - free(devlist, M_TEMP); - return_ACPI_STATUS (AE_OK); + break; } } free(devlist, M_TEMP); ==== //depot/projects/netperf_socket/sys/dev/ofw/ofw_console.c#7 (text+ko) ==== @@ -24,10 +24,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.24 2004/06/16 09:46:52 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.25 2004/06/24 02:57:11 obrien Exp $"); #include "opt_ddb.h" #include "opt_comconsole.h" +#include "opt_ofw.h" #include #include @@ -42,7 +43,10 @@ #include -#define OFW_POLL_HZ 4 +#ifndef OFWCONS_POLL_HZ +#define OFWCONS_POLL_HZ 4 /* 50-100 works best on Ultra2 */ +#endif +#define OFBURSTLEN 128 /* max number of bytes to write in one chunk */ static d_open_t ofw_dev_open; static d_close_t ofw_dev_close; @@ -125,7 +129,7 @@ ttychars(tp); tp->t_iflag = TTYDEF_IFLAG; tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG|CLOCAL; + tp->t_cflag = TTYDEF_CFLAG; tp->t_lflag = TTYDEF_LFLAG; tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; ttsetwater(tp); @@ -138,7 +142,7 @@ error = ttyld_open(tp, dev); if (error == 0 && setuptimeout) { - polltime = hz / OFW_POLL_HZ; + polltime = hz / OFWCONS_POLL_HZ; if (polltime < 1) { polltime = 1; } @@ -162,6 +166,8 @@ return (ENXIO); } + /* XXX Should be replaced with callout_stop(9) */ + untimeout(ofw_timeout, tp, ofw_timeouthandle); ttyld_close(tp, flag); ttyclose(tp); @@ -179,16 +185,18 @@ static void ofw_tty_start(struct tty *tp) { + struct clist *cl; + int len; + u_char buf[OFBURSTLEN]; + - if (tp->t_state & (TS_TIMEOUT | TS_TTSTOP)) { - ttwwakeup(tp); + if (tp->t_state & (TS_TIMEOUT | TS_BUSY | TS_TTSTOP)) return; - } tp->t_state |= TS_BUSY; - while (tp->t_outq.c_cc != 0) { - ofw_cons_putc(NULL, getc(&tp->t_outq)); - } + cl = &tp->t_outq; + len = q_to_b(cl, buf, OFBURSTLEN); + OF_write(stdout, buf, len); tp->t_state &= ~TS_BUSY; ttwwakeup(tp); ==== //depot/projects/netperf_socket/sys/fs/portalfs/portal_vnops.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * * @(#)portal_vnops.c 8.14 (Berkeley) 5/21/95 * - * $FreeBSD: src/sys/fs/portalfs/portal_vnops.c,v 1.64 2004/06/23 06:47:49 bde Exp $ + * $FreeBSD: src/sys/fs/portalfs/portal_vnops.c,v 1.65 2004/06/24 00:47:23 rwatson Exp $ */ /* @@ -216,7 +216,6 @@ struct portalnode *pt; struct thread *td = ap->a_td; struct vnode *vp = ap->a_vp; - int s; struct uio auio; struct iovec aiov[2]; int res; @@ -284,16 +283,18 @@ * will happen if the server dies. Sleep for 5 second intervals * and keep polling the reference count. XXX. */ - s = splnet(); + /* XXXRW: Locking? */ + SOCK_LOCK(so); while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) { if (fmp->pm_server->f_count == 1) { + SOCK_UNLOCK(so); error = ECONNREFUSED; - splx(s); goto bad; } - (void) tsleep((caddr_t) &so->so_timeo, PSOCK, "portalcon", 5 * hz); + (void) msleep((caddr_t) &so->so_timeo, SOCK_MTX(so), PSOCK, + "portalcon", 5 * hz); } - splx(s); + SOCK_UNLOCK(so); if (so->so_error) { error = so->so_error; @@ -303,12 +304,12 @@ /* * Set miscellaneous flags */ + SOCKBUF_LOCK(&so->so_rcv); so->so_rcv.sb_timeo = 0; - so->so_snd.sb_timeo = 0; - SOCKBUF_LOCK(&so->so_rcv); so->so_rcv.sb_flags |= SB_NOINTR; SOCKBUF_UNLOCK(&so->so_rcv); SOCKBUF_LOCK(&so->so_snd); + so->so_snd.sb_timeo = 0; so->so_snd.sb_flags |= SB_NOINTR; SOCKBUF_UNLOCK(&so->so_snd); ==== //depot/projects/netperf_socket/sys/fs/udf/udf_vnops.c#5 (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/fs/udf/udf_vnops.c,v 1.36 2004/06/23 19:36:09 scottl Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vnops.c,v 1.37 2004/06/23 21:49:03 scottl Exp $ */ /* udf_vnops.c */ @@ -186,11 +186,11 @@ udf_permtomode(struct udf_node *node) { uint32_t perm; - uint32_t flags; + uint16_t flags; mode_t mode; - perm = node->fentry->perm; - flags = node->fentry->icbtag.flags; + perm = le32toh(node->fentry->perm); + flags = le16toh(node->fentry->icbtag.flags); mode = perm & UDF_FENTRY_PERM_USER_MASK; mode |= ((perm & UDF_FENTRY_PERM_GRP_MASK) >> 2); @@ -256,7 +256,7 @@ static void udf_timetotimespec(struct timestamp *time, struct timespec *t) { - int i, lpyear, daysinyear; + int i, lpyear, daysinyear, year; union { uint16_t u_tz_offset; int16_t s_tz_offset; @@ -265,7 +265,8 @@ t->tv_nsec = 0; /* DirectCD seems to like using bogus year values */ - if (time->year < 1970) { + year = le16toh(time->year); + if (year < 1970) { t->tv_sec = 0; return; } @@ -277,18 +278,18 @@ t->tv_sec += time->day * 3600 * 24; /* Calclulate the month */ - lpyear = udf_isaleapyear(time->year); + lpyear = udf_isaleapyear(year); for (i = 1; i < time->month; i++) t->tv_sec += mon_lens[lpyear][i] * 3600 * 24; /* Speed up the calculation */ - if (time->year > 1979) + if (year > 1979) t->tv_sec += 315532800; - if (time->year > 1989) + if (year > 1989) t->tv_sec += 315619200; - if (time->year > 1999) + if (year > 1999) t->tv_sec += 315532800; - for (i = 2000; i < time->year; i++) { + for (i = 2000; i < year; i++) { daysinyear = udf_isaleapyear(i) + 365 ; t->tv_sec += daysinyear * 3600 * 24; } @@ -297,7 +298,7 @@ * Calculate the time zone. The timezone is 12 bit signed 2's * compliment, so we gotta do some extra magic to handle it right. */ - tz.u_tz_offset = time->type_tz; + tz.u_tz_offset = le16toh(time->type_tz); tz.u_tz_offset &= 0x0fff; if (tz.u_tz_offset & 0x0800) tz.u_tz_offset |= 0xf000; /* extend the sign to 16 bits */ @@ -326,13 +327,13 @@ vap->va_fsid = dev2udev(node->i_dev); vap->va_fileid = node->hash_id; vap->va_mode = udf_permtomode(node); - vap->va_nlink = fentry->link_cnt; + vap->va_nlink = le16toh(fentry->link_cnt); /* * XXX The spec says that -1 is valid for uid/gid and indicates an * invalid uid/gid. How should this be represented? */ - vap->va_uid = (fentry->uid == -1) ? 0 : fentry->uid; - vap->va_gid = (fentry->gid == -1) ? 0 : fentry->gid; + vap->va_uid = (le32toh(fentry->uid) == -1) ? 0 : le32toh(fentry->uid); + vap->va_gid = (le32toh(fentry->gid) == -1) ? 0 : le32toh(fentry->gid); udf_timetotimespec(&fentry->atime, &vap->va_atime); udf_timetotimespec(&fentry->mtime, &vap->va_mtime); vap->va_ctime = vap->va_mtime; /* XXX Stored as an Extended Attribute */ @@ -345,24 +346,25 @@ * make it appear so. */ if (fentry->logblks_rec != 0) { - vap->va_size = fentry->logblks_rec * node->udfmp->bsize; + vap->va_size = + le64toh(fentry->logblks_rec) * node->udfmp->bsize; } else { vap->va_size = node->udfmp->bsize; } } else { - vap->va_size = fentry->inf_len; + vap->va_size = le64toh(fentry->inf_len); } vap->va_flags = 0; vap->va_gen = 1; vap->va_blocksize = node->udfmp->bsize; - vap->va_bytes = fentry->inf_len; + vap->va_bytes = le64toh(fentry->inf_len); vap->va_type = vp->v_type; vap->va_filerev = 0; /* XXX */ return (0); } /* - * File specific ioctls. DeCSS candidate? + * File specific ioctls. */ static int udf_ioctl(struct vop_ioctl_args *a) @@ -411,7 +413,7 @@ if (uio->uio_offset < 0) return (EINVAL); - fsize = node->fentry->inf_len; + fsize = le64toh(node->fentry->inf_len); while (uio->uio_offset < fsize && uio->uio_resid > 0) { offset = uio->uio_offset; @@ -602,7 +604,7 @@ * looking for the l_iu and l_fi fields. */ if (ds->off + UDF_FID_SIZE > ds->size || - ds->off + fid->l_iu + fid->l_fi + UDF_FID_SIZE > ds->size) { + ds->off + le16toh(fid->l_iu) + fid->l_fi + UDF_FID_SIZE > ds->size){ /* Copy what we have of the fid into a buffer */ frag_size = ds->size - ds->off; @@ -649,7 +651,7 @@ * copy in the rest of the fid from the new * allocation. */ - total_fid_size = UDF_FID_SIZE + fid->l_iu + fid->l_fi; + total_fid_size = UDF_FID_SIZE + le16toh(fid->l_iu) + fid->l_fi; if (total_fid_size > ds->udfmp->bsize) { printf("udf: invalid FID\n"); ds->error = EIO; @@ -660,7 +662,7 @@ ds->fid_fragment = 1; } else { - total_fid_size = fid->l_iu + fid->l_fi + UDF_FID_SIZE; + total_fid_size = le16toh(fid->l_iu) + fid->l_fi + UDF_FID_SIZE; } /* @@ -733,7 +735,7 @@ * Iterate through the file id descriptors. Give the parent dir * entry special attention. */ - ds = udf_opendir(node, uio->uio_offset, node->fentry->inf_len, + ds = udf_opendir(node, uio->uio_offset, le64toh(node->fentry->inf_len), node->udfmp); while ((fid = udf_getfid(ds)) != NULL) { @@ -918,7 +920,7 @@ flags = a->a_cnp->cn_flags; nameptr = a->a_cnp->cn_nameptr; namelen = a->a_cnp->cn_namelen; - fsize = node->fentry->inf_len; + fsize = le64toh(node->fentry->inf_len); td = a->a_cnp->cn_thread; /* @@ -1077,8 +1079,8 @@ * allocation descriptor field of the file entry. */ fentry = node->fentry; - *data = &fentry->data[fentry->l_ea]; - *size = fentry->l_ad; + *data = &fentry->data[le32toh(fentry->l_ea)]; + *size = le32toh(fentry->l_ad); return (0); } else if (error != 0) { return (error); @@ -1120,7 +1122,7 @@ fentry = node->fentry; tag = &fentry->icbtag; - switch (tag->strat_type) { + switch (le16toh(tag->strat_type)) { case 4: break; @@ -1133,7 +1135,7 @@ return (ENODEV); } - switch (tag->flags & 0x7) { + switch (le16toh(tag->flags) & 0x7) { case 0: /* * The allocation descriptor field is filled with short_ad's. @@ -1143,11 +1145,12 @@ do { offset -= icblen; ad_offset = sizeof(struct short_ad) * ad_num; - if (ad_offset > fentry->l_ad) { + if (ad_offset > le32toh(fentry->l_ad)) { printf("File offset out of bounds\n"); return (EINVAL); } - icb = GETICB(long_ad, fentry, fentry->l_ea + ad_offset); + icb = GETICB(long_ad, fentry, + le32toh(fentry->l_ea) + ad_offset); icblen = GETICBLEN(short_ad, icb); ad_num++; } while(offset >= icblen); @@ -1167,17 +1170,18 @@ do { offset -= icblen; ad_offset = sizeof(struct long_ad) * ad_num; - if (ad_offset > fentry->l_ad) { + if (ad_offset > le32toh(fentry->l_ad)) { printf("File offset out of bounds\n"); return (EINVAL); } - icb = GETICB(long_ad, fentry, fentry->l_ea + ad_offset); + icb = GETICB(long_ad, fentry, + le32toh(fentry->l_ea) + ad_offset); icblen = GETICBLEN(long_ad, icb); ad_num++; } while(offset >= icblen); lsector = (offset >> udfmp->bshift) + - ((struct long_ad *)(icb))->loc.lb_num; + le32toh(((struct long_ad *)(icb))->loc.lb_num); *max_size = GETICBLEN(long_ad, icb); @@ -1207,9 +1211,11 @@ */ if (udfmp->s_table != NULL) { for (i = 0; i< udfmp->s_table_entries; i++) { - p_offset = lsector - udfmp->s_table->entries[i].org; + p_offset = + lsector - le32toh(udfmp->s_table->entries[i].org); if ((p_offset < udfmp->p_sectors) && (p_offset >= 0)) { - *sector = udfmp->s_table->entries[i].map + + *sector = + le32toh(udfmp->s_table->entries[i].map) + p_offset; break; } ==== //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum.c,v 1.2 2004/06/18 19:53:33 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum.c,v 1.3 2004/06/24 02:40:34 csjp Exp $"); #include #include @@ -319,8 +319,16 @@ d = g_malloc(sizeof(*d), M_WAITOK | M_ZERO); bcopy(d2, d, sizeof(*d)); - /* XXX */ + /* + * Make sure that the provider specified in the drive + * specification is an active GEOM provider. + */ pp = g_provider_by_name(d->device); + if (pp == NULL) { + gctl_error(req, "%s: drive not found", d->device); + g_free(d); + return (-1); + } d->size = pp->mediasize - GV_DATA_START; d->avail = d->size; @@ -456,8 +464,17 @@ */ LIST_FOREACH(d, &sc->drives, drive) { if (d->geom == NULL) { - /* XXX */ + /* + * XXX if the provider disapears before we get a chance + * to write the config out to the drive, should this + * be handled any differently? + */ pp = g_provider_by_name(d->device); + if (pp == NULL) { + printf("geom_vinum: %s: drive disapeared?\n", + d->device); + continue; + } cp = g_new_consumer(gp); g_attach(cp, pp); gv_save_config(cp, d, sc); ==== //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_plex.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_plex.c,v 1.3 2004/06/18 19:53:33 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_plex.c,v 1.4 2004/06/23 23:52:55 le Exp $"); #include #include @@ -275,6 +275,8 @@ boff); if (err) { + if (p->org == GV_PLEX_RAID5) + gv_free_raid5_packet(wp); bp->bio_completed += bcount; if (bp->bio_error == 0) bp->bio_error = err; ==== //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_raid5.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.c,v 1.3 2004/06/22 14:54:31 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.c,v 1.5 2004/06/23 23:52:55 le Exp $"); #include #include @@ -70,6 +70,26 @@ return (wp); } +void +gv_free_raid5_packet(struct gv_raid5_packet *wp) +{ + struct gv_raid5_bit *r, *r2; + + /* Remove all the bits from this work packet. */ + TAILQ_FOREACH_SAFE(r, &wp->bits, list, r2) { + TAILQ_REMOVE(&wp->bits, r, list); + if (r->malloc) + g_free(r->buf); + if (r->bio != NULL) + g_destroy_bio(r->bio); + g_free(r); + } + + if (wp->bufmalloc == 1) + g_free(wp->buf); + g_free(wp); +} + /* * Check if the stripe that the work packet wants is already being used by * some other work packet. @@ -109,7 +129,6 @@ mtx_lock(&p->worklist_mtx); for (;;) { restart = 0; - g_trace(G_T_TOPOLOGY, "gv_raid5_worker scan"); TAILQ_FOREACH_SAFE(wp, &p->worklist, list, wpt) { /* This request packet is already being processed. */ if (wp->state == IO) @@ -141,9 +160,7 @@ mtx_lock(&p->worklist_mtx); } TAILQ_REMOVE(&p->worklist, wp, list); - if (wp->bufmalloc == 1) - g_free(wp->buf); - g_free(wp); + gv_free_raid5_packet(wp); restart++; /*break;*/ } @@ -152,7 +169,6 @@ /* Self-destruct. */ if (p->flags & GV_PLEX_THREAD_DIE) break; - g_trace(G_T_TOPOLOGY, "gv_raid5_worker sleep"); error = msleep(p, &p->worklist_mtx, PRIBIO, "-", hz/100); } @@ -240,15 +256,6 @@ break; } - g_destroy_bio(bp); - - if (rbp != NULL) { - if (rbp->malloc == 1) - g_free(rbp->buf); - TAILQ_REMOVE(&wp->bits, rbp, list); - g_free(rbp); - } - /* This request group is done. */ if (wp->active == 0) wp->state = FINISH; ==== //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_raid5.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/geom/vinum/geom_vinum_raid5.h,v 1.1 2004/06/12 21:16:10 le Exp $ + * $FreeBSD: src/sys/geom/vinum/geom_vinum_raid5.h,v 1.2 2004/06/23 23:52:55 le Exp $ */ #ifndef _GEOM_VINUM_RAID5_H_ @@ -85,6 +85,7 @@ int gv_build_raid5_req(struct gv_raid5_packet *, struct bio *, caddr_t, long, off_t); +void gv_free_raid5_packet(struct gv_raid5_packet *); void gv_raid5_done(struct bio *); void gv_raid5_worker(void *); struct gv_raid5_packet *gv_new_raid5_packet(void); ==== //depot/projects/netperf_socket/sys/i386/linux/imgact_linux.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/imgact_linux.c,v 1.51 2004/02/04 21:52:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/imgact_linux.c,v 1.52 2004/06/24 02:24:39 obrien Exp $"); #include #include @@ -192,7 +192,7 @@ #ifdef DEBUG printf("imgact: startaddr=%08lx, length=%08lx\n", - (u_long)vmaddr, a_out->a_text + a_out->a_data); + (u_long)vmaddr, (u_long)a_out->a_text + (u_long)a_out->a_data); #endif /* * allow read/write of data ==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#23 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.187 2004/06/22 03:49:22 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.188 2004/06/24 00:54:26 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -1915,15 +1915,15 @@ if (events & (POLLIN | POLLINIGNEOF | POLLPRI | POLLRDNORM | POLLRDBAND)) { + SOCKBUF_LOCK(&so->so_rcv); selrecord(td, &so->so_rcv.sb_sel); - SOCKBUF_LOCK(&so->so_rcv); so->so_rcv.sb_flags |= SB_SEL; SOCKBUF_UNLOCK(&so->so_rcv); } if (events & (POLLOUT | POLLWRNORM)) { + SOCKBUF_LOCK(&so->so_snd); selrecord(td, &so->so_snd.sb_sel); - SOCKBUF_LOCK(&so->so_snd); so->so_snd.sb_flags |= SB_SEL; SOCKBUF_UNLOCK(&so->so_snd); } ==== //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#20 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.134 2004/06/21 00:20:42 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.135 2004/06/24 01:37:03 rwatson Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -506,24 +506,26 @@ { struct thread *td = curthread; - if (sbreserve(&so->so_snd, sndcc, so, td) == 0) + SOCKBUF_LOCK(&so->so_snd); + SOCKBUF_LOCK(&so->so_rcv); + if (sbreserve_locked(&so->so_snd, sndcc, so, td) == 0) goto bad; - if (sbreserve(&so->so_rcv, rcvcc, so, td) == 0) + if (sbreserve_locked(&so->so_rcv, rcvcc, so, td) == 0) goto bad2; - SOCKBUF_LOCK(&so->so_rcv); if (so->so_rcv.sb_lowat == 0) so->so_rcv.sb_lowat = 1; - SOCKBUF_UNLOCK(&so->so_rcv); - SOCKBUF_LOCK(&so->so_snd); if (so->so_snd.sb_lowat == 0) so->so_snd.sb_lowat = MCLBYTES; if (so->so_snd.sb_lowat > so->so_snd.sb_hiwat) so->so_snd.sb_lowat = so->so_snd.sb_hiwat; + SOCKBUF_UNLOCK(&so->so_rcv); SOCKBUF_UNLOCK(&so->so_snd); return (0); bad2: - sbrelease(&so->so_snd, so); + sbrelease_locked(&so->so_snd, so); bad: + SOCKBUF_UNLOCK(&so->so_rcv); + SOCKBUF_UNLOCK(&so->so_snd); return (ENOBUFS); } @@ -553,7 +555,7 @@ * if buffering efficiency is near the normal case. */ int -sbreserve(sb, cc, so, td) +sbreserve_locked(sb, cc, so, td) struct sockbuf *sb; u_long cc; struct socket *so; @@ -561,6 +563,8 @@ { rlim_t sbsize_limit; + SOCKBUF_LOCK_ASSERT(sb); + /* * td will only be NULL when we're in an interrupt * (e.g. in tcp_input()) @@ -582,6 +586,21 @@ return (1); } +int +sbreserve(sb, cc, so, td) + struct sockbuf *sb; + u_long cc; + struct socket *so; + struct thread *td; +{ + int error; + + SOCKBUF_LOCK(sb); + error = sbreserve_locked(sb, cc, so, td); + SOCKBUF_UNLOCK(sb); + return (error); +} + /* * Free mbufs held by a socket, and reserved mbuf space. */ ==== //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#21 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.195 2004/06/22 23:58:09 bms Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.196 2004/06/24 01:43:23 rwatson Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" ==== //depot/projects/netperf_socket/sys/netgraph/ng_base.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ * Authors: Julian Elischer * Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.75 2004/05/29 07:21:46 julian Exp $ + * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.76 2004/06/24 01:47:31 rwatson Exp $ * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $ */ @@ -170,6 +170,7 @@ #define NG_IDHASH_FN(ID) ((ID) % (NG_ID_HASH_SIZE)) #define NG_IDHASH_FIND(ID, node) \ do { \ + mtx_assert(&ng_idhash_mtx, MA_OWNED); \ LIST_FOREACH(node, &ng_ID_hash[NG_IDHASH_FN(ID)], \ nd_idnodes) { \ if (NG_NODE_IS_VALID(node) \ @@ -3231,10 +3232,12 @@ { node_p node; int i = 1; + mtx_lock(&ng_nodelist_mtx); SLIST_FOREACH(node, &ng_allnodes, nd_all) { printf("[%d] ", i++); dumpnode(node, NULL, 0); } + mtx_unlock(&ng_nodelist_mtx); } static void @@ -3242,10 +3245,12 @@ { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 24 03:55:14 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B66A16A4D0; Thu, 24 Jun 2004 03:55:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C87E16A4CF for ; Thu, 24 Jun 2004 03:55:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3DEBB43D2F for ; Thu, 24 Jun 2004 03:55:14 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O3tDhc043287 for ; Thu, 24 Jun 2004 03:55:14 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O3tDh8043284 for perforce@freebsd.org; Thu, 24 Jun 2004 03:55:13 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 Jun 2004 03:55:13 GMT Message-Id: <200406240355.i5O3tDh8043284@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 Subject: PERFORCE change 55681 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 03:55:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=55681 Change 55681 by marcel@marcel_nfs on 2004/06/24 03:55:06 Remove the binutils directories and add libgdb. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/Makefile#4 edit Differences ... ==== //depot/projects/gdb/gnu/usr.bin/gdb/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= bfd libiberty opcodes gdb +SUBDIR= libgdb gdb .include From owner-p4-projects@FreeBSD.ORG Thu Jun 24 03:56:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4196E16A4D0; Thu, 24 Jun 2004 03:56:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1B36816A4CE for ; Thu, 24 Jun 2004 03:56:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13FF643D2D for ; Thu, 24 Jun 2004 03:56:16 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O3uFQN043378 for ; Thu, 24 Jun 2004 03:56:15 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O3uFUK043375 for perforce@freebsd.org; Thu, 24 Jun 2004 03:56:15 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 Jun 2004 03:56:15 GMT Message-Id: <200406240356.i5O3uFUK043375@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 Subject: PERFORCE change 55682 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 03:56:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=55682 Change 55682 by marcel@marcel_nfs on 2004/06/24 03:56:07 o Update to use contrib/binutils o Update to new layout Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/Makefile.inc#2 edit Differences ... ==== //depot/projects/gdb/gnu/usr.bin/gdb/Makefile.inc#2 (text+ko) ==== @@ -1,3 +1,41 @@ # $FreeBSD$ +VERSION= "6.1.1 [FreeBSD]" +VENDOR= marcel + +BMAKE_GDB= ${.CURDIR}/.. +BMAKE_ROOT= ${BMAKE_GDB}/.. +BMAKE_BU= ${BMAKE_ROOT}/binutils + +CNTRB_ROOT= ${BMAKE_ROOT}/../../contrib +CNTRB_BU= ${CNTRB_ROOT}/binutils +CNTRB_GDB= ${CNTRB_ROOT}/gdb + +OBJ_ROOT= ${.OBJDIR}/../.. +OBJ_BU= ${OBJ_ROOT}/binutils +OBJ_GDB= ${OBJ_ROOT}/gdb + +TARGET_ARCH?= ${MACHINE_ARCH} +TARGET_SUBDIR= ${BMAKE_GDB}/arch/${TARGET_ARCH} + +.PATH: ${CNTRB_GDB}/gdb ${CNTRB_GDB}/gdb/cli ${CNTRB_GDB}/gdb/mi \ + ${CNTRB_GDB}/gdb/signals ${CNTRB_GDB}/gdb/tui ${TARGET_SUBDIR} + +CFLAGS+= -DHAVE_CONFIG_H -DRL_NO_COMPAT -DMI_OUT=1 -DTUI=1 +CFLAGS+= -I. +CFLAGS+= -I${TARGET_SUBDIR} +CFLAGS+= -I${BMAKE_BU}/libbfd/${TARGET_ARCH} +CFLAGS+= -I${CNTRB_GDB}/gdb +CFLAGS+= -I${CNTRB_GDB}/gdb/config +CFLAGS+= -I${CNTRB_GDB}/include +CFLAGS+= -I${CNTRB_BU}/include +CFLAGS+= -I${CNTRB_BU}/bfd + +GENSRCS+= nm.h tm.h + +.include "${TARGET_SUBDIR}/Makefile" + +SRCS+= ${GENSRCS} +CLEANFILES+= ${GENSRCS} + .include "../Makefile.inc" From owner-p4-projects@FreeBSD.ORG Thu Jun 24 03:58:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C36416A4D0; Thu, 24 Jun 2004 03:58:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5DBB516A4CE for ; Thu, 24 Jun 2004 03:58:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 431D443D58 for ; Thu, 24 Jun 2004 03:58:19 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O3wJNA043452 for ; Thu, 24 Jun 2004 03:58:19 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O3wIaQ043449 for perforce@freebsd.org; Thu, 24 Jun 2004 03:58:18 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 Jun 2004 03:58:18 GMT Message-Id: <200406240358.i5O3wIaQ043449@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 Subject: PERFORCE change 55683 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 03:58:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=55683 Change 55683 by marcel@marcel_nfs on 2004/06/24 03:58:03 Major simplification now that we build libgdb Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#16 edit Differences ... ==== //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#16 (text+ko) ==== @@ -1,77 +1,17 @@ # $FreeBSD$ -.include "../Makefile.inc0" - -.PATH: ${CNTRB_GDB}/gdb ${CNTRB_GDB}/gdb/cli ${CNTRB_GDB}/gdb/mi \ - ${CNTRB_GDB}/gdb/signals ${CNTRB_GDB}/gdb/tui ${TARGET_SUBDIR} - PROG= gdb -NOMAN= yes -GENSRCS=version.c nm.h tm.h -SRCS= annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c bcache.c \ - bfd-target.c block.c blockframe.c breakpoint.c buildsym.c \ - c-exp.y c-lang.c c-typeprint.c c-valprint.c charset.c \ - cli-cmds.c cli-decode.c cli-dump.c cli-interp.c cli-logging.c \ - cli-out.c cli-script.c cli-setshow.c cli-utils.c coff-pe-read.c \ - coffread.c complaints.c completer.c copying.c corefile.c \ - corelow.c cp-abi.c cp-namespace.c cp-support.c cp-valprint.c \ - dbxread.c dcache.c demangle.c dictionary.c disasm.c doublest.c \ - dummy-frame.c dwarf2-frame.c dwarf2expr.c dwarf2loc.c \ - dwarf2read.c dwarfread.c elfread.c environ.c eval.c \ - event-loop.c event-top.c exec.c expprint.c f-exp.y f-lang.c \ - f-typeprint.c f-valprint.c findvar.c fork-child.c frame-base.c \ - frame-unwind.c frame.c gdb-events.c gdb.c gdbarch.c gdbtypes.c \ - gnu-v2-abi.c gnu-v3-abi.c hpacc-abi.c inf-loop.c infcall.c \ - infcmd.c inflow.c infptrace.c infrun.c inftarg.c init.c \ - interps.c jv-exp.y jv-lang.c jv-typeprint.c jv-valprint.c \ - kod-cisco.c kod.c language.c linespec.c m2-exp.y m2-lang.c \ - m2-typeprint.c m2-valprint.c macrocmd.c macroexp.c macroscope.c \ - macrotab.c main.c maint.c mdebugread.c mem-break.c memattr.c \ - mi-cmd-break.c mi-cmd-disas.c mi-cmd-env.c mi-cmd-file.c \ - mi-cmd-stack.c mi-cmd-var.c mi-cmds.c mi-console.c mi-getopt.c \ - mi-interp.c mi-main.c mi-out.c mi-parse.c mi-symbol-cmds.c \ - minsyms.c mipsread.c nlmread.c objc-exp.y objc-lang.c \ - objfiles.c observer.c osabi.c p-exp.y p-lang.c p-typeprint.c \ - p-valprint.c parse.c printcmd.c regcache.c reggroups.c remote.c \ - remote-fileio.c remote-utils.c scm-exp.c scm-lang.c \ - scm-valprint.c sentinel-frame.c ser-pipe.c ser-tcp.c ser-unix.c \ - serial.c signals.c solib.c solib-svr4.c source.c stabsread.c \ - stack.c std-regs.c symfile.c symmisc.c symtab.c target.c \ - thread.c top.c tracepoint.c trad-frame.c tui.c tui-command.c \ - tui-data.c tui-disasm.c tui-file.c tui-hooks.c tui-interp.c \ - tui-io.c tui-layout.c tui-out.c tui-regs.c tui-source.c \ - tui-stack.c tui-win.c tui-windata.c tui-wingeneral.c \ - tui-winsource.c typeprint.c ui-file.c ui-out.c user-regs.c \ - utils.c valarith.c valops.c valprint.c values.c varobj.c \ - wrapper.c ${GENSRCS} +SRCS= gdb.c -.include "${TARGET_SUBDIR}/Makefile" +BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ + ${OBJ_BU}/libiberty/libiberty.a +GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a -CLEANFILES+= ${GENSRCS} +# libthread_db.so calls back into gdb for the proc services. Make all the +# global symbols visible. +LDFLAGS+= -Wl,-E -CFLAGS+= -DHAVE_CONFIG_H -DRL_NO_COMPAT -DMI_OUT=1 -DTUI=1 -CFLAGS+= -I. -CFLAGS+= -I${.CURDIR} -CFLAGS+= -I${TARGET_SUBDIR} -CFLAGS+= -I${CNTRB_GDB}/gdb -CFLAGS+= -I${CNTRB_GDB}/gdb/config -CFLAGS+= -I${CNTRB_GDB}/include -CFLAGS+= -I${CNTRB_GDB}/bfd -CFLAGS+= -I${.CURDIR}/../bfd/${TARGET_ARCH} - -GDB_LIBS= ../bfd/libbfd.a ../libiberty/libiberty.a ../opcodes/libopcodes.a - -DPADD= ${GDB_LIBS} ${LIBREADLINE} ${LIBM} -LDADD= ${GDB_LIBS} -lreadline -lm - -VERSION= "6.1.0.90_20040413 [FreeBSD]" - -version.c: - echo '#include "version.h"' > ${.TARGET} - echo 'const char version[] = ${VERSION};' >> ${.TARGET} - echo 'const char host_name[] = "${MACHINE_ARCH}-intree-freebsd";' \ - >> ${.TARGET} - echo 'const char target_name[] = "${TARGET_ARCH}-intree-freebsd";' \ - >> ${.TARGET} +DPADD+= ${GDBLIBS} ${BULIBS} ${LIBREADLINE} ${LIBM} +LDADD+= ${GDBLIBS} ${BULIBS} -lreadline -lm .include From owner-p4-projects@FreeBSD.ORG Thu Jun 24 03:59:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E7EC16A4D0; Thu, 24 Jun 2004 03:59:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4917716A4CE for ; Thu, 24 Jun 2004 03:59:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AF6343D2D for ; Thu, 24 Jun 2004 03:59:21 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O3xL6b043514 for ; Thu, 24 Jun 2004 03:59:21 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O3xKCu043511 for perforce@freebsd.org; Thu, 24 Jun 2004 03:59:20 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 Jun 2004 03:59:20 GMT Message-Id: <200406240359.i5O3xKCu043511@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 Subject: PERFORCE change 55684 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 03:59:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=55684 Change 55684 by marcel@marcel_nfs on 2004/06/24 03:59:04 Add libgdb foo. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/libgdb/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 24 04:00:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 576C416A4D0; Thu, 24 Jun 2004 04:00:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 31DC916A4CE for ; Thu, 24 Jun 2004 04:00:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12ED743D45 for ; Thu, 24 Jun 2004 04:00:23 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O40MdV043547 for ; Thu, 24 Jun 2004 04:00:22 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O40MKl043544 for perforce@freebsd.org; Thu, 24 Jun 2004 04:00:22 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 Jun 2004 04:00:22 GMT Message-Id: <200406240400.i5O40MKl043544@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 Subject: PERFORCE change 55685 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 04:00:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=55685 Change 55685 by marcel@marcel_nfs on 2004/06/24 03:59:49 Remove Makefile.inc0. We don't need it anymore. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/Makefile.inc0#5 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 24 04:07:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DB3116A4D0; Thu, 24 Jun 2004 04:07:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 68B7D16A4CE for ; Thu, 24 Jun 2004 04:07:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A70C43D45 for ; Thu, 24 Jun 2004 04:07:32 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O47Wnb046553 for ; Thu, 24 Jun 2004 04:07:32 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O47VQQ046550 for perforce@freebsd.org; Thu, 24 Jun 2004 04:07:31 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 Jun 2004 04:07:31 GMT Message-Id: <200406240407.i5O47VQQ046550@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 Subject: PERFORCE change 55686 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 04:07:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=55686 Change 55686 by marcel@marcel_nfs on 2004/06/24 04:06:57 Re-add amd64 Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/Makefile#1 add .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/config.h#1 add .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/init.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 24 04:10:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B48DA16A4D0; Thu, 24 Jun 2004 04:10:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8AE7A16A4CF for ; Thu, 24 Jun 2004 04:10:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 81B8F43D3F for ; Thu, 24 Jun 2004 04:10:36 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O4Aa6d046708 for ; Thu, 24 Jun 2004 04:10:36 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O4Aaaj046705 for perforce@freebsd.org; Thu, 24 Jun 2004 04:10:36 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 Jun 2004 04:10:36 GMT Message-Id: <200406240410.i5O4Aaaj046705@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 Subject: PERFORCE change 55687 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 04:10:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=55687 Change 55687 by marcel@marcel_sledge on 2004/06/24 04:10:18 Remove the opcodes directory now that we can use binutils. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/opcodes/Makefile#4 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/opcodes/alpha/Makefile#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/opcodes/alpha/config.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/opcodes/amd64/Makefile#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/opcodes/amd64/config.h#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/opcodes/i386/Makefile#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/opcodes/i386/config.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/opcodes/ia64/Makefile#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/opcodes/ia64/config.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/opcodes/sparc64/Makefile#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/opcodes/sparc64/config.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 24 04:11:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4259716A4D1; Thu, 24 Jun 2004 04:11:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1AACB16A4CE for ; Thu, 24 Jun 2004 04:11:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0FFF43D45 for ; Thu, 24 Jun 2004 04:11:38 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O4Bc0o047758 for ; Thu, 24 Jun 2004 04:11:38 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O4Bcp9047748 for perforce@freebsd.org; Thu, 24 Jun 2004 04:11:38 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 Jun 2004 04:11:38 GMT Message-Id: <200406240411.i5O4Bcp9047748@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 Subject: PERFORCE change 55689 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 04:11:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=55689 Change 55689 by marcel@marcel_sledge on 2004/06/24 04:11:08 Remove the libiberty directory, now that we can use binutils. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/libiberty/Makefile#6 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/libiberty/alpha/config.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/libiberty/amd64/config.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/libiberty/i386/config.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/libiberty/ia64/config.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/libiberty/sparc64/config.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 24 04:12:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 374BD16A4D0; Thu, 24 Jun 2004 04:12:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0EF3616A4CF for ; Thu, 24 Jun 2004 04:12:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06DD943D41 for ; Thu, 24 Jun 2004 04:12:41 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O4CePS048501 for ; Thu, 24 Jun 2004 04:12:40 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O4Ceh2048498 for perforce@freebsd.org; Thu, 24 Jun 2004 04:12:40 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 Jun 2004 04:12:40 GMT Message-Id: <200406240412.i5O4Ceh2048498@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 Subject: PERFORCE change 55690 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 04:12:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=55690 Change 55690 by marcel@marcel_sledge on 2004/06/24 04:12:02 Remove the bfd directory, now that we can use binutils. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/Makefile#8 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/alpha/Makefile#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/alpha/bfd.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/alpha/config.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/amd64/Makefile#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/amd64/bfd.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/amd64/config.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/i386/Makefile#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/i386/bfd.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/i386/config.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/ia64/Makefile#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/ia64/bfd.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/ia64/config.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/sparc64/Makefile#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/sparc64/bfd.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/sparc64/config.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 24 04:22:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57DD416A4D0; Thu, 24 Jun 2004 04:22:05 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1490616A4CE for ; Thu, 24 Jun 2004 04:22:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E88AE43D1D for ; Thu, 24 Jun 2004 04:22:04 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O4LqQv050080 for ; Thu, 24 Jun 2004 04:21:52 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O4Lqrs050074 for perforce@freebsd.org; Thu, 24 Jun 2004 04:21:52 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 Jun 2004 04:21:52 GMT Message-Id: <200406240421.i5O4Lqrs050074@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 Subject: PERFORCE change 55691 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 04:22:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=55691 Change 55691 by marcel@marcel_sledge on 2004/06/24 04:21:25 Remove the obsoleted i386 and amd64 directories. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/amd64/Makefile#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/amd64/config.h#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/amd64/init.c#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/i386/Makefile#6 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/i386/config.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/i386/init.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 24 04:31:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6ECD16A4D0; Thu, 24 Jun 2004 04:31:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B210716A4CE for ; Thu, 24 Jun 2004 04:31:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92A1743D41 for ; Thu, 24 Jun 2004 04:31:19 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O4V4gC051104 for ; Thu, 24 Jun 2004 04:31:04 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O4V3Ch051101 for perforce@freebsd.org; Thu, 24 Jun 2004 04:31:03 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 Jun 2004 04:31:03 GMT Message-Id: <200406240431.i5O4V3Ch051101@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 Subject: PERFORCE change 55692 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 04:31:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=55692 Change 55692 by marcel@marcel_nfs on 2004/06/24 04:30:46 Build gdbtui as well. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/Makefile#5 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/gdbtui/Makefile#1 add Differences ... ==== //depot/projects/gdb/gnu/usr.bin/gdb/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= libgdb gdb +SUBDIR= libgdb gdb gdbtui .include From owner-p4-projects@FreeBSD.ORG Thu Jun 24 04:40:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70ACF16A4D0; Thu, 24 Jun 2004 04:40:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B2CA16A4CE for ; Thu, 24 Jun 2004 04:40:17 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43C2A43D31 for ; Thu, 24 Jun 2004 04:40:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O4eHXP053058 for ; Thu, 24 Jun 2004 04:40:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O4eGUi053055 for perforce@freebsd.org; Thu, 24 Jun 2004 04:40:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 24 Jun 2004 04:40:16 GMT Message-Id: <200406240440.i5O4eGUi053055@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 Subject: PERFORCE change 55695 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 04:40:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=55695 Change 55695 by rwatson@rwatson_tislabs on 2004/06/24 04:39:22 Integrate netperf_socket: - Loop back socket buffer lock protections for low and high watermark socket options from rwatson_netperf. - Loop back out-of-band data locking for SPX from rwatson_netperf. - Loop back socket locking annotation updates, sowwakeup_locked() socket buffer assertions from rwatson_netperf. Affected files ... .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#24 integrate .. //depot/projects/netperf_socket/sys/netipx/spx_usrreq.c#7 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#19 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pageout.c#7 integrate Differences ... ==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#24 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.188 2004/06/24 00:54:26 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.189 2004/06/24 04:28:30 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -1526,14 +1526,18 @@ * the high-water. */ case SO_SNDLOWAT: + SOCKBUF_LOCK(&so->so_snd); so->so_snd.sb_lowat = (optval > so->so_snd.sb_hiwat) ? so->so_snd.sb_hiwat : optval; + SOCKBUF_UNLOCK(&so->so_snd); break; case SO_RCVLOWAT: + SOCKBUF_LOCK(&so->so_rcv); so->so_rcv.sb_lowat = (optval > so->so_rcv.sb_hiwat) ? so->so_rcv.sb_hiwat : optval; + SOCKBUF_UNLOCK(&so->so_rcv); break; } break; ==== //depot/projects/netperf_socket/sys/netipx/spx_usrreq.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.44 2004/06/20 21:47:12 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.45 2004/06/24 04:29:53 rwatson Exp $"); #include #include @@ -575,13 +575,12 @@ m = dtom(q); if (SI(q)->si_cc & SPX_OB) { cb->s_oobflags &= ~SF_IOOB; + SOCKBUF_LOCK(&so->so_rcv); if (so->so_rcv.sb_cc) so->so_oobmark = so->so_rcv.sb_cc; - else { - SOCKBUF_LOCK(&so->so_rcv); + else so->so_rcv.sb_state |= SBS_RCVATMARK; - SOCKBUF_UNLOCK(&so->so_rcv); - } + SOCKBUF_UNLOCK(&so->so_rcv); } q = q->si_prev; remque(q->si_next); @@ -610,8 +609,8 @@ if (sp->spx_cc & SPX_OB) { MCHTYPE(m, MT_OOBDATA); spx_newchecks[1]++; + SOCKBUF_LOCK(&so->so_rcv); so->so_oobmark = 0; - SOCKBUF_LOCK(&so->so_rcv); so->so_rcv.sb_state &= ~SBS_RCVATMARK; SOCKBUF_UNLOCK(&so->so_rcv); } ==== //depot/projects/netperf_socket/sys/sys/socketvar.h#19 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.3 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/socketvar.h,v 1.129 2004/06/24 03:12:46 rwatson Exp $ + * $FreeBSD: src/sys/sys/socketvar.h,v 1.130 2004/06/24 04:27:10 rwatson Exp $ */ #ifndef _SYS_SOCKETVAR_H_ @@ -85,7 +85,7 @@ connections */ short so_qlimit; /* (e) max number queued connections */ short so_timeo; /* (g) connection timeout */ - u_short so_error; /* error affecting connection */ + u_short so_error; /* (f) error affecting connection */ struct sigio *so_sigio; /* [sg] information for async I/O or out of band data (SIGURG) */ u_long so_oobmark; /* (c) chars to oob mark */ @@ -399,6 +399,7 @@ } while (0) #define sowwakeup_locked(so) do { \ + SOCKBUF_LOCK_ASSERT(&(so)->so_snd); \ if (sb_notify(&(so)->so_snd)) \ sowakeup((so), &(so)->so_snd); \ else \ ==== //depot/projects/netperf_socket/sys/vm/vm_pageout.c#7 (text+ko) ==== @@ -71,7 +71,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.257 2004/06/24 03:13:30 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.258 2004/06/24 04:08:43 alc Exp $"); #include "opt_vm.h" #include @@ -1243,6 +1243,7 @@ static int fullintervalcount = 0; int page_shortage; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); page_shortage = (cnt.v_inactive_target + cnt.v_cache_max + cnt.v_free_min) - (cnt.v_free_count + cnt.v_inactive_count + cnt.v_cache_count); @@ -1250,7 +1251,6 @@ if (page_shortage <= 0) return; - vm_page_lock_queues(); pcount = cnt.v_active_count; fullintervalcount += vm_pageout_stats_interval; if (fullintervalcount < vm_pageout_full_stats_interval) { @@ -1313,7 +1313,6 @@ m = next; } - vm_page_unlock_queues(); } /* @@ -1437,9 +1436,9 @@ error = msleep(&vm_pages_needed, &vm_page_queue_mtx, PVM, "psleep", vm_pageout_stats_interval * hz); if (error && !vm_pages_needed) { - vm_page_unlock_queues(); pass = 0; vm_pageout_page_stats(); + vm_page_unlock_queues(); continue; } } From owner-p4-projects@FreeBSD.ORG Thu Jun 24 04:59:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C94F016A4D0; Thu, 24 Jun 2004 04:59:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A2E8216A4CE for ; Thu, 24 Jun 2004 04:59:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8620443D41 for ; Thu, 24 Jun 2004 04:59:54 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O4xh4g063303 for ; Thu, 24 Jun 2004 04:59:43 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O4xhmX063300 for perforce@freebsd.org; Thu, 24 Jun 2004 04:59:43 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 Jun 2004 04:59:43 GMT Message-Id: <200406240459.i5O4xhmX063300@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 Subject: PERFORCE change 55699 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 04:59:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=55699 Change 55699 by marcel@marcel_nfs on 2004/06/24 04:58:58 Re-add sparc64. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/Makefile#1 add .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/config.h#1 add .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/init.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 24 05:02:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC8DB16A4D0; Thu, 24 Jun 2004 05:02:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A637E16A4CE for ; Thu, 24 Jun 2004 05:02:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FBBE43D62 for ; Thu, 24 Jun 2004 05:02:49 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O52lq8065175 for ; Thu, 24 Jun 2004 05:02:47 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O52lU4065172 for perforce@freebsd.org; Thu, 24 Jun 2004 05:02:47 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 Jun 2004 05:02:47 GMT Message-Id: <200406240502.i5O52lU4065172@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 Subject: PERFORCE change 55700 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 05:02:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=55700 Change 55700 by marcel@marcel_sledge on 2004/06/24 05:02:41 Remove the obsoleted alpha, ia64 and sparc64 directories. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/alpha/Makefile#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/alpha/config.h#3 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/alpha/init.c#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/ia64/Makefile#6 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/ia64/config.h#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/ia64/init.c#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/sparc64/Makefile#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/sparc64/config.h#2 delete .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/sparc64/init.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 24 23:04:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA73A16A4D0; Thu, 24 Jun 2004 23:04:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A8BB016A4CE for ; Thu, 24 Jun 2004 23:04:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A325C43D46 for ; Thu, 24 Jun 2004 23:04:11 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5ON3g0A029378 for ; Thu, 24 Jun 2004 23:03:42 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5ON3fQr029375 for perforce@freebsd.org; Thu, 24 Jun 2004 23:03:41 GMT (envelope-from peter@freebsd.org) Date: Thu, 24 Jun 2004 23:03:41 GMT Message-Id: <200406242303.i5ON3fQr029375@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 55750 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 23:04:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=55750 Change 55750 by peter@peter_daintree on 2004/06/24 23:02:41 revert Affected files ... .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#18 edit .. //depot/projects/hammer/gnu/lib/libsupc++/Makefile#4 edit Differences ... ==== //depot/projects/hammer/gnu/lib/libstdc++/Makefile#18 (text+ko) ==== @@ -15,8 +15,6 @@ CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -CXXFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H -CXXFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections -Wno-deprecated #LDFLAGS+= -Wl,-version-info,4:0:0 -Wl,--version-script=${SRCDIR}/src/linker.map ==== //depot/projects/hammer/gnu/lib/libsupc++/Makefile#4 (text+ko) ==== @@ -18,8 +18,6 @@ CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H CFLAGS+= -I${SRCDIR} -I${GCCDIR} -I${.CURDIR}/../libstdc++ -CXXFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H -CXXFLAGS+= -I${SRCDIR} -I${GCCDIR} -I${.CURDIR}/../libstdc++ CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections HDRS= exception new typeinfo cxxabi.h exception_defines.h From owner-p4-projects@FreeBSD.ORG Thu Jun 24 23:48:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B429716A4D0; Thu, 24 Jun 2004 23:48:50 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C3F616A4CE for ; Thu, 24 Jun 2004 23:48:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 653E243D39 for ; Thu, 24 Jun 2004 23:48:50 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5ONmcrL037609 for ; Thu, 24 Jun 2004 23:48:38 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5ONmaAc037606 for perforce@freebsd.org; Thu, 24 Jun 2004 23:48:36 GMT (envelope-from peter@freebsd.org) Date: Thu, 24 Jun 2004 23:48:36 GMT Message-Id: <200406242348.i5ONmaAc037606@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 55752 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2004 23:48:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=55752 Change 55752 by peter@peter_hammer on 2004/06/24 23:48:01 IFC @55748 Affected files ... .. //depot/projects/hammer/bin/ps/extern.h#10 integrate .. //depot/projects/hammer/bin/ps/keyword.c#12 integrate .. //depot/projects/hammer/bin/ps/print.c#12 integrate .. //depot/projects/hammer/bin/ps/ps.c#16 integrate .. //depot/projects/hammer/bin/ps/ps.h#8 integrate .. //depot/projects/hammer/etc/rc.subr#16 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#23 integrate .. //depot/projects/hammer/lib/libc/sys/send.2#6 integrate .. //depot/projects/hammer/lib/msun/Makefile#11 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/Makefile.inc#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/install.ent#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/i386/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/readme/Makefile#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/readme/article.sgml#1 branch .. //depot/projects/hammer/share/man/man4/Makefile#43 integrate .. //depot/projects/hammer/share/man/man4/pcm.4#8 integrate .. //depot/projects/hammer/share/man/man4/scsi.4#3 integrate .. //depot/projects/hammer/share/man/man4/sd.4#2 delete .. //depot/projects/hammer/share/man/man4/st.4#2 delete .. //depot/projects/hammer/share/man/man4/ubtbcmfw.4#5 integrate .. //depot/projects/hammer/share/man/man4/ucom.4#3 integrate .. //depot/projects/hammer/share/man/man4/uftdi.4#3 integrate .. //depot/projects/hammer/share/man/man4/uhid.4#3 integrate .. //depot/projects/hammer/share/man/man4/uhidev.4#2 integrate .. //depot/projects/hammer/share/man/man4/ulpt.4#3 integrate .. //depot/projects/hammer/share/man/man4/umodem.4#2 integrate .. //depot/projects/hammer/share/man/man4/uplcom.4#4 integrate .. //depot/projects/hammer/share/man/man4/uvisor.4#3 integrate .. //depot/projects/hammer/share/man/man4/uvscom.4#2 integrate .. //depot/projects/hammer/share/man/man4/vinum.4#3 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#11 integrate .. //depot/projects/hammer/sys/compat/svr4/imgact_svr4.c#6 integrate .. //depot/projects/hammer/sys/conf/files#66 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#30 integrate .. //depot/projects/hammer/sys/conf/options.sparc64#8 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#38 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#23 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_quirks#1 branch .. //depot/projects/hammer/sys/dev/ichsmb/ichsmb_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#12 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#10 integrate .. //depot/projects/hammer/sys/dev/twa/twa_freebsd.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus.h#5 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_i8251.c#3 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_ns8250.c#5 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_sab82532.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_z8530.c#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#37 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#36 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#36 integrate .. //depot/projects/hammer/sys/fs/portalfs/portal_vnops.c#9 integrate .. //depot/projects/hammer/sys/geom/geom_slice.c#15 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/hammer/sys/i386/linux/imgact_linux.c#9 integrate .. //depot/projects/hammer/sys/kern/tty.c#19 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#29 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#24 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#30 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#32 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#29 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#16 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#12 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#16 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#21 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#31 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#17 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#31 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#30 integrate .. //depot/projects/hammer/sys/netipx/spx_usrreq.c#10 integrate .. //depot/projects/hammer/sys/netnatm/natm.c#12 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#16 integrate .. //depot/projects/hammer/sys/security/mac/mac_net.c#11 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#25 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#19 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#25 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#9 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#24 integrate .. //depot/projects/hammer/sys/sparc64/conf/NOTES#6 integrate .. //depot/projects/hammer/sys/sys/mac_policy.h#20 integrate .. //depot/projects/hammer/sys/sys/serial.h#1 branch .. //depot/projects/hammer/sys/sys/socketvar.h#19 integrate .. //depot/projects/hammer/sys/sys/ttycom.h#6 integrate .. //depot/projects/hammer/sys/tools/acpi_quirks2h.awk#1 branch .. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#11 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#36 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#27 integrate .. //depot/projects/hammer/usr.bin/comm/comm.1#2 integrate .. //depot/projects/hammer/usr.bin/expand/expand.c#3 integrate .. //depot/projects/hammer/usr.bin/fetch/fetch.c#10 integrate .. //depot/projects/hammer/usr.bin/fold/fold.c#3 integrate .. //depot/projects/hammer/usr.bin/join/join.1#4 integrate .. //depot/projects/hammer/usr.bin/unexpand/unexpand.c#4 integrate .. //depot/projects/hammer/usr.bin/uniq/uniq.1#4 integrate .. //depot/projects/hammer/usr.bin/vis/vis.1#2 integrate Differences ... ==== //depot/projects/hammer/bin/ps/extern.h#10 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.36 2004/06/23 11:56:57 gad Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.37 2004/06/23 23:48:09 gad Exp $ */ struct kinfo; @@ -40,7 +40,7 @@ extern unsigned long mempages; extern time_t now; extern int sumrusage, termwidth, totwidth; -extern VARENT *vhead; +extern STAILQ_HEAD(velisthead, varent) varlist; __BEGIN_DECLS void arguments(KINFO *, VARENT *); ==== //depot/projects/hammer/bin/ps/keyword.c#12 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.69 2004/06/23 11:56:57 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.70 2004/06/23 23:48:09 gad Exp $"); #include #include @@ -235,7 +235,6 @@ void parsefmt(const char *p, int user) { - static struct varent *vtail; char *tempstr, *tempstr1; #define FMTSEP " \t,\n" @@ -282,16 +281,10 @@ if (vent->var == NULL) errx(1, "malloc failed"); memcpy(vent->var, v, sizeof(*vent->var)); - vent->next = NULL; - if (vhead == NULL) - vhead = vtail = vent; - else { - vtail->next = vent; - vtail = vent; - } + STAILQ_INSERT_TAIL(&varlist, vent, next_ve); } free(tempstr1); - if (!vhead) { + if (STAILQ_EMPTY(&varlist)) { warnx("no valid keywords; valid keywords:"); showkey(); exit(1); ==== //depot/projects/hammer/bin/ps/print.c#12 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.90 2004/06/23 12:18:36 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.91 2004/06/23 23:48:09 gad Exp $"); #include #include @@ -69,26 +69,23 @@ { VAR *v; struct varent *vent; - int allempty; - allempty = 1; - for (vent = vhead; vent; vent = vent->next) - if (*vent->header != '\0') { - allempty = 0; + STAILQ_FOREACH(vent, &varlist, next_ve) + if (*vent->header != '\0') break; - } - if (allempty) + if (!vent) return; - for (vent = vhead; vent; vent = vent->next) { + + STAILQ_FOREACH(vent, &varlist, next_ve) { v = vent->var; if (v->flag & LJUST) { - if (vent->next == NULL) /* last one */ + if (STAILQ_NEXT(vent, next_ve) == NULL) /* last one */ (void)printf("%s", vent->header); else (void)printf("%-*s", v->width, vent->header); } else (void)printf("%*s", v->width, vent->header); - if (vent->next != NULL) + if (STAILQ_NEXT(vent, next_ve) != NULL) (void)putchar(' '); } (void)putchar('\n'); @@ -105,7 +102,7 @@ if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL) errx(1, "malloc failed"); strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH); - if (ve->next == NULL) { + if (STAILQ_NEXT(ve, next_ve) == NULL) { /* last field */ if (termwidth == UNLIMITED) { (void)printf("%s", vis_args); @@ -131,7 +128,8 @@ v = ve->var; if (cflag) { - if (ve->next == NULL) /* last field, don't pad */ + /* If it is the last field, then don't pad */ + if (STAILQ_NEXT(ve, next_ve) == NULL) (void)printf("%s", k->ki_p->ki_comm); else (void)printf("%-*s", v->width, k->ki_p->ki_comm); @@ -147,7 +145,7 @@ } else vis_env = NULL; - if (ve->next == NULL) { + if (STAILQ_NEXT(ve, next_ve) == NULL) { /* last field */ if (termwidth == UNLIMITED) { if (vis_env) @@ -180,7 +178,7 @@ VAR *v; v = ve->var; - if (ve->next == NULL) /* last field, don't pad */ + if (STAILQ_NEXT(ve, next_ve) == NULL) /* last field, don't pad */ (void)printf("%s", k->ki_p->ki_comm); else (void)printf("%-*s", v->width, k->ki_p->ki_comm); ==== //depot/projects/hammer/bin/ps/ps.c#16 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.102 2004/06/23 21:17:25 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.105 2004/06/24 03:15:18 gad Exp $"); #include #include @@ -98,7 +98,7 @@ int termwidth; /* Width of the screen (0 == infinity). */ int totwidth; /* Calculated-width of requested variables. */ -struct varent *vhead; +struct velisthead varlist = STAILQ_HEAD_INITIALIZER(varlist); static int forceuread = DEF_UREAD; /* Do extra work to get u-area. */ static kvm_t *kd; @@ -600,9 +600,9 @@ * For each process, call each variable output function. */ for (i = lineno = 0; i < nkept; i++) { - for (vent = vhead; vent; vent = vent->next) { + STAILQ_FOREACH(vent, &varlist, next_ve) { (vent->var->oproc)(&kinfo[i], vent); - if (vent->next != NULL) + if (STAILQ_NEXT(vent, next_ve) != NULL) (void)putchar(' '); } (void)putchar('\n'); @@ -703,6 +703,13 @@ } #undef BSD_PID_MAX +/*- + * The user can specify a device via one of three formats: + * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console + * 2) missing "/dev", e.g.: ttyp0 console + * 3) two-letters, e.g.: p0 co + * (matching letters that would be seen in the "TT" column) + */ static int addelem_tty(struct listinfo *inf, const char *elem) { @@ -710,25 +717,46 @@ struct stat sb; char pathbuf[PATH_MAX]; - if (strcmp(elem, "co") == 0) - ttypath = strdup(_PATH_CONSOLE); - else if (*elem == '/') + ttypath = NULL; + switch (*elem) { + case '/': ttypath = elem; - else { + break; + case 'c': + if (strcmp(elem, "co") == 0) { + ttypath = _PATH_CONSOLE; + break; + } + /* FALLTHROUGH */ + default: + strlcpy(pathbuf, _PATH_DEV, sizeof(pathbuf)); + strlcat(pathbuf, elem, sizeof(pathbuf)); + ttypath = pathbuf; + if (strncmp(pathbuf, _PATH_TTY, sizeof(_PATH_TTY)) == 0) + break; + if (strcmp(pathbuf, _PATH_CONSOLE) == 0) + break; + if (stat(pathbuf, &sb) == 0 && S_ISCHR(sb.st_mode)) { + /* No need to repeat stat() && S_ISCHR() checks */ + ttypath = NULL; + break; + } + /* /dev/${elem} does not exist, so try /dev/tty${elem} */ strlcpy(pathbuf, _PATH_TTY, sizeof(pathbuf)); strlcat(pathbuf, elem, sizeof(pathbuf)); - ttypath = pathbuf; + break; } - - if (stat(ttypath, &sb) == -1) { - warn("%s", ttypath); - optfatal = 1; - return (0); - } - if (!S_ISCHR(sb.st_mode)) { - warn("%s: Not a terminal", ttypath); - optfatal = 1; - return (0); + if (ttypath) { + if (stat(ttypath, &sb) == -1) { + warn("%s", ttypath); + optfatal = 1; + return (0); + } + if (!S_ISCHR(sb.st_mode)) { + warn("%s: Not a terminal", ttypath); + optfatal = 1; + return (0); + } } if (inf->count >= inf->maxcount) expand_list(inf); @@ -886,7 +914,7 @@ { struct varent *vent; - for (vent = vhead; vent; vent = vent->next) { + STAILQ_FOREACH(vent, &varlist, next_ve) { if (strcmp(vent->var->name, v->name) == 0) return vent; } @@ -899,7 +927,7 @@ struct varent *vent; VAR *v; - for (vent = vhead; vent; vent = vent->next) { + STAILQ_FOREACH(vent, &varlist, next_ve) { v = vent->var; if (v->flag & DSIZ) { v->dwidth = v->width; @@ -919,7 +947,7 @@ VAR *v; int i; - for (vent = vhead; vent; vent = vent->next) { + STAILQ_FOREACH(vent, &varlist, next_ve) { v = vent->var; if (!(v->flag & DSIZ)) continue; @@ -938,7 +966,7 @@ VAR *v; int i; - for (vent = vhead; vent; vent = vent->next) { + STAILQ_FOREACH(vent, &varlist, next_ve) { v = vent->var; i = strlen(vent->header); if (v->width < i) @@ -985,7 +1013,7 @@ ki->ki_p->ki_comm, MAXCOMLEN)); else asprintf(&ki->ki_args, "(%s)", ki->ki_p->ki_comm); - if (ki->ki_env == NULL) + if (ki->ki_args == NULL) errx(1, "malloc failed"); } else { ki->ki_args = NULL; ==== //depot/projects/hammer/bin/ps/ps.h#8 (text+ko) ==== @@ -27,9 +27,11 @@ * SUCH DAMAGE. * * @(#)ps.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ps/ps.h,v 1.18 2004/06/20 21:25:10 gad Exp $ + * $FreeBSD: src/bin/ps/ps.h,v 1.19 2004/06/23 23:48:09 gad Exp $ */ +#include + #define UNLIMITED 0 /* unlimited terminal width */ enum type { CHAR, UCHAR, SHORT, USHORT, INT, UINT, LONG, ULONG, KPTR, PGTOK }; @@ -44,8 +46,8 @@ /* Variables. */ typedef struct varent { + STAILQ_ENTRY(varent) next_ve; const char *header; - struct varent *next; struct var *var; } VARENT; ==== //depot/projects/hammer/etc/rc.subr#16 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.27 2004/06/06 18:06:09 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.28 2004/06/24 16:57:49 mtm Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -194,7 +194,7 @@ err 3 'USAGE: check_pidfile pidfile procname [interpreter]' fi if [ ! -f $_pidfile ]; then - debug "pid file {$_pidfile): not readable." + debug "pid file ($_pidfile): not readable." return fi read _pid _junk < $_pidfile ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#23 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.137 2004/06/01 09:45:16 des Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.138 2004/06/24 03:08:44 wollman Exp $ % -- Gifts for Children -- @@ -16100,6 +16100,9 @@ % Yes, but which self do you want to be? % +Yes, I was surprised how easy it was to cut the door off my cat. + -- James D. Nicoll +% Yesterday I was a dog. Today I'm a dog. Tomorrow I'll probably still be a dog. Sigh! There's so little hope for advancement. -- Snoopy ==== //depot/projects/hammer/lib/libc/sys/send.2#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.24 2004/06/21 18:57:32 mpp Exp $ +.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.25 2004/06/24 10:53:44 rik Exp $ .\" .Dd February 15, 1995 .Dt SEND 2 @@ -194,7 +194,7 @@ address specified in the IP header did not match the IP address bound to the prison. .It Bq Er EPIPE -The socket is unable to send anymore data (SS_CANTSENDMORE has +The socket is unable to send anymore data (SBS_CANTSENDMORE has been set on the socket). This typically means that the socket is not connected. .El ==== //depot/projects/hammer/lib/msun/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.44 2004/06/20 10:42:23 stefanf Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.45 2004/06/24 00:02:32 marcel Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -49,7 +49,7 @@ # Stock gcc 2.7.2.1 doesn't understand these options. #CFLAGS += -mtrap-precision=i -mfp-trap-mode=su .elif ${MACHINE_ARCH} == "i386" -ARCH= i387 +ARCH_SUBDIR= i387 ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_fmod.S e_log.S e_log10.S \ e_remainder.S e_scalb.S e_sqrt.S s_atan.S s_ceil.S s_copysign.S \ s_cos.S s_finite.S s_floor.S s_logb.S \ @@ -58,7 +58,7 @@ # ARCH_SRCS+= s_log1p.S .endif -ARCH?= ${MACHINE_ARCH} +ARCH_SUBDIR?= ${MACHINE_ARCH} .PATH: ${.CURDIR}/bsdsrc .PATH: ${.CURDIR}/man @@ -114,7 +114,7 @@ #COMMON_SRCS+= s_fabs.c s_frexp.c s_isnan.c s_ldexp.c s_modf.c # Exclude the generic versions of what we provide in the MD area. -.PATH: ${.CURDIR}/${ARCH} +.PATH: ${.CURDIR}/${ARCH_SUBDIR} .if defined(ARCH_SRCS) .for i in ${ARCH_SRCS} COMMON_SRCS:= ${COMMON_SRCS:N${i:R}.c} ==== //depot/projects/hammer/share/man/man4/Makefile#43 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.272 2004/06/22 09:09:18 ru Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.273 2004/06/24 05:01:52 imp Exp $ MAN= aac.4 \ acpi.4 \ @@ -244,7 +244,6 @@ sbsh.4 \ screen.4 \ scsi.4 \ - sd.4 \ sem.4 \ ses.4 \ sf.4 \ @@ -262,7 +261,6 @@ spic.4 \ splash.4 \ sppp.4 \ - st.4 \ ste.4 \ stf.4 \ stg.4 \ ==== //depot/projects/hammer/share/man/man4/pcm.4#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.34 2004/06/16 08:33:54 ru Exp $ +.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.35 2004/06/24 17:43:12 josef Exp $ .\" .Dd November 14, 2003 .Dt PCM 4 @@ -138,6 +138,11 @@ .Dq Li YES , load driver for card/chipset foo. .El +.Pp +To define default values for the different mixer channels, +set the channel to the prefered value using hints, e.g.: +.Va hint.pcm.0.line Ns = Ns Qq Li 0 . +This will mute the input channel per default. .Ss VCHANs Each device can optionally support more playback channels that physical hardware provides by using ==== //depot/projects/hammer/share/man/man4/scsi.4#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/share/man/man4/scsi.4,v 1.28 2003/06/28 23:53:37 ru Exp $ +.\" $FreeBSD: src/share/man/man4/scsi.4,v 1.29 2004/06/24 04:05:08 scottl Exp $ .Dd October 15, 1998 .Dt SCSI 4 .Os @@ -159,23 +159,46 @@ .Em counted so that they appear as the next available unused unit. .Pp -To configure a driver in the kernel without wiring down the device use a -config line similar to -.Cd "device ch0" -to include the changer driver. +Units are wired down by setting kernel environment hints. +This is usually done either interactively from the loader, or automatically via the +.Pa /boot/device.hints +file. The basic syntax is: +.Bd -literal -offset indent +hint.device.unit.property="value" +.Ed +.Pp +Individual scsi bus numbers can be wired down to specific controllers with +a config line similar to the following: +.Bd -literal -offset indent +hint.scbus.0.at="ahd1" +.Ed +.Pp +This assigns scsi bus number 0 to the +.Em ahd1 +driver instance. +For controllers supporting more than one bus, a particular bus can be assigned +as follows: +.Bd -literal -offset indent +hint.scbus.0.at="ahc1" +hint.scbus.0.bus="1" +.Ed +.Pp +This assigns scsi bus 0 to the bus 1 instance on +.Em ahc0 . +Peripheral drivers can be wired to a specific bus, target, and lun as so: +.Bd -literal -offset indent +hint.da.0.at="scbus0" +hint.da.0.target="0" +hint.da.0.unit="0" +.Ed .Pp -To wire down a unit use a config line similar to -.Cd "device ch1 at scbus0 target 4 unit 0" -to assign changer 1 as the changer with SCSI ID 4, -SCSI logical unit 0 on SCSI bus 0. -Individual scbuses can be wired down to specific controllers with -a config line similar to -.Cd "device scbus0 at ahc0" -which assigns scsi bus 0 to the first unit using the ahc driver. -For controllers supporting more than one bus, -the particular bus can be specified as in -.Cd "device scbus3 at ahc1 bus 1" -which assigns scbus 1 to the second bus probed on the ahc1 device. +This assigns +.Em da0 +to target 0, unit (lun) 0 of scbus 0. +Omitting the target or unit hints will instruct CAM to treat them as wildcards +and use the first respective counted instances. +These examples can be combined together to allow a peripheral device to be +wired to any particular controller, bus, target, and/or unit instance. .Pp When you have a mixture of wired down and counted devices then the counting begins with the first non-wired down unit for a particular ==== //depot/projects/hammer/share/man/man4/ubtbcmfw.4#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $Id: ubtbcmfw.4,v 1.3 2003/05/21 19:37:35 max Exp $ -.\" $FreeBSD: src/share/man/man4/ubtbcmfw.4,v 1.4 2004/03/02 18:38:32 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ubtbcmfw.4,v 1.5 2004/06/24 05:09:15 imp Exp $ .\" .Dd April 28, 2003 .Dt UBTBCMFW 4 @@ -31,6 +31,8 @@ .Sh NAME .Nm ubtbcmfw .Nd Firmware driver for Broadcom BCM2033 chip based Bluetooth USB devices +.Sh SYNOPSIS +.Cd "device ubtbcmfw" .Sh DESCRIPTION The .Nm ==== //depot/projects/hammer/share/man/man4/ucom.4#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ucom.4,v 1.3 2002/08/12 20:28:53 joe Exp $ +.\" $FreeBSD: src/share/man/man4/ucom.4,v 1.4 2004/06/24 05:09:15 imp Exp $ .\" .Dd November 25, 1999 .Dt UCOM 4 @@ -43,12 +43,7 @@ .Nm ucom .Nd USB tty support .Sh SYNOPSIS -.Cd "ucom* at uftdi?" -.Cd "ucom* at umct?" -.Cd "ucom* at umodem?" -.Cd "ucom* at uplcom?" -.Cd "ucom* at uvisor? portno ?" -.Cd "ucom* at uvscom?" +.Cd "device ucom" .Sh DESCRIPTION The .Nm ==== //depot/projects/hammer/share/man/man4/uftdi.4#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uftdi.4,v 1.2 2004/06/13 22:46:32 obrien Exp $ +.\" $FreeBSD: src/share/man/man4/uftdi.4,v 1.3 2004/06/24 05:09:15 imp Exp $ .\" .Dd April 13, 2000 .Dt UFTDI 4 @@ -43,8 +43,8 @@ .Nm uftdi .Nd USB support for serial adapters based on the FT8U100AX and FT8U232AM .Sh SYNOPSIS -.Cd "uftdi* at uhub?" -.Cd "ucom* at uftdi?" +.Cd "device uftdi" +.Cd "device ucom" .Sh HARDWARE The .Nm ==== //depot/projects/hammer/share/man/man4/uhid.4#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uhid.4,v 1.3 2002/08/16 05:01:11 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/uhid.4,v 1.4 2004/06/24 05:09:15 imp Exp $ .\" .Dd July 12, 1998 .Dt UHID 4 @@ -43,7 +43,7 @@ .Nm uhid .Nd USB generic HID support .Sh SYNOPSIS -.Cd "uhid* at uhidev? reportid ?" +.Cd "device uhid" .Sh DESCRIPTION The .Nm ==== //depot/projects/hammer/share/man/man4/uhidev.4#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uhidev.4,v 1.2 2002/05/30 12:59:52 ru Exp $ +.\" $FreeBSD: src/share/man/man4/uhidev.4,v 1.3 2004/06/24 05:09:15 imp Exp $ .\" .Dd December 27, 2001 .Dt UHIDEV 4 @@ -43,10 +43,9 @@ .Nm uhidev .Nd USB Human Interface Device support .Sh SYNOPSIS -.Cd "uhidev* at uhub?" -.Cd "uhid* at uhidev? reportid ?" -.Cd "ukbd* at uhidev? reportid ?" -.Cd "ums* at uhidev? reportid ?" +.Cd "device uhid" +.Cd "device ukbd" +.Cd "device ums" .Sh DESCRIPTION The .Nm ==== //depot/projects/hammer/share/man/man4/ulpt.4#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ulpt.4,v 1.5 2003/09/20 15:16:56 se Exp $ +.\" $FreeBSD: src/share/man/man4/ulpt.4,v 1.6 2004/06/24 05:09:15 imp Exp $ .\" .Dd July 12, 1998 .Dt ULPT 4 @@ -43,7 +43,7 @@ .Nm ulpt .Nd USB printer support .Sh SYNOPSIS -.Cd "ulpt* at uhub?" +.Cd "device ulpt" .Sh DESCRIPTION The .Nm ==== //depot/projects/hammer/share/man/man4/umodem.4#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/umodem.4,v 1.2 2002/05/30 12:59:52 ru Exp $ +.\" $FreeBSD: src/share/man/man4/umodem.4,v 1.3 2004/06/24 05:09:15 imp Exp $ .\" .Dd August 16, 1999 .Dt UMODEM 4 @@ -43,8 +43,8 @@ .Nm umodem .Nd USB modem support .Sh SYNOPSIS -.Cd "umodem* at uhub?" -.Cd "ucom* at umodem?" +.Cd "device umodem" +.Cd "device ucom" .Sh DESCRIPTION The .Nm ==== //depot/projects/hammer/share/man/man4/uplcom.4#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uplcom.4,v 1.5 2004/01/24 22:12:06 simon Exp $ +.\" $FreeBSD: src/share/man/man4/uplcom.4,v 1.6 2004/06/24 05:09:15 imp Exp $ .\" .Dd May 21, 2001 .Dt UPLCOM 4 @@ -43,8 +43,8 @@ .Nm uplcom .Nd USB support for Prolific PL-2303 serial adapters driver .Sh SYNOPSIS -.Cd "uplcom* at uhub?" -.Cd "ucom* at uplcom?" +.Cd "device uplcom" +.Cd "device ucom" .Sh HARDWARE The .Nm ==== //depot/projects/hammer/share/man/man4/uvisor.4#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uvisor.4,v 1.3 2002/12/10 14:21:55 ru Exp $ +.\" $FreeBSD: src/share/man/man4/uvisor.4,v 1.4 2004/06/24 05:09:15 imp Exp $ .\" .Dd March 10, 2000 .Dt UVISOR 4 @@ -43,8 +43,8 @@ .Nm uvisor .Nd USB support for the Handspring Visor, a Palmpilot compatible PDA .Sh SYNOPSIS -.Cd "uvisor* at uhub?" -.Cd "ucom* at uvisor? portno ?" +.Cd "device uvisor" +.Cd "device ucom" .Sh DESCRIPTION The .Nm ==== //depot/projects/hammer/share/man/man4/uvscom.4#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uvscom.4,v 1.2 2002/05/30 12:59:52 ru Exp $ +.\" $FreeBSD: src/share/man/man4/uvscom.4,v 1.3 2004/06/24 05:09:15 imp Exp $ .\" .Dd May 21, 2001 .Dt UVSCOM 4 @@ -43,8 +43,8 @@ .Nm uvscom .Nd USB support for SUNTAC Slipper U VS-10U serial adapters driver .Sh SYNOPSIS -.Cd "uvscom* at uhub?" -.Cd "ucom* at uvscom?" +.Cd "device uvscom" +.Cd "device ucom" .Sh DESCRIPTION The .Nm ==== //depot/projects/hammer/share/man/man4/vinum.4#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" 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/vinum.4,v 1.48 2003/03/03 22:48:49 ru Exp $ +.\" $FreeBSD: src/share/man/man4/vinum.4,v 1.49 2004/06/24 05:09:15 imp Exp $ .\" .Dd May 16, 2002 .Dt VINUM 4 @@ -43,7 +43,7 @@ .Nm vinum .Nd Logical Volume Manager .Sh SYNOPSIS -.Cd "kldload vinum" +.Cd "device vinum" .Sh DESCRIPTION .Nm is a logical volume manager inspired by, but not derived from, the Veritas ==== //depot/projects/hammer/sys/boot/forth/loader.conf#11 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.79 2004/06/22 22:57:13 brueffer Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.80 2004/06/24 17:49:18 josef Exp $ ############################################################## ### Basic configuration options ############################ @@ -278,7 +278,6 @@ snd_via8233_load="NO" # via8233 snd_via82c686_load="NO" # via82c686 snd_driver_load="NO" # All sound drivers -#pcm0.line="0" # Default value for a mixer channel ############################################################## ### USB modules ############################################ ==== //depot/projects/hammer/sys/compat/svr4/imgact_svr4.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.22 2004/02/04 21:52:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.23 2004/06/24 02:21:17 obrien Exp $"); #include #include @@ -90,7 +90,7 @@ } bss_size = round_page(a_out->a_bss); #ifdef DEBUG - printf("imgact: text: %08lx, data: %08lx, bss: %08lx\n", a_out->a_text, a_out->a_data, bss_size); + printf("imgact: text: %08lx, data: %08lx, bss: %08lx\n", (u_long)a_out->a_text, (u_long)a_out->a_data, bss_size); #endif /* @@ -193,7 +193,7 @@ #ifdef DEBUG printf("imgact: startaddr=%08lx, length=%08lx\n", (u_long)vmaddr, - a_out->a_text + a_out->a_data); + (u_long)a_out->a_text + a_out->a_data); #endif /* * allow read/write of data ==== //depot/projects/hammer/sys/conf/files#66 (text+ko) ==== @@ -1,9 +1,14 @@ -# $FreeBSD: src/sys/conf/files,v 1.908 2004/06/23 21:04:36 ps Exp $ +# $FreeBSD: src/sys/conf/files,v 1.909 2004/06/24 06:29:22 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and # dependency lines other than the first are silently ignored. # +acpi_quirks.h standard \ + dependency "$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ + compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ + no-obj no-implicit-rule \ + clean "acpi_quirks.h" aicasm optional ahc \ dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ ==== //depot/projects/hammer/sys/conf/kmod.mk#30 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.161 2004/06/13 17:29:06 mlaier Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.162 2004/06/24 06:29:22 njl Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -343,6 +343,17 @@ .endif .endfor # _i >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 25 01:01:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A0E016A4D0; Fri, 25 Jun 2004 01:01:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F7AC16A4CE for ; Fri, 25 Jun 2004 01:01:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A87143D1D for ; Fri, 25 Jun 2004 01:01:07 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5P115KT059165 for ; Fri, 25 Jun 2004 01:01:05 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5P1151E059162 for perforce@freebsd.org; Fri, 25 Jun 2004 01:01:05 GMT (envelope-from marcel@freebsd.org) Date: Fri, 25 Jun 2004 01:01:05 GMT Message-Id: <200406250101.i5P1151E059162@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 Subject: PERFORCE change 55754 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 01:01:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=55754 Change 55754 by marcel@marcel_nfs on 2004/06/25 01:00:36 Build the gdb docs. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/Makefile#6 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/Makefile.inc#3 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/doc/Makefile#1 add Differences ... ==== //depot/projects/gdb/gnu/usr.bin/gdb/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= libgdb gdb gdbtui +SUBDIR= doc libgdb gdb gdbtui .include ==== //depot/projects/gdb/gnu/usr.bin/gdb/Makefile.inc#3 (text+ko) ==== @@ -10,6 +10,7 @@ CNTRB_ROOT= ${BMAKE_ROOT}/../../contrib CNTRB_BU= ${CNTRB_ROOT}/binutils CNTRB_GDB= ${CNTRB_ROOT}/gdb +CNTRB_RL= ${CNTRB_ROOT}/libreadline OBJ_ROOT= ${.OBJDIR}/../.. OBJ_BU= ${OBJ_ROOT}/binutils @@ -18,6 +19,8 @@ TARGET_ARCH?= ${MACHINE_ARCH} TARGET_SUBDIR= ${BMAKE_GDB}/arch/${TARGET_ARCH} +.if !defined(INFO) + .PATH: ${CNTRB_GDB}/gdb ${CNTRB_GDB}/gdb/cli ${CNTRB_GDB}/gdb/mi \ ${CNTRB_GDB}/gdb/signals ${CNTRB_GDB}/gdb/tui ${TARGET_SUBDIR} @@ -38,4 +41,10 @@ SRCS+= ${GENSRCS} CLEANFILES+= ${GENSRCS} +.else + +.PATH: ${CNTRB_GDB}/gdb ${CNTRB_GDB}/gdb/doc ${CNTRB_RL}/doc ${BMAKE_BU}/doc + +.endif + .include "../Makefile.inc" From owner-p4-projects@FreeBSD.ORG Fri Jun 25 01:12:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF88D16A4D1; Fri, 25 Jun 2004 01:12:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 894DA16A4CE for ; Fri, 25 Jun 2004 01:12:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DBE043D58 for ; Fri, 25 Jun 2004 01:12:20 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5P1CKlF063612 for ; Fri, 25 Jun 2004 01:12:20 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5P1CJdR063606 for perforce@freebsd.org; Fri, 25 Jun 2004 01:12:19 GMT (envelope-from marcel@freebsd.org) Date: Fri, 25 Jun 2004 01:12:19 GMT Message-Id: <200406250112.i5P1CJdR063606@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 Subject: PERFORCE change 55755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 01:12:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=55755 Change 55755 by marcel@marcel_nfs on 2004/06/25 01:11:56 Don't build the gdb docs as part of binutils. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/binutils/doc/Makefile#3 edit Differences ... ==== //depot/projects/gdb/gnu/usr.bin/binutils/doc/Makefile#3 (text+ko) ==== @@ -5,12 +5,9 @@ GDBDIR= ${.CURDIR}/../../../../contrib/gdb CONTRIBDIR= ${.CURDIR}/../../../../contrib -.PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc ${GDBDIR}/gdb/doc ${GDBDIR}/gdb/mi +.PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc -INFO= as ld gasp stabs binutils -.if !defined(NO_GDB) -INFO+= gdb gdbint -.endif +INFO= as ld gasp binutils INFOSECTION= "Programming & development tools." INFOENTRY_as= "* As: (as). The GNU assembler." INFOENTRY_gasp= "* Gasp: (gasp). The GNU Assembler Macro Preprocessor." @@ -20,13 +17,8 @@ MAKEINFOFLAGS+= --no-validate MAKEINFOFLAGS+= -I ${SRCDIR}/gas/doc -I ${SRCDIR}/ld -I ${SRCDIR}/bfd/doc MAKEINFOFLAGS+= -I ${SRCDIR}/binutils -MAKEINFOFLAGS+= -I ${GDBDIR}/gdb/doc -MAKEINFOFLAGS+= -I ${GDBDIR}/gdb/mi -MAKEINFOFLAGS+= -I ${CONTRIBDIR}/libreadline/doc -CLEANFILES= configdoc.texi gdb-cfg.texi GDBvn.texi \ - inc-hist.texinfo inc-hist.texinfo.orig \ - config.texi gasver.texi ldver.texi +CLEANFILES= configdoc.texi config.texi gasver.texi ldver.texi as.info: as.texinfo asconfig.texi c-i386.texi gasver.texi ld.info: ld.texinfo bfdsumm.texi ldver.texi configdoc.texi @@ -34,27 +26,10 @@ configdoc.texi: gen-doc.texi ln -sf ${.ALLSRC} ${.TARGET} -gdb.info: gdb.texinfo gdb-cfg.texi GDBvn.texi annotate.texinfo \ - fdl.texi gpl.texi \ - rluser.texinfo inc-hist.texinfo - -gdbint.info: gdbint.texinfo gdb-cfg.texi fdl.texi observer.texi - -gdb-cfg.texi: all-cfg.texi - ln -sf ${.ALLSRC} ${.TARGET} - -GDBvn.texi: ${GDBDIR}/gdb/version.in - echo "@set GDBVN `sed q ${.ALLSRC}`" > ${.TARGET} - .PATH: ${SRCDIR}/binutils/doc binutils.info: binutils.texi config.texi config.texi gasver.texi ldver.texi: echo "@set VERSION ${VERSION}" > ${.TARGET} -.PATH: ${CONTRIBDIR}/libreadline/doc -inc-hist.texinfo: hsuser.texinfo inc-hist.diff - cp ${.ALLSRC:M*.texinfo} ${.TARGET} - patch -b .orig < ${.ALLSRC:M*.diff} - .include From owner-p4-projects@FreeBSD.ORG Fri Jun 25 02:30:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF2F916A4D3; Fri, 25 Jun 2004 02:30:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7164116A4DB for ; Fri, 25 Jun 2004 02:30:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B1FE43D2F for ; Fri, 25 Jun 2004 02:30:41 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5P2UfNe079447 for ; Fri, 25 Jun 2004 02:30:41 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5P2UeJl079444 for perforce@freebsd.org; Fri, 25 Jun 2004 02:30:40 GMT (envelope-from wsalamon@computer.org) Date: Fri, 25 Jun 2004 02:30:40 GMT Message-Id: <200406250230.i5P2UeJl079444@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 55759 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 02:30:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=55759 Change 55759 by wsalamon@wsalamon_epi on 2004/06/25 02:30:31 Integrate more of the Darwin 7.4 audit bits; matching the new file naming and directory layout. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kernel.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_klib.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_klib.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_token.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jun 25 04:42:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DFF0A16A4CE; Fri, 25 Jun 2004 04:42:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1A8043D1D; Fri, 25 Jun 2004 04:42:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5P4fZlO003343; Fri, 25 Jun 2004 04:41:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5P4fXa8003340; Fri, 25 Jun 2004 04:41:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 25 Jun 2004 04:41:33 GMT Message-Id: <200406250441.i5P4fXa8003340@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: rwatson@FreeBSD.org (Robert Watson) To: Perforce Change Reviews Subject: PERFORCE change 55762 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: bb+lists.freebsd.perforce@cyrus.watson.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 04:42:43 -0000 Change 55762 by rwatson@rwatson_tislabs on 2004/06/25 04:08:48 Integrate netperf_socket: - serial.h - ufs_extattr.c, vfs_syscalls.c cleanups. And etc. Affected files ... .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/netperf_socket/sys/conf/files#30 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#10 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_quirks#1 branch .. //depot/projects/netperf_socket/sys/dev/ichsmb/ichsmb_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/mixer.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/twa/twa_freebsd.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_bus.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_dev_i8251.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_dev_sab82532.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_dev_z8530.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_tty.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#14 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#14 integrate .. //depot/projects/netperf_socket/sys/geom/geom_slice.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#12 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#16 integrate .. //depot/projects/netperf_socket/sys/net/if_vlan.c#8 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/netperf_socket/sys/sys/serial.h#1 branch .. //depot/projects/netperf_socket/sys/sys/ttycom.h#6 integrate .. //depot/projects/netperf_socket/sys/tools/acpi_quirks2h.awk#1 branch .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#9 integrate Differences ... ==== //depot/projects/netperf_socket/sys/boot/forth/loader.conf#7 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.79 2004/06/22 22:57:13 brueffer Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.80 2004/06/24 17:49:18 josef Exp $ ############################################################## ### Basic configuration options ############################ @@ -278,7 +278,6 @@ snd_via8233_load="NO" # via8233 snd_via82c686_load="NO" # via82c686 snd_driver_load="NO" # All sound drivers -#pcm0.line="0" # Default value for a mixer channel ############################################################## ### USB modules ############################################ ==== //depot/projects/netperf_socket/sys/conf/files#30 (text+ko) ==== @@ -1,9 +1,14 @@ -# $FreeBSD: src/sys/conf/files,v 1.908 2004/06/23 21:04:36 ps Exp $ +# $FreeBSD: src/sys/conf/files,v 1.909 2004/06/24 06:29:22 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and # dependency lines other than the first are silently ignored. # +acpi_quirks.h standard \ + dependency "$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ + compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ + no-obj no-implicit-rule \ + clean "acpi_quirks.h" aicasm optional ahc \ dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ ==== //depot/projects/netperf_socket/sys/conf/kmod.mk#10 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.161 2004/06/13 17:29:06 mlaier Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.162 2004/06/24 06:29:22 njl Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -343,6 +343,17 @@ .endif .endfor # _i +.if ${SRCS:Macpi_quirks.h} != "" +CLEANFILES+= acpi_quirks.h +.if !exists(@) +acpi_quirks.h: @ +.endif +.if exists(@) +acpi_quirks.h: @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks +.endif + ${AWK} -f @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks +.endif + regress: lint: ${SRCS} ==== //depot/projects/netperf_socket/sys/dev/ichsmb/ichsmb_pci.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.12 2004/05/30 20:08:33 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.13 2004/06/24 18:21:28 ambrisko Exp $"); /* * Support for the SMBus controller logical device which is part of the @@ -73,6 +73,7 @@ #define ID_82801CA 0x24838086 #define ID_82801DC 0x24C38086 #define ID_82801EB 0x24D38086 +#define ID_6300ESB 0x25a48086 #define PCIS_SERIALBUS_SMBUS_PROGIF 0x00 @@ -137,6 +138,9 @@ case ID_82801EB: device_set_desc(dev, "Intel 82801EB (ICH5) SMBus controller"); break; + case ID_6300ESB: + device_set_desc(dev, "Intel 6300ESB (ICH) SMBus controller"); + break; default: if (pci_get_class(dev) == PCIC_SERIALBUS && pci_get_subclass(dev) == PCIS_SERIALBUS_SMBUS @@ -167,6 +171,9 @@ sc->io_rid = ICH_SMB_BASE; sc->io_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->io_rid, 0, ~0, 16, RF_ACTIVE); + if (sc->io_res == NULL) + sc->io_res = bus_alloc_resource(dev, SYS_RES_IOPORT, + &sc->io_rid, 0, ~0, 32, RF_ACTIVE); if (sc->io_res == NULL) { log(LOG_ERR, "%s: can't map I/O\n", device_get_nameunit(dev)); error = ENXIO; ==== //depot/projects/netperf_socket/sys/dev/sound/pcm/mixer.c#5 (text+ko) ==== @@ -25,11 +25,10 @@ */ #include -#include #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.38 2004/06/20 15:38:11 josef Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.39 2004/06/24 17:41:20 josef Exp $"); MALLOC_DEFINE(M_MIXER, "mixer", "mixer"); @@ -190,7 +189,6 @@ { struct snddev_info *snddev; struct snd_mixer *m; - char devname[20]; u_int16_t v; struct cdev *pdev; int i, unit, val; @@ -206,13 +204,14 @@ goto bad; for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) { - snprintf(devname, sizeof(devname), "%s.%s", device_get_nameunit(dev), snd_mixernames[i]); - TUNABLE_INT_FETCH(devname, &val); - - if (val >= 0 && val <= 100) - v = (u_int16_t) val; - else + if (resource_int_value(device_get_name(dev), + device_get_unit(dev), snd_mixernames[i], &val) == 0) { + if (val >= 0 && val <= 100) { + v = (u_int16_t) val; + } + } else { v = snd_mixerdefaults[i]; + } mixer_set(m, i, v | (v << 8)); } ==== //depot/projects/netperf_socket/sys/dev/twa/twa_freebsd.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twa/twa_freebsd.c,v 1.6 2004/06/16 09:47:00 phk Exp $ + * $FreeBSD: src/sys/dev/twa/twa_freebsd.c,v 1.7 2004/06/24 18:30:08 scottl Exp $ */ /* @@ -584,7 +584,7 @@ TWA_ALIGNMENT, /* alignment */ 0, /* boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR + 1, /* highaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ TWA_Q_LENGTH * (sizeof(struct twa_command_packet)),/* maxsize */ ==== //depot/projects/netperf_socket/sys/dev/uart/uart_bus.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.5 2004/06/16 09:47:00 phk Exp $ + * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.6 2004/06/24 10:07:28 phk Exp $ */ #ifndef _DEV_UART_BUS_H_ @@ -33,6 +33,7 @@ #include "opt_uart.h" #endif +#include #include /* Drain and flush targets. */ @@ -45,7 +46,7 @@ * Interrupt sources (in priority order). See also uart_core.c * Note that the low order 16 bits are used to pass modem signals * from the hardware interrupt handler to the software interrupt - * handler. See UART_SIG_* and UART_SIGMASK_* below. + * handler. */ #define UART_IPEND_OVERRUN 0x010000 #define UART_IPEND_BREAK 0x020000 @@ -62,31 +63,17 @@ #define UART_STAT_OVERRUN 0x0400 #define UART_STAT_PARERR 0x0800 -/* Modem and line signals. */ -#define UART_SIG_DTR 0x0001 -#define UART_SIG_RTS 0x0002 -#define UART_SIG_DSR 0x0004 -#define UART_SIG_CTS 0x0008 -#define UART_SIG_DCD 0x0010 -#define UART_SIG_RI 0x0020 -#define UART_SIG_DDTR 0x0100 -#define UART_SIG_DRTS 0x0200 -#define UART_SIG_DDSR 0x0400 -#define UART_SIG_DCTS 0x0800 -#define UART_SIG_DDCD 0x1000 -#define UART_SIG_DRI 0x2000 - -#define UART_SIGMASK_DTE 0x0003 -#define UART_SIGMASK_DCE 0x003c -#define UART_SIGMASK_STATE 0x003f -#define UART_SIGMASK_DELTA 0x3f00 +#define UART_SIGMASK_DTE (SER_DTR | SER_RTS) +#define UART_SIGMASK_DCE (SER_DSR | SER_CTS | SER_DCD | SER_RI) +#define UART_SIGMASK_STATE (UART_SIGMASK_DTE | UART_SIGMASK_DCE) +#define UART_SIGMASK_DELTA (UART_SIGMASK_STATE << 8) #ifdef UART_PPS_ON_CTS -#define UART_SIG_DPPS UART_SIG_DCTS -#define UART_SIG_PPS UART_SIG_CTS +#define UART_SIG_DPPS SER_DCTS +#define UART_SIG_PPS SER_CTS #else -#define UART_SIG_DPPS UART_SIG_DDCD -#define UART_SIG_PPS UART_SIG_DCD +#define UART_SIG_DPPS SER_DDCD +#define UART_SIG_PPS SER_DCD #endif /* UART_IOCTL() requests */ ==== //depot/projects/netperf_socket/sys/dev/uart/uart_dev_i8251.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_i8251.c,v 1.3 2003/09/17 03:11:32 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_i8251.c,v 1.4 2004/06/24 10:07:28 phk Exp $"); #include #include @@ -398,9 +398,9 @@ i8251_bus_flush(sc, UART_FLUSH_RECEIVER|UART_FLUSH_TRANSMITTER); if (i8251->mcr & MCR_DTR) - sc->sc_hwsig |= UART_SIG_DTR; + sc->sc_hwsig |= SER_DTR; if (i8251->mcr & MCR_RTS) - sc->sc_hwsig |= UART_SIG_RTS; + sc->sc_hwsig |= SER_RTS; i8251_bus_getsig(sc); i8251_clrint(bas); @@ -454,10 +454,10 @@ mtx_lock_spin(&sc->sc_hwmtx); msr = uart_getreg(&sc->sc_bas, REG_MSR); mtx_unlock_spin(&sc->sc_hwmtx); - SIGCHG(msr & MSR_DSR, sig, UART_SIG_DSR, UART_SIG_DDSR); - SIGCHG(msr & MSR_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); - SIGCHG(msr & MSR_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD); - SIGCHG(msr & MSR_RI, sig, UART_SIG_RI, UART_SIG_DRI); + SIGCHG(msr & MSR_DSR, sig, SER_DSR, SER_DDSR); + SIGCHG(msr & MSR_CTS, sig, SER_CTS, SER_DCTS); + SIGCHG(msr & MSR_DCD, sig, SER_DCD, SER_DDCD); + SIGCHG(msr & MSR_RI, sig, SER_RI, SER_DRI); new = sig & ~UART_SIGMASK_DELTA; } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); return (sig); @@ -715,20 +715,20 @@ do { old = sc->sc_hwsig; new = old; - if (sig & UART_SIG_DDTR) { - SIGCHG(sig & UART_SIG_DTR, new, UART_SIG_DTR, - UART_SIG_DDTR); + if (sig & SER_DDTR) { + SIGCHG(sig & SER_DTR, new, SER_DTR, + SER_DDTR); } - if (sig & UART_SIG_DRTS) { - SIGCHG(sig & UART_SIG_RTS, new, UART_SIG_RTS, - UART_SIG_DRTS); + if (sig & SER_DRTS) { + SIGCHG(sig & SER_RTS, new, SER_RTS, + SER_DRTS); } } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); mtx_lock_spin(&sc->sc_hwmtx); i8251->mcr &= ~(MCR_DTR|MCR_RTS); - if (new & UART_SIG_DTR) + if (new & SER_DTR) i8251->mcr |= MCR_DTR; - if (new & UART_SIG_RTS) + if (new & SER_RTS) i8251->mcr |= MCR_RTS; uart_setreg(bas, REG_MCR, i8251->mcr); uart_barrier(bas); ==== //depot/projects/netperf_socket/sys/dev/uart/uart_dev_ns8250.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.7 2004/05/26 21:59:01 tmm Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.8 2004/06/24 10:07:28 phk Exp $"); #include #include @@ -399,9 +399,9 @@ ns8250_bus_flush(sc, UART_FLUSH_RECEIVER|UART_FLUSH_TRANSMITTER); if (ns8250->mcr & MCR_DTR) - sc->sc_hwsig |= UART_SIG_DTR; + sc->sc_hwsig |= SER_DTR; if (ns8250->mcr & MCR_RTS) - sc->sc_hwsig |= UART_SIG_RTS; + sc->sc_hwsig |= SER_RTS; ns8250_bus_getsig(sc); ns8250_clrint(bas); @@ -455,10 +455,10 @@ mtx_lock_spin(&sc->sc_hwmtx); msr = uart_getreg(&sc->sc_bas, REG_MSR); mtx_unlock_spin(&sc->sc_hwmtx); - SIGCHG(msr & MSR_DSR, sig, UART_SIG_DSR, UART_SIG_DDSR); - SIGCHG(msr & MSR_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); - SIGCHG(msr & MSR_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD); - SIGCHG(msr & MSR_RI, sig, UART_SIG_RI, UART_SIG_DRI); + SIGCHG(msr & MSR_DSR, sig, SER_DSR, SER_DDSR); + SIGCHG(msr & MSR_CTS, sig, SER_CTS, SER_DCTS); + SIGCHG(msr & MSR_DCD, sig, SER_DCD, SER_DDCD); + SIGCHG(msr & MSR_RI, sig, SER_RI, SER_DRI); new = sig & ~UART_SIGMASK_DELTA; } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); return (sig); @@ -753,20 +753,20 @@ do { old = sc->sc_hwsig; new = old; - if (sig & UART_SIG_DDTR) { - SIGCHG(sig & UART_SIG_DTR, new, UART_SIG_DTR, - UART_SIG_DDTR); + if (sig & SER_DDTR) { + SIGCHG(sig & SER_DTR, new, SER_DTR, + SER_DDTR); } - if (sig & UART_SIG_DRTS) { - SIGCHG(sig & UART_SIG_RTS, new, UART_SIG_RTS, - UART_SIG_DRTS); + if (sig & SER_DRTS) { + SIGCHG(sig & SER_RTS, new, SER_RTS, + SER_DRTS); } } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); mtx_lock_spin(&sc->sc_hwmtx); ns8250->mcr &= ~(MCR_DTR|MCR_RTS); - if (new & UART_SIG_DTR) + if (new & SER_DTR) ns8250->mcr |= MCR_DTR; - if (new & UART_SIG_RTS) + if (new & SER_RTS) ns8250->mcr |= MCR_RTS; uart_setreg(bas, REG_MCR, ns8250->mcr); uart_barrier(bas); ==== //depot/projects/netperf_socket/sys/dev/uart/uart_dev_sab82532.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.6 2004/04/25 04:30:40 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.7 2004/06/24 10:07:28 phk Exp $"); #include #include @@ -410,7 +410,7 @@ uart_barrier(bas); if (sc->sc_sysdev == NULL) - sab82532_bus_setsig(sc, UART_SIG_DDTR|UART_SIG_DRTS); + sab82532_bus_setsig(sc, SER_DDTR|SER_DRTS); (void)sab82532_bus_getsig(sc); return (0); } @@ -455,9 +455,9 @@ sig = old; mtx_lock_spin(&sc->sc_hwmtx); star = uart_getreg(bas, SAB_STAR); - SIGCHG(star & SAB_STAR_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); + SIGCHG(star & SAB_STAR_CTS, sig, SER_CTS, SER_DCTS); vstr = uart_getreg(bas, SAB_VSTR); - SIGCHG(vstr & SAB_VSTR_CD, sig, UART_SIG_DCD, UART_SIG_DDCD); + SIGCHG(vstr & SAB_VSTR_CD, sig, SER_DCD, SER_DDCD); pvr = uart_getreg(bas, SAB_PVR); switch (bas->chan) { case 1: @@ -467,7 +467,7 @@ pvr &= SAB_PVR_DSR_B; break; } - SIGCHG(~pvr, sig, UART_SIG_DSR, UART_SIG_DDSR); + SIGCHG(~pvr, sig, SER_DSR, SER_DDSR); mtx_unlock_spin(&sc->sc_hwmtx); new = sig & ~UART_SIGMASK_DELTA; } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); @@ -655,13 +655,13 @@ do { old = sc->sc_hwsig; new = old; - if (sig & UART_SIG_DDTR) { - SIGCHG(sig & UART_SIG_DTR, new, UART_SIG_DTR, - UART_SIG_DDTR); + if (sig & SER_DDTR) { + SIGCHG(sig & SER_DTR, new, SER_DTR, + SER_DDTR); } - if (sig & UART_SIG_DRTS) { - SIGCHG(sig & UART_SIG_RTS, new, UART_SIG_RTS, - UART_SIG_DRTS); + if (sig & SER_DRTS) { + SIGCHG(sig & SER_RTS, new, SER_RTS, + SER_DRTS); } } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); @@ -670,13 +670,13 @@ pvr = uart_getreg(bas, SAB_PVR); switch (bas->chan) { case 1: - if (new & UART_SIG_DTR) + if (new & SER_DTR) pvr &= ~SAB_PVR_DTR_A; else pvr |= SAB_PVR_DTR_A; break; case 2: - if (new & UART_SIG_DTR) + if (new & SER_DTR) pvr &= ~SAB_PVR_DTR_B; else pvr |= SAB_PVR_DTR_B; @@ -686,7 +686,7 @@ /* Set RTS pin. */ mode = uart_getreg(bas, SAB_MODE); - if (new & UART_SIG_RTS) + if (new & SER_RTS) mode &= ~SAB_MODE_FRTS; else mode |= SAB_MODE_FRTS; ==== //depot/projects/netperf_socket/sys/dev/uart/uart_dev_z8530.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.7 2004/05/04 06:58:10 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.8 2004/06/24 10:07:28 phk Exp $"); #include #include @@ -350,8 +350,8 @@ mtx_lock_spin(&sc->sc_hwmtx); bes = uart_getmreg(&sc->sc_bas, RR_BES); mtx_unlock_spin(&sc->sc_hwmtx); - SIGCHG(bes & BES_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); - SIGCHG(bes & BES_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD); + SIGCHG(bes & BES_CTS, sig, SER_CTS, SER_DCTS); + SIGCHG(bes & BES_DCD, sig, SER_DCD, SER_DDCD); new = sig & ~UART_SIGMASK_DELTA; } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); return (sig); @@ -411,8 +411,8 @@ if (bes & BES_RXA) ipend |= UART_IPEND_RXREADY; sig = sc->sc_hwsig; - SIGCHG(bes & BES_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); - SIGCHG(bes & BES_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD); + SIGCHG(bes & BES_CTS, sig, SER_CTS, SER_DCTS); + SIGCHG(bes & BES_DCD, sig, SER_DCD, SER_DDCD); if (sig & UART_SIGMASK_DELTA) ipend |= UART_IPEND_SIGCHG; src = uart_getmreg(bas, RR_SRC); @@ -509,22 +509,22 @@ do { old = sc->sc_hwsig; new = old; - if (sig & UART_SIG_DDTR) { - SIGCHG(sig & UART_SIG_DTR, new, UART_SIG_DTR, - UART_SIG_DDTR); + if (sig & SER_DDTR) { + SIGCHG(sig & SER_DTR, new, SER_DTR, + SER_DDTR); } - if (sig & UART_SIG_DRTS) { - SIGCHG(sig & UART_SIG_RTS, new, UART_SIG_RTS, - UART_SIG_DRTS); + if (sig & SER_DRTS) { + SIGCHG(sig & SER_RTS, new, SER_RTS, + SER_DRTS); } } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); mtx_lock_spin(&sc->sc_hwmtx); - if (new & UART_SIG_DTR) + if (new & SER_DTR) z8530->tpc |= TPC_DTR; else z8530->tpc &= ~TPC_DTR; - if (new & UART_SIG_RTS) + if (new & SER_RTS) z8530->tpc |= TPC_RTS; else z8530->tpc &= ~TPC_RTS; ==== //depot/projects/netperf_socket/sys/dev/uart/uart_tty.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.12 2004/06/23 10:28:09 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.13 2004/06/24 10:07:28 phk Exp $"); #include #include @@ -164,11 +164,11 @@ */ if ((tp->t_cflag & CRTS_IFLOW) && !sc->sc_hwiflow) { if ((tp->t_state & TS_TBLOCK) && - (sc->sc_hwsig & UART_SIG_RTS)) - UART_SETSIG(sc, UART_SIG_DRTS); + (sc->sc_hwsig & SER_RTS)) + UART_SETSIG(sc, SER_DRTS); else if (!(tp->t_state & TS_TBLOCK) && - !(sc->sc_hwsig & UART_SIG_RTS)) - UART_SETSIG(sc, UART_SIG_DRTS|UART_SIG_RTS); + !(sc->sc_hwsig & SER_RTS)) + UART_SETSIG(sc, SER_DRTS|SER_RTS); } if (tp->t_state & TS_TTSTOP) @@ -207,7 +207,7 @@ t->c_cflag &= ~HUPCL; } if (t->c_ospeed == 0) { - UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DRTS); + UART_SETSIG(sc, SER_DDTR | SER_DRTS); return (0); } switch (t->c_cflag & CSIZE) { @@ -224,13 +224,13 @@ parity = UART_PARITY_NONE; if (UART_PARAM(sc, t->c_ospeed, databits, stopbits, parity) != 0) return (EINVAL); - UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DTR); + UART_SETSIG(sc, SER_DDTR | SER_DTR); /* Set input flow control state. */ if (!sc->sc_hwiflow) { if ((t->c_cflag & CRTS_IFLOW) && (tp->t_state & TS_TBLOCK)) - UART_SETSIG(sc, UART_SIG_DRTS); + UART_SETSIG(sc, SER_DRTS); else - UART_SETSIG(sc, UART_SIG_DRTS | UART_SIG_RTS); + UART_SETSIG(sc, SER_DRTS | SER_RTS); } else UART_IOCTL(sc, UART_IOCTL_IFLOW, (t->c_cflag & CRTS_IFLOW)); /* Set output flow control state. */ @@ -297,11 +297,11 @@ if (pend & UART_IPEND_SIGCHG) { sig = pend & UART_IPEND_SIGMASK; - if (sig & UART_SIG_DDCD) - ttyld_modem(tp, sig & UART_SIG_DCD); - if ((sig & UART_SIG_DCTS) && (tp->t_cflag & CCTS_OFLOW) && + if (sig & SER_DDCD) + ttyld_modem(tp, sig & SER_DCD); + if ((sig & SER_DCTS) && (tp->t_cflag & CCTS_OFLOW) && !sc->sc_hwoflow) { - if (sig & UART_SIG_CTS) { + if (sig & SER_CTS) { tp->t_state &= ~TS_TTSTOP; ttyld_start(tp); } else @@ -418,7 +418,7 @@ /* * Handle initial DCD. */ - if ((sc->sc_hwsig & UART_SIG_DCD) || sc->sc_callout) + if ((sc->sc_hwsig & SER_DCD) || sc->sc_callout) ttyld_modem(tp, 1); } /* @@ -464,7 +464,7 @@ if (sc->sc_hwoflow) UART_IOCTL(sc, UART_IOCTL_OFLOW, 0); if (sc->sc_sysdev == NULL) - UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DRTS); + UART_SETSIG(sc, SER_DDTR | SER_DRTS); /* Disable pulse capturing. */ sc->sc_pps.ppsparam.mode = 0; @@ -504,52 +504,52 @@ UART_IOCTL(sc, UART_IOCTL_BREAK, 0); break; case TIOCSDTR: - UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DTR); + UART_SETSIG(sc, SER_DDTR | SER_DTR); break; case TIOCCDTR: - UART_SETSIG(sc, UART_SIG_DDTR); + UART_SETSIG(sc, SER_DDTR); break; case TIOCMSET: bits = *(int*)data; - sig = UART_SIG_DDTR | UART_SIG_DRTS; + sig = SER_DDTR | SER_DRTS; if (bits & TIOCM_DTR) - sig |= UART_SIG_DTR; + sig |= SER_DTR; if (bits & TIOCM_RTS) - sig |= UART_SIG_RTS; + sig |= SER_RTS; UART_SETSIG(sc, sig); break; case TIOCMBIS: bits = *(int*)data; sig = 0; if (bits & TIOCM_DTR) - sig |= UART_SIG_DDTR | UART_SIG_DTR; + sig |= SER_DDTR | SER_DTR; if (bits & TIOCM_RTS) - sig |= UART_SIG_DRTS | UART_SIG_RTS; + sig |= SER_DRTS | SER_RTS; UART_SETSIG(sc, sig); break; case TIOCMBIC: bits = *(int*)data; sig = 0; if (bits & TIOCM_DTR) - sig |= UART_SIG_DDTR; + sig |= SER_DDTR; if (bits & TIOCM_RTS) - sig |= UART_SIG_DRTS; + sig |= SER_DRTS; UART_SETSIG(sc, sig); break; case TIOCMGET: sig = sc->sc_hwsig; bits = TIOCM_LE; - if (sig & UART_SIG_DTR) + if (sig & SER_DTR) bits |= TIOCM_DTR; - if (sig & UART_SIG_RTS) + if (sig & SER_RTS) bits |= TIOCM_RTS; - if (sig & UART_SIG_DSR) + if (sig & SER_DSR) bits |= TIOCM_DSR; - if (sig & UART_SIG_CTS) + if (sig & SER_CTS) bits |= TIOCM_CTS; - if (sig & UART_SIG_DCD) + if (sig & SER_DCD) bits |= TIOCM_CD; - if (sig & (UART_SIG_DRI | UART_SIG_RI)) + if (sig & (SER_DRI | SER_RI)) bits |= TIOCM_RI; *(int*)data = bits; break; ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs#14 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.182 2004/06/19 22:16:03 sanpei Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.183 2004/06/24 05:05:56 jb Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -363,6 +363,7 @@ vendor PLX 0x10b5 PLX vendor ASANTE 0x10bd Asante vendor JRC 0x1145 Japan Radio Company +vendor DELORME 0x1163 Delorme Publishing vendor ACERCM 0x1189 Acer Communications & Multimedia Inc. vendor BELKIN2 0x1293 Belkin Components vendor MOBILITY 0x1342 Mobility @@ -601,6 +602,9 @@ /* Dell products */ product DELL BC02 0x8000 Dell BC02 Bluetooth USB Adapter +/* Delorme Paublishing products */ +product DELORME EARTHMATE 0x0100 Earthmate GPS + /* Diamond products */ product DIAMOND RIO500USB 0x0001 Rio 500 USB @@ -1078,6 +1082,7 @@ product PHILIPS PCA646VC 0x0303 PCA646VC PC Camera product PHILIPS PCVC680K 0x0308 PCVC680K Vesta Pro PC Camera product PHILIPS DSS150 0x0471 DSS 150 Digital Speaker System +product PHILIPS UM10016 0x1552 ISP 1581 Hi-Speed USB MPEG2 Encoder Reference Kit product PHILIPS DIVAUSB 0x1801 DIVA USB mp3 player /* Philips Semiconductor products */ ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#14 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.189 2004/06/19 22:17:34 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.190 2004/06/24 05:25:04 jb Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.182 2004/06/19 22:16:03 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.183 2004/06/24 05:05:56 jb Exp */ /* @@ -370,6 +370,7 @@ #define USB_VENDOR_PLX 0x10b5 /* PLX */ #define USB_VENDOR_ASANTE 0x10bd /* Asante */ #define USB_VENDOR_JRC 0x1145 /* Japan Radio Company */ +#define USB_VENDOR_DELORME 0x1163 /* Delorme Publishing */ #define USB_VENDOR_ACERCM 0x1189 /* Acer Communications & Multimedia Inc. */ #define USB_VENDOR_BELKIN2 0x1293 /* Belkin Components */ #define USB_VENDOR_MOBILITY 0x1342 /* Mobility */ @@ -608,6 +609,9 @@ /* Dell products */ #define USB_PRODUCT_DELL_BC02 0x8000 /* Dell BC02 Bluetooth USB Adapter */ +/* Delorme Paublishing products */ +#define USB_PRODUCT_DELORME_EARTHMATE 0x0100 /* Earthmate GPS */ + /* Diamond products */ #define USB_PRODUCT_DIAMOND_RIO500USB 0x0001 /* Rio 500 USB */ @@ -1085,6 +1089,7 @@ #define USB_PRODUCT_PHILIPS_PCA646VC 0x0303 /* PCA646VC PC Camera */ #define USB_PRODUCT_PHILIPS_PCVC680K 0x0308 /* PCVC680K Vesta Pro PC Camera */ #define USB_PRODUCT_PHILIPS_DSS150 0x0471 /* DSS 150 Digital Speaker System */ +#define USB_PRODUCT_PHILIPS_UM10016 0x1552 /* ISP 1581 Hi-Speed USB MPEG2 Encoder Reference Kit */ #define USB_PRODUCT_PHILIPS_DIVAUSB 0x1801 /* DIVA USB mp3 player */ /* Philips Semiconductor products */ ==== //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#14 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.189 2004/06/19 22:17:34 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.190 2004/06/24 05:25:04 jb Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.182 2004/06/19 22:16:03 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.183 2004/06/24 05:05:56 jb Exp */ /* @@ -802,6 +802,12 @@ "Dell BC02 Bluetooth USB Adapter", }, { + USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE, + 0, + "Delorme Publishing", + "Earthmate GPS", + }, + { USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB, 0, "Diamond", @@ -2596,6 +2602,12 @@ "DSS 150 Digital Speaker System", }, { + USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_UM10016, + 0, + "Philips", + "ISP 1581 Hi-Speed USB MPEG2 Encoder Reference Kit", + }, + { USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DIVAUSB, 0, "Philips", @@ -5218,6 +5230,12 @@ NULL, }, { + USB_VENDOR_DELORME, 0, + USB_KNOWNDEV_NOPROD, + "Delorme Publishing", + NULL, + }, + { USB_VENDOR_ACERCM, 0, USB_KNOWNDEV_NOPROD, "Acer Communications & Multimedia Inc.", ==== //depot/projects/netperf_socket/sys/geom/geom_slice.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_slice.c,v 1.51 2004/02/12 22:42:11 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_slice.c,v 1.52 2004/06/24 10:50:20 pjd Exp $"); #include #include @@ -62,7 +62,10 @@ struct g_slicer *gsp; gsp = g_malloc(sizeof *gsp, M_WAITOK | M_ZERO); - gsp->softc = g_malloc(scsize, M_WAITOK | M_ZERO); + if (scsize > 0) + gsp->softc = g_malloc(scsize, M_WAITOK | M_ZERO); + else + gsp->softc = NULL; gsp->slices = g_malloc(nslice * sizeof(struct g_slice), M_WAITOK | M_ZERO); gsp->nslice = nslice; @@ -468,7 +471,8 @@ g_wither_geom(gp, ENXIO); return (NULL); } - *vp = gsp->softc; + if (extrap != NULL) + *vp = gsp->softc; *cpp = cp; return (gp); } ==== //depot/projects/netperf_socket/sys/kern/tty.c#10 (text+ko) ==== @@ -71,7 +71,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.220 2004/06/21 22:57:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.222 2004/06/24 10:32:30 phk Exp $"); #include "opt_compat.h" #include "opt_tty.h" @@ -97,6 +97,7 @@ #include #include #include +#include #include #include #include @@ -2858,3 +2859,20 @@ tp->t_state &= ~TS_CAN_BYPASS_L_RINT; return (linesw[tp->t_line]->l_hotchar); } + + +/* + * Record the relationship between the serial ports notion of modem control + * signals and the one used in certain ioctls in a way the compiler can enforce + * XXX: We should define TIOCM_* in terms of SER_ if we can limit the + * XXX: consequences of the #include work that would take. + */ +CTASSERT(SER_DTR == TIOCM_DTR / 2); +CTASSERT(SER_RTS == TIOCM_RTS / 2); +CTASSERT(SER_STX == TIOCM_ST / 2); +CTASSERT(SER_SRX == TIOCM_SR / 2); +CTASSERT(SER_CTS == TIOCM_CTS / 2); +CTASSERT(SER_DCD == TIOCM_DCD / 2); +CTASSERT(SER_RI == TIOCM_RI / 2); +CTASSERT(SER_DSR == TIOCM_DSR / 2); + ==== //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#12 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.352 2004/06/22 04:34:05 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.354 2004/06/24 17:22:29 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -4398,15 +4398,6 @@ size_t size, *sizep; int error; - /* - * XXX: Temporary API compatibility for applications that know - * about this hack ("" means list), but haven't been updated - * for the extattr_list_*() system calls yet. This will go - * away for FreeBSD 5.3. - */ - if (strlen(attrname) == 0) - return (extattr_list_vp(vp, attrnamespace, data, nbytes, td)); - VOP_LEASE(vp, td, td->td_ucred, LEASE_READ); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); @@ -4433,9 +4424,8 @@ auio.uio_td = td; auiop = &auio; cnt = nbytes; - } else { + } else sizep = &size; - } #ifdef MAC error = mac_check_vnode_getextattr(td->td_ucred, vp, attrnamespace, @@ -4450,9 +4440,8 @@ if (auiop != NULL) { cnt -= auio.uio_resid; td->td_retval[0] = cnt; - } else { + } else td->td_retval[0] = size; - } done: VOP_UNLOCK(vp, 0, td); @@ -4721,9 +4710,8 @@ auio.uio_td = td; auiop = &auio; cnt = nbytes; - } else { + } else sizep = &size; - } #ifdef MAC error = mac_check_vnode_listextattr(td->td_ucred, vp, attrnamespace); @@ -4737,9 +4725,8 @@ if (auiop != NULL) { cnt -= auio.uio_resid; td->td_retval[0] = cnt; - } else { + } else >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 25 04:42:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57DBE16A4D0; Fri, 25 Jun 2004 04:42:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 299F243D1D; Fri, 25 Jun 2004 04:42:49 +0000 (GMT) (envelope-from ps@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5P4fast003359; Fri, 25 Jun 2004 04:41:36 GMT (envelope-from ps@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5P4faWA003356; Fri, 25 Jun 2004 04:41:36 GMT (envelope-from ps@freebsd.org) Date: Fri, 25 Jun 2004 04:41:36 GMT Message-Id: <200406250441.i5P4faWA003356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ps@freebsd.org using -f From: ps@FreeBSD.org (Paul Saab) To: Perforce Change Reviews Subject: PERFORCE change 55764 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: ps@freebsd.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 04:42:50 -0000 Change 55764 by ps@butter.corp on 2004/06/25 04:33:12 Integrace the sack branch for testing a perforce commit. Affected files ... .. //depot/projects/sack/boot/forth/loader.conf#4 integrate .. //depot/projects/sack/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/sack/conf/files#6 integrate .. //depot/projects/sack/conf/kmod.mk#3 integrate .. //depot/projects/sack/conf/options#4 integrate .. //depot/projects/sack/conf/options.sparc64#2 integrate .. //depot/projects/sack/dev/acpica/acpi.c#5 integrate .. //depot/projects/sack/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/sack/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/sack/dev/acpica/acpi_quirks#1 branch .. //depot/projects/sack/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/sack/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/sack/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/sack/dev/twa/twa_freebsd.c#3 integrate .. //depot/projects/sack/dev/uart/uart_bus.h#3 integrate .. //depot/projects/sack/dev/uart/uart_dev_i8251.c#2 integrate .. //depot/projects/sack/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/sack/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/sack/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/sack/dev/uart/uart_tty.c#4 integrate .. //depot/projects/sack/dev/usb/usbdevs#3 integrate .. //depot/projects/sack/dev/usb/usbdevs.h#3 integrate .. //depot/projects/sack/dev/usb/usbdevs_data.h#3 integrate .. //depot/projects/sack/fs/portalfs/portal_vnops.c#4 integrate .. //depot/projects/sack/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/sack/geom/geom_slice.c#2 integrate .. //depot/projects/sack/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/sack/geom/vinum/geom_vinum_plex.c#3 integrate .. //depot/projects/sack/geom/vinum/geom_vinum_raid5.c#3 integrate .. //depot/projects/sack/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/sack/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/sack/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/sack/kern/tty.c#5 integrate .. //depot/projects/sack/kern/uipc_socket.c#5 integrate .. //depot/projects/sack/kern/uipc_socket2.c#4 integrate .. //depot/projects/sack/kern/uipc_syscalls.c#5 integrate .. //depot/projects/sack/kern/vfs_syscalls.c#5 integrate .. //depot/projects/sack/net/if_ethersubr.c#3 integrate .. //depot/projects/sack/net/if_vlan.c#4 integrate .. //depot/projects/sack/netgraph/ng_base.c#2 integrate .. //depot/projects/sack/netinet/in_pcb.h#2 integrate .. //depot/projects/sack/netinet/ip_dummynet.c#2 integrate .. //depot/projects/sack/netinet/ip_fw2.c#3 integrate .. //depot/projects/sack/netinet/ip_mroute.c#3 integrate .. //depot/projects/sack/netinet/ip_output.c#3 integrate .. //depot/projects/sack/netinet/tcp.h#4 integrate .. //depot/projects/sack/netinet/tcp_input.c#5 integrate .. //depot/projects/sack/netinet/tcp_output.c#5 integrate .. //depot/projects/sack/netinet/tcp_seq.h#3 integrate .. //depot/projects/sack/netinet/tcp_subr.c#5 integrate .. //depot/projects/sack/netinet/tcp_syncache.c#5 integrate .. //depot/projects/sack/netinet/tcp_timer.c#3 integrate .. //depot/projects/sack/netinet/tcp_var.h#3 integrate .. //depot/projects/sack/netipx/spx_usrreq.c#4 integrate .. //depot/projects/sack/netnatm/natm.c#3 integrate .. //depot/projects/sack/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/sack/security/mac/mac_net.c#2 integrate .. //depot/projects/sack/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/sack/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/sack/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/sack/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/sack/security/mac_test/mac_test.c#3 integrate .. //depot/projects/sack/sparc64/conf/NOTES#2 integrate .. //depot/projects/sack/sys/mac_policy.h#3 integrate .. //depot/projects/sack/sys/serial.h#1 branch .. //depot/projects/sack/sys/socketvar.h#4 integrate .. //depot/projects/sack/sys/ttycom.h#3 integrate .. //depot/projects/sack/tools/acpi_quirks2h.awk#1 branch .. //depot/projects/sack/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/sack/vm/uma_core.c#3 integrate .. //depot/projects/sack/vm/vm_map.c#2 integrate .. //depot/projects/sack/vm/vm_pageout.c#3 integrate Differences ... ==== //depot/projects/sack/boot/forth/loader.conf#4 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.79 2004/06/22 22:57:13 brueffer Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.80 2004/06/24 17:49:18 josef Exp $ ############################################################## ### Basic configuration options ############################ @@ -278,7 +278,6 @@ snd_via8233_load="NO" # via8233 snd_via82c686_load="NO" # via82c686 snd_driver_load="NO" # All sound drivers -#pcm0.line="0" # Default value for a mixer channel ############################################################## ### USB modules ############################################ ==== //depot/projects/sack/compat/svr4/imgact_svr4.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.22 2004/02/04 21:52:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.23 2004/06/24 02:21:17 obrien Exp $"); #include #include @@ -90,7 +90,7 @@ } bss_size = round_page(a_out->a_bss); #ifdef DEBUG - printf("imgact: text: %08lx, data: %08lx, bss: %08lx\n", a_out->a_text, a_out->a_data, bss_size); + printf("imgact: text: %08lx, data: %08lx, bss: %08lx\n", (u_long)a_out->a_text, (u_long)a_out->a_data, bss_size); #endif /* @@ -193,7 +193,7 @@ #ifdef DEBUG printf("imgact: startaddr=%08lx, length=%08lx\n", (u_long)vmaddr, - a_out->a_text + a_out->a_data); + (u_long)a_out->a_text + a_out->a_data); #endif /* * allow read/write of data ==== //depot/projects/sack/conf/files#6 (text+ko) ==== @@ -1,9 +1,14 @@ -# $FreeBSD: src/sys/conf/files,v 1.907 2004/06/22 20:13:24 brooks Exp $ +# $FreeBSD: src/sys/conf/files,v 1.909 2004/06/24 06:29:22 njl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and # dependency lines other than the first are silently ignored. # +acpi_quirks.h standard \ + dependency "$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ + compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ + no-obj no-implicit-rule \ + clean "acpi_quirks.h" aicasm optional ahc \ dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ ==== //depot/projects/sack/conf/kmod.mk#3 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.161 2004/06/13 17:29:06 mlaier Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.162 2004/06/24 06:29:22 njl Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -343,6 +343,17 @@ .endif .endfor # _i +.if ${SRCS:Macpi_quirks.h} != "" +CLEANFILES+= acpi_quirks.h +.if !exists(@) +acpi_quirks.h: @ +.endif +.if exists(@) +acpi_quirks.h: @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks +.endif + ${AWK} -f @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks +.endif + regress: lint: ${SRCS} ==== //depot/projects/sack/conf/options#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.453 2004/06/13 17:29:06 mlaier Exp $ +# $FreeBSD: src/sys/conf/options,v 1.454 2004/06/23 21:04:37 ps Exp $ # # On the handling of kernel options # ==== //depot/projects/sack/conf/options.sparc64#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.sparc64,v 1.10 2004/05/08 13:53:46 marius Exp $ +# $FreeBSD: src/sys/conf/options.sparc64,v 1.11 2004/06/24 02:57:10 obrien Exp $ SUN4U opt_global.h @@ -9,6 +9,7 @@ PSYCHO_DEBUG opt_psycho.h DEBUGGER_ON_POWERFAIL opt_psycho.h OFW_PCI_DEBUG opt_ofw_pci.h +OFWCONS_POLL_HZ opt_ofw.h # Debug IOMMU inserts/removes using diagnostic accesses. Very loud. IOMMU_DIAG opt_iommu.h PMAP_STATS opt_pmap.h ==== //depot/projects/sack/dev/acpica/acpi.c#5 (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/dev/acpica/acpi.c,v 1.164 2004/06/23 17:21:02 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.165 2004/06/24 00:48:45 njl Exp $ */ #include "opt_acpi.h" @@ -129,7 +129,6 @@ static ACPI_STATUS acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status); static void acpi_shutdown_final(void *arg, int howto); -static void acpi_shutdown_poweroff(void *arg); static void acpi_enable_fixed_events(struct acpi_softc *sc); static int acpi_parse_prw(ACPI_HANDLE h, struct acpi_prw_data *prw); static ACPI_STATUS acpi_wake_limit(ACPI_HANDLE h, UINT32 level, void *context, @@ -1282,9 +1281,9 @@ ACPI_STATUS status; /* - * If powering off, run the actual shutdown code on each processor. - * It will only perform the shutdown on the BSP. Some chipsets do - * not power off the system correctly if called from an AP. + * XXX Shutdown code should only run on the BSP (cpuid 0). + * Some chipsets do not power off the system correctly if called from + * an AP. */ if ((howto & RB_POWEROFF) != 0) { status = AcpiEnterSleepStatePrep(ACPI_STATE_S5); @@ -1294,36 +1293,20 @@ return; } printf("Powering system off using ACPI\n"); - smp_rendezvous(NULL, acpi_shutdown_poweroff, NULL, NULL); + ACPI_DISABLE_IRQS(); + status = AcpiEnterSleepState(ACPI_STATE_S5); + if (ACPI_FAILURE(status)) { + printf("ACPI power-off failed - %s\n", AcpiFormatException(status)); + } else { + DELAY(1000000); + printf("ACPI power-off failed - timeout\n"); + } } else { printf("Shutting down ACPI\n"); AcpiTerminate(); } } -/* - * Since this function may be called with locks held or in an unknown - * context, it cannot allocate memory, acquire locks, sleep, etc. - */ -static void -acpi_shutdown_poweroff(void *arg) -{ - ACPI_STATUS status; - - /* Only attempt to power off if this is the BSP (cpuid 0). */ - if (PCPU_GET(cpuid) != 0) - return; - - ACPI_DISABLE_IRQS(); - status = AcpiEnterSleepState(ACPI_STATE_S5); - if (ACPI_FAILURE(status)) { - printf("ACPI power-off failed - %s\n", AcpiFormatException(status)); - } else { - DELAY(1000000); - printf("ACPI power-off failed - timeout\n"); - } -} - static void acpi_enable_fixed_events(struct acpi_softc *sc) { ==== //depot/projects/sack/dev/acpica/acpi_cpu.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.40 2004/06/19 02:27:23 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.41 2004/06/24 00:38:51 njl Exp $"); #include "opt_acpi.h" #include @@ -1046,7 +1046,7 @@ struct sbuf sb; char buf[128]; int i; - uint64_t fract, sum, whole; + uintmax_t fract, sum, whole; sum = 0; for (i = 0; i < cpu_cx_count; i++) @@ -1054,7 +1054,7 @@ sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN); for (i = 0; i < cpu_cx_count; i++) { if (sum > 0) { - whole = cpu_cx_stats[i] * 100; + whole = (uintmax_t)cpu_cx_stats[i] * 100; fract = (whole % sum) * 100; sbuf_printf(&sb, "%u.%02u%% ", (u_int)(whole / sum), (u_int)(fract / sum)); ==== //depot/projects/sack/dev/acpica/acpi_pci.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.19 2004/06/23 15:08:40 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.20 2004/06/24 01:57:31 njl Exp $"); #include #include @@ -232,7 +232,7 @@ if (ACPI_FAILURE(status)) printf("WARNING: Unable to detach object data from %s - %s\n", acpi_name(handle), AcpiFormatException(status)); - status = AcpiAttachData(handle, acpi_fake_objhandler, child); + status = AcpiAttachData(handle, acpi_fake_objhandler, pci_child); if (ACPI_FAILURE(status)) printf("WARNING: Unable to attach object data to %s - %s\n", acpi_name(handle), AcpiFormatException(status)); @@ -261,8 +261,7 @@ dinfo->ap_dinfo.cfg.slot == slot) { dinfo->ap_handle = handle; acpi_pci_update_device(handle, devlist[i]); - free(devlist, M_TEMP); - return_ACPI_STATUS (AE_OK); + break; } } free(devlist, M_TEMP); ==== //depot/projects/sack/dev/ichsmb/ichsmb_pci.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.12 2004/05/30 20:08:33 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.13 2004/06/24 18:21:28 ambrisko Exp $"); /* * Support for the SMBus controller logical device which is part of the @@ -73,6 +73,7 @@ #define ID_82801CA 0x24838086 #define ID_82801DC 0x24C38086 #define ID_82801EB 0x24D38086 +#define ID_6300ESB 0x25a48086 #define PCIS_SERIALBUS_SMBUS_PROGIF 0x00 @@ -137,6 +138,9 @@ case ID_82801EB: device_set_desc(dev, "Intel 82801EB (ICH5) SMBus controller"); break; + case ID_6300ESB: + device_set_desc(dev, "Intel 6300ESB (ICH) SMBus controller"); + break; default: if (pci_get_class(dev) == PCIC_SERIALBUS && pci_get_subclass(dev) == PCIS_SERIALBUS_SMBUS @@ -167,6 +171,9 @@ sc->io_rid = ICH_SMB_BASE; sc->io_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->io_rid, 0, ~0, 16, RF_ACTIVE); + if (sc->io_res == NULL) + sc->io_res = bus_alloc_resource(dev, SYS_RES_IOPORT, + &sc->io_rid, 0, ~0, 32, RF_ACTIVE); if (sc->io_res == NULL) { log(LOG_ERR, "%s: can't map I/O\n", device_get_nameunit(dev)); error = ENXIO; ==== //depot/projects/sack/dev/ofw/ofw_console.c#4 (text+ko) ==== @@ -24,10 +24,11 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.24 2004/06/16 09:46:52 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.25 2004/06/24 02:57:11 obrien Exp $"); #include "opt_ddb.h" #include "opt_comconsole.h" +#include "opt_ofw.h" #include #include @@ -42,7 +43,10 @@ #include -#define OFW_POLL_HZ 4 +#ifndef OFWCONS_POLL_HZ +#define OFWCONS_POLL_HZ 4 /* 50-100 works best on Ultra2 */ +#endif +#define OFBURSTLEN 128 /* max number of bytes to write in one chunk */ static d_open_t ofw_dev_open; static d_close_t ofw_dev_close; @@ -125,7 +129,7 @@ ttychars(tp); tp->t_iflag = TTYDEF_IFLAG; tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG|CLOCAL; + tp->t_cflag = TTYDEF_CFLAG; tp->t_lflag = TTYDEF_LFLAG; tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; ttsetwater(tp); @@ -138,7 +142,7 @@ error = ttyld_open(tp, dev); if (error == 0 && setuptimeout) { - polltime = hz / OFW_POLL_HZ; + polltime = hz / OFWCONS_POLL_HZ; if (polltime < 1) { polltime = 1; } @@ -162,6 +166,8 @@ return (ENXIO); } + /* XXX Should be replaced with callout_stop(9) */ + untimeout(ofw_timeout, tp, ofw_timeouthandle); ttyld_close(tp, flag); ttyclose(tp); @@ -179,16 +185,18 @@ static void ofw_tty_start(struct tty *tp) { + struct clist *cl; + int len; + u_char buf[OFBURSTLEN]; + - if (tp->t_state & (TS_TIMEOUT | TS_TTSTOP)) { - ttwwakeup(tp); + if (tp->t_state & (TS_TIMEOUT | TS_BUSY | TS_TTSTOP)) return; - } tp->t_state |= TS_BUSY; - while (tp->t_outq.c_cc != 0) { - ofw_cons_putc(NULL, getc(&tp->t_outq)); - } + cl = &tp->t_outq; + len = q_to_b(cl, buf, OFBURSTLEN); + OF_write(stdout, buf, len); tp->t_state &= ~TS_BUSY; ttwwakeup(tp); ==== //depot/projects/sack/dev/sound/pcm/mixer.c#3 (text+ko) ==== @@ -25,11 +25,10 @@ */ #include -#include #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.38 2004/06/20 15:38:11 josef Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.39 2004/06/24 17:41:20 josef Exp $"); MALLOC_DEFINE(M_MIXER, "mixer", "mixer"); @@ -190,7 +189,6 @@ { struct snddev_info *snddev; struct snd_mixer *m; - char devname[20]; u_int16_t v; struct cdev *pdev; int i, unit, val; @@ -206,13 +204,14 @@ goto bad; for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) { - snprintf(devname, sizeof(devname), "%s.%s", device_get_nameunit(dev), snd_mixernames[i]); - TUNABLE_INT_FETCH(devname, &val); - - if (val >= 0 && val <= 100) - v = (u_int16_t) val; - else + if (resource_int_value(device_get_name(dev), + device_get_unit(dev), snd_mixernames[i], &val) == 0) { + if (val >= 0 && val <= 100) { + v = (u_int16_t) val; + } + } else { v = snd_mixerdefaults[i]; + } mixer_set(m, i, v | (v << 8)); } ==== //depot/projects/sack/dev/twa/twa_freebsd.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twa/twa_freebsd.c,v 1.6 2004/06/16 09:47:00 phk Exp $ + * $FreeBSD: src/sys/dev/twa/twa_freebsd.c,v 1.7 2004/06/24 18:30:08 scottl Exp $ */ /* @@ -584,7 +584,7 @@ TWA_ALIGNMENT, /* alignment */ 0, /* boundary */ BUS_SPACE_MAXADDR, /* lowaddr */ - BUS_SPACE_MAXADDR + 1, /* highaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ TWA_Q_LENGTH * (sizeof(struct twa_command_packet)),/* maxsize */ ==== //depot/projects/sack/dev/uart/uart_bus.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.5 2004/06/16 09:47:00 phk Exp $ + * $FreeBSD: src/sys/dev/uart/uart_bus.h,v 1.6 2004/06/24 10:07:28 phk Exp $ */ #ifndef _DEV_UART_BUS_H_ @@ -33,6 +33,7 @@ #include "opt_uart.h" #endif +#include #include /* Drain and flush targets. */ @@ -45,7 +46,7 @@ * Interrupt sources (in priority order). See also uart_core.c * Note that the low order 16 bits are used to pass modem signals * from the hardware interrupt handler to the software interrupt - * handler. See UART_SIG_* and UART_SIGMASK_* below. + * handler. */ #define UART_IPEND_OVERRUN 0x010000 #define UART_IPEND_BREAK 0x020000 @@ -62,31 +63,17 @@ #define UART_STAT_OVERRUN 0x0400 #define UART_STAT_PARERR 0x0800 -/* Modem and line signals. */ -#define UART_SIG_DTR 0x0001 -#define UART_SIG_RTS 0x0002 -#define UART_SIG_DSR 0x0004 -#define UART_SIG_CTS 0x0008 -#define UART_SIG_DCD 0x0010 -#define UART_SIG_RI 0x0020 -#define UART_SIG_DDTR 0x0100 -#define UART_SIG_DRTS 0x0200 -#define UART_SIG_DDSR 0x0400 -#define UART_SIG_DCTS 0x0800 -#define UART_SIG_DDCD 0x1000 -#define UART_SIG_DRI 0x2000 - -#define UART_SIGMASK_DTE 0x0003 -#define UART_SIGMASK_DCE 0x003c -#define UART_SIGMASK_STATE 0x003f -#define UART_SIGMASK_DELTA 0x3f00 +#define UART_SIGMASK_DTE (SER_DTR | SER_RTS) +#define UART_SIGMASK_DCE (SER_DSR | SER_CTS | SER_DCD | SER_RI) +#define UART_SIGMASK_STATE (UART_SIGMASK_DTE | UART_SIGMASK_DCE) +#define UART_SIGMASK_DELTA (UART_SIGMASK_STATE << 8) #ifdef UART_PPS_ON_CTS -#define UART_SIG_DPPS UART_SIG_DCTS -#define UART_SIG_PPS UART_SIG_CTS +#define UART_SIG_DPPS SER_DCTS +#define UART_SIG_PPS SER_CTS #else -#define UART_SIG_DPPS UART_SIG_DDCD -#define UART_SIG_PPS UART_SIG_DCD +#define UART_SIG_DPPS SER_DDCD +#define UART_SIG_PPS SER_DCD #endif /* UART_IOCTL() requests */ ==== //depot/projects/sack/dev/uart/uart_dev_i8251.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_i8251.c,v 1.3 2003/09/17 03:11:32 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_i8251.c,v 1.4 2004/06/24 10:07:28 phk Exp $"); #include #include @@ -398,9 +398,9 @@ i8251_bus_flush(sc, UART_FLUSH_RECEIVER|UART_FLUSH_TRANSMITTER); if (i8251->mcr & MCR_DTR) - sc->sc_hwsig |= UART_SIG_DTR; + sc->sc_hwsig |= SER_DTR; if (i8251->mcr & MCR_RTS) - sc->sc_hwsig |= UART_SIG_RTS; + sc->sc_hwsig |= SER_RTS; i8251_bus_getsig(sc); i8251_clrint(bas); @@ -454,10 +454,10 @@ mtx_lock_spin(&sc->sc_hwmtx); msr = uart_getreg(&sc->sc_bas, REG_MSR); mtx_unlock_spin(&sc->sc_hwmtx); - SIGCHG(msr & MSR_DSR, sig, UART_SIG_DSR, UART_SIG_DDSR); - SIGCHG(msr & MSR_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); - SIGCHG(msr & MSR_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD); - SIGCHG(msr & MSR_RI, sig, UART_SIG_RI, UART_SIG_DRI); + SIGCHG(msr & MSR_DSR, sig, SER_DSR, SER_DDSR); + SIGCHG(msr & MSR_CTS, sig, SER_CTS, SER_DCTS); + SIGCHG(msr & MSR_DCD, sig, SER_DCD, SER_DDCD); + SIGCHG(msr & MSR_RI, sig, SER_RI, SER_DRI); new = sig & ~UART_SIGMASK_DELTA; } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); return (sig); @@ -715,20 +715,20 @@ do { old = sc->sc_hwsig; new = old; - if (sig & UART_SIG_DDTR) { - SIGCHG(sig & UART_SIG_DTR, new, UART_SIG_DTR, - UART_SIG_DDTR); + if (sig & SER_DDTR) { + SIGCHG(sig & SER_DTR, new, SER_DTR, + SER_DDTR); } - if (sig & UART_SIG_DRTS) { - SIGCHG(sig & UART_SIG_RTS, new, UART_SIG_RTS, - UART_SIG_DRTS); + if (sig & SER_DRTS) { + SIGCHG(sig & SER_RTS, new, SER_RTS, + SER_DRTS); } } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); mtx_lock_spin(&sc->sc_hwmtx); i8251->mcr &= ~(MCR_DTR|MCR_RTS); - if (new & UART_SIG_DTR) + if (new & SER_DTR) i8251->mcr |= MCR_DTR; - if (new & UART_SIG_RTS) + if (new & SER_RTS) i8251->mcr |= MCR_RTS; uart_setreg(bas, REG_MCR, i8251->mcr); uart_barrier(bas); ==== //depot/projects/sack/dev/uart/uart_dev_ns8250.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.7 2004/05/26 21:59:01 tmm Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_ns8250.c,v 1.8 2004/06/24 10:07:28 phk Exp $"); #include #include @@ -399,9 +399,9 @@ ns8250_bus_flush(sc, UART_FLUSH_RECEIVER|UART_FLUSH_TRANSMITTER); if (ns8250->mcr & MCR_DTR) - sc->sc_hwsig |= UART_SIG_DTR; + sc->sc_hwsig |= SER_DTR; if (ns8250->mcr & MCR_RTS) - sc->sc_hwsig |= UART_SIG_RTS; + sc->sc_hwsig |= SER_RTS; ns8250_bus_getsig(sc); ns8250_clrint(bas); @@ -455,10 +455,10 @@ mtx_lock_spin(&sc->sc_hwmtx); msr = uart_getreg(&sc->sc_bas, REG_MSR); mtx_unlock_spin(&sc->sc_hwmtx); - SIGCHG(msr & MSR_DSR, sig, UART_SIG_DSR, UART_SIG_DDSR); - SIGCHG(msr & MSR_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); - SIGCHG(msr & MSR_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD); - SIGCHG(msr & MSR_RI, sig, UART_SIG_RI, UART_SIG_DRI); + SIGCHG(msr & MSR_DSR, sig, SER_DSR, SER_DDSR); + SIGCHG(msr & MSR_CTS, sig, SER_CTS, SER_DCTS); + SIGCHG(msr & MSR_DCD, sig, SER_DCD, SER_DDCD); + SIGCHG(msr & MSR_RI, sig, SER_RI, SER_DRI); new = sig & ~UART_SIGMASK_DELTA; } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); return (sig); @@ -753,20 +753,20 @@ do { old = sc->sc_hwsig; new = old; - if (sig & UART_SIG_DDTR) { - SIGCHG(sig & UART_SIG_DTR, new, UART_SIG_DTR, - UART_SIG_DDTR); + if (sig & SER_DDTR) { + SIGCHG(sig & SER_DTR, new, SER_DTR, + SER_DDTR); } - if (sig & UART_SIG_DRTS) { - SIGCHG(sig & UART_SIG_RTS, new, UART_SIG_RTS, - UART_SIG_DRTS); + if (sig & SER_DRTS) { + SIGCHG(sig & SER_RTS, new, SER_RTS, + SER_DRTS); } } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); mtx_lock_spin(&sc->sc_hwmtx); ns8250->mcr &= ~(MCR_DTR|MCR_RTS); - if (new & UART_SIG_DTR) + if (new & SER_DTR) ns8250->mcr |= MCR_DTR; - if (new & UART_SIG_RTS) + if (new & SER_RTS) ns8250->mcr |= MCR_RTS; uart_setreg(bas, REG_MCR, ns8250->mcr); uart_barrier(bas); ==== //depot/projects/sack/dev/uart/uart_dev_sab82532.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.6 2004/04/25 04:30:40 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.7 2004/06/24 10:07:28 phk Exp $"); #include #include @@ -410,7 +410,7 @@ uart_barrier(bas); if (sc->sc_sysdev == NULL) - sab82532_bus_setsig(sc, UART_SIG_DDTR|UART_SIG_DRTS); + sab82532_bus_setsig(sc, SER_DDTR|SER_DRTS); (void)sab82532_bus_getsig(sc); return (0); } @@ -455,9 +455,9 @@ sig = old; mtx_lock_spin(&sc->sc_hwmtx); star = uart_getreg(bas, SAB_STAR); - SIGCHG(star & SAB_STAR_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); + SIGCHG(star & SAB_STAR_CTS, sig, SER_CTS, SER_DCTS); vstr = uart_getreg(bas, SAB_VSTR); - SIGCHG(vstr & SAB_VSTR_CD, sig, UART_SIG_DCD, UART_SIG_DDCD); + SIGCHG(vstr & SAB_VSTR_CD, sig, SER_DCD, SER_DDCD); pvr = uart_getreg(bas, SAB_PVR); switch (bas->chan) { case 1: @@ -467,7 +467,7 @@ pvr &= SAB_PVR_DSR_B; break; } - SIGCHG(~pvr, sig, UART_SIG_DSR, UART_SIG_DDSR); + SIGCHG(~pvr, sig, SER_DSR, SER_DDSR); mtx_unlock_spin(&sc->sc_hwmtx); new = sig & ~UART_SIGMASK_DELTA; } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); @@ -655,13 +655,13 @@ do { old = sc->sc_hwsig; new = old; - if (sig & UART_SIG_DDTR) { - SIGCHG(sig & UART_SIG_DTR, new, UART_SIG_DTR, - UART_SIG_DDTR); + if (sig & SER_DDTR) { + SIGCHG(sig & SER_DTR, new, SER_DTR, + SER_DDTR); } - if (sig & UART_SIG_DRTS) { - SIGCHG(sig & UART_SIG_RTS, new, UART_SIG_RTS, - UART_SIG_DRTS); + if (sig & SER_DRTS) { + SIGCHG(sig & SER_RTS, new, SER_RTS, + SER_DRTS); } } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); @@ -670,13 +670,13 @@ pvr = uart_getreg(bas, SAB_PVR); switch (bas->chan) { case 1: - if (new & UART_SIG_DTR) + if (new & SER_DTR) pvr &= ~SAB_PVR_DTR_A; else pvr |= SAB_PVR_DTR_A; break; case 2: - if (new & UART_SIG_DTR) + if (new & SER_DTR) pvr &= ~SAB_PVR_DTR_B; else pvr |= SAB_PVR_DTR_B; @@ -686,7 +686,7 @@ /* Set RTS pin. */ mode = uart_getreg(bas, SAB_MODE); - if (new & UART_SIG_RTS) + if (new & SER_RTS) mode &= ~SAB_MODE_FRTS; else mode |= SAB_MODE_FRTS; ==== //depot/projects/sack/dev/uart/uart_dev_z8530.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.7 2004/05/04 06:58:10 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_z8530.c,v 1.8 2004/06/24 10:07:28 phk Exp $"); #include #include @@ -350,8 +350,8 @@ mtx_lock_spin(&sc->sc_hwmtx); bes = uart_getmreg(&sc->sc_bas, RR_BES); mtx_unlock_spin(&sc->sc_hwmtx); - SIGCHG(bes & BES_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); - SIGCHG(bes & BES_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD); + SIGCHG(bes & BES_CTS, sig, SER_CTS, SER_DCTS); + SIGCHG(bes & BES_DCD, sig, SER_DCD, SER_DDCD); new = sig & ~UART_SIGMASK_DELTA; } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); return (sig); @@ -411,8 +411,8 @@ if (bes & BES_RXA) ipend |= UART_IPEND_RXREADY; sig = sc->sc_hwsig; - SIGCHG(bes & BES_CTS, sig, UART_SIG_CTS, UART_SIG_DCTS); - SIGCHG(bes & BES_DCD, sig, UART_SIG_DCD, UART_SIG_DDCD); + SIGCHG(bes & BES_CTS, sig, SER_CTS, SER_DCTS); + SIGCHG(bes & BES_DCD, sig, SER_DCD, SER_DDCD); if (sig & UART_SIGMASK_DELTA) ipend |= UART_IPEND_SIGCHG; src = uart_getmreg(bas, RR_SRC); @@ -509,22 +509,22 @@ do { old = sc->sc_hwsig; new = old; - if (sig & UART_SIG_DDTR) { - SIGCHG(sig & UART_SIG_DTR, new, UART_SIG_DTR, - UART_SIG_DDTR); + if (sig & SER_DDTR) { + SIGCHG(sig & SER_DTR, new, SER_DTR, + SER_DDTR); } - if (sig & UART_SIG_DRTS) { - SIGCHG(sig & UART_SIG_RTS, new, UART_SIG_RTS, - UART_SIG_DRTS); + if (sig & SER_DRTS) { + SIGCHG(sig & SER_RTS, new, SER_RTS, + SER_DRTS); } } while (!atomic_cmpset_32(&sc->sc_hwsig, old, new)); mtx_lock_spin(&sc->sc_hwmtx); - if (new & UART_SIG_DTR) + if (new & SER_DTR) z8530->tpc |= TPC_DTR; else z8530->tpc &= ~TPC_DTR; - if (new & UART_SIG_RTS) + if (new & SER_RTS) z8530->tpc |= TPC_RTS; else z8530->tpc &= ~TPC_RTS; ==== //depot/projects/sack/dev/uart/uart_tty.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.12 2004/06/23 10:28:09 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.13 2004/06/24 10:07:28 phk Exp $"); #include #include @@ -164,11 +164,11 @@ */ if ((tp->t_cflag & CRTS_IFLOW) && !sc->sc_hwiflow) { if ((tp->t_state & TS_TBLOCK) && - (sc->sc_hwsig & UART_SIG_RTS)) - UART_SETSIG(sc, UART_SIG_DRTS); + (sc->sc_hwsig & SER_RTS)) + UART_SETSIG(sc, SER_DRTS); else if (!(tp->t_state & TS_TBLOCK) && - !(sc->sc_hwsig & UART_SIG_RTS)) - UART_SETSIG(sc, UART_SIG_DRTS|UART_SIG_RTS); + !(sc->sc_hwsig & SER_RTS)) + UART_SETSIG(sc, SER_DRTS|SER_RTS); } if (tp->t_state & TS_TTSTOP) @@ -207,7 +207,7 @@ t->c_cflag &= ~HUPCL; } if (t->c_ospeed == 0) { - UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DRTS); + UART_SETSIG(sc, SER_DDTR | SER_DRTS); return (0); } switch (t->c_cflag & CSIZE) { @@ -224,13 +224,13 @@ parity = UART_PARITY_NONE; if (UART_PARAM(sc, t->c_ospeed, databits, stopbits, parity) != 0) return (EINVAL); - UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DTR); + UART_SETSIG(sc, SER_DDTR | SER_DTR); /* Set input flow control state. */ if (!sc->sc_hwiflow) { if ((t->c_cflag & CRTS_IFLOW) && (tp->t_state & TS_TBLOCK)) - UART_SETSIG(sc, UART_SIG_DRTS); + UART_SETSIG(sc, SER_DRTS); else - UART_SETSIG(sc, UART_SIG_DRTS | UART_SIG_RTS); + UART_SETSIG(sc, SER_DRTS | SER_RTS); } else UART_IOCTL(sc, UART_IOCTL_IFLOW, (t->c_cflag & CRTS_IFLOW)); /* Set output flow control state. */ @@ -297,11 +297,11 @@ if (pend & UART_IPEND_SIGCHG) { sig = pend & UART_IPEND_SIGMASK; - if (sig & UART_SIG_DDCD) - ttyld_modem(tp, sig & UART_SIG_DCD); - if ((sig & UART_SIG_DCTS) && (tp->t_cflag & CCTS_OFLOW) && + if (sig & SER_DDCD) + ttyld_modem(tp, sig & SER_DCD); + if ((sig & SER_DCTS) && (tp->t_cflag & CCTS_OFLOW) && !sc->sc_hwoflow) { - if (sig & UART_SIG_CTS) { + if (sig & SER_CTS) { tp->t_state &= ~TS_TTSTOP; ttyld_start(tp); } else @@ -418,7 +418,7 @@ /* * Handle initial DCD. */ - if ((sc->sc_hwsig & UART_SIG_DCD) || sc->sc_callout) + if ((sc->sc_hwsig & SER_DCD) || sc->sc_callout) ttyld_modem(tp, 1); } /* @@ -464,7 +464,7 @@ if (sc->sc_hwoflow) UART_IOCTL(sc, UART_IOCTL_OFLOW, 0); if (sc->sc_sysdev == NULL) - UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DRTS); + UART_SETSIG(sc, SER_DDTR | SER_DRTS); /* Disable pulse capturing. */ sc->sc_pps.ppsparam.mode = 0; @@ -504,52 +504,52 @@ UART_IOCTL(sc, UART_IOCTL_BREAK, 0); break; case TIOCSDTR: - UART_SETSIG(sc, UART_SIG_DDTR | UART_SIG_DTR); + UART_SETSIG(sc, SER_DDTR | SER_DTR); break; case TIOCCDTR: - UART_SETSIG(sc, UART_SIG_DDTR); + UART_SETSIG(sc, SER_DDTR); break; case TIOCMSET: bits = *(int*)data; - sig = UART_SIG_DDTR | UART_SIG_DRTS; + sig = SER_DDTR | SER_DRTS; if (bits & TIOCM_DTR) - sig |= UART_SIG_DTR; + sig |= SER_DTR; if (bits & TIOCM_RTS) - sig |= UART_SIG_RTS; + sig |= SER_RTS; UART_SETSIG(sc, sig); break; case TIOCMBIS: bits = *(int*)data; sig = 0; if (bits & TIOCM_DTR) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 25 04:45:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4EF6416A4D5; Fri, 25 Jun 2004 04:45:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FAFF43D41; Fri, 25 Jun 2004 04:45:25 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5P4iUGL003468; Fri, 25 Jun 2004 04:44:30 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5P4iUEW003465; Fri, 25 Jun 2004 04:44:30 GMT (envelope-from marcel@freebsd.org) Date: Fri, 25 Jun 2004 04:44:30 GMT Message-Id: <200406250444.i5P4iUEW003465@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: marcel@FreeBSD.org (Marcel Moolenaar) To: Perforce Change Reviews Subject: PERFORCE change 55765 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: marcel@freebsd.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 04:45:25 -0000 Change 55765 by marcel@marcel_nfs on 2004/06/25 04:43:36 o Re-add ia64 support to gdb 6.1.1 o Re-add ia64 bmake foo. Affected files ... .. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/fbsd.mh#3 add .. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/fbsd.mt#3 add .. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/nm-fbsd.h#3 add .. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/tm-fbsd.h#3 add .. //depot/projects/gdb/contrib/gdb/gdb/ia64-fbsd-nat.c#3 add .. //depot/projects/gdb/contrib/gdb/gdb/ia64-fbsd-tdep.c#3 add .. //depot/projects/gdb/contrib/gdb/gdb/ia64-tdep.c#7 edit .. //depot/projects/gdb/contrib/gdb/gdb/ia64-tdep.h#4 edit .. //depot/projects/gdb/contrib/gdb/gdb/inftarg.c#7 edit .. //depot/projects/gdb/contrib/gdb/gdb/remote.c#7 edit .. //depot/projects/gdb/contrib/gdb/gdb/target.h#8 edit .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/Makefile#1 add .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/config.h#1 add .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/init.c#1 add Differences ... ==== //depot/projects/gdb/contrib/gdb/gdb/ia64-tdep.c#7 (text+ko) ==== @@ -45,17 +45,6 @@ #include "libunwind-ia64.h" #endif -/* Hook for determining the global pointer when calling functions in - the inferior under AIX. The initialization code in ia64-aix-nat.c - sets this hook to the address of a function which will find the - global pointer for a given address. - - The generic code which uses the dynamic section in the inferior for - finding the global pointer is not of much use on AIX since the - values obtained from the inferior have not been relocated. */ - -CORE_ADDR (*native_find_global_pointer) (CORE_ADDR) = 0; - /* An enumeration of the different IA-64 instruction types. */ typedef enum instruction_type @@ -256,20 +245,6 @@ }; -struct gdbarch_tdep - { - CORE_ADDR (*sigcontext_register_address) (CORE_ADDR, int); - /* OS specific function which, given a frame address - and register number, returns the offset to the - given register from the start of the frame. */ - CORE_ADDR (*find_global_pointer) (CORE_ADDR); - }; - -#define SIGCONTEXT_REGISTER_ADDRESS \ - (gdbarch_tdep (current_gdbarch)->sigcontext_register_address) -#define FIND_GLOBAL_POINTER \ - (gdbarch_tdep (current_gdbarch)->find_global_pointer) - int ia64_register_reggroup_p (struct gdbarch *gdbarch, int regnum, struct reggroup *group) @@ -682,9 +657,18 @@ if ((cfm & 0x7f) > regnum - V32_REGNUM) { + ULONGEST bspstore; ULONGEST reg_addr = rse_address_add (bsp, (regnum - V32_REGNUM)); - reg = read_memory_integer ((CORE_ADDR)reg_addr, 8); - store_unsigned_integer (buf, register_size (current_gdbarch, regnum), reg); + regcache_cooked_read_unsigned (regcache, IA64_BSPSTORE_REGNUM, + &bspstore); + if (reg_addr < bspstore) { + reg = read_memory_integer ((CORE_ADDR)reg_addr, 8); + store_unsigned_integer (buf, register_size (current_gdbarch, + regnum), reg); + } else + target_read_partial (¤t_target, TARGET_OBJECT_DIRTY, + (void*)bspstore, buf, reg_addr - bspstore, + register_size (current_gdbarch, regnum)); } else store_unsigned_integer (buf, register_size (current_gdbarch, regnum), 0); @@ -725,7 +709,21 @@ if (nat_addr >= bsp) regcache_cooked_read_unsigned (regcache, IA64_RNAT_REGNUM, &nat_collection); else - nat_collection = read_memory_integer (nat_addr, 8); + { + ULONGEST bspstore; + regcache_cooked_read_unsigned (regcache, IA64_BSPSTORE_REGNUM, + &bspstore); + if (nat_addr < bspstore) + nat_collection = read_memory_integer (nat_addr, 8); + else { + char natbuf[8]; + target_read_partial (¤t_target, TARGET_OBJECT_DIRTY, + (void*)bspstore, natbuf, + nat_addr - bspstore, + register_size (current_gdbarch, regnum)); + nat_collection = *((uint64_t*)natbuf); + } + } nat_bit = (gr_addr >> 3) & 0x3f; natN_val = (nat_collection >> nat_bit) & 1; } @@ -789,8 +787,16 @@ if ((cfm & 0x7f) > regnum - V32_REGNUM) { + ULONGEST bspstore; ULONGEST reg_addr = rse_address_add (bsp, (regnum - V32_REGNUM)); - write_memory (reg_addr, (void *)buf, 8); + regcache_cooked_read_unsigned (regcache, IA64_BSPSTORE_REGNUM, + &bspstore); + if (reg_addr < bspstore) + write_memory (reg_addr, (void *)buf, 8); + else + target_write_partial (¤t_target, TARGET_OBJECT_DIRTY, + (void*)bspstore, buf, reg_addr - bspstore, + register_size (current_gdbarch, regnum)); } } else if (IA64_NAT0_REGNUM <= regnum && regnum <= IA64_NAT31_REGNUM) @@ -845,13 +851,33 @@ else { char nat_buf[8]; - nat_collection = read_memory_integer (nat_addr, 8); + ULONGEST bspstore; + regcache_cooked_read_unsigned (regcache, IA64_BSPSTORE_REGNUM, + &bspstore); + if (nat_addr < bspstore) + nat_collection = read_memory_integer (nat_addr, 8); + else { + char natbuf[8]; + target_read_partial (¤t_target, TARGET_OBJECT_DIRTY, + (void*)bspstore, natbuf, + nat_addr - bspstore, + register_size (current_gdbarch, regnum)); + nat_collection = *((uint64_t*)natbuf); + } if (natN_val) nat_collection |= natN_mask; else nat_collection &= ~natN_mask; - store_unsigned_integer (nat_buf, register_size (current_gdbarch, regnum), nat_collection); - write_memory (nat_addr, nat_buf, 8); + store_unsigned_integer (nat_buf, register_size (current_gdbarch, + regnum), + nat_collection); + if (nat_addr < bspstore) + write_memory (nat_addr, nat_buf, 8); + else + target_write_partial (¤t_target, TARGET_OBJECT_DIRTY, + (void*)bspstore, nat_buf, + nat_addr - bspstore, + register_size (current_gdbarch, regnum)); } } } @@ -1813,6 +1839,7 @@ prev_bof = rse_address_add (prev_bsp, -(prev_cfm & 0x7f)); addr = rse_address_add (prev_bof, (regnum - IA64_GR32_REGNUM)); + /* XXX marcel */ *lvalp = lval_memory; *addrp = addr; read_memory (addr, valuep, register_size (current_gdbarch, regnum)); @@ -2858,8 +2885,8 @@ DT_PLTGOT tag. If it finds one of these, the corresponding d_un.d_ptr value is the global pointer. */ -static CORE_ADDR -generic_elf_find_global_pointer (CORE_ADDR faddr) +CORE_ADDR +ia64_generic_find_global_pointer (CORE_ADDR faddr) { struct obj_section *faddr_sect; @@ -3255,33 +3282,10 @@ tdep = xmalloc (sizeof (struct gdbarch_tdep)); gdbarch = gdbarch_alloc (&info, tdep); + tdep->osabi = info.osabi; + tdep->sigcontext_register_address = NULL; + tdep->find_global_pointer = ia64_generic_find_global_pointer; - /* Set the method of obtaining the sigcontext addresses at which - registers are saved. The method of checking to see if - native_find_global_pointer is nonzero to indicate that we're - on AIX is kind of hokey, but I can't think of a better way - to do it. */ - if (info.osabi == GDB_OSABI_LINUX) - tdep->sigcontext_register_address = ia64_linux_sigcontext_register_address; - else if (native_find_global_pointer != 0) - tdep->sigcontext_register_address = ia64_aix_sigcontext_register_address; - else - tdep->sigcontext_register_address = 0; - - /* We know that GNU/Linux won't have to resort to the - native_find_global_pointer hackery. But that's the only one we - know about so far, so if native_find_global_pointer is set to - something non-zero, then use it. Otherwise fall back to using - generic_elf_find_global_pointer. This arrangement should (in - theory) allow us to cross debug GNU/Linux binaries from an AIX - machine. */ - if (info.osabi == GDB_OSABI_LINUX) - tdep->find_global_pointer = generic_elf_find_global_pointer; - else if (native_find_global_pointer != 0) - tdep->find_global_pointer = native_find_global_pointer; - else - tdep->find_global_pointer = generic_elf_find_global_pointer; - /* Define the ia64 floating-point format to gdb. */ builtin_type_ia64_ext = init_type (TYPE_CODE_FLT, 128 / 8, @@ -3338,10 +3342,7 @@ set_gdbarch_memory_remove_breakpoint (gdbarch, ia64_memory_remove_breakpoint); set_gdbarch_breakpoint_from_pc (gdbarch, ia64_breakpoint_from_pc); set_gdbarch_read_pc (gdbarch, ia64_read_pc); - if (info.osabi == GDB_OSABI_LINUX) - set_gdbarch_write_pc (gdbarch, ia64_linux_write_pc); - else - set_gdbarch_write_pc (gdbarch, ia64_write_pc); + set_gdbarch_write_pc (gdbarch, ia64_write_pc); /* Settings for calling functions in the inferior. */ set_gdbarch_push_dummy_call (gdbarch, ia64_push_dummy_call); @@ -3366,6 +3367,8 @@ set_gdbarch_print_insn (gdbarch, ia64_print_insn); set_gdbarch_convert_from_func_ptr_addr (gdbarch, ia64_convert_from_func_ptr_addr); + gdbarch_init_osabi (info, gdbarch); + return gdbarch; } ==== //depot/projects/gdb/contrib/gdb/gdb/ia64-tdep.h#4 (text+ko) ==== @@ -22,10 +22,25 @@ #ifndef IA64_TDEP_H #define IA64_TDEP_H -extern CORE_ADDR ia64_linux_sigcontext_register_address (CORE_ADDR, int); -extern CORE_ADDR ia64_aix_sigcontext_register_address (CORE_ADDR, int); -extern unsigned long ia64_linux_getunwind_table (void *, size_t); -extern void ia64_write_pc (CORE_ADDR, ptid_t); -extern void ia64_linux_write_pc (CORE_ADDR, ptid_t); +#include "osabi.h" + +/* Target-dependent structure in gdbarch. */ +struct gdbarch_tdep +{ + enum gdb_osabi osabi; /* OS/ABI of inferior. */ + + CORE_ADDR (*sigcontext_register_address) (CORE_ADDR, int); + /* OS specific function which, given a frame address + and register number, returns the offset to the + given register from the start of the frame. */ + CORE_ADDR (*find_global_pointer) (CORE_ADDR); +}; + +#define SIGCONTEXT_REGISTER_ADDRESS \ + (gdbarch_tdep (current_gdbarch)->sigcontext_register_address) +#define FIND_GLOBAL_POINTER \ + (gdbarch_tdep (current_gdbarch)->find_global_pointer) + +extern CORE_ADDR ia64_generic_find_global_pointer (CORE_ADDR); #endif /* IA64_TDEP_H */ ==== //depot/projects/gdb/contrib/gdb/gdb/inftarg.c#7 (text+ko) ==== @@ -592,6 +592,13 @@ return NATIVE_XFER_WCOOKIE (ops, object, annex, readbuf, writebuf, offset, len); + case TARGET_OBJECT_DIRTY: +#ifndef TARGET_XFER_DIRTY +#define TARGET_XFER_DIRTY(OPS,OBJECT,ANNEX,WRITEBUF,READBUF,OFFSET,LEN) (-1) +#endif + return TARGET_XFER_DIRTY (ops, object, annex, readbuf, writebuf, + offset, len); + default: return -1; } ==== //depot/projects/gdb/contrib/gdb/gdb/remote.c#7 (text+ko) ==== @@ -998,6 +998,23 @@ show_packet_config_cmd (&remote_protocol_qPart_auxv); } +/* Should we try the 'qPart:dirty' (target dirty register read) request? */ +static struct packet_config remote_protocol_qPart_dirty; + +static void +set_remote_protocol_qPart_dirty_packet_cmd (char *args, int from_tty, + struct cmd_list_element *c) +{ + update_packet_config (&remote_protocol_qPart_dirty); +} + +static void +show_remote_protocol_qPart_dirty_packet_cmd (char *args, int from_tty, + struct cmd_list_element *c) +{ + show_packet_config_cmd (&remote_protocol_qPart_dirty); +} + /* Tokens for use by the asynchronous signal handlers for SIGINT */ static void *sigint_remote_twice_token; @@ -2088,6 +2105,7 @@ downloading. */ update_packet_config (&remote_protocol_binary_download); update_packet_config (&remote_protocol_qPart_auxv); + update_packet_config (&remote_protocol_qPart_dirty); } /* Symbol look-up. */ @@ -4925,6 +4943,23 @@ } return -1; + case TARGET_OBJECT_DIRTY: + if (remote_protocol_qPart_dirty.support != PACKET_DISABLE) + { + snprintf (buf2, rs->remote_packet_size, "qPart:dirty:read::%lx", + (long)(offset >> 3)); + i = putpkt (buf2); + if (i < 0) + return i; + buf2[0] = '\0'; + getpkt (buf2, rs->remote_packet_size, 0); + if (packet_ok (buf2, &remote_protocol_qPart_dirty) != PACKET_OK) + return -1; + i = hex2bin (buf2, readbuf, len); + return i; + } + return -1; + default: return -1; } @@ -5423,6 +5458,7 @@ show_remote_protocol_vcont_packet_cmd (args, from_tty, NULL); show_remote_protocol_binary_download_cmd (args, from_tty, NULL); show_remote_protocol_qPart_auxv_packet_cmd (args, from_tty, NULL); + show_remote_protocol_qPart_dirty_packet_cmd (args, from_tty, NULL); } static void @@ -5673,6 +5709,13 @@ &remote_set_cmdlist, &remote_show_cmdlist, 0); + add_packet_config_cmd (&remote_protocol_qPart_dirty, + "qPart_dirty", "read-dirty-registers", + set_remote_protocol_qPart_dirty_packet_cmd, + show_remote_protocol_qPart_dirty_packet_cmd, + &remote_set_cmdlist, &remote_show_cmdlist, + 0); + /* Keep the old ``set remote Z-packet ...'' working. */ add_setshow_auto_boolean_cmd ("Z-packet", class_obscure, &remote_Z_packet_detect, "\ ==== //depot/projects/gdb/contrib/gdb/gdb/target.h#8 (text+ko) ==== @@ -229,7 +229,9 @@ /* Transfer auxilliary vector. */ TARGET_OBJECT_AUXV, /* StackGhost cookie. See "sparc-tdep.c". */ - TARGET_OBJECT_WCOOKIE + TARGET_OBJECT_WCOOKIE, + /* Dirty registers. See "ia64-tdep.c". */ + TARGET_OBJECT_DIRTY /* Possible future objects: TARGET_OBJECT_FILE, TARGET_OBJECT_PROC, ... */ }; From owner-p4-projects@FreeBSD.ORG Fri Jun 25 05:26:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6177816A4CE; Fri, 25 Jun 2004 05:26:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A4E843D6E; Fri, 25 Jun 2004 05:26:57 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5P5PJrC004106; Fri, 25 Jun 2004 05:25:19 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5P5PJFO004103; Fri, 25 Jun 2004 05:25:19 GMT (envelope-from julian@freebsd.org) Date: Fri, 25 Jun 2004 05:25:19 GMT Message-Id: <200406250525.i5P5PJFO004103@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: julian@FreeBSD.org (Julian Elischer) To: Perforce Change Reviews Subject: PERFORCE change 55766 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: julian@freebsd.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 05:26:57 -0000 Change 55766 by julian@julian_jules1 on 2004/06/25 05:24:55 take kern_switch out of ULE build too. Affected files ... .. //depot/projects/nsched/sys/conf/files#12 edit Differences ... ==== //depot/projects/nsched/sys/conf/files#12 (text+ko) ==== @@ -1107,7 +1107,6 @@ kern/md4c.c optional netsmb kern/md5c.c standard kern/sched_4bsd.c optional sched_4bsd -kern/kern_switch.c optional sched_ule kern/sched_ule.c optional sched_ule kern/subr_autoconf.c standard kern/subr_blist.c standard From owner-p4-projects@FreeBSD.ORG Fri Jun 25 05:47:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A53616A4CF; Fri, 25 Jun 2004 05:47:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AFBC43D3F; Fri, 25 Jun 2004 05:47:02 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5P5jjkw006694; Fri, 25 Jun 2004 05:45:45 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5P5ji4m006691; Fri, 25 Jun 2004 05:45:44 GMT (envelope-from julian@freebsd.org) Date: Fri, 25 Jun 2004 05:45:44 GMT Message-Id: <200406250545.i5P5ji4m006691@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: julian@FreeBSD.org (Julian Elischer) To: Perforce Change Reviews Subject: PERFORCE change 55767 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: julian@freebsd.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 05:47:03 -0000 Change 55767 by julian@julian_jules1 on 2004/06/25 05:45:28 fix typos Affected files ... .. //depot/projects/nsched/sys/kern/sched_4bsd.c#17 edit Differences ... ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#17 (text+ko) ==== @@ -939,7 +939,6 @@ * Called from: * sleepq_switch() */ - */ void sched_sleep(struct thread *td) { @@ -1557,6 +1556,7 @@ * sched_exit_ksegrp() (local) * kse_exit() (decreasing) * kse_create() (increasing) + */ void sched_set_concurrancy(struct ksegrp *kg, int concurrancy) { From owner-p4-projects@FreeBSD.ORG Fri Jun 25 06:32:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10D3E16A4D0; Fri, 25 Jun 2004 06:32:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A4CCB16A4CE for ; Fri, 25 Jun 2004 06:32:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 801AF43D60 for ; Fri, 25 Jun 2004 06:32:48 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5P6Vt83007236 for ; Fri, 25 Jun 2004 06:31:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5P6VtKW007233 for perforce@freebsd.org; Fri, 25 Jun 2004 06:31:55 GMT (envelope-from marcel@freebsd.org) Date: Fri, 25 Jun 2004 06:31:55 GMT Message-Id: <200406250631.i5P6VtKW007233@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 Subject: PERFORCE change 55768 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 06:32:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=55768 Change 55768 by marcel@marcel_nfs on 2004/06/25 06:31:32 Re-add the alpha bmake foo. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/Makefile#1 add .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/config.h#1 add .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/init.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jun 25 07:06:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8C1416A4D0; Fri, 25 Jun 2004 07:06:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F0C016A4CE for ; Fri, 25 Jun 2004 07:06:09 +0000 (GMT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4606643D45 for ; Fri, 25 Jun 2004 07:06:09 +0000 (GMT) (envelope-from peter@evilpete.dyndns.org) Received: from fw.wemm.org (canning.wemm.org [192.203.228.65]) by canning.wemm.org (Postfix) with ESMTP id 70A082A8D5 for ; Thu, 24 Jun 2004 23:35:21 -0700 (PDT) (envelope-from peter@overcee.wemm.org) Received: from overcee.wemm.org (overcee.wemm.org [10.0.0.3]) by fw.wemm.org (Postfix) with ESMTP id E4EF1E27E for ; Thu, 24 Jun 2004 23:35:20 -0700 (PDT) (envelope-from peter@overcee.wemm.org) Received: from overcee.wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (8.12.11/8.12.11) with ESMTP id i5P6ZKLs073153 for ; Thu, 24 Jun 2004 23:35:20 -0700 (PDT) (envelope-from peter@overcee.wemm.org) Received: from localhost (localhost [[UNIX: localhost]]) by overcee.wemm.org (8.12.11/8.12.11/Submit) id i5P6ZKJb073152 for perforce@freebsd.org; Thu, 24 Jun 2004 23:35:20 -0700 (PDT) (envelope-from peter) From: Peter Wemm To: Perforce Change Reviews Date: Thu, 24 Jun 2004 23:35:20 -0700 User-Agent: KMail/1.6.1 References: <200406250441.i5P4faWA003356@repoman.freebsd.org> In-Reply-To: <200406250441.i5P4faWA003356@repoman.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200406242335.20320.peter@wemm.org> Subject: Re: PERFORCE change 55764 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 07:06:10 -0000 On Thursday 24 June 2004 09:41 pm, Paul Saab wrote: > Change 55764 by ps@butter.corp on 2004/06/25 04:33:12 > > Integrace the sack branch for testing a perforce commit. In case anybody was wondering, the botched headers etc were my fault. I accidently ran the old review daemon instead of the one that was supposed to be used. Oops. :-) -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 From owner-p4-projects@FreeBSD.ORG Fri Jun 25 07:33:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FFA116A4D0; Fri, 25 Jun 2004 07:33:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 30F8F16A4CE for ; Fri, 25 Jun 2004 07:33:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21AA543D53 for ; Fri, 25 Jun 2004 07:33:08 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5P7WAZ5009030 for ; Fri, 25 Jun 2004 07:32:10 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5P7WAXp009027 for perforce@freebsd.org; Fri, 25 Jun 2004 07:32:10 GMT (envelope-from julian@freebsd.org) Date: Fri, 25 Jun 2004 07:32:10 GMT Message-Id: <200406250732.i5P7WAXp009027@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 55771 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 07:33:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=55771 Change 55771 by julian@julian_jules1 on 2004/06/25 07:32:03 safety safe for churn nowhere near finished (or even compiles) Affected files ... .. //depot/projects/nsched/sys/kern/sched_4bsd.c#18 edit .. //depot/projects/nsched/sys/kern/sched_ule.c#7 edit Differences ... ==== //depot/projects/nsched/sys/kern/sched_4bsd.c#18 (text+ko) ==== @@ -52,12 +52,6 @@ #include #include #include /* XXXKSE */ -#if 0 -#include -#include -#include -#include -#endif #include #include ==== //depot/projects/nsched/sys/kern/sched_ule.c#7 (text+ko) ==== @@ -1,3 +1,4 @@ + /*- * Copyright (c) 2002-2003, Jeffrey Roberson * All rights reserved. @@ -34,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -55,6 +57,10 @@ #define KTR_ULE KTR_NFS +#include +#include + + /* decay 95% of `p_pctcpu' in 60 seconds; see CCPU_SHIFT before changing */ /* XXX This is bogus compatability crap for ps */ static fixpt_t ccpu = 0.95122942450071400909 * FSCALE; /* exp(-1/20) */ @@ -78,45 +84,221 @@ * These datastructures are allocated within their parent datastructure but * are scheduler specific. */ +/*- + * Description of a process. + * + * Below is a key of locks used to protect each member of struct proc. The + * lock is indicated by a reference to a specific character in parens in the + * associated comment. + * * - not yet protected + * a - only touched by curproc or parent during fork/wait + * b - created at fork, never changes + * (exception aiods switch vmspaces, but they are also + * marked 'P_SYSTEM' so hopefully it will be left alone) + * c - locked by proc mtx + * d - locked by allproc_lock lock + * e - locked by proctree_lock lock + * f - session mtx + * g - process group mtx + * h - callout_lock mtx + * i - by curproc or the master session mtx + * j - locked by sched_lock mtx + * k - only accessed by curthread + * l - the attaching proc or attaching proc parent + * m - Giant + * n - not locked, lazy + * o - ktrace lock + * p - select lock (sellock) + * q - td_contested lock + * r - p_peers lock + * x - created at fork, only changes during single threading in exec + * z - zombie threads/kse/ksegroup lock + * + */ +/*************** + * In pictures: + With a single run queue used by all processors: + + RUNQ: --->KSE---KSE--... SLEEPQ:[]---THREAD---THREAD---THREAD + | / []---THREAD + KSEG---THREAD--THREAD--THREAD [] + []---THREAD---THREAD + + (processors run THREADs from the KSEG until they are exhausted or + the KSEG exhausts its quantum) + +With PER-CPU run queues: +KSEs on the separate run queues directly +They would be given priorities calculated from the KSEG. + + * + *****************/ +/************************************************************************ + * Definitions of the run queues we use here. + */ + +/* + * Copyright (c) 2001 Jake Burkholder + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: src/sys/sys/runq.h,v 1.4 2002/05/25 01:12:23 jake Exp $ + */ + +#ifndef _RUNQ_H_ +#define _RUNQ_H_ + +#include + +struct kse; + +/* + * Run queue parameters. + */ + +#define RQ_NQS (64) /* Number of run queues. */ +#define RQ_PPQ (4) /* Priorities per queue. */ -struct ke_sched { - int ske_slice; - struct runq *ske_runq; +/* + * Head of run queues. + */ +TAILQ_HEAD(rqhead, kse); + +/* + * Bit array which maintains the status of a run queue. When a queue is + * non-empty the bit corresponding to the queue number will be set. + */ +struct rqbits { + rqb_word_t rqb_bits[RQB_LEN]; +}; + +/* + * Run queue structure. Contains an array of run queues on which processes + * are placed, and a structure to maintain the status of each queue. + */ +struct runq { + struct rqbits rq_status; + struct rqhead rq_queues[RQ_NQS]; +}; + +#endif /* end of Jake copyright file */ + + +/* + * The schedulable entity that can be given a context to run. + * A process may have several of these. Probably one per processor + * but posibly a few more. In this universe they are grouped + * with a KSEG that contains the priority and niceness + * for the group. + */ +struct kse { + struct proc *ke_proc; /* (*) Associated process. */ + struct ksegrp *ke_ksegrp; /* (*) Associated KSEG. */ + TAILQ_ENTRY(kse) ke_kglist; /* (*) Queue of KSEs in ke_ksegrp. */ + TAILQ_ENTRY(kse) ke_kgrlist; /* (*) Queue of KSEs in this state. */ + TAILQ_ENTRY(kse) ke_procq; /* (j/z) Run queue. */ + +#define ke_startzero ke_flags + int ke_flags; /* (j) KEF_* flags. */ + struct thread *ke_thread; /* (*) Active associated thread. */ + fixpt_t ke_pctcpu; /* (j) %cpu during p_swtime. */ + u_char ke_oncpu; /* (j) Which cpu we are on. */ + char ke_rqindex; /* (j) Run queue index. */ + enum { + KES_UNUSED = 0x0, + KES_IDLE, + KES_ONRUNQ, + KES_UNQUEUED, /* in transit */ + KES_THREAD /* slaved to thread state */ + } ke_state; /* (j) KSE status. */ +#define ke_endzero ke_dummy + u_char ke_dummy; + int ke_slice; + struct runq *ke_runq; /* The following variables are only used for pctcpu calculation */ - int ske_ltick; /* Last tick that we were running on */ - int ske_ftick; /* First tick that we were running on */ - int ske_ticks; /* Tick count */ + int ke_ltick; /* Last tick that we were running on */ + int ke_ftick; /* First tick that we were running on */ + int ke_ticks; /* Tick count */ /* CPU that we have affinity for. */ - u_char ske_cpu; + u_char ke_cpu; }; -#define ke_slice ke_sched->ske_slice -#define ke_runq ke_sched->ske_runq -#define ke_ltick ke_sched->ske_ltick -#define ke_ftick ke_sched->ske_ftick -#define ke_ticks ke_sched->ske_ticks -#define ke_cpu ke_sched->ske_cpu -#define ke_assign ke_procq.tqe_next + +/* flags kept in ke_flags */ +#define KEF_ASSIGNED 0x00001 /* KSE is being migrated. */ +#define KEF_BOUND 0x00002 /* KSE can not migrate. */ +#define KEF_DIDRUN 0x02000 /* KSE actually ran. */ +#define KEF_EXIT 0x04000 /* KSE is being killed. */ + +#define FIRST_KSE_IN_KSEGRP(kg) TAILQ_FIRST(&(kg)->kg_kseq) +#define FIRST_KSE_IN_PROC(p) FIRST_KSE_IN_KSEGRP(FIRST_KSEGRP_IN_PROC(p)) + +static struct kse kse0; /* Primary kse in proc0. */ +static struct kse *kse_alloc(void); +static void kse_free(struct kse *ke); +static void kse_stash(struct kse *ke); +static void kse_unlink(struct kse *ke); +static void kse_reassign(struct kse *ke); +static void kse_link(struct kse *ke, struct ksegrp *kg); -#define KEF_ASSIGNED KEF_SCHED0 /* KSE is being migrated. */ -#define KEF_BOUND KEF_SCHED1 /* KSE can not migrate. */ +/* + * Scheduler specific extensions to various structures. + */ struct kg_sched { int skg_slptime; /* Number of ticks we vol. slept */ int skg_runtime; /* Number of ticks we were running */ + TAILQ_HEAD(, kse) skg_kseq; /* (ke_kglist) All KSEs. */ + TAILQ_HEAD(, kse) skg_iq; /* (ke_kgrlist) All idle KSEs. */ + struct thread *skg_last_assigned; /* (j) Last thread assigned */ + /* ( to a KSE). */ + int skg_runq_kses; /* (j) Num KSEs on runq. */ + int skg_idle_kses; /* (j) Num KSEs on iq. */ + int skg_kses; /* (j) Num KSEs in group. */ + int skg_concurrancy; /* (j) desired concurrancy */ + }; #define kg_slptime kg_sched->skg_slptime #define kg_runtime kg_sched->skg_runtime +#define kg_kseq kg_sched->skg_kseq +#define kg_iq kg_sched->skg_iq +#define kg_last_assigned kg_sched->skg_last_assigned +#define kg_runq_kses kg_sched->skg_runq_kses +#define kg_idle_kses kg_sched->skg_idle_kses +#define kg_kses kg_sched->skg_kses + struct td_sched { int std_slptime; + struct kse *std_last_kse; /* (j) Previous value of td_kse. */ + struct kse *std_kse; /* (j) Current KSE if running. */ }; #define td_slptime td_sched->std_slptime +#define td_last_kse td_sched->std_last_kse +#define td_kse td_sched->std_kse struct td_sched td_sched; -struct ke_sched ke_sched; struct kg_sched kg_sched; -struct ke_sched *kse0_sched = &ke_sched; struct kg_sched *ksegrp0_sched = &kg_sched; struct p_sched *proc0_sched = NULL; struct td_sched *thread0_sched = &td_sched; @@ -286,6 +468,31 @@ static void kseq_notify(struct kse *ke, int cpu); static void kseq_assign(struct kseq *); static struct kse *kseq_steal(struct kseq *kseq, int stealidle); +#endif + +static void runq_add(struct runq *, struct kse *); +static int runq_check(struct runq *); +static struct kse *runq_choose(struct runq *); +static void runq_init(struct runq *); +static void runq_remove(struct runq *, struct kse *); + + +static void setup_runqs(void); +static void roundrobin(void *arg); +static void schedcpu(void); +static void schedcpu_thread(void); +static void maybe_resched(struct thread *td); +static void updatepri(struct ksegrp *kg); +static void resetpriority(struct ksegrp *kg); +static void sched_add(struct thread *td); +static void sched_rem(struct thread *td); +static struct kse * sched_choose(void); +static void adjustrunqueue( struct thread *td, int newpri) ; + +static void sched_fork_kse(struct thread *td, struct kse *child); +static void sched_exit_kse(struct kse *ke, struct thread *td); + +#ifdef SMP /* * On P4 Xeons the round-robin interrupt delivery is broken. As a result of * this, we can't pin interrupts to the cpu that they were delivered to, @@ -301,6 +508,7 @@ #endif /* !__i386__ */ #endif +#define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start)) void kseq_print(int cpu) { @@ -1123,7 +1331,7 @@ } void -sched_switch(struct thread *td) +sched_switch(struct thread *td , int flags) { struct thread *newtd; struct kse *ke; @@ -1158,7 +1366,7 @@ kse_reassign(ke); } } - newtd = choosethread(); + newtd = choosethread(flags); if (td != newtd) cpu_switch(td, newtd); sched_lock.mtx_lock = (uintptr_t)td; @@ -1247,20 +1455,25 @@ * priority. */ void -sched_fork(struct proc *p, struct proc *p1) +sched_fork(struct thread *td, struct proc *p1) { + struct proc *p; + + p = td->td_proc; + mtx_assert(&sched_lock, MA_OWNED); p1->p_nice = p->p_nice; - sched_fork_ksegrp(FIRST_KSEGRP_IN_PROC(p), FIRST_KSEGRP_IN_PROC(p1)); - sched_fork_kse(FIRST_KSE_IN_PROC(p), FIRST_KSE_IN_PROC(p1)); - sched_fork_thread(FIRST_THREAD_IN_PROC(p), FIRST_THREAD_IN_PROC(p1)); + sched_fork_ksegrp(td, FIRST_KSEGRP_IN_PROC(p1)); + sched_fork_kse(td, FIRST_KSE_IN_PROC(p1)); + sched_fork_thread(td, FIRST_THREAD_IN_PROC(p1)); } -void -sched_fork_kse(struct kse *ke, struct kse *child) +static void +sched_fork_kse(struct thread *td, struct kse *child) { + struct kse *ke = td->td_kse; child->ke_slice = 1; /* Attempt to quickly learn interactivity. */ child->ke_cpu = ke->ke_cpu; @@ -1273,8 +1486,10 @@ } void -sched_fork_ksegrp(struct ksegrp *kg, struct ksegrp *child) +sched_fork_ksegrp(struct thread *td, struct ksegrp *child) { + struct ksegrp *kg = td->td_ksegrp; + PROC_LOCK_ASSERT(child->kg_proc, MA_OWNED); child->kg_slptime = kg->kg_slptime; @@ -1290,11 +1505,6 @@ } void -sched_fork_thread(struct thread *td, struct thread *child) -{ -} - -void sched_class(struct ksegrp *kg, int class) { struct kseq *kseq; @@ -1348,29 +1558,31 @@ * Return some of the child's priority and interactivity to the parent. */ void -sched_exit(struct proc *p, struct proc *child) +sched_exit(struct proc *p, struct thread *td ) { mtx_assert(&sched_lock, MA_OWNED); - sched_exit_kse(FIRST_KSE_IN_PROC(p), FIRST_KSE_IN_PROC(child)); - sched_exit_ksegrp(FIRST_KSEGRP_IN_PROC(p), FIRST_KSEGRP_IN_PROC(child)); + sched_exit_kse(FIRST_KSE_IN_PROC(p), td); + sched_exit_ksegrp(p, td); } void -sched_exit_kse(struct kse *ke, struct kse *child) +sched_exit_kse(struct kse *ke, struct thread *td) { - kseq_load_rem(KSEQ_CPU(child->ke_cpu), child); + kseq_load_rem(KSEQ_CPU(child->ke_cpu), td->td_kse); } void -sched_exit_ksegrp(struct ksegrp *kg, struct ksegrp *child) +sched_exit_ksegrp(struct proc *p, struct thread *td) { - /* kg->kg_slptime += child->kg_slptime; */ - kg->kg_runtime += child->kg_runtime; + struct ksegrp *kg = FIRST_KSEGRP_IN_PROC(p); + + /* kg->kg_slptime += td->td_ksegrp->kg_slptime; */ + kg->kg_runtime += td->td_ksegrp->kg_runtime; sched_interact_update(kg); } void -sched_exit_thread(struct thread *td, struct thread *child) +sched_exit_thread(struct proc *p, struct thread *child) { } @@ -1726,12 +1938,6 @@ } int -sched_sizeof_kse(void) -{ - return (sizeof(struct kse) + sizeof(struct ke_sched)); -} - -int sched_sizeof_ksegrp(void) { return (sizeof(struct ksegrp) + sizeof(struct kg_sched)); @@ -1748,3 +1954,1062 @@ { return (sizeof(struct thread) + sizeof(struct td_sched)); } + +/* + * Copyright (c) 2001 Jake Burkholder + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/*** +Here is the logic.. + +If there are N processors, then there are at most N KSEs (kernel +schedulable entities) working to process threads that belong to a +KSEGROUP (kg). If there are X of these KSEs actually running at the +moment in question, then there are at most M (N-X) of these KSEs on +the run queue, as running KSEs are not on the queue. + +Runnable threads are queued off the KSEGROUP in priority order. +If there are M or more threads runnable, the top M threads +(by priority) are 'preassigned' to the M KSEs not running. The KSEs take +their priority from those threads and are put on the run queue. + +The last thread that had a priority high enough to have a KSE associated +with it, AND IS ON THE RUN QUEUE is pointed to by +kg->kg_last_assigned. If no threads queued off the KSEGROUP have KSEs +assigned as all the available KSEs are activly running, or because there +are no threads queued, that pointer is NULL. + +When a KSE is removed from the run queue to become runnable, we know +it was associated with the highest priority thread in the queue (at the head +of the queue). If it is also the last assigned we know M was 1 and must +now be 0. Since the thread is no longer queued that pointer must be +removed from it. Since we know there were no more KSEs available, +(M was 1 and is now 0) and since we are not FREEING our KSE +but using it, we know there are STILL no more KSEs available, we can prove +that the next thread in the ksegrp list will not have a KSE to assign to +it, so we can show that the pointer must be made 'invalid' (NULL). + +The pointer exists so that when a new thread is made runnable, it can +have its priority compared with the last assigned thread to see if +it should 'steal' its KSE or not.. i.e. is it 'earlier' +on the list than that thread or later.. If it's earlier, then the KSE is +removed from the last assigned (which is now not assigned a KSE) +and reassigned to the new thread, which is placed earlier in the list. +The pointer is then backed up to the previous thread (which may or may not +be the new thread). + +When a thread sleeps or is removed, the KSE becomes available and if there +are queued threads that are not assigned KSEs, the highest priority one of +them is assigned the KSE, which is then placed back on the run queue at +the approipriate place, and the kg->kg_last_assigned pointer is adjusted down +to point to it. + +The following diagram shows 2 KSEs and 3 threads from a single process. + + RUNQ: --->KSE---KSE--... (KSEs queued at priorities from threads) + \ \____ + \ \ + KSEGROUP---thread--thread--thread (queued in priority order) + \ / + \_______________/ + (last_assigned) + +The result of this scheme is that the M available KSEs are always +queued at the priorities they have inherrited from the M highest priority +threads for that KSEGROUP. If this situation changes, the KSEs are +reassigned to keep this true. +***/ + + +CTASSERT((RQB_BPW * RQB_LEN) == RQ_NQS); + + +/* END */ + +void +sched_thread_exit(struct thread *td) +{ + struct kse *ke; + + ke = td->td_kse; + + if ((td->td_proc->p_flag & P_SA) && ke != NULL) { + ke->ke_thread = NULL; + td->td_kse = NULL; + kse_reassign(ke); + } + if ((td->td_proc->p_flag & P_NOLOAD) == 0) + sched_tdcnt--; + +} + +/* + * special version of the above for thr.. + * work towards merging them. + * Special code for thr library thread + * Called from: + * thr_exit1() + */ +void +sched_thr_exit(struct thread *td) +{ + struct kse *ke; + + ke = td->td_kse; + + if ((td->td_proc->p_flag & P_NOLOAD) == 0) + sched_tdcnt--; + + /* td is about to be freed, but keep it clean */ + td->td_kse = NULL; + td->td_last_kse = NULL; + kse_unlink(ke); /* also frees it */ +} + + +/* + * Allocate any resources the scheduler needs to allocate or set up + * on a new process at fork() time. + * Called from: + * fork1() + */ +void +sched_fork(struct thread *td, struct proc *child) +{ + struct thread *newtd; + struct kse *newke; + + newtd = FIRST_THREAD_IN_PROC(child); + newke = FIRST_KSE_IN_PROC(child); + bzero(&newke->ke_startzero, + (unsigned) RANGEOF(struct kse, ke_startzero, ke_endzero)); + newke->ke_state = KES_THREAD; + newke->ke_cpticks = 0; + sched_fork_ksegrp(td, FIRST_KSEGRP_IN_PROC(child)); + newke->ke_thread = newtd; + newtd->td_kse = newke; +} + +static uma_zone_t kse_zone; + +struct kse kse0; +static struct kg_sched kg_sched0; +static struct td_sched td_sched0; + + +extern struct mtx kse_zombie_lock; +TAILQ_HEAD(, kse) zombie_kses = TAILQ_HEAD_INITIALIZER(zombie_kses); + +/* + * Occasionally the scheduler may need to do some GC.. + * Called from: + * thread_reap() + */ +void +sched_GC(void) +{ + struct kse *ke_first, *ke_next; + + if (!TAILQ_EMPTY(&zombie_kses)) { + mtx_lock_spin(&kse_zombie_lock); + ke_first = TAILQ_FIRST(&zombie_kses); + if (ke_first) + TAILQ_INIT(&zombie_kses); + mtx_unlock_spin(&kse_zombie_lock); + while (ke_first) { + ke_next = TAILQ_NEXT(ke_first, ke_procq); + kse_free(ke_first); + ke_first = ke_next; + } + } +} + +/* + * Very early in the boot some setup of scheduler-specific + * parts of proc0 and of soem scheduler resources needs to be done. + * Called from: + * proc0_init() + */ +void +schedinit(void) +{ + /* + * Set up the scheduler specific parts of proc0. + */ + ksegrp0.kg_sched = &kg_sched0; + proc0.p_sched = NULL; /* XXX */ + thread0.td_sched = &td_sched0; + + /* + * and link in our own per scheduler struct + */ + kse_link(&kse0, &ksegrp0); + /* + * and set it up as if BOUND and running + */ + kse0.ke_thread = &thread0; + thread0.td_kse = &kse0; /* we are running */ + kse0.ke_state = KES_THREAD; + + kse_zone = uma_zcreate("KSE", sizeof (struct kse), + NULL, NULL, NULL, NULL, UMA_ALIGN_CACHE, 0); +} + +/* + * for now have special thr code + * later on, clean these up into common code. + * Called from: + * thr_create() + */ +int +sched_thr_newthread(struct thread *td, struct thread *newtd, int flags) +{ + struct kse *newke; + /* Initialize our kse structure. */ + newke = kse_alloc(); + bzero(&newke->ke_startzero, + RANGEOF(struct kse, ke_startzero, ke_endzero)); + + /* Link the thread and kse into the ksegrp and make it runnable. */ + mtx_lock_spin(&sched_lock); + + thread_link(newtd, td->td_ksegrp); + kse_link(newke, td->td_ksegrp); + + /* Bind this thread and kse together. */ + newtd->td_kse = newke; + newke->ke_thread = newtd; + bzero(&newke->ke_startzero, + (unsigned) RANGEOF(struct kse, ke_startzero, ke_endzero)); + newke->ke_state = KES_THREAD; + newke->ke_cpticks = 0; + sched_fork_kse(td->td_kse, newke); + + TD_SET_CAN_RUN(newtd); + if ((flags & THR_SUSPENDED) == 0) + setrunqueue(newtd); + + mtx_unlock_spin(&sched_lock); + return (0); /* the API could fail but not in this case */ +} + +/***************************** + * KSE zone/allocation methods. + */ +/* + * Allocate a kse. + */ +static struct kse * +kse_alloc(void) +{ + return (uma_zalloc(kse_zone, M_WAITOK)); +} + +/* + * Deallocate a kse. + */ +static void +kse_free(struct kse *td) +{ + uma_zfree(kse_zone, td); +} + +/* + * Stash an embarasingly extra kse into the zombie kse queue. + * Called from: + * kse_unlink() (local) + */ +static void +kse_stash(struct kse *ke) +{ + mtx_lock_spin(&kse_zombie_lock); + TAILQ_INSERT_HEAD(&zombie_kses, ke, ke_procq); + mtx_unlock_spin(&kse_zombie_lock); +} + +/* + * KSE is linked into kse group. + * Called from: + * sched_newproc() (local) + * sched_thr_newthread() (local) + * schedinit() (local) + * sched_set_concurrancy() (local) + * + */ +static void +kse_link( struct kse *ke, struct ksegrp *kg) +{ + TAILQ_INSERT_HEAD(&kg->kg_kseq, ke, ke_kglist); + kg->kg_kses++; + ke->ke_state = KES_UNQUEUED; + ke->ke_proc = kg->kg_proc; /* really just a shortcut */ + ke->ke_ksegrp = kg; + ke->ke_thread = NULL; + ke->ke_oncpu = NOCPU; + ke->ke_flags = 0; +} + +/* + * Allocate scheduler specific per-process resources. + * The thread and ksegrp have already been linked in. + * Called from: + * proc_init() (UMA init method) + */ +int +sched_newproc(struct proc *p, struct ksegrp *kg, struct thread *td) +{ + struct kse *ke; + + /* + * For a new process, allocate a single KSE to the ksegrp. + */ + ke = kse_alloc(); + if (ke) { + kse_link(ke, kg); + td->td_kse = ke; + ke->ke_thread = td; + return (0); + } + return (ENOMEM ); +} + +/* + * Ksegrp is being either created or recycled. + * Fix up the per-scheduler resources associated with it. + * Called from: + * ksegrp_dtor() + * ksegrp_initi() + */ +void +sched_init_ksegrp(struct ksegrp *kg) +{ + + TAILQ_INIT(&kg->kg_kseq); /* all kses in ksegrp */ + TAILQ_INIT(&kg->kg_iq); /* all idle kses in ksegrp */ + kg->kg_kses = 0; + kg->kg_runq_kses = 0; /* XXXKSE change name */ + kg->kg_idle_kses = 0; +} + +/* + * thread is being either created or recycled. + * Fix up the per-scheduler resources associated with it. + * Called from: + * thread_dtor() + * thread_initi() + */ +/* Assumes td->td_sched is already set up */ +void +sched_init_thread(struct thread *td) +{ + td->td_last_kse = NULL; + td->td_kse = NULL; +} + + +/* + * code to take the per-scheduler KSE structure + * off the ksegrp it is hanging off and free it + * Called from: + * sched_destroyproc() + * sched_thr_exit() + * sched_set_concurrancy() via REDUCE_KSES() + * kse_reassign() via REDUCE_KSES() + */ +static void +kse_unlink(struct kse *ke) +{ + struct ksegrp *kg; + + mtx_assert(&sched_lock, MA_OWNED); + kg = ke->ke_ksegrp; + TAILQ_REMOVE(&kg->kg_kseq, ke, ke_kglist); + if (ke->ke_state == KES_IDLE) { + TAILQ_REMOVE(&kg->kg_iq, ke, ke_kgrlist); + kg->kg_idle_kses--; + } + /* + * Aggregate stats from the KSE + * ## none yet ## + */ + + kse_stash(ke); +} + +/* + * Whenever we have idle KSEs and there are too many for the concurrancy, + * then free as many as we can. Don't free too many if we have threads + * to run/kill. + */ +#define REDUCE_KSES(kg, skg) \ +do { \ + while ((skg->skg_concurrancy < skg->skg_kses) && \ + (skg->skg_idle_kses > 0) && \ + (skg->skg_kses > kg->kg_numthreads)) { \ + kse_unlink(TAILQ_FIRST(&skg->skg_iq)); \ + } \ +} while (0) + +/* + * Called by the uma process fini routine.. + * undo anything we may have done in the uma_init method. + * Panic if it's not all 1:1:1:1 + * Called from: + * proc_fini() (UMA method) + */ +void +sched_destroyproc(struct proc *p) +{ + struct ksegrp *kg; + struct kg_sched *skg; + + KASSERT((p->p_numthreads == 1), ("Cached proc with > 1 thread ")); + KASSERT((p->p_numksegrps == 1), ("Cached proc with > 1 ksegrp ")); + + kg = FIRST_KSEGRP_IN_PROC(p); + + KASSERT((kg->kg_kses == 1), ("Cached proc with > 1 kse ")); + + skg = kg->kg_sched; + kse_unlink(TAILQ_FIRST(&skg->skg_iq)); \ +} + +/* + * (Re) assign resources to allow the ksegrp to implement + * teh requested concurrancy. At this time it means allocating + * or freeing KSE structures. + * Called from: + * kern_execve() (reverting to non threaded) + * kern_exit() (reverting to non threaded) + * thread_exit() (during removal of ksegrp) + * sched_exit_ksegrp() (local) + * kse_exit() (decreasing) + * kse_create() (increasing) + */ +void +sched_set_concurrancy(struct ksegrp *kg, int concurrancy) +{ + struct kse *newke; + struct kg_sched *skg; + + skg = kg->kg_sched; + skg->skg_concurrancy = concurrancy; + REDUCE_KSES(kg, skg); + while (skg->skg_kses < skg->skg_concurrancy) { + newke = kse_alloc(); + bzero(&newke->ke_startzero, RANGEOF(struct kse, + ke_startzero, ke_endzero)); +#if 0 + mtx_lock_spin(&sched_lock); + bcopy(&ke->ke_startcopy, &newke->ke_startcopy, + RANGEOF(struct kse, ke_startcopy, ke_endcopy)); + mtx_unlock_spin(&sched_lock); +#endif + mtx_lock_spin(&sched_lock); + kse_link(newke, kg); + bzero(&newke->ke_startzero, + (unsigned) RANGEOF(struct kse, ke_startzero, ke_endzero)); + newke->ke_state = KES_THREAD; + newke->ke_cpticks = 0; + /* Add engine */ + kse_reassign(newke); + mtx_unlock_spin(&sched_lock); + } +} + + +CTASSERT((RQB_BPW * RQB_LEN) == RQ_NQS); + +#if 0 +static void runq_readjust(struct runq *rq, struct kse *ke); +#endif +/* + * Select the KSE that will be run next. From that find the thread, and + * remove it from the KSEGRP's run queue. If there is thread clustering, + * this will be what does it. + * XXX Change to take an argument indicating + * if the switch is voluntary or involuntary. + * Called from: + * thr_exit1() + * thread_exit() + * sched_switch() (local) + * init_secondary() (start up 2ndary processors) + */ +struct thread * +choosethread(int flags) +{ + struct kse *ke; + struct thread *td; + struct ksegrp *kg; + +#if defined(SMP) && (defined(__i386__) || defined(__amd64__)) + if (smp_active == 0 && PCPU_GET(cpuid) != 0) { + /* Shutting down, run idlethread on AP's */ + td = PCPU_GET(idlethread); + ke = td->td_kse; + CTR1(KTR_RUNQ, "choosethread: td=%p (idle)", td); + ke->ke_flags |= KEF_DIDRUN; + TD_SET_RUNNING(td); + return (td); + } +#endif + +retry: + kg = curthread->td_ksegrp; +#if 0 + if (flags & SW_VOL) { + if (kg->kg_runnable) { + td = TAILQ_FIRST(&kg->kg_runq); + } + } + if (ke == NULL) +#endif + ke = sched_choose(); + if (ke) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 25 07:44:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8181416A4CE; Fri, 25 Jun 2004 07:44:13 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4540216A4CE for ; Fri, 25 Jun 2004 07:44:13 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3695143D1D for ; Fri, 25 Jun 2004 07:44:13 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5P7hPR0009855 for ; Fri, 25 Jun 2004 07:43:25 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5P7hPUC009852 for perforce@freebsd.org; Fri, 25 Jun 2004 07:43:25 GMT (envelope-from peter@freebsd.org) Date: Fri, 25 Jun 2004 07:43:25 GMT Message-Id: <200406250743.i5P7hPUC009852@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 55775 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 07:44:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=55775 Change 55775 by peter@peter_overcee on 2004/06/25 07:42:36 IFC @55774 Affected files ... .. //depot/projects/hammer/bin/pax/ar_io.c#6 integrate .. //depot/projects/hammer/contrib/gdb/FREEBSD-upgrade#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/fbsd.mh#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/fbsd.mt#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/nm-fbsd.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/config/ia64/tm-fbsd.h#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ia64-fbsd-nat.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ia64-fbsd-tdep.c#1 branch .. //depot/projects/hammer/contrib/gdb/gdb/ia64-tdep.c#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/ia64-tdep.h#2 integrate .. //depot/projects/hammer/contrib/gdb/gdb/inftarg.c#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/remote.c#3 integrate .. //depot/projects/hammer/contrib/gdb/gdb/target.h#4 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#8 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/Makefile#8 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/doc/Makefile#6 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/Makefile#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/Makefile.inc#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/Makefile#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/config.h#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/alpha/init.c#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/Makefile#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/config.h#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/amd64/init.c#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/Makefile#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/config.h#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/i386/init.c#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/ia64/Makefile#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/ia64/config.h#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/ia64/init.c#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/sparc64/Makefile#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/sparc64/config.h#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/arch/sparc64/init.c#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/doc/Makefile#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/gdb/Makefile#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/gdb/gdb.1#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/gdbtui/Makefile#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/Makefile#1 branch .. //depot/projects/hammer/lib/libdevstat/devstat.c#7 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_radius/pam_radius.c#8 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/Makefile#2 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#31 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#14 integrate .. //depot/projects/hammer/usr.bin/paste/paste.1#4 integrate .. //depot/projects/hammer/usr.bin/paste/paste.c#2 integrate Differences ... ==== //depot/projects/hammer/bin/pax/ar_io.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.24 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.25 2004/06/25 05:27:59 obrien Exp $"); #include #include @@ -154,8 +154,10 @@ return(-1); if (chdname != NULL) - if (chdir(chdname) != 0) + if (chdir(chdname) != 0) { syswarn(1, errno, "Failed chdir to %s", chdname); + return(-1); + } /* * set up is based on device type */ ==== //depot/projects/hammer/contrib/gdb/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,18 +1,9 @@ -$FreeBSD: src/contrib/gdb/FREEBSD-upgrade,v 1.2 2002/10/12 21:33:49 mp Exp $ +$FreeBSD: src/contrib/gdb/FREEBSD-upgrade,v 1.3 2004/06/25 05:04:09 marcel Exp $ + +To strip down a new version of gdb for import, extract the files like this: -To strip down a new version of gdb for import, extract -the files like this: + tar xzf gdb-6.1.1.tar.gz -X FREEBSD-Xlist - tar xzf gdb-5.2.1.tar.gz -X FREEBSD-Xlist - tar xzf gdb-5.2.1.tar.gz gdb-5.2.1/gdb/config/i386 - tar xzf gdb-5.2.1.tar.gz gdb-5.2.1/gdb/config/alpha - tar xzf gdb-5.2.1.tar.gz gdb-5.2.1/gdb/config/powerpc - tar xzf gdb-5.2.1.tar.gz gdb-5.2.1/gdb/config/ia64 - tar xzf gdb-5.2.1.tar.gz gdb-5.2.1/gdb/config/none - tar xzf gdb-5.2.1.tar.gz gdb-5.2.1/gdb/config/sparc - tar xzf gdb-5.2.1.tar.gz gdb-5.2.1/gdb/config/arm - tar xzf gdb-5.2.1.tar.gz gdb-5.2.1/gdb/config/nm-linux.h - tar xzf gdb-5.2.1.tar.gz gdb-5.2.1/gdb/config/tm-linux.h - tar xzf gdb-5.2.1.tar.gz gdb-5.2.1/gdb/config/tm-vxworks.h - tar xzf gdb-5.2.1.tar.gz gdb-5.2.1/include/gdb/ChangeLog - tar xzf gdb-5.2.1.tar.gz gdb-5.2.1/include/gdb/signals.h +After importing, remove files on the vendor branch that are not part of the +new gdb version (if any). Then remove files from HEAD that are not part of +the new version (if applicable). ==== //depot/projects/hammer/contrib/gdb/gdb/ia64-tdep.c#3 (text+ko) ==== @@ -45,17 +45,6 @@ #include "libunwind-ia64.h" #endif -/* Hook for determining the global pointer when calling functions in - the inferior under AIX. The initialization code in ia64-aix-nat.c - sets this hook to the address of a function which will find the - global pointer for a given address. - - The generic code which uses the dynamic section in the inferior for - finding the global pointer is not of much use on AIX since the - values obtained from the inferior have not been relocated. */ - -CORE_ADDR (*native_find_global_pointer) (CORE_ADDR) = 0; - /* An enumeration of the different IA-64 instruction types. */ typedef enum instruction_type @@ -256,20 +245,6 @@ }; -struct gdbarch_tdep - { - CORE_ADDR (*sigcontext_register_address) (CORE_ADDR, int); - /* OS specific function which, given a frame address - and register number, returns the offset to the - given register from the start of the frame. */ - CORE_ADDR (*find_global_pointer) (CORE_ADDR); - }; - -#define SIGCONTEXT_REGISTER_ADDRESS \ - (gdbarch_tdep (current_gdbarch)->sigcontext_register_address) -#define FIND_GLOBAL_POINTER \ - (gdbarch_tdep (current_gdbarch)->find_global_pointer) - int ia64_register_reggroup_p (struct gdbarch *gdbarch, int regnum, struct reggroup *group) @@ -682,9 +657,18 @@ if ((cfm & 0x7f) > regnum - V32_REGNUM) { + ULONGEST bspstore; ULONGEST reg_addr = rse_address_add (bsp, (regnum - V32_REGNUM)); - reg = read_memory_integer ((CORE_ADDR)reg_addr, 8); - store_unsigned_integer (buf, register_size (current_gdbarch, regnum), reg); + regcache_cooked_read_unsigned (regcache, IA64_BSPSTORE_REGNUM, + &bspstore); + if (reg_addr < bspstore) { + reg = read_memory_integer ((CORE_ADDR)reg_addr, 8); + store_unsigned_integer (buf, register_size (current_gdbarch, + regnum), reg); + } else + target_read_partial (¤t_target, TARGET_OBJECT_DIRTY, + (void*)bspstore, buf, reg_addr - bspstore, + register_size (current_gdbarch, regnum)); } else store_unsigned_integer (buf, register_size (current_gdbarch, regnum), 0); @@ -725,7 +709,21 @@ if (nat_addr >= bsp) regcache_cooked_read_unsigned (regcache, IA64_RNAT_REGNUM, &nat_collection); else - nat_collection = read_memory_integer (nat_addr, 8); + { + ULONGEST bspstore; + regcache_cooked_read_unsigned (regcache, IA64_BSPSTORE_REGNUM, + &bspstore); + if (nat_addr < bspstore) + nat_collection = read_memory_integer (nat_addr, 8); + else { + char natbuf[8]; + target_read_partial (¤t_target, TARGET_OBJECT_DIRTY, + (void*)bspstore, natbuf, + nat_addr - bspstore, + register_size (current_gdbarch, regnum)); + nat_collection = *((uint64_t*)natbuf); + } + } nat_bit = (gr_addr >> 3) & 0x3f; natN_val = (nat_collection >> nat_bit) & 1; } @@ -789,8 +787,16 @@ if ((cfm & 0x7f) > regnum - V32_REGNUM) { + ULONGEST bspstore; ULONGEST reg_addr = rse_address_add (bsp, (regnum - V32_REGNUM)); - write_memory (reg_addr, (void *)buf, 8); + regcache_cooked_read_unsigned (regcache, IA64_BSPSTORE_REGNUM, + &bspstore); + if (reg_addr < bspstore) + write_memory (reg_addr, (void *)buf, 8); + else + target_write_partial (¤t_target, TARGET_OBJECT_DIRTY, + (void*)bspstore, buf, reg_addr - bspstore, + register_size (current_gdbarch, regnum)); } } else if (IA64_NAT0_REGNUM <= regnum && regnum <= IA64_NAT31_REGNUM) @@ -845,13 +851,33 @@ else { char nat_buf[8]; - nat_collection = read_memory_integer (nat_addr, 8); + ULONGEST bspstore; + regcache_cooked_read_unsigned (regcache, IA64_BSPSTORE_REGNUM, + &bspstore); + if (nat_addr < bspstore) + nat_collection = read_memory_integer (nat_addr, 8); + else { + char natbuf[8]; + target_read_partial (¤t_target, TARGET_OBJECT_DIRTY, + (void*)bspstore, natbuf, + nat_addr - bspstore, + register_size (current_gdbarch, regnum)); + nat_collection = *((uint64_t*)natbuf); + } if (natN_val) nat_collection |= natN_mask; else nat_collection &= ~natN_mask; - store_unsigned_integer (nat_buf, register_size (current_gdbarch, regnum), nat_collection); - write_memory (nat_addr, nat_buf, 8); + store_unsigned_integer (nat_buf, register_size (current_gdbarch, + regnum), + nat_collection); + if (nat_addr < bspstore) + write_memory (nat_addr, nat_buf, 8); + else + target_write_partial (¤t_target, TARGET_OBJECT_DIRTY, + (void*)bspstore, nat_buf, + nat_addr - bspstore, + register_size (current_gdbarch, regnum)); } } } @@ -1813,6 +1839,7 @@ prev_bof = rse_address_add (prev_bsp, -(prev_cfm & 0x7f)); addr = rse_address_add (prev_bof, (regnum - IA64_GR32_REGNUM)); + /* XXX marcel */ *lvalp = lval_memory; *addrp = addr; read_memory (addr, valuep, register_size (current_gdbarch, regnum)); @@ -2858,8 +2885,8 @@ DT_PLTGOT tag. If it finds one of these, the corresponding d_un.d_ptr value is the global pointer. */ -static CORE_ADDR -generic_elf_find_global_pointer (CORE_ADDR faddr) +CORE_ADDR +ia64_generic_find_global_pointer (CORE_ADDR faddr) { struct obj_section *faddr_sect; @@ -3255,33 +3282,10 @@ tdep = xmalloc (sizeof (struct gdbarch_tdep)); gdbarch = gdbarch_alloc (&info, tdep); + tdep->osabi = info.osabi; + tdep->sigcontext_register_address = NULL; + tdep->find_global_pointer = ia64_generic_find_global_pointer; - /* Set the method of obtaining the sigcontext addresses at which - registers are saved. The method of checking to see if - native_find_global_pointer is nonzero to indicate that we're - on AIX is kind of hokey, but I can't think of a better way - to do it. */ - if (info.osabi == GDB_OSABI_LINUX) - tdep->sigcontext_register_address = ia64_linux_sigcontext_register_address; - else if (native_find_global_pointer != 0) - tdep->sigcontext_register_address = ia64_aix_sigcontext_register_address; - else - tdep->sigcontext_register_address = 0; - - /* We know that GNU/Linux won't have to resort to the - native_find_global_pointer hackery. But that's the only one we - know about so far, so if native_find_global_pointer is set to - something non-zero, then use it. Otherwise fall back to using - generic_elf_find_global_pointer. This arrangement should (in - theory) allow us to cross debug GNU/Linux binaries from an AIX - machine. */ - if (info.osabi == GDB_OSABI_LINUX) - tdep->find_global_pointer = generic_elf_find_global_pointer; - else if (native_find_global_pointer != 0) - tdep->find_global_pointer = native_find_global_pointer; - else - tdep->find_global_pointer = generic_elf_find_global_pointer; - /* Define the ia64 floating-point format to gdb. */ builtin_type_ia64_ext = init_type (TYPE_CODE_FLT, 128 / 8, @@ -3338,10 +3342,7 @@ set_gdbarch_memory_remove_breakpoint (gdbarch, ia64_memory_remove_breakpoint); set_gdbarch_breakpoint_from_pc (gdbarch, ia64_breakpoint_from_pc); set_gdbarch_read_pc (gdbarch, ia64_read_pc); - if (info.osabi == GDB_OSABI_LINUX) - set_gdbarch_write_pc (gdbarch, ia64_linux_write_pc); - else - set_gdbarch_write_pc (gdbarch, ia64_write_pc); + set_gdbarch_write_pc (gdbarch, ia64_write_pc); /* Settings for calling functions in the inferior. */ set_gdbarch_push_dummy_call (gdbarch, ia64_push_dummy_call); @@ -3366,6 +3367,8 @@ set_gdbarch_print_insn (gdbarch, ia64_print_insn); set_gdbarch_convert_from_func_ptr_addr (gdbarch, ia64_convert_from_func_ptr_addr); + gdbarch_init_osabi (info, gdbarch); + return gdbarch; } ==== //depot/projects/hammer/contrib/gdb/gdb/ia64-tdep.h#2 (text+ko) ==== @@ -22,10 +22,25 @@ #ifndef IA64_TDEP_H #define IA64_TDEP_H -extern CORE_ADDR ia64_linux_sigcontext_register_address (CORE_ADDR, int); -extern CORE_ADDR ia64_aix_sigcontext_register_address (CORE_ADDR, int); -extern unsigned long ia64_linux_getunwind_table (void *, size_t); -extern void ia64_write_pc (CORE_ADDR, ptid_t); -extern void ia64_linux_write_pc (CORE_ADDR, ptid_t); +#include "osabi.h" + +/* Target-dependent structure in gdbarch. */ +struct gdbarch_tdep +{ + enum gdb_osabi osabi; /* OS/ABI of inferior. */ + + CORE_ADDR (*sigcontext_register_address) (CORE_ADDR, int); + /* OS specific function which, given a frame address + and register number, returns the offset to the + given register from the start of the frame. */ + CORE_ADDR (*find_global_pointer) (CORE_ADDR); +}; + +#define SIGCONTEXT_REGISTER_ADDRESS \ + (gdbarch_tdep (current_gdbarch)->sigcontext_register_address) +#define FIND_GLOBAL_POINTER \ + (gdbarch_tdep (current_gdbarch)->find_global_pointer) + +extern CORE_ADDR ia64_generic_find_global_pointer (CORE_ADDR); #endif /* IA64_TDEP_H */ ==== //depot/projects/hammer/contrib/gdb/gdb/inftarg.c#3 (text+ko) ==== @@ -592,6 +592,13 @@ return NATIVE_XFER_WCOOKIE (ops, object, annex, readbuf, writebuf, offset, len); + case TARGET_OBJECT_DIRTY: +#ifndef TARGET_XFER_DIRTY +#define TARGET_XFER_DIRTY(OPS,OBJECT,ANNEX,WRITEBUF,READBUF,OFFSET,LEN) (-1) +#endif + return TARGET_XFER_DIRTY (ops, object, annex, readbuf, writebuf, + offset, len); + default: return -1; } ==== //depot/projects/hammer/contrib/gdb/gdb/remote.c#3 (text+ko) ==== @@ -998,6 +998,23 @@ show_packet_config_cmd (&remote_protocol_qPart_auxv); } +/* Should we try the 'qPart:dirty' (target dirty register read) request? */ +static struct packet_config remote_protocol_qPart_dirty; + +static void +set_remote_protocol_qPart_dirty_packet_cmd (char *args, int from_tty, + struct cmd_list_element *c) +{ + update_packet_config (&remote_protocol_qPart_dirty); +} + +static void +show_remote_protocol_qPart_dirty_packet_cmd (char *args, int from_tty, + struct cmd_list_element *c) +{ + show_packet_config_cmd (&remote_protocol_qPart_dirty); +} + /* Tokens for use by the asynchronous signal handlers for SIGINT */ static void *sigint_remote_twice_token; @@ -2088,6 +2105,7 @@ downloading. */ update_packet_config (&remote_protocol_binary_download); update_packet_config (&remote_protocol_qPart_auxv); + update_packet_config (&remote_protocol_qPart_dirty); } /* Symbol look-up. */ @@ -4925,6 +4943,23 @@ } return -1; + case TARGET_OBJECT_DIRTY: + if (remote_protocol_qPart_dirty.support != PACKET_DISABLE) + { + snprintf (buf2, rs->remote_packet_size, "qPart:dirty:read::%lx", + (long)(offset >> 3)); + i = putpkt (buf2); + if (i < 0) + return i; + buf2[0] = '\0'; + getpkt (buf2, rs->remote_packet_size, 0); + if (packet_ok (buf2, &remote_protocol_qPart_dirty) != PACKET_OK) + return -1; + i = hex2bin (buf2, readbuf, len); + return i; + } + return -1; + default: return -1; } @@ -5423,6 +5458,7 @@ show_remote_protocol_vcont_packet_cmd (args, from_tty, NULL); show_remote_protocol_binary_download_cmd (args, from_tty, NULL); show_remote_protocol_qPart_auxv_packet_cmd (args, from_tty, NULL); + show_remote_protocol_qPart_dirty_packet_cmd (args, from_tty, NULL); } static void @@ -5673,6 +5709,13 @@ &remote_set_cmdlist, &remote_show_cmdlist, 0); + add_packet_config_cmd (&remote_protocol_qPart_dirty, + "qPart_dirty", "read-dirty-registers", + set_remote_protocol_qPart_dirty_packet_cmd, + show_remote_protocol_qPart_dirty_packet_cmd, + &remote_set_cmdlist, &remote_show_cmdlist, + 0); + /* Keep the old ``set remote Z-packet ...'' working. */ add_setshow_auto_boolean_cmd ("Z-packet", class_obscure, &remote_Z_packet_detect, "\ ==== //depot/projects/hammer/contrib/gdb/gdb/target.h#4 (text+ko) ==== @@ -229,7 +229,9 @@ /* Transfer auxilliary vector. */ TARGET_OBJECT_AUXV, /* StackGhost cookie. See "sparc-tdep.c". */ - TARGET_OBJECT_WCOOKIE + TARGET_OBJECT_WCOOKIE, + /* Dirty registers. See "ia64-tdep.c". */ + TARGET_OBJECT_DIRTY /* Possible future objects: TARGET_OBJECT_FILE, TARGET_OBJECT_PROC, ... */ }; ==== //depot/projects/hammer/gnu/usr.bin/Makefile#8 (text+ko) ==== @@ -1,11 +1,18 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.80 2004/06/10 19:17:20 peter Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.81 2004/06/25 07:15:13 marcel Exp $ -SUBDIR= bc ${_binutils} ${_cc} cpio dc dialog diff diff3 \ +SUBDIR= bc ${_binutils} ${_cc} cpio dc dialog diff diff3 ${_gdb} \ ${_gperf} grep gzip man patch rcs sdiff send-pr sort tar texinfo +.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" +NO_GDB= not yet +.endif + .if !defined(NO_TOOLCHAIN) _cc=cc _binutils=binutils +.if !defined(NO_GDB) +_gdb=gdb +.endif .endif .if !defined(NO_CXX) ==== //depot/projects/hammer/gnu/usr.bin/binutils/Makefile#8 (text+ko) ==== @@ -1,15 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.28 2004/06/21 18:09:20 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.29 2004/06/25 07:34:56 obrien Exp $ SUBDIR= libiberty libbfd libopcodes libbinutils \ addr2line ar as ld nm objcopy objdump ranlib readelf \ size strings strip doc -NO_GDB= yes -TARGET_ARCH?= ${MACHINE_ARCH} -.if (${TARGET_ARCH} == "alpha" \ - || ${TARGET_ARCH} == "i386" ) \ - && !defined(NO_GDB) -SUBDIR+= gdb gdbreplay -.endif - .include ==== //depot/projects/hammer/gnu/usr.bin/binutils/doc/Makefile#6 (text+ko) ==== @@ -1,16 +1,10 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/doc/Makefile,v 1.20 2004/06/23 04:36:04 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/doc/Makefile,v 1.21 2004/06/25 06:55:49 marcel Exp $ .include "../Makefile.inc0" -GDBDIR= ${.CURDIR}/../../../../contrib/gdb -CONTRIBDIR= ${.CURDIR}/../../../../contrib +.PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc -.PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc ${GDBDIR}/gdb/doc ${GDBDIR}/gdb/mi - -INFO= as ld gasp stabs binutils -.if !defined(NO_GDB) -INFO+= gdb gdbint -.endif +INFO= as ld gasp binutils INFOSECTION= "Programming & development tools." INFOENTRY_as= "* As: (as). The GNU assembler." INFOENTRY_gasp= "* Gasp: (gasp). The GNU Assembler Macro Preprocessor." @@ -20,13 +14,8 @@ MAKEINFOFLAGS+= --no-validate MAKEINFOFLAGS+= -I ${SRCDIR}/gas/doc -I ${SRCDIR}/ld -I ${SRCDIR}/bfd/doc MAKEINFOFLAGS+= -I ${SRCDIR}/binutils -MAKEINFOFLAGS+= -I ${GDBDIR}/gdb/doc -MAKEINFOFLAGS+= -I ${GDBDIR}/gdb/mi -MAKEINFOFLAGS+= -I ${CONTRIBDIR}/libreadline/doc -CLEANFILES= configdoc.texi gdb-cfg.texi GDBvn.texi \ - inc-hist.texinfo inc-hist.texinfo.orig \ - config.texi gasver.texi ldver.texi +CLEANFILES= configdoc.texi config.texi gasver.texi ldver.texi as.info: as.texinfo asconfig.texi c-i386.texi gasver.texi ld.info: ld.texinfo bfdsumm.texi ldver.texi configdoc.texi @@ -34,27 +23,10 @@ configdoc.texi: gen-doc.texi ln -sf ${.ALLSRC} ${.TARGET} -gdb.info: gdb.texinfo gdb-cfg.texi GDBvn.texi annotate.texinfo \ - fdl.texi gpl.texi \ - rluser.texinfo inc-hist.texinfo - -gdbint.info: gdbint.texinfo gdb-cfg.texi fdl.texi observer.texi - -gdb-cfg.texi: all-cfg.texi - ln -sf ${.ALLSRC} ${.TARGET} - -GDBvn.texi: ${GDBDIR}/gdb/version.in - echo "@set GDBVN `sed q ${.ALLSRC}`" > ${.TARGET} - .PATH: ${SRCDIR}/binutils/doc binutils.info: binutils.texi config.texi config.texi gasver.texi ldver.texi: echo "@set VERSION ${VERSION}" > ${.TARGET} -.PATH: ${CONTRIBDIR}/libreadline/doc -inc-hist.texinfo: hsuser.texinfo inc-hist.diff - cp ${.ALLSRC:M*.texinfo} ${.TARGET} - patch -b .orig < ${.ALLSRC:M*.diff} - .include ==== //depot/projects/hammer/lib/libdevstat/devstat.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.25 2003/10/13 05:30:20 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.26 2004/06/25 01:16:02 kan Exp $"); #include #include @@ -1572,7 +1572,7 @@ const char *func_name = "readkmem_nl"; struct nlist nl[2]; - (const char *)nl[0].n_name = name; + nl[0].n_name = (char *)name; nl[1].n_name = NULL; if (kvm_nlist(kd, nl) == -1) { ==== //depot/projects/hammer/lib/libpam/modules/pam_radius/pam_radius.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.c,v 1.20 2003/12/11 13:55:16 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.c,v 1.21 2004/06/25 01:54:26 kan Exp $"); #include #include @@ -111,7 +111,7 @@ hints.ai_family = PF_INET; if (getaddrinfo(nas_ipaddr, NULL, &hints, &res) == 0 && res != NULL) { - (struct sockaddr *)haddr = res->ai_addr; + haddr = (struct sockaddr_in*)res->ai_addr; error = rad_put_addr(radh, RAD_NAS_IP_ADDRESS, haddr->sin_addr); freeaddrinfo(res); ==== //depot/projects/hammer/release/doc/ru_RU.KOI8-R/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ # The FreeBSD Russian Documentation Project # -# $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/Makefile,v 1.3 2004/05/31 10:22:42 den Exp $ -# $FreeBSD: src/release/doc/ru_RU.KOI8-R/Makefile,v 1.2 2004/05/31 11:43:20 den Exp $ +# $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/Makefile,v 1.5 2004/06/24 13:34:36 den Exp $ +# $FreeBSD: src/release/doc/ru_RU.KOI8-R/Makefile,v 1.3 2004/06/25 05:03:56 den Exp $ # # Original revision: 1.3 # @@ -10,9 +10,9 @@ SUBDIR = relnotes SUBDIR+= hardware -#SUBDIR+= readme +SUBDIR+= readme #SUBDIR+= errata -#SUBDIR+= installation +SUBDIR+= installation #SUBDIR+= early-adopter COMPAT_SYMLINK = ru ==== //depot/projects/hammer/sys/netinet/tcp_input.c#31 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.246 2004/06/24 03:07:27 rwatson Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.247 2004/06/25 04:11:26 ps Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -1057,7 +1057,7 @@ * for incoming connections is handled in tcp_syncache. * XXX this is traditional behavior, may need to be cleaned up. */ - tcp_dooptions(tp,&to, optp, optlen, thflags & TH_SYN,th); + tcp_dooptions(tp, &to, optp, optlen, thflags & TH_SYN, th); if (thflags & TH_SYN) { if (to.to_flags & TOF_SCALE) { tp->t_flags |= TF_RCVD_SCALE; @@ -1084,7 +1084,7 @@ if (tp->sack_enable) { /* Delete stale (cumulatively acked) SACK holes */ tcp_del_sackholes(tp, th); - tp->rcv_laststart = th->th_seq; /* last rec'vd segment*/ + tp->rcv_laststart = th->th_seq; /* last recv'd segment*/ tp->rcv_lastend = th->th_seq + tlen; } @@ -2579,7 +2579,7 @@ tcp_dooptions(tp, to, cp, cnt, is_syn, th) struct tcpcb *tp; struct tcpopt *to; - u_char *cp; + u_char *cp; int cnt; int is_syn; struct tcphdr *th; ==== //depot/projects/hammer/sys/netinet/tcp_var.h#14 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_var.h 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_var.h,v 1.106 2004/06/23 21:04:37 ps Exp $ + * $FreeBSD: src/sys/netinet/tcp_var.h,v 1.107 2004/06/25 02:29:58 bms Exp $ */ #ifndef _NETINET_TCP_VAR_H_ @@ -54,7 +54,7 @@ struct sackblk { tcp_seq start; /* start seq no. of sack block */ - tcp_seq end; /* end seq no. */ + tcp_seq end; /* end seq no. */ }; struct sackhole { @@ -63,6 +63,7 @@ tcp_seq rxmit; /* next seq. no in hole to be retransmitted */ struct sackhole *next; /* next in list */ }; + struct tcptemp { u_char tt_ipgen[40]; /* the size must be of max ip header, now IPv6 */ struct tcphdr tt_t; @@ -190,11 +191,10 @@ u_long rcv_second; /* start of interval second */ u_long rcv_pps; /* received packets per second */ u_long rcv_byps; /* received bytes per second */ - /* SACK related state */ +/* SACK related state */ int sack_enable; /* enable SACK for this connection */ int snd_numholes; /* number of holes seen by sender */ struct sackhole *snd_holes; /* linked list of holes (sorted) */ - tcp_seq rcv_laststart; /* start of last segment recd. */ tcp_seq rcv_lastend; /* end of ... */ tcp_seq rcv_lastsack; /* last seq number(+1) sack'd by rcv'r*/ ==== //depot/projects/hammer/usr.bin/paste/paste.1#4 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)paste.1 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.bin/paste/paste.1,v 1.15 2002/12/23 16:04:51 ru Exp $ +.\" $FreeBSD: src/usr.bin/paste/paste.1,v 1.16 2004/06/25 01:48:43 tjr Exp $ .\" -.Dd September 20, 2001 +.Dd June 25, 2004 .Dt PASTE 1 .Os .Sh NAME @@ -148,7 +148,3 @@ .Nm command appeared in .At 32v . -.Sh BUGS -Multibyte character delimiters cannot be specified with the -.Fl d -option. ==== //depot/projects/hammer/usr.bin/paste/paste.c#2 (text+ko) ==== @@ -47,38 +47,56 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/paste/paste.c,v 1.13 2002/05/24 08:56:49 tjr Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/paste/paste.c,v 1.14 2004/06/25 01:48:43 tjr Exp $"); #include #include #include #include +#include #include #include #include #include +#include -char *delim; +wchar_t *delim; int delimcnt; int parallel(char **); int sequential(char **); -int tr(char *); +int tr(wchar_t *); static void usage(void); -char tab[] = "\t"; +wchar_t tab[] = L"\t"; int main(int argc, char *argv[]) { int ch, rval, seq; + wchar_t *warg; + const char *arg; + size_t len; + + setlocale(LC_CTYPE, ""); seq = 0; while ((ch = getopt(argc, argv, "d:s")) != -1) switch(ch) { case 'd': - delimcnt = tr(delim = optarg); + arg = optarg; + len = mbsrtowcs(NULL, &arg, 0, NULL); + if (len == (size_t)-1) + err(1, "delimiters"); + warg = malloc((len + 1) * sizeof(*warg)); + if (warg == NULL) + err(1, NULL); + arg = optarg; + len = mbsrtowcs(warg, &arg, len + 1, NULL); + if (len == (size_t)-1) + err(1, "delimiters"); + delimcnt = tr(delim = warg); break; case 's': seq = 1; @@ -116,10 +134,11 @@ { LIST *lp; int cnt; - char ch, *buf, *p; + wint_t ich; + wchar_t ch; + char *p; LIST *head, *tmp; int opencnt, output; - size_t len; for (cnt = 0, head = NULL; (p = *argv); ++argv, ++cnt) { if ((lp = malloc(sizeof(LIST))) == NULL) @@ -144,16 +163,16 @@ if (!lp->fp) { if (output && lp->cnt && (ch = delim[(lp->cnt - 1) % delimcnt])) - putchar(ch); + putwchar(ch); continue; } - if ((buf = fgetln(lp->fp, &len)) == NULL) { + if ((ich = getwc(lp->fp)) == WEOF) { if (!--opencnt) break; lp->fp = NULL; if (output && lp->cnt && (ch = delim[(lp->cnt - 1) % delimcnt])) - putchar(ch); + putwchar(ch); continue; } /* @@ -164,15 +183,17 @@ output = 1; for (cnt = 0; cnt < lp->cnt; ++cnt) if ((ch = delim[cnt % delimcnt])) - putchar(ch); + putwchar(ch); } else if ((ch = delim[(lp->cnt - 1) % delimcnt])) - putchar(ch); - if (buf[len - 1] == '\n') - len--; - fwrite(buf, 1, len, stdout); + putwchar(ch); + if (ich == '\n') + continue; + do { + putwchar(ich); + } while ((ich = getwc(lp->fp)) != WEOF && ich != '\n'); } if (output) - putchar('\n'); + putwchar('\n'); } return (0); @@ -183,8 +204,8 @@ { FILE *fp; int cnt, failed, needdelim; - char *buf, *p; - size_t len; + wint_t ch; + char *p; failed = 0; for (; (p = *argv); ++argv) { @@ -196,21 +217,21 @@ continue; } cnt = needdelim = 0; - while ((buf = fgetln(fp, &len)) != NULL) { + while ((ch = getwc(fp)) != WEOF) { if (needdelim) { needdelim = 0; if (delim[cnt] != '\0') - putchar(delim[cnt]); + putwchar(delim[cnt]); if (++cnt == delimcnt) cnt = 0; } - if (buf[len - 1] == '\n') - len--; - fwrite(buf, 1, len, stdout); - needdelim = 1; + if (ch != '\n') + putwchar(ch); + else + needdelim = 1; } if (needdelim) - putchar('\n'); + putwchar('\n'); if (fp != stdin) (void)fclose(fp); } @@ -219,10 +240,10 @@ } int -tr(char *arg) +tr(wchar_t *arg) { int cnt; - char ch, *p; + wchar_t ch, *p; for (p = arg, cnt = 0; (ch = *p++); ++arg, ++cnt) if (ch == '\\') From owner-p4-projects@FreeBSD.ORG Fri Jun 25 08:00:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C6CC16A4D0; Fri, 25 Jun 2004 08:00:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8A1016A4CF for ; Fri, 25 Jun 2004 08:00:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0B3043D55 for ; Fri, 25 Jun 2004 08:00:15 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5P7xjqc010362 for ; Fri, 25 Jun 2004 07:59:45 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5P7xjKZ010357 for perforce@freebsd.org; Fri, 25 Jun 2004 07:59:45 GMT (envelope-from julian@freebsd.org) Date: Fri, 25 Jun 2004 07:59:45 GMT Message-Id: <200406250759.i5P7xjKZ010357@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 55776 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 08:00:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=55776 Change 55776 by julian@julian_jules1 on 2004/06/25 07:59:42 Doodling with ULE.. compiles, probably doesn't run. Affected files ... .. //depot/projects/nsched/sys/kern/sched_ule.c#8 edit Differences ... ==== //depot/projects/nsched/sys/kern/sched_ule.c#8 (text+ko) ==== @@ -253,6 +253,14 @@ #define FIRST_KSE_IN_PROC(p) FIRST_KSE_IN_KSEGRP(FIRST_KSEGRP_IN_PROC(p)) static struct kse kse0; /* Primary kse in proc0. */ +static uma_zone_t kse_zone; +static struct kg_sched kg_sched0; +static struct td_sched td_sched0; + + +extern struct mtx kse_zombie_lock; +TAILQ_HEAD(, kse) zombie_kses = TAILQ_HEAD_INITIALIZER(zombie_kses); + static struct kse *kse_alloc(void); static void kse_free(struct kse *ke); static void kse_stash(struct kse *ke); @@ -471,19 +479,13 @@ #endif static void runq_add(struct runq *, struct kse *); +#if 0 static int runq_check(struct runq *); +#endif static struct kse *runq_choose(struct runq *); static void runq_init(struct runq *); static void runq_remove(struct runq *, struct kse *); - -static void setup_runqs(void); -static void roundrobin(void *arg); -static void schedcpu(void); -static void schedcpu_thread(void); -static void maybe_resched(struct thread *td); -static void updatepri(struct ksegrp *kg); -static void resetpriority(struct ksegrp *kg); static void sched_add(struct thread *td); static void sched_rem(struct thread *td); static struct kse * sched_choose(void); @@ -1451,23 +1453,34 @@ } /* + * Allocate any resources the scheduler needs to allocate or set up + * on a new process at fork() time. * Penalize the parent for creating a new child and initialize the child's * priority. + * Called from: + * fork1() */ void -sched_fork(struct thread *td, struct proc *p1) +sched_fork(struct thread *td, struct proc *child) { - + struct thread *newtd; + struct kse *newke; struct proc *p; + mtx_assert(&sched_lock, MA_OWNED); p = td->td_proc; - mtx_assert(&sched_lock, MA_OWNED); - - p1->p_nice = p->p_nice; - sched_fork_ksegrp(td, FIRST_KSEGRP_IN_PROC(p1)); - sched_fork_kse(td, FIRST_KSE_IN_PROC(p1)); - sched_fork_thread(td, FIRST_THREAD_IN_PROC(p1)); + child->p_nice = p->p_nice; + newtd = FIRST_THREAD_IN_PROC(child); + newke = FIRST_KSE_IN_PROC(child); + bzero(&newke->ke_startzero, + (unsigned) RANGEOF(struct kse, ke_startzero, ke_endzero)); + newke->ke_state = KES_THREAD; + sched_fork_ksegrp(td, FIRST_KSEGRP_IN_PROC(child)); + newke->ke_thread = newtd; + newtd->td_kse = newke; + sched_fork_ksegrp(td, FIRST_KSEGRP_IN_PROC(child)); + sched_fork_kse(td, FIRST_KSE_IN_PROC(child)); } static void @@ -1568,7 +1581,7 @@ void sched_exit_kse(struct kse *ke, struct thread *td) { - kseq_load_rem(KSEQ_CPU(child->ke_cpu), td->td_kse); + kseq_load_rem(KSEQ_CPU(td->td_kse->ke_cpu), td->td_kse); } void @@ -1981,68 +1994,6 @@ * SUCH DAMAGE. */ -/*** -Here is the logic.. - -If there are N processors, then there are at most N KSEs (kernel -schedulable entities) working to process threads that belong to a -KSEGROUP (kg). If there are X of these KSEs actually running at the -moment in question, then there are at most M (N-X) of these KSEs on -the run queue, as running KSEs are not on the queue. - -Runnable threads are queued off the KSEGROUP in priority order. -If there are M or more threads runnable, the top M threads -(by priority) are 'preassigned' to the M KSEs not running. The KSEs take -their priority from those threads and are put on the run queue. - -The last thread that had a priority high enough to have a KSE associated -with it, AND IS ON THE RUN QUEUE is pointed to by -kg->kg_last_assigned. If no threads queued off the KSEGROUP have KSEs -assigned as all the available KSEs are activly running, or because there -are no threads queued, that pointer is NULL. - -When a KSE is removed from the run queue to become runnable, we know -it was associated with the highest priority thread in the queue (at the head -of the queue). If it is also the last assigned we know M was 1 and must -now be 0. Since the thread is no longer queued that pointer must be -removed from it. Since we know there were no more KSEs available, -(M was 1 and is now 0) and since we are not FREEING our KSE -but using it, we know there are STILL no more KSEs available, we can prove -that the next thread in the ksegrp list will not have a KSE to assign to -it, so we can show that the pointer must be made 'invalid' (NULL). - -The pointer exists so that when a new thread is made runnable, it can -have its priority compared with the last assigned thread to see if -it should 'steal' its KSE or not.. i.e. is it 'earlier' -on the list than that thread or later.. If it's earlier, then the KSE is -removed from the last assigned (which is now not assigned a KSE) -and reassigned to the new thread, which is placed earlier in the list. -The pointer is then backed up to the previous thread (which may or may not -be the new thread). - -When a thread sleeps or is removed, the KSE becomes available and if there -are queued threads that are not assigned KSEs, the highest priority one of -them is assigned the KSE, which is then placed back on the run queue at -the approipriate place, and the kg->kg_last_assigned pointer is adjusted down -to point to it. - -The following diagram shows 2 KSEs and 3 threads from a single process. - - RUNQ: --->KSE---KSE--... (KSEs queued at priorities from threads) - \ \____ - \ \ - KSEGROUP---thread--thread--thread (queued in priority order) - \ / - \_______________/ - (last_assigned) - -The result of this scheme is that the M available KSEs are always -queued at the priorities they have inherrited from the M highest priority -threads for that KSEGROUP. If this situation changes, the KSEs are -reassigned to keep this true. -***/ - - CTASSERT((RQB_BPW * RQB_LEN) == RQ_NQS); @@ -2060,9 +2011,6 @@ td->td_kse = NULL; kse_reassign(ke); } - if ((td->td_proc->p_flag & P_NOLOAD) == 0) - sched_tdcnt--; - } /* @@ -2079,49 +2027,15 @@ ke = td->td_kse; - if ((td->td_proc->p_flag & P_NOLOAD) == 0) - sched_tdcnt--; - /* td is about to be freed, but keep it clean */ td->td_kse = NULL; td->td_last_kse = NULL; + sched_exit_kse( td->td_kse, td); kse_unlink(ke); /* also frees it */ } -/* - * Allocate any resources the scheduler needs to allocate or set up - * on a new process at fork() time. - * Called from: - * fork1() - */ -void -sched_fork(struct thread *td, struct proc *child) -{ - struct thread *newtd; - struct kse *newke; - - newtd = FIRST_THREAD_IN_PROC(child); - newke = FIRST_KSE_IN_PROC(child); - bzero(&newke->ke_startzero, - (unsigned) RANGEOF(struct kse, ke_startzero, ke_endzero)); - newke->ke_state = KES_THREAD; - newke->ke_cpticks = 0; - sched_fork_ksegrp(td, FIRST_KSEGRP_IN_PROC(child)); - newke->ke_thread = newtd; - newtd->td_kse = newke; -} - -static uma_zone_t kse_zone; - -struct kse kse0; -static struct kg_sched kg_sched0; -static struct td_sched td_sched0; - -extern struct mtx kse_zombie_lock; -TAILQ_HEAD(, kse) zombie_kses = TAILQ_HEAD_INITIALIZER(zombie_kses); - /* * Occasionally the scheduler may need to do some GC.. * Called from: @@ -2204,8 +2118,7 @@ bzero(&newke->ke_startzero, (unsigned) RANGEOF(struct kse, ke_startzero, ke_endzero)); newke->ke_state = KES_THREAD; - newke->ke_cpticks = 0; - sched_fork_kse(td->td_kse, newke); + sched_fork_kse(td, newke); TD_SET_CAN_RUN(newtd); if ((flags & THR_SUSPENDED) == 0) @@ -2432,7 +2345,7 @@ bzero(&newke->ke_startzero, (unsigned) RANGEOF(struct kse, ke_startzero, ke_endzero)); newke->ke_state = KES_THREAD; - newke->ke_cpticks = 0; + sched_fork_kse(curthread, newke); /* Add engine */ kse_reassign(newke); mtx_unlock_spin(&sched_lock); @@ -2940,6 +2853,7 @@ TAILQ_INSERT_TAIL(rqh, ke, ke_procq); } +#if 0 /* * Return true if there are runnable processes of any priority on the run * queue, false otherwise. Has no side effects, does not modify the run @@ -2962,6 +2876,7 @@ return (0); } +#endif /* * Find the highest priority process on the run queue. From owner-p4-projects@FreeBSD.ORG Fri Jun 25 20:21:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C65D516A4D0; Fri, 25 Jun 2004 20:21:52 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 850C716A4CE for ; Fri, 25 Jun 2004 20:21:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C3F443D46 for ; Fri, 25 Jun 2004 20:21:52 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5PKKuRR033269 for ; Fri, 25 Jun 2004 20:20:56 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5PKKsKQ033266 for perforce@freebsd.org; Fri, 25 Jun 2004 20:20:54 GMT (envelope-from marcel@freebsd.org) Date: Fri, 25 Jun 2004 20:20:54 GMT Message-Id: <200406252020.i5PKKsKQ033266@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 Subject: PERFORCE change 55802 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 20:21:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=55802 Change 55802 by marcel@marcel_nfs on 2004/06/25 20:19:59 IFC @55800 Affected files ... .. //depot/projects/gdb/bin/pax/ar_io.c#3 integrate .. //depot/projects/gdb/bin/ps/extern.h#5 integrate .. //depot/projects/gdb/bin/ps/keyword.c#6 integrate .. //depot/projects/gdb/bin/ps/print.c#6 integrate .. //depot/projects/gdb/bin/ps/ps.c#14 integrate .. //depot/projects/gdb/bin/ps/ps.h#4 integrate .. //depot/projects/gdb/contrib/gdb/FREEBSD-upgrade#5 branch .. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/fbsd.mh#4 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/fbsd.mt#4 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/nm-fbsd.h#4 integrate .. //depot/projects/gdb/contrib/gdb/gdb/config/ia64/tm-fbsd.h#4 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ia64-fbsd-nat.c#4 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ia64-fbsd-tdep.c#4 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ia64-tdep.c#8 integrate .. //depot/projects/gdb/contrib/gdb/gdb/ia64-tdep.h#5 integrate .. //depot/projects/gdb/contrib/gdb/gdb/inftarg.c#8 integrate .. //depot/projects/gdb/contrib/gdb/gdb/remote.c#8 integrate .. //depot/projects/gdb/contrib/gdb/gdb/target.h#9 integrate .. //depot/projects/gdb/etc/rc.subr#6 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes#9 integrate .. //depot/projects/gdb/gnu/usr.bin/Makefile#5 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/Makefile#5 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/doc/Makefile#4 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/Makefile#7 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/Makefile.inc#4 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/config.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/init.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/config.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/init.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/config.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/init.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/config.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/init.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/config.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/init.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/doc/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#17 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/gdb.1#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/gdbtui/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/libgdb/Makefile#2 integrate .. //depot/projects/gdb/lib/libc/sys/send.2#4 integrate .. //depot/projects/gdb/lib/libdevstat/devstat.c#2 integrate .. //depot/projects/gdb/lib/libkvm/kvm_proc.c#7 integrate .. //depot/projects/gdb/lib/libpam/modules/pam_radius/pam_radius.c#2 integrate .. //depot/projects/gdb/lib/msun/Makefile#6 integrate .. //depot/projects/gdb/libexec/getty/subr.c#2 integrate .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/Makefile#3 integrate .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/Makefile.inc#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/alpha/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/amd64/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/common/abstract.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/common/install.ent#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/i386/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/i386/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/ia64/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/pc98/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/installation/sparc64/article.sgml#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/readme/Makefile#1 branch .. //depot/projects/gdb/release/doc/ru_RU.KOI8-R/readme/article.sgml#1 branch .. //depot/projects/gdb/sbin/gbde/gbde.c#3 integrate .. //depot/projects/gdb/share/man/man4/Makefile#13 integrate .. //depot/projects/gdb/share/man/man4/ng_ksocket.4#2 integrate .. //depot/projects/gdb/share/man/man4/pcm.4#3 integrate .. //depot/projects/gdb/share/man/man4/scsi.4#2 integrate .. //depot/projects/gdb/share/man/man4/sd.4#2 delete .. //depot/projects/gdb/share/man/man4/st.4#2 delete .. //depot/projects/gdb/share/man/man4/ubtbcmfw.4#3 integrate .. //depot/projects/gdb/share/man/man4/ucom.4#2 integrate .. //depot/projects/gdb/share/man/man4/uftdi.4#3 integrate .. //depot/projects/gdb/share/man/man4/uhid.4#2 integrate .. //depot/projects/gdb/share/man/man4/uhidev.4#2 integrate .. //depot/projects/gdb/share/man/man4/ulpt.4#2 integrate .. //depot/projects/gdb/share/man/man4/umodem.4#2 integrate .. //depot/projects/gdb/share/man/man4/uplcom.4#3 integrate .. //depot/projects/gdb/share/man/man4/usb.4#2 integrate .. //depot/projects/gdb/share/man/man4/uvisor.4#2 integrate .. //depot/projects/gdb/share/man/man4/uvscom.4#2 integrate .. //depot/projects/gdb/share/man/man4/vinum.4#2 integrate .. //depot/projects/gdb/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/gdb/sys/compat/svr4/imgact_svr4.c#3 integrate .. //depot/projects/gdb/sys/conf/files#31 integrate .. //depot/projects/gdb/sys/conf/kmod.mk#9 integrate .. //depot/projects/gdb/sys/conf/options#23 integrate .. //depot/projects/gdb/sys/conf/options.powerpc#3 integrate .. //depot/projects/gdb/sys/conf/options.sparc64#4 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#23 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_cpu.c#11 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pci.c#12 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_quirks#1 branch .. //depot/projects/gdb/sys/dev/ar/if_ar.c#5 integrate .. //depot/projects/gdb/sys/dev/cp/if_cp.c#7 integrate .. //depot/projects/gdb/sys/dev/ctau/if_ct.c#7 integrate .. //depot/projects/gdb/sys/dev/cx/if_cx.c#11 integrate .. //depot/projects/gdb/sys/dev/digi/digi.c#10 integrate .. //depot/projects/gdb/sys/dev/ichsmb/ichsmb_pci.c#4 integrate .. //depot/projects/gdb/sys/dev/ofw/ofw_console.c#8 integrate .. //depot/projects/gdb/sys/dev/ofw/ofw_disk.c#3 integrate .. //depot/projects/gdb/sys/dev/rc/rc.c#8 integrate .. //depot/projects/gdb/sys/dev/sio/sio.c#16 integrate .. //depot/projects/gdb/sys/dev/sound/pcm/mixer.c#7 integrate .. //depot/projects/gdb/sys/dev/sr/if_sr.c#5 integrate .. //depot/projects/gdb/sys/dev/twa/twa_freebsd.c#6 integrate .. //depot/projects/gdb/sys/dev/uart/uart_bus.h#3 integrate .. //depot/projects/gdb/sys/dev/uart/uart_dev_i8251.c#2 integrate .. //depot/projects/gdb/sys/dev/uart/uart_dev_ns8250.c#4 integrate .. //depot/projects/gdb/sys/dev/uart/uart_dev_sab82532.c#3 integrate .. //depot/projects/gdb/sys/dev/uart/uart_dev_z8530.c#3 integrate .. //depot/projects/gdb/sys/dev/uart/uart_tty.c#7 integrate .. //depot/projects/gdb/sys/dev/usb/udbp.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs.h#14 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs_data.h#14 integrate .. //depot/projects/gdb/sys/dev/zs/zs_macio.c#3 integrate .. //depot/projects/gdb/sys/fs/portalfs/portal_vnops.c#7 integrate .. //depot/projects/gdb/sys/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/gdb/sys/geom/geom_slice.c#3 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum_plex.c#4 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum_raid5.c#3 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/gdb/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/gdb/sys/i386/linux/imgact_linux.c#3 integrate .. //depot/projects/gdb/sys/kern/tty.c#11 integrate .. //depot/projects/gdb/sys/kern/uipc_socket.c#16 integrate .. //depot/projects/gdb/sys/kern/uipc_socket2.c#13 integrate .. //depot/projects/gdb/sys/kern/uipc_syscalls.c#17 integrate .. //depot/projects/gdb/sys/kern/vfs_syscalls.c#15 integrate .. //depot/projects/gdb/sys/modules/ar/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/sr/Makefile#2 integrate .. //depot/projects/gdb/sys/net/if_ethersubr.c#14 integrate .. //depot/projects/gdb/sys/net/if_spppsubr.c#6 integrate .. //depot/projects/gdb/sys/net/if_vlan.c#8 integrate .. //depot/projects/gdb/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/gdb/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/gdb/sys/netgraph/ng_ksocket.c#7 integrate .. //depot/projects/gdb/sys/netgraph/ng_ksocket.h#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_lmi.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_parse.c#4 integrate .. //depot/projects/gdb/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/gdb/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/gdb/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/gdb/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/gdb/sys/netinet/ip_output.c#10 integrate .. //depot/projects/gdb/sys/netinet/tcp.h#4 integrate .. //depot/projects/gdb/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/gdb/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/gdb/sys/netinet/tcp_sack.c#1 branch .. //depot/projects/gdb/sys/netinet/tcp_seq.h#3 integrate .. //depot/projects/gdb/sys/netinet/tcp_subr.c#10 integrate .. //depot/projects/gdb/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/gdb/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/gdb/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/gdb/sys/netipx/spx_usrreq.c#5 integrate .. //depot/projects/gdb/sys/netnatm/natm.c#4 integrate .. //depot/projects/gdb/sys/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/gdb/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/gdb/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/gdb/sys/powerpc/powermac/grackle.c#4 integrate .. //depot/projects/gdb/sys/powerpc/powermac/hrowpic.c#3 integrate .. //depot/projects/gdb/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/gdb/sys/powerpc/powermac/openpic_macio.c#4 integrate .. //depot/projects/gdb/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/nexus.c#3 integrate .. //depot/projects/gdb/sys/powerpc/psim/iobus.c#2 integrate .. //depot/projects/gdb/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/gdb/sys/security/mac/mac_net.c#4 integrate .. //depot/projects/gdb/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/gdb/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/gdb/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/gdb/sys/security/mac_stub/mac_stub.c#5 integrate .. //depot/projects/gdb/sys/security/mac_test/mac_test.c#7 integrate .. //depot/projects/gdb/sys/sparc64/conf/NOTES#4 integrate .. //depot/projects/gdb/sys/sys/mac_policy.h#6 integrate .. //depot/projects/gdb/sys/sys/serial.h#1 branch .. //depot/projects/gdb/sys/sys/socketvar.h#8 integrate .. //depot/projects/gdb/sys/sys/tty.h#9 integrate .. //depot/projects/gdb/sys/sys/ttycom.h#6 integrate .. //depot/projects/gdb/sys/tools/acpi_quirks2h.awk#1 branch .. //depot/projects/gdb/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/gdb/sys/vm/uma_core.c#8 integrate .. //depot/projects/gdb/sys/vm/vm_map.c#10 integrate .. //depot/projects/gdb/sys/vm/vm_pageout.c#6 integrate .. //depot/projects/gdb/tools/regression/lib/libc/stdlib/Makefile#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/stdlib/test-heapsort.c#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/stdlib/test-mergesort.c#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/stdlib/test-qsort.c#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/stdlib/test-sort.h#1 branch .. //depot/projects/gdb/usr.bin/comm/comm.1#2 integrate .. //depot/projects/gdb/usr.bin/expand/expand.c#2 integrate .. //depot/projects/gdb/usr.bin/fetch/fetch.c#5 integrate .. //depot/projects/gdb/usr.bin/fold/fold.c#2 integrate .. //depot/projects/gdb/usr.bin/join/join.1#2 integrate .. //depot/projects/gdb/usr.bin/paste/paste.1#2 integrate .. //depot/projects/gdb/usr.bin/paste/paste.c#2 integrate .. //depot/projects/gdb/usr.bin/unexpand/unexpand.c#2 integrate .. //depot/projects/gdb/usr.bin/uniq/uniq.1#2 integrate .. //depot/projects/gdb/usr.bin/vis/vis.1#2 integrate Differences ... ==== //depot/projects/gdb/bin/pax/ar_io.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.24 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/ar_io.c,v 1.25 2004/06/25 05:27:59 obrien Exp $"); #include #include @@ -154,8 +154,10 @@ return(-1); if (chdname != NULL) - if (chdir(chdname) != 0) + if (chdir(chdname) != 0) { syswarn(1, errno, "Failed chdir to %s", chdname); + return(-1); + } /* * set up is based on device type */ ==== //depot/projects/gdb/bin/ps/extern.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.36 2004/06/23 11:56:57 gad Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.37 2004/06/23 23:48:09 gad Exp $ */ struct kinfo; @@ -40,7 +40,7 @@ extern unsigned long mempages; extern time_t now; extern int sumrusage, termwidth, totwidth; -extern VARENT *vhead; +extern STAILQ_HEAD(velisthead, varent) varlist; __BEGIN_DECLS void arguments(KINFO *, VARENT *); ==== //depot/projects/gdb/bin/ps/keyword.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.69 2004/06/23 11:56:57 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.70 2004/06/23 23:48:09 gad Exp $"); #include #include @@ -235,7 +235,6 @@ void parsefmt(const char *p, int user) { - static struct varent *vtail; char *tempstr, *tempstr1; #define FMTSEP " \t,\n" @@ -282,16 +281,10 @@ if (vent->var == NULL) errx(1, "malloc failed"); memcpy(vent->var, v, sizeof(*vent->var)); - vent->next = NULL; - if (vhead == NULL) - vhead = vtail = vent; - else { - vtail->next = vent; - vtail = vent; - } + STAILQ_INSERT_TAIL(&varlist, vent, next_ve); } free(tempstr1); - if (!vhead) { + if (STAILQ_EMPTY(&varlist)) { warnx("no valid keywords; valid keywords:"); showkey(); exit(1); ==== //depot/projects/gdb/bin/ps/print.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.90 2004/06/23 12:18:36 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.91 2004/06/23 23:48:09 gad Exp $"); #include #include @@ -69,26 +69,23 @@ { VAR *v; struct varent *vent; - int allempty; - allempty = 1; - for (vent = vhead; vent; vent = vent->next) - if (*vent->header != '\0') { - allempty = 0; + STAILQ_FOREACH(vent, &varlist, next_ve) + if (*vent->header != '\0') break; - } - if (allempty) + if (!vent) return; - for (vent = vhead; vent; vent = vent->next) { + + STAILQ_FOREACH(vent, &varlist, next_ve) { v = vent->var; if (v->flag & LJUST) { - if (vent->next == NULL) /* last one */ + if (STAILQ_NEXT(vent, next_ve) == NULL) /* last one */ (void)printf("%s", vent->header); else (void)printf("%-*s", v->width, vent->header); } else (void)printf("%*s", v->width, vent->header); - if (vent->next != NULL) + if (STAILQ_NEXT(vent, next_ve) != NULL) (void)putchar(' '); } (void)putchar('\n'); @@ -105,7 +102,7 @@ if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL) errx(1, "malloc failed"); strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH); - if (ve->next == NULL) { + if (STAILQ_NEXT(ve, next_ve) == NULL) { /* last field */ if (termwidth == UNLIMITED) { (void)printf("%s", vis_args); @@ -131,7 +128,8 @@ v = ve->var; if (cflag) { - if (ve->next == NULL) /* last field, don't pad */ + /* If it is the last field, then don't pad */ + if (STAILQ_NEXT(ve, next_ve) == NULL) (void)printf("%s", k->ki_p->ki_comm); else (void)printf("%-*s", v->width, k->ki_p->ki_comm); @@ -147,7 +145,7 @@ } else vis_env = NULL; - if (ve->next == NULL) { + if (STAILQ_NEXT(ve, next_ve) == NULL) { /* last field */ if (termwidth == UNLIMITED) { if (vis_env) @@ -180,7 +178,7 @@ VAR *v; v = ve->var; - if (ve->next == NULL) /* last field, don't pad */ + if (STAILQ_NEXT(ve, next_ve) == NULL) /* last field, don't pad */ (void)printf("%s", k->ki_p->ki_comm); else (void)printf("%-*s", v->width, k->ki_p->ki_comm); ==== //depot/projects/gdb/bin/ps/ps.c#14 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.101 2004/06/23 11:40:56 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.105 2004/06/24 03:15:18 gad Exp $"); #include #include @@ -98,7 +98,7 @@ int termwidth; /* Width of the screen (0 == infinity). */ int totwidth; /* Calculated-width of requested variables. */ -struct varent *vhead; +struct velisthead varlist = STAILQ_HEAD_INITIALIZER(varlist); static int forceuread = DEF_UREAD; /* Do extra work to get u-area. */ static kvm_t *kd; @@ -600,9 +600,9 @@ * For each process, call each variable output function. */ for (i = lineno = 0; i < nkept; i++) { - for (vent = vhead; vent; vent = vent->next) { + STAILQ_FOREACH(vent, &varlist, next_ve) { (vent->var->oproc)(&kinfo[i], vent); - if (vent->next != NULL) + if (STAILQ_NEXT(vent, next_ve) != NULL) (void)putchar(' '); } (void)putchar('\n'); @@ -703,6 +703,13 @@ } #undef BSD_PID_MAX +/*- + * The user can specify a device via one of three formats: + * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console + * 2) missing "/dev", e.g.: ttyp0 console + * 3) two-letters, e.g.: p0 co + * (matching letters that would be seen in the "TT" column) + */ static int addelem_tty(struct listinfo *inf, const char *elem) { @@ -710,25 +717,46 @@ struct stat sb; char pathbuf[PATH_MAX]; - if (strcmp(elem, "co") == 0) - ttypath = strdup(_PATH_CONSOLE); - else if (*elem == '/') + ttypath = NULL; + switch (*elem) { + case '/': ttypath = elem; - else { + break; + case 'c': + if (strcmp(elem, "co") == 0) { + ttypath = _PATH_CONSOLE; + break; + } + /* FALLTHROUGH */ + default: + strlcpy(pathbuf, _PATH_DEV, sizeof(pathbuf)); + strlcat(pathbuf, elem, sizeof(pathbuf)); + ttypath = pathbuf; + if (strncmp(pathbuf, _PATH_TTY, sizeof(_PATH_TTY)) == 0) + break; + if (strcmp(pathbuf, _PATH_CONSOLE) == 0) + break; + if (stat(pathbuf, &sb) == 0 && S_ISCHR(sb.st_mode)) { + /* No need to repeat stat() && S_ISCHR() checks */ + ttypath = NULL; + break; + } + /* /dev/${elem} does not exist, so try /dev/tty${elem} */ strlcpy(pathbuf, _PATH_TTY, sizeof(pathbuf)); strlcat(pathbuf, elem, sizeof(pathbuf)); - ttypath = pathbuf; + break; } - - if (stat(ttypath, &sb) == -1) { - warn("%s", ttypath); - optfatal = 1; - return (0); - } - if (!S_ISCHR(sb.st_mode)) { - warn("%s: Not a terminal", ttypath); - optfatal = 1; - return (0); + if (ttypath) { + if (stat(ttypath, &sb) == -1) { + warn("%s", ttypath); + optfatal = 1; + return (0); + } + if (!S_ISCHR(sb.st_mode)) { + warn("%s: Not a terminal", ttypath); + optfatal = 1; + return (0); + } } if (inf->count >= inf->maxcount) expand_list(inf); @@ -886,7 +914,7 @@ { struct varent *vent; - for (vent = vhead; vent; vent = vent->next) { + STAILQ_FOREACH(vent, &varlist, next_ve) { if (strcmp(vent->var->name, v->name) == 0) return vent; } @@ -899,7 +927,7 @@ struct varent *vent; VAR *v; - for (vent = vhead; vent; vent = vent->next) { + STAILQ_FOREACH(vent, &varlist, next_ve) { v = vent->var; if (v->flag & DSIZ) { v->dwidth = v->width; @@ -919,7 +947,7 @@ VAR *v; int i; - for (vent = vhead; vent; vent = vent->next) { + STAILQ_FOREACH(vent, &varlist, next_ve) { v = vent->var; if (!(v->flag & DSIZ)) continue; @@ -938,7 +966,7 @@ VAR *v; int i; - for (vent = vhead; vent; vent = vent->next) { + STAILQ_FOREACH(vent, &varlist, next_ve) { v = vent->var; i = strlen(vent->header); if (v->width < i) @@ -977,19 +1005,27 @@ /* * save arguments if needed */ - if (needcomm && (UREADOK(ki) || (ki->ki_p->ki_args != NULL))) { - ki->ki_args = strdup(fmt(kvm_getargv, ki, ki->ki_p->ki_comm, - MAXCOMLEN)); - } else if (needcomm) { - asprintf(&ki->ki_args, "(%s)", ki->ki_p->ki_comm); + if (needcomm) { + if (ki->ki_p->ki_stat == SZOMB) + ki->ki_args = strdup(""); + else if (UREADOK(ki) || (ki->ki_p->ki_args != NULL)) + ki->ki_args = strdup(fmt(kvm_getargv, ki, + ki->ki_p->ki_comm, MAXCOMLEN)); + else + asprintf(&ki->ki_args, "(%s)", ki->ki_p->ki_comm); + if (ki->ki_args == NULL) + errx(1, "malloc failed"); } else { ki->ki_args = NULL; } - if (needenv && UREADOK(ki)) { - ki->ki_env = strdup(fmt(kvm_getenvv, ki, (char *)NULL, 0)); - } else if (needenv) { - ki->ki_env = malloc(3); - strcpy(ki->ki_env, "()"); + if (needenv) { + if (UREADOK(ki)) + ki->ki_env = strdup(fmt(kvm_getenvv, ki, + (char *)NULL, 0)); + else + ki->ki_env = strdup("()"); + if (ki->ki_env == NULL) + errx(1, "malloc failed"); } else { ki->ki_env = NULL; } ==== //depot/projects/gdb/bin/ps/ps.h#4 (text+ko) ==== @@ -27,9 +27,11 @@ * SUCH DAMAGE. * * @(#)ps.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ps/ps.h,v 1.18 2004/06/20 21:25:10 gad Exp $ + * $FreeBSD: src/bin/ps/ps.h,v 1.19 2004/06/23 23:48:09 gad Exp $ */ +#include + #define UNLIMITED 0 /* unlimited terminal width */ enum type { CHAR, UCHAR, SHORT, USHORT, INT, UINT, LONG, ULONG, KPTR, PGTOK }; @@ -44,8 +46,8 @@ /* Variables. */ typedef struct varent { + STAILQ_ENTRY(varent) next_ve; const char *header; - struct varent *next; struct var *var; } VARENT; ==== //depot/projects/gdb/contrib/gdb/gdb/config/ia64/fbsd.mh#4 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/ia64/fbsd.mt#4 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/ia64/nm-fbsd.h#4 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/config/ia64/tm-fbsd.h#4 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/ia64-fbsd-nat.c#4 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/ia64-fbsd-tdep.c#4 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/ia64-tdep.c#8 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/ia64-tdep.h#5 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/inftarg.c#8 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/remote.c#8 (text+ko) ==== ==== //depot/projects/gdb/contrib/gdb/gdb/target.h#9 (text+ko) ==== ==== //depot/projects/gdb/etc/rc.subr#6 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.27 2004/06/06 18:06:09 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.28 2004/06/24 16:57:49 mtm Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -194,7 +194,7 @@ err 3 'USAGE: check_pidfile pidfile procname [interpreter]' fi if [ ! -f $_pidfile ]; then - debug "pid file {$_pidfile): not readable." + debug "pid file ($_pidfile): not readable." return fi read _pid _junk < $_pidfile ==== //depot/projects/gdb/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.137 2004/06/01 09:45:16 des Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.138 2004/06/24 03:08:44 wollman Exp $ % -- Gifts for Children -- @@ -16100,6 +16100,9 @@ % Yes, but which self do you want to be? % +Yes, I was surprised how easy it was to cut the door off my cat. + -- James D. Nicoll +% Yesterday I was a dog. Today I'm a dog. Tomorrow I'll probably still be a dog. Sigh! There's so little hope for advancement. -- Snoopy ==== //depot/projects/gdb/gnu/usr.bin/Makefile#5 (text+ko) ==== @@ -1,8 +1,12 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.80 2004/06/10 19:17:20 peter Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.81 2004/06/25 07:15:13 marcel Exp $ SUBDIR= bc ${_binutils} ${_cc} cpio dc dialog diff diff3 ${_gdb} \ ${_gperf} grep gzip man patch rcs sdiff send-pr sort tar texinfo +.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" +NO_GDB= not yet +.endif + .if !defined(NO_TOOLCHAIN) _cc=cc _binutils=binutils ==== //depot/projects/gdb/gnu/usr.bin/binutils/Makefile#5 (text+ko) ==== @@ -1,15 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.28 2004/06/21 18:09:20 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.29 2004/06/25 07:34:56 obrien Exp $ SUBDIR= libiberty libbfd libopcodes libbinutils \ addr2line ar as ld nm objcopy objdump ranlib readelf \ size strings strip doc -NO_GDB= yes -TARGET_ARCH?= ${MACHINE_ARCH} -.if (${TARGET_ARCH} == "alpha" \ - || ${TARGET_ARCH} == "i386" ) \ - && !defined(NO_GDB) -SUBDIR+= gdb gdbreplay -.endif - .include ==== //depot/projects/gdb/gnu/usr.bin/binutils/doc/Makefile#4 (text+ko) ==== @@ -1,10 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/doc/Makefile,v 1.20 2004/06/23 04:36:04 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/doc/Makefile,v 1.21 2004/06/25 06:55:49 marcel Exp $ .include "../Makefile.inc0" -GDBDIR= ${.CURDIR}/../../../../contrib/gdb -CONTRIBDIR= ${.CURDIR}/../../../../contrib - .PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld ${SRCDIR}/bfd/doc INFO= as ld gasp binutils ==== //depot/projects/gdb/gnu/usr.bin/gdb/Makefile#7 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/Makefile.inc#4 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/Makefile#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/config.h#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/alpha/init.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/Makefile#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/config.h#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/amd64/init.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/Makefile#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/config.h#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/i386/init.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/Makefile#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/config.h#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/ia64/init.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/config.h#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/arch/sparc64/init.c#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/doc/Makefile#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#17 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/gdb/gdb.1#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/gdbtui/Makefile#2 (text+ko) ==== ==== //depot/projects/gdb/gnu/usr.bin/gdb/libgdb/Makefile#2 (text+ko) ==== ==== //depot/projects/gdb/lib/libc/sys/send.2#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.24 2004/06/21 18:57:32 mpp Exp $ +.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.25 2004/06/24 10:53:44 rik Exp $ .\" .Dd February 15, 1995 .Dt SEND 2 @@ -194,7 +194,7 @@ address specified in the IP header did not match the IP address bound to the prison. .It Bq Er EPIPE -The socket is unable to send anymore data (SS_CANTSENDMORE has +The socket is unable to send anymore data (SBS_CANTSENDMORE has been set on the socket). This typically means that the socket is not connected. .El ==== //depot/projects/gdb/lib/libdevstat/devstat.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.25 2003/10/13 05:30:20 bde Exp $"); +__FBSDID("$FreeBSD: src/lib/libdevstat/devstat.c,v 1.26 2004/06/25 01:16:02 kan Exp $"); #include #include @@ -1572,7 +1572,7 @@ const char *func_name = "readkmem_nl"; struct nlist nl[2]; - (const char *)nl[0].n_name = name; + nl[0].n_name = (char *)name; nl[1].n_name = NULL; if (kvm_nlist(kd, nl) == -1) { ==== //depot/projects/gdb/lib/libkvm/kvm_proc.c#7 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.76 2004/06/19 14:08:10 gad Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.78 2004/06/23 21:59:56 gad Exp $"); /* * Proc traversal interface for kvm. ps and w are (probably) the exclusive @@ -128,7 +128,7 @@ TAILQ_FIRST(&proc.p_threads)); return (-1); } - if (proc.p_flag & P_SA == 0) { + if ((proc.p_flag & P_SA) == 0) { if (KREAD(kd, (u_long)TAILQ_FIRST(&proc.p_ksegrps), &mkg)) { @@ -328,10 +328,8 @@ continue; break; } - if (proc.p_comm[0] != 0) { - strncpy(kp->ki_comm, proc.p_comm, MAXCOMLEN); - kp->ki_comm[MAXCOMLEN] = 0; - } + if (proc.p_comm[0] != 0) + strlcpy(kp->ki_comm, proc.p_comm, MAXCOMLEN); (void)kvm_read(kd, (u_long)proc.p_sysent, (char *)&sysent, sizeof(sysent)); (void)kvm_read(kd, (u_long)sysent.sv_name, (char *)&svname, ==== //depot/projects/gdb/lib/libpam/modules/pam_radius/pam_radius.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.c,v 1.20 2003/12/11 13:55:16 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.c,v 1.22 2004/06/25 12:32:45 kan Exp $"); #include #include ==== //depot/projects/gdb/lib/msun/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.44 2004/06/20 10:42:23 stefanf Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.45 2004/06/24 00:02:32 marcel Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -49,7 +49,7 @@ # Stock gcc 2.7.2.1 doesn't understand these options. #CFLAGS += -mtrap-precision=i -mfp-trap-mode=su .elif ${MACHINE_ARCH} == "i386" -ARCH= i387 +ARCH_SUBDIR= i387 ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_fmod.S e_log.S e_log10.S \ e_remainder.S e_scalb.S e_sqrt.S s_atan.S s_ceil.S s_copysign.S \ s_cos.S s_finite.S s_floor.S s_logb.S \ @@ -58,7 +58,7 @@ # ARCH_SRCS+= s_log1p.S .endif -ARCH?= ${MACHINE_ARCH} +ARCH_SUBDIR?= ${MACHINE_ARCH} .PATH: ${.CURDIR}/bsdsrc .PATH: ${.CURDIR}/man @@ -114,7 +114,7 @@ #COMMON_SRCS+= s_fabs.c s_frexp.c s_isnan.c s_ldexp.c s_modf.c # Exclude the generic versions of what we provide in the MD area. -.PATH: ${.CURDIR}/${ARCH} +.PATH: ${.CURDIR}/${ARCH_SUBDIR} .if defined(ARCH_SRCS) .for i in ${ARCH_SRCS} COMMON_SRCS:= ${COMMON_SRCS:N${i:R}.c} ==== //depot/projects/gdb/libexec/getty/subr.c#2 (text+ko) ==== @@ -36,13 +36,12 @@ static char sccsid[] = "@(#)from: subr.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/getty/subr.c,v 1.18 2002/02/06 16:38:40 imp Exp $"; + "$FreeBSD: src/libexec/getty/subr.c,v 1.19 2004/06/25 10:11:28 phk Exp $"; #endif /* not lint */ /* * Melbourne getty. */ -#define COMPAT_43 #ifdef DEBUG #include #endif @@ -60,9 +59,6 @@ #include "extern.h" -#ifdef COMPAT_43 -static void compatflags(long); -#endif /* * Get a table entry. @@ -260,28 +256,6 @@ { tcflag_t iflag, oflag, cflag, lflag; -#ifdef COMPAT_43 - switch (n) { - case 0: - if (F0set) { - compatflags(F0); - return; - } - break; - case 1: - if (F1set) { - compatflags(F1); - return; - } - break; - default: - if (F2set) { - compatflags(F2); - return; - } - break; - } -#endif switch (n) { case 0: @@ -437,130 +411,6 @@ tmode.c_lflag = lflag; } -#ifdef COMPAT_43 -/* - * Old TTY => termios, snatched from - */ -void -compatflags(long flags) -{ - tcflag_t iflag, oflag, cflag, lflag; - - iflag = BRKINT|ICRNL|IMAXBEL|IXON|IXANY; - oflag = OPOST|ONLCR|OXTABS; - cflag = CREAD; - lflag = ICANON|ISIG|IEXTEN; - - if (ISSET(flags, TANDEM)) - SET(iflag, IXOFF); - else - CLR(iflag, IXOFF); - if (ISSET(flags, ECHO)) - SET(lflag, ECHO); - else - CLR(lflag, ECHO); - if (ISSET(flags, CRMOD)) { - SET(iflag, ICRNL); - SET(oflag, ONLCR); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 26 16:43:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A6C416A4D0; Sat, 26 Jun 2004 16:43:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E66AB16A4CE for ; Sat, 26 Jun 2004 16:43:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE1DB43D4C for ; Sat, 26 Jun 2004 16:43:45 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5QGhgD1068571 for ; Sat, 26 Jun 2004 16:43:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5QGhgg7068568 for perforce@freebsd.org; Sat, 26 Jun 2004 16:43:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 26 Jun 2004 16:43:42 GMT Message-Id: <200406261643.i5QGhgg7068568@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 Subject: PERFORCE change 55844 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jun 2004 16:43:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=55844 Change 55844 by rwatson@rwatson_tislabs on 2004/06/26 16:43:39 Integrate netperf_socket: Slide UNIX domain socket lock before free of unpcb. TTY goop. USB goop. Netgraph cleanup -- no NULL messages passed in, use m_tags for state. Cleanup of SACK. Affected files ... .. //depot/projects/netperf_socket/sys/conf/files#31 integrate .. //depot/projects/netperf_socket/sys/conf/kern.post.mk#7 integrate .. //depot/projects/netperf_socket/sys/conf/options.powerpc#3 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_ar.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-raid.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/ofw_disk.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/rc/rc.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sab/sab.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/si/si.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/si/si.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/mixer.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sr/if_sr.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sx/sx.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sx/sx.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_tty.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehcireg.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubser.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ucom.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ucomvar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/udbp.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ugen.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhid.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb_subr.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdi_util.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/zs/zs.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/zs/zs_macio.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_subr.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/tty_pty.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#16 integrate .. //depot/projects/netperf_socket/sys/modules/ar/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/sr/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/net/if_sl.c#7 integrate .. //depot/projects/netperf_socket/sys/net/if_spppsubr.c#7 integrate .. //depot/projects/netperf_socket/sys/net/ppp_tty.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#6 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#7 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_UI.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_iface.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ksocket.c#9 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ksocket.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_lmi.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_parse.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_rfc1490.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_sppp.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_tty.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#14 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#12 integrate .. //depot/projects/netperf_socket/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/grackle.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/hrowpic.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/openpic_macio.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/nexus.c#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/psim/iobus.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/netperf_socket/sys/sys/linedisc.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/procfs.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/serial.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/tty.h#8 integrate .. //depot/projects/netperf_socket/sys/sys/ttycom.h#7 integrate Differences ... ==== //depot/projects/netperf_socket/sys/conf/files#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.909 2004/06/24 06:29:22 njl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.910 2004/06/26 05:58:43 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -43,17 +43,17 @@ miidevs.h standard \ dependency "$S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ - no-obj no-implicit-rule \ + no-obj no-implicit-rule before-depend \ clean "miidevs.h" pccarddevs.h standard \ dependency "$S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ compile-with "${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ - no-obj no-implicit-rule \ + no-obj no-implicit-rule before-depend \ clean "pccarddevs.h" usbdevs.h standard \ dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ - no-obj no-implicit-rule \ + no-obj no-implicit-rule before-depend \ clean "usbdevs.h" kern/device_if.m standard kern/bus_if.m standard ==== //depot/projects/netperf_socket/sys/conf/kern.post.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.66 2004/05/26 16:31:41 imp Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.67 2004/06/26 06:02:06 imp Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -77,8 +77,7 @@ ${SYSTEM_LD_TAIL} .if !exists(${.OBJDIR}/.depend) -${SYSTEM_OBJS}: assym.s pccarddevs.h usbdevs.h miidevs.h vnode_if.h \ - ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/} +${SYSTEM_OBJS}: assym.s vnode_if.h ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/} .endif LNFILES= ${CFILES:T:S/.c$/.ln/} @@ -136,7 +135,7 @@ # The argument list can be very long, so use make -V and xargs to # pass it to mkdep. -_kernel-depend: assym.s miidevs.h pccarddevs.h usbdevs.h vnode_if.h \ +_kernel-depend: assym.s vnode_if.h \ ${BEFORE_DEPEND} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} \ ${GEN_M_CFILES} ${SFILES} ${MFILES:T:S/.m$/.h/} if [ -f .olddep ]; then mv .olddep .depend; fi ==== //depot/projects/netperf_socket/sys/conf/options.powerpc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.powerpc,v 1.8 2004/01/21 05:20:58 grehan Exp $ +# $FreeBSD: src/sys/conf/options.powerpc,v 1.9 2004/06/25 13:44:34 grehan Exp $ # Options specific to the powerpc platform kernels OEA opt_global.h @@ -12,3 +12,5 @@ PSIM SC_OFWFB opt_ofwfb.h + +OFWCONS_POLL_HZ opt_ofw.h ==== //depot/projects/netperf_socket/sys/dev/ar/if_ar.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.63 2004/05/29 00:51:08 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.64 2004/06/25 19:22:04 julian Exp $"); /* * Programming assumptions and other issues. @@ -2228,10 +2228,9 @@ struct ar_softc * sc = NG_NODE_PRIVATE(NG_HOOK_NODE(hook)); struct ifqueue *xmitq_p; struct mbuf *m; - meta_p meta; + struct ng_tag_prio *ptag; NGI_GET_M(item, m); - NGI_GET_META(item, meta); NG_FREE_ITEM(item); /* * data doesn't come in from just anywhere (e.g control hook) @@ -2244,11 +2243,12 @@ /* * Now queue the data for when it can be sent */ - if (meta && meta->priority > 0) { + if ((ptag = (struct ng_tag_prio *)m_tag_locate(m, NGM_GENERIC_COOKIE, + NG_TAG_PRIO, NULL)) != NULL && (ptag->priority > NG_PRIO_CUTOFF) ) xmitq_p = (&sc->xmitq_hipri); - } else { + else xmitq_p = (&sc->xmitq); - } + s = splimp(); IF_LOCK(xmitq_p); if (_IF_QFULL(xmitq_p)) { @@ -2270,7 +2270,6 @@ * check if we need to free the mbuf, and then return the error */ NG_FREE_M(m); - NG_FREE_META(meta); return (error); } ==== //depot/projects/netperf_socket/sys/dev/ata/ata-raid.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.78 2004/02/18 21:36:51 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.79 2004/06/25 21:21:59 sos Exp $"); #include "opt_ata.h" #include @@ -67,6 +67,8 @@ static void ar_rebuild(void *); static int ar_highpoint_read_conf(struct ad_softc *, struct ar_softc **); static int ar_highpoint_write_conf(struct ar_softc *); +static int ar_lsi_read_conf(struct ad_softc *, struct ar_softc **); +static int ar_lsi_write_conf(struct ar_softc *); static int ar_promise_read_conf(struct ad_softc *, struct ar_softc **, int); static int ar_promise_write_conf(struct ar_softc *); static int ar_rw(struct ad_softc *, u_int32_t, int, caddr_t, int); @@ -121,6 +123,9 @@ case ATA_HIGHPOINT_ID: return (ar_highpoint_read_conf(adp, ar_table)); + case ATA_SILICON_IMAGE_ID: + return (ar_lsi_read_conf(adp, ar_table)); + default: return (ar_promise_read_conf(adp, ar_table, 1)); } @@ -325,6 +330,12 @@ AD_SOFTC(rdp->disks[disk])->total_secs; break; + case ATA_SILICON_IMAGE_ID: + ctlr |= AR_F_LSI_RAID; + rdp->disks[disk].disk_sectors = + AD_SOFTC(rdp->disks[disk])->total_secs - 4208; /* SOS */ + break; + default: ctlr |= AR_F_FREEBSD_RAID; /* FALLTHROUGH */ @@ -336,9 +347,12 @@ break; } - if (rdp->flags & (AR_F_PROMISE_RAID|AR_F_HIGHPOINT_RAID) && - (rdp->flags & (AR_F_PROMISE_RAID|AR_F_HIGHPOINT_RAID)) != - (ctlr & (AR_F_PROMISE_RAID|AR_F_HIGHPOINT_RAID))) { + if ((rdp->flags & + (AR_F_PROMISE_RAID | AR_F_LSI_RAID | AR_F_HIGHPOINT_RAID)) && + (rdp->flags & + (AR_F_PROMISE_RAID | AR_F_LSI_RAID | AR_F_HIGHPOINT_RAID)) != + (ctlr & + (AR_F_PROMISE_RAID | AR_F_LSI_RAID | AR_F_HIGHPOINT_RAID))) { free(rdp, M_AR); return EXDEV; } @@ -397,10 +411,12 @@ while (setup->interleave >>= 1) bit++; + if (rdp->flags & AR_F_HIGHPOINT_RAID) + rdp->interleave = min(max(32, 1 << bit), 128); + if (rdp->flags & AR_F_LSI_RAID) + rdp->interleave = min(max(2, 1 << bit), 4096); if (rdp->flags & AR_F_PROMISE_RAID) rdp->interleave = min(max(2, 1 << bit), 2048); - if (rdp->flags & AR_F_HIGHPOINT_RAID) - rdp->interleave = min(max(32, 1 << bit), 128); } rdp->total_disks = total_disks; rdp->width = total_disks / ((rdp->flags & AR_F_RAID1) ? 2 : 1); @@ -456,10 +472,14 @@ rdp->disks[disk].flags = 0; } } + + if (rdp->flags & AR_F_HIGHPOINT_RAID) + ar_highpoint_write_conf(rdp); + if (rdp->flags & AR_F_LSI_RAID) + ar_lsi_write_conf(rdp); if (rdp->flags & AR_F_PROMISE_RAID) ar_promise_write_conf(rdp); - else - ar_highpoint_write_conf(rdp); + disk_destroy(rdp->disk); free(rdp, M_AR); ar_table[array] = NULL; @@ -979,10 +999,12 @@ } } if (writeback) { + if (rdp->flags & AR_F_HIGHPOINT_RAID) + ar_highpoint_write_conf(rdp); + if (rdp->flags & AR_F_LSI_RAID) + ar_lsi_write_conf(rdp); if (rdp->flags & AR_F_PROMISE_RAID) ar_promise_write_conf(rdp); - if (rdp->flags & AR_F_HIGHPOINT_RAID) - ar_highpoint_write_conf(rdp); } } @@ -1134,7 +1156,7 @@ } } raid = raidp[array]; - if (raid->flags & AR_F_PROMISE_RAID) + if (raid->flags & (AR_F_PROMISE_RAID | AR_F_LSI_RAID)) continue; switch (info->type) { @@ -1197,6 +1219,8 @@ default: printf("ar%d: HighPoint unknown RAID type 0x%02x\n", array, info->type); + free(raidp[array], M_AR); + raidp[array] = NULL; goto highpoint_out; } @@ -1229,6 +1253,7 @@ retval = 1; break; } + highpoint_out: free(info, M_AR); return retval; @@ -1321,6 +1346,216 @@ } static int +ar_lsi_read_conf(struct ad_softc *adp, struct ar_softc **raidp) +{ + struct lsi_raid_conf *info; + struct ar_softc *raid = NULL; + int array, retval = 0; + + if (!(info = (struct lsi_raid_conf *) + malloc(sizeof(struct lsi_raid_conf), M_AR, M_NOWAIT | M_ZERO))) + return retval; + + if (ar_rw(adp, LSI_LBA(adp), sizeof(struct lsi_raid_conf), + (caddr_t)info, AR_READ | AR_WAIT)) { + if (1 || bootverbose) + printf("ar: LSI read conf failed\n"); + goto lsi_out; + } + + /* check if this is a LSI RAID struct */ + if (strncmp(info->lsi_id, LSI_MAGIC, strlen(LSI_MAGIC))) { + if (1 || bootverbose) + printf("ar: LSI check1 failed\n"); + goto lsi_out; + } + + /* now convert LSI config info into our generic form */ + for (array = 0; array < MAX_ARRAYS; array++) { + int raid_entry, conf_entry; + + if (!raidp[array + info->raid_number]) { + raidp[array + info->raid_number] = + (struct ar_softc*)malloc(sizeof(struct ar_softc), M_AR, + M_NOWAIT | M_ZERO); + if (!raidp[array + info->raid_number]) { + printf("ar%d: failed to allocate raid config storage\n", array); + goto lsi_out; + } + } + raid = raidp[array + info->raid_number]; + + if (raid->flags & (AR_F_PROMISE_RAID | AR_F_HIGHPOINT_RAID)) + continue; + + if (raid->magic_0 && + ((raid->magic_0 != info->timestamp) || + (raid->magic_1 != info->raid_number))) + continue; + + array += info->raid_number; + + raid_entry = info->raid_number; + conf_entry = (info->configs[raid_entry].raid.config_offset >> 4) + + info->disk_number - 1; + + switch (info->configs[raid_entry].raid.type) { + case LSI_R_RAID0: + raid->magic_0 = info->timestamp; + raid->magic_1 = info->raid_number; + raid->flags |= AR_F_RAID0; + raid->interleave = info->configs[raid_entry].raid.stripe_size; + raid->width = info->configs[raid_entry].raid.raid_width; + break; + + case LSI_R_RAID1: + raid->magic_0 = info->timestamp; + raid->magic_1 = info->raid_number; + raid->flags |= AR_F_RAID1; + raid->width = info->configs[raid_entry].raid.raid_width; + break; + + case LSI_R_RAID0 | LSI_R_RAID1: + raid->magic_0 = info->timestamp; + raid->magic_1 = info->raid_number; + raid->flags |= (AR_F_RAID0 | AR_F_RAID1); + raid->interleave = info->configs[raid_entry].raid.stripe_size; + raid->width = info->configs[raid_entry].raid.raid_width; + break; + + default: + printf("ar%d: LSI unknown RAID type 0x%02x\n", + array, info->configs[raid_entry].raid.type); + free(raidp[array], M_AR); + raidp[array] = NULL; + goto lsi_out; + } + + /* setup RAID specifics */ + raid->flags |= AR_F_LSI_RAID; + raid->generation = 0; + raid->total_disks = info->configs[raid_entry].raid.disk_count; + raid->heads = 255; + raid->sectors = 63; + raid->cylinders = info->configs[raid_entry].raid.total_sectors/(63*255); + raid->total_sectors = info->configs[raid_entry].raid.total_sectors; + raid->offset = 0; + raid->reserved = 1; + raid->lock_start = raid->lock_end = 0; + raid->lun = array; + + /* setup RAID specifics of this disk */ + if (info->configs[conf_entry].disk.device != LSI_D_NONE) { + raid->disks[info->disk_number].device = adp->device; + raid->disks[info->disk_number].disk_sectors = + info->configs[conf_entry].disk.disk_sectors; + raid->disks[info->disk_number].flags = + (AR_DF_ONLINE | AR_DF_PRESENT | AR_DF_ASSIGNED); + AD_SOFTC(raid->disks[info->disk_number])->flags |= + AD_F_RAID_SUBDISK; + retval = 1; + } + else + raid->disks[info->disk_number].flags &= ~AR_DF_ONLINE; + + return retval; + } + +lsi_out: + free(info, M_AR); + return retval; +} + +static int +ar_lsi_write_conf(struct ar_softc *rdp) +{ + struct lsi_raid_conf *config; + struct timeval timestamp; + int disk, disk_entry; + + microtime(×tamp); + rdp->magic_0 = timestamp.tv_sec & 0xffffffc0; + rdp->magic_1 = 0; + + for (disk = 0; disk < rdp->total_disks; disk++) { + if (!(config = (struct lsi_raid_conf *) + malloc(sizeof(struct lsi_raid_conf), M_AR, M_NOWAIT | M_ZERO))) { + printf("ar%d: LSI write conf failed\n", rdp->lun); + return -1; + } + + bcopy(LSI_MAGIC, config->lsi_id, strlen(LSI_MAGIC)); + config->dummy_1 = 0x10; + config->flags = 0x19; /* SOS X */ + config->version[0] = '2'; + config->version[1] = '0'; + config->config_entries = 2 + rdp->total_disks; + config->raid_count = 1; + config->total_disks = rdp->total_disks; + config->dummy_e = 0xfc; + config->disk_number = disk; + config->raid_number = 0; + config->timestamp = rdp->magic_0; + + switch (rdp->flags & (AR_F_RAID0 | AR_F_RAID1 | AR_F_SPAN)) { + case AR_F_RAID0: + config->configs[0].raid.type = LSI_R_RAID0; + break; + + case AR_F_RAID1: + config->configs[0].raid.type = LSI_R_RAID1; + break; + + case AR_F_RAID0 | AR_F_RAID1: + config->flags = 0x15; /* SOS X */ + config->configs[0].raid.type = (LSI_R_RAID0 | LSI_R_RAID1); + break; + + default: + return -1; + } + + config->configs[0].raid.dummy_1 = 0x10; + config->configs[0].raid.stripe_size = rdp->interleave; + config->configs[0].raid.raid_width = rdp->width; + config->configs[0].raid.disk_count = rdp->total_disks; + config->configs[0].raid.config_offset = 2 * 0x10; + config->configs[0].raid.total_sectors = rdp->total_sectors; + + for (disk_entry = 0; disk_entry < rdp->total_disks; disk_entry++) { + if (rdp->disks[disk_entry].flags & AR_DF_ONLINE) + config->configs[1 + disk_entry].disk.device = + (rdp->disks[disk_entry].device->channel->unit ? + LSI_D_CHANNEL1 : LSI_D_CHANNEL0) | + (rdp->disks[disk_entry].device->unit ? + LSI_D_SLAVE : LSI_D_MASTER); + else { + config->configs[1 + disk_entry].disk.device = LSI_D_NONE; + config->configs[1 + disk_entry].disk.flags = LSI_D_GONE; + } + config->configs[1 + disk_entry].disk.dummy_1 = 0x10; + config->configs[1 + disk_entry].disk.disk_sectors = + rdp->disks[disk_entry].disk_sectors; + config->configs[1 + disk_entry].disk.disk_number = disk_entry; + config->configs[1 + disk_entry].disk.raid_number = 0; + } + + if ((rdp->disks[disk].device && rdp->disks[disk].device->softc) && + !(rdp->disks[disk].device->flags & ATA_D_DETACHING)) { + + if (ar_rw(AD_SOFTC(rdp->disks[disk]), + LSI_LBA(AD_SOFTC(rdp->disks[disk])), + sizeof(struct lsi_raid_conf), + (caddr_t)config, AR_WRITE)) { + printf("ar%d: LSI write conf failed\n", rdp->lun); + return -1; + } + } + } + return 0; +} + +static int ar_promise_read_conf(struct ad_softc *adp, struct ar_softc **raidp, int local) { struct promise_raid_conf *info; @@ -1341,14 +1576,14 @@ /* check if this is a Promise RAID struct (or our local one) */ if (local) { - if (strncmp(info->promise_id, ATA_MAGIC, sizeof(ATA_MAGIC))) { + if (strncmp(info->promise_id, ATA_MAGIC, strlen(ATA_MAGIC))) { if (bootverbose) printf("ar: FreeBSD check1 failed\n"); goto promise_out; } } else { - if (strncmp(info->promise_id, PR_MAGIC, sizeof(PR_MAGIC))) { + if (strncmp(info->promise_id, PR_MAGIC, strlen(PR_MAGIC))) { if (bootverbose) printf("ar: Promise check1 failed\n"); goto promise_out; @@ -1382,7 +1617,7 @@ } } raid = raidp[array]; - if (raid->flags & AR_F_HIGHPOINT_RAID) + if (raid->flags & (AR_F_LSI_RAID | AR_F_HIGHPOINT_RAID)) continue; magic = (pci_get_device(device_get_parent( @@ -1428,6 +1663,8 @@ default: printf("ar%d: %s unknown RAID type 0x%02x\n", array, local ? "FreeBSD" : "Promise", info->raid.type); + free(raidp[array], M_AR); + raidp[array] = NULL; goto promise_out; } raid->interleave = 1 << info->raid.stripe_shift; ==== //depot/projects/netperf_socket/sys/dev/ata/ata-raid.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.26 2004/02/18 21:36:51 phk Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.27 2004/06/25 21:21:59 sos Exp $ */ /* misc defines */ @@ -55,17 +55,25 @@ int32_t magic_0; /* ident for this array */ int32_t magic_1; /* ident for this array */ int flags; -#define AR_F_RAID0 0x0001 /* STRIPE */ -#define AR_F_RAID1 0x0002 /* MIRROR */ -#define AR_F_SPAN 0x0004 /* SPAN */ -#define AR_F_READY 0x0100 -#define AR_F_DEGRADED 0x0200 -#define AR_F_REBUILDING 0x0400 -#define AR_F_PROMISE_RAID 0x1000 -#define AR_F_HIGHPOINT_RAID 0x2000 -#define AR_F_FREEBSD_RAID 0x4000 -#define AR_F_TOGGLE 0x8000 - +#define AR_F_SPAN 0x00000001 +#define AR_F_RAID0 0x00000002 +#define AR_F_RAID1 0x00000004 +#define AR_F_RAID3 0x00000008 +#define AR_F_RAID5 0x00000010 + +#define AR_F_READY 0x00000100 +#define AR_F_DEGRADED 0x00000200 +#define AR_F_REBUILDING 0x00000400 +#define AR_F_TOGGLE 0x00000800 + +#define AR_F_FREEBSD_RAID 0x00010000 +#define AR_F_PROMISE_RAID 0x00020000 +#define AR_F_HIGHPOINT_RAID 0x00040000 +#define AR_F_ADAPTEC_RAID 0x00080000 +#define AR_F_LSI_RAID 0x00100000 +#define AR_F_INTEL_RAID 0x00200000 +#define AR_F_QTEC_RAID 0x00400000 + int total_disks; /* number of disks in this array */ int generation; /* generation of this array */ struct ar_disk disks[MAX_DISKS+1]; /* ptr to each disk in array */ @@ -92,11 +100,12 @@ #define AB_F_DONE 0x01 }; + #define HPT_LBA 9 struct highpoint_raid_conf { int8_t filler1[32]; - u_int32_t magic; /* 0x20 */ + u_int32_t magic; #define HPT_MAGIC_OK 0x5a7816f0 #define HPT_MAGIC_BAD 0x5a7816fd @@ -148,6 +157,66 @@ } __packed; +#define LSI_LBA(adp) (adp->total_secs - 1) + +struct lsi_raid_conf { + u_int8_t lsi_id[6]; +#define LSI_MAGIC "$XIDE$" + + u_int8_t dummy_1; + u_int8_t flags; + u_int8_t version[2]; + u_int8_t config_entries; + u_int8_t raid_count; + u_int8_t total_disks; + u_int8_t dummy_d; + u_int8_t dummy_e; + u_int8_t dummy_f; + + union { + struct { + u_int8_t type; +#define LSI_R_RAID0 0x01 +#define LSI_R_RAID1 0x02 +#define LSI_R_SPARE 0x08 + + u_int8_t dummy_1; + u_int16_t stripe_size; + u_int8_t raid_width; + u_int8_t disk_count; + u_int8_t config_offset; + u_int8_t dummy_7; + u_int8_t flags; +#define LSI_R_DEGRADED 0x02 + + u_int32_t total_sectors; + u_int8_t filler[3]; + } __packed raid; + struct { + u_int8_t device; +#define LSI_D_MASTER 0x00 +#define LSI_D_SLAVE 0x01 +#define LSI_D_CHANNEL0 0x00 +#define LSI_D_CHANNEL1 0x10 +#define LSI_D_NONE 0xff + + u_int8_t dummy_1; + u_int32_t disk_sectors; + u_int8_t disk_number; + u_int8_t raid_number; + u_int8_t flags; +#define LSI_D_GONE 0x02 + + u_int8_t filler[7]; + } __packed disk; + } configs[30]; + u_int8_t disk_number; + u_int8_t raid_number; + u_int32_t timestamp; + u_int8_t filler[10]; +} __packed; + + #define PR_LBA(adp) \ (((adp->total_secs / (adp->heads * adp->sectors)) * \ adp->heads * adp->sectors) - adp->sectors) @@ -164,7 +233,7 @@ u_int32_t magic_2; u_int8_t filler1[470]; struct { - u_int32_t integrity; /* 0x200 */ + u_int32_t integrity; #define PR_I_VALID 0x00000080 u_int8_t flags; @@ -181,7 +250,7 @@ u_int8_t channel; u_int8_t device; u_int64_t magic_0 __packed; - u_int32_t disk_offset; /* 0x210 */ + u_int32_t disk_offset; u_int32_t disk_sectors; u_int32_t rebuild_lba; u_int16_t generation; @@ -201,7 +270,7 @@ #define PR_T_RAID5 0x04 #define PR_T_SPAN 0x08 - u_int8_t total_disks; /* 0x220 */ + u_int8_t total_disks; u_int8_t stripe_shift; u_int8_t array_width; u_int8_t array_number; @@ -210,7 +279,7 @@ u_int8_t heads; u_int8_t sectors; int64_t magic_1 __packed; - struct { /* 0x240 */ + struct { u_int8_t flags; u_int8_t dummy_0; u_int8_t channel; ==== //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#6 (text+ko) ==== @@ -22,7 +22,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.8 2004/06/23 18:13:09 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.9 2004/06/25 19:22:03 julian Exp $"); #include @@ -2261,7 +2261,7 @@ { drv_t *d = NG_NODE_PRIVATE (NG_HOOK_NODE(hook)); struct mbuf *m; - meta_p meta; + struct ng_tag_prio *ptag; #else static int ng_cp_rcvdata (hook_p hook, struct mbuf *m, meta_p meta) { @@ -2273,18 +2273,23 @@ CP_DEBUG2 (d, ("Rcvdata\n")); #if __FreeBSD_version >= 500000 NGI_GET_M (item, m); - NGI_GET_META (item, meta); NG_FREE_ITEM (item); if (! NG_HOOK_PRIVATE (hook) || ! d) { NG_FREE_M (m); - NG_FREE_META (meta); #else if (! hook->private || ! d) { NG_FREE_DATA (m,meta); #endif return ENETDOWN; } - q = (meta && meta->priority > 0) ? &d->hi_queue : &d->queue; + + /* Check for high priority data */ + if ((ptag = (struct ng_tag_prio *)m_tag_locate(m, NGM_GENERIC_COOKIE, + NG_TAG_PRIO, NULL)) != NULL && (ptag->priority > NG_PRIO_CUTOFF) ) + q = &d->hi_queue; + else + q = &d->queue; + s = splimp (); #if __FreeBSD_version >= 500000 IF_LOCK (q); @@ -2293,7 +2298,6 @@ IF_UNLOCK (q); splx (s); NG_FREE_M (m); - NG_FREE_META (meta); return ENOBUFS; } _IF_ENQUEUE (q, m); ==== //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#7 (text+ko) ==== @@ -22,7 +22,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.10 2004/06/23 18:13:10 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.11 2004/06/25 19:22:04 julian Exp $"); #include @@ -2187,7 +2187,7 @@ { drv_t *d = NG_NODE_PRIVATE (NG_HOOK_NODE(hook)); struct mbuf *m; - meta_p meta; + struct ng_tag_prio *ptag; #else static int ng_ct_rcvdata (hook_p hook, struct mbuf *m, meta_p meta) { @@ -2201,18 +2201,23 @@ #if __FreeBSD_version >= 500000 NGI_GET_M (item, m); - NGI_GET_META (item, meta); NG_FREE_ITEM (item); if (! NG_HOOK_PRIVATE (hook) || ! d) { NG_FREE_M (m); - NG_FREE_META (meta); #else if (! hook->private || ! d) { NG_FREE_DATA (m,meta); #endif return ENETDOWN; } - q = (meta && meta->priority > 0) ? &d->hi_queue : &d->queue; + + /* Check for high priority data */ + if ((ptag = (struct ng_tag_prio *)m_tag_locate(m, NGM_GENERIC_COOKIE, + NG_TAG_PRIO, NULL)) != NULL && (ptag->priority > NG_PRIO_CUTOFF) ) + q = &d->hi_queue; + else + q = &d->queue; + s = splimp (); #if __FreeBSD_version >= 500000 IF_LOCK (q); @@ -2221,7 +2226,6 @@ IF_UNLOCK (q); splx (s); NG_FREE_M (m); - NG_FREE_META (meta); return ENOBUFS; } _IF_ENQUEUE (q, m); ==== //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.23 2004/06/23 18:13:10 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.24 2004/06/25 19:22:04 julian Exp $"); #include @@ -2705,7 +2705,7 @@ { drv_t *d = NG_NODE_PRIVATE (NG_HOOK_NODE(hook)); struct mbuf *m; - meta_p meta; + struct ng_tag_prio *ptag; #else static int ng_cx_rcvdata (hook_p hook, struct mbuf *m, meta_p meta) { @@ -2716,18 +2716,23 @@ #if __FreeBSD_version >= 500000 NGI_GET_M (item, m); - NGI_GET_META (item, meta); NG_FREE_ITEM (item); if (! NG_HOOK_PRIVATE (hook) || ! d) { NG_FREE_M (m); - NG_FREE_META (meta); #else if (! hook->private || ! d) { NG_FREE_DATA (m,meta); #endif return ENETDOWN; } - q = (meta && meta->priority > 0) ? &d->hi_queue : &d->lo_queue; + + /* Check for high priority data */ + if ((ptag = (struct ng_tag_prio *)m_tag_locate(m, NGM_GENERIC_COOKIE, + NG_TAG_PRIO, NULL)) != NULL && (ptag->priority > NG_PRIO_CUTOFF) ) + q = &d->hi_queue; + else + q = &d->lo_queue; + s = splhigh (); #if __FreeBSD_version >= 500000 IF_LOCK (q); @@ -2736,7 +2741,6 @@ IF_UNLOCK (q); splx (s); NG_FREE_M (m); - NG_FREE_META (meta); return ENOBUFS; } _IF_ENQUEUE (q, m); ==== //depot/projects/netperf_socket/sys/dev/cy/cy.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.155 2004/06/22 20:32:16 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cy/cy.c,v 1.156 2004/06/26 09:20:05 phk Exp $"); #include "opt_compat.h" @@ -271,7 +271,6 @@ u_char last_modem_status; /* last MSR read by intr handler */ u_char prev_modem_status; /* last MSR handled by high level */ - u_char hotchar; /* ldisc-specific char to be handled ASAP */ u_char *ibuf; /* start of input buffer */ u_char *ibufend; /* end of input buffer */ u_char *ibufold; /* old input buffer, to be freed */ @@ -1111,7 +1110,7 @@ recv_data = cd_inb(iobase, CD1400_RDSR, cy_align); #ifndef SOFT_HOTCHAR if (line_status & CD1400_RDSR_SPECIAL - && com->hotchar != 0) + && com->tp->t_hotchar != 0) swi_sched(sio_fast_ih, 0); #endif @@ -1139,7 +1138,7 @@ #endif /* 1 */ ++com->bytes_in; #ifdef SOFT_HOTCHAR - if (com->hotchar != 0 && recv_data == com->hotchar) + if (com->tp->t_hotchar != 0 && recv_data == com->tp->t_hotchar) swi_sched(sio_fast_ih, 0); #endif ioptr = com->iptr; @@ -1187,9 +1186,9 @@ CD1400_RDSR, cy_align); #ifdef SOFT_HOTCHAR - if (com->hotchar != 0 + if (com->tp->t_hotchar != 0 && recv_data - == com->hotchar) + == com->tp->t_hotchar) swi_sched(sio_fast_ih, 0); #endif @@ -1204,8 +1203,8 @@ recv_data = cd_inb(iobase, CD1400_RDSR, cy_align); #ifdef SOFT_HOTCHAR - if (com->hotchar != 0 - && recv_data == com->hotchar) + if (com->tp->t_hotchar != 0 + && recv_data == com->tp->t_hotchar) swi_sched(sio_fast_ih, 0); #endif } while (--count != 0); @@ -1229,8 +1228,8 @@ recv_data = cd_inb(iobase, CD1400_RDSR, cy_align); #ifdef SOFT_HOTCHAR - if (com->hotchar != 0 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 26 20:35:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D82716A4D0; Sat, 26 Jun 2004 20:35:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2734416A4CE for ; Sat, 26 Jun 2004 20:35:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19B8943D48 for ; Sat, 26 Jun 2004 20:35:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5QKZRjj074913 for ; Sat, 26 Jun 2004 20:35:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5QKZRa6074910 for perforce@freebsd.org; Sat, 26 Jun 2004 20:35:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 26 Jun 2004 20:35:27 GMT Message-Id: <200406262035.i5QKZRa6074910@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 Subject: PERFORCE change 55858 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jun 2004 20:35:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=55858 Change 55858 by rwatson@rwatson_tislabs on 2004/06/26 20:35:25 Integrate netperf_socket: - Loop back soabort() comment from rwatson_netperf following CVS merge. - Loop back lock coallescing between sbappend/sowakeup and in related situations. - Loop back spl removal from tcp usrreq. Affected files ... .. //depot/projects/netperf_socket/sys/conf/NOTES#23 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#14 integrate .. //depot/projects/netperf_socket/sys/kern/imgact_elf.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/kern_fork.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/kern_kse.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thr.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#25 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#21 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#17 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_divert.c#9 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#8 integrate .. //depot/projects/netperf_socket/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#15 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_usrreq.c#10 integrate .. //depot/projects/netperf_socket/sys/netinet/udp_usrreq.c#8 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#14 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.h#5 integrate Differences ... ==== //depot/projects/netperf_socket/sys/conf/NOTES#23 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1233 2004/06/22 22:02:57 bms Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1234 2004/06/26 17:19:44 mpp Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -95,7 +95,7 @@ # # BLKDEV_IOSIZE sets the default block size used in user block -# device I/O. Note that this value will be overriden by the label +# device I/O. Note that this value will be overridden by the label # when specifying a block device from a label with a non-0 # partition blocksize. The default is PAGE_SIZE. # @@ -184,7 +184,7 @@ # WITNESS enables the witness code which detects deadlocks and cycles # during locking operations. # WITNESS_DDB causes the witness code to drop into the kernel debugger if -# a lock heirarchy violation occurs or if locks are held when going to +# a lock hierarchy violation occurs or if locks are held when going to # sleep. # WITNESS_SKIPSPIN disables the witness checks on spin mutexes. options MUTEX_DEBUG @@ -328,7 +328,7 @@ # # REGRESSION causes optional kernel interfaces necessary only for regression -# testing to be enabled. These interfaces may consitute security risks +# testing to be enabled. These interfaces may constitute security risks # when enabled, as they permit processes to easily modify aspects of the # run-time environment to reproduce unlikely or unusual (possibly normally # impossible) scenarios. @@ -408,7 +408,7 @@ options ALTQ_RIO # RED In/Out options ALTQ_HFSC # Hierarchical Packet Scheduler options ALTQ_CDNR # Traffic conditioner -options ALTQ_PRIQ # Prioirity Queueing +options ALTQ_PRIQ # Priority Queueing options ALTQ_NOPCC # Required for SMP build options ALTQ_DEBUG @@ -589,7 +589,7 @@ # packets without touching the ttl). This can be useful to hide firewalls # from traceroute and similar tools. # -# PFIL_HOOKS enables an abtraction layer which is meant to be used in +# PFIL_HOOKS enables an abstraction layer which is meant to be used in # network code where filtering is required. See pfil(9). This option is # required by the IPFILTER option and the PF device. # @@ -657,7 +657,7 @@ options BRIDGE # Zero copy sockets support. This enables "zero copy" for sending and -# receving data via a socket. The send side works for any type of NIC, +# receiving data via a socket. The send side works for any type of NIC, # the receive side only works for NICs that support MTUs greater than the # page size of your architecture and that support header splitting. See # zero_copy(9) for more details. @@ -932,8 +932,8 @@ # # The cd driver drives SCSI Read Only Direct Access ("cd") devices. # -# The ses driver drives SCSI Envinronment Services ("ses") and -# SAF-TE ("SCSI Accessable Fault-Tolerant Enclosure") devices. +# The ses driver drives SCSI Environment Services ("ses") and +# SAF-TE ("SCSI Accessible Fault-Tolerant Enclosure") devices. # # The pt driver drives SCSI Processor devices. # @@ -1554,7 +1554,7 @@ # # MII bus support is required for some PCI 10/100 ethernet NICs, # namely those which use MII-compliant transceivers or implement -# tranceiver control interfaces that operate like an MII. Adding +# transceiver control interfaces that operate like an MII. Adding # "device miibus0" to the kernel config pulls in support for # the generic miibus API and all of the PHY drivers, including a # generic one for PHYs that aren't specifically handled by an @@ -1644,7 +1644,7 @@ # Compaq Netelligent 10/100 cards and the built-in ethernet controllers # in several Compaq Prosignia, Proliant and Deskpro systems. It also # supports several Olicom 10Mbps and 10/100 boards. -# tx: SMC 9432 TX, BTX and FTX cards. (SMC EtherPower II serie) +# tx: SMC 9432 TX, BTX and FTX cards. (SMC EtherPower II series) # txp: Support for 3Com 3cR990 cards with the "Typhoon" chipset # vr: Support for various fast ethernet adapters based on the VIA # Technologies VT3043 `Rhine I' and VT86C100A `Rhine II' chips, @@ -1800,7 +1800,7 @@ # Gravis UltraSound ISA PnP/non-PnP # Crystal Semiconductor CS461x/428x PCI # Neomagic 256AV (ac97) -# Most of the more common ISA/PnP sb/mss/ess compatable cards. +# Most of the more common ISA/PnP sb/mss/ess compatible cards. device pcm @@ -1919,7 +1919,7 @@ # options BROOKTREE_SYSTEM_DEFAULT=BROOKTREE_PAL # or # options BROOKTREE_SYSTEM_DEFAULT=BROOKTREE_NTSC -# Specifes the default video capture mode. +# Specifies the default video capture mode. # This is required for Dual Crystal (28&35Mhz) boards where PAL is used # to prevent hangs during initialisation. eg VideoLogic Captivator PCI. # @@ -2224,12 +2224,12 @@ makeoptions UKBD_DFLT_KEYMAP=it.iso # options for uplcom: -options UPLCOM_INTR_INTERVAL=100 # interrpt pipe interval +options UPLCOM_INTR_INTERVAL=100 # interrupt pipe interval # in milliseconds # options for uvscom: options UVSCOM_DEFAULT_OPKTSIZE=8 # default output packet size -options UVSCOM_INTR_INTERVAL=100 # interrpt pipe interval +options UVSCOM_INTR_INTERVAL=100 # interrupt pipe interval # in milliseconds ##################################################################### ==== //depot/projects/netperf_socket/sys/i386/i386/pmap.c#14 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.477 2004/06/22 19:35:43 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.478 2004/06/26 19:10:12 alc Exp $"); /* * Manages physical address maps. @@ -878,12 +878,14 @@ vm_page_hold(m); } } else { + sched_pin(); pte = *pmap_pte_quick(pmap, va); if (pte != 0 && ((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) { m = PHYS_TO_VM_PAGE(pte & PG_FRAME); vm_page_hold(m); } + sched_unpin(); } } vm_page_unlock_queues(); ==== //depot/projects/netperf_socket/sys/kern/imgact_elf.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.151 2004/06/05 02:18:28 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.152 2004/06/26 18:58:22 marcel Exp $"); #include #include @@ -910,10 +910,10 @@ static void cb_put_phdr(vm_map_entry_t, void *); static void cb_size_segment(vm_map_entry_t, void *); -static void each_writable_segment(struct proc *, segment_callback, void *); +static void each_writable_segment(struct thread *, segment_callback, void *); static int __elfN(corehdr)(struct thread *, struct vnode *, struct ucred *, int, void *, size_t); -static void __elfN(puthdr)(struct proc *, void *, size_t *, int); +static void __elfN(puthdr)(struct thread *, void *, size_t *, int); static void __elfN(putnote)(void *, size_t *, const char *, int, const void *, size_t); @@ -922,11 +922,10 @@ int __elfN(coredump)(td, vp, limit) struct thread *td; - register struct vnode *vp; + struct vnode *vp; off_t limit; { - register struct proc *p = td->td_proc; - register struct ucred *cred = td->td_ucred; + struct ucred *cred = td->td_ucred; int error = 0; struct sseg_closure seginfo; void *hdr; @@ -935,7 +934,7 @@ /* Size the program segments. */ seginfo.count = 0; seginfo.size = 0; - each_writable_segment(p, cb_size_segment, &seginfo); + each_writable_segment(td, cb_size_segment, &seginfo); /* * Calculate the size of the core file header area by making @@ -943,7 +942,7 @@ * size is calculated. */ hdrsize = 0; - __elfN(puthdr)(p, (void *)NULL, &hdrsize, seginfo.count); + __elfN(puthdr)(td, (void *)NULL, &hdrsize, seginfo.count); if (hdrsize + seginfo.size >= limit) return (EFAULT); @@ -1036,11 +1035,12 @@ * caller-supplied data. */ static void -each_writable_segment(p, func, closure) - struct proc *p; +each_writable_segment(td, func, closure) + struct thread *td; segment_callback func; void *closure; { + struct proc *p = td->td_proc; vm_map_t map = &p->p_vmspace->vm_map; vm_map_entry_t entry; @@ -1103,13 +1103,12 @@ size_t hdrsize; void *hdr; { - struct proc *p = td->td_proc; size_t off; /* Fill in the header. */ bzero(hdr, hdrsize); off = 0; - __elfN(puthdr)(p, hdr, &off, numsegs); + __elfN(puthdr)(td, hdr, &off, numsegs); /* Write it to the core file. */ return (vn_rdwr_inchunks(UIO_WRITE, vp, hdr, hdrsize, (off_t)0, @@ -1118,7 +1117,7 @@ } static void -__elfN(puthdr)(struct proc *p, void *dst, size_t *off, int numsegs) +__elfN(puthdr)(struct thread *td, void *dst, size_t *off, int numsegs) { struct { prstatus_t status; @@ -1128,9 +1127,12 @@ prstatus_t *status; prfpregset_t *fpregset; prpsinfo_t *psinfo; - struct thread *first, *thr; + struct proc *p; + struct thread *thr; size_t ehoff, noteoff, notesz, phoff; + p = td->td_proc; + ehoff = *off; *off += sizeof(Elf_Ehdr); @@ -1169,22 +1171,16 @@ sizeof *psinfo); /* - * We want to start with the registers of the initial thread in the - * process so that the .reg and .reg2 pseudo-sections created by bfd - * will be identical to the .reg/$PID and .reg2/$PID pseudo-sections. - * This makes sure that any tool that only looks for .reg and .reg2 - * and not for .reg/$PID and .reg2/$PID will behave the same as - * before. The first thread is the thread with an ID equal to the - * process' ID. - * Note that the initial thread may already be gone. In that case - * 'first' is NULL. + * For backward compatibility, we dump the registers of the current + * thread (as passed to us in td) first and set pr_pid to the PID of + * the process. We then dump the other threads, but with pr_pid set + * to the TID of the thread itself. This has two advantages: + * 1) We preserve the meaning of pr_pid for as much as is possible. + * 2) The debugger will select the current thread as its initial + * "thread", which is likely what we want. */ - thr = first = TAILQ_FIRST(&p->p_threads); - while (first != NULL && first->td_tid > PID_MAX) - first = TAILQ_NEXT(first, td_plist); - if (first != NULL) - thr = first; - do { + thr = td; + while (thr != NULL) { if (dst != NULL) { status->pr_version = PRSTATUS_VERSION; status->pr_statussz = sizeof(prstatus_t); @@ -1192,7 +1188,7 @@ status->pr_fpregsetsz = sizeof(fpregset_t); status->pr_osreldate = osreldate; status->pr_cursig = p->p_sig; - status->pr_pid = thr->td_tid; + status->pr_pid = (thr == td) ? p->p_pid : thr->td_tid; fill_regs(thr, &status->pr_reg); fill_fpregs(thr, fpregset); } @@ -1200,12 +1196,14 @@ sizeof *status); __elfN(putnote)(dst, off, "FreeBSD", NT_FPREGSET, fpregset, sizeof *fpregset); + /* XXX allow for MD specific notes. */ - thr = (thr == first) ? TAILQ_FIRST(&p->p_threads) : + + thr = (thr == td) ? TAILQ_FIRST(&p->p_threads) : TAILQ_NEXT(thr, td_plist); - if (thr == first && thr != NULL) + if (thr == td) thr = TAILQ_NEXT(thr, td_plist); - } while (thr != NULL); + } notesz = *off - noteoff; @@ -1266,7 +1264,7 @@ /* All the writable segments from the program. */ phc.phdr = phdr; phc.offset = *off; - each_writable_segment(p, cb_put_phdr, &phc); + each_writable_segment(td, cb_put_phdr, &phc); } } ==== //depot/projects/netperf_socket/sys/kern/kern_fork.c#11 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.226 2004/04/05 21:03:34 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.227 2004/06/26 18:58:22 marcel Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -493,7 +493,6 @@ (unsigned) RANGEOF(struct ksegrp, kg_startcopy, kg_endcopy)); #undef RANGEOF - td2->td_tid = p2->p_pid; td2->td_sigstk = td->td_sigstk; /* Set up the thread as an active thread (as if runnable). */ ==== //depot/projects/netperf_socket/sys/kern/kern_kse.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.181 2004/06/11 17:48:20 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_kse.c,v 1.182 2004/06/26 18:58:22 marcel Exp $"); #include #include @@ -872,10 +872,8 @@ if (td->td_standin) return; - if (spare == NULL) { + if (spare == NULL) spare = thread_alloc(); - spare->td_tid = thread_new_tid(); - } td->td_standin = spare; bzero(&spare->td_startzero, (unsigned)RANGEOF(struct thread, td_startzero, td_endzero)); ==== //depot/projects/netperf_socket/sys/kern/kern_thr.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thr.c,v 1.19 2004/04/19 14:20:01 mtm Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thr.c,v 1.20 2004/06/26 18:58:22 marcel Exp $"); #include #include @@ -130,7 +130,6 @@ /* Initialize our td. */ td0 = thread_alloc(); - td0->td_tid = thread_new_tid(); /* * Try the copyout as soon as we allocate the td so we don't have to ==== //depot/projects/netperf_socket/sys/kern/kern_thread.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.184 2004/06/21 20:44:02 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.185 2004/06/26 18:58:22 marcel Exp $"); #include #include @@ -149,7 +149,6 @@ struct thread *td; td = (struct thread *)mem; - td->td_tid = 0; td->td_state = TDS_INACTIVE; td->td_oncpu = NOCPU; @@ -175,28 +174,9 @@ thread_dtor(void *mem, int size, void *arg) { struct thread *td; - struct tid_bitmap_part *bmp; - lwpid_t tid; - int bit, idx; td = (struct thread *)mem; - if (td->td_tid > PID_MAX) { - STAILQ_FOREACH(bmp, &tid_bitmap, bmp_next) { - if (td->td_tid >= bmp->bmp_base && - td->td_tid < bmp->bmp_base + TID_IDS_PER_PART) - break; - } - KASSERT(bmp != NULL, ("No TID bitmap?")); - mtx_lock(&tid_lock); - tid = td->td_tid - bmp->bmp_base; - idx = tid / TID_IDS_PER_IDX; - bit = 1UL << (tid % TID_IDS_PER_IDX); - bmp->bmp_bitmap[idx] |= bit; - bmp->bmp_free++; - mtx_unlock(&tid_lock); - } - #ifdef INVARIANTS /* Verify that this thread is in a safe state to free. */ switch (td->td_state) { @@ -225,9 +205,47 @@ static void thread_init(void *mem, int size) { - struct thread *td; + struct thread *td; + struct tid_bitmap_part *bmp, *new; + int bit, idx; td = (struct thread *)mem; + + mtx_lock(&tid_lock); + STAILQ_FOREACH(bmp, &tid_bitmap, bmp_next) { + if (bmp->bmp_free) + break; + } + /* Create a new bitmap if we run out of free bits. */ + if (bmp == NULL) { + mtx_unlock(&tid_lock); + new = uma_zalloc(tid_zone, M_WAITOK); + mtx_lock(&tid_lock); + bmp = STAILQ_LAST(&tid_bitmap, tid_bitmap_part, bmp_next); + if (bmp == NULL || bmp->bmp_free < TID_IDS_PER_PART/2) { + /* 1=free, 0=assigned. This way we can use ffsl(). */ + memset(new->bmp_bitmap, ~0U, sizeof(new->bmp_bitmap)); + new->bmp_base = (bmp == NULL) ? TID_MIN : + bmp->bmp_base + TID_IDS_PER_PART; + new->bmp_free = TID_IDS_PER_PART; + STAILQ_INSERT_TAIL(&tid_bitmap, new, bmp_next); + bmp = new; + new = NULL; + } + } else + new = NULL; + /* We have a bitmap with available IDs. */ + idx = 0; + while (idx < TID_BITMAP_SIZE && bmp->bmp_bitmap[idx] == 0UL) + idx++; + bit = ffsl(bmp->bmp_bitmap[idx]) - 1; + td->td_tid = bmp->bmp_base + idx * TID_IDS_PER_IDX + bit; + bmp->bmp_bitmap[idx] &= ~(1UL << bit); + bmp->bmp_free--; + mtx_unlock(&tid_lock); + if (new != NULL) + uma_zfree(tid_zone, new); + vm_thread_new(td, 0); cpu_thread_setup(td); td->td_sleepqueue = sleepq_alloc(); @@ -241,12 +259,29 @@ static void thread_fini(void *mem, int size) { - struct thread *td; + struct thread *td; + struct tid_bitmap_part *bmp; + lwpid_t tid; + int bit, idx; td = (struct thread *)mem; turnstile_free(td->td_turnstile); sleepq_free(td->td_sleepqueue); vm_thread_dispose(td); + + STAILQ_FOREACH(bmp, &tid_bitmap, bmp_next) { + if (td->td_tid >= bmp->bmp_base && + td->td_tid < bmp->bmp_base + TID_IDS_PER_PART) + break; + } + KASSERT(bmp != NULL, ("No TID bitmap?")); + mtx_lock(&tid_lock); + tid = td->td_tid - bmp->bmp_base; + idx = tid / TID_IDS_PER_IDX; + bit = 1UL << (tid % TID_IDS_PER_IDX); + bmp->bmp_bitmap[idx] |= bit; + bmp->bmp_free++; + mtx_unlock(&tid_lock); } /* @@ -536,55 +571,6 @@ } /* - * Assign a thread ID. - */ -lwpid_t -thread_new_tid(void) -{ - struct tid_bitmap_part *bmp, *new; - lwpid_t tid; - int bit, idx; - - mtx_lock(&tid_lock); - STAILQ_FOREACH(bmp, &tid_bitmap, bmp_next) { - if (bmp->bmp_free) - break; - } - /* Create a new bitmap if we run out of free bits. */ - if (bmp == NULL) { - mtx_unlock(&tid_lock); - new = uma_zalloc(tid_zone, M_WAITOK); - mtx_lock(&tid_lock); - bmp = STAILQ_LAST(&tid_bitmap, tid_bitmap_part, bmp_next); - if (bmp == NULL || bmp->bmp_free < TID_IDS_PER_PART/2) { - /* 1=free, 0=assigned. This way we can use ffsl(). */ - memset(new->bmp_bitmap, ~0U, sizeof(new->bmp_bitmap)); - new->bmp_base = (bmp == NULL) ? TID_MIN : - bmp->bmp_base + TID_IDS_PER_PART; - new->bmp_free = TID_IDS_PER_PART; - STAILQ_INSERT_TAIL(&tid_bitmap, new, bmp_next); - bmp = new; - new = NULL; - } - } else - new = NULL; - /* We have a bitmap with available IDs. */ - idx = 0; - while (idx < TID_BITMAP_SIZE && bmp->bmp_bitmap[idx] == 0UL) - idx++; - bit = ffsl(bmp->bmp_bitmap[idx]) - 1; - tid = bmp->bmp_base + idx * TID_IDS_PER_IDX + bit; - bmp->bmp_bitmap[idx] &= ~(1UL << bit); - bmp->bmp_free--; - mtx_unlock(&tid_lock); - - if (new != NULL) - uma_zfree(tid_zone, new); - return (tid); -} - - -/* * Discard the current thread and exit from its context. * Always called with scheduler locked. * ==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#25 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.189 2004/06/24 04:28:30 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.190 2004/06/26 17:12:29 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -432,7 +432,10 @@ } /* - * Must be called at splnet... + * soabort() must not be called with any socket locks held, as it calls + * into the protocol, which will call back into the socket code causing + * it to acquire additional socket locks that may cause recursion or lock + * order reversals. */ int soabort(so) ==== //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#21 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.135 2004/06/24 01:37:03 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.136 2004/06/26 19:10:38 rwatson Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -171,13 +171,11 @@ SOCK_UNLOCK(so); SOCKBUF_LOCK(&so->so_rcv); so->so_rcv.sb_state |= SBS_CANTRCVMORE; - SOCKBUF_UNLOCK(&so->so_rcv); + sorwakeup_locked(so); SOCKBUF_LOCK(&so->so_snd); so->so_snd.sb_state |= SBS_CANTSENDMORE; - SOCKBUF_UNLOCK(&so->so_snd); + sowwakeup_locked(so); wakeup(&so->so_timeo); - sowwakeup(so); - sorwakeup(so); } void @@ -190,20 +188,19 @@ * SOCKBUF_LOCK(&so->so_rcv) even though they are the same mutex to * avoid introducing the assumption that they are the same. */ + /* XXXRW: so_state locking? */ SOCK_LOCK(so); so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING); so->so_state |= SS_ISDISCONNECTED; SOCK_UNLOCK(so); SOCKBUF_LOCK(&so->so_rcv); so->so_rcv.sb_state |= SBS_CANTRCVMORE; - SOCKBUF_UNLOCK(&so->so_rcv); + sorwakeup_locked(so); SOCKBUF_LOCK(&so->so_snd); so->so_snd.sb_state |= SBS_CANTSENDMORE; sbdrop_locked(&so->so_snd, so->so_snd.sb_cc); - SOCKBUF_UNLOCK(&so->so_snd); + sowwakeup_locked(so); wakeup(&so->so_timeo); - sowwakeup(so); - sorwakeup(so); } /* ==== //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#17 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.130 2004/06/25 20:12:06 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.131 2004/06/26 19:10:38 rwatson Exp $"); #include "opt_mac.h" @@ -302,8 +302,7 @@ newhiwat, RLIM_INFINITY); unp->unp_cc = so->so_rcv.sb_cc; SOCKBUF_UNLOCK(&so->so_rcv); - SOCKBUF_UNLOCK(&so2->so_snd); - sowwakeup(so2); + sowwakeup_locked(so2); break; default: @@ -371,8 +370,7 @@ from = &sun_noname; SOCKBUF_LOCK(&so2->so_rcv); if (sbappendaddr_locked(&so2->so_rcv, from, m, control)) { - SOCKBUF_UNLOCK(&so2->so_rcv); - sorwakeup(so2); + sorwakeup_locked(so2); m = NULL; control = NULL; } else { @@ -431,8 +429,7 @@ (void)chgsbsize(so->so_cred->cr_uidinfo, &so->so_snd.sb_hiwat, newhiwat, RLIM_INFINITY); unp->unp_conn->unp_cc = so2->so_rcv.sb_cc; - SOCKBUF_UNLOCK(&so2->so_rcv); - sorwakeup(so2); + sorwakeup_locked(so2); m = NULL; break; ==== //depot/projects/netperf_socket/sys/netinet/ip_divert.c#9 (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/netinet/ip_divert.c,v 1.92 2004/06/22 04:00:51 rwatson Exp $ + * $FreeBSD: src/sys/netinet/ip_divert.c,v 1.93 2004/06/26 19:10:38 rwatson Exp $ */ #include "opt_inet.h" @@ -228,12 +228,14 @@ /* XXX why does only one socket match? */ if (inp->inp_lport == nport) { sa = inp->inp_socket; - if (sbappendaddr(&sa->so_rcv, + SOCKBUF_LOCK(&sa->so_rcv); + if (sbappendaddr_locked(&sa->so_rcv, (struct sockaddr *)&divsrc, m, - (struct mbuf *)0) == 0) + (struct mbuf *)0) == 0) { sa = NULL; /* force mbuf reclaim below */ - else - sorwakeup(sa); + SOCKBUF_UNLOCK(&sa->so_rcv); + } else + sorwakeup_locked(sa); INP_UNLOCK(inp); break; } ==== //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#8 (text+ko) ==== @@ -17,7 +17,7 @@ * and PIM-SMv2 and PIM-DM support, advanced API support, * bandwidth metering and signaling * - * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.101 2004/06/24 02:01:48 rwatson Exp $ + * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.102 2004/06/26 19:10:38 rwatson Exp $ */ #include "opt_mac.h" @@ -1307,10 +1307,13 @@ socket_send(struct socket *s, struct mbuf *mm, struct sockaddr_in *src) { if (s) { - if (sbappendaddr(&s->so_rcv, (struct sockaddr *)src, mm, NULL) != 0) { - sorwakeup(s); + SOCKBUF_LOCK(&s->so_rcv); + if (sbappendaddr_locked(&s->so_rcv, (struct sockaddr *)src, mm, + NULL) != 0) { + sorwakeup_locked(s); return 0; } + SOCKBUF_UNLOCK(&s->so_rcv); } m_freem(mm); return -1; ==== //depot/projects/netperf_socket/sys/netinet/raw_ip.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 - * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.134 2004/06/09 20:10:38 ru Exp $ + * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.135 2004/06/26 19:10:39 rwatson Exp $ */ #include "opt_inet6.h" @@ -160,18 +160,22 @@ #endif if (!policyfail) { struct mbuf *opts = NULL; + struct socket *so; + so = last->inp_socket; if ((last->inp_flags & INP_CONTROLOPTS) || - (last->inp_socket->so_options & SO_TIMESTAMP)) + (so->so_options & SO_TIMESTAMP)) ip_savecontrol(last, &opts, ip, n); - if (sbappendaddr(&last->inp_socket->so_rcv, + SOCKBUF_LOCK(&so->so_rcv); + if (sbappendaddr_locked(&so->so_rcv, (struct sockaddr *)&ripsrc, n, opts) == 0) { /* should notify about lost packet */ m_freem(n); if (opts) m_freem(opts); + SOCKBUF_UNLOCK(&so->so_rcv); } else - sorwakeup(last->inp_socket); + sorwakeup_locked(so); } else m_freem(n); return policyfail; ==== //depot/projects/netperf_socket/sys/netinet/tcp_input.c#15 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.247 2004/06/25 04:11:26 ps Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.248 2004/06/26 19:10:39 rwatson Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -353,22 +353,24 @@ q = LIST_FIRST(&tp->t_segq); if (!q || q->tqe_th->th_seq != tp->rcv_nxt) return (0); + SOCKBUF_LOCK(&so->so_rcv); do { tp->rcv_nxt += q->tqe_len; flags = q->tqe_th->th_flags & TH_FIN; nq = LIST_NEXT(q, tqe_q); LIST_REMOVE(q, tqe_q); + /* Unlocked read. */ if (so->so_rcv.sb_state & SBS_CANTRCVMORE) m_freem(q->tqe_m); else - sbappendstream(&so->so_rcv, q->tqe_m); + sbappendstream_locked(&so->so_rcv, q->tqe_m); uma_zfree(tcp_reass_zone, q); tp->t_segqlen--; tcp_reass_qsize--; q = nq; } while (q && q->tqe_th->th_seq == tp->rcv_nxt); ND6_HINT(tp); - sorwakeup(so); + sorwakeup_locked(so); return (flags); } @@ -1264,13 +1266,15 @@ #endif * Add data to socket buffer. */ + /* Unlocked read. */ + SOCKBUF_LOCK(&so->so_rcv); if (so->so_rcv.sb_state & SBS_CANTRCVMORE) { m_freem(m); } else { m_adj(m, drop_hdrlen); /* delayed header drop */ - sbappendstream(&so->so_rcv, m); + sbappendstream_locked(&so->so_rcv, m); } - sorwakeup(so); + sorwakeup_locked(so); if (DELAY_ACK(tp)) { tp->t_flags |= TF_DELACK; } else { @@ -2155,8 +2159,7 @@ tp->snd_wnd -= acked; ourfinisacked = 0; } - SOCKBUF_UNLOCK(&so->so_snd); - sowwakeup(so); + sowwakeup_locked(so); /* detect una wraparound */ if ((tcp_do_newreno || tp->sack_enable) && !IN_FASTRECOVERY(tp) && @@ -2365,11 +2368,13 @@ tcpstat.tcps_rcvpack++; tcpstat.tcps_rcvbyte += tlen; ND6_HINT(tp); + /* Unlocked read. */ + SOCKBUF_LOCK(&so->so_rcv); if (so->so_rcv.sb_state & SBS_CANTRCVMORE) m_freem(m); else - sbappendstream(&so->so_rcv, m); - sorwakeup(so); + sbappendstream_locked(&so->so_rcv, m); + sorwakeup_locked(so); } else { thflags = tcp_reass(tp, th, &tlen, m); tp->t_flags |= TF_ACKNOW; ==== //depot/projects/netperf_socket/sys/netinet/tcp_usrreq.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * From: @(#)tcp_usrreq.c 8.2 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/tcp_usrreq.c,v 1.102 2004/06/18 20:22:21 rwatson Exp $ + * $FreeBSD: src/sys/netinet/tcp_usrreq.c,v 1.103 2004/06/26 17:50:50 rwatson Exp $ */ #include "opt_ipsec.h" ==== //depot/projects/netperf_socket/sys/netinet/udp_usrreq.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 - * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.155 2004/06/16 08:50:14 bms Exp $ + * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.156 2004/06/26 19:10:39 rwatson Exp $ */ #include "opt_ipsec.h" @@ -447,6 +447,7 @@ int off; { struct sockaddr *append_sa; + struct socket *so; struct mbuf *opts = 0; INP_LOCK_ASSERT(last); @@ -496,13 +497,17 @@ #endif append_sa = (struct sockaddr *)&udp_in; m_adj(n, off); - if (sbappendaddr(&last->inp_socket->so_rcv, append_sa, n, opts) == 0) { + + so = last->inp_socket; + SOCKBUF_LOCK(&so->so_rcv); + if (sbappendaddr_locked(&so->so_rcv, append_sa, n, opts) == 0) { m_freem(n); if (opts) m_freem(opts); udpstat.udps_fullsock++; + SOCKBUF_UNLOCK(&so->so_rcv); } else - sorwakeup(last->inp_socket); + sorwakeup_locked(so); } /* ==== //depot/projects/netperf_socket/sys/sys/proc.h#14 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.381 2004/06/19 17:58:32 marcel Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.382 2004/06/26 18:58:22 marcel Exp $ */ #ifndef _SYS_PROC_H_ @@ -903,7 +903,6 @@ int thread_export_context(struct thread *td, int willexit); void thread_free(struct thread *td); void thread_link(struct thread *td, struct ksegrp *kg); -lwpid_t thread_new_tid(void); void thread_reap(void); struct thread *thread_schedule_upcall(struct thread *td, struct kse_upcall *ku); int thread_single(int how); ==== //depot/projects/netperf_socket/sys/vm/vm_map.h#5 (text+ko) ==== @@ -57,7 +57,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_map.h,v 1.109 2004/04/24 03:46:44 alc Exp $ + * $FreeBSD: src/sys/vm/vm_map.h,v 1.110 2004/06/26 19:16:35 alc Exp $ */ /* @@ -223,8 +223,7 @@ int vm_refcnt; /* number of references */ struct shmmap_state *vm_shm; /* SYS5 shared memory private data XXX */ /* we copy between vm_startcopy and vm_endcopy on fork */ -#define vm_startcopy vm_rssize - segsz_t vm_rssize; /* current resident set size in pages */ +#define vm_startcopy vm_swrss >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 26 23:10:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87E8C16A4D0; Sat, 26 Jun 2004 23:10:13 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47CC916A4CE for ; Sat, 26 Jun 2004 23:10:13 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A47C43D1D for ; Sat, 26 Jun 2004 23:10:13 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5QN9akV079730 for ; Sat, 26 Jun 2004 23:09:36 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5QN9aQe079727 for perforce@freebsd.org; Sat, 26 Jun 2004 23:09:36 GMT (envelope-from julian@freebsd.org) Date: Sat, 26 Jun 2004 23:09:36 GMT Message-Id: <200406262309.i5QN9aQe079727@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 55867 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jun 2004 23:10:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=55867 Change 55867 by julian@julian_jules1 on 2004/06/26 23:08:40 for now don't use RQ_PPQ Affected files ... .. //depot/projects/nsched/sys/kern/kern_intr.c#4 edit Differences ... ==== //depot/projects/nsched/sys/kern/kern_intr.c#4 (text+ko) ==== @@ -454,7 +454,8 @@ *ithdp = ithd; } return (ithread_add_handler(ithd, name, handler, arg, - (pri * RQ_PPQ) + PI_SOFT, flags, cookiep)); + (pri /** RQ_PPQ*/) + PI_SOFT, flags, cookiep)); + /* XXKSE.. think of a better way to get separate queues */ } From owner-p4-projects@FreeBSD.ORG Sat Jun 26 23:25:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6DD416A4D1; Sat, 26 Jun 2004 23:25:43 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8062D16A4CE for ; Sat, 26 Jun 2004 23:25:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 782B243D2F for ; Sat, 26 Jun 2004 23:25:43 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5QNOuU0080198 for ; Sat, 26 Jun 2004 23:24:56 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5QNOtpN080195 for perforce@freebsd.org; Sat, 26 Jun 2004 23:24:55 GMT (envelope-from julian@freebsd.org) Date: Sat, 26 Jun 2004 23:24:55 GMT Message-Id: <200406262324.i5QNOtpN080195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 55868 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jun 2004 23:25:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=55868 Change 55868 by julian@julian_jules1 on 2004/06/26 23:24:51 IFC to catch marcel's change to TIDS. Affected files ... .. //depot/projects/nsched/sys/alpha/include/pmap.h#5 integrate .. //depot/projects/nsched/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/nsched/sys/boot/forth/loader.conf#4 integrate .. //depot/projects/nsched/sys/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/nsched/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/nsched/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/nsched/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/nsched/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/nsched/sys/compat/svr4/svr4_ttold.c#2 integrate .. //depot/projects/nsched/sys/conf/NOTES#7 integrate .. //depot/projects/nsched/sys/conf/files#13 integrate .. //depot/projects/nsched/sys/conf/files.i386#6 integrate .. //depot/projects/nsched/sys/conf/kern.post.mk#3 integrate .. //depot/projects/nsched/sys/conf/kmod.mk#6 integrate .. //depot/projects/nsched/sys/conf/options#8 integrate .. //depot/projects/nsched/sys/conf/options.powerpc#2 integrate .. //depot/projects/nsched/sys/conf/options.sparc64#3 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_fil.c#3 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/nsched/sys/contrib/pf/net/if_pflog.c#5 integrate .. //depot/projects/nsched/sys/contrib/pf/net/if_pfsync.c#5 integrate .. //depot/projects/nsched/sys/contrib/pf/net/pfvar.h#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pci.c#6 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pcib.c#4 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_quirks#1 branch .. //depot/projects/nsched/sys/dev/acpica/acpi_resource.c#5 integrate .. //depot/projects/nsched/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/nsched/sys/dev/acpica/acpivar.h#6 integrate .. //depot/projects/nsched/sys/dev/ar/if_ar.c#3 integrate .. //depot/projects/nsched/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/nsched/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/nsched/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/nsched/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/nsched/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/nsched/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/nsched/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/nsched/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/nsched/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/nsched/sys/dev/ciss/cissreg.h#6 integrate .. //depot/projects/nsched/sys/dev/ciss/cissvar.h#4 integrate .. //depot/projects/nsched/sys/dev/cp/if_cp.c#5 integrate .. //depot/projects/nsched/sys/dev/ctau/if_ct.c#6 integrate .. //depot/projects/nsched/sys/dev/cx/if_cx.c#7 integrate .. //depot/projects/nsched/sys/dev/cy/cy.c#7 integrate .. //depot/projects/nsched/sys/dev/digi/digi.c#7 integrate .. //depot/projects/nsched/sys/dev/digi/digi.h#3 integrate .. //depot/projects/nsched/sys/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/nsched/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/nsched/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/nsched/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/nsched/sys/dev/rc/rc.c#5 integrate .. //depot/projects/nsched/sys/dev/rp/rp.c#6 integrate .. //depot/projects/nsched/sys/dev/sab/sab.c#4 integrate .. //depot/projects/nsched/sys/dev/si/si.c#5 integrate .. //depot/projects/nsched/sys/dev/si/si.h#2 integrate .. //depot/projects/nsched/sys/dev/sio/sio.c#7 integrate .. //depot/projects/nsched/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/nsched/sys/dev/sr/if_sr.c#3 integrate .. //depot/projects/nsched/sys/dev/sx/sx.c#5 integrate .. //depot/projects/nsched/sys/dev/sx/sx.h#2 integrate .. //depot/projects/nsched/sys/dev/twa/twa_freebsd.c#4 integrate .. //depot/projects/nsched/sys/dev/uart/uart_bus.h#3 integrate .. //depot/projects/nsched/sys/dev/uart/uart_dev_i8251.c#2 integrate .. //depot/projects/nsched/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/nsched/sys/dev/uart/uart_dev_sab82532.c#3 integrate .. //depot/projects/nsched/sys/dev/uart/uart_dev_z8530.c#3 integrate .. //depot/projects/nsched/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/ehcireg.h#3 integrate .. //depot/projects/nsched/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/ubser.c#5 integrate .. //depot/projects/nsched/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/nsched/sys/dev/usb/ucomvar.h#3 integrate .. //depot/projects/nsched/sys/dev/usb/udbp.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/uhid.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/ulpt.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs.h#6 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs_data.h#6 integrate .. //depot/projects/nsched/sys/dev/usb/usbdi_util.h#2 integrate .. //depot/projects/nsched/sys/dev/vinum/vinumio.c#4 integrate .. //depot/projects/nsched/sys/dev/zs/zs.c#5 integrate .. //depot/projects/nsched/sys/dev/zs/zs_macio.c#2 integrate .. //depot/projects/nsched/sys/fs/fifofs/fifo_vnops.c#7 integrate .. //depot/projects/nsched/sys/fs/portalfs/portal_vnops.c#4 integrate .. //depot/projects/nsched/sys/fs/udf/udf.h#3 integrate .. //depot/projects/nsched/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/nsched/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/nsched/sys/geom/geom.h#3 integrate .. //depot/projects/nsched/sys/geom/geom_slice.c#2 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_drive.c#3 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_plex.c#3 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_raid5.c#2 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_share.c#2 integrate .. //depot/projects/nsched/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/nsched/sys/i386/conf/NOTES#6 integrate .. //depot/projects/nsched/sys/i386/i386/bios.c#6 integrate .. //depot/projects/nsched/sys/i386/i386/io_apic.c#5 integrate .. //depot/projects/nsched/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/nsched/sys/i386/i386/mptable.c#4 integrate .. //depot/projects/nsched/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/nsched/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/nsched/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/nsched/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/nsched/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/nsched/sys/i4b/driver/i4b_ing.c#3 integrate .. //depot/projects/nsched/sys/ia64/include/pmap.h#3 integrate .. //depot/projects/nsched/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/nsched/sys/kern/init_sysent.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_conf.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_fork.c#6 integrate .. //depot/projects/nsched/sys/kern/kern_kse.c#15 integrate .. //depot/projects/nsched/sys/kern/kern_resource.c#6 integrate .. //depot/projects/nsched/sys/kern/kern_thr.c#7 integrate .. //depot/projects/nsched/sys/kern/kern_thread.c#26 integrate .. //depot/projects/nsched/sys/kern/kern_time.c#4 integrate .. //depot/projects/nsched/sys/kern/sched_4bsd.c#19 integrate .. //depot/projects/nsched/sys/kern/sched_ule.c#9 integrate .. //depot/projects/nsched/sys/kern/syscalls.c#3 integrate .. //depot/projects/nsched/sys/kern/syscalls.master#3 integrate .. //depot/projects/nsched/sys/kern/tty.c#6 integrate .. //depot/projects/nsched/sys/kern/tty_compat.c#6 integrate .. //depot/projects/nsched/sys/kern/tty_pty.c#7 integrate .. //depot/projects/nsched/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/nsched/sys/kern/uipc_socket2.c#8 integrate .. //depot/projects/nsched/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/nsched/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/nsched/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/nsched/sys/modules/Makefile#5 integrate .. //depot/projects/nsched/sys/modules/ar/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ctau/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/cx/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/sr/Makefile#2 integrate .. //depot/projects/nsched/sys/net/if.c#5 integrate .. //depot/projects/nsched/sys/net/if.h#4 integrate .. //depot/projects/nsched/sys/net/if_clone.c#1 branch .. //depot/projects/nsched/sys/net/if_clone.h#1 branch .. //depot/projects/nsched/sys/net/if_disc.c#3 integrate .. //depot/projects/nsched/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/nsched/sys/net/if_faith.c#5 integrate .. //depot/projects/nsched/sys/net/if_gif.c#5 integrate .. //depot/projects/nsched/sys/net/if_gre.c#4 integrate .. //depot/projects/nsched/sys/net/if_loop.c#4 integrate .. //depot/projects/nsched/sys/net/if_ppp.c#4 integrate .. //depot/projects/nsched/sys/net/if_sl.c#5 integrate .. //depot/projects/nsched/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/nsched/sys/net/if_stf.c#4 integrate .. //depot/projects/nsched/sys/net/if_var.h#5 integrate .. //depot/projects/nsched/sys/net/if_vlan.c#5 integrate .. //depot/projects/nsched/sys/net/ppp_tty.c#3 integrate .. //depot/projects/nsched/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#5 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#7 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket.c#3 integrate .. //depot/projects/nsched/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_UI.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_bpf.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/nsched/sys/netgraph/ng_etf.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_ether.c#5 integrate .. //depot/projects/nsched/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_hub.c#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_ksocket.c#6 integrate .. //depot/projects/nsched/sys/netgraph/ng_ksocket.h#2 integrate .. //depot/projects/nsched/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/nsched/sys/netgraph/ng_lmi.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_one2many.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_parse.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_rfc1490.c#4 integrate .. //depot/projects/nsched/sys/netgraph/ng_sample.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_sppp.c#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_tee.c#4 integrate .. //depot/projects/nsched/sys/netgraph/ng_tty.c#4 integrate .. //depot/projects/nsched/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/nsched/sys/netinet/ip_divert.c#5 integrate .. //depot/projects/nsched/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/nsched/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/nsched/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/nsched/sys/netinet/ip_output.c#6 integrate .. //depot/projects/nsched/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/nsched/sys/netinet/tcp.h#3 integrate .. //depot/projects/nsched/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/nsched/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/nsched/sys/netinet/tcp_sack.c#1 branch .. //depot/projects/nsched/sys/netinet/tcp_seq.h#3 integrate .. //depot/projects/nsched/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/nsched/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/nsched/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/nsched/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/nsched/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/nsched/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/nsched/sys/netipsec/key.c#4 integrate .. //depot/projects/nsched/sys/netipsec/keysock.c#2 integrate .. //depot/projects/nsched/sys/netipx/ipx.h#2 integrate .. //depot/projects/nsched/sys/netipx/spx_usrreq.c#4 integrate .. //depot/projects/nsched/sys/netnatm/natm.c#3 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/nsched/sys/pc98/i386/machdep.c#5 integrate .. //depot/projects/nsched/sys/pc98/pc98/sio.c#7 integrate .. //depot/projects/nsched/sys/pci/if_mn.c#4 integrate .. //depot/projects/nsched/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/nsched/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/nsched/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/nsched/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/nsched/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/nsched/sys/powerpc/powermac/openpic_macio.c#2 integrate .. //depot/projects/nsched/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/nsched/sys/powerpc/powerpc/nexus.c#2 integrate .. //depot/projects/nsched/sys/powerpc/psim/iobus.c#2 integrate .. //depot/projects/nsched/sys/powerpc/psim/openpic_iobus.c#2 integrate .. //depot/projects/nsched/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/nsched/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/nsched/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/nsched/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/nsched/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/nsched/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/nsched/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/nsched/sys/sys/imgact_aout.h#4 integrate .. //depot/projects/nsched/sys/sys/ioctl_compat.h#3 integrate .. //depot/projects/nsched/sys/sys/linedisc.h#3 integrate .. //depot/projects/nsched/sys/sys/mac_policy.h#4 integrate .. //depot/projects/nsched/sys/sys/param.h#7 integrate .. //depot/projects/nsched/sys/sys/proc.h#16 integrate .. //depot/projects/nsched/sys/sys/procfs.h#2 integrate .. //depot/projects/nsched/sys/sys/serial.h#1 branch .. //depot/projects/nsched/sys/sys/socketvar.h#6 integrate .. //depot/projects/nsched/sys/sys/syscall.h#3 integrate .. //depot/projects/nsched/sys/sys/syscall.mk#3 integrate .. //depot/projects/nsched/sys/sys/sysproto.h#3 integrate .. //depot/projects/nsched/sys/sys/tty.h#6 integrate .. //depot/projects/nsched/sys/sys/ttychars.h#3 integrate .. //depot/projects/nsched/sys/sys/ttycom.h#4 integrate .. //depot/projects/nsched/sys/sys/ttydev.h#3 integrate .. //depot/projects/nsched/sys/sys/user.h#6 integrate .. //depot/projects/nsched/sys/tools/acpi_quirks2h.awk#1 branch .. //depot/projects/nsched/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/nsched/sys/vm/swap_pager.c#5 integrate .. //depot/projects/nsched/sys/vm/uma_core.c#3 integrate .. //depot/projects/nsched/sys/vm/vm_map.c#5 integrate .. //depot/projects/nsched/sys/vm/vm_map.h#4 integrate .. //depot/projects/nsched/sys/vm/vm_pageout.c#4 integrate Differences ... ==== //depot/projects/nsched/sys/alpha/include/pmap.h#5 (text+ko) ==== @@ -39,7 +39,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.30 2004/04/11 05:08:26 alc Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.31 2004/06/23 08:06:52 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -178,11 +178,6 @@ LIST_ENTRY(pmap) pm_list; /* list of all pmaps. */ }; -#define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) - -#define PM_FLAG_LOCKED 0x1 -#define PM_FLAG_WANTED 0x2 - typedef struct pmap *pmap_t; #ifdef _KERNEL @@ -210,6 +205,8 @@ struct vmspace; +#define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) + vm_offset_t pmap_steal_memory(vm_size_t); void pmap_bootstrap(vm_offset_t, u_int); void pmap_kenter(vm_offset_t va, vm_offset_t pa); ==== //depot/projects/nsched/sys/amd64/amd64/pmap.c#11 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.478 2004/06/20 20:57:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.479 2004/06/23 04:37:14 alc Exp $"); /* * Manages physical address maps. @@ -801,18 +801,34 @@ vm_page_t pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) { - vm_paddr_t pa; + pd_entry_t pde, *pdep; + pt_entry_t pte; vm_page_t m; m = NULL; - mtx_lock(&Giant); - if ((pa = pmap_extract(pmap, va)) != 0) { - m = PHYS_TO_VM_PAGE(pa); - vm_page_lock_queues(); - vm_page_hold(m); - vm_page_unlock_queues(); + if (pmap == NULL) + return (m); + vm_page_lock_queues(); + PMAP_LOCK(pmap); + pdep = pmap_pde(pmap, va); + if (pdep != NULL && (pde = *pdep)) { + if (pde & PG_PS) { + if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) { + m = PHYS_TO_VM_PAGE((pde & ~PDRMASK) | + (va & PDRMASK)); + vm_page_hold(m); + } + } else { + pte = *pmap_pte(pmap, va); + if ((pte & PG_V) && + ((pte & PG_RW) || (prot & VM_PROT_WRITE) == 0)) { + m = PHYS_TO_VM_PAGE(pte & PG_FRAME); + vm_page_hold(m); + } + } } - mtx_unlock(&Giant); + vm_page_unlock_queues(); + PMAP_UNLOCK(pmap); return (m); } ==== //depot/projects/nsched/sys/boot/forth/loader.conf#4 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.78 2004/06/20 15:58:24 josef Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.80 2004/06/24 17:49:18 josef Exp $ ############################################################## ### Basic configuration options ############################ @@ -172,8 +172,6 @@ if_tun_load="NO" # Tunnel driver (user process ppp) if_vlan_load="NO" # IEEE 802.1Q VLAN network interface ipfw_load="NO" # Firewall -pfsync_load="NO" # pfsync pseudo interface -pflog_load="NO" # pflog pseudo interface pf_load="NO" # packet filter @@ -280,7 +278,6 @@ snd_via8233_load="NO" # via8233 snd_via82c686_load="NO" # via82c686 snd_driver_load="NO" # All sound drivers -#pcm0.line="0" # Default value for a mixer channel ############################################################## ### USB modules ############################################ ==== //depot/projects/nsched/sys/boot/i386/cdboot/cdboot.s#2 (text+ko) ==== @@ -1,19 +1,33 @@ # -# Copyright (c) 2001 John Baldwin +# Copyright (c) 2001 John Baldwin # All rights reserved. # -# Redistribution and use in source and binary forms are freely -# permitted provided that the above copyright notice and this -# paragraph and the following disclaimer are duplicated in all -# such forms. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the author nor the names of any co-contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. # -# This software is provided "AS IS" and without any express or -# implied warranties, including, without limitation, the implied -# warranties of merchantability and fitness for a particular -# purpose. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.11 2004/01/12 20:34:42 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/cdboot/cdboot.s,v 1.13 2004/06/22 21:55:22 jhb Exp $ # # This program is a freestanding boot program to load an a.out binary @@ -151,7 +165,6 @@ mov $0xffff,%cx # path name by repnz # scanning for scasb # nul char - inc %di # Skip nul mov %di,%si # Point %si at next path mov (%si),%al # Get first char of next path or %al,%al # Is it double nul? ==== //depot/projects/nsched/sys/cam/cam_xpt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.139 2004/06/16 09:46:31 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.141 2004/06/21 19:01:55 ps Exp $"); #include #include ==== //depot/projects/nsched/sys/compat/linux/linux_util.c#2 (text+ko) ==== @@ -30,13 +30,15 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.24 2004/01/14 22:38:03 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.26 2004/06/23 06:35:43 bde Exp $"); #include -#include +#include +#include +#include #include #include -#include +#include #include #include @@ -101,6 +103,8 @@ char *ptr, *buf, *cp; size_t len, sz; + GIANT_REQUIRED; + buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK); *pbuf = buf; ==== //depot/projects/nsched/sys/compat/svr4/imgact_svr4.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.22 2004/02/04 21:52:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.23 2004/06/24 02:21:17 obrien Exp $"); #include #include @@ -90,7 +90,7 @@ } bss_size = round_page(a_out->a_bss); #ifdef DEBUG - printf("imgact: text: %08lx, data: %08lx, bss: %08lx\n", a_out->a_text, a_out->a_data, bss_size); + printf("imgact: text: %08lx, data: %08lx, bss: %08lx\n", (u_long)a_out->a_text, (u_long)a_out->a_data, bss_size); #endif /* @@ -193,7 +193,7 @@ #ifdef DEBUG printf("imgact: startaddr=%08lx, length=%08lx\n", (u_long)vmaddr, - a_out->a_text + a_out->a_data); + (u_long)a_out->a_text + a_out->a_data); #endif /* * allow read/write of data ==== //depot/projects/nsched/sys/compat/svr4/svr4_ioctl.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.20 2003/06/10 21:35:15 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.21 2004/06/21 22:57:10 phk Exp $"); #include #include @@ -119,10 +119,12 @@ #endif switch (cmd & 0xff00) { +#ifndef BURN_BRIDGES case SVR4_tIOC: DPRINTF(("ttold\n")); fun = svr4_ttold_ioctl; break; +#endif case SVR4_TIOC: DPRINTF(("term\n")); ==== //depot/projects/nsched/sys/compat/svr4/svr4_ttold.c#2 (text+ko) ==== @@ -27,7 +27,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ttold.c,v 1.12 2003/06/10 21:35:15 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ttold.c,v 1.13 2004/06/21 22:57:10 phk Exp $"); + +#ifndef BURN_BRIDGES #include #include @@ -376,3 +378,5 @@ return 0; /* ENOSYS really */ } } + +#endif /* BURN_BRIDGES */ ==== //depot/projects/nsched/sys/conf/NOTES#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1232 2004/06/13 17:29:06 mlaier Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1234 2004/06/26 17:19:44 mpp Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -95,7 +95,7 @@ # # BLKDEV_IOSIZE sets the default block size used in user block -# device I/O. Note that this value will be overriden by the label +# device I/O. Note that this value will be overridden by the label # when specifying a block device from a label with a non-0 # partition blocksize. The default is PAGE_SIZE. # @@ -184,7 +184,7 @@ # WITNESS enables the witness code which detects deadlocks and cycles # during locking operations. # WITNESS_DDB causes the witness code to drop into the kernel debugger if -# a lock heirarchy violation occurs or if locks are held when going to +# a lock hierarchy violation occurs or if locks are held when going to # sleep. # WITNESS_SKIPSPIN disables the witness checks on spin mutexes. options MUTEX_DEBUG @@ -328,7 +328,7 @@ # # REGRESSION causes optional kernel interfaces necessary only for regression -# testing to be enabled. These interfaces may consitute security risks +# testing to be enabled. These interfaces may constitute security risks # when enabled, as they permit processes to easily modify aspects of the # run-time environment to reproduce unlikely or unusual (possibly normally # impossible) scenarios. @@ -372,9 +372,8 @@ # The default is that packets coming from a tunnel are _not_ processed; # they are assumed trusted. # -# Note that enabling this can be problematic as there are no mechanisms -# in place for distinguishing packets coming out of a tunnel (e.g. no -# encX devices as found on openbsd). +# IPSEC history is preserved for such packets, and can be filtered +# using ipfw(8)'s 'ipsec' keyword, when this option is enabled. # #options IPSEC_FILTERGIF #filter ipsec packets from a tunnel @@ -409,7 +408,7 @@ options ALTQ_RIO # RED In/Out options ALTQ_HFSC # Hierarchical Packet Scheduler options ALTQ_CDNR # Traffic conditioner -options ALTQ_PRIQ # Prioirity Queueing +options ALTQ_PRIQ # Priority Queueing options ALTQ_NOPCC # Required for SMP build options ALTQ_DEBUG @@ -590,7 +589,7 @@ # packets without touching the ttl). This can be useful to hide firewalls # from traceroute and similar tools. # -# PFIL_HOOKS enables an abtraction layer which is meant to be used in +# PFIL_HOOKS enables an abstraction layer which is meant to be used in # network code where filtering is required. See pfil(9). This option is # required by the IPFILTER option and the PF device. # @@ -658,7 +657,7 @@ options BRIDGE # Zero copy sockets support. This enables "zero copy" for sending and -# receving data via a socket. The send side works for any type of NIC, +# receiving data via a socket. The send side works for any type of NIC, # the receive side only works for NICs that support MTUs greater than the # page size of your architecture and that support header splitting. See # zero_copy(9) for more details. @@ -933,8 +932,8 @@ # # The cd driver drives SCSI Read Only Direct Access ("cd") devices. # -# The ses driver drives SCSI Envinronment Services ("ses") and -# SAF-TE ("SCSI Accessable Fault-Tolerant Enclosure") devices. +# The ses driver drives SCSI Environment Services ("ses") and +# SAF-TE ("SCSI Accessible Fault-Tolerant Enclosure") devices. # # The pt driver drives SCSI Processor devices. # @@ -1555,7 +1554,7 @@ # # MII bus support is required for some PCI 10/100 ethernet NICs, # namely those which use MII-compliant transceivers or implement -# tranceiver control interfaces that operate like an MII. Adding +# transceiver control interfaces that operate like an MII. Adding # "device miibus0" to the kernel config pulls in support for # the generic miibus API and all of the PHY drivers, including a # generic one for PHYs that aren't specifically handled by an @@ -1645,7 +1644,7 @@ # Compaq Netelligent 10/100 cards and the built-in ethernet controllers # in several Compaq Prosignia, Proliant and Deskpro systems. It also # supports several Olicom 10Mbps and 10/100 boards. -# tx: SMC 9432 TX, BTX and FTX cards. (SMC EtherPower II serie) +# tx: SMC 9432 TX, BTX and FTX cards. (SMC EtherPower II series) # txp: Support for 3Com 3cR990 cards with the "Typhoon" chipset # vr: Support for various fast ethernet adapters based on the VIA # Technologies VT3043 `Rhine I' and VT86C100A `Rhine II' chips, @@ -1801,7 +1800,7 @@ # Gravis UltraSound ISA PnP/non-PnP # Crystal Semiconductor CS461x/428x PCI # Neomagic 256AV (ac97) -# Most of the more common ISA/PnP sb/mss/ess compatable cards. +# Most of the more common ISA/PnP sb/mss/ess compatible cards. device pcm @@ -1920,7 +1919,7 @@ # options BROOKTREE_SYSTEM_DEFAULT=BROOKTREE_PAL # or # options BROOKTREE_SYSTEM_DEFAULT=BROOKTREE_NTSC -# Specifes the default video capture mode. +# Specifies the default video capture mode. # This is required for Dual Crystal (28&35Mhz) boards where PAL is used # to prevent hangs during initialisation. eg VideoLogic Captivator PCI. # @@ -2225,12 +2224,12 @@ makeoptions UKBD_DFLT_KEYMAP=it.iso # options for uplcom: -options UPLCOM_INTR_INTERVAL=100 # interrpt pipe interval +options UPLCOM_INTR_INTERVAL=100 # interrupt pipe interval # in milliseconds # options for uvscom: options UVSCOM_DEFAULT_OPKTSIZE=8 # default output packet size -options UVSCOM_INTR_INTERVAL=100 # interrpt pipe interval +options UVSCOM_INTR_INTERVAL=100 # interrupt pipe interval # in milliseconds ##################################################################### ==== //depot/projects/nsched/sys/conf/files#13 (text+ko) ==== @@ -1,9 +1,14 @@ -# $FreeBSD: src/sys/conf/files,v 1.906 2004/06/16 23:23:59 mlaier Exp $ +# $FreeBSD: src/sys/conf/files,v 1.910 2004/06/26 05:58:43 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and # dependency lines other than the first are silently ignored. # +acpi_quirks.h standard \ + dependency "$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ + compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ + no-obj no-implicit-rule \ + clean "acpi_quirks.h" aicasm optional ahc \ dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ @@ -38,17 +43,17 @@ miidevs.h standard \ dependency "$S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ - no-obj no-implicit-rule \ + no-obj no-implicit-rule before-depend \ clean "miidevs.h" pccarddevs.h standard \ dependency "$S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ compile-with "${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ - no-obj no-implicit-rule \ + no-obj no-implicit-rule before-depend \ clean "pccarddevs.h" usbdevs.h standard \ dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ - no-obj no-implicit-rule \ + no-obj no-implicit-rule before-depend \ clean "usbdevs.h" kern/device_if.m standard kern/bus_if.m standard @@ -1221,6 +1226,7 @@ net/if.c standard net/if_arcsubr.c optional arcnet net/if_atmsubr.c optional atm +net/if_clone.c standard net/if_disc.c optional disc net/if_ef.c optional ef net/if_ethersubr.c optional ether @@ -1463,6 +1469,7 @@ netinet/tcp_hostcache.c optional inet netinet/tcp_input.c optional inet netinet/tcp_output.c optional inet +netinet/tcp_sack.c optional inet netinet/tcp_subr.c optional inet netinet/tcp_syncache.c optional inet netinet/tcp_timer.c optional inet ==== //depot/projects/nsched/sys/conf/files.i386#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.493 2004/05/26 07:43:40 bde Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.494 2004/06/23 17:33:24 brooks Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -272,7 +272,7 @@ i386/isa/elcr.c standard i386/isa/elink.c optional ep i386/isa/elink.c optional ie -i386/isa/if_el.c count el +i386/isa/if_el.c optional el i386/isa/isa.c optional isa i386/isa/isa_dma.c optional isa i386/isa/mse.c optional mse ==== //depot/projects/nsched/sys/conf/kern.post.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.66 2004/05/26 16:31:41 imp Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.67 2004/06/26 06:02:06 imp Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -77,8 +77,7 @@ ${SYSTEM_LD_TAIL} .if !exists(${.OBJDIR}/.depend) -${SYSTEM_OBJS}: assym.s pccarddevs.h usbdevs.h miidevs.h vnode_if.h \ - ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/} +${SYSTEM_OBJS}: assym.s vnode_if.h ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/} .endif LNFILES= ${CFILES:T:S/.c$/.ln/} @@ -136,7 +135,7 @@ # The argument list can be very long, so use make -V and xargs to # pass it to mkdep. -_kernel-depend: assym.s miidevs.h pccarddevs.h usbdevs.h vnode_if.h \ +_kernel-depend: assym.s vnode_if.h \ ${BEFORE_DEPEND} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} \ ${GEN_M_CFILES} ${SFILES} ${MFILES:T:S/.m$/.h/} if [ -f .olddep ]; then mv .olddep .depend; fi ==== //depot/projects/nsched/sys/conf/kmod.mk#6 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.161 2004/06/13 17:29:06 mlaier Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.162 2004/06/24 06:29:22 njl Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -343,6 +343,17 @@ .endif .endfor # _i +.if ${SRCS:Macpi_quirks.h} != "" +CLEANFILES+= acpi_quirks.h +.if !exists(@) +acpi_quirks.h: @ +.endif +.if exists(@) +acpi_quirks.h: @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks +.endif + ${AWK} -f @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks +.endif + regress: lint: ${SRCS} ==== //depot/projects/nsched/sys/conf/options#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.453 2004/06/13 17:29:06 mlaier Exp $ +# $FreeBSD: src/sys/conf/options,v 1.454 2004/06/23 21:04:37 ps Exp $ # # On the handling of kernel options # @@ -354,6 +354,7 @@ SLIP_IFF_OPTS opt_slip.h TCPDEBUG TCP_SIGNATURE opt_inet.h +TCP_SACK_DEBUG opt_tcp_sack.h TCP_DROP_SYNFIN opt_tcp_input.h XBONEHACK ==== //depot/projects/nsched/sys/conf/options.powerpc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.powerpc,v 1.8 2004/01/21 05:20:58 grehan Exp $ +# $FreeBSD: src/sys/conf/options.powerpc,v 1.9 2004/06/25 13:44:34 grehan Exp $ # Options specific to the powerpc platform kernels OEA opt_global.h @@ -12,3 +12,5 @@ PSIM SC_OFWFB opt_ofwfb.h + +OFWCONS_POLL_HZ opt_ofw.h ==== //depot/projects/nsched/sys/conf/options.sparc64#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.sparc64,v 1.10 2004/05/08 13:53:46 marius Exp $ +# $FreeBSD: src/sys/conf/options.sparc64,v 1.11 2004/06/24 02:57:10 obrien Exp $ SUN4U opt_global.h @@ -9,6 +9,7 @@ PSYCHO_DEBUG opt_psycho.h DEBUGGER_ON_POWERFAIL opt_psycho.h OFW_PCI_DEBUG opt_ofw_pci.h +OFWCONS_POLL_HZ opt_ofw.h # Debug IOMMU inserts/removes using diagnostic accesses. Very loud. IOMMU_DIAG opt_iommu.h PMAP_STATS opt_pmap.h ==== //depot/projects/nsched/sys/contrib/ipfilter/netinet/fil.c#3 (text+ko) ==== @@ -42,6 +42,7 @@ # include # endif #else +# include # include # if SOLARIS2 < 5 # include @@ -99,7 +100,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.37 2004/04/07 20:45:56 imp Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.38 2004/06/21 22:46:35 darrenr Exp $"; #endif #ifndef _KERNEL @@ -146,6 +147,9 @@ static int frflushlist __P((int, minor_t, int *, frentry_t **)); #ifdef _KERNEL static void frsynclist __P((frentry_t *)); +# ifndef __sgi +static void *ipf_pullup __P((mb_t *, fr_info_t *, int, void *)); +# endif #endif @@ -194,19 +198,27 @@ * compact the IP header into a structure which contains just the info. * which is useful for comparing IP headers with. */ -void fr_makefrip(hlen, ip, fin) +int fr_makefrip(hlen, ip, fin) int hlen; ip_t *ip; fr_info_t *fin; { u_short optmsk = 0, secmsk = 0, auth = 0; int i, mv, ol, off, p, plen, v; +#if defined(_KERNEL) +# if SOLARIS + mb_t *m = fin->fin_qfm; +# else + mb_t *m = fin->fin_mp ? *fin->fin_mp : NULL; +# endif +#endif fr_ip_t *fi = &fin->fin_fi; struct optlist *op; u_char *s, opt; tcphdr_t *tcp; fin->fin_rev = 0; + fin->fin_dp = NULL; fin->fin_fr = NULL; fin->fin_tcpf = 0; fin->fin_data[0] = 0; @@ -220,8 +232,10 @@ if (v == 4) { fin->fin_id = ip->ip_id; fi->fi_tos = ip->ip_tos; +#if (OpenBSD >= 200311) && defined(_KERNEL) + ip->ip_off = ntohs(ip->ip_off); +#endif off = (ip->ip_off & IP_OFFMASK); - tcp = (tcphdr_t *)((char *)ip + hlen); (*(((u_short *)fi) + 1)) = (*(((u_short *)ip) + 4)); fi->fi_src.i6[1] = 0; fi->fi_src.i6[2] = 0; @@ -235,6 +249,9 @@ fi->fi_fl = (hlen > sizeof(ip_t)) ? FI_OPTIONS : 0; if (ip->ip_off & (IP_MF|IP_OFFMASK)) fi->fi_fl |= FI_FRAG; +#if (OpenBSD >= 200311) && defined(_KERNEL) + ip->ip_len = ntohs(ip->ip_len); +#endif plen = ip->ip_len; fin->fin_dlen = plen - hlen; } @@ -246,7 +263,6 @@ p = ip6->ip6_nxt; fi->fi_p = p; fi->fi_ttl = ip6->ip6_hlim; - tcp = (tcphdr_t *)(ip6 + 1); fi->fi_src.in6 = ip6->ip6_src; fi->fi_dst.in6 = ip6->ip6_dst; fin->fin_id = (u_short)(ip6->ip6_flow & 0xffff); @@ -258,14 +274,23 @@ } #endif else - return; + return -1; fin->fin_off = off; fin->fin_plen = plen; - fin->fin_dp = (char *)tcp; + tcp = (tcphdr_t *)((char *)ip + hlen); fin->fin_misc = 0; off <<= 3; + /* + * For both ICMPV6 & ICMP, we attempt to pullup the entire packet into + * a single buffer for recognised error return packets. Why? Because + * the entire data section of the ICMP payload is considered to be of + * significance and maybe required in NAT/state processing, so rather + * than be careful later, attempt to get it all in one buffeer first. + * For TCP we just make sure the _entire_ TCP header is in the first + * buffer for convienience. + */ switch (p) { #ifdef USE_INET6 @@ -274,7 +299,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<