From owner-p4-projects@FreeBSD.ORG Sun Feb 22 14:12:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84EDA16A4D0; Sun, 22 Feb 2004 14:12:16 -0800 (PST) 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 5CB2F16A4CE for ; Sun, 22 Feb 2004 14:12:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 558A643D1F for ; Sun, 22 Feb 2004 14:12:16 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1MMCGGe009505 for ; Sun, 22 Feb 2004 14:12:16 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1MMCFlC009499 for perforce@freebsd.org; Sun, 22 Feb 2004 14:12:15 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 22 Feb 2004 14:12:15 -0800 (PST) Message-Id: <200402222212.i1MMCFlC009499@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 47431 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, 22 Feb 2004 22:12:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=47431 Change 47431 by marcel@marcel_nfs on 2004/02/22 14:11:33 Get libiberty to compile. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/binutils/Makefile.inc0#2 edit .. //depot/projects/gdb/gnu/usr.bin/binutils/libiberty/Makefile#2 edit .. //depot/projects/gdb/gnu/usr.bin/binutils/libiberty/config.h#2 edit Differences ... ==== //depot/projects/gdb/gnu/usr.bin/binutils/Makefile.inc0#2 (text+ko) ==== @@ -22,7 +22,6 @@ .else WARNS= 3 .endif -CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I. .if exists(${.CURDIR}/${TARGET_ARCH}) CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} ==== //depot/projects/gdb/gnu/usr.bin/binutils/libiberty/Makefile#2 (text+ko) ==== @@ -5,11 +5,14 @@ .PATH: ${SRCDIR}/libiberty LIB= iberty -SRCS= argv.c choose-temp.c concat.c cp-demangle.c cplus-dem.c \ - dyn-string.c getopt.c getopt1.c getpwd.c getruntime.c \ - hex.c floatformat.c hashtab.c lbasename.c make-temp-file.c \ - objalloc.c obstack.c safe-ctype.c xatexit.c xexit.c xmalloc.c \ - xstrdup.c xstrerror.c +SRCS= argv.c choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \ + dyn-string.c fdmatch.c fibheap.c floatformat.c getopt.c getopt1.c \ + getpwd.c getruntime.c hashtab.c hex.c lbasename.c lrealpath.c \ + make-temp-file.c md5.c objalloc.c obstack.c partition.c pex-unix.c \ + physmem.c regex.c safe-ctype.c sort.c spaces.c splay-tree.c stpncpy.c \ + strerror.c strsignal.c ternary.c xatexit.c xexit.c xmalloc.c \ + xmemdup.c xstrdup.c xstrerror.c + WARNS= 1 CFLAGS+= -DHAVE_CONFIG_H INTERNALLIB= true ==== //depot/projects/gdb/gnu/usr.bin/binutils/libiberty/config.h#2 (text+ko) ==== @@ -1,257 +1,378 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/libiberty/config.h,v 1.5 2002/12/02 09:44:59 obrien Exp $ */ +/* $FreeBSD$ */ +/* config.h. Generated by configure. */ +/* config.in. Generated from configure.ac by autoheader. */ +/* Define to `unsigned long' if doesn't define. */ +/* #undef uintptr_t */ -/* config.h. Generated automatically by configure. */ -/* config.in. Generated automatically from configure.in by autoheader 2.13. */ -/* Define to empty if the keyword does not work. */ -/* #undef const */ +/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ +#define BYTEORDER 1234 -/* Define if you have a working `mmap' system call. */ -#define HAVE_MMAP 1 +/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. + This function is required for alloca.c support on those systems. */ +/* #undef CRAY_STACKSEG_END */ -/* Define if you have that is POSIX.1 compatible. */ -#define HAVE_SYS_WAIT_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ALLOCA_H */ -/* Define if you have . */ -/* #undef HAVE_VFORK_H */ - -/* Define as __inline if that's what the C compiler calls it. */ -/* #undef inline */ - -/* Define to `int' if doesn't define. */ -/* #undef pid_t */ - -/* Define if you need to in order for stat and other things to work. */ -/* #undef _POSIX_SOURCE */ - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define if you can safely include both and . */ -#define TIME_WITH_SYS_TIME 1 - -/* Define vfork as fork if vfork does not work. */ -/* #undef vfork */ - -/* Define if you have the _doprnt function. */ -/* #undef HAVE__DOPRNT */ - -/* Define if you have the asprintf function. */ +/* Define to 1 if you have the `asprintf' function. */ #define HAVE_ASPRINTF 1 -/* Define if you have the atexit function. */ +/* Define to 1 if you have the `atexit' function. */ #define HAVE_ATEXIT 1 -/* Define if you have the basename function. */ +/* Define to 1 if you have the `basename' function. */ #define HAVE_BASENAME 1 -/* Define if you have the bcmp function. */ +/* Define to 1 if you have the `bcmp' function. */ #define HAVE_BCMP 1 -/* Define if you have the bcopy function. */ +/* Define to 1 if you have the `bcopy' function. */ #define HAVE_BCOPY 1 -/* Define if you have the bsearch function. */ +/* Define to 1 if you have the `bsearch' function. */ #define HAVE_BSEARCH 1 -/* Define if you have the bzero function. */ +/* Define to 1 if you have the `bzero' function. */ #define HAVE_BZERO 1 -/* Define if you have the calloc function. */ +/* Define to 1 if you have the `calloc' function. */ #define HAVE_CALLOC 1 -/* Define if you have the clock function. */ +/* Define to 1 if you have the `canonicalize_file_name' function. */ +/* #undef HAVE_CANONICALIZE_FILE_NAME */ + +/* Define to 1 if you have the `clock' function. */ #define HAVE_CLOCK 1 -/* Define if you have the ffs function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `ffs' function. */ #define HAVE_FFS 1 -/* Define if you have the getcwd function. */ +/* Define to 1 if you have the `fork' function. */ +#define HAVE_FORK 1 + +/* Define to 1 if you have the `getcwd' function. */ #define HAVE_GETCWD 1 -/* Define if you have the getpagesize function. */ +/* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 -/* Define if you have the getrusage function. */ +/* Define to 1 if you have the `getrusage' function. */ #define HAVE_GETRUSAGE 1 -/* Define if you have the gettimeofday function. */ +/* Define to 1 if you have the `getsysinfo' function. */ +/* #undef HAVE_GETSYSINFO */ + +/* Define to 1 if you have the `gettimeofday' function. */ #define HAVE_GETTIMEOFDAY 1 -/* Define if you have the index function. */ +/* Define to 1 if you have the `index' function. */ #define HAVE_INDEX 1 -/* Define if you have the insque function. */ +/* Define to 1 if you have the `insque' function. */ #define HAVE_INSQUE 1 -/* Define if you have the memchr function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MACHINE_HAL_SYSINFO_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MALLOC_H */ + +/* Define to 1 if you have the `memchr' function. */ #define HAVE_MEMCHR 1 -/* Define if you have the memcmp function. */ +/* Define to 1 if you have the `memcmp' function. */ #define HAVE_MEMCMP 1 -/* Define if you have the memcpy function. */ +/* Define to 1 if you have the `memcpy' function. */ #define HAVE_MEMCPY 1 -/* Define if you have the memmove function. */ +/* Define to 1 if you have the `memmove' function. */ #define HAVE_MEMMOVE 1 -/* Define if you have the memset function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mempcpy' function. */ +/* #undef HAVE_MEMPCPY */ + +/* Define to 1 if you have the `memset' function. */ #define HAVE_MEMSET 1 -/* Define if you have the mkstemps function. */ +/* Define to 1 if you have the `mkstemps' function. */ #define HAVE_MKSTEMPS 1 -/* Define if you have the on_exit function. */ +/* Define to 1 if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 + +/* Define to 1 if you have the `on_exit' function. */ /* #undef HAVE_ON_EXIT */ -/* Define if you have the psignal function. */ +/* Define to 1 if you have the `psignal' function. */ #define HAVE_PSIGNAL 1 -/* Define if you have the putenv function. */ +/* Define to 1 if you have the `pstat_getdynamic' function. */ +/* #undef HAVE_PSTAT_GETDYNAMIC */ + +/* Define to 1 if you have the `pstat_getstatic' function. */ +/* #undef HAVE_PSTAT_GETSTATIC */ + +/* Define to 1 if you have the `putenv' function. */ #define HAVE_PUTENV 1 -/* Define if you have the random function. */ +/* Define to 1 if you have the `random' function. */ #define HAVE_RANDOM 1 -/* Define if you have the rename function. */ +/* Define to 1 if you have the `realpath' function. */ +#define HAVE_REALPATH 1 + +/* Define to 1 if you have the `rename' function. */ #define HAVE_RENAME 1 -/* Define if you have the rindex function. */ +/* Define to 1 if you have the `rindex' function. */ #define HAVE_RINDEX 1 -/* Define if you have the sbrk function. */ +/* Define to 1 if you have the `sbrk' function. */ #define HAVE_SBRK 1 -/* Define if you have the setenv function. */ +/* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 -/* Define if you have the sigsetmask function. */ +/* Define to 1 if you have the `sigsetmask' function. */ #define HAVE_SIGSETMASK 1 -/* Define if you have the strcasecmp function. */ +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `stpcpy' function. */ +#define HAVE_STPCPY 1 + +/* Define to 1 if you have the `stpncpy' function. */ +/* #undef HAVE_STPNCPY */ + +/* Define to 1 if you have the `strcasecmp' function. */ #define HAVE_STRCASECMP 1 -/* Define if you have the strchr function. */ +/* Define to 1 if you have the `strchr' function. */ #define HAVE_STRCHR 1 -/* Define if you have the strdup function. */ +/* Define to 1 if you have the `strdup' function. */ #define HAVE_STRDUP 1 -/* Define if you have the strerror function. */ +/* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 -/* Define if you have the strncasecmp function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strncasecmp' function. */ #define HAVE_STRNCASECMP 1 -/* Define if you have the strrchr function. */ +/* Define to 1 if you have the `strrchr' function. */ #define HAVE_STRRCHR 1 -/* Define if you have the strsignal function. */ +/* Define to 1 if you have the `strsignal' function. */ #define HAVE_STRSIGNAL 1 -/* Define if you have the strstr function. */ +/* Define to 1 if you have the `strstr' function. */ #define HAVE_STRSTR 1 -/* Define if you have the strtod function. */ +/* Define to 1 if you have the `strtod' function. */ #define HAVE_STRTOD 1 -/* Define if you have the strtol function. */ +/* Define to 1 if you have the `strtol' function. */ #define HAVE_STRTOL 1 -/* Define if you have the strtoul function. */ +/* Define to 1 if you have the `strtoul' function. */ #define HAVE_STRTOUL 1 -/* Define if you have the sysconf function. */ +/* Define to 1 if you have the `sysconf' function. */ #define HAVE_SYSCONF 1 -/* Define if you have the times function. */ +/* Define to 1 if you have the `sysctl' function. */ +#define HAVE_SYSCTL 1 + +/* Define to 1 if you have the `sysmp' function. */ +/* #undef HAVE_SYSMP */ + +/* Define if you have the sys_errlist variable. */ +#define HAVE_SYS_ERRLIST 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_FILE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + +/* Define if you have the sys_nerr variable. */ +#define HAVE_SYS_NERR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_PSTAT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define if you have the sys_siglist variable. */ +#define HAVE_SYS_SIGLIST 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SYSCTL_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SYSINFO_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SYSMP_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SYSTEMCFG_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_TABLE_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the `table' function. */ +/* #undef HAVE_TABLE */ + +/* Define to 1 if you have the `times' function. */ #define HAVE_TIMES 1 -/* Define if you have the tmpnam function. */ +/* Define to 1 if you have the header file. */ +#define HAVE_TIME_H 1 + +/* Define to 1 if you have the `tmpnam' function. */ #define HAVE_TMPNAM 1 -/* Define if you have the vasprintf function. */ +/* Define if you have the \`uintptr_t' type. */ +#define HAVE_UINTPTR_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `vasprintf' function. */ #define HAVE_VASPRINTF 1 -/* Define if you have the vfprintf function. */ +/* Define to 1 if you have the `vfork' function. */ +#define HAVE_VFORK 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_VFORK_H */ + +/* Define to 1 if you have the `vfprintf' function. */ #define HAVE_VFPRINTF 1 -/* Define if you have the vprintf function. */ +/* Define to 1 if you have the `vprintf' function. */ #define HAVE_VPRINTF 1 -/* Define if you have the vsprintf function. */ +/* Define to 1 if you have the `vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Define to 1 if you have the `vsprintf' function. */ #define HAVE_VSPRINTF 1 -/* Define if you have the waitpid function. */ +/* Define to 1 if you have the `waitpid' function. */ #define HAVE_WAITPID 1 -/* Define if you have the header file. */ -/* #undef HAVE_ALLOCA_H */ +/* Define to 1 if `fork' works. */ +#define HAVE_WORKING_FORK 1 -/* Define if you have the header file. */ -#define HAVE_FCNTL_H 1 +/* Define to 1 if `vfork' works. */ +#define HAVE_WORKING_VFORK 1 -/* Define if you have the header file. */ -#define HAVE_LIMITS_H 1 +/* Define to 1 if you have the `_doprnt' function. */ +/* #undef HAVE__DOPRNT */ -/* Define if you have the header file. */ -#define HAVE_STDLIB_H 1 +/* Define if you have the _system_configuration variable. */ +/* #undef HAVE__SYSTEM_CONFIGURATION */ -/* Define if you have the header file. */ -#define HAVE_STRING_H 1 +/* Define if the host machine stores words of multi-word integers in + big-endian order. */ +/* #undef HOST_WORDS_BIG_ENDIAN */ -/* Define if you have the header file. */ -#define HAVE_STRINGS_H 1 +/* Define if canonicalize_file_name is not declared in system header files. */ +#define NEED_DECLARATION_CANONICALIZE_FILE_NAME 1 -/* Define if you have the header file. */ -#define HAVE_SYS_FILE_H 1 +/* Define if errno must be declared even when is included. */ +/* #undef NEED_DECLARATION_ERRNO */ -/* Define if you have the header file. */ -#define HAVE_SYS_MMAN_H 1 +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +/* #undef NO_MINUS_C_MINUS_O */ -/* Define if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" -/* Define if you have the header file. */ -#define HAVE_SYS_RESOURCE_H 1 +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" -/* Define if you have the header file. */ -#define HAVE_SYS_STAT_H 1 +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" -/* Define if you have the header file. */ -#define HAVE_SYS_TIME_H 1 +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" -/* Define if you have the header file. */ -#define HAVE_TIME_H 1 +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" -/* Define if you have the header file. */ -#define HAVE_UNISTD_H 1 +/* Define if you know the direction of stack growth for your system; otherwise + it will be automatically deduced at run-time. STACK_DIRECTION > 0 => grows + toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +#define STACK_DIRECTION -1 -/* Define if errno must be declared even when is included. */ -/* #undef NEED_DECLARATION_ERRNO */ +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 -/* Define if you have the `uintptr_t' type. */ -#define HAVE_UINTPTR_T 1 +/* Define to 1 if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 -/* Define if you have the sys_errlist variable. */ -#define HAVE_SYS_ERRLIST 1 +/* whether byteorder is bigendian */ +/* #undef WORDS_BIGENDIAN */ -/* Define if you have the sys_nerr variable. */ -#define HAVE_SYS_NERR 1 +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ -/* Define if you have the sys_siglist variable. */ -#define HAVE_SYS_SIGLIST 1 +/* Define as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ +/* #undef inline */ -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP - systems. This function is required for alloca.c support on those - systems. */ -/* #undef CRAY_STACKSEG_END */ +/* Define to `int' if does not define. */ +/* #undef pid_t */ -/* Define if you know the direction of stack growth for your system; - otherwise it will be automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -#define STACK_DIRECTION -1 +/* Define to `unsigned long' if does not define. */ +/* #undef uintptr_t */ +/* Define as `fork' if `vfork' does not work. */ +/* #undef vfork */ From owner-p4-projects@FreeBSD.ORG Sun Feb 22 15:04:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E8F416A4D2; Sun, 22 Feb 2004 15:04:24 -0800 (PST) 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 2BF3F16A4CE for ; Sun, 22 Feb 2004 15:04:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 23BCA43D1D for ; Sun, 22 Feb 2004 15:04:24 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1MN4OGe021642 for ; Sun, 22 Feb 2004 15:04:24 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1MN4NRu021639 for perforce@freebsd.org; Sun, 22 Feb 2004 15:04:23 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sun, 22 Feb 2004 15:04:23 -0800 (PST) Message-Id: <200402222304.i1MN4NRu021639@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 47439 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, 22 Feb 2004 23:04:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=47439 Change 47439 by marcel@marcel_nfs on 2004/02/22 15:03:48 Get libbfd to compile. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile#2 edit .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.i386#2 edit .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/bfdver.h#1 add .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/i386/bfd.h#2 edit .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/i386/config.h#1 add Differences ... ==== //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile#2 (text+ko) ==== @@ -9,16 +9,11 @@ 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 \ - targmatch.h dwarf1.c dwarf2.c config.h -.if (${TARGET_ARCH} == "alpha" || ${TARGET_ARCH} == "ia64" || ${TARGET_ARCH} == "sparc64") -WARNS= 2 -.endif -WARNS=0 + targmatch.h dwarf1.c dwarf2.c +WARNS=2 CFLAGS+= -I${SRCDIR}/bfd -CFLAGS+= -DBFD_VERSION=\"${VERSION_DATE}\" -DBFD_VERSION_DATE=${VERSION_DATE} -CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" INTERNALLIB= true -CLEANFILES+= config.h targmatch.h +CLEANFILES+= targmatch.h SELARCH= .if ${TARGET_ARCH} == "amd64" @@ -49,12 +44,5 @@ 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} -.else - sed -e 's,!!TRAD_HEADER!!,,g' ${.ALLSRC} > ${.TARGET} -.endif .include ==== //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.i386#2 (text+ko) ==== @@ -2,7 +2,7 @@ DEFAULT_VECTOR= bfd_elf32_i386_freebsd_vec -SRCS+= cpu-i386.c elf32-i386-fbsd.c elf32-i386.c elf32-target.h elf32.c elflink.c +SRCS+= cpu-i386.c elf32-i386.c elf32-target.h elf32.c elflink.c VECS= ${DEFAULT_VECTOR} bfd_elf32_i386_vec .if ${TARGET_ARCH} == "i386" CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR} ==== //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/i386/bfd.h#2 (text+ko) ==== @@ -1,15 +1,16 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/i386/bfd.h,v 1.20 2002/12/02 09:49:57 obrien Exp $ */ - +/* $FreeBSD$ */ /* 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 +50,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 +58,11 @@ /* The word size of the default bfd target. */ #define BFD_DEFAULT_TARGET_SIZE 32 -#if defined(__alpha__) || defined(__sparc64__) -#define BFD_HOST_64BIT_LONG 1 -#else #define BFD_HOST_64BIT_LONG 0 -#endif /* 64-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 long +#define BFD_HOST_U_64_BIT unsigned long long #endif #if BFD_ARCH_SIZE >= 64 @@ -84,63 +78,46 @@ #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. + + General rule: Functions which are bfd_boolean return TRUE on + success and FALSE on failure (unless they're a predicate). */ + +typedef int bfd_boolean; +#undef FALSE +#undef TRUE +#define FALSE 0 +#define TRUE 1 -/* 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; +#if 0 +/* Poison. */ +#undef false +#undef true +#define false dont_use_false_in_bfd +#define true dont_use_true_in_bfd #endif /* 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. */ + set to 1 above. Otherwise, if the host compiler used during + configuration supports long long, this code will use it. + Otherwise, BFD_HOST_64_BIT must be defined above. */ #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 +# if BFD_HOST_LONG_LONG # 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_LONG_LONG */ # endif /* ! BFD_HOST_64BIT_LONG */ #endif /* ! defined (BFD_HOST_64_BIT) */ @@ -191,19 +168,13 @@ #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; +/* 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 +187,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 +250,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 +305,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 +316,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 +332,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 +360,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 +393,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. */ -extern PTR bfd_hash_allocate PARAMS ((struct bfd_hash_table *, - unsigned int)); +extern void *bfd_hash_allocate + (struct bfd_hash_table *, unsigned int); /* Traverse a hash table in a random order, calling a function on each - element. If the function returns false, the traversal stops. The + element. If the function returns FALSE, the traversal stops. The INFO argument is passed to the function. */ -extern void bfd_hash_traverse PARAMS ((struct bfd_hash_table *, - boolean (*) (struct bfd_hash_entry *, - PTR), - PTR info)); +extern void bfd_hash_traverse + (struct bfd_hash_table *, + bfd_boolean (*) (struct bfd_hash_entry *, void *), + void *info); -#define COFF_SWAP_TABLE (PTR) &bfd_coff_std_swap_table +#define COFF_SWAP_TABLE (void *) &bfd_coff_std_swap_table /* User program access to BFD facilities. */ /* Direct I/O routines, for programs which know more about the object file than BFD does. Use higher level routines if possible. */ -extern bfd_size_type bfd_bread PARAMS ((PTR, bfd_size_type, bfd *)); -extern bfd_size_type bfd_bwrite PARAMS ((const PTR, bfd_size_type, bfd *)); -extern int bfd_seek PARAMS ((bfd *, file_ptr, int)); -extern ufile_ptr bfd_tell PARAMS ((bfd *)); -extern int bfd_flush PARAMS ((bfd *)); -extern int bfd_stat PARAMS ((bfd *, struct stat *)); +extern bfd_size_type bfd_bread (void *, bfd_size_type, bfd *); +extern bfd_size_type bfd_bwrite (const void *, bfd_size_type, bfd *); +extern int bfd_seek (bfd *, file_ptr, int); +extern file_ptr bfd_tell (bfd *); +extern int bfd_flush (bfd *); +extern int bfd_stat (bfd *, struct stat *); /* Deprecated old routines. */ #if __GNUC__ @@ -505,8 +478,7 @@ (warn_deprecated ("bfd_write", (const char *) 0, 0, (const char *) 0),\ bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD))) #endif -extern void warn_deprecated - PARAMS ((const char *, const char *, int, const char *)); +extern void warn_deprecated (const char *, const char *, int, const char *); /* Cast from const char * to char * so that caller can assign to a char * without a warning. */ @@ -542,40 +514,41 @@ #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char) -#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = (boolean) (bool)), true) +#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE) -extern boolean bfd_cache_close PARAMS ((bfd *abfd)); +extern bfd_boolean bfd_cache_close + (bfd *abfd); /* NB: This declaration should match the autogenerated one in libbfd.h. */ -extern boolean bfd_record_phdr - PARAMS ((bfd *, unsigned long, boolean, flagword, boolean, bfd_vma, - boolean, boolean, unsigned int, struct sec **)); +extern bfd_boolean bfd_record_phdr + (bfd *, unsigned long, bfd_boolean, flagword, bfd_boolean, bfd_vma, + bfd_boolean, bfd_boolean, unsigned int, struct bfd_section **); /* Byte swapping routines. */ -bfd_vma bfd_getb64 PARAMS ((const unsigned char *)); -bfd_vma bfd_getl64 PARAMS ((const unsigned char *)); -bfd_signed_vma bfd_getb_signed_64 PARAMS ((const unsigned char *)); -bfd_signed_vma bfd_getl_signed_64 PARAMS ((const unsigned char *)); -bfd_vma bfd_getb32 PARAMS ((const unsigned char *)); -bfd_vma bfd_getl32 PARAMS ((const unsigned char *)); -bfd_signed_vma bfd_getb_signed_32 PARAMS ((const unsigned char *)); -bfd_signed_vma bfd_getl_signed_32 PARAMS ((const unsigned char *)); -bfd_vma bfd_getb16 PARAMS ((const unsigned char *)); -bfd_vma bfd_getl16 PARAMS ((const unsigned char *)); -bfd_signed_vma bfd_getb_signed_16 PARAMS ((const unsigned char *)); -bfd_signed_vma bfd_getl_signed_16 PARAMS ((const unsigned char *)); -void bfd_putb64 PARAMS ((bfd_vma, unsigned char *)); -void bfd_putl64 PARAMS ((bfd_vma, unsigned char *)); -void bfd_putb32 PARAMS ((bfd_vma, unsigned char *)); -void bfd_putl32 PARAMS ((bfd_vma, unsigned char *)); -void bfd_putb16 PARAMS ((bfd_vma, unsigned char *)); -void bfd_putl16 PARAMS ((bfd_vma, unsigned char *)); +bfd_vma bfd_getb64 (const unsigned char *); +bfd_vma bfd_getl64 (const unsigned char *); +bfd_signed_vma bfd_getb_signed_64 (const unsigned char *); +bfd_signed_vma bfd_getl_signed_64 (const unsigned char *); +bfd_vma bfd_getb32 (const unsigned char *); +bfd_vma bfd_getl32 (const unsigned char *); +bfd_signed_vma bfd_getb_signed_32 (const unsigned char *); +bfd_signed_vma bfd_getl_signed_32 (const unsigned char *); +bfd_vma bfd_getb16 (const unsigned char *); +bfd_vma bfd_getl16 (const unsigned char *); +bfd_signed_vma bfd_getb_signed_16 (const unsigned char *); +bfd_signed_vma bfd_getl_signed_16 (const unsigned char *); +void bfd_putb64 (bfd_vma, unsigned char *); +void bfd_putl64 (bfd_vma, unsigned char *); +void bfd_putb32 (bfd_vma, unsigned char *); +void bfd_putl32 (bfd_vma, unsigned char *); +void bfd_putb16 (bfd_vma, unsigned char *); +void bfd_putl16 (bfd_vma, unsigned char *); /* Byte swapping routines which take size and endiannes as arguments. */ -bfd_vma bfd_get_bits PARAMS ((bfd_byte *, int, boolean)); -void bfd_put_bits PARAMS ((bfd_vma, bfd_byte *, int, boolean)); +bfd_vma bfd_get_bits (bfd_byte *, int, bfd_boolean); +void bfd_put_bits (bfd_vma, bfd_byte *, int, bfd_boolean); /* Externally visible ECOFF routines. */ @@ -583,59 +556,54 @@ struct ecoff_debug_info; struct ecoff_debug_swap; struct ecoff_extr; -struct symbol_cache_entry; +struct bfd_symbol; struct bfd_link_info; struct bfd_link_hash_entry; struct bfd_elf_version_tree; #endif -extern bfd_vma bfd_ecoff_get_gp_value PARAMS ((bfd * abfd)); -extern boolean bfd_ecoff_set_gp_value PARAMS ((bfd *abfd, bfd_vma gp_value)); -extern boolean bfd_ecoff_set_regmasks - PARAMS ((bfd *abfd, unsigned long gprmask, unsigned long fprmask, - unsigned long *cprmask)); -extern PTR bfd_ecoff_debug_init - PARAMS ((bfd *output_bfd, struct ecoff_debug_info *output_debug, - const struct ecoff_debug_swap *output_swap, - struct bfd_link_info *)); +extern bfd_vma bfd_ecoff_get_gp_value + (bfd * abfd); +extern bfd_boolean bfd_ecoff_set_gp_value + (bfd *abfd, bfd_vma gp_value); +extern bfd_boolean bfd_ecoff_set_regmasks + (bfd *abfd, unsigned long gprmask, unsigned long fprmask, + unsigned long *cprmask); +extern void *bfd_ecoff_debug_init + (bfd *output_bfd, struct ecoff_debug_info *output_debug, + const struct ecoff_debug_swap *output_swap, struct bfd_link_info *); extern void bfd_ecoff_debug_free - PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug, - const struct ecoff_debug_swap *output_swap, - struct bfd_link_info *)); -extern boolean bfd_ecoff_debug_accumulate - PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug, - const struct ecoff_debug_swap *output_swap, - bfd *input_bfd, struct ecoff_debug_info *input_debug, - const struct ecoff_debug_swap *input_swap, - struct bfd_link_info *)); -extern boolean bfd_ecoff_debug_accumulate_other - PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug, - const struct ecoff_debug_swap *output_swap, bfd *input_bfd, - struct bfd_link_info *)); -extern boolean bfd_ecoff_debug_externals - PARAMS ((bfd *abfd, struct ecoff_debug_info *debug, - const struct ecoff_debug_swap *swap, - boolean relocateable, - boolean (*get_extr) (struct symbol_cache_entry *, - struct ecoff_extr *), - void (*set_index) (struct symbol_cache_entry *, - bfd_size_type))); -extern boolean bfd_ecoff_debug_one_external - PARAMS ((bfd *abfd, struct ecoff_debug_info *debug, - const struct ecoff_debug_swap *swap, - const char *name, struct ecoff_extr *esym)); + (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug, + const struct ecoff_debug_swap *output_swap, struct bfd_link_info *); +extern bfd_boolean bfd_ecoff_debug_accumulate + (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug, + const struct ecoff_debug_swap *output_swap, bfd *input_bfd, + struct ecoff_debug_info *input_debug, + const struct ecoff_debug_swap *input_swap, struct bfd_link_info *); +extern bfd_boolean bfd_ecoff_debug_accumulate_other + (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug, + const struct ecoff_debug_swap *output_swap, bfd *input_bfd, + struct bfd_link_info *); +extern bfd_boolean bfd_ecoff_debug_externals + (bfd *abfd, struct ecoff_debug_info *debug, + const struct ecoff_debug_swap *swap, bfd_boolean relocatable, + bfd_boolean (*get_extr) (struct bfd_symbol *, struct ecoff_extr *), + void (*set_index) (struct bfd_symbol *, bfd_size_type)); +extern bfd_boolean bfd_ecoff_debug_one_external + (bfd *abfd, struct ecoff_debug_info *debug, + const struct ecoff_debug_swap *swap, const char *name, + struct ecoff_extr *esym); extern bfd_size_type bfd_ecoff_debug_size - PARAMS ((bfd *abfd, struct ecoff_debug_info *debug, - const struct ecoff_debug_swap *swap)); -extern boolean bfd_ecoff_write_debug - PARAMS ((bfd *abfd, struct ecoff_debug_info *debug, - const struct ecoff_debug_swap *swap, file_ptr where)); -extern boolean bfd_ecoff_write_accumulated_debug - PARAMS ((PTR handle, bfd *abfd, struct ecoff_debug_info *debug, - const struct ecoff_debug_swap *swap, - struct bfd_link_info *info, file_ptr where)); -extern boolean bfd_mips_ecoff_create_embedded_relocs - PARAMS ((bfd *, struct bfd_link_info *, struct sec *, struct sec *, - char **)); + (bfd *abfd, struct ecoff_debug_info *debug, + const struct ecoff_debug_swap *swap); +extern bfd_boolean bfd_ecoff_write_debug + (bfd *abfd, struct ecoff_debug_info *debug, + const struct ecoff_debug_swap *swap, file_ptr where); +extern bfd_boolean bfd_ecoff_write_accumulated_debug + (void *handle, bfd *abfd, struct ecoff_debug_info *debug, + const struct ecoff_debug_swap *swap, + struct bfd_link_info *info, file_ptr where); +extern bfd_boolean bfd_mips_ecoff_create_embedded_relocs + (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, char **); /* Externally visible ELF routines. */ @@ -646,36 +614,36 @@ const char *name; }; -extern boolean bfd_elf32_record_link_assignment - PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean)); -extern boolean bfd_elf64_record_link_assignment - PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean)); +extern bfd_boolean bfd_elf_record_link_assignment + (bfd *, struct bfd_link_info *, const char *, bfd_boolean); extern struct bfd_link_needed_list *bfd_elf_get_needed_list - PARAMS ((bfd *, struct bfd_link_info *)); -extern boolean bfd_elf_get_bfd_needed_list - PARAMS ((bfd *, struct bfd_link_needed_list **)); -extern boolean bfd_elf32_size_dynamic_sections - PARAMS ((bfd *, const char *, const char *, const char *, - const char * const *, struct bfd_link_info *, struct sec **, - struct bfd_elf_version_tree *)); -extern boolean bfd_elf64_size_dynamic_sections - PARAMS ((bfd *, const char *, const char *, const char *, - const char * const *, struct bfd_link_info *, struct sec **, - struct bfd_elf_version_tree *)); -extern void bfd_elf_set_dt_needed_name PARAMS ((bfd *, const char *)); -extern void bfd_elf_set_dt_needed_soname PARAMS ((bfd *, const char *)); -extern const char *bfd_elf_get_dt_soname PARAMS ((bfd *)); + (bfd *, struct bfd_link_info *); +extern bfd_boolean bfd_elf_get_bfd_needed_list + (bfd *, struct bfd_link_needed_list **); +extern bfd_boolean bfd_elf32_size_dynamic_sections + (bfd *, const char *, const char *, const char *, const char * const *, + struct bfd_link_info *, struct bfd_section **, struct bfd_elf_version_tree *); +extern bfd_boolean bfd_elf64_size_dynamic_sections + (bfd *, const char *, const char *, const char *, const char * const *, + struct bfd_link_info *, struct bfd_section **, struct bfd_elf_version_tree *); +extern void bfd_elf_set_dt_needed_name + (bfd *, const char *); +extern void bfd_elf_set_dt_needed_soname + (bfd *, const char *); +extern const char *bfd_elf_get_dt_soname + (bfd *); extern struct bfd_link_needed_list *bfd_elf_get_runpath_list - PARAMS ((bfd *, struct bfd_link_info *)); -extern boolean bfd_elf32_discard_info - PARAMS ((bfd *, struct bfd_link_info *)); -extern boolean bfd_elf64_discard_info - PARAMS ((bfd *, struct bfd_link_info *)); + (bfd *, struct bfd_link_info *); +extern bfd_boolean bfd_elf32_discard_info + (bfd *, struct bfd_link_info *); +extern bfd_boolean bfd_elf64_discard_info + (bfd *, struct bfd_link_info *); /* Return an upper bound on the number of bytes required to store a copy of ABFD's program header table entries. Return -1 if an error occurs; bfd_get_error will return an appropriate code. */ -extern long bfd_get_elf_phdr_upper_bound PARAMS ((bfd *abfd)); +extern long bfd_get_elf_phdr_upper_bound + (bfd *abfd); /* Copy ABFD's program header table entries to *PHDRS. The entries will be stored as an array of Elf_Internal_Phdr structures, as @@ -684,39 +652,58 @@ Return the number of program header table entries read, or -1 if an error occurs; bfd_get_error will return an appropriate code. */ -extern int bfd_get_elf_phdrs PARAMS ((bfd *abfd, void *phdrs)); +extern int bfd_get_elf_phdrs + (bfd *abfd, void *phdrs); + +/* Create a new BFD as if by bfd_openr. Rather than opening a file, + reconstruct an ELF file by reading the segments out of remote memory + based on the ELF file header at EHDR_VMA and the ELF program headers it + points to. If not null, *LOADBASEP is filled in with the difference + between the VMAs from which the segments were read, and the VMAs the + file headers (and hence BFD's idea of each section's VMA) put them at. + + The function TARGET_READ_MEMORY is called to copy LEN bytes from the + remote memory at target address VMA into the local buffer at MYADDR; it + should return zero on success or an `errno' code on failure. TEMPL must + be a BFD for an ELF target with the word size and byte order found in + the remote memory. */ +extern bfd *bfd_elf_bfd_from_remote_memory + (bfd *templ, bfd_vma ehdr_vma, bfd_vma *loadbasep, + int (*target_read_memory) (bfd_vma vma, char *myaddr, int len)); /* Return the arch_size field of an elf bfd, or -1 if not elf. */ -extern int bfd_get_arch_size PARAMS ((bfd *)); +extern int bfd_get_arch_size + (bfd *); + +/* Return TRUE if address "naturally" sign extends, or -1 if not elf. */ +extern int bfd_get_sign_extend_vma + (bfd *); -/* Return true if address "naturally" sign extends, or -1 if not elf. */ -extern int bfd_get_sign_extend_vma PARAMS ((bfd *)); +extern struct bfd_section *_bfd_elf_tls_setup + (bfd *, struct bfd_link_info *); -extern boolean bfd_m68k_elf32_create_embedded_relocs - PARAMS ((bfd *, struct bfd_link_info *, struct sec *, struct sec *, - char **)); -extern boolean bfd_mips_elf32_create_embedded_relocs - PARAMS ((bfd *, struct bfd_link_info *, struct sec *, struct sec *, - char **)); +extern bfd_boolean bfd_m68k_elf32_create_embedded_relocs + (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, char **); +extern bfd_boolean bfd_mips_elf32_create_embedded_relocs + (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, char **); /* SunOS shared library support routines for the linker. */ extern struct bfd_link_needed_list *bfd_sunos_get_needed_list - PARAMS ((bfd *, struct bfd_link_info *)); -extern boolean bfd_sunos_record_link_assignment - PARAMS ((bfd *, struct bfd_link_info *, const char *)); -extern boolean bfd_sunos_size_dynamic_sections - PARAMS ((bfd *, struct bfd_link_info *, struct sec **, struct sec **, - struct sec **)); + (bfd *, struct bfd_link_info *); +extern bfd_boolean bfd_sunos_record_link_assignment + (bfd *, struct bfd_link_info *, const char *); +extern bfd_boolean bfd_sunos_size_dynamic_sections + (bfd *, struct bfd_link_info *, struct bfd_section **, struct bfd_section **, struct bfd_section **); /* Linux shared library support routines for the linker. */ -extern boolean bfd_i386linux_size_dynamic_sections - PARAMS ((bfd *, struct bfd_link_info *)); -extern boolean bfd_m68klinux_size_dynamic_sections - PARAMS ((bfd *, struct bfd_link_info *)); -extern boolean bfd_sparclinux_size_dynamic_sections - PARAMS ((bfd *, struct bfd_link_info *)); +extern bfd_boolean bfd_i386linux_size_dynamic_sections + (bfd *, struct bfd_link_info *); +extern bfd_boolean bfd_m68klinux_size_dynamic_sections + (bfd *, struct bfd_link_info *); +extern bfd_boolean bfd_sparclinux_size_dynamic_sections + (bfd *, struct bfd_link_info *); /* mmap hacks */ @@ -726,7 +713,7 @@ typedef struct _bfd_window { /* What the user asked for. */ - PTR data; + void *data; bfd_size_type size; /* The actual window used by BFD. Small user-requested read-only regions sharing a page may share a single window into the object @@ -738,34 +725,36 @@ } bfd_window; -extern void bfd_init_window PARAMS ((bfd_window *)); -extern void bfd_free_window PARAMS ((bfd_window *)); -extern boolean bfd_get_file_window - PARAMS ((bfd *, file_ptr, bfd_size_type, bfd_window *, boolean)); +extern void bfd_init_window + (bfd_window *); +extern void bfd_free_window + (bfd_window *); +extern bfd_boolean bfd_get_file_window + (bfd *, file_ptr, bfd_size_type, bfd_window *, bfd_boolean); /* XCOFF support routines for the linker. */ -extern boolean bfd_xcoff_link_record_set - PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, - bfd_size_type)); -extern boolean bfd_xcoff_import_symbol - PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, - bfd_vma, const char *, const char *, const char *, unsigned int)); -extern boolean bfd_xcoff_export_symbol - PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *)); -extern boolean bfd_xcoff_link_count_reloc - PARAMS ((bfd *, struct bfd_link_info *, const char *)); -extern boolean bfd_xcoff_record_link_assignment - PARAMS ((bfd *, struct bfd_link_info *, const char *)); -extern boolean bfd_xcoff_size_dynamic_sections - PARAMS ((bfd *, struct bfd_link_info *, const char *, const char *, - unsigned long, unsigned long, unsigned long, boolean, - int, boolean, boolean, struct sec **, boolean)); -extern boolean bfd_xcoff_link_generate_rtinit - PARAMS ((bfd *, const char *, const char *, boolean)); +extern bfd_boolean bfd_xcoff_link_record_set + (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, bfd_size_type); +extern bfd_boolean bfd_xcoff_import_symbol + (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, bfd_vma, + const char *, const char *, const char *, unsigned int); +extern bfd_boolean bfd_xcoff_export_symbol + (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *); +extern bfd_boolean bfd_xcoff_link_count_reloc + (bfd *, struct bfd_link_info *, const char *); +extern bfd_boolean bfd_xcoff_record_link_assignment + (bfd *, struct bfd_link_info *, const char *); +extern bfd_boolean bfd_xcoff_size_dynamic_sections + (bfd *, struct bfd_link_info *, const char *, const char *, + unsigned long, unsigned long, unsigned long, bfd_boolean, + int, bfd_boolean, bfd_boolean, struct bfd_section **, bfd_boolean); +extern bfd_boolean bfd_xcoff_link_generate_rtinit + (bfd *, const char *, const char *, bfd_boolean); /* XCOFF support routines for ar. */ -extern boolean bfd_xcoff_ar_archive_set_magic PARAMS ((bfd *, char *)); +extern bfd_boolean bfd_xcoff_ar_archive_set_magic + (bfd *, char *); /* Externally visible COFF routines. */ @@ -774,144 +763,165 @@ union internal_auxent; #endif -extern boolean bfd_coff_get_syment - PARAMS ((bfd *, struct symbol_cache_entry *, struct internal_syment *)); +extern bfd_boolean bfd_coff_get_syment + (bfd *, struct bfd_symbol *, struct internal_syment *); -extern boolean bfd_coff_get_auxent - PARAMS ((bfd *, struct symbol_cache_entry *, int, union internal_auxent *)); +extern bfd_boolean bfd_coff_get_auxent + (bfd *, struct bfd_symbol *, int, union internal_auxent *); -extern boolean bfd_coff_set_symbol_class - PARAMS ((bfd *, struct symbol_cache_entry *, unsigned int)); +extern bfd_boolean bfd_coff_set_symbol_class + (bfd *, struct bfd_symbol *, unsigned int); -extern boolean bfd_m68k_coff_create_embedded_relocs - PARAMS ((bfd *, struct bfd_link_info *, struct sec *, struct sec *, - char **)); +extern bfd_boolean bfd_m68k_coff_create_embedded_relocs + (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, char **); /* ARM Interworking support. Called from linker. */ -extern boolean bfd_arm_allocate_interworking_sections - PARAMS ((struct bfd_link_info *)); +extern bfd_boolean bfd_arm_allocate_interworking_sections + (struct bfd_link_info *); -extern boolean bfd_arm_process_before_allocation - PARAMS ((bfd *, struct bfd_link_info *, int)); +extern bfd_boolean bfd_arm_process_before_allocation + (bfd *, struct bfd_link_info *, int); -extern boolean bfd_arm_get_bfd_for_interworking - PARAMS ((bfd *, struct bfd_link_info *)); +extern bfd_boolean bfd_arm_get_bfd_for_interworking + (bfd *, struct bfd_link_info *); /* PE ARM Interworking support. Called from linker. */ -extern boolean bfd_arm_pe_allocate_interworking_sections - PARAMS ((struct bfd_link_info *)); +extern bfd_boolean bfd_arm_pe_allocate_interworking_sections + (struct bfd_link_info *); -extern boolean bfd_arm_pe_process_before_allocation - PARAMS ((bfd *, struct bfd_link_info *, int)); +extern bfd_boolean bfd_arm_pe_process_before_allocation + (bfd *, struct bfd_link_info *, int); -extern boolean bfd_arm_pe_get_bfd_for_interworking - PARAMS ((bfd *, struct bfd_link_info *)); +extern bfd_boolean bfd_arm_pe_get_bfd_for_interworking + (bfd *, struct bfd_link_info *); /* ELF ARM Interworking support. Called from linker. */ -extern boolean bfd_elf32_arm_allocate_interworking_sections - PARAMS ((struct bfd_link_info *)); +extern bfd_boolean bfd_elf32_arm_allocate_interworking_sections + (struct bfd_link_info *); + +extern bfd_boolean bfd_elf32_arm_process_before_allocation + (bfd *, struct bfd_link_info *, int); + +extern bfd_boolean bfd_elf32_arm_get_bfd_for_interworking + (bfd *, struct bfd_link_info *); + +extern bfd_boolean bfd_elf32_arm_add_glue_sections_to_bfd + (bfd *, struct bfd_link_info *); -extern boolean bfd_elf32_arm_process_before_allocation - PARAMS ((bfd *, struct bfd_link_info *, int)); +/* ARM Note section processing. */ +extern bfd_boolean bfd_arm_merge_machines + (bfd *, bfd *); -extern boolean bfd_elf32_arm_get_bfd_for_interworking - PARAMS ((bfd *, struct bfd_link_info *)); +extern bfd_boolean bfd_arm_update_notes + (bfd *, const char *); -extern boolean bfd_elf32_arm_add_glue_sections_to_bfd - PARAMS ((bfd *, struct bfd_link_info *)); +extern unsigned int bfd_arm_get_mach_from_notes + (bfd *, const char *); /* TI COFF load page support. */ extern void bfd_ticoff_set_section_load_page - PARAMS ((struct sec *, int)); + (struct bfd_section *, int); extern int bfd_ticoff_get_section_load_page - PARAMS ((struct sec *)); + (struct bfd_section *); + +/* H8/300 functions. */ +extern bfd_vma bfd_h8300_pad_address + (bfd *, bfd_vma); + +/* IA64 Itanium code generation. Called from linker. */ +extern void bfd_elf32_ia64_after_parse + (int); + +extern void bfd_elf64_ia64_after_parse + (int); /* Extracted from init.c. */ -void -bfd_init PARAMS ((void)); +void bfd_init (void); /* Extracted from opncls.c. */ -bfd * -bfd_openr PARAMS ((const char *filename, const char *target)); +bfd *bfd_openr (const char *filename, const char *target); + +bfd *bfd_fdopenr (const char *filename, const char *target, int fd); + +bfd *bfd_openstreamr (const char *, const char *, void *); + +bfd *bfd_openw (const char *filename, const char *target); + +bfd_boolean bfd_close (bfd *abfd); -bfd * -bfd_fdopenr PARAMS ((const char *filename, const char *target, int fd)); +bfd_boolean bfd_close_all_done (bfd *); -bfd * -bfd_openstreamr PARAMS ((const char *, const char *, PTR)); +bfd *bfd_create (const char *filename, bfd *templ); -bfd * -bfd_openw PARAMS ((const char *filename, const char *target)); +bfd_boolean bfd_make_writable (bfd *abfd); -boolean -bfd_close PARAMS ((bfd *abfd)); +bfd_boolean bfd_make_readable (bfd *abfd); -boolean -bfd_close_all_done PARAMS ((bfd *)); +unsigned long bfd_calc_gnu_debuglink_crc32 + (unsigned long crc, const unsigned char *buf, bfd_size_type len); -bfd * -bfd_create PARAMS ((const char *filename, bfd *templ)); +char *bfd_follow_gnu_debuglink (bfd *abfd, const char *dir); -boolean -bfd_make_writable PARAMS ((bfd *abfd)); +struct bfd_section *bfd_create_gnu_debuglink_section + (bfd *abfd, const char *filename); -boolean -bfd_make_readable PARAMS ((bfd *abfd)); +bfd_boolean bfd_fill_in_gnu_debuglink_section + (bfd *abfd, struct bfd_section *sect, const char *filename); /* Extracted from libbfd.c. */ /* Byte swapping macros for user section data. */ #define bfd_put_8(abfd, val, ptr) \ - ((void) (*((unsigned char *) (ptr)) = (unsigned char) (val))) + ((void) (*((unsigned char *) (ptr)) = (unsigned char) (val))) #define bfd_put_signed_8 \ - bfd_put_8 + bfd_put_8 #define bfd_get_8(abfd, ptr) \ - (*(unsigned char *) (ptr) & 0xff) + (*(unsigned char *) (ptr) & 0xff) #define bfd_get_signed_8(abfd, ptr) \ - (((*(unsigned char *) (ptr) & 0xff) ^ 0x80) - 0x80) + (((*(unsigned char *) (ptr) & 0xff) ^ 0x80) - 0x80) #define bfd_put_16(abfd, val, ptr) \ - BFD_SEND(abfd, bfd_putx16, ((val),(ptr))) + BFD_SEND (abfd, bfd_putx16, ((val),(ptr))) #define bfd_put_signed_16 \ - bfd_put_16 + bfd_put_16 #define bfd_get_16(abfd, ptr) \ - BFD_SEND(abfd, bfd_getx16, (ptr)) + BFD_SEND (abfd, bfd_getx16, (ptr)) #define bfd_get_signed_16(abfd, ptr) \ - BFD_SEND (abfd, bfd_getx_signed_16, (ptr)) + BFD_SEND (abfd, bfd_getx_signed_16, (ptr)) #define bfd_put_32(abfd, val, ptr) \ - BFD_SEND(abfd, bfd_putx32, ((val),(ptr))) + BFD_SEND (abfd, bfd_putx32, ((val),(ptr))) #define bfd_put_signed_32 \ - bfd_put_32 + bfd_put_32 #define bfd_get_32(abfd, ptr) \ - BFD_SEND(abfd, bfd_getx32, (ptr)) + BFD_SEND (abfd, bfd_getx32, (ptr)) #define bfd_get_signed_32(abfd, ptr) \ - BFD_SEND(abfd, bfd_getx_signed_32, (ptr)) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 23 05:44:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1732E16A4D0; Mon, 23 Feb 2004 05:44:36 -0800 (PST) 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 C9EC616A4CE for ; Mon, 23 Feb 2004 05:44:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C471643D1F for ; Mon, 23 Feb 2004 05:44:35 -0800 (PST) (envelope-from mini@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1NDiZGe078687 for ; Mon, 23 Feb 2004 05:44:35 -0800 (PST) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1NDiZu1078684 for perforce@freebsd.org; Mon, 23 Feb 2004 05:44:35 -0800 (PST) (envelope-from mini@freebsd.org) Date: Mon, 23 Feb 2004 05:44:35 -0800 (PST) Message-Id: <200402231344.i1NDiZu1078684@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini To: Perforce Change Reviews Subject: PERFORCE change 47477 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, 23 Feb 2004 13:44:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=47477 Change 47477 by mini@freefall on 2004/02/23 05:44:14 Submit pending deletions to old branch so that I may delete this unused client view. Affected files ... .. //depot/projects/kse/lib/libpthread/Makefile#3 delete .. //depot/projects/kse/lib/libpthread/arch/alpha/_atomic_lock.S#2 delete .. //depot/projects/kse/lib/libpthread/arch/i386/_atomic_lock.S#2 delete .. //depot/projects/kse/lib/libpthread/arch/i386/_thread_enter_uts.S#2 delete .. //depot/projects/kse/lib/libpthread/arch/i386/_thread_switch.S#2 delete .. //depot/projects/kse/lib/libpthread/arch/ia64/_atomic_lock.S#2 delete .. //depot/projects/kse/lib/libpthread/man/Makefile.inc#2 delete .. //depot/projects/kse/lib/libpthread/man/pthread_attr.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_cancel.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_cleanup_pop.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_cleanup_push.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_cond_broadcast.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_cond_destroy.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_cond_init.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_cond_signal.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_cond_timedwait.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_cond_wait.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_condattr.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_create.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_detach.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_equal.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_exit.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_getspecific.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_join.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_key_create.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_key_delete.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_kill.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_mutex_destroy.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_mutex_init.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_mutex_lock.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_mutex_trylock.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_mutex_unlock.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_mutexattr.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_once.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_rwlock_destroy.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_rwlock_init.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_rwlock_rdlock.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_rwlock_unlock.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_rwlock_wrlock.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_rwlockattr_destroy.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_rwlockattr_getpshared.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_rwlockattr_init.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_rwlockattr_setpshared.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_schedparam.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_self.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_setspecific.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_sigmask.3#3 delete .. //depot/projects/kse/lib/libpthread/man/pthread_testcancel.3#3 delete .. //depot/projects/kse/lib/libpthread/man/sem_destroy.3#3 delete .. //depot/projects/kse/lib/libpthread/man/sem_getvalue.3#3 delete .. //depot/projects/kse/lib/libpthread/man/sem_init.3#3 delete .. //depot/projects/kse/lib/libpthread/man/sem_open.3#3 delete .. //depot/projects/kse/lib/libpthread/man/sem_post.3#3 delete .. //depot/projects/kse/lib/libpthread/man/sem_wait.3#3 delete .. //depot/projects/kse/lib/libpthread/man/sigwait.3#3 delete .. //depot/projects/kse/lib/libpthread/sys/Makefile.inc#2 delete .. //depot/projects/kse/lib/libpthread/sys/uthread_error.c#2 delete .. //depot/projects/kse/lib/libpthread/test/Makefile#3 delete .. //depot/projects/kse/lib/libpthread/test/README#3 delete .. //depot/projects/kse/lib/libpthread/test/guard_b.c#2 delete .. //depot/projects/kse/lib/libpthread/test/guard_b.exp#2 delete .. //depot/projects/kse/lib/libpthread/test/guard_s.pl#2 delete .. //depot/projects/kse/lib/libpthread/test/hello_b.c#2 delete .. //depot/projects/kse/lib/libpthread/test/hello_d.c#2 delete .. //depot/projects/kse/lib/libpthread/test/hello_d.exp#2 delete .. //depot/projects/kse/lib/libpthread/test/hello_s.c#2 delete .. //depot/projects/kse/lib/libpthread/test/join_leak_d.c#2 delete .. //depot/projects/kse/lib/libpthread/test/join_leak_d.exp#2 delete .. //depot/projects/kse/lib/libpthread/test/mutex_d.c#2 delete .. //depot/projects/kse/lib/libpthread/test/mutex_d.exp#2 delete .. //depot/projects/kse/lib/libpthread/test/propagate_s.pl#3 delete .. //depot/projects/kse/lib/libpthread/test/sem_d.c#2 delete .. //depot/projects/kse/lib/libpthread/test/sem_d.exp#2 delete .. //depot/projects/kse/lib/libpthread/test/sigsuspend_d.c#2 delete .. //depot/projects/kse/lib/libpthread/test/sigsuspend_d.exp#2 delete .. //depot/projects/kse/lib/libpthread/test/sigwait_d.c#2 delete .. //depot/projects/kse/lib/libpthread/test/sigwait_d.exp#2 delete .. //depot/projects/kse/lib/libpthread/test/verify#2 delete .. //depot/projects/kse/lib/libpthread/uthread/Makefile.inc#2 delete .. //depot/projects/kse/lib/libpthread/uthread/pthread_private.h#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_aio_suspend.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_destroy.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_getdetachstate.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_getguardsize.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_getinheritsched.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_getschedparam.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_getschedpolicy.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_getscope.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_getstackaddr.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_getstacksize.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_init.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setcreatesuspend_np.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setdetachstate.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setguardsize.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setinheritsched.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setschedparam.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setschedpolicy.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setscope.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setstackaddr.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setstacksize.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_autoinit.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_cancel.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_clean.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_close.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_cond.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_condattr_destroy.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_condattr_init.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_creat.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_create.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_detach.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_equal.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_exit.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_fcntl.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_find_thread.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_fork.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_fsync.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_gc.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_getprio.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_getschedparam.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_info.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_init.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_join.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_kern.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_kill.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_main_np.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_mattr_init.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_mattr_kind_np.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_msync.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_multi_np.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_mutex.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_mutex_prioceiling.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_mutex_protocol.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_mutexattr_destroy.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_nanosleep.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_once.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_open.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_pause.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_poll.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_printf.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_priority_queue.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_pselect.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_read.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_readv.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_resume_np.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_rwlock.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_rwlockattr.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_select.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_self.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_sem.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_seterrno.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_setprio.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_setschedparam.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_sigmask.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_sigsuspend.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_sigwait.c#3 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_single_np.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_sleep.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_spec.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_spinlock.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_stack.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_suspend_np.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_switch_np.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_system.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_tcdrain.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_vfork.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_wait.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_wait4.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_waitpid.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_write.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_writev.c#2 delete .. //depot/projects/kse/lib/libpthread/uthread/uthread_yield.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Feb 23 08:00:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE9FA16A4D0; Mon, 23 Feb 2004 08:00:53 -0800 (PST) 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 9771316A4CE; Mon, 23 Feb 2004 08:00:53 -0800 (PST) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A00C43D1D; Mon, 23 Feb 2004 08:00:52 -0800 (PST) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.10/8.12.9) with ESMTP id i1NG0pkj030419; Mon, 23 Feb 2004 09:00:51 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Mon, 23 Feb 2004 09:00:20 -0700 (MST) Message-Id: <20040223.090020.94288908.imp@bsdimp.com> To: sam@freebsd.org From: "M. Warner Losh" In-Reply-To: <200402220207.i1M27ggU093061@repoman.freebsd.org> References: <200402220207.i1M27ggU093061@repoman.freebsd.org> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: perforce@freebsd.org Subject: Re: PERFORCE change 47351 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, 23 Feb 2004 16:00:54 -0000 In message: <200402220207.i1M27ggU093061@repoman.freebsd.org> Sam Leffler writes: : default: : /* XXX here to keep compiler happy */ : - break; : + goto out; I think this comment can be removed now. Warner From owner-p4-projects@FreeBSD.ORG Mon Feb 23 12:43:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CDF316A52E; Mon, 23 Feb 2004 12:43:12 -0800 (PST) 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 D6B1716A52E for ; Mon, 23 Feb 2004 12:43:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CFBD043D1D for ; Mon, 23 Feb 2004 12:43:11 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1NKhBGe083234 for ; Mon, 23 Feb 2004 12:43:11 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1NKhB7e083231 for perforce@freebsd.org; Mon, 23 Feb 2004 12:43:11 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 23 Feb 2004 12:43:11 -0800 (PST) Message-Id: <200402232043.i1NKhB7e083231@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 47490 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, 23 Feb 2004 20:43:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=47490 Change 47490 by jhb@jhb_slimer on 2004/02/23 12:42:32 Add another todo inspired by bms@. Affected files ... .. //depot/projects/smpng/sys/notes#7 edit Differences ... ==== //depot/projects/smpng/sys/notes#7 (text+ko) ==== @@ -60,5 +60,9 @@ - Consolidate most of the kernel procs into a 'system' kernel proc that would be pid 0. - Stick all the 'idle threads' in a single 'idle' kernel proc. +- kill taskqueue_swi in favor of taskqueue_thread since the only thing swi + buys is being able to swi_sched() from a fast handler, but that doesn't + make sense because you can't actually enqueue a task onto its queue from + a fast interrupt context Space reserved for child branches: From owner-p4-projects@FreeBSD.ORG Tue Feb 24 06:43:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA4E416A4D0; Tue, 24 Feb 2004 06:43:56 -0800 (PST) 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 BEA4A16A4CF for ; Tue, 24 Feb 2004 06:43:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A1E2543D1F for ; Tue, 24 Feb 2004 06:43:56 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1OEhuGe062517 for ; Tue, 24 Feb 2004 06:43:56 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1OEhuOg062514 for perforce@freebsd.org; Tue, 24 Feb 2004 06:43:56 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 24 Feb 2004 06:43:56 -0800 (PST) Message-Id: <200402241443.i1OEhuOg062514@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 47561 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, 24 Feb 2004 14:43:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=47561 Change 47561 by cvance@cvance_g4 on 2004/02/24 06:43:55 Add some basic installation instructions. Affected files ... .. //depot/projects/trustedbsd/sebsd/SEBSD-Installation.txt#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Feb 24 09:37:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5321916A4D0; Tue, 24 Feb 2004 09:37:08 -0800 (PST) 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 2959D16A4CE for ; Tue, 24 Feb 2004 09:37:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E18C43D2F for ; Tue, 24 Feb 2004 09:37:08 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1OHb7Ge007966 for ; Tue, 24 Feb 2004 09:37:07 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1OHb7L2007963 for perforce@freebsd.org; Tue, 24 Feb 2004 09:37:07 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 24 Feb 2004 09:37:07 -0800 (PST) Message-Id: <200402241737.i1OHb7L2007963@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 47577 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, 24 Feb 2004 17:37:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=47577 Change 47577 by cvance@cvance_osx_laptop on 2004/02/24 09:36:47 Integrate the changes that allow you to use -Z without requiring long format. Affected files ... .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/ls.c#3 edit .. //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/print.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/ls.c#3 (text+ko) ==== @@ -246,7 +246,7 @@ * information. */ if (!f_inode && !f_longform && !f_size && !f_type && - sortkey == BY_NAME) + sortkey == BY_NAME && !f_label) fts_options |= FTS_NOSTAT; /* @@ -309,7 +309,7 @@ } /* Select a print function. */ - if (f_singlecol) + if (f_singlecol || (f_label && !f_longform)) printfcn = printscol; else if (f_columnacross) printfcn = printacol; @@ -356,7 +356,8 @@ * If not recursing down this tree and don't need stat info, just get * the names. */ - ch_options = !f_recursive && options & FTS_NOSTAT ? FTS_NAMEONLY : 0; + ch_options = !f_recursive && !f_label && + options & FTS_NOSTAT ? FTS_NAMEONLY : 0; while ((p = fts_read(ftsp)) != NULL) switch (p->fts_info) { @@ -439,7 +440,7 @@ if (list == NULL) return; - needstats = f_inode || f_longform || f_size; + needstats = f_inode || f_longform || f_size || f_label; flen = 0; maxinode = maxnlink = 0; bcfile = 0; @@ -492,7 +493,7 @@ } btotal += sp->st_blocks; - if (f_longform) { + if (f_longform || f_label) { if (f_numericonly) { (void)snprintf(nuser, sizeof(nuser), "%u", sp->st_uid); @@ -645,7 +646,7 @@ printfcn(&d); output = 1; - if (f_longform) + if (f_longform || f_label) for (cur = list; cur; cur = cur->fts_link) free(cur->fts_pointer); } ==== //depot/projects/trustedbsd/sedarwin/apsl/file_cmds/ls/print.c#3 (text+ko) ==== @@ -64,7 +64,7 @@ #include "ls.h" #include "extern.h" -static int printaname __P((FTSENT *, int, int)); +static int printaname __P((FTSENT *, int, int, int)); static void printlink __P((FTSENT *)); static void printtime __P((time_t)); static int printtype __P((u_int)); @@ -82,7 +82,7 @@ for (p = dp->list; p; p = p->fts_link) { if (IS_NOPRINT(p)) continue; - (void)printaname(p, dp->s_inode, dp->s_block); + (void)printaname(p, dp->s_label, dp->s_inode, dp->s_block); (void)putchar('\n'); } } @@ -201,8 +201,8 @@ (long long)(howmany(dp->btotal, blocksize))); for (row = 0; row < numrows; ++row) { for (base = row, chcnt = col = 0; col < numcols; ++col) { - chcnt = printaname(array[base], dp->s_inode, - dp->s_block); + chcnt = printaname(array[base], dp->s_label, + dp->s_inode, dp->s_block); if ((base += numrows) >= num) break; while (chcnt++ < colwidth) @@ -250,7 +250,7 @@ chcnt = col = 0; (void)putchar('\n'); } - chcnt = printaname(p, dp->s_inode, dp->s_block); + chcnt = printaname(p, dp->s_label, dp->s_inode, dp->s_block); while (chcnt++ < colwidth) (void)putchar(' '); col++; @@ -263,16 +263,21 @@ * return # of characters printed, no trailing characters. */ static int -printaname(p, inodefield, sizefield) +printaname(p, labelfield, inodefield, sizefield) FTSENT *p; - int sizefield, inodefield; + int labelfield, sizefield, inodefield; { struct stat *sp; int chcnt; + NAMES *np; char nbuf[MAXPATHLEN + 1], *name; sp = p->fts_statp; chcnt = 0; + if (f_label) { + np = p->fts_pointer; + chcnt += printf("%-*s ", (int)labelfield, np->label); + } if (f_inode) chcnt += printf("%*u ", inodefield, sp->st_ino); if (f_size) From owner-p4-projects@FreeBSD.ORG Tue Feb 24 10:59:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FEF416A4D0; Tue, 24 Feb 2004 10:59:53 -0800 (PST) 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 58C6216A4CE for ; Tue, 24 Feb 2004 10:59:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 50DA943D1F for ; Tue, 24 Feb 2004 10:59:53 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1OIxrGe025908 for ; Tue, 24 Feb 2004 10:59:53 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1OIxp7q025903 for perforce@freebsd.org; Tue, 24 Feb 2004 10:59:51 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 24 Feb 2004 10:59:51 -0800 (PST) Message-Id: <200402241859.i1OIxp7q025903@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 47583 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, 24 Feb 2004 18:59:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=47583 Change 47583 by jhb@jhb_slimer on 2004/02/24 10:59:26 IFC @47578. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/mem.c#13 integrate .. //depot/projects/smpng/sys/alpha/alpha/promcons.c#16 integrate .. //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#14 integrate .. //depot/projects/smpng/sys/amd64/amd64/mem.c#7 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#9 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#18 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#10 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#49 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#11 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#10 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#19 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#9 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#13 integrate .. //depot/projects/smpng/sys/coda/coda_fbsd.c#7 integrate .. //depot/projects/smpng/sys/coda/coda_venus.c#8 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_genassym.c#2 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_signal.h#5 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#16 integrate .. //depot/projects/smpng/sys/conf/majors#37 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.c#13 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#36 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#60 integrate .. //depot/projects/smpng/sys/dev/adlink/adlink.c#6 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#19 integrate .. //depot/projects/smpng/sys/dev/amr/amr_disk.c#13 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#22 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#47 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#10 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#40 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#47 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#25 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#20 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#27 integrate .. //depot/projects/smpng/sys/dev/ctau/am8530.h#1 branch .. //depot/projects/smpng/sys/dev/ctau/ctau.c#1 branch .. //depot/projects/smpng/sys/dev/ctau/ctau2fw.h#1 branch .. //depot/projects/smpng/sys/dev/ctau/ctaue1fw.h#1 branch .. //depot/projects/smpng/sys/dev/ctau/ctaufw.h#1 branch .. //depot/projects/smpng/sys/dev/ctau/ctaug7fw.h#1 branch .. //depot/projects/smpng/sys/dev/ctau/ctaureg.h#1 branch .. //depot/projects/smpng/sys/dev/ctau/ctddk.c#1 branch .. //depot/projects/smpng/sys/dev/ctau/ctddk.h#1 branch .. //depot/projects/smpng/sys/dev/ctau/ds2153.h#1 branch .. //depot/projects/smpng/sys/dev/ctau/hdc64570.h#1 branch .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#1 branch .. //depot/projects/smpng/sys/dev/ctau/lxt318.h#1 branch .. //depot/projects/smpng/sys/dev/ctau/ng_ct.h#1 branch .. //depot/projects/smpng/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons.c#3 integrate .. //depot/projects/smpng/sys/dev/digi/digi.c#20 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.h#16 integrate .. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#14 integrate .. //depot/projects/smpng/sys/dev/drm/r128_state.c#7 integrate .. //depot/projects/smpng/sys/dev/fb/fb.c#10 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#31 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#15 integrate .. //depot/projects/smpng/sys/dev/harp/if_harp.c#4 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_buffer.c#6 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_command.c#7 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_init.c#6 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_load.c#7 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_output.c#8 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_receive.c#8 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_stats.c#4 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_transmit.c#4 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_var.h#5 integrate .. //depot/projects/smpng/sys/dev/ida/ida.c#15 integrate .. //depot/projects/smpng/sys/dev/iicbus/iic.c#8 integrate .. //depot/projects/smpng/sys/dev/iir/iir_ctrl.c#10 integrate .. //depot/projects/smpng/sys/dev/ips/ips.c#8 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#29 integrate .. //depot/projects/smpng/sys/dev/joy/joy.c#7 integrate .. //depot/projects/smpng/sys/dev/kbd/kbd.c#12 integrate .. //depot/projects/smpng/sys/dev/led/led.c#6 integrate .. //depot/projects/smpng/sys/dev/matcd/matcd.c#4 integrate .. //depot/projects/smpng/sys/dev/mcd/mcd.c#8 integrate .. //depot/projects/smpng/sys/dev/md/md.c#45 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx.c#13 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#21 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#17 integrate .. //depot/projects/smpng/sys/dev/null/null.c#15 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#15 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirmio.c#7 integrate .. //depot/projects/smpng/sys/dev/ofw/openpromio.c#3 integrate .. //depot/projects/smpng/sys/dev/pci/pci_user.c#12 integrate .. //depot/projects/smpng/sys/dev/ppbus/lpt.c#8 integrate .. //depot/projects/smpng/sys/dev/ppbus/pcfclock.c#8 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppi.c#8 integrate .. //depot/projects/smpng/sys/dev/ppbus/pps.c#12 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_diskqueue.c#3 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_freebsdkintf.c#13 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_paritylog.c#3 integrate .. //depot/projects/smpng/sys/dev/random/randomdev.c#20 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#8 integrate .. //depot/projects/smpng/sys/dev/rp/rp.c#14 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#15 integrate .. //depot/projects/smpng/sys/dev/scd/scd.c#7 integrate .. //depot/projects/smpng/sys/dev/si/si.c#12 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#39 integrate .. //depot/projects/smpng/sys/dev/smbus/smb.c#7 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/midi/midi.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/midi/midi.h#6 integrate .. //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#12 integrate .. //depot/projects/smpng/sys/dev/streams/streams.c#17 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#36 integrate .. //depot/projects/smpng/sys/dev/syscons/sysmouse.c#8 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_vars.h#3 integrate .. //depot/projects/smpng/sys/dev/tga/tga_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#14 integrate .. //depot/projects/smpng/sys/dev/twe/twe.c#9 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#19 integrate .. //depot/projects/smpng/sys/dev/twe/twevar.h#6 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/ucom.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/ufm.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/ulpt.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/urio.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/usb.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.h#11 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#21 integrate .. //depot/projects/smpng/sys/dev/vinum/vinum.c#16 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumvar.h#8 integrate .. //depot/projects/smpng/sys/dev/zs/zs.c#12 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#27 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#29 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#18 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#34 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#13 integrate .. //depot/projects/smpng/sys/i386/bios/apm.c#7 integrate .. //depot/projects/smpng/sys/i386/bios/smapi.c#5 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#77 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/mem.c#18 integrate .. //depot/projects/smpng/sys/i386/i386/perfmon.c#13 integrate .. //depot/projects/smpng/sys/i386/isa/asc.c#8 integrate .. //depot/projects/smpng/sys/i386/isa/ctx.c#8 integrate .. //depot/projects/smpng/sys/i386/isa/cy.c#22 integrate .. //depot/projects/smpng/sys/i386/isa/gpib.c#9 integrate .. //depot/projects/smpng/sys/i386/isa/gsc.c#7 integrate .. //depot/projects/smpng/sys/i386/isa/istallion.c#11 integrate .. //depot/projects/smpng/sys/i386/isa/mse.c#10 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#13 integrate .. //depot/projects/smpng/sys/i386/isa/spic.c#9 integrate .. //depot/projects/smpng/sys/i386/isa/spicreg.h#3 integrate .. //depot/projects/smpng/sys/i386/isa/spigot.c#15 integrate .. //depot/projects/smpng/sys/i386/isa/spkr.c#13 integrate .. //depot/projects/smpng/sys/i386/isa/stallion.c#13 integrate .. //depot/projects/smpng/sys/i386/isa/wt.c#9 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ctl.c#8 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_rbch.c#13 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_tel.c#11 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_trace.c#12 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_i4bdrv.c#17 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#78 integrate .. //depot/projects/smpng/sys/ia64/ia64/mem.c#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#27 integrate .. //depot/projects/smpng/sys/ia64/ia64/ssc.c#12 integrate .. //depot/projects/smpng/sys/ia64/include/md_var.h#14 integrate .. //depot/projects/smpng/sys/isa/fd.c#28 integrate .. //depot/projects/smpng/sys/isa/psm.c#21 integrate .. //depot/projects/smpng/sys/isa/vga_isa.c#10 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vnops.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_acl.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#58 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#35 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#58 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#34 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#30 integrate .. //depot/projects/smpng/sys/kern/subr_devstat.c#13 integrate .. //depot/projects/smpng/sys/kern/subr_log.c#13 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#42 integrate .. //depot/projects/smpng/sys/kern/tty.c#41 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#25 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#28 integrate .. //depot/projects/smpng/sys/kern/tty_tty.c#12 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#32 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#58 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#67 integrate .. //depot/projects/smpng/sys/modules/geom/Makefile#5 integrate .. //depot/projects/smpng/sys/net/bpf.c#32 integrate .. //depot/projects/smpng/sys/net/if.c#43 integrate .. //depot/projects/smpng/sys/net/if_tap.c#23 integrate .. //depot/projects/smpng/sys/net/if_tapvar.h#3 integrate .. //depot/projects/smpng/sys/net/if_tun.c#29 integrate .. //depot/projects/smpng/sys/net/if_tunvar.h#3 delete .. //depot/projects/smpng/sys/netatm/atm_subr.c#16 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#8 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif.c#6 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#49 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#44 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#21 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#22 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#18 integrate .. //depot/projects/smpng/sys/netncp/ncp_mod.c#6 integrate .. //depot/projects/smpng/sys/netsmb/smb_dev.c#14 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_dev.c#4 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_idmap.c#4 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_subs.c#2 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#34 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#11 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#27 integrate .. //depot/projects/smpng/sys/pc98/pc98/mse.c#8 integrate .. //depot/projects/smpng/sys/pc98/pc98/olpt.c#8 integrate .. //depot/projects/smpng/sys/pc98/pc98/pc98gdc.c#10 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#36 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#15 integrate .. //depot/projects/smpng/sys/pccard/pccard.c#22 integrate .. //depot/projects/smpng/sys/pci/agp.c#18 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#34 integrate .. //depot/projects/smpng/sys/pci/xrpu.c#12 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#8 integrate .. //depot/projects/smpng/sys/security/mac/mac_process.c#6 integrate .. //depot/projects/smpng/sys/security/mac/mac_system.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_vfs.c#5 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#25 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.h#5 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#9 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.h#3 integrate .. //depot/projects/smpng/sys/security/mac_ifoff/mac_ifoff.c#7 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#20 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.h#2 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#24 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.h#5 integrate .. //depot/projects/smpng/sys/security/mac_none/mac_none.c#12 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#7 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.h#3 integrate .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#6 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#20 integrate .. //depot/projects/smpng/sys/sparc64/creator/creator_upa.c#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mem.c#9 integrate .. //depot/projects/smpng/sys/sys/_label.h#5 integrate .. //depot/projects/smpng/sys/sys/conf.h#24 integrate .. //depot/projects/smpng/sys/sys/mac.h#25 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#21 integrate .. //depot/projects/smpng/sys/sys/param.h#56 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#24 integrate .. //depot/projects/smpng/sys/sys/systm.h#48 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#30 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#27 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#33 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#43 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#50 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#43 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/mem.c#13 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.46 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.47 2004/02/21 21:10:38 phk Exp $"); /* * Memory special file @@ -83,6 +83,7 @@ #define CDEV_MAJOR 2 static struct cdevsw mem_cdevsw = { + .d_version = D_VERSION, .d_open = mmopen, .d_close = mmclose, .d_read = mmrw, @@ -91,7 +92,7 @@ .d_mmap = memmmap, .d_name = "mem", .d_maj = CDEV_MAJOR, - .d_flags = D_MEM, + .d_flags = D_MEM | D_NEEDGIANT, }; struct mem_range_softc mem_range_softc; ==== //depot/projects/smpng/sys/alpha/alpha/promcons.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.31 2003/09/26 10:52:16 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.34 2004/02/21 21:10:38 phk Exp $"); #include #include @@ -63,16 +63,13 @@ static d_close_t promclose; static d_ioctl_t promioctl; -#define CDEV_MAJOR 97 static struct cdevsw prom_cdevsw = { + .d_version = D_VERSION, .d_open = promopen, .d_close = promclose, - .d_read = ttyread, - .d_write = ttywrite, .d_ioctl = promioctl, - .d_poll = ttypoll, .d_name = "prom", - .d_maj = CDEV_MAJOR, + .d_flags = D_TTY | D_NEEDGIANT, }; ==== //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.39 2003/09/26 19:35:49 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.42 2004/02/21 21:10:38 phk Exp $"); #include "opt_ddb.h" @@ -70,16 +70,13 @@ static d_close_t zsclose; static d_ioctl_t zsioctl; -#define CDEV_MAJOR 135 static struct cdevsw zs_cdevsw = { + .d_version = D_VERSION, .d_open = zsopen, .d_close = zsclose, - .d_read = ttyread, - .d_write = ttywrite, .d_ioctl = zsioctl, - .d_poll = ttypoll, .d_name = "zs", - .d_maj = CDEV_MAJOR, + .d_flags = D_TTY | D_NEEDGIANT, }; static void zsstart(struct tty *); ==== //depot/projects/smpng/sys/amd64/amd64/mem.c#7 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.112 2003/12/06 23:19:47 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.113 2004/02/21 21:10:38 phk Exp $"); /* * Memory special file @@ -81,6 +81,7 @@ #define CDEV_MAJOR 2 static struct cdevsw mem_cdevsw = { + .d_version = D_VERSION, .d_open = mmopen, .d_close = mmclose, .d_read = mmrw, @@ -89,7 +90,7 @@ .d_mmap = memmmap, .d_name = "mem", .d_maj = CDEV_MAJOR, - .d_flags = D_MEM, + .d_flags = D_MEM | D_NEEDGIANT, }; MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors"); ==== //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.8 2004/01/03 02:02:24 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.9 2004/02/21 23:34:42 peter Exp $"); #include "opt_compat.h" @@ -235,8 +235,7 @@ /* Build the argument list for the signal handler. */ sf.sf_signum = sig; sf.sf_ucontext = (register_t)&sfp->sf_uc; - PROC_LOCK(p); - if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) { + if (SIGISMEMBER(psp->ps_siginfo, sig)) { /* Signal handler installed with SA_SIGINFO. */ sf.sf_siginfo = (u_int32_t)(uintptr_t)&sfp->sf_si; sf.sf_ah = (u_int32_t)(uintptr_t)catcher; @@ -252,7 +251,6 @@ sf.sf_ah = (u_int32_t)(uintptr_t)catcher; } mtx_unlock(&psp->ps_mtx); - PROC_UNLOCK(p); /* * Copy the sigframe out to the user's stack. @@ -354,8 +352,7 @@ /* Build the argument list for the signal handler. */ sf.sf_signum = sig; sf.sf_ucontext = (register_t)&sfp->sf_uc; - PROC_LOCK(p); - if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) { + if (SIGISMEMBER(psp->ps_siginfo, sig)) { /* Signal handler installed with SA_SIGINFO. */ sf.sf_siginfo = (u_int32_t)(uintptr_t)&sfp->sf_si; sf.sf_ah = (u_int32_t)(uintptr_t)catcher; @@ -371,7 +368,6 @@ sf.sf_ah = (u_int32_t)(uintptr_t)catcher; } mtx_unlock(&psp->ps_mtx); - PROC_UNLOCK(p); /* * Copy the sigframe out to the user's stack. ==== //depot/projects/smpng/sys/cam/cam_xpt.c#18 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.135 2003/11/09 02:22:33 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.137 2004/02/21 21:10:38 phk Exp $"); #include #include @@ -630,18 +630,18 @@ PERIPHDRIVER_DECLARE(xpt, xpt_driver); PERIPHDRIVER_DECLARE(probe, probe_driver); -#define XPT_CDEV_MAJOR 104 static d_open_t xptopen; static d_close_t xptclose; static d_ioctl_t xptioctl; static struct cdevsw xpt_cdevsw = { + .d_version = D_VERSION, + .d_flags = D_NEEDGIANT, .d_open = xptopen, .d_close = xptclose, .d_ioctl = xptioctl, .d_name = "xpt", - .d_maj = XPT_CDEV_MAJOR, }; static struct intr_config_hook *xpt_config_hook; ==== //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#10 (text+ko) ==== @@ -68,7 +68,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.37 2003/06/10 18:14:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.39 2004/02/21 21:10:38 phk Exp $"); #include #include @@ -174,7 +174,6 @@ }; #define CHUNIT(x) (minor((x))) -#define CH_CDEV_MAJOR 17 static d_open_t chopen; static d_close_t chclose; @@ -213,11 +212,12 @@ PERIPHDRIVER_DECLARE(ch, chdriver); static struct cdevsw ch_cdevsw = { + .d_version = D_VERSION, + .d_flags = D_NEEDGIANT, .d_open = chopen, .d_close = chclose, .d_ioctl = chioctl, .d_name = "ch", - .d_maj = CH_CDEV_MAJOR, }; static void ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#49 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.163 2004/02/18 21:36:50 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.164 2004/02/22 01:14:54 cperciva Exp $"); #ifdef _KERNEL #include "opt_da.h" @@ -464,11 +464,11 @@ s = splsoftcam(); periph = (struct cam_periph *)dp->d_drv1; - unit = periph->unit_number; if (periph == NULL) { splx(s); return (ENXIO); } + unit = periph->unit_number; softc = (struct da_softc *)periph->softc; ==== //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.38 2003/06/10 18:14:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.40 2004/02/21 21:10:38 phk Exp $"); #include #include @@ -77,7 +77,6 @@ dev_t dev; }; -#define PASS_CDEV_MAJOR 31 static d_open_t passopen; static d_close_t passclose; @@ -106,11 +105,12 @@ PERIPHDRIVER_DECLARE(pass, passdriver); static struct cdevsw pass_cdevsw = { + .d_version = D_VERSION, + .d_flags = D_NEEDGIANT, .d_open = passopen, .d_close = passclose, .d_ioctl = passioctl, .d_name = "pass", - .d_maj = PASS_CDEV_MAJOR, }; static void ==== //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.39 2003/06/10 18:14:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.41 2004/02/21 21:10:38 phk Exp $"); #include #include @@ -116,9 +116,10 @@ PERIPHDRIVER_DECLARE(pt, ptdriver); -#define PT_CDEV_MAJOR 61 static struct cdevsw pt_cdevsw = { + .d_version = D_VERSION, + .d_flags = D_NEEDGIANT, .d_open = ptopen, .d_close = ptclose, .d_read = physread, @@ -126,7 +127,6 @@ .d_ioctl = ptioctl, .d_strategy = ptstrategy, .d_name = "pt", - .d_maj = PT_CDEV_MAJOR, }; #ifndef SCSI_PT_DEFAULT_TIMEOUT ==== //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#19 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.98 2004/01/18 00:17:14 johan Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.100 2004/02/21 21:10:38 phk Exp $"); #include #include @@ -423,9 +423,9 @@ #define D_TAPE 0 #endif -#define SA_CDEV_MAJOR 14 static struct cdevsw sa_cdevsw = { + .d_version = D_VERSION, .d_open = saopen, .d_close = saclose, .d_read = physread, @@ -433,8 +433,7 @@ .d_ioctl = saioctl, .d_strategy = sastrategy, .d_name = "sa", - .d_maj = SA_CDEV_MAJOR, - .d_flags = D_TAPE, + .d_flags = D_TAPE | D_NEEDGIANT, }; static int ==== //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.26 2003/06/10 18:14:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.28 2004/02/21 21:10:39 phk Exp $"); #include #include @@ -153,7 +153,6 @@ #define SES_FLAG_INITIALIZED 0x04 #define SESUNIT(x) (minor((x))) -#define SES_CDEV_MAJOR 110 static d_open_t sesopen; static d_close_t sesclose; @@ -175,13 +174,13 @@ PERIPHDRIVER_DECLARE(ses, sesdriver); -static struct cdevsw ses_cdevsw = -{ +static struct cdevsw ses_cdevsw = { + .d_version = D_VERSION, .d_open = sesopen, .d_close = sesclose, .d_ioctl = sesioctl, .d_name = "ses", - .d_maj = SES_CDEV_MAJOR, + .d_flags = D_NEEDGIANT, }; static void ==== //depot/projects/smpng/sys/cam/scsi/scsi_target.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.58 2003/11/09 09:17:20 tanimura Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.60 2004/02/21 21:10:39 phk Exp $"); #include #include @@ -104,8 +104,9 @@ static struct filterops targread_filtops = { 1, NULL, targreadfiltdetach, targreadfilt }; -#define TARG_CDEV_MAJOR 65 static struct cdevsw targ_cdevsw = { + .d_version = D_VERSION, + .d_flags = D_NEEDGIANT, .d_open = targopen, .d_close = targclose, .d_read = targread, @@ -113,7 +114,6 @@ .d_ioctl = targioctl, .d_poll = targpoll, .d_name = "targ", - .d_maj = TARG_CDEV_MAJOR, .d_kqfilter = targkqfilter }; ==== //depot/projects/smpng/sys/coda/coda_fbsd.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.31 2003/07/26 07:32:20 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_fbsd.c,v 1.32 2004/02/21 21:10:39 phk Exp $"); #include "vcoda.h" @@ -66,6 +66,8 @@ #define VC_DEV_NO 93 static struct cdevsw codadevsw = { + .d_version = D_VERSION, + .d_flags = D_NEEDGIANT, .d_open = vc_nb_open, .d_close = vc_nb_close, .d_read = vc_nb_read, ==== //depot/projects/smpng/sys/coda/coda_venus.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_venus.c,v 1.18 2003/09/07 07:43:09 tjr Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_venus.c,v 1.19 2004/02/21 21:32:14 phk Exp $"); #include #include @@ -212,8 +212,7 @@ error = coda_call(mdp, Isize, &Osize, (char *)inp); if (!error) { -/* 5/11 *dev = udev2dev(outp->dev, 2); */ - *dev = udev2dev(outp->dev, 0); + *dev = udev2dev(outp->dev); *inode = outp->inode; } ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.21 2004/02/03 05:20:28 deischen Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.34 2004/02/03 05:18:48 deischen Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.22 2004/02/21 23:38:57 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.35 2004/02/21 23:37:33 peter Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -276,7 +276,7 @@ char oact_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * oact; char oact_r_[PADR_(struct sigaction32 *)]; }; struct freebsd4_freebsd32_sigreturn_args { - char sigcntxp_l_[PADL_(const struct __ucontext *)]; const struct __ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct __ucontext *)]; + char sigcntxp_l_[PADL_(const struct freebsd4_freebsd32_ucontext *)]; const struct freebsd4_freebsd32_ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct freebsd4_freebsd32_ucontext *)]; }; int freebsd4_freebsd32_sendfile(struct thread *, struct freebsd4_freebsd32_sendfile_args *); int freebsd4_freebsd32_sigaction(struct thread *, struct freebsd4_freebsd32_sigaction_args *); ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.21 2004/02/03 05:20:28 deischen Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.34 2004/02/03 05:18:48 deischen Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.22 2004/02/21 23:38:57 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.35 2004/02/21 23:37:33 peter Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.12 2004/02/03 05:20:28 deischen Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.34 2004/02/03 05:18:48 deischen Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.13 2004/02/21 23:38:58 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.35 2004/02/21 23:37:33 peter Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.22 2004/02/03 05:20:28 deischen Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.34 2004/02/03 05:18:48 deischen Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.23 2004/02/21 23:38:58 peter Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.35 2004/02/21 23:37:33 peter Exp */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#7 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.34 2004/02/03 05:18:48 deischen Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.35 2004/02/21 23:37:33 peter Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -475,7 +475,7 @@ struct sigaction32 *oact); } 343 MNOPROTO { int sigpending(sigset_t *set); } 344 MCOMPAT4 { int freebsd32_sigreturn( \ - const struct __ucontext *sigcntxp); } + const struct freebsd4_freebsd32_ucontext *sigcntxp); } ; XXX implement 345 UNIMPL sigtimedwait ; XXX implement ==== //depot/projects/smpng/sys/compat/ia32/ia32_genassym.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_genassym.c,v 1.3 2003/08/22 23:19:02 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_genassym.c,v 1.4 2004/02/21 23:35:56 peter Exp $"); #include "opt_compat.h" @@ -17,7 +17,7 @@ ASSYM(IA32_UC_ES, offsetof(struct ia32_ucontext, uc_mcontext.mc_es)); ASSYM(IA32_UC_DS, offsetof(struct ia32_ucontext, uc_mcontext.mc_ds)); #ifdef COMPAT_FREEBSD4 -ASSYM(IA32_SIGF_UC4, offsetof(struct ia32_sigframe, sf_uc)); +ASSYM(IA32_SIGF_UC4, offsetof(struct ia32_sigframe4, sf_uc)); ASSYM(IA32_UC4_GS, offsetof(struct ia32_ucontext4, uc_mcontext.mc_gs)); ASSYM(IA32_UC4_FS, offsetof(struct ia32_ucontext4, uc_mcontext.mc_fs)); ASSYM(IA32_UC4_ES, offsetof(struct ia32_ucontext4, uc_mcontext.mc_es)); ==== //depot/projects/smpng/sys/compat/ia32/ia32_signal.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ia32/ia32_signal.h,v 1.4 2003/11/08 07:43:44 peter Exp $ + * $FreeBSD: src/sys/compat/ia32/ia32_signal.h,v 1.5 2004/02/21 23:36:31 peter Exp $ */ struct ia32_sigaltstack { @@ -151,6 +151,7 @@ u_int32_t sf_ucontext; /* points to sf_uc */ u_int32_t sf_addr; /* undocumented 4th arg */ u_int32_t sf_ah; /* action/handler pointer */ + /* Beware, hole due to ucontext being 16 byte aligned! */ struct ia32_ucontext sf_uc; /* = *sf_ucontext */ struct ia32_siginfo sf_si; /* = *sf_siginfo (SA_SIGINFO case) */ }; ==== //depot/projects/smpng/sys/compat/linux/linux_stats.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.56 2003/11/05 23:52:54 anholt Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.57 2004/02/21 21:32:14 phk Exp $"); #include "opt_mac.h" @@ -76,7 +76,7 @@ * in FreeBSD but block devices under Linux. */ if (S_ISCHR(tbuf.st_mode) && - (dev = udev2dev(buf->st_rdev, 0)) != NODEV) { + (dev = udev2dev(buf->st_rdev)) != NODEV) { cdevsw = devsw(dev); if (cdevsw != NULL && (cdevsw->d_flags & D_DISK)) { tbuf.st_mode &= ~S_IFMT; @@ -365,8 +365,8 @@ * dev_t returned from previous syscalls. Just return a bzeroed * ustat in that case. */ - dev = makedev(args->dev >> 8, args->dev & 0xFF); - if (vfinddev(dev, VCHR, &vp)) { + dev = udev2dev(makeudev(args->dev >> 8, args->dev & 0xFF)); + if (dev != NODEV && vfinddev(dev, VCHR, &vp)) { if (vp->v_mount == NULL) return (EINVAL); #ifdef MAC @@ -414,7 +414,7 @@ * in FreeBSD but block devices under Linux. */ if (S_ISCHR(lbuf.st_mode) && - (dev = udev2dev(buf->st_rdev, 0)) != NODEV) { + (dev = udev2dev(buf->st_rdev)) != NODEV) { cdevsw = devsw(dev); if (cdevsw != NULL && (cdevsw->d_flags & D_DISK)) { lbuf.st_mode &= ~S_IFMT; ==== //depot/projects/smpng/sys/conf/majors#37 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/majors,v 1.193 2004/02/14 23:18:58 scottl Exp $ +# $FreeBSD: src/sys/conf/majors,v 1.197 2004/02/23 08:55:12 phk Exp $ # # This list is semi-obsoleted by DEVFS, but for now it still contains # the current allocation of device major numbers. @@ -23,25 +23,9 @@ 5 *pts pseudo tty "tty" half 6 *ptc pseudo tty "master" half 7 *log system log -9 *fd floppy disk -10 *wt i386/isa/wt.c -11 *spigot Video capture? -12 *sc syscons/pcvt virtual consoles -14 *sa SCSI "sequential access devices" -16 *lpt PC parallel printer port -17 *ch SCSI changer -18 *nmdm nullmodem back-to-back tty ports 19 *tw X-10 power interface -20 *ng_device Netgraph -21 *psm PS/2 Mouse 22 *fd (/dev/stdin etc) -23 *bpf Berkeley Packet Filter -26 *spkr PC speaker (/dev/spkr) -27 *mse Microsoft bus-mouse -28 *sio 16450/16550 serial -29 *mcd Mitsumi CDROM interface 30 *snd sound driver system -31 *pass SCSI "Application Pass-Thru" 32 lkmc Loadable Kernel Module Controller 33 lkm assigned to Loadable Kernel Modules 34 lkm assigned to Loadable Kernel Modules @@ -49,110 +33,52 @@ 36 lkm assigned to Loadable Kernel Modules 37 lkm assigned to Loadable Kernel Modules 38 lkm assigned to Loadable Kernel Modules -39 *apm Advanced Power Management also ACPI -40 *ctx Cortex 42 *cx Cronyx/Sigma serial adapter 43 vn vnode "disk" device (retired) -44 *gp GPIB -45 *scd Sony CDROM interface 46 - - -47 *gsc Genius Scanner -48 *cy Cyclades -51 *joy joystick -52 *tun IP tunnel device -53 *snp tty snoop 54 OLDnic ISDN system -55 *i4b_ctl ISDN4BSD -56 *i4b_tel ISDN4BSD -57 *i4b_rbch ISDN4BSD 58 - Was dgb: Digiboard PC/Xe -59 *i4b_trace ISDN4BSD -60 *i4b_i4bdrv ISDN4BSD -61 *pt SCSI "processor target" 62 worm SCSI "worm type" -63 *rc Riscom/8 driver 64 ?? Talisman -65 *targ SCSI target sample driver 66 labpc National Instruments LabPC 67 - was meteor Matrox Meteor video capture -68 *si Specialix SI/XIO (peter@freebsd.org) -69 *wcd ATAPI CDROM client of "wd" 70 crypto Device-independent crypto interface (from openbsd) -71 *asc AmiScan driver -72 *stl Stallion (cd1400 based) (gerg@stallion.oz.au) 74 *ccd concatenated disk -75 *stli Stallion (intelligent cdk based) (gerg@stallion.oz.au) 76 scc IBM Smart Capture Card (ohashi@mickey.ai.kyutech.ac.jp) -77 cyy Cyclades Ye/PCI serial card +77 - - 78 pci PCI bus 79 *ipl IP Filter 80 xdcp Assigned to Chris Ficklin -81 *rp RocketPort/Steve Gericke -82 *ppi Generic Parallel I/O 83 can CAN16-2 CAN-PC Interface 84 dtfp Datum Time and Frequency processor (louie@UU.NET) 85 vesa VESA support device (j_mini@efn.org) 86 alog Industrial Computer Source AIO8-P driver (deprecated) 87 wfd ATAPI floppy client of "wd" -88 *dpt DPT RAID Controller -89 *pps Pulse-Per-Second timing interface 90 wst ATAPI tape client of "wd" -91 *vinum Volume manager 92 *bktr Bt848 video capture driver (hasty@star-gate.com) 93 *coda CODA filesystem. 96 altq alternate queueing (including cbq, red, wfq) -97 *prom Alpha PROM console 98 loe Loopback pseudo-ethernet (sbabkin@dcn.att.com) 99 ct Cronyx/Tau serial adaptor >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 24 15:05:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 048CC16A4D0; Tue, 24 Feb 2004 15:05:05 -0800 (PST) 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 B292616A4CE for ; Tue, 24 Feb 2004 15:05:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD9DC43D2D for ; Tue, 24 Feb 2004 15:05:05 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1ON55Ge089064 for ; Tue, 24 Feb 2004 15:05:05 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1ON55VL089061 for perforce@freebsd.org; Tue, 24 Feb 2004 15:05:05 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 24 Feb 2004 15:05:05 -0800 (PST) Message-Id: <200402242305.i1ON55VL089061@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 47597 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, 24 Feb 2004 23:05:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=47597 Change 47597 by jhb@jhb_slimer on 2004/02/24 15:04:09 Import more changes that bde and myself were throwing around. Affected files ... .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#17 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_taskqueue.c#17 (text+ko) ==== @@ -52,7 +52,6 @@ const char *tq_name; taskqueue_enqueue_fn tq_enqueue; void *tq_context; - int tq_draining; struct mtx tq_mutex; }; @@ -82,7 +81,6 @@ queue->tq_name = name; queue->tq_enqueue = enqueue; queue->tq_context = context; - queue->tq_draining = 0; mtx_init(&queue->tq_mutex, "taskqueue", NULL, MTX_DEF); mtx_lock(&taskqueue_queues_mutex); @@ -96,17 +94,12 @@ taskqueue_free(struct taskqueue *queue) { - mtx_lock(&queue->tq_mutex); - KASSERT(queue->tq_draining == 0, ("free'ing a draining taskqueue")); - queue->tq_draining = 1; - mtx_unlock(&queue->tq_mutex); - - taskqueue_run(queue); - mtx_lock(&taskqueue_queues_mutex); STAILQ_REMOVE(&taskqueue_queues, queue, taskqueue, tq_link); mtx_unlock(&taskqueue_queues_mutex); + mtx_lock(&queue->tq_mutex); + taskqueue_run(queue); mtx_destroy(&queue->tq_mutex); free(queue, M_TASKQUEUE); } @@ -140,14 +133,6 @@ mtx_lock(&queue->tq_mutex); /* - * Don't allow new tasks on a queue which is being freed. - */ - if (queue->tq_draining) { - mtx_unlock(&queue->tq_mutex); - return EPIPE; - } - - /* * Count multiple enqueues. */ if (task->ta_pending) { @@ -188,9 +173,11 @@ taskqueue_run(struct taskqueue *queue) { struct task *task; - int pending; + int owned, pending; - mtx_lock(&queue->tq_mutex); + owned = mtx_owned(&queue->tq_mutex); + if (!owned) + mtx_lock(&queue->tq_mutex); while (STAILQ_FIRST(&queue->tq_queue)) { /* * Carefully remove the first task from the queue and @@ -206,7 +193,13 @@ mtx_lock(&queue->tq_mutex); } - mtx_unlock(&queue->tq_mutex); + + /* + * For compatibility, unlock on return if the queue was not locked + * on entry, although this opens a race window. + */ + if (!owned) + mtx_unlock(&queue->tq_mutex); } static void @@ -234,15 +227,13 @@ } static void -taskqueue_thread_loop(void *arg) +taskqueue_thread_loop(void *dummy) { + mtx_lock(&taskqueue_thread->tq_mutex); for (;;) { - mtx_lock(&taskqueue_thread->tq_mutex); - while (STAILQ_EMPTY(&taskqueue_thread->tq_queue)) - msleep(taskqueue_thread, &taskqueue_thread->tq_mutex, - PWAIT, "-", 0); - mtx_unlock(&taskqueue_thread->tq_mutex); taskqueue_run(taskqueue_thread); + msleep(taskqueue_thread, &taskqueue_thread->tq_mutex, PWAIT, + "-", 0); } } @@ -274,14 +265,6 @@ mtx_lock_spin(&queue->tq_mutex); /* - * Don't allow new tasks on a queue which is being freed. - */ - if (queue->tq_draining) { - mtx_unlock_spin(&queue->tq_mutex); - return EPIPE; - } - - /* * Count multiple enqueues. */ if (task->ta_pending) { @@ -361,8 +344,8 @@ static void taskqueue_define_fast(void *arg) { - taskqueue_fast = malloc(sizeof(struct taskqueue), - M_TASKQUEUE, M_NOWAIT | M_ZERO); + taskqueue_fast = malloc(sizeof(struct taskqueue), M_TASKQUEUE, + M_NOWAIT | M_ZERO); if (!taskqueue_fast) { printf("%s: Unable to allocate fast task queue!\n", __func__); return; @@ -381,4 +364,4 @@ NULL, SWI_TQ_FAST, 0, &taskqueue_fast_ih); } SYSINIT(taskqueue_fast, SI_SUB_CONFIGURE, SI_ORDER_SECOND, - taskqueue_define_fast, NULL); + taskqueue_define_fast, NULL); From owner-p4-projects@FreeBSD.ORG Tue Feb 24 15:06:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AECD916A4D0; Tue, 24 Feb 2004 15:06:07 -0800 (PST) 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 88CDC16A4CE for ; Tue, 24 Feb 2004 15:06:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 84A8E43D31 for ; Tue, 24 Feb 2004 15:06:07 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1ON67Ge089211 for ; Tue, 24 Feb 2004 15:06:07 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1ON67Ku089208 for perforce@freebsd.org; Tue, 24 Feb 2004 15:06:07 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 24 Feb 2004 15:06:07 -0800 (PST) Message-Id: <200402242306.i1ON67Ku089208@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 47598 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, 24 Feb 2004 23:06:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=47598 Change 47598 by jhb@jhb_slimer on 2004/02/24 15:05:12 Update. Affected files ... .. //depot/projects/smpng/sys/notes#8 edit Differences ... ==== //depot/projects/smpng/sys/notes#8 (text+ko) ==== @@ -45,8 +45,7 @@ - Cleanup the SMP rendezvous code to properly use membar's to ensure function pointers are up to date before deferencing them. - Untested -- Minor fixes to taskqueue locking including making the locking for the - taskqueue thread queeu actually work. +- Further fixes to taskqueue including killing the draining hack. - Untested - Don't allow kthreads to get signalled and do bad things - Untested From owner-p4-projects@FreeBSD.ORG Tue Feb 24 19:10:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E6DB16A4D6; Tue, 24 Feb 2004 19:10:07 -0800 (PST) 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 A834416A4D0 for ; Tue, 24 Feb 2004 19:10:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B8C643D39 for ; Tue, 24 Feb 2004 19:10:06 -0800 (PST) (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.10/8.12.10) with ESMTP id i1P3A6Ge050807 for ; Tue, 24 Feb 2004 19:10:06 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1P3A5x5050804 for perforce@freebsd.org; Tue, 24 Feb 2004 19:10:05 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 24 Feb 2004 19:10:05 -0800 (PST) Message-Id: <200402250310.i1P3A5x5050804@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 47606 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, 25 Feb 2004 03:10:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=47606 Change 47606 by rwatson@rwatson_paprika on 2004/02/24 19:09:55 Modify bsde_add_rule() to return the rule number it used when adding a new rule. Document bsde_add_rule(). Affected files ... .. //depot/projects/trustedbsd/mac/lib/libugidfw/Makefile#7 edit .. //depot/projects/trustedbsd/mac/lib/libugidfw/bsde_get_rule.3#3 edit .. //depot/projects/trustedbsd/mac/lib/libugidfw/libugidfw.3#3 edit .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#10 edit .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.h#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libugidfw/Makefile#7 (text+ko) ==== @@ -8,6 +8,7 @@ MAN+= bsde_get_rule.3 bsde_get_rule_count.3 bsde_parse_rule.3 \ bsde_rule_to_string.3 libugidfw.3 +MLINKS= bsde_get_rule.3 bsde_add_rule.3 MLINKS= bsde_get_rule.3 bsde_delete_rule.3 MLINKS+= bsde_get_rule.3 bsde_set_rule.3 MLINKS+= bsde_get_rule_count.3 bsde_get_rule_slots.3 ==== //depot/projects/trustedbsd/mac/lib/libugidfw/bsde_get_rule.3#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2003 Networks Associates Technology, Inc. +.\" Copyright (c) 2003-2004 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by Chris @@ -30,10 +30,11 @@ .\" .\" $FreeBSD: src/lib/libugidfw/bsde_get_rule.3,v 1.2 2003/06/01 19:41:49 ru Exp $ .\" -.Dd January 7, 2003 +.Dd February 24, 2004 .Os .Dt BSDE_GET_RULE 3 .Sh NAME +.Nm bsde_add_rule , .Nm bsde_get_rule , .Nm bsde_set_rule , .Nm bsde_delete_rule @@ -43,6 +44,11 @@ .Sh SYNOPSIS .In ugidfw.h .Ft int +.Fo bsde_add_rule +.Fa "int *rulenum" "struct mac_bsdextended_rule *rule" +.Fa "size_t buflen" "char *errstr" +.Fc +.Ft int .Fo bsde_get_rule .Fa "int rulenum" "struct mac_bsdextended_rule *rule" .Fa "size_t errlen" "char *errstr" @@ -56,6 +62,27 @@ .Fn bsde_delete_rule "int rulenum" "size_t errlen" "char *errstr" .Sh DESCRIPTION The +.Fn bsde_add_rule +function fills the next available +rule (in +.Vt "struct mac_bsdextended_rule" +form, either from +.Fn bsde_get_rule +or +.Xr bsde_parse_rule 3 ) . +If an error occurs, +.Fa *errstr +is filled with the error string +(up to +.Fa errlen +characters, including the terminating +.Dv NUL ) . +If successful and +.Fa rulenum +is non-NULL, the rule number used will be returned in +.Fa *rulenum . +.Pp +The .Fn bsde_get_rule function fills in .Fa *rule ==== //depot/projects/trustedbsd/mac/lib/libugidfw/libugidfw.3#3 (text+ko) ==== @@ -96,6 +96,10 @@ module and applies it; see .Xr bsde_set_rule 3 . +.It Fn bsde_add_rule +Upload the rule to the module, automatically selecting the next available +rule number; see +.Xr bsde_add_rule 3 . .El .Sh SEE ALSO .Xr bsde_delete_rule 3 , ==== //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002, 2004 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by Network Associates @@ -710,7 +710,8 @@ } int -bsde_add_rule(struct mac_bsdextended_rule *rule, size_t buflen, char *errstr) +bsde_add_rule(int *rulenum, struct mac_bsdextended_rule *rule, size_t buflen, + char *errstr) { char charstr[BUFSIZ]; int name[10]; @@ -743,5 +744,8 @@ return (-1); } + if (rulenum != NULL) + rule_slots; + return (0); } ==== //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.h#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002, 2004 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by Network Associates @@ -54,8 +54,8 @@ int bsde_delete_rule(int rulenum, size_t buflen, char *errstr); int bsde_set_rule(int rulenum, struct mac_bsdextended_rule *rule, size_t buflen, char *errstr); -int bsde_add_rule(struct mac_bsdextended_rule *rule, size_t buflen, - char *errstr); +int bsde_add_rule(int *rulename, struct mac_bsdextended_rule *rule, + size_t buflen, char *errstr); __END_DECLS #endif From owner-p4-projects@FreeBSD.ORG Tue Feb 24 19:41:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 749A216A4D0; Tue, 24 Feb 2004 19:41:46 -0800 (PST) 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 4F7F116A4CE for ; Tue, 24 Feb 2004 19:41:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4959F43D1D for ; Tue, 24 Feb 2004 19:41:46 -0800 (PST) (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.10/8.12.10) with ESMTP id i1P3fkGe058826 for ; Tue, 24 Feb 2004 19:41:46 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1P3fj03058817 for perforce@freebsd.org; Tue, 24 Feb 2004 19:41:45 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 24 Feb 2004 19:41:45 -0800 (PST) Message-Id: <200402250341.i1P3fj03058817@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 47608 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, 25 Feb 2004 03:41:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=47608 Change 47608 by rwatson@rwatson_paprika on 2004/02/24 19:41:02 Loop back addition of bsd_add_rule() from FreeBSD CVS HEAD to TrustedBSD base. Affected files ... .. //depot/projects/trustedbsd/base/lib/libugidfw/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/bsde_get_rule.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/libugidfw.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/ugidfw.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/ugidfw.h#4 integrate Differences ... ==== //depot/projects/trustedbsd/base/lib/libugidfw/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libugidfw/Makefile,v 1.4 2003/01/07 11:23:43 chris Exp $ +# $FreeBSD: src/lib/libugidfw/Makefile,v 1.5 2004/02/25 03:24:39 rwatson Exp $ LIB= ugidfw SHLIB_MAJOR= 1 @@ -8,6 +8,7 @@ MAN+= bsde_get_rule.3 bsde_get_rule_count.3 bsde_parse_rule.3 \ bsde_rule_to_string.3 libugidfw.3 +MLINKS= bsde_get_rule.3 bsde_add_rule.3 MLINKS= bsde_get_rule.3 bsde_delete_rule.3 MLINKS+= bsde_get_rule.3 bsde_set_rule.3 MLINKS+= bsde_get_rule_count.3 bsde_get_rule_slots.3 ==== //depot/projects/trustedbsd/base/lib/libugidfw/bsde_get_rule.3#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2003 Networks Associates Technology, Inc. +.\" Copyright (c) 2003-2004 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by Chris @@ -28,12 +28,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libugidfw/bsde_get_rule.3,v 1.2 2003/06/01 19:41:49 ru Exp $ +.\" $FreeBSD: src/lib/libugidfw/bsde_get_rule.3,v 1.3 2004/02/25 03:24:39 rwatson Exp $ .\" -.Dd January 7, 2003 +.Dd February 24, 2004 .Os .Dt BSDE_GET_RULE 3 .Sh NAME +.Nm bsde_add_rule , .Nm bsde_get_rule , .Nm bsde_set_rule , .Nm bsde_delete_rule @@ -43,6 +44,11 @@ .Sh SYNOPSIS .In ugidfw.h .Ft int +.Fo bsde_add_rule +.Fa "int *rulenum" "struct mac_bsdextended_rule *rule" +.Fa "size_t buflen" "char *errstr" +.Fc +.Ft int .Fo bsde_get_rule .Fa "int rulenum" "struct mac_bsdextended_rule *rule" .Fa "size_t errlen" "char *errstr" @@ -56,6 +62,27 @@ .Fn bsde_delete_rule "int rulenum" "size_t errlen" "char *errstr" .Sh DESCRIPTION The +.Fn bsde_add_rule +function fills the next available +rule (in +.Vt "struct mac_bsdextended_rule" +form, either from +.Fn bsde_get_rule +or +.Xr bsde_parse_rule 3 ) . +If an error occurs, +.Fa *errstr +is filled with the error string +(up to +.Fa errlen +characters, including the terminating +.Dv NUL ) . +If successful and +.Fa rulenum +is non-NULL, the rule number used will be returned in +.Fa *rulenum . +.Pp +The .Fn bsde_get_rule function fills in .Fa *rule ==== //depot/projects/trustedbsd/base/lib/libugidfw/libugidfw.3#3 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libugidfw/libugidfw.3,v 1.3 2003/06/01 19:41:49 ru Exp $ +.\" $FreeBSD: src/lib/libugidfw/libugidfw.3,v 1.4 2004/02/25 03:24:39 rwatson Exp $ .\" .Dd January 5, 2003 .Os @@ -96,6 +96,10 @@ module and applies it; see .Xr bsde_set_rule 3 . +.It Fn bsde_add_rule +Upload the rule to the module, automatically selecting the next available +rule number; see +.Xr bsde_add_rule 3 . .El .Sh SEE ALSO .Xr bsde_delete_rule 3 , ==== //depot/projects/trustedbsd/base/lib/libugidfw/ugidfw.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002, 2004 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by Network Associates @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libugidfw/ugidfw.c,v 1.4 2002/11/07 20:37:04 rwatson Exp $ + * $FreeBSD: src/lib/libugidfw/ugidfw.c,v 1.5 2004/02/25 03:24:39 rwatson Exp $ */ #include #include @@ -708,3 +708,44 @@ return (0); } + +int +bsde_add_rule(int *rulenum, struct mac_bsdextended_rule *rule, size_t buflen, + char *errstr) +{ + char charstr[BUFSIZ]; + int name[10]; + size_t len, size; + int error, rule_slots; + + len = 10; + error = bsde_get_mib(MIB ".rules", name, &len); + if (error) { + len = snprintf(errstr, buflen, "%s: %s", MIB ".rules", + strerror(errno)); + return (-1); + } + + rule_slots = bsde_get_rule_slots(BUFSIZ, charstr); + if (rule_slots == -1) { + len = snprintf(errstr, buflen, "unable to get rule slots: %s", + strerror(errno)); + return (-1); + } + + name[len] = rule_slots; + len++; + + size = sizeof(*rule); + error = sysctl(name, len, NULL, NULL, rule, size); + if (error) { + len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", + rule_slots, strerror(errno)); + return (-1); + } + + if (rulenum != NULL) + rule_slots; + + return (0); +} ==== //depot/projects/trustedbsd/base/lib/libugidfw/ugidfw.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002, 2004 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by Network Associates @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libugidfw/ugidfw.h,v 1.3 2002/11/07 20:37:04 rwatson Exp $ + * $FreeBSD: src/lib/libugidfw/ugidfw.h,v 1.4 2004/02/25 03:24:39 rwatson Exp $ */ #ifndef _UGIDFW_H @@ -54,6 +54,8 @@ int bsde_delete_rule(int rulenum, size_t buflen, char *errstr); int bsde_set_rule(int rulenum, struct mac_bsdextended_rule *rule, size_t buflen, char *errstr); +int bsde_add_rule(int *rulename, struct mac_bsdextended_rule *rule, + size_t buflen, char *errstr); __END_DECLS #endif From owner-p4-projects@FreeBSD.ORG Tue Feb 24 19:42:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 732A716A4D0; Tue, 24 Feb 2004 19:42:48 -0800 (PST) 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 4E86116A4CE for ; Tue, 24 Feb 2004 19:42:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32AFE43D1D for ; Tue, 24 Feb 2004 19:42:48 -0800 (PST) (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.10/8.12.10) with ESMTP id i1P3gmGe059302 for ; Tue, 24 Feb 2004 19:42:48 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1P3gl1F059299 for perforce@freebsd.org; Tue, 24 Feb 2004 19:42:47 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 24 Feb 2004 19:42:47 -0800 (PST) Message-Id: <200402250342.i1P3gl1F059299@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 47609 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, 25 Feb 2004 03:42:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=47609 Change 47609 by rwatson@rwatson_paprika on 2004/02/24 19:42:20 Loop back bsde_rule_add() from TrustedBSD base branch to TrustedBSD MAC branch. libugidfw is now in sync between the FreeBSD tree and the MAC development tree. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libugidfw/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/bsde_get_rule.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/libugidfw.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.h#7 integrate Differences ... ==== //depot/projects/trustedbsd/mac/lib/libugidfw/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libugidfw/Makefile,v 1.4 2003/01/07 11:23:43 chris Exp $ +# $FreeBSD: src/lib/libugidfw/Makefile,v 1.5 2004/02/25 03:24:39 rwatson Exp $ LIB= ugidfw SHLIB_MAJOR= 1 ==== //depot/projects/trustedbsd/mac/lib/libugidfw/bsde_get_rule.3#4 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libugidfw/bsde_get_rule.3,v 1.2 2003/06/01 19:41:49 ru Exp $ +.\" $FreeBSD: src/lib/libugidfw/bsde_get_rule.3,v 1.3 2004/02/25 03:24:39 rwatson Exp $ .\" .Dd February 24, 2004 .Os ==== //depot/projects/trustedbsd/mac/lib/libugidfw/libugidfw.3#4 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libugidfw/libugidfw.3,v 1.3 2003/06/01 19:41:49 ru Exp $ +.\" $FreeBSD: src/lib/libugidfw/libugidfw.3,v 1.4 2004/02/25 03:24:39 rwatson Exp $ .\" .Dd January 5, 2003 .Os ==== //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#11 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libugidfw/ugidfw.c,v 1.4 2002/11/07 20:37:04 rwatson Exp $ + * $FreeBSD: src/lib/libugidfw/ugidfw.c,v 1.5 2004/02/25 03:24:39 rwatson Exp $ */ #include #include ==== //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.h#7 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libugidfw/ugidfw.h,v 1.3 2002/11/07 20:37:04 rwatson Exp $ + * $FreeBSD: src/lib/libugidfw/ugidfw.h,v 1.4 2004/02/25 03:24:39 rwatson Exp $ */ #ifndef _UGIDFW_H From owner-p4-projects@FreeBSD.ORG Tue Feb 24 19:55:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E07BC16A4D0; Tue, 24 Feb 2004 19:55:03 -0800 (PST) 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 A4C0C16A4CE for ; Tue, 24 Feb 2004 19:55:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8921643D1D for ; Tue, 24 Feb 2004 19:55:03 -0800 (PST) (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.10/8.12.10) with ESMTP id i1P3t3Ge061481 for ; Tue, 24 Feb 2004 19:55:03 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1P3t3Y7061478 for perforce@freebsd.org; Tue, 24 Feb 2004 19:55:03 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 24 Feb 2004 19:55:03 -0800 (PST) Message-Id: <200402250355.i1P3t3Y7061478@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 47610 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, 25 Feb 2004 03:55:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=47610 Change 47610 by rwatson@rwatson_paprika on 2004/02/24 19:54:30 Add an 'add' command to ugidfw(8), which automatically selects the rule number for a new rule using bsde_add_rule(). Affected files ... .. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.8#4 edit .. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.8#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2002, 2004 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by Chris @@ -33,7 +33,7 @@ .\" .\" $FreeBSD: src/usr.sbin/ugidfw/ugidfw.8,v 1.5 2002/12/12 14:09:25 ru Exp $ .\" -.Dd October 11, 2002 +.Dd February 24, 2004 .Dt UGIDFW 8 .Os .Sh NAME @@ -41,6 +41,18 @@ .Nd "firewall-like access controls for file system objects" .Sh SYNOPSIS .Nm +.Cm add +.Cm subject +.Op Cm not +.Op Cm uid Ar uid +.Op Cm gid Ar gid +.Cm object +.Op Cm not +.Op Cm uid Ar uid +.Op Cm gid Ar gid +.Cm mode +.Ar arswxn +.Nm .Cm list .Nm .Cm set @@ -71,6 +83,27 @@ .Pp The arguments are as follows: .Bl -tag -width indent -offset indent +.It Cm add +Add a new +.Nm +rule. +.It Xo +.Cm add +.Cm subject +.Op Cm not +.Op Cm uid Ar uid +.Op Cm gid Ar gid +.Cm object +.Op Cm not +.Op Cm uid Ar uid +.Op Cm gid Ar gid +.Cm mode +.Ar arswxn +.Xc +Add a new rule, automatically selecting the rule number. +See the description of +.Cm set +for syntax information. .It Cm list Produces a list of all the current .Nm ==== //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#11 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002, 2004 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by NAI Labs, the @@ -15,9 +15,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The names of the authors may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -50,6 +47,9 @@ usage(void) { + fprintf(stderr, "ugidfw add [subject [not] [uid uid] [gid gid]]" + " [object [not] [uid uid] \\\n"); + fprintf(stderr, " [gid gid]] mode arswxn\n"); fprintf(stderr, "ugidfw list\n"); fprintf(stderr, "ugidfw set rulenum [subject [not] [uid uid] [gid gid]]" " [object [not] \\\n"); @@ -60,6 +60,29 @@ } void +add_rule(int argc, char *argv[]) +{ + char errstr[BUFSIZ]; + struct mac_bsdextended_rule rule; + long value; + int error, rulenum; + char *endp; + + error = bsde_parse_rule(argc, argv, &rule, BUFSIZ, errstr); + if (error) { + fprintf(stderr, "%s\n", errstr); + return; + } + + error = bsde_add_rule(&rulenum, &rule, BUFSIZ, errstr); + if (error) { + fprintf(stderr, "%s\n", errstr); + return; + } + printf("Added rule %d\n", rulenum); +} + +void list_rules(void) { char errstr[BUFSIZ], charstr[BUFSIZ]; @@ -168,7 +191,9 @@ if (argc < 2) usage(); - if (strcmp("list", argv[1]) == 0) { + if (strcmp("add", argv[1]) == 0) { + add_rule(argc-2, argv+2); + } else if (strcmp("list", argv[1]) == 0) { if (argc != 2) usage(); list_rules(); From owner-p4-projects@FreeBSD.ORG Wed Feb 25 08:52:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC41C16A4D0; Wed, 25 Feb 2004 08:52:58 -0800 (PST) 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 C26F616A4CE for ; Wed, 25 Feb 2004 08:52:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A6BC043D1D for ; Wed, 25 Feb 2004 08:52:58 -0800 (PST) (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.10/8.12.10) with ESMTP id i1PGqwGe065211 for ; Wed, 25 Feb 2004 08:52:58 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1PGqwVE065208 for perforce@freebsd.org; Wed, 25 Feb 2004 08:52:58 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 25 Feb 2004 08:52:58 -0800 (PST) Message-Id: <200402251652.i1PGqwVE065208@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 47630 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, 25 Feb 2004 16:52:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=47630 Change 47630 by rwatson@rwatson_tislabs on 2004/02/25 08:52:45 Loop back support for 'ugidfw add' from the FreeBSD CVS HEAD to TrustedBSD base branch. Affected files ... .. //depot/projects/trustedbsd/base/usr.sbin/ugidfw/ugidfw.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ugidfw/ugidfw.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/base/usr.sbin/ugidfw/ugidfw.8#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\" Copyright (c) 2002, 2004 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by Chris @@ -15,9 +15,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. The names of the authors may not be used to endorse or promote -.\" products derived from this software without specific prior written -.\" permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -31,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.sbin/ugidfw/ugidfw.8,v 1.5 2002/12/12 14:09:25 ru Exp $ +.\" $FreeBSD: src/usr.sbin/ugidfw/ugidfw.8,v 1.6 2004/02/25 03:59:56 rwatson Exp $ .\" -.Dd October 11, 2002 +.Dd February 24, 2004 .Dt UGIDFW 8 .Os .Sh NAME @@ -41,6 +38,18 @@ .Nd "firewall-like access controls for file system objects" .Sh SYNOPSIS .Nm +.Cm add +.Cm subject +.Op Cm not +.Op Cm uid Ar uid +.Op Cm gid Ar gid +.Cm object +.Op Cm not +.Op Cm uid Ar uid +.Op Cm gid Ar gid +.Cm mode +.Ar arswxn +.Nm .Cm list .Nm .Cm set @@ -71,6 +80,27 @@ .Pp The arguments are as follows: .Bl -tag -width indent -offset indent +.It Cm add +Add a new +.Nm +rule. +.It Xo +.Cm add +.Cm subject +.Op Cm not +.Op Cm uid Ar uid +.Op Cm gid Ar gid +.Cm object +.Op Cm not +.Op Cm uid Ar uid +.Op Cm gid Ar gid +.Cm mode +.Ar arswxn +.Xc +Add a new rule, automatically selecting the rule number. +See the description of +.Cm set +for syntax information. .It Cm list Produces a list of all the current .Nm ==== //depot/projects/trustedbsd/base/usr.sbin/ugidfw/ugidfw.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2002, 2004 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by NAI Labs, the @@ -15,9 +15,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The names of the authors may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -31,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/ugidfw/ugidfw.c,v 1.1 2002/08/02 07:14:22 rwatson Exp $ + * $FreeBSD: src/usr.sbin/ugidfw/ugidfw.c,v 1.2 2004/02/25 03:59:56 rwatson Exp $ */ #include #include @@ -50,6 +47,9 @@ usage(void) { + fprintf(stderr, "ugidfw add [subject [not] [uid uid] [gid gid]]" + " [object [not] [uid uid] \\\n"); + fprintf(stderr, " [gid gid]] mode arswxn\n"); fprintf(stderr, "ugidfw list\n"); fprintf(stderr, "ugidfw set rulenum [subject [not] [uid uid] [gid gid]]" " [object [not] \\\n"); @@ -60,6 +60,29 @@ } void +add_rule(int argc, char *argv[]) +{ + char errstr[BUFSIZ]; + struct mac_bsdextended_rule rule; + long value; + int error, rulenum; + char *endp; + + error = bsde_parse_rule(argc, argv, &rule, BUFSIZ, errstr); + if (error) { + fprintf(stderr, "%s\n", errstr); + return; + } + + error = bsde_add_rule(&rulenum, &rule, BUFSIZ, errstr); + if (error) { + fprintf(stderr, "%s\n", errstr); + return; + } + printf("Added rule %d\n", rulenum); +} + +void list_rules(void) { char errstr[BUFSIZ], charstr[BUFSIZ]; @@ -168,7 +191,9 @@ if (argc < 2) usage(); - if (strcmp("list", argv[1]) == 0) { + if (strcmp("add", argv[1]) == 0) { + add_rule(argc-2, argv+2); + } else if (strcmp("list", argv[1]) == 0) { if (argc != 2) usage(); list_rules(); From owner-p4-projects@FreeBSD.ORG Wed Feb 25 08:54:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D76A216A4D0; Wed, 25 Feb 2004 08:54:00 -0800 (PST) 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 AE50716A4CE for ; Wed, 25 Feb 2004 08:54:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A883D43D1D for ; Wed, 25 Feb 2004 08:54:00 -0800 (PST) (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.10/8.12.10) with ESMTP id i1PGs0Ge065250 for ; Wed, 25 Feb 2004 08:54:00 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1PGs0kr065247 for perforce@freebsd.org; Wed, 25 Feb 2004 08:54:00 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 25 Feb 2004 08:54:00 -0800 (PST) Message-Id: <200402251654.i1PGs0kr065247@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 47631 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, 25 Feb 2004 16:54:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=47631 Change 47631 by rwatson@rwatson_tislabs on 2004/02/25 08:53:36 Loop back integration of 'ugidfw add' support from TrustedBSD base branch to TrustedBSD MAC branch following merge to FreeBSD CVS. Affected files ... .. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.8#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#12 integrate Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.8#5 (text+ko) ==== @@ -15,9 +15,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. The names of the authors may not be used to endorse or promote -.\" products derived from this software without specific prior written -.\" permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -31,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.sbin/ugidfw/ugidfw.8,v 1.5 2002/12/12 14:09:25 ru Exp $ +.\" $FreeBSD: src/usr.sbin/ugidfw/ugidfw.8,v 1.6 2004/02/25 03:59:56 rwatson Exp $ .\" .Dd February 24, 2004 .Dt UGIDFW 8 ==== //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#12 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/ugidfw/ugidfw.c,v 1.1 2002/08/02 07:14:22 rwatson Exp $ + * $FreeBSD: src/usr.sbin/ugidfw/ugidfw.c,v 1.2 2004/02/25 03:59:56 rwatson Exp $ */ #include #include From owner-p4-projects@FreeBSD.ORG Wed Feb 25 10:11:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAAFB16A4D0; Wed, 25 Feb 2004 10:11:38 -0800 (PST) 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 9078F16A4CE for ; Wed, 25 Feb 2004 10:11:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A77943D2F for ; Wed, 25 Feb 2004 10:11:38 -0800 (PST) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1PIBcGe083488 for ; Wed, 25 Feb 2004 10:11:38 -0800 (PST) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1PIBa4R083457 for perforce@freebsd.org; Wed, 25 Feb 2004 10:11:36 -0800 (PST) (envelope-from areisse@nailabs.com) Date: Wed, 25 Feb 2004 10:11:36 -0800 (PST) Message-Id: <200402251811.i1PIBa4R083457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 47635 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, 25 Feb 2004 18:11:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=47635 Change 47635 by areisse@areisse_ibook on 2004/02/25 10:11:23 talk about verbose mode hanging tell them how do enable enforcing mode Affected files ... .. //depot/projects/trustedbsd/sedarwin/bootstrap_instructions.txt#27 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/bootstrap_instructions.txt#27 (text+ko) ==== @@ -8,6 +8,11 @@ forward to 10.2.8. Currently, Panther and older Jaguar releases are not supported. + The instructions assume that / is the root of the system that + will have SEdarwin installed. Boot into that partition before + continuing, so that absolute paths and 'make install' targets + will be in the right place. + Step 2: Check out TrustedBSD/SEDarwin source tree In our environment, this requires installing and configuring the @@ -271,7 +276,10 @@ variables, or press Command-Option-P-R to clear the PRAM in the event of serious problems. Finally, you may want to set the boot-args flag to "-v" to get a text-based boot with console messages, rather than the - pretty but less informative Apple logo, etc. + pretty but less informative Apple logo, etc. If the system hangs during + verbose mode startup (whether running sedarwin or not), try using normal + boot options, as we have experienced unpredictable hangs with verbose + boots. We've found that boot-time failure modes with Darwin are a bit hard to diagnose, and problems booting a new kernel frequent result in a @@ -342,3 +350,8 @@ Missing this step will result in login attempts failing, or the entire system not working if enforcing mode is enabled. + + If you want to run in enforcing mode, you can use the "kenv_sebsd_enforce" + OF variable. Set it with: + + # nvram kenv_sebsd_enforce=1 From owner-p4-projects@FreeBSD.ORG Wed Feb 25 17:22:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5601816A4D0; Wed, 25 Feb 2004 17:22:53 -0800 (PST) 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 2A7CE16A4CE for ; Wed, 25 Feb 2004 17:22:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2667043D2D for ; Wed, 25 Feb 2004 17:22:53 -0800 (PST) (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.10/8.12.10) with ESMTP id i1Q1MqGe098039 for ; Wed, 25 Feb 2004 17:22:52 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1Q1Mq4o098036 for perforce@freebsd.org; Wed, 25 Feb 2004 17:22:52 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 25 Feb 2004 17:22:52 -0800 (PST) Message-Id: <200402260122.i1Q1Mq4o098036@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 47666 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, 26 Feb 2004 01:22:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=47666 Change 47666 by rwatson@rwatson_paprika on 2004/02/25 17:22:40 MAC includes no longer required in pseudofs, since we don't currently force pseudofs-derived file systems to be MNT_MULTILABEL. Affected files ... .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.c#12 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.c#12 (text+ko) ==== @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -45,8 +44,6 @@ #include #include -#include "opt_mac.h" - static MALLOC_DEFINE(M_PFSNODES, "pfs_nodes", "pseudofs nodes"); SYSCTL_NODE(_vfs, OID_AUTO, pfs, CTLFLAG_RW, 0, From owner-p4-projects@FreeBSD.ORG Wed Feb 25 17:35:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A272B16A4D0; Wed, 25 Feb 2004 17:35:08 -0800 (PST) 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 7D1E716A4CE for ; Wed, 25 Feb 2004 17:35:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78CD543D1D for ; Wed, 25 Feb 2004 17:35:08 -0800 (PST) (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.10/8.12.10) with ESMTP id i1Q1Z8Ge000284 for ; Wed, 25 Feb 2004 17:35:08 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1Q1Z8Eu000281 for perforce@freebsd.org; Wed, 25 Feb 2004 17:35:08 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 25 Feb 2004 17:35:08 -0800 (PST) Message-Id: <200402260135.i1Q1Z8Eu000281@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 47667 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, 26 Feb 2004 01:35:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=47667 Change 47667 by rwatson@rwatson_paprika on 2004/02/25 17:34:43 When these comments were merged to FreeBSD CVS HEAD, the line wrapping was different. Synchronize. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#36 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#36 (text+ko) ==== @@ -122,8 +122,8 @@ extern struct protosw inetsw[]; /* - * IP output. The packet in mbuf chain m contains a skeletal IP header (with - * len, off, ttl, proto, tos, src, dst). + * IP output. The packet in mbuf chain m contains a skeletal IP + * header (with len, off, ttl, proto, tos, src, dst). * The mbuf chain containing the packet will be freed. * The mbuf opt, if present, will not be freed. * In the IP forwarding case, the packet will arrive with options already From owner-p4-projects@FreeBSD.ORG Thu Feb 26 07:24:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BE0916A4D9; Thu, 26 Feb 2004 07:24:33 -0800 (PST) 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 D235816A4E6 for ; Thu, 26 Feb 2004 07:24:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CCF3743D2F for ; Thu, 26 Feb 2004 07:24:32 -0800 (PST) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1QFOWGe010599 for ; Thu, 26 Feb 2004 07:24:32 -0800 (PST) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1QFOVSC010596 for perforce@freebsd.org; Thu, 26 Feb 2004 07:24:31 -0800 (PST) (envelope-from areisse@nailabs.com) Date: Thu, 26 Feb 2004 07:24:31 -0800 (PST) Message-Id: <200402261524.i1QFOVSC010596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 47691 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, 26 Feb 2004 15:24:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=47691 Change 47691 by areisse@areisse_ibook on 2004/02/26 07:24:31 fix some labelling rules Affected files ... .. //depot/projects/trustedbsd/sedarwin/policy/fc#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin/policy/fc#4 (text+ko) ==== @@ -9,8 +9,9 @@ /Applications/.* system_u:object_r:appl_t /sbin/SystemStarter system_u:object_r:systemstarter_exec_t /System/Library/CoreServices/coreservicesd system_u:object_r:coreservices_exec_t -/System/Library/CoreServices/loginwindow.app/Contents/MacOS/loginwindow.real system_u:object_r:loginwindow_exec_t +/System/Library/CoreServices/loginwindow.app/Contents/MacOS/loginwindow system_u:object_r:loginwindow_exec_t /System/Library/CoreServices/pbs system_u:object_r:pbs_exec_t /System/Library/CoreServices/RealWindowServer system_u:object_r:windowserver_exec_t +/System/Library/CoreServices/WindowServer system_u:object_r:windowserver_exec_t /System/Library/CoreServices/SecurityServer system_u:object_r:securityserver_exec_t /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Support/coreservicesd system_u:object_r:coreservices_exec_t From owner-p4-projects@FreeBSD.ORG Thu Feb 26 11:12:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6861A16A4D0; Thu, 26 Feb 2004 11:12:39 -0800 (PST) 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 42BB516A4CE for ; Thu, 26 Feb 2004 11:12:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E19543D1D for ; Thu, 26 Feb 2004 11:12:39 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1QJCdGe070162 for ; Thu, 26 Feb 2004 11:12:39 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1QJCcrG070159 for perforce@freebsd.org; Thu, 26 Feb 2004 11:12:38 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 26 Feb 2004 11:12:38 -0800 (PST) Message-Id: <200402261912.i1QJCcrG070159@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 47703 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, 26 Feb 2004 19:12:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=47703 Change 47703 by jhb@jhb_slimer on 2004/02/26 11:12:06 After talking with Robert, re-sync exec'ing thread credentials with process credentials rather than vice versa. Affected files ... .. //depot/projects/smpng/sys/kern/kern_exec.c#66 edit .. //depot/projects/smpng/sys/notes#9 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_exec.c#66 (text+ko) ==== @@ -223,7 +223,7 @@ { struct proc *p = td->td_proc; struct nameidata nd, *ndp; - struct ucred *newcred = NULL, *oldcred; + struct ucred *newcred = NULL, *oldcred = NULL; struct uidinfo *euip; register_t *stack_base; int error, len, i; @@ -269,12 +269,14 @@ td->td_mailbox = NULL; thread_single_end(); if (td->td_ucred != p->p_ucred) { - crfree(p->p_ucred); - p->p_ucred = crhold(td->td_ucred); + oldcred = td->td_ucred; + td->td_ucred = crhold(p->p_ucred); } } p->p_flag |= P_INEXEC; PROC_UNLOCK(p); + if (oldcred != NULL) + crfree(oldcred); /* * Initialize part of the common data ==== //depot/projects/smpng/sys/notes#9 (text+ko) ==== @@ -26,10 +26,9 @@ - Untested - Fixup asm constraints for i386/isa/bs/bsif.h - Untested -- Fixup p_ucred to use the ucred of the thread doing the actual execve() - during an exec. This change is actually split across the jhb_proc and - smpng branches. - - Untested, also not sure if this is strictly correct. +- Fixup td_ucred of thread doing execve() to re-sync with process ucred + after single threading during an exec. + - Untested - Move lock checks and enabling of an ithread's interrupt source earlier in ithread_loop(). - Tested only on my laptop From owner-p4-projects@FreeBSD.ORG Thu Feb 26 11:32:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 119C416A4D0; Thu, 26 Feb 2004 11:32:05 -0800 (PST) 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 D936C16A4CF for ; Thu, 26 Feb 2004 11:32:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D007C43D31 for ; Thu, 26 Feb 2004 11:32:04 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1QJW4Ge074255 for ; Thu, 26 Feb 2004 11:32:04 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1QJW4VS074249 for perforce@freebsd.org; Thu, 26 Feb 2004 11:32:04 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 26 Feb 2004 11:32:04 -0800 (PST) Message-Id: <200402261932.i1QJW4VS074249@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 47707 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, 26 Feb 2004 19:32:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=47707 Change 47707 by jhb@jhb_slimer on 2004/02/26 11:31:27 ktrace cv was tested and committed. Affected files ... .. //depot/projects/smpng/sys/notes#10 edit Differences ... ==== //depot/projects/smpng/sys/notes#10 (text+ko) ==== @@ -48,8 +48,6 @@ - Untested - Don't allow kthreads to get signalled and do bad things - Untested -- Change ktrace to just use a cv rather than a semaphore - - Untested - Add a kproc API that does what kthread does right now - Add a real kthread API that creates just another thread inside of a kproc - Figure out what needs to be done to make a new kthread.. should each From owner-p4-projects@FreeBSD.ORG Fri Feb 27 10:03:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6130016A4F1; Fri, 27 Feb 2004 10:03:10 -0800 (PST) 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 1AFFC16A4EF for ; Fri, 27 Feb 2004 10:03:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1206343D1F for ; Fri, 27 Feb 2004 10:03:10 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1RI3AGe018615 for ; Fri, 27 Feb 2004 10:03:10 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1RI393j018612 for perforce@freebsd.org; Fri, 27 Feb 2004 10:03:09 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 27 Feb 2004 10:03:09 -0800 (PST) Message-Id: <200402271803.i1RI393j018612@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 47745 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, 27 Feb 2004 18:03:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=47745 Change 47745 by jhb@jhb_slimer on 2004/02/27 10:02:20 IFC @47739. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#21 integrate .. //depot/projects/smpng/sys/amd64/amd64/mpboot.S#2 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#21 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#16 integrate .. //depot/projects/smpng/sys/conf/NOTES#62 integrate .. //depot/projects/smpng/sys/conf/files#103 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#30 integrate .. //depot/projects/smpng/sys/conf/options#70 integrate .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.h#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/if_pfsync.h#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pf_osfp.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pf_table.c#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pfvar.h#1 branch .. //depot/projects/smpng/sys/contrib/pf/netinet/in4_cksum.c#1 branch .. //depot/projects/smpng/sys/ddb/db_sym.c#4 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#37 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#30 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#19 integrate .. //depot/projects/smpng/sys/dev/patm/genrtab/Makefile#3 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.h#2 integrate .. //depot/projects/smpng/sys/isa/fd.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#59 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#73 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#59 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#35 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#31 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#7 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#43 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#68 integrate .. //depot/projects/smpng/sys/modules/pf/Makefile#1 branch .. //depot/projects/smpng/sys/modules/pflog/Makefile#1 branch .. //depot/projects/smpng/sys/modules/pfsync/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf.h#10 integrate .. //depot/projects/smpng/sys/net/bridge.c#24 integrate .. //depot/projects/smpng/sys/net/if.c#44 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#42 integrate .. //depot/projects/smpng/sys/net/if_types.h#3 integrate .. //depot/projects/smpng/sys/net/if_var.h#21 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif.c#7 integrate .. //depot/projects/smpng/sys/netinet/icmp_var.h#5 integrate .. //depot/projects/smpng/sys/netinet/in.c#19 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#13 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#31 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.h#1 branch .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#28 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#13 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#5 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#18 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#30 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#25 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.h#6 integrate .. //depot/projects/smpng/sys/netinet/ip_id.c#4 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#49 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#52 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#20 integrate .. //depot/projects/smpng/sys/netinet/tcp_debug.c#5 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#50 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#45 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#22 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#40 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#19 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#10 integrate .. //depot/projects/smpng/sys/netncp/ncp_conn.c#10 integrate .. //depot/projects/smpng/sys/netsmb/smb_conn.c#10 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#28 integrate .. //depot/projects/smpng/sys/security/mac/mac_inet.c#1 branch .. //depot/projects/smpng/sys/security/mac/mac_internal.h#7 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#9 integrate .. //depot/projects/smpng/sys/security/mac/mac_socket.c#1 branch .. //depot/projects/smpng/sys/sys/limits.h#5 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#22 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#35 integrate .. //depot/projects/smpng/sys/sys/param.h#57 integrate .. //depot/projects/smpng/sys/sys/proc.h#111 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#25 integrate .. //depot/projects/smpng/sys/sys/turnstile.h#2 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#20 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#38 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#40 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#21 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.603 2004/01/29 00:07:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.604 2004/02/25 23:12:39 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1104,9 +1104,11 @@ #error "have you forgotten the isa device?"; #endif +#if 0 /* Not till we test the features bit */ /* Turn on PTE NX (no execute) bit */ msr = rdmsr(MSR_EFER) | EFER_NXE; wrmsr(MSR_EFER, msr); +#endif proc0.p_uarea = (struct user *)(physfree + KERNBASE); bzero(proc0.p_uarea, UAREA_PAGES * PAGE_SIZE); ==== //depot/projects/smpng/sys/amd64/amd64/mpboot.S#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/mpboot.S,v 1.24 2003/11/17 08:58:12 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/mpboot.S,v 1.25 2004/02/25 23:12:39 peter Exp $ */ #include /* miscellaneous asm macros */ @@ -102,7 +102,11 @@ */ movl $MSR_EFER, %ecx rdmsr +#if 0 /* not till we test the NX cpuid bits */ orl $EFER_LME | EFER_SCE | EFER_NXE, %eax +#else + orl $EFER_LME | EFER_SCE, %eax +#endif wrmsr /* ==== //depot/projects/smpng/sys/boot/forth/loader.conf#21 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.73 2004/01/27 15:59:38 des Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.74 2004/02/26 03:53:52 mlaier Exp $ ############################################################## ### Basic configuration options ############################ @@ -171,6 +171,9 @@ 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/smpng/sys/boot/i386/loader/Makefile#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.75 2004/02/12 21:43:50 ru Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.76 2004/02/27 14:10:09 ru Exp $ PROG= loader.sym INTERNALPROG= @@ -82,8 +82,11 @@ FILES+= ${.CURDIR}/loader.rc .endif -DPADD= ${BTXCRT} ${LIBFICL} ${LIBI386} ${LIBSTAND} -LDADD= ${BTXCRT} ${LIBFICL} ${LIBI386} -lstand +# XXX crt0.o needs to be first for pxeboot(8) to work +OBJS= ${BTXCRT} + +DPADD= ${LIBFICL} ${LIBI386} ${LIBSTAND} +LDADD= ${LIBFICL} ${LIBI386} -lstand .include ==== //depot/projects/smpng/sys/conf/NOTES#62 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1197 2004/01/26 16:38:33 ale Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1199 2004/02/25 08:57:33 bde Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -242,6 +242,12 @@ #!options DDB_NOKLDSYM # +# Print the numerical value of symbols in addition to the symbolic +# representation. +# +options DDB_NUMSYM + +# # Print a stack trace of the current thread out on the console for a panic. # options DDB_TRACE ==== //depot/projects/smpng/sys/conf/files#103 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.863 2004/02/11 04:26:01 bms Exp $ +# $FreeBSD: src/sys/conf/files,v 1.865 2004/02/26 03:53:52 mlaier Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -206,6 +206,14 @@ contrib/ipfilter/netinet/ip_proxy.c optional ipfilter inet contrib/ipfilter/netinet/ip_state.c optional ipfilter inet contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet +contrib/pf/net/if_pflog.c optional pflog +contrib/pf/net/if_pfsync.c optional pfsync +contrib/pf/net/pf.c optional pf nowerror +contrib/pf/net/pf_ioctl.c optional pf +contrib/pf/net/pf_norm.c optional pf +contrib/pf/net/pf_table.c optional pf +contrib/pf/net/pf_osfp.c optional pf +contrib/pf/netinet/in4_cksum.c optional pf inet crypto/blowfish/bf_ecb.c optional ipsec ipsec_esp crypto/blowfish/bf_skey.c optional ipsec ipsec_esp crypto/cast128/cast128.c optional ipsec ipsec_esp @@ -1618,10 +1626,12 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard kern/uipc_sem.c optional p1003_1b_semaphores +security/mac/mac_inet.c optional mac inet security/mac/mac_label.c optional mac security/mac/mac_net.c optional mac security/mac/mac_pipe.c optional mac security/mac/mac_process.c optional mac +security/mac/mac_socket.c optional mac security/mac/mac_system.c optional mac security/mac/mac_vfs.c optional mac security/mac_biba/mac_biba.c optional mac_biba ==== //depot/projects/smpng/sys/conf/kern.pre.mk#30 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.41 2004/02/13 10:40:54 ru Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.42 2004/02/26 03:53:52 mlaier Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -32,6 +32,9 @@ # ... and the same for ipfilter INCLUDES+= -I$S/contrib/ipfilter +# ... and the same for pf +INCLUDES+= -I$S/contrib/pf + # ... and the same for Atheros HAL INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd ==== //depot/projects/smpng/sys/conf/options#70 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.429 2004/02/11 04:26:01 bms Exp $ +# $FreeBSD: src/sys/conf/options,v 1.432 2004/02/26 03:53:52 mlaier Exp $ # # On the handling of kernel options # @@ -83,8 +83,10 @@ CY_PCI_FASTINTR DDB DDB_NOKLDSYM opt_ddb.h +DDB_NUMSYM opt_ddb.h DDB_TRACE DDB_UNATTENDED +DIRECTIO opt_directio.h GDB_REMOTE_CHAT opt_ddb.h GDBSPEED opt_ddb.h GEOM_AES opt_geom.h @@ -99,8 +101,8 @@ GEOM_SUNLABEL opt_geom.h GEOM_VOL opt_geom.h HW_WDOG +KSTACK_MAX_PAGES KSTACK_PAGES -KSTACK_MAX_PAGES KTRACE KTRACE_REQUEST_POOL opt_ktrace.h LIBICONV @@ -151,15 +153,15 @@ SYSVMSG opt_sysvipc.h SYSVSEM opt_sysvipc.h SYSVSHM opt_sysvipc.h +TTYHOG opt_tty.h VFS_AIO +WATCHDOG opt_watchdog.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h -TTYHOG opt_tty.h -DIRECTIO opt_directio.h # POSIX kernel options +P1003_1B_SEMAPHORES opt_posix.h _KPOSIX_PRIORITY_SCHEDULING opt_posix.h -P1003_1B_SEMAPHORES opt_posix.h # Do we want the config file compiled into the kernel? INCLUDE_CONFIG_FILE opt_config.h @@ -305,11 +307,11 @@ ATA_STATIC_ID opt_ata.h ATA_NOPCI opt_ata.h DEV_ATADISK opt_ata.h -DEV_ATARAID opt_ata.h -DEV_ATAPICD opt_ata.h +DEV_ATAPICD opt_ata.h DEV_ATAPIST opt_ata.h DEV_ATAPIFD opt_ata.h DEV_ATAPICAM opt_ata.h +DEV_ATARAID opt_ata.h # Net stuff. ACCEPT_FILTER_DATA @@ -320,6 +322,9 @@ BOOTP_NFSV3 opt_bootp.h BOOTP_WIRED_TO opt_bootp.h BRIDGE opt_bdg.h +DEV_PF opt_pf.h +DEV_PFLOG opt_pf.h +DEV_PFSYNC opt_pf.h ETHER_II opt_ef.h ETHER_8023 opt_ef.h ETHER_8022 opt_ef.h @@ -352,6 +357,7 @@ IPXIP opt_ipx.h LIBMBPOOL LIBMCHAIN +MBUF_STRESS_TEST opt_mbuf_stress_test.h NCP NETATALK opt_atalk.h PPP_BSDCOMP opt_ppp.h @@ -363,7 +369,6 @@ TCP_SIGNATURE opt_inet.h TCP_DROP_SYNFIN opt_tcp_input.h XBONEHACK -MBUF_STRESS_TEST opt_mbuf_stress_test.h # Netgraph(4). Use option NETGRAPH to enable the base netgraph code. # Each netgraph node type can be either be compiled into the kernel @@ -445,13 +450,9 @@ LPT_DEBUG opt_lpt.h PLIP_DEBUG opt_plip.h LOCKF_DEBUG opt_debug_lockf.h -MUTEX_DEBUG opt_global.h -MUTEX_NOINLINE opt_global.h -MUTEX_PROFILING opt_global.h NPX_DEBUG opt_debug_npx.h NETATALKDEBUG opt_atalk.h SI_DEBUG opt_debug_si.h -WATCHDOG opt_watchdog.h # Fb options FB_DEBUG opt_fb.h @@ -475,6 +476,9 @@ INVARIANTS opt_global.h LOOKUP_SHARED opt_global.h MCLSHIFT opt_global.h +MUTEX_DEBUG opt_global.h +MUTEX_NOINLINE opt_global.h +MUTEX_PROFILING opt_global.h MSIZE opt_global.h REGRESSION opt_global.h RESTARTABLE_PANICS opt_global.h @@ -588,9 +592,9 @@ NDEVFSOVERFLOW opt_devfs.h # various 'device presence' options. +DEV_BPF opt_bpf.h DEV_ISA opt_isa.h DEV_MCA opt_mca.h -DEV_BPF opt_bpf.h DEV_SPLASH opt_splash.h EISA_SLOTS opt_eisa.h @@ -636,13 +640,13 @@ SC_NO_CUTPASTE opt_syscons.h SC_NO_FONT_LOADING opt_syscons.h SC_NO_HISTORY opt_syscons.h +SC_NO_SUSPEND_VTYSWITCH opt_syscons.h SC_NO_SYSMOUSE opt_syscons.h SC_NORM_ATTR opt_syscons.h SC_NORM_REV_ATTR opt_syscons.h SC_PIXEL_MODE opt_syscons.h SC_RENDER_DEBUG opt_syscons.h SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h # kbd options KBD_DISABLE_KEYMAP_LOAD opt_kbd.h ==== //depot/projects/smpng/sys/ddb/db_sym.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_sym.c,v 1.34 2003/06/10 22:09:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_sym.c,v 1.35 2004/02/24 22:51:42 phk Exp $"); #include #include @@ -37,6 +37,8 @@ #include #include +#include + /* * Multiple symbol tables */ @@ -308,7 +310,11 @@ db_printf("%#lr", (unsigned long)off); return; } +#ifdef DDB_NUMSYM + db_printf("%#lr = %s", (unsigned long)off, name); +#else db_printf("%s", name); +#endif if (d) db_printf("+%+#lr", (long)d); if (strategy == DB_STGY_PROC) { ==== //depot/projects/smpng/sys/dev/aac/aac.c#37 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.88 2004/02/21 21:10:39 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.89 2004/02/25 05:41:44 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -1292,7 +1292,6 @@ /* put the FIB on the outbound queue */ if (aac_enqueue_fib(sc, cm->cm_queue, cm) == EBUSY) { - aac_remove_busy(cm); aac_unmap_command(cm); aac_requeue_ready(cm); } ==== //depot/projects/smpng/sys/dev/ata/ata-chipset.c#30 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.61 2004/02/02 14:05:56 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.62 2004/02/25 09:55:49 sos Exp $"); #include "opt_ata.h" #include @@ -1587,8 +1587,10 @@ struct ata_chip_id *idx; static struct ata_chip_id ids[] = {{ ATA_SII3114, 0x00, SIIMEMIO, SII4CH, ATA_SA150, "SiI 3114" }, + { ATA_SII3512, 0x02, SIIMEMIO, 0, ATA_SA150, "SiI 3512" }, { ATA_SII3112, 0x02, SIIMEMIO, 0, ATA_SA150, "SiI 3112" }, { ATA_SII3112_1, 0x02, SIIMEMIO, 0, ATA_SA150, "SiI 3112" }, + { ATA_SII3512, 0x00, SIIMEMIO, SIIBUG, ATA_SA150, "SiI 3512" }, { ATA_SII3112, 0x00, SIIMEMIO, SIIBUG, ATA_SA150, "SiI 3112" }, { ATA_SII3112_1, 0x00, SIIMEMIO, SIIBUG, ATA_SA150, "SiI 3112" }, { ATA_SII0680, 0x00, SIIMEMIO, SIISETCLK, ATA_UDMA6, "SiI 0680" }, ==== //depot/projects/smpng/sys/dev/ata/ata-pci.h#19 (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-pci.h,v 1.24 2004/02/02 14:05:57 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.25 2004/02/25 09:55:49 sos Exp $ */ /* structure holding chipset config info */ @@ -160,6 +160,7 @@ #define ATA_SILICON_IMAGE_ID 0x1095 #define ATA_SII3114 0x31141095 +#define ATA_SII3512 0x35121095 #define ATA_SII3112 0x31121095 #define ATA_SII3112_1 0x02401095 #define ATA_SII0680 0x06801095 ==== //depot/projects/smpng/sys/dev/patm/genrtab/Makefile#3 (text+ko) ==== @@ -1,15 +1,13 @@ -# $FreeBSD: src/sys/dev/patm/genrtab/Makefile,v 1.2 2004/02/05 22:01:28 ru Exp $ +# $FreeBSD: src/sys/dev/patm/genrtab/Makefile,v 1.4 2004/02/25 13:12:51 johan Exp $ # # This program is used to generate the if_patm_rtables.c file # for the idt77252 driver. It is not installed. # -PROG=genrtab -WARNS=5 -NOMAN=true -DPADD=${LIBM} -LDADD=-lm - -install: +PROG= genrtab +INTERNALPROG= +WARNS?= 5 +NOMAN= true +DPADD= ${LIBM} +LDADD= -lm .include - ==== //depot/projects/smpng/sys/geom/concat/g_concat.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/concat/g_concat.c,v 1.1 2004/02/19 15:19:49 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/concat/g_concat.c,v 1.2 2004/02/27 15:34:21 pjd Exp $"); #include #include @@ -537,7 +537,8 @@ gp = g_new_geomf(mp, "concat:taste"); gp->start = g_concat_start; - gp->access= g_concat_access; + gp->access = g_concat_access; + gp->orphan = g_concat_orphan; cp = g_new_consumer(gp); g_attach(cp, pp); ==== //depot/projects/smpng/sys/geom/concat/g_concat.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/concat/g_concat.h,v 1.1 2004/02/19 15:19:49 pjd Exp $ + * $FreeBSD: src/sys/geom/concat/g_concat.h,v 1.2 2004/02/27 15:32:49 pjd Exp $ */ #ifndef _G_CONCAT_H_ @@ -69,7 +69,6 @@ }; struct g_concat_softc { - int sc_flags; /* flags */ u_int sc_type; /* provider type */ struct g_provider *sc_provider; char sc_name[16]; /* concat name */ ==== //depot/projects/smpng/sys/isa/fd.c#29 (text+ko) ==== @@ -53,7 +53,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/isa/fd.c,v 1.265 2004/02/21 21:10:52 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/isa/fd.c,v 1.266 2004/02/25 13:44:58 phk Exp $"); #include "opt_fdc.h" #include "card.h" @@ -176,9 +176,7 @@ typedef struct fdc_data *fdc_p; typedef enum fdc_type fdc_t; -#define FDUNIT(s) (((s) >> 6) & 3) #define FDNUMTOUNIT(n) (((n) & 3) << 6) -#define FDTYPE(s) ((s) & 0x3f) /* * fdc maintains a set (1!) of ivars per child of each controller. @@ -227,13 +225,6 @@ /* * Number of subdevices that can be used for different density types. - * By now, the lower 6 bit of the minor number are reserved for this, - * allowing for up to 64 subdevices, but we only use 16 out of this. - * Density #0 is used for automatic format detection, the other - * densities are available as programmable densities (for assignment - * by fdcontrol(8)). - * The upper 2 bits of the minor number are reserved for the subunit - * (drive #) per controller. */ #define NUMDENS 16 @@ -317,10 +308,6 @@ struct callout_handle tohandle; struct devstat *device_stats; dev_t masterdev; -#ifdef GONE_IN_5 - eventhandler_tag clonetag; - dev_t clonedevs[NUMDENS - 1]; -#endif device_t dev; fdu_t fdu; }; @@ -388,9 +375,6 @@ static void fdc_add_child(device_t, const char *, int); static int fdc_attach(device_t); static int fdc_print_child(device_t, device_t); -#ifdef GONE_IN_5 -static void fd_clone (void *, char *, int, dev_t *); -#endif static int fd_probe(device_t); static int fd_attach(device_t); static int fd_detach(device_t); @@ -1154,63 +1138,7 @@ #endif /* NCARD > 0 */ -#ifdef GONE_IN_5 -/* - * Create a clone device upon request by devfs. - */ -static void -fd_clone(void *arg, char *name, int namelen, dev_t *dev) -{ - struct fd_data *fd; - int i, u; - char *n; - size_t l; - fd = (struct fd_data *)arg; - if (*dev != NODEV) - return; - if (dev_stdclone(name, &n, "fd", &u) != 2) - return; - if (u != fd->fdu) - /* unit # mismatch */ - return; - l = strlen(n); - if (l == 1 && *n >= 'a' && *n <= 'h') { - /* - * Trailing letters a through h denote - * pseudo-partitions. We don't support true - * (UFS-style) partitions, so we just implement them - * as symlinks if someone asks us nicely. - */ - *dev = make_dev_alias(fd->masterdev, name); - return; - } - if (l >= 2 && l <= 5 && *n == '.') { - /* - * Trailing numbers, preceded by a dot, denote - * subdevices for different densities. Historically, - * they have been named by density (like fd0.1440), - * but we allow arbitrary numbers between 1 and 4 - * digits, so fd0.1 through fd0.15 are possible as - * well. - */ - for (i = 1; i < l; i++) - if (n[i] < '0' || n[i] > '9') - return; - for (i = 0; i < NUMDENS - 1; i++) - if (fd->clonedevs[i] == NODEV) { - *dev = make_dev(&fd_cdevsw, - FDNUMTOUNIT(u) + i + 1, - UID_ROOT, GID_OPERATOR, 0640, - name); - fd->clonedevs[i] = *dev; - fd->clonedevs[i]->si_drv1 = fd; - return; - } - } -} -#endif - /* * Configuration/initialization, per drive. */ @@ -1365,19 +1293,9 @@ struct fd_data *fd; fd = device_get_softc(dev); -#ifdef GONE_IN_5 - fd->clonetag = EVENTHANDLER_REGISTER(dev_clone, fd_clone, fd, 1000); -#endif - fd->masterdev = make_dev(&fd_cdevsw, fd->fdu << 6, + fd->masterdev = make_dev(&fd_cdevsw, fd->fdu, UID_ROOT, GID_OPERATOR, 0640, "fd%d", fd->fdu); fd->masterdev->si_drv1 = fd; -#ifdef GONE_IN_5 - { - int i; - for (i = 0; i < NUMDENS - 1; i++) - fd->clonedevs[i] = NODEV; - } -#endif fd->device_stats = devstat_new_entry(device_get_name(dev), device_get_unit(dev), 0, DEVSTAT_NO_ORDERED_TAGS, DEVSTAT_TYPE_FLOPPY | DEVSTAT_TYPE_IF_OTHER, @@ -1394,15 +1312,6 @@ untimeout(fd_turnoff, fd, fd->toffhandle); devstat_remove_entry(fd->device_stats); destroy_dev(fd->masterdev); -#ifdef GONE_IN_5 - { - int i; - for (i = 0; i < NUMDENS - 1; i++) - if (fd->clonedevs[i] != NODEV) - destroy_dev(fd->clonedevs[i]); - EVENTHANDLER_DEREGISTER(dev_clone, fd->clonetag); - } -#endif return (0); } @@ -1597,7 +1506,6 @@ static int fdopen(dev_t dev, int flags, int mode, struct thread *td) { - int type = FDTYPE(minor(dev)); fd_p fd; fdc_p fdc; int rv, unitattn, dflags; @@ -1608,8 +1516,6 @@ fdc = fd->fdc; if ((fdc == NULL) || (fd->type == FDT_NONE)) return (ENXIO); - if (type > NUMDENS) - return (ENXIO); dflags = device_get_flags(fd->dev); /* * This is a bit bogus. It's still possible that e. g. a @@ -1622,62 +1528,58 @@ if (fd->flags & FD_OPEN) return (EBUSY); - if (type == 0) { - if (flags & FNONBLOCK) { - /* - * Unfortunately, physio(9) discards its ioflag - * argument, thus preventing us from seeing the - * IO_NDELAY bit. So we need to keep track - * ourselves. - */ - fd->flags |= FD_NONBLOCK; - fd->ft = 0; + if (flags & FNONBLOCK) { + /* + * Unfortunately, physio(9) discards its ioflag + * argument, thus preventing us from seeing the + * IO_NDELAY bit. So we need to keep track + * ourselves. + */ + fd->flags |= FD_NONBLOCK; + fd->ft = 0; + } else { + /* + * Figure out a unit attention condition. + * + * If UA has been forced, proceed. + * + * If the drive has no changeline support, + * or if the drive parameters have been lost + * due to previous non-blocking access, + * assume a forced UA condition. + * + * If motor is off, turn it on for a moment + * and select our drive, in order to read the + * UA hardware signal. + * + * If motor is on, and our drive is currently + * selected, just read the hardware bit. + * + * If motor is on, but active for another + * drive on that controller, we are lost. We + * cannot risk to deselect the other drive, so + * we just assume a forced UA condition to be + * on the safe side. + */ + unitattn = 0; + if ((dflags & FD_NO_CHLINE) != 0 || + (fd->flags & FD_UA) != 0 || + fd->ft == 0) { + unitattn = 1; + fd->flags &= ~FD_UA; + } else if (fdc->fdout & (FDO_MOEN0 | FDO_MOEN1 | + FDO_MOEN2 | FDO_MOEN3)) { + if ((fdc->fdout & FDO_FDSEL) == fd->fdsu) + unitattn = fdin_rd(fdc) & FDI_DCHG; + else + unitattn = 1; } else { - /* - * Figure out a unit attention condition. - * - * If UA has been forced, proceed. - * - * If the drive has no changeline support, - * or if the drive parameters have been lost - * due to previous non-blocking access, - * assume a forced UA condition. - * - * If motor is off, turn it on for a moment - * and select our drive, in order to read the - * UA hardware signal. - * - * If motor is on, and our drive is currently - * selected, just read the hardware bit. - * - * If motor is on, but active for another - * drive on that controller, we are lost. We - * cannot risk to deselect the other drive, so - * we just assume a forced UA condition to be - * on the safe side. - */ - unitattn = 0; - if ((dflags & FD_NO_CHLINE) != 0 || - (fd->flags & FD_UA) != 0 || - fd->ft == 0) { - unitattn = 1; - fd->flags &= ~FD_UA; - } else if (fdc->fdout & (FDO_MOEN0 | FDO_MOEN1 | - FDO_MOEN2 | FDO_MOEN3)) { - if ((fdc->fdout & FDO_FDSEL) == fd->fdsu) - unitattn = fdin_rd(fdc) & FDI_DCHG; - else - unitattn = 1; - } else { - set_motor(fdc, fd->fdsu, TURNON); - unitattn = fdin_rd(fdc) & FDI_DCHG; - set_motor(fdc, fd->fdsu, TURNOFF); - } - if (unitattn && (rv = fdautoselect(dev)) != 0) - return (rv); + set_motor(fdc, fd->fdsu, TURNON); + unitattn = fdin_rd(fdc) & FDI_DCHG; + set_motor(fdc, fd->fdsu, TURNOFF); } - } else { - fd->ft = fd->fts + type; + if (unitattn && (rv = fdautoselect(dev)) != 0) + return (rv); } fd->flags |= FD_OPEN; /* @@ -1718,11 +1620,8 @@ fd_p fd; size_t fdblk; - fdu = FDUNIT(minor(bp->bio_dev)); fd = bp->bio_dev->si_drv1; - if (fd == NULL) - panic("fdstrategy: buf for nonexistent device (%#lx, %#lx)", - (u_long)major(bp->bio_dev), (u_long)minor(bp->bio_dev)); + fdu = fd->fdu; fdc = fd->fdc; bp->bio_resid = bp->bio_bcount; if (fd->type == FDT_NONE || fd->ft == 0) { @@ -1906,13 +1805,11 @@ static int fdautoselect(dev_t dev) { - fdu_t fdu; fd_p fd; struct fd_type *fdtp; struct fdc_readid id; int i, n, oopts, rv; - fdu = FDUNIT(minor(dev)); fd = dev->si_drv1; switch (fd->type) { @@ -2039,8 +1936,8 @@ TRACE1("[fdc%d IDLE]", fdc->fdcu); return (0); } - fdu = FDUNIT(minor(bp->bio_dev)); fd = bp->bio_dev->si_drv1; + fdu = fd->fdu; fdblk = 128 << fd->ft->secsize; if (fdc->fd && (fd != fdc->fd)) device_printf(fd->dev, "confused fd pointers\n"); @@ -2542,8 +2439,8 @@ bp = fdc->bp; /* XXX shouldn't this be cached somewhere? */ - fdu = FDUNIT(minor(bp->bio_dev)); fd = bp->bio_dev->si_drv1; + fdu = fd->fdu; if (fd->options & FDOPT_NORETRY) goto fail; @@ -2613,8 +2510,8 @@ size_t fdblk; int error; - fdu = FDUNIT(minor(dev)); fd = dev->si_drv1; + fdu = fd->fdu; fdblk = 128 << fd->ft->secsize; finfo = (struct fd_formb *)data; idfield = (struct fdc_readid *)data; @@ -2660,11 +2557,10 @@ fd_p fd; struct fdc_status *fsp; struct fdc_readid *rid; - int error, type; + int error; - fdu = FDUNIT(minor(dev)); - type = FDTYPE(minor(dev)); fd = dev->si_drv1; + fdu = fd->fdu; /* * First, handle everything that could be done with @@ -2712,30 +2608,13 @@ return (0); case FD_STYPE: /* set drive type */ - if (type == 0) { - /* - * Allow setting drive type temporarily iff - * currently unset. Used for fdformat so any - * user can set it, and then start formatting. - */ - if (fd->ft) - return (EINVAL); /* already set */ - fd->ft = fd->fts; - *fd->ft = *(struct fd_type *)addr; - fd->flags |= FD_UA; - } else { - /* - * Set density definition permanently. Only - * allow for superuser. - */ - if (suser(td) != 0) - return (EPERM); - fd->fts[type] = *(struct fd_type *)addr; - } + if (suser(td) != 0) + return (EPERM); + fd->fts[0] = *(struct fd_type *)addr; return (0); case FD_GOPTS: /* get drive options */ - *(int *)addr = fd->options + (type == 0? FDOPT_AUTOSEL: 0); + *(int *)addr = fd->options + FDOPT_AUTOSEL; return (0); case FD_SOPTS: /* set drive options */ ==== //depot/projects/smpng/sys/kern/kern_descrip.c#59 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.227 2004/02/21 21:10:52 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.228 2004/02/26 00:27:02 truckman Exp $"); #include "opt_compat.h" @@ -2327,7 +2327,9 @@ * it is of a similar order of magnitude to the leakage from * global system statistics such as kern.openfiles. */ - sysctl_wire_old_buffer(req, 0); + error = sysctl_wire_old_buffer(req, 0); + if (error != 0) + return (error); if (req->oldptr == NULL) { n = 16; /* A slight overestimate. */ sx_slock(&filelist_lock); ==== //depot/projects/smpng/sys/kern/kern_fork.c#73 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.214 2004/02/05 21:01:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_fork.c,v 1.215 2004/02/26 00:27:02 truckman Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -168,7 +168,9 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 27 10:05:14 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB4A316A4F4; Fri, 27 Feb 2004 10:05:13 -0800 (PST) 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 C1E2A16A4CE for ; Fri, 27 Feb 2004 10:05:13 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBB7843D1D for ; Fri, 27 Feb 2004 10:05:13 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1RI5DGe019591 for ; Fri, 27 Feb 2004 10:05:13 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1RI5DEY019588 for perforce@freebsd.org; Fri, 27 Feb 2004 10:05:13 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 27 Feb 2004 10:05:13 -0800 (PST) Message-Id: <200402271805.i1RI5DEY019588@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 47747 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, 27 Feb 2004 18:05:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=47747 Change 47747 by jhb@jhb_slimer on 2004/02/27 10:04:19 IFC @47744. Affected files ... .. //depot/projects/smpng/sys/kern/kern_sysctl.c#36 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#26 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_sysctl.c#36 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.150 2004/02/26 00:27:02 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.151 2004/02/27 17:13:23 des Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -416,6 +416,26 @@ } /* + * Reparent an existing oid. + */ +int +sysctl_move_oid(struct sysctl_oid *oid, struct sysctl_oid_list *parent) +{ + struct sysctl_oid *oidp; + + if (oid->oid_parent == parent) + return (0); + oidp = sysctl_find_oidname(oid->oid_name, parent); + if (oidp != NULL) + return (EEXIST); + sysctl_unregister_oid(oid); + oid->oid_parent = parent; + oid->oid_number = OID_AUTO; + sysctl_register_oid(oid); + return (0); +} + +/* * Register the kernel's oids on startup. */ SET_DECLARE(sysctl_set, struct sysctl_oid); ==== //depot/projects/smpng/sys/sys/sysctl.h#26 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)sysctl.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/sysctl.h,v 1.125 2004/02/26 16:18:22 des Exp $ + * $FreeBSD: src/sys/sys/sysctl.h,v 1.126 2004/02/27 17:13:23 des Exp $ */ #ifndef _SYS_SYSCTL_H_ @@ -603,6 +603,8 @@ int kind, void *arg1, int arg2, int (*handler) (SYSCTL_HANDLER_ARGS), const char *fmt, const char *descr); +int sysctl_move_oid(struct sysctl_oid *oidp, + struct sysctl_oid_list *parent); int sysctl_remove_oid(struct sysctl_oid *oidp, int del, int recurse); int sysctl_ctx_init(struct sysctl_ctx_list *clist); int sysctl_ctx_free(struct sysctl_ctx_list *clist); From owner-p4-projects@FreeBSD.ORG Fri Feb 27 11:04:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8A5216A4D0; Fri, 27 Feb 2004 11:04:34 -0800 (PST) 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 B9E9316A4CE for ; Fri, 27 Feb 2004 11:04:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B111343D1F for ; Fri, 27 Feb 2004 11:04:34 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1RJ4YGe033496 for ; Fri, 27 Feb 2004 11:04:34 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1RJ4Yf3033493 for perforce@freebsd.org; Fri, 27 Feb 2004 11:04:34 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 27 Feb 2004 11:04:34 -0800 (PST) Message-Id: <200402271904.i1RJ4Yf3033493@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 47757 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, 27 Feb 2004 19:04:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=47757 Change 47757 by jhb@jhb_slimer on 2004/02/27 11:03:35 IFC @47756. Loop back sleep queues merge. Affected files ... .. //depot/projects/smpng/sys/conf/files#104 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#72 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#87 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#65 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#51 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#23 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#26 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#1 branch .. //depot/projects/smpng/sys/kern/subr_turnstile.c#8 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#113 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#31 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#69 integrate .. //depot/projects/smpng/sys/sys/condvar.h#6 integrate .. //depot/projects/smpng/sys/sys/proc.h#112 integrate .. //depot/projects/smpng/sys/sys/sched.h#9 integrate .. //depot/projects/smpng/sys/sys/sleepqueue.h#1 branch .. //depot/projects/smpng/sys/sys/systm.h#49 integrate Differences ... ==== //depot/projects/smpng/sys/conf/files#104 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.865 2004/02/26 03:53:52 mlaier Exp $ +# $FreeBSD: src/sys/conf/files,v 1.866 2004/02/27 18:52:42 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1151,6 +1151,7 @@ kern/subr_rman.c standard kern/subr_sbuf.c standard kern/subr_scanf.c standard +kern/subr_sleepqueue.c standard kern/subr_smp.c standard kern/subr_taskqueue.c standard kern/subr_trap.c standard ==== //depot/projects/smpng/sys/ddb/db_ps.c#24 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.49 2003/08/30 19:06:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.50 2004/02/27 18:52:42 jhb Exp $"); #include #include @@ -126,20 +126,8 @@ if (p->p_flag & P_SA) db_printf( " thread %p ksegrp %p ", td, td->td_ksegrp); - if (TD_ON_SLEEPQ(td)) { - if (td->td_flags & TDF_CVWAITQ) - if (TD_IS_SLEEPING(td)) - db_printf("[CV]"); - else - db_printf("[CVQ"); - else - if (TD_IS_SLEEPING(td)) - db_printf("[SLP]"); - else - db_printf("[SLPQ"); - db_printf("%s %p]", td->td_wmesg, - (void *)td->td_wchan); - } + if (TD_ON_SLEEPQ(td)) + db_printf("[SLPQ %s %p]", td->td_wmesg, (void *)td->td_wchan); switch (td->td_state) { case TDS_INHIBITED: if (TD_ON_LOCK(td)) { @@ -147,11 +135,9 @@ td->td_lockname, (void *)td->td_blocked); } -#if 0 /* covered above */ if (TD_IS_SLEEPING(td)) { db_printf("[SLP]"); } -#endif if (TD_IS_SWAPPED(td)) { db_printf("[SWAP]"); } ==== //depot/projects/smpng/sys/kern/kern_condvar.c#33 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_condvar.c,v 1.45 2004/01/25 03:54:52 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_condvar.c,v 1.46 2004/02/27 18:52:43 jhb Exp $"); #include "opt_ktrace.h" @@ -39,6 +39,7 @@ #include #include #include +#include #include #ifdef KTRACE #include @@ -56,35 +57,6 @@ mtx_assert((mp), MA_OWNED | MA_NOTRECURSED); \ } while (0) -#ifdef INVARIANTS -#define CV_WAIT_VALIDATE(cvp, mp) do { \ - if (TAILQ_EMPTY(&(cvp)->cv_waitq)) { \ - /* Only waiter. */ \ - (cvp)->cv_mtx = (mp); \ - } else { \ - /* \ - * Other waiter; assert that we're using the \ - * same mutex. \ - */ \ - KASSERT((cvp)->cv_mtx == (mp), \ - ("%s: Multiple mutexes", __func__)); \ - } \ -} while (0) - -#define CV_SIGNAL_VALIDATE(cvp) do { \ - if (!TAILQ_EMPTY(&(cvp)->cv_waitq)) { \ - KASSERT(mtx_owned((cvp)->cv_mtx), \ - ("%s: Mutex not owned", __func__)); \ - } \ -} while (0) - -#else -#define CV_WAIT_VALIDATE(cvp, mp) -#define CV_SIGNAL_VALIDATE(cvp) -#endif - -static void cv_timedwait_end(void *arg); - /* * Initialize a condition variable. Must be called before use. */ @@ -92,8 +64,6 @@ cv_init(struct cv *cvp, const char *desc) { - TAILQ_INIT(&cvp->cv_waitq); - cvp->cv_mtx = NULL; cvp->cv_description = desc; } @@ -104,85 +74,16 @@ void cv_destroy(struct cv *cvp) { +#ifdef INVARIANTS + struct sleepqueue *sq; - KASSERT(cv_waitq_empty(cvp), ("%s: cv_waitq non-empty", __func__)); -} - -/* - * Common code for cv_wait* functions. All require sched_lock. - */ - -/* - * Switch context. - */ -static __inline void -cv_switch(struct thread *td) -{ - TD_SET_SLEEPING(td); - mi_switch(SW_VOL); - CTR3(KTR_PROC, "cv_switch: resume thread %p (pid %d, %s)", td, - td->td_proc->p_pid, td->td_proc->p_comm); -} - -/* - * Switch context, catching signals. - */ -static __inline int -cv_switch_catch(struct thread *td) -{ - struct proc *p; - int sig; - - /* - * We put ourselves on the sleep queue and start our timeout before - * calling cursig, as we could stop there, and a wakeup or a SIGCONT (or - * both) could occur while we were stopped. A SIGCONT would cause us to - * be marked as TDS_SLP without resuming us, thus we must be ready for - * sleep when cursig is called. If the wakeup happens while we're - * stopped, td->td_wchan will be 0 upon return from cursig, - * and TD_ON_SLEEPQ() will return false. - */ - td->td_flags |= TDF_SINTR; - mtx_unlock_spin(&sched_lock); - p = td->td_proc; - PROC_LOCK(p); - mtx_lock(&p->p_sigacts->ps_mtx); - sig = cursig(td); - mtx_unlock(&p->p_sigacts->ps_mtx); - if (thread_suspend_check(1)) - sig = SIGSTOP; - mtx_lock_spin(&sched_lock); - PROC_UNLOCK(p); - if (sig != 0) { - if (TD_ON_SLEEPQ(td)) - cv_waitq_remove(td); - TD_SET_RUNNING(td); - } else if (TD_ON_SLEEPQ(td)) { - cv_switch(td); - } - td->td_flags &= ~TDF_SINTR; - - return sig; + sq = sleepq_lookup(cvp); + sleepq_release(cvp); + KASSERT(sq == NULL, ("%s: associated sleep queue non-empty", __func__)); +#endif } /* - * Add a thread to the wait queue of a condition variable. - */ -static __inline void -cv_waitq_add(struct cv *cvp, struct thread *td) -{ - - td->td_flags |= TDF_CVWAITQ; - TD_SET_ON_SLEEPQ(td); - td->td_wchan = cvp; - td->td_wmesg = cvp->cv_description; - CTR3(KTR_PROC, "cv_waitq_add: thread %p (pid %d, %s)", td, - td->td_proc->p_pid, td->td_proc->p_comm); - TAILQ_INSERT_TAIL(&cvp->cv_waitq, td, td_slpq); - sched_sleep(td, td->td_priority); -} - -/* * Wait on a condition variable. The current thread is placed on the condition * variable's wait queue and suspended. A cv_signal or cv_broadcast on the same * condition variable will resume the thread. The mutex is released before @@ -192,6 +93,7 @@ void cv_wait(struct cv *cvp, struct mtx *mp) { + struct sleepqueue *sq; struct thread *td; WITNESS_SAVE_DECL(mp); @@ -205,7 +107,7 @@ "Waiting on \"%s\"", cvp->cv_description); WITNESS_SAVE(&mp->mtx_object, mp); - if (cold ) { + if (cold || panicstr) { /* * During autoconfiguration, just give interrupts * a chance, then just return. Don't run any other @@ -215,17 +117,14 @@ return; } - mtx_lock_spin(&sched_lock); - - CV_WAIT_VALIDATE(cvp, mp); + sq = sleepq_lookup(cvp); DROP_GIANT(); mtx_unlock(mp); - cv_waitq_add(cvp, td); - cv_switch(td); + sleepq_add(sq, cvp, mp, cvp->cv_description, SLEEPQ_CONDVAR); + sleepq_wait(cvp); - mtx_unlock_spin(&sched_lock); #ifdef KTRACE if (KTRPOINT(td, KTR_CSW)) ktrcsw(0, 0); @@ -244,10 +143,10 @@ int cv_wait_sig(struct cv *cvp, struct mtx *mp) { + struct sleepqueue *sq; struct thread *td; struct proc *p; - int rval; - int sig; + int rval, sig; WITNESS_SAVE_DECL(mp); td = curthread; @@ -272,32 +171,25 @@ return 0; } - mtx_lock_spin(&sched_lock); + sq = sleepq_lookup(cvp); - CV_WAIT_VALIDATE(cvp, mp); + /* XXX: Missing the threading checks from msleep! */ DROP_GIANT(); mtx_unlock(mp); - cv_waitq_add(cvp, td); - sig = cv_switch_catch(td); + sleepq_add(sq, cvp, mp, cvp->cv_description, SLEEPQ_CONDVAR); + sig = sleepq_catch_signals(cvp); + /* + * XXX: Missing magic return value handling for no signal + * caught but thread woken up during check. + */ + rval = sleepq_wait_sig(cvp); + if (rval == 0) + rval = sleepq_calc_signal_retval(sig); - mtx_unlock_spin(&sched_lock); - + /* XXX: Part of missing threading checks? */ PROC_LOCK(p); - mtx_lock(&p->p_sigacts->ps_mtx); - if (sig == 0) { - sig = cursig(td); /* XXXKSE */ - if (sig == 0 && td->td_flags & TDF_INTERRUPT) - rval = td->td_intrval; - } - if (sig != 0) { - if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) - rval = EINTR; - else - rval = ERESTART; - } - mtx_unlock(&p->p_sigacts->ps_mtx); if (p->p_flag & P_WEXIT) rval = EINTR; PROC_UNLOCK(p); @@ -321,6 +213,7 @@ int cv_timedwait(struct cv *cvp, struct mtx *mp, int timo) { + struct sleepqueue *sq; struct thread *td; int rval; WITNESS_SAVE_DECL(mp); @@ -346,34 +239,15 @@ return 0; } - mtx_lock_spin(&sched_lock); - - CV_WAIT_VALIDATE(cvp, mp); + sq = sleepq_lookup(cvp); DROP_GIANT(); mtx_unlock(mp); - cv_waitq_add(cvp, td); - callout_reset(&td->td_slpcallout, timo, cv_timedwait_end, td); - cv_switch(td); - - if (td->td_flags & TDF_TIMEOUT) { - td->td_flags &= ~TDF_TIMEOUT; - rval = EWOULDBLOCK; - } else if (td->td_flags & TDF_TIMOFAIL) - td->td_flags &= ~TDF_TIMOFAIL; - else if (callout_stop(&td->td_slpcallout) == 0) { - /* - * Work around race with cv_timedwait_end similar to that - * between msleep and endtsleep. - * Go back to sleep. - */ - TD_SET_SLEEPING(td); - mi_switch(SW_INVOL); - td->td_flags &= ~TDF_TIMOFAIL; - } + sleepq_add(sq, cvp, mp, cvp->cv_description, SLEEPQ_CONDVAR); + sleepq_set_timeout(sq, cvp, timo); + rval = sleepq_timedwait(cvp, 0); - mtx_unlock_spin(&sched_lock); #ifdef KTRACE if (KTRPOINT(td, KTR_CSW)) ktrcsw(0, 0); @@ -394,6 +268,7 @@ int cv_timedwait_sig(struct cv *cvp, struct mtx *mp, int timo) { + struct sleepqueue *sq; struct thread *td; struct proc *p; int rval; @@ -422,48 +297,24 @@ return 0; } - mtx_lock_spin(&sched_lock); + sq = sleepq_lookup(cvp); - CV_WAIT_VALIDATE(cvp, mp); - DROP_GIANT(); mtx_unlock(mp); - cv_waitq_add(cvp, td); - callout_reset(&td->td_slpcallout, timo, cv_timedwait_end, td); - sig = cv_switch_catch(td); + sleepq_add(sq, cvp, mp, cvp->cv_description, SLEEPQ_CONDVAR); + sleepq_set_timeout(sq, cvp, timo); + sig = sleepq_catch_signals(cvp); + /* + * XXX: Missing magic return value handling for no signal + * caught but thread woken up during check. + */ + rval = sleepq_timedwait_sig(cvp, sig != 0); + if (rval == 0) + rval = sleepq_calc_signal_retval(sig); - if (td->td_flags & TDF_TIMEOUT) { - td->td_flags &= ~TDF_TIMEOUT; - rval = EWOULDBLOCK; - } else if (td->td_flags & TDF_TIMOFAIL) - td->td_flags &= ~TDF_TIMOFAIL; - else if (callout_stop(&td->td_slpcallout) == 0) { - /* - * Work around race with cv_timedwait_end similar to that - * between msleep and endtsleep. - * Go back to sleep. - */ - TD_SET_SLEEPING(td); - mi_switch(SW_INVOL); - td->td_flags &= ~TDF_TIMOFAIL; - } - mtx_unlock_spin(&sched_lock); - + /* XXX: Part of missing threading checks? */ PROC_LOCK(p); - mtx_lock(&p->p_sigacts->ps_mtx); - if (sig == 0) { - sig = cursig(td); - if (sig == 0 && td->td_flags & TDF_INTERRUPT) - rval = td->td_intrval; - } - if (sig != 0) { - if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) - rval = EINTR; - else - rval = ERESTART; - } - mtx_unlock(&p->p_sigacts->ps_mtx); if (p->p_flag & P_WEXIT) rval = EINTR; PROC_UNLOCK(p); @@ -480,24 +331,6 @@ } /* - * Common code for signal and broadcast. Assumes waitq is not empty. Must be - * called with sched_lock held. - */ -static __inline void -cv_wakeup(struct cv *cvp) -{ - struct thread *td; - - mtx_assert(&sched_lock, MA_OWNED); - td = TAILQ_FIRST(&cvp->cv_waitq); - KASSERT(td->td_wchan == cvp, ("%s: bogus wchan", __func__)); - KASSERT(td->td_flags & TDF_CVWAITQ, ("%s: not on waitq", __func__)); - cv_waitq_remove(td); - TD_CLR_SLEEPING(td); - setrunnable(td); -} - -/* * Signal a condition variable, wakes up one waiting thread. Will also wakeup * the swapper if the process is not in memory, so that it can bring the * sleeping process in. Note that this may also result in additional threads @@ -508,13 +341,7 @@ cv_signal(struct cv *cvp) { - KASSERT(cvp != NULL, ("%s: cvp NULL", __func__)); - mtx_lock_spin(&sched_lock); - if (!TAILQ_EMPTY(&cvp->cv_waitq)) { - CV_SIGNAL_VALIDATE(cvp); - cv_wakeup(cvp); - } - mtx_unlock_spin(&sched_lock); + sleepq_signal(cvp, SLEEPQ_CONDVAR, -1); } /* @@ -524,82 +351,6 @@ void cv_broadcastpri(struct cv *cvp, int pri) { - struct thread *td; - KASSERT(cvp != NULL, ("%s: cvp NULL", __func__)); - mtx_lock_spin(&sched_lock); - CV_SIGNAL_VALIDATE(cvp); - while (!TAILQ_EMPTY(&cvp->cv_waitq)) { - if (pri >= PRI_MIN && pri <= PRI_MAX) { - td = TAILQ_FIRST(&cvp->cv_waitq); - if (td->td_priority > pri) - td->td_priority = pri; - } - cv_wakeup(cvp); - } - mtx_unlock_spin(&sched_lock); + sleepq_broadcast(cvp, SLEEPQ_CONDVAR, pri); } - -/* - * Remove a thread from the wait queue of its condition variable. This may be - * called externally. - */ -void -cv_waitq_remove(struct thread *td) -{ - struct cv *cvp; - - mtx_assert(&sched_lock, MA_OWNED); - if ((cvp = td->td_wchan) != NULL && td->td_flags & TDF_CVWAITQ) { - TAILQ_REMOVE(&cvp->cv_waitq, td, td_slpq); - td->td_flags &= ~TDF_CVWAITQ; - td->td_wmesg = NULL; - TD_CLR_ON_SLEEPQ(td); - } -} - -/* - * Timeout function for cv_timedwait. Put the thread on the runqueue and set - * its timeout flag. - */ -static void -cv_timedwait_end(void *arg) -{ - struct thread *td; - - td = arg; - CTR3(KTR_PROC, "cv_timedwait_end: thread %p (pid %d, %s)", - td, td->td_proc->p_pid, td->td_proc->p_comm); - mtx_lock_spin(&sched_lock); - if (TD_ON_SLEEPQ(td)) { - cv_waitq_remove(td); - td->td_flags |= TDF_TIMEOUT; - } else { - td->td_flags |= TDF_TIMOFAIL; - } - TD_CLR_SLEEPING(td); - setrunnable(td); - mtx_unlock_spin(&sched_lock); -} - -/* - * For now only abort interruptable waits. - * The others will have to either complete on their own or have a timeout. - */ -void -cv_abort(struct thread *td) -{ - - CTR3(KTR_PROC, "cv_abort: thread %p (pid %d, %s)", td, - td->td_proc->p_pid, td->td_proc->p_comm); - mtx_lock_spin(&sched_lock); - if ((td->td_flags & (TDF_SINTR|TDF_TIMEOUT)) == TDF_SINTR) { - if (TD_ON_SLEEPQ(td)) { - cv_waitq_remove(td); - } - TD_CLR_SLEEPING(td); - setrunnable(td); - } - mtx_unlock_spin(&sched_lock); -} - ==== //depot/projects/smpng/sys/kern/kern_exit.c#72 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.222 2004/02/19 06:43:48 truckman Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exit.c,v 1.223 2004/02/27 18:39:09 jhb Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -494,21 +494,26 @@ PROC_LOCK(p); PROC_LOCK(p->p_pptr); sx_xunlock(&proctree_lock); - mtx_lock_spin(&sched_lock); while (mtx_owned(&Giant)) mtx_unlock(&Giant); /* * We have to wait until after acquiring all locks before - * changing p_state. If we block on a mutex then we will be - * back at SRUN when we resume and our parent will never - * harvest us. + * changing p_state. We need to avoid any possibly context + * switches while marked as a zombie including blocking on + * a mutex. */ + mtx_lock_spin(&sched_lock); p->p_state = PRS_ZOMBIE; + critical_enter(); + mtx_unlock_spin(&sched_lock); wakeup(p->p_pptr); PROC_UNLOCK(p->p_pptr); + + mtx_lock_spin(&sched_lock); + critical_exit(); cnt.v_swtch++; binuptime(PCPU_PTR(switchtime)); PCPU_SET(switchticks, ticks); ==== //depot/projects/smpng/sys/kern/kern_sig.c#87 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.270 2004/02/04 21:52:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.271 2004/02/27 18:52:43 jhb Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -63,6 +63,7 @@ #include #include #include +#include #include #include #include @@ -1872,12 +1873,8 @@ * It may run a bit until it hits a thread_suspend_check(). */ mtx_lock_spin(&sched_lock); - if (TD_ON_SLEEPQ(td) && (td->td_flags & TDF_SINTR)) { - if (td->td_flags & TDF_CVWAITQ) - cv_abort(td); - else - abortsleep(td); - } + if (TD_ON_SLEEPQ(td) && (td->td_flags & TDF_SINTR)) + sleepq_abort(td); mtx_unlock_spin(&sched_lock); goto out; /* @@ -1972,9 +1969,8 @@ * be noticed when the process returns through * trap() or syscall(). */ - if ((td->td_flags & TDF_SINTR) == 0) { + if ((td->td_flags & TDF_SINTR) == 0) return; - } /* * Process is sleeping and traced. Make it runnable * so it can discover the signal in issignal() and stop @@ -2002,14 +1998,10 @@ /* * Raise priority to at least PUSER. */ - if (td->td_priority > PUSER) { + if (td->td_priority > PUSER) td->td_priority = PUSER; - } } - if (td->td_flags & TDF_CVWAITQ) - cv_abort(td); - else - abortsleep(td); + sleepq_abort(td); } #ifdef SMP else { @@ -2018,9 +2010,8 @@ * other than kicking ourselves if we are running. * It will either never be noticed, or noticed very soon. */ - if (TD_IS_RUNNING(td) && td != curthread) { + if (TD_IS_RUNNING(td) && td != curthread) forward_signal(td); - } } #endif } ==== //depot/projects/smpng/sys/kern/kern_synch.c#65 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.242 2004/02/01 05:37:36 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.243 2004/02/27 18:52:43 jhb Exp $"); #include "opt_ddb.h" #include "opt_ktrace.h" @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -95,7 +96,6 @@ static int fscale __unused = FSCALE; SYSCTL_INT(_kern, OID_AUTO, fscale, CTLFLAG_RD, 0, FSCALE, ""); -static void endtsleep(void *); static void loadav(void *arg); static void lboltcb(void *arg); @@ -116,6 +116,7 @@ hogticks = (hz / 10) * 2; /* Default only. */ for (i = 0; i < TABLESIZE; i++) TAILQ_INIT(&slpque[i]); + init_sleepqueues(); } /* @@ -141,29 +142,59 @@ int priority, timo; const char *wmesg; { - struct thread *td = curthread; - struct proc *p = td->td_proc; - int sig, catch = priority & PCATCH; - int rval = 0; + struct sleepqueue *sq; + struct thread *td; + struct proc *p; + int catch, rval, sig; WITNESS_SAVE_DECL(mtx); + td = curthread; + p = td->td_proc; #ifdef KTRACE if (KTRPOINT(td, KTR_CSW)) ktrcsw(1, 0); #endif - /* XXX: mtx == NULL ?? */ - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mtx->mtx_object, - "Sleeping on \"%s\"", wmesg); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, mtx == NULL ? NULL : + &mtx->mtx_object, "Sleeping on \"%s\"", wmesg); KASSERT(timo != 0 || mtx_owned(&Giant) || mtx != NULL, ("sleeping without a mutex")); + KASSERT(p != NULL, ("msleep1")); + KASSERT(ident != NULL && TD_IS_RUNNING(td), ("msleep")); + + if (cold) { + /* + * During autoconfiguration, just return; + * don't run any other procs or panic below, + * in case this is the idle process and already asleep. + * XXX: this used to do "s = splhigh(); splx(safepri); + * splx(s);" to give interrupts a chance, but there is + * no way to give interrupts a chance now. + */ + if (mtx != NULL && priority & PDROP) + mtx_unlock(mtx); + return (0); + } + catch = priority & PCATCH; + rval = 0; + /* + * If we are already on a sleep queue, then remove us from that + * sleep queue first. We have to do this to handle recursive + * sleeps. + */ + if (TD_ON_SLEEPQ(td)) + sleepq_remove(td, td->td_wchan); + + sq = sleepq_lookup(ident); + mtx_lock_spin(&sched_lock); + + /* * If we are capable of async syscalls and there isn't already * another one ready to return, start a new thread * and queue it as ready to run. Note that there is danger here * because we need to make sure that we don't sleep allocating * the thread (recursion here might be bad). */ - mtx_lock_spin(&sched_lock); if (p->p_flag & P_SA || p->p_numthreads > 1) { /* * Just don't bother if we are exiting @@ -173,28 +204,20 @@ if (catch) { if ((p->p_flag & P_WEXIT) && p->p_singlethread != td) { mtx_unlock_spin(&sched_lock); + sleepq_release(ident); return (EINTR); } if (td->td_flags & TDF_INTERRUPT) { mtx_unlock_spin(&sched_lock); + sleepq_release(ident); return (td->td_intrval); } } } - if (cold ) { - /* - * During autoconfiguration, just return; - * don't run any other procs or panic below, - * in case this is the idle process and already asleep. - * XXX: this used to do "s = splhigh(); splx(safepri); - * splx(s);" to give interrupts a chance, but there is - * no way to give interrupts a chance now. - */ - if (mtx != NULL && priority & PDROP) - mtx_unlock(mtx); - mtx_unlock_spin(&sched_lock); - return (0); - } + mtx_unlock_spin(&sched_lock); + CTR5(KTR_PROC, "msleep: thread %p (pid %d, %s) on %s (%p)", + td, p->p_pid, p->p_comm, wmesg, ident); + DROP_GIANT(); if (mtx != NULL) { mtx_assert(mtx, MA_OWNED | MA_NOTRECURSED); @@ -203,101 +226,55 @@ if (priority & PDROP) mtx = NULL; } - KASSERT(p != NULL, ("msleep1")); - KASSERT(ident != NULL && TD_IS_RUNNING(td), ("msleep")); - - CTR5(KTR_PROC, "msleep: thread %p (pid %d, %s) on %s (%p)", - td, p->p_pid, p->p_comm, wmesg, ident); - td->td_wchan = ident; - td->td_wmesg = wmesg; - TAILQ_INSERT_TAIL(&slpque[LOOKUP(ident)], td, td_slpq); - TD_SET_ON_SLEEPQ(td); - if (timo) - callout_reset(&td->td_slpcallout, timo, endtsleep, td); /* * We put ourselves on the sleep queue and start our timeout - * before calling thread_suspend_check, as we could stop there, and - * a wakeup or a SIGCONT (or both) could occur while we were stopped. - * without resuming us, thus we must be ready for sleep - * when cursig is called. If the wakeup happens while we're - * stopped, td->td_wchan will be 0 upon return from cursig. + * before calling thread_suspend_check, as we could stop there, + * and a wakeup or a SIGCONT (or both) could occur while we were + * stopped without resuming us. Thus, we must be ready for sleep + * when cursig() is called. If the wakeup happens while we're + * stopped, then td will no longer be on a sleep queue upon + * return from cursig(). */ + sleepq_add(sq, ident, mtx, wmesg, 0); + if (timo) + sleepq_set_timeout(sq, ident, timo); if (catch) { - CTR3(KTR_PROC, "msleep caught: thread %p (pid %d, %s)", td, - p->p_pid, p->p_comm); - td->td_flags |= TDF_SINTR; - mtx_unlock_spin(&sched_lock); - PROC_LOCK(p); - mtx_lock(&p->p_sigacts->ps_mtx); - sig = cursig(td); - mtx_unlock(&p->p_sigacts->ps_mtx); - if (sig == 0 && thread_suspend_check(1)) - sig = SIGSTOP; - mtx_lock_spin(&sched_lock); - PROC_UNLOCK(p); - if (sig != 0) { - if (TD_ON_SLEEPQ(td)) - unsleep(td); - } else if (!TD_ON_SLEEPQ(td)) + sig = sleepq_catch_signals(ident); + if (sig == 0 && !TD_ON_SLEEPQ(td)) { + mtx_lock_spin(&sched_lock); + td->td_flags &= ~TDF_SINTR; + mtx_unlock_spin(&sched_lock); catch = 0; + } } else sig = 0; /* - * Let the scheduler know we're about to voluntarily go to sleep. + * Adjust this threads priority. + * + * XXX: Do we need to save priority in td_base_pri? */ - sched_sleep(td, priority & PRIMASK); + mtx_lock_spin(&sched_lock); + sched_prio(td, priority & PRIMASK); + mtx_unlock_spin(&sched_lock); - if (TD_ON_SLEEPQ(td)) { - TD_SET_SLEEPING(td); - mi_switch(SW_VOL); + if (timo && catch) + rval = sleepq_timedwait_sig(ident, sig != 0); + else if (timo) + rval = sleepq_timedwait(ident, sig != 0); + else if (catch) + rval = sleepq_wait_sig(ident); + else { + sleepq_wait(ident); + rval = 0; } + /* * We're awake from voluntary sleep. */ - CTR3(KTR_PROC, "msleep resume: thread %p (pid %d, %s)", td, p->p_pid, - p->p_comm); - KASSERT(TD_IS_RUNNING(td), ("running but not TDS_RUNNING")); - td->td_flags &= ~TDF_SINTR; - if (td->td_flags & TDF_TIMEOUT) { - td->td_flags &= ~TDF_TIMEOUT; - if (sig == 0) - rval = EWOULDBLOCK; - } else if (td->td_flags & TDF_TIMOFAIL) { - td->td_flags &= ~TDF_TIMOFAIL; - } else if (timo && callout_stop(&td->td_slpcallout) == 0) { - /* - * This isn't supposed to be pretty. If we are here, then - * the endtsleep() callout is currently executing on another - * CPU and is either spinning on the sched_lock or will be - * soon. If we don't synchronize here, there is a chance - * that this process may msleep() again before the callout - * has a chance to run and the callout may end up waking up - * the wrong msleep(). Yuck. - */ - TD_SET_SLEEPING(td); - mi_switch(SW_INVOL); - td->td_flags &= ~TDF_TIMOFAIL; - } - if ((td->td_flags & TDF_INTERRUPT) && (priority & PCATCH) && - (rval == 0)) { - rval = td->td_intrval; - } - mtx_unlock_spin(&sched_lock); - if (rval == 0 && catch) { - PROC_LOCK(p); - /* XXX: shouldn't we always be calling cursig()? */ - mtx_lock(&p->p_sigacts->ps_mtx); - if (sig != 0 || (sig = cursig(td))) { - if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) - rval = EINTR; - else - rval = ERESTART; - } - mtx_unlock(&p->p_sigacts->ps_mtx); - PROC_UNLOCK(p); - } + if (rval == 0 && catch) + rval = sleepq_calc_signal_retval(sig); #ifdef KTRACE if (KTRPOINT(td, KTR_CSW)) ktrcsw(0, 0); @@ -311,109 +288,14 @@ } /* - * Implement timeout for msleep(). - * - * If process hasn't been awakened (wchan non-zero), - * set timeout flag and undo the sleep. If proc - * is stopped, just unsleep so it will remain stopped. - * MP-safe, called without the Giant mutex. - */ -static void -endtsleep(arg) - void *arg; -{ - register struct thread *td; - - td = (struct thread *)arg; - CTR3(KTR_PROC, "endtsleep: thread %p (pid %d, %s)", - td, td->td_proc->p_pid, td->td_proc->p_comm); - mtx_lock_spin(&sched_lock); - /* - * This is the other half of the synchronization with msleep() - * described above. If the TDS_TIMEOUT flag is set, we lost the - * race and just need to put the process back on the runqueue. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 27 16:29:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB35A16A4D0; Fri, 27 Feb 2004 16:29:17 -0800 (PST) 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 96A6C16A4CE for ; Fri, 27 Feb 2004 16:29:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 918A043D1D for ; Fri, 27 Feb 2004 16:29:17 -0800 (PST) (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.10/8.12.10) with ESMTP id i1S0THGe014511 for ; Fri, 27 Feb 2004 16:29:17 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1S0TH98014508 for perforce@freebsd.org; Fri, 27 Feb 2004 16:29:17 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 27 Feb 2004 16:29:17 -0800 (PST) Message-Id: <200402280029.i1S0TH98014508@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 47773 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, 28 Feb 2004 00:29:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=47773 Change 47773 by rwatson@rwatson_tislabs on 2004/02/27 16:28:52 Integ netperf_socket to @45542 so that there's a known integration point. Affected files ... .. //depot/projects/netperf_socket/sys/dev/ips/ips.c#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/dev/ips/ips.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ips/ips.c,v 1.6 2003/11/27 08:37:36 mbr Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ips/ips.c,v 1.7 2004/01/18 17:34:11 ru Exp $"); #include #include @@ -169,6 +169,7 @@ mask = splbio(); if(sc->state & IPS_OFFLINE){ splx(mask); + free(waiter, M_DEVBUF); return EIO; } command = SLIST_FIRST(&sc->free_cmd_list); From owner-p4-projects@FreeBSD.ORG Fri Feb 27 16:59:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AE0B16A4D0; Fri, 27 Feb 2004 16:59:56 -0800 (PST) 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 015FF16A4CE for ; Fri, 27 Feb 2004 16:59:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8EBE43D2F for ; Fri, 27 Feb 2004 16:59:55 -0800 (PST) (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.10/8.12.10) with ESMTP id i1S0xtGe026830 for ; Fri, 27 Feb 2004 16:59:55 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1S0xt1X026827 for perforce@freebsd.org; Fri, 27 Feb 2004 16:59:55 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 27 Feb 2004 16:59:55 -0800 (PST) Message-Id: <200402280059.i1S0xt1X026827@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 47775 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, 28 Feb 2004 00:59:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=47775 Change 47775 by rwatson@rwatson_tislabs on 2004/02/27 16:59:15 Assert the socket lock directly in sofree() rather than relying on later unlock attempts to fail. Affected files ... .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#3 edit Differences ... ==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#3 (text+ko) ==== @@ -291,6 +291,7 @@ struct socket *so; { KASSERT(so->so_count == 0, ("socket %p so_count not 0", so)); + SOCK_LOCK_ASSERT(so); if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0) { SOCK_UNLOCK(so); From owner-p4-projects@FreeBSD.ORG Sat Feb 28 09:52:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BADB16A4D0; Sat, 28 Feb 2004 09:52:15 -0800 (PST) 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 4B22E16A4CE for ; Sat, 28 Feb 2004 09:52:15 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 405CB43D1F for ; Sat, 28 Feb 2004 09:52:15 -0800 (PST) (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.10/8.12.10) with ESMTP id i1SHqEGe084298 for ; Sat, 28 Feb 2004 09:52:14 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1SHq6QJ084175 for perforce@freebsd.org; Sat, 28 Feb 2004 09:52:06 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 28 Feb 2004 09:52:06 -0800 (PST) Message-Id: <200402281752.i1SHq6QJ084175@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 47801 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, 28 Feb 2004 17:52:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=47801 Change 47801 by rwatson@rwatson_tislabs on 2004/02/28 09:51:12 Integrate the netperf_socket branch forward to HEAD, including looping back the MT_TAG cleanup, introduction of pf. A few instances of XXXRW added for things I need to revisit, as well as some open questions about: - Reviewing pf to make sure it's occasional socket access is safe (seems safe, since it appears only to access static fields in struct socket). - Understanding some of the ipsec changes and state magic. - Need to determine if TCP/MD5 state is properly synchronized. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/mem.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/support.s#2 integrate .. //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_misc.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_proto.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_syscall.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_sysent.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/syscalls.master#2 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/zs_tlsb.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/db_interface.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mpboot.S#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/NOTES#1 branch .. //depot/projects/netperf_socket/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/fpu.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/reg.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/smp.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/alpha/Makefile.inc#2 integrate .. //depot/projects/netperf_socket/sys/boot/alpha/boot1/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/alpha/cdboot/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/alpha/common/Makefile.common#2 integrate .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/alpha/loader/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/alpha/netboot/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/netperf_socket/sys/boot/common/help.common#2 integrate .. //depot/projects/netperf_socket/sys/boot/common/loader.8#2 integrate .. //depot/projects/netperf_socket/sys/boot/efi/Makefile.inc#2 integrate .. //depot/projects/netperf_socket/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/efi/loader/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/Makefile.inc#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot0sio/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/boot2/boot1.s#2 delete .. //depot/projects/netperf_socket/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/boot2/sio.s#2 delete .. //depot/projects/netperf_socket/sys/boot/i386/btx/Makefile.inc#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/btx/btx/btx.s#2 delete .. //depot/projects/netperf_socket/sys/boot/i386/btx/btxldr/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/btx/btxldr/btxldr.s#2 delete .. //depot/projects/netperf_socket/sys/boot/i386/btx/lib/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/cdboot/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/kgzldr/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/mbr/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/pxeldr/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/pxeldr/pxeldr.s#2 delete .. //depot/projects/netperf_socket/sys/boot/ia64/Makefile.inc#2 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/libski/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/ia64/skiload/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot0.5/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot0/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/btx.s#2 delete .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/btxldr.s#2 delete .. //depot/projects/netperf_socket/sys/boot/pc98/btx/lib/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/kgzldr/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/powerpc/loader/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/netperf_socket/sys/boot/sparc64/boot1/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/sparc64/boot1/_start.S#2 delete .. //depot/projects/netperf_socket/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/netperf_socket/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda_fbsd.c#2 integrate .. //depot/projects/netperf_socket/sys/coda/coda_venus.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/netperf_socket/sys/compat/ia32/ia32_genassym.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_resource.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/svr4_types.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/svr4/syscalls.master#2 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.alpha#2 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#2 integrate .. //depot/projects/netperf_socket/sys/conf/files#2 integrate .. //depot/projects/netperf_socket/sys/conf/files.amd64#2 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#2 integrate .. //depot/projects/netperf_socket/sys/conf/files.pc98#2 integrate .. //depot/projects/netperf_socket/sys/conf/files.powerpc#2 integrate .. //depot/projects/netperf_socket/sys/conf/kern.mk#2 integrate .. //depot/projects/netperf_socket/sys/conf/kern.post.mk#2 integrate .. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#2 integrate .. //depot/projects/netperf_socket/sys/conf/ldscript.alpha#2 integrate .. //depot/projects/netperf_socket/sys/conf/majors#2 integrate .. //depot/projects/netperf_socket/sys/conf/options#2 integrate .. //depot/projects/netperf_socket/sys/conf/options.i386#2 integrate .. //depot/projects/netperf_socket/sys/conf/options.pc98#2 integrate .. //depot/projects/netperf_socket/sys/conf/options.powerpc#2 integrate .. //depot/projects/netperf_socket/sys/conf/systags.sh#2 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/fla/fla.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/ip_fil.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_norm.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_osfp.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_table.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/pf/net/pfvar.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/pf/netinet/in4_cksum.c#1 branch .. //depot/projects/netperf_socket/sys/crypto/md5.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_output.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_ps.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_sym.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_ioctl.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_powerres.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.reg#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_inline.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/dev/amd/amd.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr_disk.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/asr/asr.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/am8530.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ctau/ctau.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ctau/ctau2fw.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ctau/ctaue1fw.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ctau/ctaufw.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ctau/ctaug7fw.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ctau/ctaureg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ctau/ctddk.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ctau/ctddk.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ctau/ds2153.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ctau/hdc64570.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ctau/lxt318.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ctau/ng_ct.h#1 branch .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/cx/ng_cx.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/dpt/dpt.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_drv.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/drm_os_freebsd.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/fb/fb.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/sbp_targ.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/harp/if_harp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_buffer.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_command.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_init.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_load.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_output.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_receive.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_stats.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_transmit.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/fore_var.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ida/ida.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ida/ida_disk.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ida/idavar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips_disk.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips_disk.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/isp/ispmbox.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/joy/joy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/led/led.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/matcd/matcd.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mcd/mcd.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/md/md.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mlx/mlx.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mlx/mlx_disk.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mlx/mlxvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/mly/mly.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/null/null.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/patm/genrtab/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/pccarddevs.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pst/pst-raid.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_diskqueue.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_freebsdkintf.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/raidframe/rf_paritylog.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/rc/rc.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sab/sab.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/safe/safe.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/scd/scd.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/si/si.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/snp/snp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/driver.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/midi/midi.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/channel.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/streams/streams.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scgfbrndr.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scterm-dumb.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/tdfx/tdfx_vars.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/tga/tga_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/trm/trm.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/twe/twe.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/twe/twevar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_udav.c#1 branch .. //depot/projects/netperf_socket/sys/dev/usb/if_udavreg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ulpt.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umass.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ums.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/urio.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinum.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumconfig.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/zs/zs.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/procfs/procfs_rlimit.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_node.h#2 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/fs/specfs/spec_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/bde/g_bde_crypt.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#1 branch .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.h#1 branch .. //depot/projects/netperf_socket/sys/geom/geom.h#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_aes.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_apple.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_dev.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_disk.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_disk.h#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_event.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_fox.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_io.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_kern.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_mbr.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_mirror.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_pc98.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_slice.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_sunlabel.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_vol_ffs.c#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_fs.h#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_fs_sb.h#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_inode_cnv.c#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_readwrite.c#2 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/bios/apm.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/db_interface.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/geode.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/longrun.c#1 branch .. //depot/projects/netperf_socket/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mem.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/p4tcc.c#1 branch .. //depot/projects/netperf_socket/sys/i386/i386/perfmon.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/trap.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/pci_cfgreg.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/asc.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/atpic_vector.s#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/ctx.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/cy.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/gpib.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/gsc.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/istallion.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/mse.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/npx.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_drv.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_ext.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_hdr.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/spic.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/spicreg.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/spigot.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/spkr.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/stallion.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/wt.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/netperf_socket/sys/i386/pci/pci_bus.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/pci/pci_pir.c#1 branch .. //depot/projects/netperf_socket/sys/i4b/driver/i4b_ctl.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/driver/i4b_rbch.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/driver/i4b_tel.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/driver/i4b_trace.c#2 integrate .. //depot/projects/netperf_socket/sys/i4b/layer4/i4b_i4bdrv.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/mem.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/sscdisk.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/netperf_socket/sys/isa/fd.c#2 integrate .. //depot/projects/netperf_socket/sys/isa/psm.c#2 integrate .. //depot/projects/netperf_socket/sys/isa/vga_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/init_main.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/init_sysent.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_acct.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_acl.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_conf.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_event.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exec.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_fork.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_idle.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_intr.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_jail.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_linker.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_mac.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_ntptime.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_poll.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_proc.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_prot.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_resource.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_switch.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sx.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_synch.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_tc.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/sched_ule.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_bus.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_devstat.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_log.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_prf.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_sleepqueue.c#1 branch .. //depot/projects/netperf_socket/sys/kern/subr_smp.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_trap.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_witness.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/sys_generic.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/sys_process.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.master#2 integrate .. //depot/projects/netperf_socket/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/tty_cons.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/tty_pty.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/tty_tty.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_init.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/netperf_socket/sys/libkern/bcmp.c#2 integrate .. //depot/projects/netperf_socket/sys/modules/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/firewire/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/firewire/Makefile.inc#2 integrate .. //depot/projects/netperf_socket/sys/modules/firewire/sbp_targ/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/geom/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/geom/geom_concat/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/harp/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/lnc/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/ncp/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/nwfs/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/osf1/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/patm/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/pecoff/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/pf/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/pflog/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/pfsync/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/smbfs/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/syscons/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/udav/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/uscanner/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/net/bpf.c#3 integrate .. //depot/projects/netperf_socket/sys/net/bpf.h#2 integrate .. //depot/projects/netperf_socket/sys/net/bridge.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if_atm.h#2 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/netperf_socket/sys/net/if_gre.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if_gre.h#2 integrate .. //depot/projects/netperf_socket/sys/net/if_media.h#2 integrate .. //depot/projects/netperf_socket/sys/net/if_ppp.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if_tap.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if_tapvar.h#2 integrate .. //depot/projects/netperf_socket/sys/net/if_tun.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if_tunvar.h#2 delete .. //depot/projects/netperf_socket/sys/net/if_types.h#2 integrate .. //depot/projects/netperf_socket/sys/net/if_var.h#2 integrate .. //depot/projects/netperf_socket/sys/net/if_vlan_var.h#2 integrate .. //depot/projects/netperf_socket/sys/net/pfkeyv2.h#2 integrate .. //depot/projects/netperf_socket/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/netperf_socket/sys/netatm/atm_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/ng_atm.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/ng_atm.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/include/ng_btsocket.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_bpf.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_cisco.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_etf.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ether.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_gif.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_message.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_one2many.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_one2many.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_parse.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_source.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/icmp_var.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/in.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/in_proto.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_divert.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_dummynet.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_gre.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_icmp.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_id.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_output.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_var.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_debug.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/netperf_socket/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/ipsec.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/ipsec6.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/nd6.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/udp6_output.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/netperf_socket/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/netperf_socket/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/netperf_socket/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/netperf_socket/sys/netipsec/key.c#2 integrate .. //depot/projects/netperf_socket/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/netperf_socket/sys/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/netperf_socket/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/netperf_socket/sys/netkey/key.c#2 integrate .. //depot/projects/netperf_socket/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/netperf_socket/sys/netncp/ncp_mod.c#2 integrate .. //depot/projects/netperf_socket/sys/netsmb/smb_conn.c#3 integrate .. //depot/projects/netperf_socket/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/netperf_socket/sys/netsmb/smb_dev.h#2 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_dev.c#2 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_socket.c#2 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_subs.c#2 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/netperf_socket/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/netperf_socket/sys/opencrypto/cryptodev.h#2 integrate .. //depot/projects/netperf_socket/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/netperf_socket/sys/opencrypto/rijndael.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/mse.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/olpt.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/pc98gdc.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/wd.c#2 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/wd_cd.c#2 integrate .. //depot/projects/netperf_socket/sys/pccard/pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/agp.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_rl.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_sk.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/if_ti.c#2 integrate .. //depot/projects/netperf_socket/sys/pci/xrpu.c#2 integrate .. //depot/projects/netperf_socket/sys/posix4/_semaphore.h#2 integrate .. //depot/projects/netperf_socket/sys/posix4/semaphore.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/float.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/floatingpoint.h#1 branch .. //depot/projects/netperf_socket/sys/powerpc/include/hid.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/intr_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/param.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/pmap.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/sc_machdep.h#1 branch .. //depot/projects/netperf_socket/sys/powerpc/include/spr.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/sr.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/ofw/ofw_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/ofw/ofw_syscons.c#1 branch .. //depot/projects/netperf_socket/sys/powerpc/ofw/ofw_syscons.h#1 branch .. //depot/projects/netperf_socket/sys/powerpc/powermac/ata_kauai.c#1 branch .. //depot/projects/netperf_socket/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/openpic_macio.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/copyinout.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/critical.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/db_memrw.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/fpu.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/locore.S#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/nexus.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/sc_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/powerpc/powerpc/suswintr.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/trap_subr.S#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/uma_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/powerpc/psim/ata_iobus.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/psim/psim-tree#2 integrate .. //depot/projects/netperf_socket/sys/security/mac/mac_inet.c#1 branch .. //depot/projects/netperf_socket/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/netperf_socket/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac/mac_socket.c#1 branch .. //depot/projects/netperf_socket/sys/security/mac/mac_system.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_biba/mac_biba.h#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_lomac/mac_lomac.h#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_mls/mac_mls.h#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_partition/mac_partition.h#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/creator/creator_upa.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/asmacros.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/netperf_socket/sys/sys/_label.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/_mutex.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/_task.h#1 branch .. //depot/projects/netperf_socket/sys/sys/bio.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/condvar.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/conf.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/cons.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/jail.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/kernel.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/libkern.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/limits.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/lock.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/mac.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/mac_policy.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/mount.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/msgbuf.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/pipe.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/resource.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/resourcevar.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/sched.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/sleepqueue.h#1 branch .. //depot/projects/netperf_socket/sys/sys/socket.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/sockio.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/sx.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.mk#2 integrate .. //depot/projects/netperf_socket/sys/sys/sysctl.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/sysproto.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/systm.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/taskqueue.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/ttycom.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/turnstile.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/uio.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/user.h#2 integrate .. //depot/projects/netperf_socket/sys/tools/emu10k1-mkalsa.sh#1 branch .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/swap_pager.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/uma_core.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_contig.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_extern.h#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_fault.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_glue.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_kern.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_object.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_unix.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_zeroidle.c#2 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#2 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.216 2004/01/03 02:02:24 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.217 2004/02/27 19:30:46 kensmith Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -201,6 +201,9 @@ long unknownmem; /* amount of memory with an unknown use */ int ncpus; /* number of cpus */ +int promcons_dly_mkdev = 1; /* need to delay call to make_dev() */ +void promcons_delayed_makedev(void); + vm_offset_t phys_avail[10]; /* must be 2 less so 0 0 can signal end of chunks */ @@ -889,6 +892,14 @@ } /* + * Check to see if promcons needs to make_dev() now, + * doing it before now crashes with kernel stack issues. + */ + if (promcons_dly_mkdev > 1) + promcons_delayed_makedev(); + promcons_dly_mkdev = 0; + + /* * Initialize the virtual memory system, and set the * page table base register in proc 0's PCB. */ ==== //depot/projects/netperf_socket/sys/alpha/alpha/mem.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.46 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.47 2004/02/21 21:10:38 phk Exp $"); /* * Memory special file @@ -83,6 +83,7 @@ #define CDEV_MAJOR 2 static struct cdevsw mem_cdevsw = { + .d_version = D_VERSION, .d_open = mmopen, .d_close = mmclose, .d_read = mmrw, @@ -91,7 +92,7 @@ .d_mmap = memmmap, .d_name = "mem", .d_maj = CDEV_MAJOR, - .d_flags = D_MEM, + .d_flags = D_MEM | D_NEEDGIANT, }; struct mem_range_softc mem_range_softc; ==== //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.31 2003/09/26 10:52:16 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.36 2004/02/28 16:36:14 kensmith Exp $"); #include #include @@ -63,16 +63,13 @@ static d_close_t promclose; static d_ioctl_t promioctl; -#define CDEV_MAJOR 97 static struct cdevsw prom_cdevsw = { + .d_version = D_VERSION, .d_open = promopen, .d_close = promclose, - .d_read = ttyread, - .d_write = ttywrite, .d_ioctl = promioctl, - .d_poll = ttypoll, .d_name = "prom", - .d_maj = CDEV_MAJOR, + .d_flags = D_TTY | D_NEEDGIANT, }; @@ -86,6 +83,9 @@ int promparam(struct tty *, struct termios *); void promstop(struct tty *, int); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 28 10:48:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 969D816A4D0; Sat, 28 Feb 2004 10:48:24 -0800 (PST) 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 6E7C716A4CE for ; Sat, 28 Feb 2004 10:48:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6798843D1F for ; Sat, 28 Feb 2004 10:48:24 -0800 (PST) (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.10/8.12.10) with ESMTP id i1SImOGe096591 for ; Sat, 28 Feb 2004 10:48:24 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1SImO8d096588 for perforce@freebsd.org; Sat, 28 Feb 2004 10:48:24 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 28 Feb 2004 10:48:24 -0800 (PST) Message-Id: <200402281848.i1SImO8d096588@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 47804 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, 28 Feb 2004 18:48:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=47804 Change 47804 by rwatson@rwatson_tislabs on 2004/02/28 10:48:04 At the risk of introducing some poor style in the netperf_socket branch, revert to the code layout in HEAD to minimize diffs. Affected files ... .. //depot/projects/netperf_socket/sys/kern/sys_socket.c#3 edit Differences ... ==== //depot/projects/netperf_socket/sys/kern/sys_socket.c#3 (text+ko) ==== @@ -77,12 +77,15 @@ int flags; { struct socket *so = fp->f_data; + int error; + #ifdef MAC - int error = mac_check_socket_receive(active_cred, so); + error = mac_check_socket_receive(active_cred, so); if (error) return (error); #endif - return (so->so_proto->pr_usrreqs->pru_soreceive(so, 0, uio, 0, 0, 0)); + error = so->so_proto->pr_usrreqs->pru_soreceive(so, 0, uio, 0, 0, 0); + return (error); } /* ARGSUSED */ @@ -95,13 +98,16 @@ int flags; { struct socket *so = fp->f_data; + int error; + #ifdef MAC - int error = mac_check_socket_send(active_cred, so); + error = mac_check_socket_send(active_cred, so); if (error) return (error); #endif - return (so->so_proto->pr_usrreqs->pru_sosend(so, 0, uio, 0, 0, 0, - uio->uio_td)); + error = so->so_proto->pr_usrreqs->pru_sosend(so, 0, uio, 0, 0, 0, + uio->uio_td); + return (error); } int From owner-p4-projects@FreeBSD.ORG Sat Feb 28 10:50:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C25C016A4D0; Sat, 28 Feb 2004 10:50:27 -0800 (PST) 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 7EB9116A4CE for ; Sat, 28 Feb 2004 10:50:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7807543D1F for ; Sat, 28 Feb 2004 10:50:27 -0800 (PST) (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.10/8.12.10) with ESMTP id i1SIoRGe096718 for ; Sat, 28 Feb 2004 10:50:27 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1SIoRau096715 for perforce@freebsd.org; Sat, 28 Feb 2004 10:50:27 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 28 Feb 2004 10:50:27 -0800 (PST) Message-Id: <200402281850.i1SIoRau096715@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 47805 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, 28 Feb 2004 18:50:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=47805 Change 47805 by rwatson@rwatson_tislabs on 2004/02/28 10:49:34 GC an mtag variable that is now defined locally in a code block, rather than globally. Affected files ... .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#4 edit Differences ... ==== //depot/projects/netperf_socket/sys/netinet/ip_input.c#4 (text+ko) ==== @@ -1719,7 +1719,6 @@ struct in_ifaddr *ia; int error, type = 0, code = 0; struct mbuf *mcopy; - struct m_tag *mtag; n_long dest; struct in_addr pkt_dst; struct ifnet *destifp; From owner-p4-projects@FreeBSD.ORG Sat Feb 28 10:50:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7405C16A4D7; Sat, 28 Feb 2004 10:50:28 -0800 (PST) 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 E2FEE16A4E6 for ; Sat, 28 Feb 2004 10:50:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB57143D1F for ; Sat, 28 Feb 2004 10:50:27 -0800 (PST) (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.10/8.12.10) with ESMTP id i1SIoRGe096725 for ; Sat, 28 Feb 2004 10:50:27 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1SIoRCp096721 for perforce@freebsd.org; Sat, 28 Feb 2004 10:50:27 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 28 Feb 2004 10:50:27 -0800 (PST) Message-Id: <200402281850.i1SIoRCp096721@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 47806 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, 28 Feb 2004 18:50:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=47806 Change 47806 by rwatson@rwatson_tislabs on 2004/02/28 10:50:20 Sync netperf_socket to HEAD: add a missing $FreeBSD$ from integ -i. Affected files ... .. //depot/projects/netperf_socket/sys/netinet/ip_divert.h#3 edit Differences ... ==== //depot/projects/netperf_socket/sys/netinet/ip_divert.h#3 (text+ko) ==== @@ -28,6 +28,8 @@ * 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 DAMAGES. + * + * $FreeBSD: src/sys/netinet/ip_divert.h,v 1.3 2004/02/25 19:55:28 mlaier Exp $ */ #ifndef _NETINET_IP_DIVERT_H_ From owner-p4-projects@FreeBSD.ORG Sat Feb 28 10:54:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AECA316A4D0; Sat, 28 Feb 2004 10:54:33 -0800 (PST) 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 7016016A4CE for ; Sat, 28 Feb 2004 10:54:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 699D943D2F for ; Sat, 28 Feb 2004 10:54:33 -0800 (PST) (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.10/8.12.10) with ESMTP id i1SIsXGe098590 for ; Sat, 28 Feb 2004 10:54:33 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1SIsXvW098587 for perforce@freebsd.org; Sat, 28 Feb 2004 10:54:33 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 28 Feb 2004 10:54:33 -0800 (PST) Message-Id: <200402281854.i1SIsXvW098587@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 47807 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, 28 Feb 2004 18:54:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=47807 Change 47807 by rwatson@rwatson_tislabs on 2004/02/28 10:54:21 m_tag is required, but it's now #ifdef FAST_IPSEC rather than global to the function. Note that the m_tag local to dummynet processing shadows the global one, suggesting that perhaps it shouldn't be local after all. Affected files ... .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#5 edit Differences ... ==== //depot/projects/netperf_socket/sys/netinet/ip_input.c#5 (text+ko) ==== @@ -311,6 +311,7 @@ struct in_addr odst; /* original dst address */ #endif #ifdef FAST_IPSEC + struct m_tag *mtag; struct tdb_ident *tdbi; struct secpolicy *sp; int s, error; From owner-p4-projects@FreeBSD.ORG Sat Feb 28 10:56:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE2C616A4D0; Sat, 28 Feb 2004 10:56:36 -0800 (PST) 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 A6C6E16A4CE for ; Sat, 28 Feb 2004 10:56:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A047943D39 for ; Sat, 28 Feb 2004 10:56:36 -0800 (PST) (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.10/8.12.10) with ESMTP id i1SIuaGe098733 for ; Sat, 28 Feb 2004 10:56:36 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1SIuaXl098730 for perforce@freebsd.org; Sat, 28 Feb 2004 10:56:36 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 28 Feb 2004 10:56:36 -0800 (PST) Message-Id: <200402281856.i1SIuaXl098730@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 47808 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, 28 Feb 2004 18:56:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=47808 Change 47808 by rwatson@rwatson_tislabs on 2004/02/28 10:55:53 Same for ip_output: mtag is needed, but just in the FAST_IPSEC case. Arguably a merge-o from integ. Affected files ... .. //depot/projects/netperf_socket/sys/netinet/ip_output.c#4 edit Differences ... ==== //depot/projects/netperf_socket/sys/netinet/ip_output.c#4 (text+ko) ==== @@ -149,6 +149,7 @@ struct secpolicy *sp = NULL; #endif #ifdef FAST_IPSEC + struct m_tag *mtag; struct secpolicy *sp = NULL; struct tdb_ident *tdbi; int s; From owner-p4-projects@FreeBSD.ORG Sat Feb 28 11:56:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31BC216A4D0; Sat, 28 Feb 2004 11:56:56 -0800 (PST) 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 0626B16A4CE for ; Sat, 28 Feb 2004 11:56:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0FF243D1D for ; Sat, 28 Feb 2004 11:56:55 -0800 (PST) (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.10/8.12.10) with ESMTP id i1SJutGe013343 for ; Sat, 28 Feb 2004 11:56:55 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1SJut2Q013340 for perforce@freebsd.org; Sat, 28 Feb 2004 11:56:55 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 28 Feb 2004 11:56:55 -0800 (PST) Message-Id: <200402281956.i1SJut2Q013340@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 47817 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, 28 Feb 2004 19:56:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=47817 Change 47817 by rwatson@rwatson_tislabs on 2004/02/28 11:56:32 Integrate netperf_socket forward a little more, to loop back ip_input.c formatting changes. Affected files ... .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips_commands.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips_disk.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/channel.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/netperf_socket/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#6 integrate Differences ... ==== //depot/projects/netperf_socket/sys/dev/ata/ata-all.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-all.h,v 1.73 2004/01/29 15:03:01 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.74 2004/02/28 17:47:27 sos Exp $ */ /* ATA register defines */ @@ -156,6 +156,28 @@ #define ATA_OP_CONTINUES 0 #define ATA_OP_FINISHED 1 +/* ATAPI request sense structure */ +struct atapi_sense { + u_int8_t error_code :7; /* current or deferred errors */ + u_int8_t valid :1; /* follows ATAPI spec */ + u_int8_t segment; /* Segment number */ + u_int8_t sense_key :4; /* sense key */ + u_int8_t reserved2_4 :1; /* reserved */ + u_int8_t ili :1; /* incorrect length indicator */ + u_int8_t eom :1; /* end of medium */ + u_int8_t filemark :1; /* filemark */ + u_int32_t cmd_info __packed; /* cmd information */ + u_int8_t sense_length; /* additional sense len (n-7) */ + u_int32_t cmd_specific_info __packed; /* additional cmd spec info */ + u_int8_t asc; /* additional sense code */ + u_int8_t ascq; /* additional sense code qual */ + u_int8_t replaceable_unit_code; /* replaceable unit code */ + u_int8_t sk_specific :7; /* sense key specific */ + u_int8_t sksv :1; /* sense key specific info OK */ + u_int8_t sk_specific1; /* sense key specific */ + u_int8_t sk_specific2; /* sense key specific */ +}; + struct ata_request { struct ata_device *device; /* ptr to device softc */ void *driver; /* driver specific */ @@ -169,6 +191,8 @@ } ata; struct { u_int8_t ccb[16]; /* ATAPI command block */ + u_int8_t sense_key; /* ATAPI request sense key */ + struct atapi_sense sense_data; /* ATAPI request sense data */ } atapi; } u; @@ -333,28 +357,6 @@ void *running; /* currently running request */ }; -/* ATAPI request sense structure */ -struct atapi_sense { - u_int8_t error_code :7; /* current or deferred errors */ - u_int8_t valid :1; /* follows ATAPI spec */ - u_int8_t segment; /* Segment number */ - u_int8_t sense_key :4; /* sense key */ - u_int8_t reserved2_4 :1; /* reserved */ - u_int8_t ili :1; /* incorrect length indicator */ - u_int8_t eom :1; /* end of medium */ - u_int8_t filemark :1; /* filemark */ - u_int32_t cmd_info __packed; /* cmd information */ - u_int8_t sense_length; /* additional sense len (n-7) */ - u_int32_t cmd_specific_info __packed; /* additional cmd spec info */ - u_int8_t asc; /* additional sense code */ - u_int8_t ascq; /* additional sense code qual */ - u_int8_t replaceable_unit_code; /* replaceable unit code */ - u_int8_t sk_specific :7; /* sense key specific */ - u_int8_t sksv :1; /* sense key specific info OK */ - u_int8_t sk_specific1; /* sense key specific */ - u_int8_t sk_specific2; /* sense key specific */ -}; - /* disk bay/enclosure related */ #define ATA_LED_OFF 0x00 #define ATA_LED_RED 0x01 ==== //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.21 2004/02/17 19:24:11 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.22 2004/02/28 17:47:27 sos Exp $"); #include "opt_ata.h" #include @@ -131,15 +131,14 @@ int count, int flags, int timeout) { struct ata_request *request = ata_alloc_request(); - int packet_size, error = ENOMEM; + int error = ENOMEM; if (request) { + request->device = atadev; if ((atadev->param->config & ATA_PROTO_MASK) == ATA_PROTO_ATAPI_12) - packet_size = 12; + bcopy(ccb, request->u.atapi.ccb, 12); else - packet_size = 16; - request->device = atadev; - bcopy(ccb, request->u.atapi.ccb, packet_size); + bcopy(ccb, request->u.atapi.ccb, 16); request->data = data; request->bytecount = count; request->transfersize = min(request->bytecount, 65534); @@ -332,43 +331,70 @@ if (request->result) break; - if (request->error) { - switch ((request->error & ATA_SK_MASK)) { - case ATA_SK_RECOVERED_ERROR: - ata_prtdev(request->device, "WARNING - %s recovered error\n", - ata_cmd2str(request)); - /* FALLTHROUGH */ + /* if we have a sensekey -> request sense from device */ + if (request->error & ATA_SK_MASK && + request->u.atapi.ccb[0] != ATAPI_REQUEST_SENSE) { + static u_int8_t ccb[16] = { ATAPI_REQUEST_SENSE, 0, 0, 0, + sizeof(struct atapi_sense), + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + + bcopy(ccb, request->u.atapi.ccb, 16); + request->u.atapi.sense_key = request->error; + request->data = (caddr_t)&request->u.atapi.sense_data; + request->bytecount = sizeof(struct atapi_sense); + request->transfersize = sizeof(struct atapi_sense); + request->timeout = 5; + request->flags = + ATA_R_ATAPI | ATA_R_READ | ATA_R_IMMEDIATE | ATA_R_REQUEUE; + ata_queue_request(request); + return; + } + + switch (request->u.atapi.sense_key & ATA_SK_MASK) { + case ATA_SK_RECOVERED_ERROR: + ata_prtdev(request->device, "WARNING - %s recovered error\n", + ata_cmd2str(request)); + /* FALLTHROUGH */ + + case ATA_SK_NO_SENSE: + request->result = 0; + break; - case ATA_SK_NO_SENSE: - request->result = 0; - break; + case ATA_SK_NOT_READY: + request->result = EBUSY; + break; - case ATA_SK_NOT_READY: - request->result = EBUSY; - break; + case ATA_SK_UNIT_ATTENTION: + request->device->flags |= ATA_D_MEDIA_CHANGED; + request->result = EIO; + break; - case ATA_SK_UNIT_ATTENTION: - request->device->flags |= ATA_D_MEDIA_CHANGED; - request->result = EIO; + default: + request->result = EIO; + if (request->flags & ATA_R_QUIET) break; - default: - if (!(request->flags & ATA_R_QUIET)) - ata_prtdev(request->device, - "FAILURE - %s status=%b sensekey=%s error=%b\n", - ata_cmd2str(request), - request->status, "\20\10BUSY\7READY\6DMA" - "\5DSC\4DRQ\3CORRECTABLE\2INDEX\1ERROR", - ata_skey2str((request->error & ATA_SK_MASK)>>4), - (request->error & ATA_E_MASK), - "\20\4MEDIA_CHANGE_REQUEST\3ABORTED" - "\2NO_MEDIA\1ILLEGAL_LENGTH"); - request->result = EIO; - } - if (request->error & ATA_E_MASK) - request->result = EIO; + ata_prtdev(request->device, + "FAILURE - %s %s asc=0x%02x ascq=0x%02x ", + ata_cmd2str(request), ata_skey2str( + (request->u.atapi.sense_key & ATA_SK_MASK) >> 4), + request->u.atapi.sense_data.asc, + request->u.atapi.sense_data.ascq); + if (request->u.atapi.sense_data.sksv) + printf("sks=0x%02x 0x%02x 0x%02x ", + request->u.atapi.sense_data.sk_specific, + request->u.atapi.sense_data.sk_specific1, + request->u.atapi.sense_data.sk_specific2); + printf("status=%b error=%b\n", + request->status, "\20\10BUSY\7READY\6DMA" + "\5DSC\4DRQ\3CORRECTABLE\2INDEX\1ERROR", + (request->error & ATA_E_MASK), + "\20\4MEDIA_CHANGE_REQUEST\3ABORTED" + "\2NO_MEDIA\1ILLEGAL_LENGTH"); } - break; + + if (request->error & ATA_E_MASK) + request->result = EIO; } ATA_DEBUG_RQ(request, "completed callback/wakeup"); ==== //depot/projects/netperf_socket/sys/dev/ips/ips.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ips/ips.c,v 1.10 2004/02/21 21:10:43 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ips/ips.c,v 1.11 2004/02/28 19:14:41 scottl Exp $"); #include #include @@ -102,16 +102,23 @@ static __inline__ int ips_cmdqueue_free(ips_softc_t *sc) { int i, error = -1; - intrmask_t mask = splbio(); + ips_command_t *command; + intrmask_t mask; + + mask = splbio(); if(!sc->used_commands){ for(i = 0; i < sc->max_cmds; i++){ - if(!(sc->commandarray[i].command_phys_addr)) + + command = &sc->commandarray[i]; + sema_destroy(&command->cmd_sema); + + if(command->command_phys_addr == 0) continue; bus_dmamap_unload(sc->command_dmatag, - sc->commandarray[i].command_dmamap); + command->command_dmamap); bus_dmamem_free(sc->command_dmatag, - sc->commandarray[i].command_buffer, - sc->commandarray[i].command_dmamap); + command->command_buffer, + command->command_dmamap); } error = 0; sc->state |= IPS_OFFLINE; @@ -129,13 +136,10 @@ SLIST_INIT(&sc->free_cmd_list); STAILQ_INIT(&sc->cmd_wait_list); for(i = 0; i < sc->max_cmds; i++){ - sc->commandarray[i].id = i; - sc->commandarray[i].sc = sc; - SLIST_INSERT_HEAD(&sc->free_cmd_list, &sc->commandarray[i], - next); - } - for(i = 0; i < sc->max_cmds; i++){ command = &sc->commandarray[i]; + command->id = i; + command->sc = sc; + if(bus_dmamem_alloc(sc->command_dmatag,&command->command_buffer, BUS_DMA_NOWAIT, &command->command_dmamap)) goto error; @@ -147,12 +151,15 @@ command->command_buffer, command->command_dmamap); goto error; } + + sema_init(&command->cmd_sema, 0, "IPS Command Semaphore"); + SLIST_INSERT_HEAD(&sc->free_cmd_list, command, next); } sc->state &= ~IPS_OFFLINE; return 0; error: - ips_cmdqueue_free(sc); - return ENOMEM; + ips_cmdqueue_free(sc); + return ENOMEM; } static int ips_add_waiting_command(ips_softc_t *sc, int (*callback)(ips_command_t *), void *data, unsigned long flags) @@ -254,6 +261,10 @@ { intrmask_t mask; mask = splbio(); + + if (sema_value(&command->cmd_sema) != 0) + panic("ips: command returned non-zero semaphore"); + SLIST_INSERT_HEAD(&sc->free_cmd_list, command, next); (sc->used_commands)--; splx(mask); @@ -375,6 +386,7 @@ { int i; DEVICE_PRINTF(1,sc->dev, "initializing\n"); + if (bus_dma_tag_create( /* parent */ sc->adapter_dmatag, /* alignemnt */ 1, /* boundary */ 0, @@ -420,8 +432,6 @@ if(sc->ips_adapter_reinit(sc, 0)) goto error; - mtx_init(&sc->cmd_mtx, "ips command mutex", NULL, MTX_DEF); - /* initialize ffdc values */ microtime(&sc->ffdc_resettime); sc->ffdc_resetcount = 1; @@ -534,8 +544,6 @@ mask = splbio(); untimeout(ips_timeout, sc, sc->timer); splx(mask); - if (mtx_initialized(&sc->cmd_mtx)) - mtx_destroy(&sc->cmd_mtx); if(sc->sg_dmatag) bus_dma_tag_destroy(sc->sg_dmatag); ==== //depot/projects/netperf_socket/sys/dev/ips/ips.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ips/ips.h,v 1.5 2003/11/27 08:37:36 mbr Exp $ + * $FreeBSD: src/sys/dev/ips/ips.h,v 1.6 2004/02/28 19:14:41 scottl Exp $ */ @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -376,6 +377,7 @@ bus_dmamap_t command_dmamap; void * command_buffer; u_int32_t command_phys_addr;/*WARNING! must be changed if 64bit addressing ever used*/ + struct sema cmd_sema; ips_cmd_status_t status; SLIST_ENTRY(ips_command) next; bus_dma_tag_t data_dmatag; @@ -427,7 +429,9 @@ void (* ips_adapter_intr)(void *sc); void (* ips_issue_cmd)(ips_command_t *command); ips_copper_queue_t * copper_queue; - struct mtx cmd_mtx; + struct mtx queue_mtx; + struct bio_queue_head queue; + }ips_softc_t; /* function defines from ips_ioctl.c */ @@ -438,7 +442,7 @@ /* function defines from ips_commands.c */ extern int ips_flush_cache(ips_softc_t *sc); -extern void ips_start_io_request(ips_softc_t *sc, struct bio *iobuf); +extern void ips_start_io_request(ips_softc_t *sc); extern int ips_get_drive_info(ips_softc_t *sc); extern int ips_get_adapter_info(ips_softc_t *sc); extern int ips_ffdc_reset(ips_softc_t *sc); ==== //depot/projects/netperf_socket/sys/dev/ips/ips_commands.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ips/ips_commands.c,v 1.8 2004/01/01 10:22:10 mbr Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ips/ips_commands.c,v 1.9 2004/02/28 19:14:41 scottl Exp $"); #include @@ -44,9 +44,7 @@ status->value = command->status.value; bus_dmamap_sync(command->sc->command_dmatag, command->command_dmamap, BUS_DMASYNC_POSTWRITE); - mtx_lock(&command->sc->cmd_mtx); - wakeup(status); - mtx_unlock(&command->sc->cmd_mtx); + sema_post(&command->cmd_sema); } /* Below are a series of functions for sending an IO request * to the adapter. The flow order is: start, send, callback, finish. @@ -163,15 +161,24 @@ return 0; } -void ips_start_io_request(ips_softc_t *sc, struct bio *iobuf) +void ips_start_io_request(ips_softc_t *sc) { - if(ips_get_free_cmd(sc, ips_send_io_request, iobuf, 0)){ - device_printf(sc->dev, "no mem for command slots!\n"); - iobuf->bio_flags |= BIO_ERROR; - iobuf->bio_error = ENOMEM; - ipsd_finish(iobuf); + struct bio *iobuf; + + mtx_lock(&sc->queue_mtx); + iobuf = bioq_first(&sc->queue); + if(!iobuf) { + mtx_unlock(&sc->queue_mtx); + return; + } + + if(ips_get_free_cmd(sc, ips_send_io_request, iobuf, IPS_NOWAIT_FLAG)){ + mtx_unlock(&sc->queue_mtx); return; } + + bioq_remove(&sc->queue, iobuf); + mtx_unlock(&sc->queue_mtx); return; } @@ -236,15 +243,13 @@ goto exit; } command->callback = ips_wakeup_callback; - mtx_lock(&sc->cmd_mtx); bus_dmamap_load(command->data_dmatag, command->data_dmamap, command->data_buffer,IPS_ADAPTER_INFO_LEN, ips_adapter_info_callback, command, BUS_DMA_NOWAIT); if ((status->value == IPS_ERROR_STATUS) || - (msleep(status, &sc->cmd_mtx, 0, "ips", 30*hz) == EWOULDBLOCK)) + (sema_timedwait(&command->cmd_sema, 30*hz) == 0)) error = ETIMEDOUT; - mtx_unlock(&sc->cmd_mtx); if (error == 0) { bus_dmamap_sync(command->data_dmatag, command->data_dmamap, @@ -343,14 +348,12 @@ goto exit; } command->callback = ips_wakeup_callback; - mtx_lock(&sc->cmd_mtx); bus_dmamap_load(command->data_dmatag, command->data_dmamap, command->data_buffer,IPS_DRIVE_INFO_LEN, ips_drive_info_callback, command, BUS_DMA_NOWAIT); if ((status->value == IPS_ERROR_STATUS) || - (msleep(status, &sc->cmd_mtx, 0, "ips", 10*hz) == EWOULDBLOCK)) + (sema_timedwait(&command->cmd_sema, 10*hz) == 0)) error = ETIMEDOUT; - mtx_unlock(&sc->cmd_mtx); if (error == 0) { bus_dmamap_sync(command->data_dmatag, command->data_dmamap, @@ -406,11 +409,9 @@ command_struct->id = command->id; bus_dmamap_sync(sc->command_dmatag, command->command_dmamap, BUS_DMASYNC_PREWRITE); - mtx_lock(&sc->cmd_mtx); sc->ips_issue_cmd(command); if (status->value != IPS_ERROR_STATUS) - msleep(status, &sc->cmd_mtx, 0, "flush2", 0); - mtx_unlock(&sc->cmd_mtx); + sema_wait(&command->cmd_sema); ips_insert_free_cmd(sc, command); return 0; } @@ -494,11 +495,9 @@ bus_dmamap_sync(sc->command_dmatag, command->command_dmamap, BUS_DMASYNC_PREWRITE); - mtx_lock(&sc->cmd_mtx); sc->ips_issue_cmd(command); if (status->value != IPS_ERROR_STATUS) - msleep(status, &sc->cmd_mtx, 0, "ffdc", 0); - mtx_unlock(&sc->cmd_mtx); + sema_wait(&command->cmd_sema); ips_insert_free_cmd(sc, command); return 0; } @@ -603,14 +602,12 @@ goto exit; } command->callback = ips_write_nvram; - mtx_lock(&sc->cmd_mtx); bus_dmamap_load(command->data_dmatag, command->data_dmamap, command->data_buffer,IPS_NVRAM_PAGE_SIZE, ips_read_nvram_callback, command, BUS_DMA_NOWAIT); if ((status->value == IPS_ERROR_STATUS) || - (msleep(status, &sc->cmd_mtx, 0, "ips", 0) == EWOULDBLOCK)) + (sema_timedwait(&command->cmd_sema, 30*hz) == 0)) error = ETIMEDOUT; - mtx_unlock(&sc->cmd_mtx); if (error == 0) { bus_dmamap_sync(command->data_dmatag, command->data_dmamap, @@ -661,11 +658,9 @@ command_struct->reserve2 = IPS_POCL; bus_dmamap_sync(sc->command_dmatag, command->command_dmamap, BUS_DMASYNC_PREWRITE); - mtx_lock(&sc->cmd_mtx); sc->ips_issue_cmd(command); if (status->value != IPS_ERROR_STATUS) - msleep(status, &sc->cmd_mtx, 0, "ipssyn", 0); - mtx_unlock(&sc->cmd_mtx); + sema_wait(&command->cmd_sema); ips_insert_free_cmd(sc, command); return 0; } @@ -684,11 +679,9 @@ command_struct->reserve2 = IPS_CSL; bus_dmamap_sync(sc->command_dmatag, command->command_dmamap, BUS_DMASYNC_PREWRITE); - mtx_lock(&sc->cmd_mtx); sc->ips_issue_cmd(command); if (status->value != IPS_ERROR_STATUS) - msleep(status, &sc->cmd_mtx, 0, "ipsetc", 0); - mtx_unlock(&sc->cmd_mtx); + sema_wait(&command->cmd_sema); ips_insert_free_cmd(sc, command); return 0; } ==== //depot/projects/netperf_socket/sys/dev/ips/ips_disk.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ips/ips_disk.c,v 1.5 2004/02/18 21:36:52 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ips/ips_disk.c,v 1.6 2004/02/28 19:14:41 scottl Exp $"); #include #include @@ -79,6 +79,9 @@ /* ipsd_finish is called to clean up and return a completed IO request */ void ipsd_finish(struct bio *iobuf) { + ipsdisk_softc_t *dsc; + dsc = iobuf->bio_disk->d_drv1; + if (iobuf->bio_flags & BIO_ERROR) { ipsdisk_softc_t *dsc; dsc = iobuf->bio_disk->d_drv1; @@ -87,6 +90,7 @@ iobuf->bio_resid = 0; biodone(iobuf); + ips_start_io_request(dsc->sc); } @@ -97,7 +101,10 @@ dsc = iobuf->bio_disk->d_drv1; DEVICE_PRINTF(8,dsc->dev,"in strategy\n"); iobuf->bio_driver1 = (void *)(uintptr_t)dsc->sc->drives[dsc->disk_number].drivenum; - ips_start_io_request(dsc->sc, iobuf); + mtx_lock(&dsc->sc->queue_mtx); + bioq_disksort(&dsc->sc->queue, iobuf); + mtx_unlock(&dsc->sc->queue_mtx); + ips_start_io_request(dsc->sc); } static int ipsd_probe(device_t dev) @@ -161,4 +168,3 @@ disk_destroy(dsc->ipsd_disk); return 0; } - ==== //depot/projects/netperf_socket/sys/dev/ips/ips_pci.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.7 2003/09/11 23:30:28 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ips/ips_pci.c,v 1.8 2004/02/28 19:14:41 scottl Exp $"); #include @@ -135,6 +135,8 @@ } sc->ips_ich.ich_func = ips_intrhook; sc->ips_ich.ich_arg = sc; + mtx_init(&sc->queue_mtx, "IPS bioqueue lock", MTX_DEF, 0); + bioq_init(&sc->queue); if (config_intrhook_establish(&sc->ips_ich) != 0) { printf("IPS can't establish configuration hook\n"); goto error; @@ -182,7 +184,7 @@ if(ips_adapter_free(sc)) return EBUSY; ips_pci_free(sc); - mtx_destroy(&sc->cmd_mtx); + bioq_flush(&sc->queue, NULL, ENXIO); } return 0; } ==== //depot/projects/netperf_socket/sys/dev/sound/pcm/channel.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/channel.c,v 1.96 2004/02/20 01:24:57 matk Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/channel.c,v 1.97 2004/02/28 19:47:02 truckman Exp $"); #define MIN_CHUNK_SIZE 256 /* for uiomove etc. */ #define DMA_ALIGN_THRESHOLD 4 @@ -69,10 +69,20 @@ static void chn_lockinit(struct pcm_channel *c, int dir) { - if (dir == PCMDIR_PLAY) - c->lock = snd_chnmtxcreate(c->name, "pcm play channel"); - else - c->lock = snd_chnmtxcreate(c->name, "pcm record channel"); + switch(dir) { + case PCMDIR_PLAY: + c->lock = snd_mtxcreate(c->name, "pcm play channel"); + break; + case PCMDIR_REC: + c->lock = snd_mtxcreate(c->name, "pcm record channel"); + break; + case PCMDIR_VIRTUAL: + c->lock = snd_mtxcreate(c->name, "pcm virtual play channel"); + break; + case 0: + c->lock = snd_mtxcreate(c->name, "pcm fake channel"); + break; + } } static void @@ -746,7 +756,7 @@ } int -chn_init(struct pcm_channel *c, void *devinfo, int dir) +chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction) { struct feeder_class *fc; struct snd_dbuf *b, *bs; @@ -791,7 +801,7 @@ ret = ENODEV; CHN_UNLOCK(c); /* XXX - Unlock for CHANNEL_INIT() malloc() call */ - c->devinfo = CHANNEL_INIT(c->methods, devinfo, b, c, dir); + c->devinfo = CHANNEL_INIT(c->methods, devinfo, b, c, direction); CHN_LOCK(c); if (c->devinfo == NULL) goto out; @@ -800,7 +810,7 @@ if ((sndbuf_getsize(b) == 0) && ((c->flags & CHN_F_VIRTUAL) == 0)) goto out; - ret = chn_setdir(c, dir); + ret = chn_setdir(c, direction); if (ret) goto out; ==== //depot/projects/netperf_socket/sys/dev/sound/pcm/channel.h#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/dev/sound/pcm/channel.h,v 1.29 2004/01/28 08:02:15 truckman Exp $ + * $FreeBSD: src/sys/dev/sound/pcm/channel.h,v 1.30 2004/02/28 19:47:02 truckman Exp $ */ struct pcmchan_children { @@ -76,7 +76,7 @@ int chn_flush(struct pcm_channel *c); int chn_poll(struct pcm_channel *c, int ev, struct thread *td); -int chn_init(struct pcm_channel *c, void *devinfo, int dir); +int chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction); int chn_kill(struct pcm_channel *c); int chn_setdir(struct pcm_channel *c, int dir); int chn_reset(struct pcm_channel *c, u_int32_t fmt); ==== //depot/projects/netperf_socket/sys/dev/sound/pcm/dsp.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.73 2004/02/21 21:10:47 phk Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/dsp.c,v 1.74 2004/02/28 19:42:48 truckman Exp $"); #define OLDPCM_IOCTL @@ -444,7 +444,7 @@ static int dsp_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct thread *td) { - struct pcm_channel *wrch, *rdch; + struct pcm_channel *chn, *rdch, *wrch; struct snddev_info *d; intrmask_t s; int kill; @@ -477,22 +477,19 @@ if (kill & 2) rdch = NULL; - if (rdch != NULL) - CHN_LOCK(rdch); - if (wrch != NULL) - CHN_LOCK(wrch); - switch(cmd) { #ifdef OLDPCM_IOCTL /* * we start with the new ioctl interface. */ case AIONWRITE: /* how many bytes can write ? */ + CHN_LOCK(wrch); /* if (wrch && wrch->bufhard.dl) while (chn_wrfeed(wrch) == 0); */ *arg_i = wrch? sndbuf_getfree(wrch->bufsoft) : 0; + CHN_UNLOCK(wrch); break; case AIOSSIZE: /* set the current blocksize */ @@ -502,12 +499,16 @@ p->play_size = 0; p->rec_size = 0; if (wrch) { + CHN_LOCK(wrch); chn_setblocksize(wrch, 2, p->play_size); p->play_size = sndbuf_getblksz(wrch->bufsoft); + CHN_UNLOCK(wrch); } if (rdch) { + CHN_LOCK(rdch); chn_setblocksize(rdch, 2, p->rec_size); p->rec_size = sndbuf_getblksz(rdch->bufsoft); + CHN_UNLOCK(rdch); } } break; @@ -515,37 +516,51 @@ { struct snd_size *p = (struct snd_size *)arg; - if (wrch) + if (wrch) { + CHN_LOCK(wrch); p->play_size = sndbuf_getblksz(wrch->bufsoft); - if (rdch) + CHN_UNLOCK(wrch); + } + if (rdch) { + CHN_LOCK(rdch); p->rec_size = sndbuf_getblksz(rdch->bufsoft); + CHN_UNLOCK(rdch); + } } break; case AIOSFMT: + case AIOGFMT: { snd_chan_param *p = (snd_chan_param *)arg; if (wrch) { - chn_setformat(wrch, p->play_format); - chn_setspeed(wrch, p->play_rate); + CHN_LOCK(wrch); + if (cmd == AIOSFMT) { + chn_setformat(wrch, p->play_format); + chn_setspeed(wrch, p->play_rate); + } + p->play_rate = wrch->speed; + p->play_format = wrch->format; + CHN_UNLOCK(wrch); + } else { + p->play_rate = 0; + p->play_format = 0; } if (rdch) { - chn_setformat(rdch, p->rec_format); - chn_setspeed(rdch, p->rec_rate); + CHN_LOCK(rdch); + if (cmd == AIOSFMT) { + chn_setformat(rdch, p->rec_format); + chn_setspeed(rdch, p->rec_rate); + } + p->rec_rate = rdch->speed; + p->rec_format = rdch->format; + CHN_UNLOCK(rdch); + } else { + p->rec_rate = 0; + p->rec_format = 0; } } - /* FALLTHROUGH */ - - case AIOGFMT: - { - snd_chan_param *p = (snd_chan_param *)arg; - - p->play_rate = wrch? wrch->speed : 0; - p->rec_rate = rdch? rdch->speed : 0; - p->play_format = wrch? wrch->format : 0; - p->rec_format = rdch? rdch->format : 0; - } break; case AIOGCAP: /* get capabilities */ @@ -554,10 +569,14 @@ struct pcmchan_caps *pcaps = NULL, *rcaps = NULL; dev_t pdev; - if (rdch) + if (rdch) { + CHN_LOCK(rdch); rcaps = chn_getcaps(rdch); - if (wrch) + } + if (wrch) { + CHN_LOCK(wrch); pcaps = chn_getcaps(wrch); + } p->rate_min = max(rcaps? rcaps->minspeed : 0, pcaps? pcaps->minspeed : 0); p->rate_max = min(rcaps? rcaps->maxspeed : 1000000, @@ -573,15 +592,23 @@ p->mixers = 1; /* default: one mixer */ p->inputs = pdev->si_drv1? mix_getdevs(pdev->si_drv1) : 0; p->left = p->right = 100; + if (rdch) + CHN_UNLOCK(rdch); + if (wrch) + CHN_UNLOCK(wrch); } break; case AIOSTOP: - if (*arg_i == AIOSYNC_PLAY && wrch) + if (*arg_i == AIOSYNC_PLAY && wrch) { + CHN_LOCK(wrch); *arg_i = chn_abort(wrch); - else if (*arg_i == AIOSYNC_CAPTURE && rdch) + CHN_UNLOCK(wrch); + } else if (*arg_i == AIOSYNC_CAPTURE && rdch) { + CHN_LOCK(rdch); *arg_i = chn_abort(rdch); - else { + CHN_UNLOCK(rdch); + } else { printf("AIOSTOP: bad channel 0x%x\n", *arg_i); *arg_i = 0; } @@ -596,9 +623,15 @@ * here follow the standard ioctls (filio.h etc.) */ case FIONREAD: /* get # bytes to read */ -/* if (rdch && rdch->bufhard.dl) - while (chn_rdfeed(rdch) == 0); -*/ *arg_i = rdch? sndbuf_getready(rdch->bufsoft) : 0; + if (rdch) { + CHN_LOCK(rdch); +/* if (rdch && rdch->bufhard.dl) + while (chn_rdfeed(rdch) == 0); +*/ + *arg_i = sndbuf_getready(rdch->bufsoft); + CHN_UNLOCK(rdch); + } else + *arg_i = 0; break; case FIOASYNC: /*set/clear async i/o */ @@ -607,15 +640,21 @@ case SNDCTL_DSP_NONBLOCK: case FIONBIO: /* set/clear non-blocking i/o */ - if (rdch) - rdch->flags &= ~CHN_F_NBIO; - if (wrch) - wrch->flags &= ~CHN_F_NBIO; - if (*arg_i) { - if (rdch) + if (rdch) { + CHN_LOCK(rdch); + if (*arg_i) rdch->flags |= CHN_F_NBIO; - if (wrch) + else + rdch->flags &= ~CHN_F_NBIO; + CHN_UNLOCK(rdch); + } + if (wrch) { + CHN_LOCK(wrch); + if (*arg_i) wrch->flags |= CHN_F_NBIO; + else + wrch->flags &= ~CHN_F_NBIO; + CHN_UNLOCK(wrch); } break; @@ -625,71 +664,93 @@ #define THE_REAL_SNDCTL_DSP_GETBLKSIZE _IOWR('P', 4, int) case THE_REAL_SNDCTL_DSP_GETBLKSIZE: case SNDCTL_DSP_GETBLKSIZE: - if (wrch) - *arg_i = sndbuf_getblksz(wrch->bufsoft); - else if (rdch) - *arg_i = sndbuf_getblksz(rdch->bufsoft); - else - *arg_i = 0; + chn = wrch ? wrch : rdch; + CHN_LOCK(chn); + *arg_i = sndbuf_getblksz(chn->bufsoft); + CHN_UNLOCK(chn); break ; case SNDCTL_DSP_SETBLKSIZE: RANGE(*arg_i, 16, 65536); - if (wrch) + if (wrch) { + CHN_LOCK(wrch); chn_setblocksize(wrch, 2, *arg_i); - if (rdch) + CHN_UNLOCK(wrch); + } + if (rdch) { + CHN_LOCK(rdch); chn_setblocksize(rdch, 2, *arg_i); + CHN_UNLOCK(rdch); + } break; case SNDCTL_DSP_RESET: DEB(printf("dsp reset\n")); if (wrch) { + CHN_LOCK(wrch); chn_abort(wrch); chn_resetbuf(wrch); + CHN_UNLOCK(wrch); } if (rdch) { + CHN_LOCK(rdch); chn_abort(rdch); chn_resetbuf(rdch); + CHN_UNLOCK(rdch); } break; case SNDCTL_DSP_SYNC: DEB(printf("dsp sync\n")); /* chn_sync may sleep */ - if (wrch) + if (wrch) { + CHN_LOCK(wrch); chn_sync(wrch, sndbuf_getsize(wrch->bufsoft) - 4); + CHN_UNLOCK(wrch); + } break; case SNDCTL_DSP_SPEED: /* chn_setspeed may sleep */ tmp = 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 28 17:19:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BC3216A4D1; Sat, 28 Feb 2004 17:19:56 -0800 (PST) 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 2EE2116A4CE for ; Sat, 28 Feb 2004 17:19:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25D1B43D2F for ; Sat, 28 Feb 2004 17:19:56 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1T1JtGe001863 for ; Sat, 28 Feb 2004 17:19:55 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1T1JQCr001498 for perforce@freebsd.org; Sat, 28 Feb 2004 17:19:26 -0800 (PST) (envelope-from marcel@freebsd.org) Date: Sat, 28 Feb 2004 17:19:26 -0800 (PST) Message-Id: <200402290119.i1T1JQCr001498@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 47841 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, 29 Feb 2004 01:19:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=47841 Change 47841 by marcel@marcel_nfs on 2004/02/28 17:18:40 IFC @47839 Affected files ... .. //depot/projects/ia64/MAINTAINERS#37 integrate .. //depot/projects/ia64/Makefile#36 integrate .. //depot/projects/ia64/Makefile.inc1#88 integrate .. //depot/projects/ia64/UPDATING#61 integrate .. //depot/projects/ia64/bin/Makefile#7 integrate .. //depot/projects/ia64/bin/chflags/chflags.c#3 integrate .. //depot/projects/ia64/bin/csh/Makefile#11 integrate .. //depot/projects/ia64/bin/df/df.c#18 integrate .. //depot/projects/ia64/bin/kill/kill.c#6 integrate .. //depot/projects/ia64/bin/ls/print.c#14 integrate .. //depot/projects/ia64/bin/ps/Makefile#10 integrate .. //depot/projects/ia64/bin/ps/keyword.c#14 integrate .. //depot/projects/ia64/bin/ps/ps.1#19 integrate .. //depot/projects/ia64/bin/ps/ps.c#13 integrate .. //depot/projects/ia64/bin/rmail/Makefile#5 integrate .. //depot/projects/ia64/bin/sh/Makefile#8 integrate .. //depot/projects/ia64/bin/sh/eval.c#9 integrate .. //depot/projects/ia64/bin/sh/input.c#6 integrate .. //depot/projects/ia64/bin/sh/jobs.c#19 integrate .. //depot/projects/ia64/bin/sh/parser.c#12 integrate .. //depot/projects/ia64/bin/sh/redir.c#8 integrate .. //depot/projects/ia64/bin/sh/redir.h#3 integrate .. //depot/projects/ia64/bin/sh/trap.c#6 integrate .. //depot/projects/ia64/contrib/bc/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64/contrib/bc/bc/main.c#2 integrate .. //depot/projects/ia64/contrib/bc/h/getopt.h#2 delete .. //depot/projects/ia64/contrib/bc/lib/getopt.c#2 delete .. //depot/projects/ia64/contrib/bc/lib/getopt1.c#2 delete .. //depot/projects/ia64/contrib/bsnmp/FREEBSD-Xlist#1 branch .. //depot/projects/ia64/contrib/bsnmp/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/ia64/contrib/bsnmp/README#2 integrate .. //depot/projects/ia64/contrib/bsnmp/TODO#2 integrate .. //depot/projects/ia64/contrib/bsnmp/VERSION#2 integrate .. //depot/projects/ia64/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/ia64/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/asn1.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/asn1.h#2 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmp.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmp.h#2 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmpagent.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmpagent.h#2 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmpclient.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmpclient.h#2 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmppriv.h#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_ifmib.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_ifstack.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_ip.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_tcp.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_udp.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/snmp_mibII.h#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/FOKUS-MIB.txt#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/action.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/config.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/export.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/snmpd.config#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/snmpd.h#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/snmpd.sh#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/snmpmod.h#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/trans_lsock.c#1 branch .. //depot/projects/ia64/contrib/bsnmp/snmpd/trans_lsock.h#1 branch .. //depot/projects/ia64/contrib/bsnmp/snmpd/trans_udp.c#1 branch .. //depot/projects/ia64/contrib/bsnmp/snmpd/trans_udp.h#1 branch .. //depot/projects/ia64/contrib/bsnmp/snmpd/trap.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/tree.def#2 integrate .. //depot/projects/ia64/contrib/cpio/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64/contrib/cpio/getopt.c#2 delete .. //depot/projects/ia64/contrib/cpio/getopt.h#2 delete .. //depot/projects/ia64/contrib/cpio/getopt1.c#2 delete .. //depot/projects/ia64/contrib/cvs/src/modules.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/server.c#5 integrate .. //depot/projects/ia64/contrib/diff/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64/contrib/diff/diff.h#2 integrate .. //depot/projects/ia64/contrib/diff/getopt.c#2 delete .. //depot/projects/ia64/contrib/diff/getopt.h#2 delete .. //depot/projects/ia64/contrib/diff/getopt1.c#2 delete .. //depot/projects/ia64/contrib/gcc/FREEBSD-Xlist#4 integrate .. //depot/projects/ia64/contrib/gcc/FREEBSD-deletelist#3 integrate .. //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#14 integrate .. //depot/projects/ia64/contrib/gcc/getopt.c#5 delete .. //depot/projects/ia64/contrib/gcc/getopt.h#6 delete .. //depot/projects/ia64/contrib/gcc/getopt1.c#4 delete .. //depot/projects/ia64/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/ia64/contrib/gdtoa/strtod.c#4 integrate .. //depot/projects/ia64/contrib/gdtoa/xsum0.out#4 integrate .. //depot/projects/ia64/contrib/gnu-sort/lib/getopt.c#3 delete .. //depot/projects/ia64/contrib/gnu-sort/lib/getopt.h#3 delete .. //depot/projects/ia64/contrib/gnu-sort/lib/getopt1.c#3 delete .. //depot/projects/ia64/contrib/gperf/FREEBSD-Xlist#2 integrate .. //depot/projects/ia64/contrib/gperf/lib/getopt.c#2 delete .. //depot/projects/ia64/contrib/gperf/lib/getopt.c.patch#2 delete .. //depot/projects/ia64/contrib/gperf/lib/getopt.h#2 delete .. //depot/projects/ia64/contrib/gperf/lib/getopt.h.patch#2 delete .. //depot/projects/ia64/contrib/gperf/lib/getopt1.c#2 delete .. //depot/projects/ia64/contrib/groff/FREEBSD-Xlist#3 integrate .. //depot/projects/ia64/contrib/groff/src/include/getopt.h#3 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/getopt.c#3 delete .. //depot/projects/ia64/contrib/groff/src/libs/libgroff/getopt1.c#3 delete .. //depot/projects/ia64/contrib/isc-dhcp/FREEBSD-upgrade#8 integrate .. //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.c#13 integrate .. //depot/projects/ia64/contrib/isc-dhcp/common/convert.c#2 delete .. //depot/projects/ia64/contrib/isc-dhcp/common/errwarn.c#2 delete .. //depot/projects/ia64/contrib/isc-dhcp/common/hash.c#2 delete .. //depot/projects/ia64/contrib/isc-dhcp/common/inet_addr.c#2 delete .. //depot/projects/ia64/contrib/isc-dhcp/includes/hash.h#2 delete .. //depot/projects/ia64/contrib/isc-dhcp/includes/sysconf.h#2 delete .. //depot/projects/ia64/contrib/libreadline/FREEBSD-upgrade#3 integrate .. //depot/projects/ia64/contrib/libreadline/bind.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/complete.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/display.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/doc/readline.3#3 integrate .. //depot/projects/ia64/contrib/libreadline/mbutil.c#2 integrate .. //depot/projects/ia64/contrib/libreadline/readline.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/readline.h#4 integrate .. //depot/projects/ia64/contrib/libreadline/rlconf.h#3 integrate .. //depot/projects/ia64/contrib/libreadline/shell.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/terminal.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/util.c#3 integrate .. //depot/projects/ia64/contrib/libreadline/vi_mode.c#3 integrate .. //depot/projects/ia64/contrib/one-true-awk/FIXES#7 integrate .. //depot/projects/ia64/contrib/one-true-awk/FREEBSD-upgrade#7 integrate .. //depot/projects/ia64/contrib/one-true-awk/b.c#7 integrate .. //depot/projects/ia64/contrib/one-true-awk/lex.c#5 integrate .. //depot/projects/ia64/contrib/one-true-awk/main.c#8 integrate .. //depot/projects/ia64/contrib/one-true-awk/run.c#7 integrate .. //depot/projects/ia64/contrib/openpam/CREDITS#10 integrate .. //depot/projects/ia64/contrib/openpam/HISTORY#18 integrate .. //depot/projects/ia64/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/openpam/RELNOTES#18 integrate .. //depot/projects/ia64/contrib/openpam/configure#2 integrate .. //depot/projects/ia64/contrib/openpam/configure.in#2 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam.3#8 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_nullconv.3#9 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_readline.3#3 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#14 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_conv.3#4 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#19 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#19 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#19 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#18 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#18 integrate .. //depot/projects/ia64/contrib/openpam/include/security/openpam.h#18 integrate .. //depot/projects/ia64/contrib/openpam/include/security/openpam_version.h#8 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_appl.h#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_borrow_cred.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_restore_cred.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#18 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_data.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_user.c#14 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_vprompt.c#13 integrate .. //depot/projects/ia64/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/ia64/contrib/openpam/stamp-h.in#2 integrate .. //depot/projects/ia64/contrib/pf/authpf/authpf.8#1 branch .. //depot/projects/ia64/contrib/pf/authpf/authpf.c#1 branch .. //depot/projects/ia64/contrib/pf/authpf/pathnames.h#1 branch .. //depot/projects/ia64/contrib/pf/ftp-proxy/ftp-proxy.8#1 branch .. //depot/projects/ia64/contrib/pf/ftp-proxy/ftp-proxy.c#1 branch .. //depot/projects/ia64/contrib/pf/ftp-proxy/getline.c#1 branch .. //depot/projects/ia64/contrib/pf/ftp-proxy/util.c#1 branch .. //depot/projects/ia64/contrib/pf/ftp-proxy/util.h#1 branch .. //depot/projects/ia64/contrib/pf/man/pf.4#1 branch .. //depot/projects/ia64/contrib/pf/man/pf.conf.5#1 branch .. //depot/projects/ia64/contrib/pf/man/pf.os.5#1 branch .. //depot/projects/ia64/contrib/pf/man/pflog.4#1 branch .. //depot/projects/ia64/contrib/pf/man/pfsync.4#1 branch .. //depot/projects/ia64/contrib/pf/pfctl/parse.y#1 branch .. //depot/projects/ia64/contrib/pf/pfctl/pf_print_state.c#1 branch .. //depot/projects/ia64/contrib/pf/pfctl/pfctl.8#1 branch .. //depot/projects/ia64/contrib/pf/pfctl/pfctl.c#1 branch .. //depot/projects/ia64/contrib/pf/pfctl/pfctl.h#1 branch .. //depot/projects/ia64/contrib/pf/pfctl/pfctl_altq.c#1 branch .. //depot/projects/ia64/contrib/pf/pfctl/pfctl_osfp.c#1 branch .. //depot/projects/ia64/contrib/pf/pfctl/pfctl_parser.c#1 branch .. //depot/projects/ia64/contrib/pf/pfctl/pfctl_parser.h#1 branch .. //depot/projects/ia64/contrib/pf/pfctl/pfctl_qstats.c#1 branch .. //depot/projects/ia64/contrib/pf/pfctl/pfctl_radix.c#1 branch .. //depot/projects/ia64/contrib/pf/pfctl/pfctl_table.c#1 branch .. //depot/projects/ia64/contrib/pf/pflogd/pflogd.8#1 branch .. //depot/projects/ia64/contrib/pf/pflogd/pflogd.c#1 branch .. //depot/projects/ia64/contrib/pf/pflogd/pidfile.c#1 branch .. //depot/projects/ia64/contrib/pf/pflogd/pidfile.h#1 branch .. //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#16 integrate .. //depot/projects/ia64/contrib/sendmail/PGPKEYS#6 integrate .. //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#12 integrate .. //depot/projects/ia64/contrib/sendmail/cf/README#12 integrate .. //depot/projects/ia64/contrib/sendmail/cf/cf/submit.cf#11 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/cfhead.m4#9 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/proto.m4#12 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/version.m4#12 integrate .. //depot/projects/ia64/contrib/sendmail/doc/op/op.me#12 integrate .. //depot/projects/ia64/contrib/sendmail/include/libmilter/mfapi.h#8 integrate .. //depot/projects/ia64/contrib/sendmail/include/libmilter/milter.h#7 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/cdefs.h#5 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/conf.h#10 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#3 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#3 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setreply.html#6 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_connect.html#3 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#3 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/engine.c#9 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/libmilter.h#8 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/listener.c#12 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/main.c#9 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/signal.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/assert.c#4 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/exc.c#4 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/ldap.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/local.h#6 integrate .. //depot/projects/ia64/contrib/sendmail/smrsh/smrsh.8#7 integrate .. //depot/projects/ia64/contrib/sendmail/smrsh/smrsh.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/src/README#11 integrate .. //depot/projects/ia64/contrib/sendmail/src/alias.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/conf.c#14 integrate .. //depot/projects/ia64/contrib/sendmail/src/daemon.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/src/deliver.c#12 integrate .. //depot/projects/ia64/contrib/sendmail/src/headers.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/src/main.c#12 integrate .. //depot/projects/ia64/contrib/sendmail/src/milter.c#12 integrate .. //depot/projects/ia64/contrib/sendmail/src/mime.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/queue.c#12 integrate .. //depot/projects/ia64/contrib/sendmail/src/readcf.c#11 integrate .. //depot/projects/ia64/contrib/sendmail/src/recipient.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/sendmail.8#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/sendmail.h#12 integrate .. //depot/projects/ia64/contrib/sendmail/src/srvrsmtp.c#12 integrate .. //depot/projects/ia64/contrib/sendmail/src/tls.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/util.c#9 integrate .. //depot/projects/ia64/contrib/sendmail/src/version.c#12 integrate .. //depot/projects/ia64/contrib/smbfs/lib/smb/nb_net.c#2 integrate .. //depot/projects/ia64/contrib/tar/FREEBSD-Xlist#2 integrate .. //depot/projects/ia64/contrib/tar/lib/getopt.c#2 delete .. //depot/projects/ia64/contrib/tar/lib/getopt.h#2 delete .. //depot/projects/ia64/contrib/tar/lib/getopt1.c#2 delete .. //depot/projects/ia64/contrib/tcpdump/print-isakmp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-l2tp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-radius.c#4 integrate .. //depot/projects/ia64/contrib/texinfo/FREEBSD-Xlist#5 integrate .. //depot/projects/ia64/contrib/texinfo/lib/getopt.c#4 delete .. //depot/projects/ia64/contrib/texinfo/lib/getopt.h#4 delete .. //depot/projects/ia64/contrib/texinfo/lib/getopt1.c#4 delete .. //depot/projects/ia64/contrib/traceroute/traceroute.c#4 integrate .. //depot/projects/ia64/crypto/openssh/CREDITS#4 integrate .. //depot/projects/ia64/crypto/openssh/ChangeLog#6 integrate .. //depot/projects/ia64/crypto/openssh/FREEBSD-Xlist#3 integrate .. //depot/projects/ia64/crypto/openssh/FREEBSD-upgrade#6 integrate .. //depot/projects/ia64/crypto/openssh/INSTALL#5 integrate .. //depot/projects/ia64/crypto/openssh/LICENCE#6 integrate .. //depot/projects/ia64/crypto/openssh/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/openssh/OVERVIEW#3 integrate .. //depot/projects/ia64/crypto/openssh/README#5 integrate .. //depot/projects/ia64/crypto/openssh/README.dns#2 integrate .. //depot/projects/ia64/crypto/openssh/README.platform#1 branch .. //depot/projects/ia64/crypto/openssh/README.privsep#5 integrate .. //depot/projects/ia64/crypto/openssh/README.smartcard#4 integrate .. //depot/projects/ia64/crypto/openssh/RFC.nroff#2 integrate .. //depot/projects/ia64/crypto/openssh/TODO#6 integrate .. //depot/projects/ia64/crypto/openssh/WARNING.RNG#2 integrate .. //depot/projects/ia64/crypto/openssh/acconfig.h#7 integrate .. //depot/projects/ia64/crypto/openssh/acss.c#1 branch .. //depot/projects/ia64/crypto/openssh/acss.h#1 branch .. //depot/projects/ia64/crypto/openssh/auth-chall.c#7 integrate .. //depot/projects/ia64/crypto/openssh/auth-krb5.c#8 integrate .. //depot/projects/ia64/crypto/openssh/auth-pam.c#9 integrate .. //depot/projects/ia64/crypto/openssh/auth-pam.h#6 integrate .. //depot/projects/ia64/crypto/openssh/auth-passwd.c#8 integrate .. //depot/projects/ia64/crypto/openssh/auth-rh-rsa.c#5 integrate .. //depot/projects/ia64/crypto/openssh/auth-rhosts.c#5 integrate .. //depot/projects/ia64/crypto/openssh/auth-rsa.c#5 integrate .. //depot/projects/ia64/crypto/openssh/auth-shadow.c#1 branch .. //depot/projects/ia64/crypto/openssh/auth-sia.c#4 integrate .. //depot/projects/ia64/crypto/openssh/auth.c#8 integrate .. //depot/projects/ia64/crypto/openssh/auth.h#8 integrate .. //depot/projects/ia64/crypto/openssh/auth1.c#10 integrate .. //depot/projects/ia64/crypto/openssh/auth2-gss.c#2 integrate .. //depot/projects/ia64/crypto/openssh/auth2-hostbased.c#3 integrate .. //depot/projects/ia64/crypto/openssh/auth2-passwd.c#3 integrate .. //depot/projects/ia64/crypto/openssh/auth2-pubkey.c#3 integrate .. //depot/projects/ia64/crypto/openssh/auth2.c#10 integrate .. //depot/projects/ia64/crypto/openssh/authfd.c#9 integrate .. //depot/projects/ia64/crypto/openssh/authfd.h#7 integrate .. //depot/projects/ia64/crypto/openssh/authfile.c#9 integrate .. //depot/projects/ia64/crypto/openssh/bufaux.c#7 integrate .. //depot/projects/ia64/crypto/openssh/bufaux.h#5 integrate .. //depot/projects/ia64/crypto/openssh/buffer.c#6 integrate .. //depot/projects/ia64/crypto/openssh/canohost.c#8 integrate .. //depot/projects/ia64/crypto/openssh/channels.c#11 integrate .. //depot/projects/ia64/crypto/openssh/channels.h#7 integrate .. //depot/projects/ia64/crypto/openssh/cipher-3des1.c#2 integrate .. //depot/projects/ia64/crypto/openssh/cipher-acss.c#1 branch .. //depot/projects/ia64/crypto/openssh/cipher-aes.c#2 integrate .. //depot/projects/ia64/crypto/openssh/cipher-ctr.c#2 integrate .. //depot/projects/ia64/crypto/openssh/cipher.c#9 integrate .. //depot/projects/ia64/crypto/openssh/cipher.h#4 integrate .. //depot/projects/ia64/crypto/openssh/cleanup.c#1 branch .. //depot/projects/ia64/crypto/openssh/clientloop.c#8 integrate .. //depot/projects/ia64/crypto/openssh/clientloop.h#4 integrate .. //depot/projects/ia64/crypto/openssh/compat.c#7 integrate .. //depot/projects/ia64/crypto/openssh/compat.h#8 integrate .. //depot/projects/ia64/crypto/openssh/compress.c#4 integrate .. //depot/projects/ia64/crypto/openssh/config.guess#4 integrate .. //depot/projects/ia64/crypto/openssh/config.h#5 integrate .. //depot/projects/ia64/crypto/openssh/config.sub#4 integrate .. //depot/projects/ia64/crypto/openssh/configure.ac#6 integrate .. //depot/projects/ia64/crypto/openssh/defines.h#6 integrate .. //depot/projects/ia64/crypto/openssh/dh.c#6 integrate .. //depot/projects/ia64/crypto/openssh/dns.c#2 integrate .. //depot/projects/ia64/crypto/openssh/dns.h#2 integrate .. //depot/projects/ia64/crypto/openssh/entropy.c#3 integrate .. //depot/projects/ia64/crypto/openssh/fatal.c#2 integrate .. //depot/projects/ia64/crypto/openssh/fixprogs#2 integrate .. //depot/projects/ia64/crypto/openssh/groupaccess.c#4 integrate .. //depot/projects/ia64/crypto/openssh/gss-genr.c#2 integrate .. //depot/projects/ia64/crypto/openssh/gss-serv-krb5.c#2 integrate .. //depot/projects/ia64/crypto/openssh/gss-serv.c#2 integrate .. //depot/projects/ia64/crypto/openssh/hostfile.c#7 integrate .. //depot/projects/ia64/crypto/openssh/hostfile.h#5 integrate .. //depot/projects/ia64/crypto/openssh/includes.h#8 integrate .. //depot/projects/ia64/crypto/openssh/install-sh#2 integrate .. //depot/projects/ia64/crypto/openssh/kex.c#6 integrate .. //depot/projects/ia64/crypto/openssh/kexgexc.c#2 integrate .. //depot/projects/ia64/crypto/openssh/key.c#9 integrate .. //depot/projects/ia64/crypto/openssh/key.h#6 integrate .. //depot/projects/ia64/crypto/openssh/log.c#7 integrate .. //depot/projects/ia64/crypto/openssh/log.h#8 integrate .. //depot/projects/ia64/crypto/openssh/loginrec.c#6 integrate .. //depot/projects/ia64/crypto/openssh/mac.c#4 integrate .. //depot/projects/ia64/crypto/openssh/md5crypt.c#3 integrate .. //depot/projects/ia64/crypto/openssh/mdoc2man.awk#2 integrate .. //depot/projects/ia64/crypto/openssh/misc.c#7 integrate .. //depot/projects/ia64/crypto/openssh/mkinstalldirs#2 integrate .. //depot/projects/ia64/crypto/openssh/moduli#2 integrate .. //depot/projects/ia64/crypto/openssh/moduli.c#2 integrate .. //depot/projects/ia64/crypto/openssh/monitor.c#8 integrate .. //depot/projects/ia64/crypto/openssh/monitor.h#5 integrate .. //depot/projects/ia64/crypto/openssh/monitor_wrap.c#6 integrate .. //depot/projects/ia64/crypto/openssh/monitor_wrap.h#5 integrate .. //depot/projects/ia64/crypto/openssh/msg.c#6 integrate .. //depot/projects/ia64/crypto/openssh/msg.h#4 integrate .. //depot/projects/ia64/crypto/openssh/nchan.ms#2 integrate .. //depot/projects/ia64/crypto/openssh/nchan2.ms#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/Makefile.in#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/base64.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/basename.c#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-arc4random.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-cray.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-cray.h#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-getpeereid.c#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-misc.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-misc.h#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/bsd-openpty.c#1 branch .. //depot/projects/ia64/crypto/openssh/openbsd-compat/daemon.c#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/dirname.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/fake-rfc2553.c#2 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/fake-rfc2553.h#2 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/getcwd.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/getgrouplist.c#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/getopt.c#6 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/getrrsetbyname.h#2 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/glob.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/glob.h#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/inet_aton.c#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/inet_ntoa.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/inet_ntop.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/mktemp.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/openbsd-compat.h#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-aix.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/port-aix.h#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/readpassphrase.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/readpassphrase.h#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/realpath.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/rresvport.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/setenv.c#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/setproctitle.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/sigact.c#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/strlcat.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/strlcpy.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/strmode.c#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/strsep.c#4 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/strtoul.c#1 branch .. //depot/projects/ia64/crypto/openssh/openbsd-compat/sys-queue.h#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/sys-tree.h#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/vis.c#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/vis.h#3 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/xcrypt.c#2 integrate .. //depot/projects/ia64/crypto/openssh/packet.c#9 integrate .. //depot/projects/ia64/crypto/openssh/pathnames.h#5 integrate .. //depot/projects/ia64/crypto/openssh/progressmeter.c#3 integrate .. //depot/projects/ia64/crypto/openssh/readconf.c#9 integrate .. //depot/projects/ia64/crypto/openssh/readconf.h#6 integrate .. //depot/projects/ia64/crypto/openssh/regress/Makefile#4 integrate .. //depot/projects/ia64/crypto/openssh/regress/README.regress#2 integrate .. //depot/projects/ia64/crypto/openssh/regress/agent-ptrace.sh#3 integrate .. //depot/projects/ia64/crypto/openssh/regress/banner.sh#1 branch .. //depot/projects/ia64/crypto/openssh/regress/sftp-badcmds.sh#2 integrate .. //depot/projects/ia64/crypto/openssh/regress/sftp-batch.sh#3 integrate .. //depot/projects/ia64/crypto/openssh/regress/sftp-cmds.sh#3 integrate .. //depot/projects/ia64/crypto/openssh/regress/ssh-com.sh#4 integrate .. //depot/projects/ia64/crypto/openssh/regress/test-exec.sh#3 integrate .. //depot/projects/ia64/crypto/openssh/rijndael.c#6 integrate .. //depot/projects/ia64/crypto/openssh/scard-opensc.c#3 integrate .. //depot/projects/ia64/crypto/openssh/scp.1#7 integrate .. //depot/projects/ia64/crypto/openssh/scp.c#8 integrate .. //depot/projects/ia64/crypto/openssh/servconf.c#12 integrate .. //depot/projects/ia64/crypto/openssh/servconf.h#6 integrate .. //depot/projects/ia64/crypto/openssh/serverloop.c#9 integrate .. //depot/projects/ia64/crypto/openssh/session.c#19 integrate .. //depot/projects/ia64/crypto/openssh/session.h#8 integrate .. //depot/projects/ia64/crypto/openssh/sftp-client.c#8 integrate .. //depot/projects/ia64/crypto/openssh/sftp-client.h#5 integrate .. //depot/projects/ia64/crypto/openssh/sftp-common.c#7 integrate .. //depot/projects/ia64/crypto/openssh/sftp-common.h#4 integrate .. //depot/projects/ia64/crypto/openssh/sftp-glob.c#5 integrate .. //depot/projects/ia64/crypto/openssh/sftp-glob.h#5 delete .. //depot/projects/ia64/crypto/openssh/sftp-int.c#8 delete .. //depot/projects/ia64/crypto/openssh/sftp-int.h#4 delete .. //depot/projects/ia64/crypto/openssh/sftp-server.8#5 integrate .. //depot/projects/ia64/crypto/openssh/sftp-server.c#8 integrate .. //depot/projects/ia64/crypto/openssh/sftp.1#7 integrate .. //depot/projects/ia64/crypto/openssh/sftp.c#8 integrate .. //depot/projects/ia64/crypto/openssh/ssh-add.1#6 integrate .. //depot/projects/ia64/crypto/openssh/ssh-add.c#8 integrate .. //depot/projects/ia64/crypto/openssh/ssh-agent.c#10 integrate .. //depot/projects/ia64/crypto/openssh/ssh-dss.c#6 integrate .. //depot/projects/ia64/crypto/openssh/ssh-gss.h#2 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keygen.1#6 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keygen.c#8 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keyscan.c#8 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keysign.c#5 integrate .. //depot/projects/ia64/crypto/openssh/ssh-rand-helper.8#2 integrate .. //depot/projects/ia64/crypto/openssh/ssh-rand-helper.c#5 integrate .. //depot/projects/ia64/crypto/openssh/ssh-rsa.c#8 integrate .. //depot/projects/ia64/crypto/openssh/ssh.1#8 integrate .. //depot/projects/ia64/crypto/openssh/ssh.c#9 integrate .. //depot/projects/ia64/crypto/openssh/ssh.h#8 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config#14 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config.5#10 integrate .. //depot/projects/ia64/crypto/openssh/ssh_prng_cmds.in#3 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect.c#9 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect2.c#10 integrate .. //depot/projects/ia64/crypto/openssh/sshd.8#11 integrate .. //depot/projects/ia64/crypto/openssh/sshd.c#11 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config#15 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config.5#11 integrate .. //depot/projects/ia64/crypto/openssh/sshpty.c#9 integrate .. //depot/projects/ia64/crypto/openssh/sshtty.c#4 integrate .. //depot/projects/ia64/crypto/openssh/sshtty.h#3 integrate .. //depot/projects/ia64/crypto/openssh/uidswap.c#6 integrate .. //depot/projects/ia64/crypto/openssh/uuencode.c#5 integrate .. //depot/projects/ia64/crypto/openssh/uuencode.h#3 integrate .. //depot/projects/ia64/crypto/openssh/version.h#15 integrate .. //depot/projects/ia64/etc/Makefile#39 integrate .. //depot/projects/ia64/etc/defaults/devfs.rules#3 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#46 integrate .. //depot/projects/ia64/etc/devd.conf#10 integrate .. //depot/projects/ia64/etc/etc.powerpc/ttys#1 branch .. //depot/projects/ia64/etc/isdn/Makefile#7 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#22 integrate .. //depot/projects/ia64/etc/mtree/BSD.local.dist#21 integrate .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#31 integrate .. //depot/projects/ia64/etc/mtree/BSD.var.dist#11 integrate .. //depot/projects/ia64/etc/namedb/named.root#3 integrate .. //depot/projects/ia64/etc/netstart#5 integrate .. //depot/projects/ia64/etc/pam.d/xdm#8 integrate .. //depot/projects/ia64/etc/pccard_ether#12 integrate .. //depot/projects/ia64/etc/periodic/daily/110.clean-tmps#3 integrate .. //depot/projects/ia64/etc/rc#27 integrate .. //depot/projects/ia64/etc/rc.d/DAEMON#4 integrate .. //depot/projects/ia64/etc/rc.d/LOGIN#4 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#24 integrate .. //depot/projects/ia64/etc/rc.d/NETWORKING#6 integrate .. //depot/projects/ia64/etc/rc.d/SERVERS#4 integrate .. //depot/projects/ia64/etc/rc.d/accounting#5 integrate .. //depot/projects/ia64/etc/rc.d/amd#8 integrate .. //depot/projects/ia64/etc/rc.d/apmd#9 integrate .. //depot/projects/ia64/etc/rc.d/bootparams#4 integrate .. //depot/projects/ia64/etc/rc.d/ccd#3 integrate .. //depot/projects/ia64/etc/rc.d/cleartmp#6 integrate .. //depot/projects/ia64/etc/rc.d/cron#5 integrate .. //depot/projects/ia64/etc/rc.d/dhclient#10 integrate .. //depot/projects/ia64/etc/rc.d/dumpon#2 integrate .. //depot/projects/ia64/etc/rc.d/fsck#5 integrate .. //depot/projects/ia64/etc/rc.d/gbde#2 integrate .. //depot/projects/ia64/etc/rc.d/gbde_swap#1 branch .. //depot/projects/ia64/etc/rc.d/inetd#3 integrate .. //depot/projects/ia64/etc/rc.d/ip6fw#4 integrate .. //depot/projects/ia64/etc/rc.d/ipfilter#14 integrate .. //depot/projects/ia64/etc/rc.d/ipfs#3 integrate .. //depot/projects/ia64/etc/rc.d/ipmon#7 integrate .. //depot/projects/ia64/etc/rc.d/ipnat#10 integrate .. //depot/projects/ia64/etc/rc.d/ipsec#7 integrate .. //depot/projects/ia64/etc/rc.d/isdnd#9 integrate .. //depot/projects/ia64/etc/rc.d/jail#8 integrate .. //depot/projects/ia64/etc/rc.d/ldconfig#9 integrate .. //depot/projects/ia64/etc/rc.d/local#5 integrate .. //depot/projects/ia64/etc/rc.d/lpd#4 integrate .. //depot/projects/ia64/etc/rc.d/motd#8 integrate .. //depot/projects/ia64/etc/rc.d/mountcritlocal#8 integrate .. //depot/projects/ia64/etc/rc.d/mountcritremote#7 integrate .. //depot/projects/ia64/etc/rc.d/mountd#9 integrate .. //depot/projects/ia64/etc/rc.d/moused#4 integrate .. //depot/projects/ia64/etc/rc.d/mrouted#6 integrate .. //depot/projects/ia64/etc/rc.d/named#7 integrate .. //depot/projects/ia64/etc/rc.d/netif#4 integrate .. //depot/projects/ia64/etc/rc.d/nfsd#10 integrate .. //depot/projects/ia64/etc/rc.d/nfslocking#5 integrate .. //depot/projects/ia64/etc/rc.d/ntpd#6 integrate .. //depot/projects/ia64/etc/rc.d/ntpdate#5 integrate .. //depot/projects/ia64/etc/rc.d/pwcheck#3 integrate .. //depot/projects/ia64/etc/rc.d/random#4 integrate .. //depot/projects/ia64/etc/rc.d/rarpd#3 integrate .. //depot/projects/ia64/etc/rc.d/root#7 integrate .. //depot/projects/ia64/etc/rc.d/route6d#6 integrate .. //depot/projects/ia64/etc/rc.d/routed#7 integrate .. //depot/projects/ia64/etc/rc.d/rpcbind#6 integrate .. //depot/projects/ia64/etc/rc.d/rtadvd#6 integrate .. //depot/projects/ia64/etc/rc.d/rwho#3 integrate .. //depot/projects/ia64/etc/rc.d/savecore#4 integrate .. //depot/projects/ia64/etc/rc.d/securelevel#7 integrate .. //depot/projects/ia64/etc/rc.d/sendmail#7 integrate .. //depot/projects/ia64/etc/rc.d/sshd#4 integrate .. //depot/projects/ia64/etc/rc.d/swap1#4 integrate .. //depot/projects/ia64/etc/rc.d/sysctl#8 integrate .. //depot/projects/ia64/etc/rc.d/syslogd#5 integrate .. //depot/projects/ia64/etc/rc.d/timed#3 integrate .. //depot/projects/ia64/etc/rc.d/ttys#5 delete .. //depot/projects/ia64/etc/rc.d/virecover#6 integrate .. //depot/projects/ia64/etc/rc.d/ypbind#7 integrate .. //depot/projects/ia64/etc/rc.d/yppasswdd#7 integrate .. //depot/projects/ia64/etc/rc.d/ypserv#8 integrate .. //depot/projects/ia64/etc/rc.subr#16 integrate .. //depot/projects/ia64/etc/rc.suspend#4 integrate .. //depot/projects/ia64/etc/remote#5 integrate .. //depot/projects/ia64/etc/sendmail/Makefile#16 integrate .. //depot/projects/ia64/games/factor/Makefile#5 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#36 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes2#21 integrate .. //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#13 integrate .. //depot/projects/ia64/games/morse/morse.6#3 integrate .. //depot/projects/ia64/games/morse/morse.c#3 integrate .. //depot/projects/ia64/gnu/lib/libdialog/Makefile#6 integrate .. //depot/projects/ia64/gnu/lib/libdialog/menubox.c#3 integrate .. //depot/projects/ia64/gnu/lib/libregex/AUTHORS#2 delete .. //depot/projects/ia64/gnu/lib/libregex/COPYING#2 delete .. //depot/projects/ia64/gnu/lib/libregex/ChangeLog#2 delete .. //depot/projects/ia64/gnu/lib/libregex/FREEBSD-upgrade#1 branch .. //depot/projects/ia64/gnu/lib/libregex/INSTALL#2 delete .. //depot/projects/ia64/gnu/lib/libregex/Makefile#4 integrate .. //depot/projects/ia64/gnu/lib/libregex/Makefile.gnu#2 delete .. //depot/projects/ia64/gnu/lib/libregex/Makefile.in#2 delete .. //depot/projects/ia64/gnu/lib/libregex/NEWS#2 delete .. //depot/projects/ia64/gnu/lib/libregex/README#2 delete .. //depot/projects/ia64/gnu/lib/libregex/VERSION#2 delete .. //depot/projects/ia64/gnu/lib/libregex/config.status#2 delete .. //depot/projects/ia64/gnu/lib/libregex/configure#2 delete .. //depot/projects/ia64/gnu/lib/libregex/configure.in#2 delete .. //depot/projects/ia64/gnu/lib/libregex/gnuregex.h#1 branch .. //depot/projects/ia64/gnu/lib/libregex/posix/regex.h#1 branch .. //depot/projects/ia64/gnu/lib/libregex/regex.c#3 integrate .. //depot/projects/ia64/gnu/lib/libregex/regex.h#2 integrate .. //depot/projects/ia64/gnu/lib/libregex/test/ChangeLog#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/Makefile#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/Makefile.in#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/alloca.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/bsd-interf.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/debugmalloc.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/emacsmalloc.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/fileregex.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/g++malloc.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/getpagesize.h#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/iregex.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/main.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/malloc-test.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/other.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/printchar.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/psx-basic.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/psx-extend.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/psx-generic.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/psx-group.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/psx-interf.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/psx-interv.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/regexcpp.sed#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/syntax.skel#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/test.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/test.h#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/tregress.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/upcase.c#2 delete .. //depot/projects/ia64/gnu/lib/libregex/test/xmalloc.c#2 delete .. //depot/projects/ia64/gnu/lib/libstdc++/Makefile#22 integrate .. //depot/projects/ia64/gnu/usr.bin/bc/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/Makefile.inc#5 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/Makefile.inc0#10 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/addr2line/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/as/Makefile.inc#2 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/as/Makefile.inc0#10 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/as/ia64-freebsd/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gasp/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile#11 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h#2 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb-amd64.h#1 branch .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h#2 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h#3 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h#2 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h#2 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h#2 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb-x86_64.h#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#10 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile#9 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/Makefile#11 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/libbinutils/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/libiberty/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/nm/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/objcopy/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/objdump/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/ranlib/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/readelf/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/size/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/strings/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/strip/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/c++/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/c++filt/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc1/Makefile#9 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc1obj/Makefile#8 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc1plus/Makefile#10 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_int/Makefile#11 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#18 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cccp/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/collect2/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cpp/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cpp0/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/f771/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/tradcpp0/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/cpio/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/cvs/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/lib/Makefile#7 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/libdiff/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/dc/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/dialog/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/diff/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/diff/diff.1#4 integrate .. //depot/projects/ia64/gnu/usr.bin/diff3/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/gperf/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/config.hin#2 delete .. //depot/projects/ia64/gnu/usr.bin/grep/dfa.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/getopt.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/grep/getopt.h#2 delete .. //depot/projects/ia64/gnu/usr.bin/grep/getopt1.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/grep/search.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/stpcpy.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/groff/src/libs/libgroff/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#21 integrate .. //depot/projects/ia64/gnu/usr.bin/gzip/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/gzip/getopt.c#3 delete .. //depot/projects/ia64/gnu/usr.bin/gzip/getopt.h#2 delete .. //depot/projects/ia64/gnu/usr.bin/man/manpath/manpath.config#8 integrate .. //depot/projects/ia64/gnu/usr.bin/patch/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/patch/getopt.c#3 delete .. //depot/projects/ia64/gnu/usr.bin/patch/getopt.h#3 delete .. //depot/projects/ia64/gnu/usr.bin/patch/getopt1.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/sdiff/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/sort/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/tar/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/texinfo/libtxi/Makefile#3 integrate .. //depot/projects/ia64/include/Makefile#35 integrate .. //depot/projects/ia64/include/getopt.h#2 integrate .. //depot/projects/ia64/include/netdb.h#6 integrate .. //depot/projects/ia64/include/protocols/routed.h#2 integrate .. //depot/projects/ia64/include/resolv.h#5 integrate .. //depot/projects/ia64/include/stdlib.h#25 integrate .. //depot/projects/ia64/include/strings.h#4 integrate .. //depot/projects/ia64/include/unistd.h#24 integrate .. //depot/projects/ia64/kerberos5/Makefile#8 integrate .. //depot/projects/ia64/kerberos5/Makefile.inc#13 integrate .. //depot/projects/ia64/kerberos5/include/Makefile#3 delete .. //depot/projects/ia64/kerberos5/lib/Makefile#6 integrate .. //depot/projects/ia64/kerberos5/lib/libasn1/Makefile#10 integrate .. //depot/projects/ia64/kerberos5/lib/libgssapi/Makefile#6 integrate .. //depot/projects/ia64/kerberos5/lib/libhdb/Makefile#12 integrate .. //depot/projects/ia64/kerberos5/lib/libkadm5clnt/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/lib/libkadm5srv/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/lib/libkafs5/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/lib/libkrb5/Makefile#8 integrate .. //depot/projects/ia64/kerberos5/lib/libroken/Makefile#6 integrate .. //depot/projects/ia64/kerberos5/lib/libsl/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/lib/libvers/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/libexec/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/libexec/Makefile.inc#2 integrate .. //depot/projects/ia64/kerberos5/libexec/hprop/Makefile#6 integrate .. //depot/projects/ia64/kerberos5/libexec/hpropd/Makefile#8 integrate .. //depot/projects/ia64/kerberos5/libexec/ipropd-master/Makefile#9 integrate .. //depot/projects/ia64/kerberos5/libexec/ipropd-slave/Makefile#9 integrate .. //depot/projects/ia64/kerberos5/libexec/kadmind/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/libexec/kdc/Makefile#10 integrate .. //depot/projects/ia64/kerberos5/libexec/kpasswdd/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/tools/Makefile#1 branch .. //depot/projects/ia64/kerberos5/tools/Makefile.inc#1 branch .. //depot/projects/ia64/kerberos5/tools/asn1_compile/Makefile#1 branch .. //depot/projects/ia64/kerberos5/tools/make-print-version/Makefile#1 branch .. //depot/projects/ia64/kerberos5/tools/make-roken/Makefile#1 branch .. //depot/projects/ia64/kerberos5/usr.bin/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kadmin/Makefile#6 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kdestroy/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kinit/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/usr.bin/klist/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kpasswd/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/usr.bin/krb5-config/Makefile#11 integrate .. //depot/projects/ia64/kerberos5/usr.bin/ksu/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/usr.bin/verify_krb5_conf/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/usr.sbin/kstash/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/usr.sbin/ktutil/Makefile#9 integrate .. //depot/projects/ia64/lib/Makefile#41 integrate .. //depot/projects/ia64/lib/csu/i386-elf/Makefile#8 integrate .. //depot/projects/ia64/lib/libalias/Makefile#6 integrate .. //depot/projects/ia64/lib/libalias/alias.c#8 integrate .. //depot/projects/ia64/lib/libalias/alias.h#6 integrate .. //depot/projects/ia64/lib/libalias/alias_cuseeme.c#3 integrate .. //depot/projects/ia64/lib/libalias/alias_db.c#9 integrate .. //depot/projects/ia64/lib/libalias/alias_ftp.c#4 integrate .. //depot/projects/ia64/lib/libalias/alias_irc.c#4 integrate .. //depot/projects/ia64/lib/libalias/alias_local.h#5 integrate .. //depot/projects/ia64/lib/libalias/alias_nbt.c#5 integrate .. //depot/projects/ia64/lib/libalias/alias_old.c#1 branch .. //depot/projects/ia64/lib/libalias/alias_pptp.c#2 integrate .. //depot/projects/ia64/lib/libalias/alias_proxy.c#5 integrate .. //depot/projects/ia64/lib/libalias/alias_skinny.c#2 integrate .. //depot/projects/ia64/lib/libalias/alias_smedia.c#3 integrate .. //depot/projects/ia64/lib/libalias/alias_util.c#4 integrate .. //depot/projects/ia64/lib/libalias/libalias.3#8 integrate .. //depot/projects/ia64/lib/libarchive/Makefile#1 branch .. //depot/projects/ia64/lib/libarchive/README#1 branch .. //depot/projects/ia64/lib/libarchive/archive.h#1 branch .. //depot/projects/ia64/lib/libarchive/archive_check_magic.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_entry.3#1 branch .. //depot/projects/ia64/lib/libarchive/archive_entry.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_entry.h#1 branch .. //depot/projects/ia64/lib/libarchive/archive_private.h#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read.3#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read_data_into_buffer.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read_data_into_fd.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read_extract.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read_open_file.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_all.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_bzip2.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_gzip.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read_support_compression_none.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_all.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_cpio.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_gnutar.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tar.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_string.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_string.h#1 branch .. //depot/projects/ia64/lib/libarchive/archive_string_sprintf.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_util.3#1 branch .. //depot/projects/ia64/lib/libarchive/archive_util.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_write.3#1 branch .. //depot/projects/ia64/lib/libarchive/archive_write.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_write_open_file.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_bzip2.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_gzip.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_write_set_compression_none.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_write_set_format.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_by_name.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_cpio.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_pax.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_shar.c#1 branch .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_ustar.c#1 branch .. //depot/projects/ia64/lib/libarchive/libarchive.3#1 branch .. //depot/projects/ia64/lib/libarchive/tar.5#1 branch .. //depot/projects/ia64/lib/libatm/Makefile#5 integrate .. //depot/projects/ia64/lib/libatm/ioctl_subr.c#6 integrate .. //depot/projects/ia64/lib/libatm/ip_addr.c#6 integrate .. //depot/projects/ia64/lib/libbsnmp/Makefile#2 integrate .. //depot/projects/ia64/lib/libbsnmp/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libbsnmp/libbsnmp/Makefile#2 integrate .. //depot/projects/ia64/lib/libbsnmp/modules/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libbsnmp/modules/snmp_mibII/Makefile#2 integrate .. //depot/projects/ia64/lib/libbsnmp/modules/snmp_mibII/genfiles#2 delete .. //depot/projects/ia64/lib/libbsnmp/modules/snmp_mibII/mibII_oid.h#2 delete .. //depot/projects/ia64/lib/libbsnmp/modules/snmp_mibII/mibII_tree.c#2 delete .. //depot/projects/ia64/lib/libbsnmp/modules/snmp_mibII/mibII_tree.h#2 delete .. //depot/projects/ia64/lib/libbsnmp/modules/snmp_netgraph/Makefile#2 integrate .. //depot/projects/ia64/lib/libbsnmp/modules/snmp_netgraph/genfiles#2 delete .. //depot/projects/ia64/lib/libbsnmp/modules/snmp_netgraph/netgraph_oid.h#2 delete .. //depot/projects/ia64/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.c#2 delete .. //depot/projects/ia64/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.h#2 delete .. //depot/projects/ia64/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#2 integrate .. //depot/projects/ia64/lib/libc/Makefile#14 integrate .. //depot/projects/ia64/lib/libc/alpha/_fpmath.h#4 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/isinf.c#5 integrate .. //depot/projects/ia64/lib/libc/amd64/SYS.h#3 integrate .. //depot/projects/ia64/lib/libc/amd64/_fpmath.h#3 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/fabs.S#3 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/isinf.c#2 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/ldexp.c#3 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/pipe.S#2 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/reboot.S#2 integrate .. //depot/projects/ia64/lib/libc/amd64/sys/setlogin.S#3 integrate .. //depot/projects/ia64/lib/libc/db/mpool/mpool.c#3 integrate .. //depot/projects/ia64/lib/libc/gdtoa/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/gdtoa/_hdtoa.c#1 branch .. //depot/projects/ia64/lib/libc/gdtoa/_ldtoa.c#2 integrate .. //depot/projects/ia64/lib/libc/gen/Makefile.inc#25 integrate .. //depot/projects/ia64/lib/libc/gen/arc4random.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/getpwent.c#15 integrate .. //depot/projects/ia64/lib/libc/gen/pw_scan.c#8 integrate .. //depot/projects/ia64/lib/libc/gen/sem.c#1 branch .. //depot/projects/ia64/lib/libc/gen/sem_destroy.3#1 branch .. //depot/projects/ia64/lib/libc/gen/sem_getvalue.3#1 branch .. //depot/projects/ia64/lib/libc/gen/sem_init.3#1 branch .. //depot/projects/ia64/lib/libc/gen/sem_open.3#1 branch .. //depot/projects/ia64/lib/libc/gen/sem_post.3#1 branch .. //depot/projects/ia64/lib/libc/gen/sem_wait.3#1 branch .. //depot/projects/ia64/lib/libc/gen/signal.3#6 integrate .. //depot/projects/ia64/lib/libc/i386/_fpmath.h#3 integrate .. //depot/projects/ia64/lib/libc/i386/gen/isinf.c#5 integrate .. //depot/projects/ia64/lib/libc/i386/gen/ldexp.c#5 integrate .. //depot/projects/ia64/lib/libc/i386/gen/signalcontext.c#4 integrate .. //depot/projects/ia64/lib/libc/ia64/_fpmath.h#4 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/isinf.c#4 integrate .. //depot/projects/ia64/lib/libc/ia64/string/bcopy.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/string/bzero.S#3 integrate .. //depot/projects/ia64/lib/libc/include/fpmath.h#2 integrate .. //depot/projects/ia64/lib/libc/include/reentrant.h#3 integrate .. //depot/projects/ia64/lib/libc/locale/setlocale.3#9 integrate .. //depot/projects/ia64/lib/libc/locale/setlocale.c#11 integrate .. //depot/projects/ia64/lib/libc/locale/wcstombs.3#2 integrate .. //depot/projects/ia64/lib/libc/net/getaddrinfo.3#8 integrate .. //depot/projects/ia64/lib/libc/net/getaddrinfo.c#15 integrate .. //depot/projects/ia64/lib/libc/net/gethostbydns.c#9 integrate .. //depot/projects/ia64/lib/libc/net/gethostbyname.3#7 integrate .. //depot/projects/ia64/lib/libc/net/gethostbynis.c#4 integrate .. //depot/projects/ia64/lib/libc/net/getipnodebyname.3#3 integrate .. //depot/projects/ia64/lib/libc/net/getnetbydns.c#6 integrate .. //depot/projects/ia64/lib/libc/net/herror.c#3 integrate .. //depot/projects/ia64/lib/libc/net/inet6_rth_space.3#2 integrate .. //depot/projects/ia64/lib/libc/net/name6.c#10 integrate .. //depot/projects/ia64/lib/libc/net/res_init.c#6 integrate .. //depot/projects/ia64/lib/libc/net/res_send.c#6 integrate .. //depot/projects/ia64/lib/libc/net/res_send_private.h#1 branch .. //depot/projects/ia64/lib/libc/net/resolver.3#6 integrate .. //depot/projects/ia64/lib/libc/powerpc/_fpmath.h#4 integrate .. //depot/projects/ia64/lib/libc/powerpc/gen/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/powerpc/gen/fabs.S#1 branch .. //depot/projects/ia64/lib/libc/powerpc/gen/flt_rounds.c#1 branch .. //depot/projects/ia64/lib/libc/powerpc/gen/fpgetmask.c#1 branch .. //depot/projects/ia64/lib/libc/powerpc/gen/fpgetround.c#1 branch .. //depot/projects/ia64/lib/libc/powerpc/gen/fpgetsticky.c#1 branch .. //depot/projects/ia64/lib/libc/powerpc/gen/fpsetmask.c#1 branch .. //depot/projects/ia64/lib/libc/powerpc/gen/fpsetround.c#1 branch .. //depot/projects/ia64/lib/libc/powerpc/gen/fpsetsticky.c#1 branch .. //depot/projects/ia64/lib/libc/powerpc/gen/isinf.c#3 integrate .. //depot/projects/ia64/lib/libc/powerpc/gen/syncicache.c#2 integrate .. //depot/projects/ia64/lib/libc/rpc/rpcb_prot.c#4 integrate .. //depot/projects/ia64/lib/libc/sparc64/_fpmath.h#3 integrate .. //depot/projects/ia64/lib/libc/sparc64/gen/fabs.S#2 integrate .. //depot/projects/ia64/lib/libc/sparc64/gen/isinf.c#4 integrate .. //depot/projects/ia64/lib/libc/sparc64/sys/__sparc_utrap.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/floatio.h#4 integrate .. //depot/projects/ia64/lib/libc/stdio/mktemp.3#4 integrate .. //depot/projects/ia64/lib/libc/stdio/printf.3#18 integrate .. //depot/projects/ia64/lib/libc/stdio/vfprintf.c#19 integrate .. //depot/projects/ia64/lib/libc/stdio/vfscanf.c#13 integrate .. //depot/projects/ia64/lib/libc/stdio/vfwprintf.c#10 integrate .. //depot/projects/ia64/lib/libc/stdio/vfwscanf.c#7 integrate .. //depot/projects/ia64/lib/libc/stdlib/Makefile.inc#14 integrate .. //depot/projects/ia64/lib/libc/stdlib/atof.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/getopt_long.3#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/getopt_long.c#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/getsubopt.3#2 integrate .. //depot/projects/ia64/lib/libc/stdlib/getsubopt.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.c#23 integrate .. //depot/projects/ia64/lib/libc/stdlib/random.c#5 integrate .. //depot/projects/ia64/lib/libc/string/Makefile.inc#9 integrate .. //depot/projects/ia64/lib/libc/string/ffs.3#4 integrate .. //depot/projects/ia64/lib/libc/string/ffs.c#5 integrate .. //depot/projects/ia64/lib/libc/string/ffsl.c#1 branch .. //depot/projects/ia64/lib/libc/string/fls.c#1 branch .. //depot/projects/ia64/lib/libc/string/flsl.c#1 branch .. //depot/projects/ia64/lib/libc/sys/Makefile.inc#19 integrate .. //depot/projects/ia64/lib/libc/sys/gettimeofday.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/poll.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/read.2#7 integrate .. //depot/projects/ia64/lib/libc/sys/select.2#6 integrate .. //depot/projects/ia64/lib/libc/sys/sem.c#5 delete .. //depot/projects/ia64/lib/libc/sys/sendfile.2#8 integrate .. //depot/projects/ia64/lib/libc/sys/setpgid.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/sigwait.2#1 branch .. //depot/projects/ia64/lib/libc/xdr/xdr_stdio.c#4 integrate .. //depot/projects/ia64/lib/libc_r/Makefile#7 integrate .. //depot/projects/ia64/lib/libc_r/arch/ia64/_atomic_lock.S#4 integrate .. //depot/projects/ia64/lib/libc_r/man/Makefile.inc#6 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_attr.3#6 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_attr_get_np.3#9 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_attr_setcreatesuspend_np.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_cancel.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_cleanup_pop.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_cleanup_push.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_cond_broadcast.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_cond_destroy.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_cond_init.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_cond_signal.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_cond_timedwait.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_cond_wait.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_condattr.3#4 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_create.3#4 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_detach.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_equal.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_exit.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_getconcurrency.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_getspecific.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_join.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_key_create.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_key_delete.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_kill.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_main_np.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_multi_np.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_mutex_destroy.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_mutex_init.3#4 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_mutex_lock.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_mutex_trylock.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_mutex_unlock.3#4 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_mutexattr.3#4 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_mutexattr_getkind_np.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_once.3#4 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_resume_all_np.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_resume_np.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_rwlock_destroy.3#2 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_rwlock_init.3#2 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_rwlock_rdlock.3#2 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_rwlock_unlock.3#2 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_rwlock_wrlock.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_rwlockattr_destroy.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_rwlockattr_getpshared.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_rwlockattr_init.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_rwlockattr_setpshared.3#4 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_schedparam.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_self.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_set_name_np.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_setspecific.3#3 delete .. //depot/projects/ia64/lib/libc_r/man/pthread_sigmask.3#3 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 28 19:14:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6FB916A4D0; Sat, 28 Feb 2004 19:14:22 -0800 (PST) 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 76F3816A4CE for ; Sat, 28 Feb 2004 19:14:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71DDC43D1D for ; Sat, 28 Feb 2004 19:14:22 -0800 (PST) (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.10/8.12.10) with ESMTP id i1T3EMGe049887 for ; Sat, 28 Feb 2004 19:14:22 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1T3EMK2049884 for perforce@freebsd.org; Sat, 28 Feb 2004 19:14:22 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 28 Feb 2004 19:14:22 -0800 (PST) Message-Id: <200402290314.i1T3EMK2049884@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 47846 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, 29 Feb 2004 03:14:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=47846 Change 47846 by rwatson@rwatson_tislabs on 2004/02/28 19:14:02 Fix botched integ -- use ip_dn_claim_rule(), synchronize whitespace to HEAD. Affected files ... .. //depot/projects/netperf_socket/sys/net/bridge.c#4 edit Differences ... ==== //depot/projects/netperf_socket/sys/net/bridge.c#4 (text+ko) ==== @@ -920,10 +920,9 @@ DDB(quad_t ticks; ticks = rdtsc();) - /* did we match a firewall rule ? */ - args.rule = ip_dn_find_rule(m0); + args.rule = ip_dn_claim_rule(m0); if (args.rule) - shared = 0; /* For sure this is our own mbuf. */ + shared = 0; /* For sure this is our own mbuf. */ else bdg_thru++; /* count 1st time through bdg_forward */